summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-25 00:06:09 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-25 00:06:09 +0100
commit738eb5a9f952ee02ddce836b9d56350bcacbadf5 (patch)
treea21afee4ca8408110900d68d07c52d74d10a26f2 /app-admin
parentMerge branch 'tvheadend' (diff)
parentSet appropriate maintainer types in metadata.xml (GLEP 67) (diff)
downloadgentoo-738eb5a9f952ee02ddce836b9d56350bcacbadf5.tar.gz
gentoo-738eb5a9f952ee02ddce836b9d56350bcacbadf5.tar.bz2
gentoo-738eb5a9f952ee02ddce836b9d56350bcacbadf5.zip
Merge the GLEP 67 transition changes
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/389-admin-console/metadata.xml6
-rw-r--r--app-admin/389-console/metadata.xml6
-rw-r--r--app-admin/389-ds-console/metadata.xml6
-rw-r--r--app-admin/abrt/metadata.xml5
-rw-r--r--app-admin/amazon-ec2-init/metadata.xml3
-rw-r--r--app-admin/analog/metadata.xml4
-rw-r--r--app-admin/ansible/metadata.xml6
-rw-r--r--app-admin/apache-tools/metadata.xml2
-rw-r--r--app-admin/apachetop/metadata.xml2
-rw-r--r--app-admin/apg/metadata.xml7
-rw-r--r--app-admin/augeas/metadata.xml2
-rw-r--r--app-admin/authbind/metadata.xml2
-rw-r--r--app-admin/aws-as-tools/metadata.xml9
-rw-r--r--app-admin/aws-cw-tools/metadata.xml9
-rw-r--r--app-admin/aws-elb-tools/metadata.xml2
-rw-r--r--app-admin/aws-iam-tools/metadata.xml9
-rw-r--r--app-admin/aws-rds-tools/metadata.xml9
-rw-r--r--app-admin/bastille/metadata.xml5
-rw-r--r--app-admin/bcfg2/metadata.xml15
-rw-r--r--app-admin/calamares/metadata.xml3
-rw-r--r--app-admin/cancd/metadata.xml2
-rw-r--r--app-admin/ccze/metadata.xml2
-rw-r--r--app-admin/cdist/metadata.xml7
-rw-r--r--app-admin/cgmanager/metadata.xml4
-rw-r--r--app-admin/checkrestart/metadata.xml2
-rw-r--r--app-admin/checksec/metadata.xml4
-rw-r--r--app-admin/chroot_safe/metadata.xml3
-rw-r--r--app-admin/chrootuid/metadata.xml2
-rw-r--r--app-admin/chrpath/metadata.xml7
-rw-r--r--app-admin/clog/metadata.xml2
-rw-r--r--app-admin/clsync/metadata.xml2
-rw-r--r--app-admin/clustershell/metadata.xml3
-rw-r--r--app-admin/collectd/metadata.xml241
-rw-r--r--app-admin/conky/metadata.xml4
-rw-r--r--app-admin/conkyforecast/metadata.xml2
-rw-r--r--app-admin/conserver/metadata.xml7
-rw-r--r--app-admin/consolehm/metadata.xml5
-rw-r--r--app-admin/consul-replicate/metadata.xml2
-rw-r--r--app-admin/consul-template/metadata.xml2
-rw-r--r--app-admin/consul/metadata.xml4
-rw-r--r--app-admin/cpulimit/metadata.xml2
-rw-r--r--app-admin/cronolog/metadata.xml4
-rw-r--r--app-admin/denyhosts/metadata.xml4
-rw-r--r--app-admin/diamond/metadata.xml2
-rw-r--r--app-admin/dio/metadata.xml7
-rw-r--r--app-admin/diradm/metadata.xml6
-rw-r--r--app-admin/drush/metadata.xml2
-rw-r--r--app-admin/durep/metadata.xml3
-rw-r--r--app-admin/ec2-ami-tools/metadata.xml3
-rw-r--r--app-admin/ec2-api-tools/metadata.xml3
-rw-r--r--app-admin/eclean-kernel/metadata.xml2
-rw-r--r--app-admin/elektra/metadata.xml3
-rw-r--r--app-admin/emacs-updater/metadata.xml2
-rw-r--r--app-admin/entr/metadata.xml7
-rw-r--r--app-admin/equo/metadata.xml3
-rw-r--r--app-admin/eselect/metadata.xml5
-rw-r--r--app-admin/evtxtools/metadata.xml2
-rw-r--r--app-admin/fam/metadata.xml2
-rw-r--r--app-admin/fetchlog/metadata.xml3
-rw-r--r--app-admin/fifo-cronolog/metadata.xml4
-rw-r--r--app-admin/filebeat-bin/metadata.xml7
-rw-r--r--app-admin/filewatcher/metadata.xml4
-rw-r--r--app-admin/fleet/metadata.xml4
-rw-r--r--app-admin/fsvs/metadata.xml3
-rw-r--r--app-admin/gam-server/metadata.xml3
-rw-r--r--app-admin/gamin/metadata.xml3
-rw-r--r--app-admin/genromfs/metadata.xml3
-rw-r--r--app-admin/gentoo-rsync-mirror/metadata.xml7
-rw-r--r--app-admin/geolizer/metadata.xml5
-rw-r--r--app-admin/gkrellm/metadata.xml1
-rw-r--r--app-admin/glance/metadata.xml7
-rw-r--r--app-admin/gnome-system-log/metadata.xml5
-rw-r--r--app-admin/grubconfig/metadata.xml5
-rw-r--r--app-admin/gtkdiskfree/metadata.xml11
-rw-r--r--app-admin/hardening-check/metadata.xml5
-rw-r--r--app-admin/hardinfo/metadata.xml3
-rw-r--r--app-admin/haskell-updater/metadata.xml5
-rw-r--r--app-admin/hddtemp/metadata.xml4
-rw-r--r--app-admin/hwreport/metadata.xml2
-rw-r--r--app-admin/ide-smart/metadata.xml4
-rw-r--r--app-admin/integrit/metadata.xml5
-rw-r--r--app-admin/jinit/metadata.xml3
-rw-r--r--app-admin/kedpm/metadata.xml3
-rw-r--r--app-admin/keepass/metadata.xml9
-rw-r--r--app-admin/keepassx/metadata.xml4
-rw-r--r--app-admin/killproc/metadata.xml2
-rw-r--r--app-admin/kpcli/metadata.xml7
-rw-r--r--app-admin/lastpass-cli/metadata.xml7
-rw-r--r--app-admin/lastpass/metadata.xml9
-rw-r--r--app-admin/lib_users/metadata.xml4
-rw-r--r--app-admin/lnav/metadata.xml2
-rw-r--r--app-admin/localepurge/metadata.xml7
-rw-r--r--app-admin/logcheck/metadata.xml2
-rw-r--r--app-admin/logmon/metadata.xml2
-rw-r--r--app-admin/logrotate/metadata.xml2
-rw-r--r--app-admin/logsentry/metadata.xml6
-rw-r--r--app-admin/logstalgia/metadata.xml2
-rw-r--r--app-admin/logstash-bin/metadata.xml7
-rw-r--r--app-admin/logstash-forwarder/metadata.xml2
-rw-r--r--app-admin/logsurfer+/metadata.xml4
-rw-r--r--app-admin/longrun/metadata.xml3
-rw-r--r--app-admin/lsat/metadata.xml6
-rw-r--r--app-admin/lsyncd/metadata.xml3
-rw-r--r--app-admin/makepasswd/metadata.xml2
-rw-r--r--app-admin/mate-system-tools/metadata.xml5
-rw-r--r--app-admin/matter/metadata.xml5
-rw-r--r--app-admin/mcelog/metadata.xml9
-rw-r--r--app-admin/mcollective/metadata.xml2
-rw-r--r--app-admin/metalog/metadata.xml7
-rw-r--r--app-admin/mktwpol/metadata.xml2
-rw-r--r--app-admin/mms-agent/metadata.xml10
-rw-r--r--app-admin/mongo-tools/metadata.xml9
-rw-r--r--app-admin/monit/metadata.xml2
-rw-r--r--app-admin/multilog-watch/metadata.xml3
-rw-r--r--app-admin/newsyslog/metadata.xml4
-rw-r--r--app-admin/ngxtop/metadata.xml2
-rw-r--r--app-admin/openrc-settingsd/metadata.xml7
-rw-r--r--app-admin/packagekit-base/metadata.xml3
-rw-r--r--app-admin/packagekit-gtk/metadata.xml3
-rw-r--r--app-admin/packagekit-qt4/metadata.xml3
-rw-r--r--app-admin/packagekit/metadata.xml3
-rw-r--r--app-admin/pass/metadata.xml2
-rw-r--r--app-admin/passook/metadata.xml3
-rw-r--r--app-admin/paxtest/metadata.xml7
-rw-r--r--app-admin/perl-cleaner/metadata.xml7
-rw-r--r--app-admin/petrovich/metadata.xml4
-rw-r--r--app-admin/phpsyslogng/metadata.xml7
-rw-r--r--app-admin/pprocm/metadata.xml3
-rw-r--r--app-admin/procinfo-ng/metadata.xml5
-rw-r--r--app-admin/procinfo/metadata.xml3
-rw-r--r--app-admin/psmon/metadata.xml4
-rw-r--r--app-admin/puppet-agent/metadata.xml2
-rw-r--r--app-admin/puppet-lint/metadata.xml13
-rw-r--r--app-admin/puppet/metadata.xml20
-rw-r--r--app-admin/puppetdb/metadata.xml2
-rw-r--r--app-admin/puppetserver/metadata.xml2
-rw-r--r--app-admin/pwcrypt/metadata.xml2
-rw-r--r--app-admin/pwgen/metadata.xml14
-rw-r--r--app-admin/pydf/metadata.xml2
-rw-r--r--app-admin/python-updater/metadata.xml5
-rw-r--r--app-admin/qpage/metadata.xml2
-rw-r--r--app-admin/qtpass/metadata.xml9
-rw-r--r--app-admin/quickswitch/metadata.xml3
-rw-r--r--app-admin/r10k/metadata.xml9
-rw-r--r--app-admin/radmind/metadata.xml5
-rw-r--r--app-admin/ranpwd/metadata.xml7
-rw-r--r--app-admin/recursos/metadata.xml3
-rw-r--r--app-admin/reportmagic/metadata.xml6
-rw-r--r--app-admin/restart_services/metadata.xml2
-rw-r--r--app-admin/rex/metadata.xml9
-rw-r--r--app-admin/rigo/metadata.xml3
-rw-r--r--app-admin/rsyslog/metadata.xml4
-rw-r--r--app-admin/sagan-rules/metadata.xml11
-rw-r--r--app-admin/sagan/metadata.xml21
-rw-r--r--app-admin/salt/metadata.xml2
-rw-r--r--app-admin/setools/metadata.xml2
-rw-r--r--app-admin/showconsole/metadata.xml5
-rw-r--r--app-admin/socklog/metadata.xml5
-rw-r--r--app-admin/sshguard/metadata.xml5
-rw-r--r--app-admin/stow/metadata.xml9
-rw-r--r--app-admin/sud/metadata.xml7
-rw-r--r--app-admin/sudo/metadata.xml9
-rw-r--r--app-admin/sulfur/metadata.xml3
-rw-r--r--app-admin/superadduser/metadata.xml5
-rw-r--r--app-admin/supernova/metadata.xml2
-rw-r--r--app-admin/supervisor/metadata.xml5
-rw-r--r--app-admin/swatch/metadata.xml2
-rw-r--r--app-admin/sxid/metadata.xml4
-rw-r--r--app-admin/sysklogd/metadata.xml7
-rw-r--r--app-admin/syslog-ng/metadata.xml2
-rw-r--r--app-admin/syslog-summary/metadata.xml2
-rw-r--r--app-admin/syslogread/metadata.xml3
-rw-r--r--app-admin/sysrqd/metadata.xml2
-rw-r--r--app-admin/sysstat/metadata.xml2
-rw-r--r--app-admin/system-config-printer/metadata.xml12
-rw-r--r--app-admin/system-tools-backends/metadata.xml5
-rw-r--r--app-admin/systemrescuecd-x86/metadata.xml2
-rw-r--r--app-admin/tenshi/metadata.xml9
-rw-r--r--app-admin/testdisk/metadata.xml13
-rw-r--r--app-admin/tmpreaper/metadata.xml2
-rw-r--r--app-admin/tmpwatch/metadata.xml2
-rw-r--r--app-admin/tripwire/metadata.xml2
-rw-r--r--app-admin/ulogd/metadata.xml25
-rw-r--r--app-admin/usbview/metadata.xml5
-rw-r--r--app-admin/usermin/metadata.xml3
-rw-r--r--app-admin/vault/metadata.xml2
-rw-r--r--app-admin/verynice/metadata.xml2
-rw-r--r--app-admin/watchfolder/metadata.xml3
-rw-r--r--app-admin/webalizer/metadata.xml9
-rw-r--r--app-admin/webapp-config/metadata.xml11
-rw-r--r--app-admin/webmin/metadata.xml7
-rw-r--r--app-admin/whowatch/metadata.xml3
-rw-r--r--app-admin/xstow/metadata.xml9
-rw-r--r--app-admin/xtail/metadata.xml7
-rw-r--r--app-admin/yaala/metadata.xml5
195 files changed, 637 insertions, 546 deletions
diff --git a/app-admin/389-admin-console/metadata.xml b/app-admin/389-admin-console/metadata.xml
index f941fa3103d1..2444066aa02b 100644
--- a/app-admin/389-admin-console/metadata.xml
+++ b/app-admin/389-admin-console/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>java</herd>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
+<maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
</maintainer>
</pkgmetadata>
diff --git a/app-admin/389-console/metadata.xml b/app-admin/389-console/metadata.xml
index 2061856c98ee..2444066aa02b 100644
--- a/app-admin/389-console/metadata.xml
+++ b/app-admin/389-console/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>java</herd>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
+<maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
</maintainer>
</pkgmetadata>
diff --git a/app-admin/389-ds-console/metadata.xml b/app-admin/389-ds-console/metadata.xml
index 2061856c98ee..2444066aa02b 100644
--- a/app-admin/389-ds-console/metadata.xml
+++ b/app-admin/389-ds-console/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>java</herd>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
+<maintainer type="project">
+ <email>java@gentoo.org</email>
+ <name>Java</name>
</maintainer>
</pkgmetadata>
diff --git a/app-admin/abrt/metadata.xml b/app-admin/abrt/metadata.xml
index dad9001338dc..996e7cacd217 100644
--- a/app-admin/abrt/metadata.xml
+++ b/app-admin/abrt/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/amazon-ec2-init/metadata.xml b/app-admin/amazon-ec2-init/metadata.xml
index 1470e032181b..097975e3adc2 100644
--- a/app-admin/amazon-ec2-init/metadata.xml
+++ b/app-admin/amazon-ec2-init/metadata.xml
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
</pkgmetadata>
diff --git a/app-admin/analog/metadata.xml b/app-admin/analog/metadata.xml
index f9d50da18d39..097975e3adc2 100644
--- a/app-admin/analog/metadata.xml
+++ b/app-admin/analog/metadata.xml
@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <description>This package lacks a primary herd or maintainer.</description>
- </maintainer>
</pkgmetadata>
diff --git a/app-admin/ansible/metadata.xml b/app-admin/ansible/metadata.xml
index 4ee44fd1745a..ca05cd97f4af 100644
--- a/app-admin/ansible/metadata.xml
+++ b/app-admin/ansible/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>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
diff --git a/app-admin/apache-tools/metadata.xml b/app-admin/apache-tools/metadata.xml
index 0530e463d6b4..e9a2f7c43c36 100644
--- a/app-admin/apache-tools/metadata.xml
+++ b/app-admin/apache-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>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
diff --git a/app-admin/apachetop/metadata.xml b/app-admin/apachetop/metadata.xml
index 48919ac33d6c..3d738830cef2 100644
--- a/app-admin/apachetop/metadata.xml
+++ b/app-admin/apachetop/metadata.xml
@@ -1,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>neurogeek@gentoo.org</email>
<name>Jesus Rivero</name>
</maintainer>
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 9cf9bbc84c78..5abd6e12e515 100644
--- a/app-admin/apg/metadata.xml
+++ b/app-admin/apg/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
<email>DuPol@gmx.de</email>
<name>Dustin Polke</name>
<description>Proxy Maintainer. CC him on bugs.</description>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<longdescription>Another Password Generator. Generates random, pronouncable passwords with a variety of algorithms</longdescription>
</pkgmetadata>
diff --git a/app-admin/augeas/metadata.xml b/app-admin/augeas/metadata.xml
index ffb39ba605d4..2b1c8d903c2b 100644
--- a/app-admin/augeas/metadata.xml
+++ b/app-admin/augeas/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
</maintainer>
<longdescription lang="en">
diff --git a/app-admin/authbind/metadata.xml b/app-admin/authbind/metadata.xml
index 5b2a5c55470b..5c23291b5215 100644
--- a/app-admin/authbind/metadata.xml
+++ b/app-admin/authbind/metadata.xml
@@ -1,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/app-admin/aws-as-tools/metadata.xml b/app-admin/aws-as-tools/metadata.xml
index 1a971abe53b5..8a33e2203ab8 100644
--- a/app-admin/aws-as-tools/metadata.xml
+++ b/app-admin/aws-as-tools/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>lxnay@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>sergey.zhuga@gmail.com</email>
<name>Sergey Zhuga</name>
<description>Proxy maintainers. CC him on bugs</description>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/aws-cw-tools/metadata.xml b/app-admin/aws-cw-tools/metadata.xml
index 1a971abe53b5..8a33e2203ab8 100644
--- a/app-admin/aws-cw-tools/metadata.xml
+++ b/app-admin/aws-cw-tools/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>lxnay@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>sergey.zhuga@gmail.com</email>
<name>Sergey Zhuga</name>
<description>Proxy maintainers. CC him on bugs</description>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/aws-elb-tools/metadata.xml b/app-admin/aws-elb-tools/metadata.xml
index c964a88f43ca..97b78fe2f133 100644
--- a/app-admin/aws-elb-tools/metadata.xml
+++ b/app-admin/aws-elb-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>lxnay@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/app-admin/aws-iam-tools/metadata.xml b/app-admin/aws-iam-tools/metadata.xml
index 1a971abe53b5..8a33e2203ab8 100644
--- a/app-admin/aws-iam-tools/metadata.xml
+++ b/app-admin/aws-iam-tools/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>lxnay@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>sergey.zhuga@gmail.com</email>
<name>Sergey Zhuga</name>
<description>Proxy maintainers. CC him on bugs</description>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/aws-rds-tools/metadata.xml b/app-admin/aws-rds-tools/metadata.xml
index 1a971abe53b5..8a33e2203ab8 100644
--- a/app-admin/aws-rds-tools/metadata.xml
+++ b/app-admin/aws-rds-tools/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>lxnay@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>sergey.zhuga@gmail.com</email>
<name>Sergey Zhuga</name>
<description>Proxy maintainers. CC him on bugs</description>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/bastille/metadata.xml b/app-admin/bastille/metadata.xml
index c60ce0ba2450..fb9c3ca6f9ff 100644
--- a/app-admin/bastille/metadata.xml
+++ b/app-admin/bastille/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>hardened</herd>
+ <maintainer type="project">
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
<longdescription>The Bastille Hardening System attempts to "harden" or "tighten" Unix operating systems.</longdescription>
<upstream>
<remote-id type="sourceforge">bastille-linux</remote-id>
diff --git a/app-admin/bcfg2/metadata.xml b/app-admin/bcfg2/metadata.xml
index 0f2dd7febf21..e26e9da25e6c 100644
--- a/app-admin/bcfg2/metadata.xml
+++ b/app-admin/bcfg2/metadata.xml
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
<description>Proxy Maintainer</description>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>mjinks@uchicago.edu</email>
<name>Michael Jinks</name>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<use>
- <flag name='cheetah'>Include dev-python/cheetah support</flag>
- <flag name='genshi'>Include dev-python/genshi support</flag>
- <flag name='server'>Installs scripts to be used on the server-side of this app</flag>
+ <flag name="cheetah">Include dev-python/cheetah support</flag>
+ <flag name="genshi">Include dev-python/genshi support</flag>
+ <flag name="server">Installs scripts to be used on the server-side of this app</flag>
</use>
</pkgmetadata>
diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index b719686ba39d..f28035634d1a 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -1,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>johu@gentoo.org</email>
<name>Johannes Huber</name>
</maintainer>
@@ -18,4 +18,3 @@
<remote-id type="github">calamares/calamares</remote-id>
</upstream>
</pkgmetadata>
-
diff --git a/app-admin/cancd/metadata.xml b/app-admin/cancd/metadata.xml
index a732fd8b2f03..a4e0d354f696 100644
--- a/app-admin/cancd/metadata.xml
+++ b/app-admin/cancd/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
diff --git a/app-admin/ccze/metadata.xml b/app-admin/ccze/metadata.xml
index 2c85fc4869de..a51daaedaa6d 100644
--- a/app-admin/ccze/metadata.xml
+++ b/app-admin/ccze/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>joker@gentoo.org</email>
<name>Christian Birchinger</name>
<description>Please take over if you want it</description>
diff --git a/app-admin/cdist/metadata.xml b/app-admin/cdist/metadata.xml
index 688513dd0ab0..cca0990e276d 100644
--- a/app-admin/cdist/metadata.xml
+++ b/app-admin/cdist/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>nerve@ipwar.ch</email>
<name>Daniel Heule</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">cdist</remote-id>
</upstream>
diff --git a/app-admin/cgmanager/metadata.xml b/app-admin/cgmanager/metadata.xml
index 5d74e34036b5..734f29efb788 100644
--- a/app-admin/cgmanager/metadata.xml
+++ b/app-admin/cgmanager/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>perfinion@gentoo.org</email>
<name>Jason Zaman</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
diff --git a/app-admin/checkrestart/metadata.xml b/app-admin/checkrestart/metadata.xml
index 8870e4ffc77a..9f5eb23dda4e 100644
--- a/app-admin/checkrestart/metadata.xml
+++ b/app-admin/checkrestart/metadata.xml
@@ -1,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>aidecoe@gentoo.org</email>
<name>Amadeusz Żołnowski</name>
</maintainer>
diff --git a/app-admin/checksec/metadata.xml b/app-admin/checksec/metadata.xml
index f1f666f2d33c..5d7a81f67440 100644
--- a/app-admin/checksec/metadata.xml
+++ b/app-admin/checksec/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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/app-admin/chroot_safe/metadata.xml b/app-admin/chroot_safe/metadata.xml
index 4145ddd1b330..ae4d57568935 100644
--- a/app-admin/chroot_safe/metadata.xml
+++ b/app-admin/chroot_safe/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<upstream>
<remote-id type="sourceforge">chrootsafe</remote-id>
</upstream>
diff --git a/app-admin/chrootuid/metadata.xml b/app-admin/chrootuid/metadata.xml
index c9141f702442..75fc762a7ae6 100644
--- a/app-admin/chrootuid/metadata.xml
+++ b/app-admin/chrootuid/metadata.xml
@@ -1,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>hattya@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/app-admin/chrpath/metadata.xml b/app-admin/chrpath/metadata.xml
index 66cf774185dd..ec89a074cbfa 100644
--- a/app-admin/chrpath/metadata.xml
+++ b/app-admin/chrpath/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>prefix</herd>
- <maintainer>
+ <maintainer type="person">
<email>grobian@gentoo.org</email>
</maintainer>
+<maintainer type="project">
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/clog/metadata.xml b/app-admin/clog/metadata.xml
index d1f1caa60dca..143be88f0726 100644
--- a/app-admin/clog/metadata.xml
+++ b/app-admin/clog/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>alicef@gentoo.org</email>
<name>Alice Ferrazzi</name>
</maintainer>
diff --git a/app-admin/clsync/metadata.xml b/app-admin/clsync/metadata.xml
index c7f85380317e..9cbe60e8159c 100644
--- a/app-admin/clsync/metadata.xml
+++ b/app-admin/clsync/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>bircoph@gentoo.org</email>
<name>Andrew Savchenko</name>
</maintainer>
diff --git a/app-admin/clustershell/metadata.xml b/app-admin/clustershell/metadata.xml
index 21e59a0a13ea..28b857cfd27c 100644
--- a/app-admin/clustershell/metadata.xml
+++ b/app-admin/clustershell/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<upstream>
<remote-id type="github">cea-hpc/clustershell</remote-id>
</upstream>
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 268c9abc954d..2b9b9b41d44c 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -1,130 +1,133 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<longdescription>Collectd gathers statistics about the system it is running on and stores this information. Those statistics can then be used to find current performance bottlenecks (i.e. performance analysis) and predict future system load (i.e. capacity planning). Or if you just want pretty graphs of your private server and are fed up with some homegrown solution you're at the right place.</longdescription>
- <maintainer>
+ <maintainer type="person">
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
<description>Proxied Maintainer</description>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
- <flag name='collectd_plugins_aggregation'>Build the aggregation plugin (aggregate multiplte values into a single value)</flag>
- <flag name='collectd_plugins_apache'>Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag>
- <flag name='collectd_plugins_apcups'>Build the apcups input plugin (UPS charge, load, input/output/battery voltage, etc.)</flag>
- <flag name='collectd_plugins_ascent'>Build the ascent input plugin (statistics about a free server for World of Warcraft)</flag>
- <flag name='collectd_plugins_battery'>Build the battery input plugin (charge, current and voltage of ACPI and PMU based laptop batteries)</flag>
- <flag name='collectd_plugins_bind'>Build the bind input plugin (name server and resolver statistics)</flag>
- <flag name='collectd_plugins_ceph'>Build the plugin for <pkg>sys-cluster/ceph</pkg></flag>
- <flag name='collectd_plugins_cgroups'>Build the cgroups CPU accounting collection plugin</flag>
- <flag name='collectd_plugins_conntrack'>Build the conntrack input plugin (number of nf_conntrack entries)</flag>
- <flag name='collectd_plugins_contextswitch'>Build the contextswitch input plugin (number of context switches done by the operating system)</flag>
- <flag name='collectd_plugins_cpu'>Build the cpu input plugin (time spent in the system, user, nice, idle, and related states)</flag>
- <flag name='collectd_plugins_cpufreq'>Build the cpufreq input plugin (CPU frequency, for laptops with speedstep or similar)</flag>
- <flag name='collectd_plugins_csv'>Build the csv output plugin (write to comma separated values (CSV) files)</flag>
- <flag name='collectd_plugins_curl'>Build the curl input plugin (parse statistics from websites using regular expressions)</flag>
- <flag name='collectd_plugins_curl_json'>Build the curl_json input plugin (get json data via curl and parse it)</flag>
- <flag name='collectd_plugins_curl_xml'>Build the curl_xml input plugin (get xml data via curl and parse it)</flag>
- <flag name='collectd_plugins_dbi'>Build the dbi input plugin (execute SQL statements on databases and interpret the reply)</flag>
- <flag name='collectd_plugins_df'>Build the df input plugin (mountpoint usage)</flag>
- <flag name='collectd_plugins_disk'>Build the disk input plugin (sectors read/written, number of read/write actions, average completion time of IO-operations)</flag>
- <flag name='collectd_plugins_dns'>Build the dns input plugin (collects statistics of your DNS traffic on port udp/53)</flag>
- <flag name='collectd_plugins_drbd'>Build the plugin for DRBD statistics</flag>
- <flag name='collectd_plugins_email'>Build the email input plugin (opens a UNIX domain socket and starts accepting connections on that socket)</flag>
- <flag name='collectd_plugins_entropy'>Build the entropy input plugin (available entropy on a system)</flag>
- <flag name='collectd_plugins_ethstat'>Build the ethstat input plugin (performance statistics of Linux ethernet cards)</flag>
- <flag name='collectd_plugins_exec'>Build the exec input/output plugin (executes scripts / applications and reads values back)</flag>
- <flag name='collectd_plugins_fhcount'>Build the plugin for File handles statistics</flag>
- <flag name='collectd_plugins_filecount'>Build the filecount input plugin (countd the number of files in a directory and all its subdirectories)</flag>
- <flag name='collectd_plugins_fscache'>Build the fscache input plugin (information about the caching infrastructure for network file-systems etc)</flag>
- <flag name='collectd_plugins_gmond'>Build the gmond input plugin (receive data from gmond, the client daemon of the Ganglia project)</flag>
- <flag name='collectd_plugins_hddtemp'>Build the hddtemp input plugin (temperature of hard disks)</flag>
- <flag name='collectd_plugins_interface'>Build the interface input plugin (information about traffic, packets and errors of interfaces)</flag>
- <flag name='collectd_plugins_ipc'>Build the plugin for IPC statistics</flag>
- <flag name='collectd_plugins_ipmi'>Build the ipmi input plugin (read hardware sensors from servers using the Intelligent Platform Management Interface (IPMI))</flag>
- <flag name='collectd_plugins_iptables'>Build the iptables input plugin (statistics from a ip_tables based packet filter)</flag>
- <flag name='collectd_plugins_irq'>Build the irq input plugin (number of times each interrupt has been handled by the os)</flag>
- <flag name='collectd_plugins_java'>Build the java input plugin (embeds a JVM into collectd for writing plugins)</flag>
- <flag name='collectd_plugins_libvirt'>Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
- <flag name='collectd_plugins_load'>Build the load input plugin (system load)</flag>
- <flag name='collectd_plugins_log_logstash'>Build the plugin for Logstash json_event compatible logging</flag>
- <flag name='collectd_plugins_logfile'>Build the logfile output plugin (writes log messages to a text file)</flag>
- <flag name='collectd_plugins_lvm'>Build the LVM input plugin</flag>
- <flag name='collectd_plugins_madwifi'>Build the madwifi input plugin (information about Atheros wireless LAN chipsets)</flag>
- <flag name='collectd_plugins_match_empty_counter'>Build the match_empty_counter filter plugin</flag>
- <flag name='collectd_plugins_match_hashed'>Build the match_hashed filter plugin</flag>
- <flag name='collectd_plugins_match_regex'>Build the match_regex filter plugin</flag>
- <flag name='collectd_plugins_match_timediff'>Build the match_timediff filter plugin</flag>
- <flag name='collectd_plugins_match_value'>Build the match_value filter plugin</flag>
- <flag name='collectd_plugins_mbmon'>Build the mbmon input plugin (information from mainboard sensors)</flag>
- <flag name='collectd_plugins_md'>Build the md input plugin (disk states in Linux md devices)</flag>
- <flag name='collectd_plugins_memcachec'>Build the memcachec input plugin (connects to a memcached server)</flag>
- <flag name='collectd_plugins_memcached'>Build the memcached input plugin (connects to a memcached daemon)</flag>
- <flag name='collectd_plugins_memory'>Build the memory input plugin (physical memory utilization)</flag>
- <flag name='collectd_plugins_multimeter'>Build the multimeter input plugin (reads a voltage or current from a multimeter connected to a serial bus)</flag>
- <flag name='collectd_plugins_mysql'>Build the mysql input plugin (connects to an MySQL-database and issues a SHOW STATUS command)</flag>
- <flag name='collectd_plugins_netlink'>Build the netlink input plugin (opens a netlink socket to the Linux kernel for getting statistics)</flag>
- <flag name='collectd_plugins_network'>Build the network input/output plugin (communicates with other instances of collectd)</flag>
- <flag name='collectd_plugins_nfs'>Build the nfs input plugin (usage of the Network File System)</flag>
- <flag name='collectd_plugins_nginx'>Build the nginx input plugin (number of requests handled by the nginx daemon)</flag>
- <flag name='collectd_plugins_notify_desktop'>Build the notify_desktop output plugin (uses libnotify to display notifications to the user)</flag>
- <flag name='collectd_plugins_notify_email'>Build the notify_email output plugin (uses libESMTP to send notifications to a configured email address)</flag>
- <flag name='collectd_plugins_ntpd'>Build the ntpd input plugin (queries an NTP server)</flag>
- <flag name='collectd_plugins_numa'>Build the numa input plugin (statistics of the Linux Non-Uniform Memory Access (NUMA) subsystem)</flag>
- <flag name='collectd_plugins_nut'>Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag>
- <flag name='collectd_plugins_olsrd'>Build the olsrd input plugin (reads information about the Optimized Link State Routing daemon)</flag>
- <flag name='collectd_plugins_onewire'>Build the onewire input plugin (collects temperature information from sensors)</flag>
- <flag name='collectd_plugins_openldap'>Build the plugin for OpenLDAP statistics</flag>
- <flag name='collectd_plugins_openvpn'>Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag>
- <flag name='collectd_plugins_oracle'>Build the oracle input plugin (SQL-queries one or more Oracle database systems)</flag>
- <flag name='collectd_plugins_perl'>Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag>
- <flag name='collectd_plugins_ping'>Build the ping input plugin (measures network latency)</flag>
- <flag name='collectd_plugins_postgresql'>Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag>
- <flag name='collectd_plugins_powerdns'>Build the powerdns input plugin (connects to a local PowerDNS instance)</flag>
- <flag name='collectd_plugins_processes'>Build the processes input plugin (statistics about processes)</flag>
- <flag name='collectd_plugins_protocols'>Build the protocols input plugin (network protocols)</flag>
- <flag name='collectd_plugins_python'>Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag>
- <flag name='collectd_plugins_redis'>Build the Redis input plugin</flag>
- <flag name='collectd_plugins_routeros'>Build the routeros input plugin (collect information on devices running RouterOS)</flag>
- <flag name='collectd_plugins_rrdcached'>Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag>
- <flag name='collectd_plugins_rrdtool'>Build the rrdtool output plugin (writes values to RRD-files)</flag>
- <flag name='collectd_plugins_sensors'>Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag>
- <flag name='collectd_plugins_serial'>Build the serial input plugin (collects the traffic on serial interfaces)</flag>
- <flag name='collectd_plugins_smart'>Build the plugin for SMART statistics</flag>
- <flag name='collectd_plugins_snmp'>Build the snmp input plugin (read values from network devices using SNMP)</flag>
- <flag name='collectd_plugins_statsd'>Build the statsd input plugin (accepts statsd-type metrics from a UDP socket)</flag>
- <flag name='collectd_plugins_swap'>Build the swap input plugin (amount of memory currently written to swap)</flag>
- <flag name='collectd_plugins_syslog'>Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)</flag>
- <flag name='collectd_plugins_table'>Build the table input plugin (parses table-like structured plain text)</flag>
- <flag name='collectd_plugins_tail'>Build the tail input plugin (follows logfiles as e.g. tail -f)</flag>
- <flag name='collectd_plugins_target_notification'>Build the target_notification filter plugin</flag>
- <flag name='collectd_plugins_target_replace'>Build the target_replace filter plugin</flag>
- <flag name='collectd_plugins_target_scale'>Build the target_scale filter plugin</flag>
- <flag name='collectd_plugins_target_set'>Build the target_set filter plugin</flag>
- <flag name='collectd_plugins_tcpconns'>Build the tcpconns input plugin (number of TCP connections to or from a specified port)</flag>
- <flag name='collectd_plugins_teamspeak2'>Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag>
- <flag name='collectd_plugins_ted'>Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag>
- <flag name='collectd_plugins_thermal'>Build the thermal input plugin (ACPI thermal zone information)</flag>
- <flag name='collectd_plugins_threshold'>Build the threshold plugin (checks values against configured thresholds and creates notifications if values are out of bounds)</flag>
- <flag name='collectd_plugins_tokyotyrant'>Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag>
- <flag name='collectd_plugins_turbostat'>Build the plugin for Advanced statistic on Intel cpu states</flag>
- <flag name='collectd_plugins_unixsock'>Build the unixsock output plugin (opens a UNIX domain socket and accepts connections)</flag>
- <flag name='collectd_plugins_uptime'>Build the uptime input plugin (system uptime)</flag>
- <flag name='collectd_plugins_users'>Build the users input plugin (number of users currently logged in)</flag>
- <flag name='collectd_plugins_uuid'>Build the uuid plugin (tries hard to determine the UUID of the system it is running on)</flag>
- <flag name='collectd_plugins_varnish'>Build the varnish input plugin</flag>
- <flag name='collectd_plugins_virt'>Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
- <flag name='collectd_plugins_vmem'>Build the vmem input plugin (information about the virtual memory subsystem)</flag>
- <flag name='collectd_plugins_wireless'>Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag>
- <flag name='collectd_plugins_write_graphite'>Build the write_graphite output plugin (sends the values collected by collectd to Carbon, the storage layer of the Graphite time-series database)</flag>
- <flag name='collectd_plugins_write_http'>Build the write_http output plugin (sends the values collected by collectd to a web-server)</flag>
- <flag name='collectd_plugins_write_log'>Build the Log output plugin</flag>
- <flag name='collectd_plugins_write_mongodb'>Build the write_mongodb output plugin (sends the values collected by collectd to a MongoDB)</flag>
- <flag name='collectd_plugins_write_redis'>Build the Redis output plugin</flag>
- <flag name='collectd_plugins_write_sensu'>Build the Sensu output plugin</flag>
- <flag name='collectd_plugins_write_tsdb'>Build the TSDB output plugin</flag>
- <flag name='collectd_plugins_zfs_arc'>Build the plugin for ZFS ARC statistics</flag>
- <flag name='collectd_plugins_zookeeper'>Build the plugin for Zookeeper statistics</flag>
- <flag name='contrib'>Install user-contributed files in the doc directory</flag>
+ <flag name="collectd_plugins_aggregation">Build the aggregation plugin (aggregate multiplte values into a single value)</flag>
+ <flag name="collectd_plugins_apache">Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag>
+ <flag name="collectd_plugins_apcups">Build the apcups input plugin (UPS charge, load, input/output/battery voltage, etc.)</flag>
+ <flag name="collectd_plugins_ascent">Build the ascent input plugin (statistics about a free server for World of Warcraft)</flag>
+ <flag name="collectd_plugins_battery">Build the battery input plugin (charge, current and voltage of ACPI and PMU based laptop batteries)</flag>
+ <flag name="collectd_plugins_bind">Build the bind input plugin (name server and resolver statistics)</flag>
+ <flag name="collectd_plugins_ceph">Build the plugin for <pkg>sys-cluster/ceph</pkg></flag>
+ <flag name="collectd_plugins_cgroups">Build the cgroups CPU accounting collection plugin</flag>
+ <flag name="collectd_plugins_conntrack">Build the conntrack input plugin (number of nf_conntrack entries)</flag>
+ <flag name="collectd_plugins_contextswitch">Build the contextswitch input plugin (number of context switches done by the operating system)</flag>
+ <flag name="collectd_plugins_cpu">Build the cpu input plugin (time spent in the system, user, nice, idle, and related states)</flag>
+ <flag name="collectd_plugins_cpufreq">Build the cpufreq input plugin (CPU frequency, for laptops with speedstep or similar)</flag>
+ <flag name="collectd_plugins_csv">Build the csv output plugin (write to comma separated values (CSV) files)</flag>
+ <flag name="collectd_plugins_curl">Build the curl input plugin (parse statistics from websites using regular expressions)</flag>
+ <flag name="collectd_plugins_curl_json">Build the curl_json input plugin (get json data via curl and parse it)</flag>
+ <flag name="collectd_plugins_curl_xml">Build the curl_xml input plugin (get xml data via curl and parse it)</flag>
+ <flag name="collectd_plugins_dbi">Build the dbi input plugin (execute SQL statements on databases and interpret the reply)</flag>
+ <flag name="collectd_plugins_df">Build the df input plugin (mountpoint usage)</flag>
+ <flag name="collectd_plugins_disk">Build the disk input plugin (sectors read/written, number of read/write actions, average completion time of IO-operations)</flag>
+ <flag name="collectd_plugins_dns">Build the dns input plugin (collects statistics of your DNS traffic on port udp/53)</flag>
+ <flag name="collectd_plugins_drbd">Build the plugin for DRBD statistics</flag>
+ <flag name="collectd_plugins_email">Build the email input plugin (opens a UNIX domain socket and starts accepting connections on that socket)</flag>
+ <flag name="collectd_plugins_entropy">Build the entropy input plugin (available entropy on a system)</flag>
+ <flag name="collectd_plugins_ethstat">Build the ethstat input plugin (performance statistics of Linux ethernet cards)</flag>
+ <flag name="collectd_plugins_exec">Build the exec input/output plugin (executes scripts / applications and reads values back)</flag>
+ <flag name="collectd_plugins_fhcount">Build the plugin for File handles statistics</flag>
+ <flag name="collectd_plugins_filecount">Build the filecount input plugin (countd the number of files in a directory and all its subdirectories)</flag>
+ <flag name="collectd_plugins_fscache">Build the fscache input plugin (information about the caching infrastructure for network file-systems etc)</flag>
+ <flag name="collectd_plugins_gmond">Build the gmond input plugin (receive data from gmond, the client daemon of the Ganglia project)</flag>
+ <flag name="collectd_plugins_hddtemp">Build the hddtemp input plugin (temperature of hard disks)</flag>
+ <flag name="collectd_plugins_interface">Build the interface input plugin (information about traffic, packets and errors of interfaces)</flag>
+ <flag name="collectd_plugins_ipc">Build the plugin for IPC statistics</flag>
+ <flag name="collectd_plugins_ipmi">Build the ipmi input plugin (read hardware sensors from servers using the Intelligent Platform Management Interface (IPMI))</flag>
+ <flag name="collectd_plugins_iptables">Build the iptables input plugin (statistics from a ip_tables based packet filter)</flag>
+ <flag name="collectd_plugins_irq">Build the irq input plugin (number of times each interrupt has been handled by the os)</flag>
+ <flag name="collectd_plugins_java">Build the java input plugin (embeds a JVM into collectd for writing plugins)</flag>
+ <flag name="collectd_plugins_libvirt">Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
+ <flag name="collectd_plugins_load">Build the load input plugin (system load)</flag>
+ <flag name="collectd_plugins_log_logstash">Build the plugin for Logstash json_event compatible logging</flag>
+ <flag name="collectd_plugins_logfile">Build the logfile output plugin (writes log messages to a text file)</flag>
+ <flag name="collectd_plugins_lvm">Build the LVM input plugin</flag>
+ <flag name="collectd_plugins_madwifi">Build the madwifi input plugin (information about Atheros wireless LAN chipsets)</flag>
+ <flag name="collectd_plugins_match_empty_counter">Build the match_empty_counter filter plugin</flag>
+ <flag name="collectd_plugins_match_hashed">Build the match_hashed filter plugin</flag>
+ <flag name="collectd_plugins_match_regex">Build the match_regex filter plugin</flag>
+ <flag name="collectd_plugins_match_timediff">Build the match_timediff filter plugin</flag>
+ <flag name="collectd_plugins_match_value">Build the match_value filter plugin</flag>
+ <flag name="collectd_plugins_mbmon">Build the mbmon input plugin (information from mainboard sensors)</flag>
+ <flag name="collectd_plugins_md">Build the md input plugin (disk states in Linux md devices)</flag>
+ <flag name="collectd_plugins_memcachec">Build the memcachec input plugin (connects to a memcached server)</flag>
+ <flag name="collectd_plugins_memcached">Build the memcached input plugin (connects to a memcached daemon)</flag>
+ <flag name="collectd_plugins_memory">Build the memory input plugin (physical memory utilization)</flag>
+ <flag name="collectd_plugins_multimeter">Build the multimeter input plugin (reads a voltage or current from a multimeter connected to a serial bus)</flag>
+ <flag name="collectd_plugins_mysql">Build the mysql input plugin (connects to an MySQL-database and issues a SHOW STATUS command)</flag>
+ <flag name="collectd_plugins_netlink">Build the netlink input plugin (opens a netlink socket to the Linux kernel for getting statistics)</flag>
+ <flag name="collectd_plugins_network">Build the network input/output plugin (communicates with other instances of collectd)</flag>
+ <flag name="collectd_plugins_nfs">Build the nfs input plugin (usage of the Network File System)</flag>
+ <flag name="collectd_plugins_nginx">Build the nginx input plugin (number of requests handled by the nginx daemon)</flag>
+ <flag name="collectd_plugins_notify_desktop">Build the notify_desktop output plugin (uses libnotify to display notifications to the user)</flag>
+ <flag name="collectd_plugins_notify_email">Build the notify_email output plugin (uses libESMTP to send notifications to a configured email address)</flag>
+ <flag name="collectd_plugins_ntpd">Build the ntpd input plugin (queries an NTP server)</flag>
+ <flag name="collectd_plugins_numa">Build the numa input plugin (statistics of the Linux Non-Uniform Memory Access (NUMA) subsystem)</flag>
+ <flag name="collectd_plugins_nut">Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag>
+ <flag name="collectd_plugins_olsrd">Build the olsrd input plugin (reads information about the Optimized Link State Routing daemon)</flag>
+ <flag name="collectd_plugins_onewire">Build the onewire input plugin (collects temperature information from sensors)</flag>
+ <flag name="collectd_plugins_openldap">Build the plugin for OpenLDAP statistics</flag>
+ <flag name="collectd_plugins_openvpn">Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag>
+ <flag name="collectd_plugins_oracle">Build the oracle input plugin (SQL-queries one or more Oracle database systems)</flag>
+ <flag name="collectd_plugins_perl">Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag>
+ <flag name="collectd_plugins_ping">Build the ping input plugin (measures network latency)</flag>
+ <flag name="collectd_plugins_postgresql">Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag>
+ <flag name="collectd_plugins_powerdns">Build the powerdns input plugin (connects to a local PowerDNS instance)</flag>
+ <flag name="collectd_plugins_processes">Build the processes input plugin (statistics about processes)</flag>
+ <flag name="collectd_plugins_protocols">Build the protocols input plugin (network protocols)</flag>
+ <flag name="collectd_plugins_python">Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag>
+ <flag name="collectd_plugins_redis">Build the Redis input plugin</flag>
+ <flag name="collectd_plugins_routeros">Build the routeros input plugin (collect information on devices running RouterOS)</flag>
+ <flag name="collectd_plugins_rrdcached">Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag>
+ <flag name="collectd_plugins_rrdtool">Build the rrdtool output plugin (writes values to RRD-files)</flag>
+ <flag name="collectd_plugins_sensors">Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag>
+ <flag name="collectd_plugins_serial">Build the serial input plugin (collects the traffic on serial interfaces)</flag>
+ <flag name="collectd_plugins_smart">Build the plugin for SMART statistics</flag>
+ <flag name="collectd_plugins_snmp">Build the snmp input plugin (read values from network devices using SNMP)</flag>
+ <flag name="collectd_plugins_statsd">Build the statsd input plugin (accepts statsd-type metrics from a UDP socket)</flag>
+ <flag name="collectd_plugins_swap">Build the swap input plugin (amount of memory currently written to swap)</flag>
+ <flag name="collectd_plugins_syslog">Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)</flag>
+ <flag name="collectd_plugins_table">Build the table input plugin (parses table-like structured plain text)</flag>
+ <flag name="collectd_plugins_tail">Build the tail input plugin (follows logfiles as e.g. tail -f)</flag>
+ <flag name="collectd_plugins_target_notification">Build the target_notification filter plugin</flag>
+ <flag name="collectd_plugins_target_replace">Build the target_replace filter plugin</flag>
+ <flag name="collectd_plugins_target_scale">Build the target_scale filter plugin</flag>
+ <flag name="collectd_plugins_target_set">Build the target_set filter plugin</flag>
+ <flag name="collectd_plugins_tcpconns">Build the tcpconns input plugin (number of TCP connections to or from a specified port)</flag>
+ <flag name="collectd_plugins_teamspeak2">Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag>
+ <flag name="collectd_plugins_ted">Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag>
+ <flag name="collectd_plugins_thermal">Build the thermal input plugin (ACPI thermal zone information)</flag>
+ <flag name="collectd_plugins_threshold">Build the threshold plugin (checks values against configured thresholds and creates notifications if values are out of bounds)</flag>
+ <flag name="collectd_plugins_tokyotyrant">Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag>
+ <flag name="collectd_plugins_turbostat">Build the plugin for Advanced statistic on Intel cpu states</flag>
+ <flag name="collectd_plugins_unixsock">Build the unixsock output plugin (opens a UNIX domain socket and accepts connections)</flag>
+ <flag name="collectd_plugins_uptime">Build the uptime input plugin (system uptime)</flag>
+ <flag name="collectd_plugins_users">Build the users input plugin (number of users currently logged in)</flag>
+ <flag name="collectd_plugins_uuid">Build the uuid plugin (tries hard to determine the UUID of the system it is running on)</flag>
+ <flag name="collectd_plugins_varnish">Build the varnish input plugin</flag>
+ <flag name="collectd_plugins_virt">Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
+ <flag name="collectd_plugins_vmem">Build the vmem input plugin (information about the virtual memory subsystem)</flag>
+ <flag name="collectd_plugins_wireless">Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag>
+ <flag name="collectd_plugins_write_graphite">Build the write_graphite output plugin (sends the values collected by collectd to Carbon, the storage layer of the Graphite time-series database)</flag>
+ <flag name="collectd_plugins_write_http">Build the write_http output plugin (sends the values collected by collectd to a web-server)</flag>
+ <flag name="collectd_plugins_write_log">Build the Log output plugin</flag>
+ <flag name="collectd_plugins_write_mongodb">Build the write_mongodb output plugin (sends the values collected by collectd to a MongoDB)</flag>
+ <flag name="collectd_plugins_write_redis">Build the Redis output plugin</flag>
+ <flag name="collectd_plugins_write_sensu">Build the Sensu output plugin</flag>
+ <flag name="collectd_plugins_write_tsdb">Build the TSDB output plugin</flag>
+ <flag name="collectd_plugins_zfs_arc">Build the plugin for ZFS ARC statistics</flag>
+ <flag name="collectd_plugins_zookeeper">Build the plugin for Zookeeper statistics</flag>
+ <flag name="contrib">Install user-contributed files in the doc directory</flag>
</use>
</pkgmetadata>
diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 8edeb0484f3f..501e0a0ae27b 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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/app-admin/conkyforecast/metadata.xml b/app-admin/conkyforecast/metadata.xml
index 7ad6f3ff7899..d9f08c9f2411 100644
--- a/app-admin/conkyforecast/metadata.xml
+++ b/app-admin/conkyforecast/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
index c3a63c8f01d2..9ccbdbbaa16b 100644
--- a/app-admin/conserver/metadata.xml
+++ b/app-admin/conserver/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>dan@danweeks.net</email>
<name>Dan Weeks</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
Conserver is an application that allows multiple users to watch a serial
console at the same time. It can log the data, allows users to take
diff --git a/app-admin/consolehm/metadata.xml b/app-admin/consolehm/metadata.xml
index ecedda4aa2cc..a00f3aeb1f81 100644
--- a/app-admin/consolehm/metadata.xml
+++ b/app-admin/consolehm/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>bsd</herd>
+<maintainer type="project">
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/consul-replicate/metadata.xml b/app-admin/consul-replicate/metadata.xml
index dd8c8da64294..387973160cac 100644
--- a/app-admin/consul-replicate/metadata.xml
+++ b/app-admin/consul-replicate/metadata.xml
@@ -1,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>zmedico@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/app-admin/consul-template/metadata.xml b/app-admin/consul-template/metadata.xml
index a12ecb248fbf..7efeb6aef9c6 100644
--- a/app-admin/consul-template/metadata.xml
+++ b/app-admin/consul-template/metadata.xml
@@ -1,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>zmedico@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/app-admin/consul/metadata.xml b/app-admin/consul/metadata.xml
index 903ed9d6da79..bdfa681795e7 100644
--- a/app-admin/consul/metadata.xml
+++ b/app-admin/consul/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>zmedico@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>ultrabug@gentoo.org</email>
</maintainer>
<use>
diff --git a/app-admin/cpulimit/metadata.xml b/app-admin/cpulimit/metadata.xml
index 39e355636da9..5d14155ff76f 100644
--- a/app-admin/cpulimit/metadata.xml
+++ b/app-admin/cpulimit/metadata.xml
@@ -1,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>nullishzero@gentoo.org</email>
<name>Pavel Kazakov</name>
</maintainer>
diff --git a/app-admin/cronolog/metadata.xml b/app-admin/cronolog/metadata.xml
index 6752c3ce0db6..564b0713d491 100644
--- a/app-admin/cronolog/metadata.xml
+++ b/app-admin/cronolog/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription lang="en">
Cronolog is a simple filter program that reads log file entries from
standard input and writes each entry to the output file specified by a
@@ -13,4 +10,3 @@
as Apache, to split the access log into daily or monthly logs.
</longdescription>
</pkgmetadata>
-
diff --git a/app-admin/denyhosts/metadata.xml b/app-admin/denyhosts/metadata.xml
index fc4254224b19..81f91d19dd64 100644
--- a/app-admin/denyhosts/metadata.xml
+++ b/app-admin/denyhosts/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?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/app-admin/diamond/metadata.xml b/app-admin/diamond/metadata.xml
index 395cb3eb4234..835af2947917 100644
--- a/app-admin/diamond/metadata.xml
+++ b/app-admin/diamond/metadata.xml
@@ -1,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>grobian@gentoo.org</email>
<name>Fabian Groffen</name>
</maintainer>
diff --git a/app-admin/dio/metadata.xml b/app-admin/dio/metadata.xml
index 67cb71579bde..19a392ab5492 100644
--- a/app-admin/dio/metadata.xml
+++ b/app-admin/dio/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>donaldbmcintosh@yahoo.co.uk</email>
<name>Donald McIntosh</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">donaldmcintosh/dio</remote-id>
</upstream>
diff --git a/app-admin/diradm/metadata.xml b/app-admin/diradm/metadata.xml
index 278b560d3df8..c8b2751e5fe0 100644
--- a/app-admin/diradm/metadata.xml
+++ b/app-admin/diradm/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>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
<use>
- <flag name='automount'>Support for automount data in LDAP</flag>
- <flag name='irixpasswd'>Support for storing separate IRIX passwords</flag>
+ <flag name="automount">Support for automount data in LDAP</flag>
+ <flag name="irixpasswd">Support for storing separate IRIX passwords</flag>
</use>
</pkgmetadata>
diff --git a/app-admin/drush/metadata.xml b/app-admin/drush/metadata.xml
index 4cf1bb2441f4..80ac404db8dc 100644
--- a/app-admin/drush/metadata.xml
+++ b/app-admin/drush/metadata.xml
@@ -1,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>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
</maintainer>
diff --git a/app-admin/durep/metadata.xml b/app-admin/durep/metadata.xml
index 06fca6f76106..ef9e210f4db8 100644
--- a/app-admin/durep/metadata.xml
+++ b/app-admin/durep/metadata.xml
@@ -1,8 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription>A perl script designed for monitoring disk usage. Similar to du</longdescription>
</pkgmetadata>
diff --git a/app-admin/ec2-ami-tools/metadata.xml b/app-admin/ec2-ami-tools/metadata.xml
index daccbacc9d37..278bcb6b95f9 100644
--- a/app-admin/ec2-ami-tools/metadata.xml
+++ b/app-admin/ec2-ami-tools/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription>
These command-line tools serve as the client interface to the Amazon EC2 web service.
</longdescription>
diff --git a/app-admin/ec2-api-tools/metadata.xml b/app-admin/ec2-api-tools/metadata.xml
index daccbacc9d37..278bcb6b95f9 100644
--- a/app-admin/ec2-api-tools/metadata.xml
+++ b/app-admin/ec2-api-tools/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription>
These command-line tools serve as the client interface to the Amazon EC2 web service.
</longdescription>
diff --git a/app-admin/eclean-kernel/metadata.xml b/app-admin/eclean-kernel/metadata.xml
index a19f15875108..8cfdc75499d4 100644
--- a/app-admin/eclean-kernel/metadata.xml
+++ b/app-admin/eclean-kernel/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
index c3fe5e3083bd..1c07cb81ebd7 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -1,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>
@@ -15,4 +15,3 @@
<flag name="yajl">Enable yajl support</flag>
</use>
</pkgmetadata>
-
diff --git a/app-admin/emacs-updater/metadata.xml b/app-admin/emacs-updater/metadata.xml
index 9daa11a4ea20..c438baf3b326 100644
--- a/app-admin/emacs-updater/metadata.xml
+++ b/app-admin/emacs-updater/metadata.xml
@@ -1,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>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-admin/entr/metadata.xml b/app-admin/entr/metadata.xml
index 0a5d54b123ef..630f6766fa61 100644
--- a/app-admin/entr/metadata.xml
+++ b/app-admin/entr/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>shell-tools</herd>
- <maintainer>
+ <maintainer type="person">
<email>monsieurp@gentoo.org</email>
<name>Patrice Clement</name>
</maintainer>
+<maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/equo/metadata.xml b/app-admin/equo/metadata.xml
index 187f7a710efe..15f07e411445 100644
--- a/app-admin/equo/metadata.xml
+++ b/app-admin/equo/metadata.xml
@@ -1,11 +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>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<use>
</use>
</pkgmetadata>
-
diff --git a/app-admin/eselect/metadata.xml b/app-admin/eselect/metadata.xml
index dc5dc4fc2cc8..1935b3149bde 100644
--- a/app-admin/eselect/metadata.xml
+++ b/app-admin/eselect/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>eselect</herd>
+<maintainer type="project">
+ <email>eselect@gentoo.org</email>
+ <name>eselect configuration and management tool</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/evtxtools/metadata.xml b/app-admin/evtxtools/metadata.xml
index 3d4b619e36fd..9a6e0b87d381 100644
--- a/app-admin/evtxtools/metadata.xml
+++ b/app-admin/evtxtools/metadata.xml
@@ -1,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>zlogene@gentoo.org</email>
<name>Mikle Kolyada</name>
</maintainer>
diff --git a/app-admin/fam/metadata.xml b/app-admin/fam/metadata.xml
index 52363bff0cba..f8bd6f3f34f9 100644
--- a/app-admin/fam/metadata.xml
+++ b/app-admin/fam/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
diff --git a/app-admin/fetchlog/metadata.xml b/app-admin/fetchlog/metadata.xml
index a12c82df6025..957ba21ad2f2 100644
--- a/app-admin/fetchlog/metadata.xml
+++ b/app-admin/fetchlog/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<upstream>
<remote-id type="sourceforge">fetchlog</remote-id>
</upstream>
diff --git a/app-admin/fifo-cronolog/metadata.xml b/app-admin/fifo-cronolog/metadata.xml
index f6c0a9ad3a3b..479c97a41559 100644
--- a/app-admin/fifo-cronolog/metadata.xml
+++ b/app-admin/fifo-cronolog/metadata.xml
@@ -5,10 +5,10 @@
fifo-cronolog is based on app-admin/cronolog, but uses a FIFO for input
instead of stdin. This package is used for the Gentoo infrastructure.
</longdescription>
- <maintainer>
+ <maintainer type="person">
<email>idl0r@gentoo.org</email>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/app-admin/filebeat-bin/metadata.xml b/app-admin/filebeat-bin/metadata.xml
index fe6f9ccf1a7e..2d4f80063279 100644
--- a/app-admin/filebeat-bin/metadata.xml
+++ b/app-admin/filebeat-bin/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>hydrapolic@gmail.com</email>
<name>Tomas Mozes</name>
<description>Proxy maintainer</description>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/filewatcher/metadata.xml b/app-admin/filewatcher/metadata.xml
index bd3257d7693a..5eac9738b3fb 100644
--- a/app-admin/filewatcher/metadata.xml
+++ b/app-admin/filewatcher/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <name>Default assignee for orphaned packages</name>
- </maintainer>
<upstream>
<remote-id type="sourceforge">filewatcher</remote-id>
</upstream>
diff --git a/app-admin/fleet/metadata.xml b/app-admin/fleet/metadata.xml
index 6e88cbd11a99..67da141be374 100644
--- a/app-admin/fleet/metadata.xml
+++ b/app-admin/fleet/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>alunduil@gentoo.org</email>
<name>Alex Brandt</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>mail@stefanjunker.de</email>
<name>Stefan Junker</name>
</maintainer>
diff --git a/app-admin/fsvs/metadata.xml b/app-admin/fsvs/metadata.xml
index ff62877c67ae..097975e3adc2 100644
--- a/app-admin/fsvs/metadata.xml
+++ b/app-admin/fsvs/metadata.xml
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
-</maintainer>
</pkgmetadata>
diff --git a/app-admin/gam-server/metadata.xml b/app-admin/gam-server/metadata.xml
index 9879e83b822e..f3cab85cf603 100644
--- a/app-admin/gam-server/metadata.xml
+++ b/app-admin/gam-server/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
- <maintainer>
+ <maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/app-admin/gamin/metadata.xml b/app-admin/gamin/metadata.xml
index 8c868061b739..fb76b944f2da 100644
--- a/app-admin/gamin/metadata.xml
+++ b/app-admin/gamin/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>freedesktop</herd>
-<maintainer>
+<maintainer type="project">
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/app-admin/genromfs/metadata.xml b/app-admin/genromfs/metadata.xml
index eedb2fb06e9f..cf2f038cb063 100644
--- a/app-admin/genromfs/metadata.xml
+++ b/app-admin/genromfs/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription>A readonly filesystem designed to be small and very space
efficent</longdescription>
<upstream>
diff --git a/app-admin/gentoo-rsync-mirror/metadata.xml b/app-admin/gentoo-rsync-mirror/metadata.xml
index 2a2586cc30ca..771a09221b68 100644
--- a/app-admin/gentoo-rsync-mirror/metadata.xml
+++ b/app-admin/gentoo-rsync-mirror/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
<email>rgkmg25@gmail.com</email>
<name>Robert Kowalski</name>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/geolizer/metadata.xml b/app-admin/geolizer/metadata.xml
index 6632069b5aff..2b9b44f73497 100644
--- a/app-admin/geolizer/metadata.xml
+++ b/app-admin/geolizer/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
index 8a2f86d9436d..d91e30b8a561 100644
--- a/app-admin/gkrellm/metadata.xml
+++ b/app-admin/gkrellm/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-dock</herd>
<use>
<flag name="hddtemp">Enable monitoring harddrive temperatures via
<pkg>app-admin/hddtemp</pkg></flag>
diff --git a/app-admin/glance/metadata.xml b/app-admin/glance/metadata.xml
index 0dc3e103ba37..080766e81a18 100644
--- a/app-admin/glance/metadata.xml
+++ b/app-admin/glance/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>openstack</herd>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
+ <maintainer type="project">
+ <email>openstack@gentoo.org</email>
+ <name>Openstack</name>
+ </maintainer>
<longdescription lang="en">
Provides services for discovering, registering, and retrieving virtual
machine images. Glance has a RESTful API that allows querying of VM image
diff --git a/app-admin/gnome-system-log/metadata.xml b/app-admin/gnome-system-log/metadata.xml
index da6fd63d0085..39980802b1da 100644
--- a/app-admin/gnome-system-log/metadata.xml
+++ b/app-admin/gnome-system-log/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/grubconfig/metadata.xml b/app-admin/grubconfig/metadata.xml
index 96a2d586367d..56c124413057 100644
--- a/app-admin/grubconfig/metadata.xml
+++ b/app-admin/grubconfig/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index 66824a4fb790..8ef6ae7388f5 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -1,15 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch</email>
<name>Samuel Bauer</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
gtkdiskfree is a gtk extension to the cli tool df, does the same and more
</longdescription>
diff --git a/app-admin/hardening-check/metadata.xml b/app-admin/hardening-check/metadata.xml
index 2c97c584ed1f..a2db75c7084a 100644
--- a/app-admin/hardening-check/metadata.xml
+++ b/app-admin/hardening-check/metadata.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>ago@gentoo.org</email>
<name>Agostino Sarubbo</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>kees@outflux.net</email>
<name>Kees Cook</name>
<description>Upstream - please CC on bugs that concerns upstream</description>
</maintainer>
</pkgmetadata>
-
diff --git a/app-admin/hardinfo/metadata.xml b/app-admin/hardinfo/metadata.xml
index 91f4e72fb544..097975e3adc2 100644
--- a/app-admin/hardinfo/metadata.xml
+++ b/app-admin/hardinfo/metadata.xml
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
</pkgmetadata>
diff --git a/app-admin/haskell-updater/metadata.xml b/app-admin/haskell-updater/metadata.xml
index ddb2b453cd1f..b7878815d80d 100644
--- a/app-admin/haskell-updater/metadata.xml
+++ b/app-admin/haskell-updater/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>haskell</herd>
+ <maintainer type="project">
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
index a6041c523f54..c518306cdc08 100644
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/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>aidecoe@gentoo.org</email>
</maintainer>
<use>
- <flag name='network-cron'>
+ <flag name="network-cron">
Monthly cronjob to update hddtemp.db.
</flag>
</use>
diff --git a/app-admin/hwreport/metadata.xml b/app-admin/hwreport/metadata.xml
index 2811adea6ed8..07b22b0b86e6 100644
--- a/app-admin/hwreport/metadata.xml
+++ b/app-admin/hwreport/metadata.xml
@@ -1,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>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
diff --git a/app-admin/ide-smart/metadata.xml b/app-admin/ide-smart/metadata.xml
index 59e2b8f78cb5..097975e3adc2 100644
--- a/app-admin/ide-smart/metadata.xml
+++ b/app-admin/ide-smart/metadata.xml
@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <name>Default assignee for orphaned packages</name>
- </maintainer>
</pkgmetadata>
diff --git a/app-admin/integrit/metadata.xml b/app-admin/integrit/metadata.xml
index f22d1250efc5..6e354d6e670c 100644
--- a/app-admin/integrit/metadata.xml
+++ b/app-admin/integrit/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>forensics</herd>
+ <maintainer type="project">
+ <email>forensics@gentoo.org</email>
+ <name>Gentoo Forensics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">integrit</remote-id>
</upstream>
diff --git a/app-admin/jinit/metadata.xml b/app-admin/jinit/metadata.xml
index ff62877c67ae..097975e3adc2 100644
--- a/app-admin/jinit/metadata.xml
+++ b/app-admin/jinit/metadata.xml
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
-</maintainer>
</pkgmetadata>
diff --git a/app-admin/kedpm/metadata.xml b/app-admin/kedpm/metadata.xml
index a4448f8b98a8..99fbdc4ca13c 100644
--- a/app-admin/kedpm/metadata.xml
+++ b/app-admin/kedpm/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription>key storing program</longdescription>
<upstream>
<remote-id type="sourceforge">kedpm</remote-id>
diff --git a/app-admin/keepass/metadata.xml b/app-admin/keepass/metadata.xml
index b9e748b54d3c..b3247799e94f 100644
--- a/app-admin/keepass/metadata.xml
+++ b/app-admin/keepass/metadata.xml
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>ale@clearmind.me</email>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>kensington@gentoo.org</email>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="aot">Generate native code at build time, rather than runtime.</flag>
</use>
diff --git a/app-admin/keepassx/metadata.xml b/app-admin/keepassx/metadata.xml
index 9fe4915f8a5c..b261f538b96b 100644
--- a/app-admin/keepassx/metadata.xml
+++ b/app-admin/keepassx/metadata.xml
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>tgurr@gentoo.org</email>
<name>Timo Gurr</name>
</maintainer>
diff --git a/app-admin/killproc/metadata.xml b/app-admin/killproc/metadata.xml
index 347ef1097116..1f15fbbf8995 100644
--- a/app-admin/killproc/metadata.xml
+++ b/app-admin/killproc/metadata.xml
@@ -1,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>
</maintainer>
</pkgmetadata>
diff --git a/app-admin/kpcli/metadata.xml b/app-admin/kpcli/metadata.xml
index 434138d285c9..ad8e967f1f82 100644
--- a/app-admin/kpcli/metadata.xml
+++ b/app-admin/kpcli/metadata.xml
@@ -1,7 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>perl</herd>
+ <maintainer type="project">
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">kpcli</remote-id>
</upstream>
diff --git a/app-admin/lastpass-cli/metadata.xml b/app-admin/lastpass-cli/metadata.xml
index e13c9ed137f5..64a89e292c38 100644
--- a/app-admin/lastpass-cli/metadata.xml
+++ b/app-admin/lastpass-cli/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>gokturk@binghamton.edu</email>
<name>Gokturk 'gokturk' Yuksek</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="X">
Use <pkg>x11-misc/xclip</pkg> or <pkg>x11-misc/xsel</pkg> to copy passwords to the clipboard.
diff --git a/app-admin/lastpass/metadata.xml b/app-admin/lastpass/metadata.xml
index b92bb91bd8fa..9f1201e51062 100644
--- a/app-admin/lastpass/metadata.xml
+++ b/app-admin/lastpass/metadata.xml
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>gokturk@binghamton.edu</email>
<name>Gokturk Yuksek</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Lastpass is an online password manager, password generator, form
filler and secure notes service.
diff --git a/app-admin/lib_users/metadata.xml b/app-admin/lib_users/metadata.xml
index 45bc5dfa4de4..4283a28a18ef 100644
--- a/app-admin/lib_users/metadata.xml
+++ b/app-admin/lib_users/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="person">
<email>klausman@gentoo.org</email>
<name>Tobias Klausman</name>
</maintainer>
diff --git a/app-admin/lnav/metadata.xml b/app-admin/lnav/metadata.xml
index e0f9d3216868..a78cad49a983 100644
--- a/app-admin/lnav/metadata.xml
+++ b/app-admin/lnav/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
diff --git a/app-admin/localepurge/metadata.xml b/app-admin/localepurge/metadata.xml
index 2d52d39e1dca..3358abaa3398 100644
--- a/app-admin/localepurge/metadata.xml
+++ b/app-admin/localepurge/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
<email>wimmuskee@gmail.com</email>
<name>Wim Muskee</name>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<longdescription>
Just a simple tool to erase all uneeded locale and man files usually generated for USE="nls"
</longdescription>
diff --git a/app-admin/logcheck/metadata.xml b/app-admin/logcheck/metadata.xml
index d047926ffe02..cc8cd37515a7 100644
--- a/app-admin/logcheck/metadata.xml
+++ b/app-admin/logcheck/metadata.xml
@@ -1,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>phajdan.jr@gentoo.org</email>
<name>Pawel Hajdan jr</name>
</maintainer>
diff --git a/app-admin/logmon/metadata.xml b/app-admin/logmon/metadata.xml
index 53a0caef5d82..9d1727e6bd92 100644
--- a/app-admin/logmon/metadata.xml
+++ b/app-admin/logmon/metadata.xml
@@ -1,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/app-admin/logrotate/metadata.xml b/app-admin/logrotate/metadata.xml
index f92e835578bb..e8db975880a9 100644
--- a/app-admin/logrotate/metadata.xml
+++ b/app-admin/logrotate/metadata.xml
@@ -1,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>nimiux@gentoo.org</email>
<name>Chema Alonso</name>
</maintainer>
diff --git a/app-admin/logsentry/metadata.xml b/app-admin/logsentry/metadata.xml
index d635429c4472..2a617538e4fe 100644
--- a/app-admin/logsentry/metadata.xml
+++ b/app-admin/logsentry/metadata.xml
@@ -1,10 +1,6 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <name>Default assignee for orphaned packages</name>
- </maintainer>
<upstream>
<remote-id type="sourceforge">sentrytools</remote-id>
</upstream>
diff --git a/app-admin/logstalgia/metadata.xml b/app-admin/logstalgia/metadata.xml
index 38b9e1fa96bd..788aa1a7159b 100644
--- a/app-admin/logstalgia/metadata.xml
+++ b/app-admin/logstalgia/metadata.xml
@@ -1,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/app-admin/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index a853f25a4654..f65dbed31dce 100644
--- a/app-admin/logstash-bin/metadata.xml
+++ b/app-admin/logstash-bin/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>hydrapolic@gmail.com</email>
<name>Tomas Mozes</name>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="standard">standard distribution package</flag>
<flag name="all-plugins">contains the standard distribution package plus all plugins</flag>
diff --git a/app-admin/logstash-forwarder/metadata.xml b/app-admin/logstash-forwarder/metadata.xml
index 8686ab814fde..0110cb9453a3 100644
--- a/app-admin/logstash-forwarder/metadata.xml
+++ b/app-admin/logstash-forwarder/metadata.xml
@@ -1,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>aidecoe@gentoo.org</email>
<name>Amadeusz Żołnowski</name>
</maintainer>
diff --git a/app-admin/logsurfer+/metadata.xml b/app-admin/logsurfer+/metadata.xml
index 2e90b802bc7c..097975e3adc2 100644
--- a/app-admin/logsurfer+/metadata.xml
+++ b/app-admin/logsurfer+/metadata.xml
@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
</pkgmetadata>
-
diff --git a/app-admin/longrun/metadata.xml b/app-admin/longrun/metadata.xml
index caa10597adc1..01147b196d17 100644
--- a/app-admin/longrun/metadata.xml
+++ b/app-admin/longrun/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription>
Longrun is a user space utility program for controlling the Longrun
thermal and power save functionalities found in the processors made
diff --git a/app-admin/lsat/metadata.xml b/app-admin/lsat/metadata.xml
index 8bd21ed586f0..340856e64102 100644
--- a/app-admin/lsat/metadata.xml
+++ b/app-admin/lsat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<longdescription lang="en">
@@ -8,10 +8,6 @@
expanded to work with Linux distributions other than Red Hat, and checks
for kernel versions.
</longdescription>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <name>Default assignee for orphaned packages</name>
- </maintainer>
<upstream>
<remote-id type="sourceforge">usat</remote-id>
</upstream>
diff --git a/app-admin/lsyncd/metadata.xml b/app-admin/lsyncd/metadata.xml
index 8716f562d13a..0fba30b74df8 100644
--- a/app-admin/lsyncd/metadata.xml
+++ b/app-admin/lsyncd/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<upstream>
<remote-id type="google-code">lsyncd</remote-id>
<remote-id type="github">axkibe/lsyncd</remote-id>
diff --git a/app-admin/makepasswd/metadata.xml b/app-admin/makepasswd/metadata.xml
index 1884a0f56a43..48fe1ac76d44 100644
--- a/app-admin/makepasswd/metadata.xml
+++ b/app-admin/makepasswd/metadata.xml
@@ -4,7 +4,7 @@
<longdescription lang="en">
A random password generator, for all your secure password needs.
</longdescription>
- <maintainer>
+ <maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/app-admin/mate-system-tools/metadata.xml b/app-admin/mate-system-tools/metadata.xml
index a4054046af53..e03e999969af 100644
--- a/app-admin/mate-system-tools/metadata.xml
+++ b/app-admin/mate-system-tools/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>mate</herd>
+ <maintainer type="project">
+ <email>mate@gentoo.org</email>
+ <name>Gentoo MATE Desktop</name>
+ </maintainer>
<longdescription>
Formerly known as the Ximian Setup Tools, the GST are a fully
integrated set of tools aimed to make easy the job that means the
diff --git a/app-admin/matter/metadata.xml b/app-admin/matter/metadata.xml
index f5967f80f9a8..20079f794f9c 100644
--- a/app-admin/matter/metadata.xml
+++ b/app-admin/matter/metadata.xml
@@ -1,12 +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>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<use>
- <flag name='entropy'>Add Entropy support</flag>
+ <flag name="entropy">Add Entropy support</flag>
</use>
</pkgmetadata>
-
diff --git a/app-admin/mcelog/metadata.xml b/app-admin/mcelog/metadata.xml
index df75688b46dc..f3f49472c382 100644
--- a/app-admin/mcelog/metadata.xml
+++ b/app-admin/mcelog/metadata.xml
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <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>bkohler@gmail.com</email>
<name>Ben Kohler</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Starting with version 2.6.4, the Linux kernel for x86-64 no longer
decodes and logs recoverable Machine Check Exception events to the
diff --git a/app-admin/mcollective/metadata.xml b/app-admin/mcollective/metadata.xml
index c35f424e1fe5..e16aaa56698f 100644
--- a/app-admin/mcollective/metadata.xml
+++ b/app-admin/mcollective/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
</maintainer>
<use>
diff --git a/app-admin/metalog/metadata.xml b/app-admin/metalog/metadata.xml
index c0a75cd058dd..e6a099eb943e 100644
--- a/app-admin/metalog/metadata.xml
+++ b/app-admin/metalog/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
- <maintainer>
+ <maintainer type="person">
<email>vapier@gentoo.org</email>
</maintainer>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">metalog</remote-id>
</upstream>
diff --git a/app-admin/mktwpol/metadata.xml b/app-admin/mktwpol/metadata.xml
index 3bb560150e4f..5261d9f64496 100644
--- a/app-admin/mktwpol/metadata.xml
+++ b/app-admin/mktwpol/metadata.xml
@@ -1,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>nimiux@gentoo.org</email>
<name>Chema Alonso</name>
</maintainer>
diff --git a/app-admin/mms-agent/metadata.xml b/app-admin/mms-agent/metadata.xml
index 480394a26751..7ad88a816a20 100644
--- a/app-admin/mms-agent/metadata.xml
+++ b/app-admin/mms-agent/metadata.xml
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>ultrabug@gentoo.org</email>
<name>Alexys Jacob</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
<description>Proxy Maintainer. CC on bugs</description>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
MongoDB MMS agents collection.
</longdescription>
@@ -18,4 +21,3 @@
<flag name="monitoring">Install the monitoring agent</flag>
</use>
</pkgmetadata>
-
diff --git a/app-admin/mongo-tools/metadata.xml b/app-admin/mongo-tools/metadata.xml
index 0f961a2a1f9b..7a3750043489 100644
--- a/app-admin/mongo-tools/metadata.xml
+++ b/app-admin/mongo-tools/metadata.xml
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>ultrabug@gentoo.org</email>
<name>Alexys Jacob</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
<description>Proxy Maintainer. CC on bugs</description>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
MongoDB operation tools such as mongodump, mongoexport, mongorestore, bsondump...
</longdescription>
diff --git a/app-admin/monit/metadata.xml b/app-admin/monit/metadata.xml
index 8c3b2675c6f3..582e37e24b75 100644
--- a/app-admin/monit/metadata.xml
+++ b/app-admin/monit/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
diff --git a/app-admin/multilog-watch/metadata.xml b/app-admin/multilog-watch/metadata.xml
index 474ccaa45709..0a03f5d837fe 100644
--- a/app-admin/multilog-watch/metadata.xml
+++ b/app-admin/multilog-watch/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
-</maintainer>
<longdescription lang="en">This program reads logs written by multilog (part of the
daemontools package by Dan Bernstein), discards any lines matching regular
expressions in its configuration file, and mails the rest to a configured e-mail
diff --git a/app-admin/newsyslog/metadata.xml b/app-admin/newsyslog/metadata.xml
index 59e2b8f78cb5..097975e3adc2 100644
--- a/app-admin/newsyslog/metadata.xml
+++ b/app-admin/newsyslog/metadata.xml
@@ -1,8 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <name>Default assignee for orphaned packages</name>
- </maintainer>
</pkgmetadata>
diff --git a/app-admin/ngxtop/metadata.xml b/app-admin/ngxtop/metadata.xml
index b4469c3d1f96..42057453021b 100644
--- a/app-admin/ngxtop/metadata.xml
+++ b/app-admin/ngxtop/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
diff --git a/app-admin/openrc-settingsd/metadata.xml b/app-admin/openrc-settingsd/metadata.xml
index cb6c8006990a..fae0fa87a25c 100644
--- a/app-admin/openrc-settingsd/metadata.xml
+++ b/app-admin/openrc-settingsd/metadata.xml
@@ -1,11 +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>tetromino@gentoo.org</email>
<name>Alexandre Rostovtsev</name>
</maintainer>
-<herd>gnome</herd>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="systemd">Use the versions of dbus and polkit files provided by
<pkg>sys-apps/systemd</pkg></flag>
diff --git a/app-admin/packagekit-base/metadata.xml b/app-admin/packagekit-base/metadata.xml
index c88633a4288c..097d4083b51f 100644
--- a/app-admin/packagekit-base/metadata.xml
+++ b/app-admin/packagekit-base/metadata.xml
@@ -1,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>
@@ -13,4 +13,3 @@
</flag>
</use>
</pkgmetadata>
-
diff --git a/app-admin/packagekit-gtk/metadata.xml b/app-admin/packagekit-gtk/metadata.xml
index 187f7a710efe..15f07e411445 100644
--- a/app-admin/packagekit-gtk/metadata.xml
+++ b/app-admin/packagekit-gtk/metadata.xml
@@ -1,11 +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>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<use>
</use>
</pkgmetadata>
-
diff --git a/app-admin/packagekit-qt4/metadata.xml b/app-admin/packagekit-qt4/metadata.xml
index 187f7a710efe..15f07e411445 100644
--- a/app-admin/packagekit-qt4/metadata.xml
+++ b/app-admin/packagekit-qt4/metadata.xml
@@ -1,11 +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>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<use>
</use>
</pkgmetadata>
-
diff --git a/app-admin/packagekit/metadata.xml b/app-admin/packagekit/metadata.xml
index 187f7a710efe..15f07e411445 100644
--- a/app-admin/packagekit/metadata.xml
+++ b/app-admin/packagekit/metadata.xml
@@ -1,11 +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>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<use>
</use>
</pkgmetadata>
-
diff --git a/app-admin/pass/metadata.xml b/app-admin/pass/metadata.xml
index 0b30c4c8eeec..97bcbb1882f7 100644
--- a/app-admin/pass/metadata.xml
+++ b/app-admin/pass/metadata.xml
@@ -1,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>zx2c4@gentoo.org</email>
<name>Jason A. Donenfeld</name>
</maintainer>
diff --git a/app-admin/passook/metadata.xml b/app-admin/passook/metadata.xml
index 4dbf560c54a9..4b62a71e6826 100644
--- a/app-admin/passook/metadata.xml
+++ b/app-admin/passook/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
- <email>maintainer-needed@gentoo.org</email>
-</maintainer>
<longdescription>Passook is a perl script that generates passwords. You can
customize the security of the password generated.</longdescription>
</pkgmetadata>
diff --git a/app-admin/paxtest/metadata.xml b/app-admin/paxtest/metadata.xml
index 04475d3958f3..a6679d4e410e 100644
--- a/app-admin/paxtest/metadata.xml
+++ b/app-admin/paxtest/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>hardened</herd>
- <maintainer>
+ <maintainer type="person">
<email>blueness@gentoo.org</email>
<description>Primary Maintainer</description>
</maintainer>
+ <maintainer type="project">
+ <email>hardened@gentoo.org</email>
+ <name>Gentoo Hardened</name>
+ </maintainer>
<longdescription>Test suite for the PaX kernel patch
PaX is a Linux kernel patch which adds much stricter control on how memory
is being used by applications. A normal Linux kernel leaves the control to the
diff --git a/app-admin/perl-cleaner/metadata.xml b/app-admin/perl-cleaner/metadata.xml
index 1c73b29270ef..1dca59d2c4cb 100644
--- a/app-admin/perl-cleaner/metadata.xml
+++ b/app-admin/perl-cleaner/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>perl</herd>
- <maintainer>
+ <maintainer type="person">
<email>fuzzyray@gentoo.org</email>
</maintainer>
+<maintainer type="project">
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/petrovich/metadata.xml b/app-admin/petrovich/metadata.xml
index a62bf0525ea1..2bba2bc06d97 100644
--- a/app-admin/petrovich/metadata.xml
+++ b/app-admin/petrovich/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <description>This package lacks a primary herd or maintainer.</description>
- </maintainer>
<upstream>
<remote-id type="sourceforge">petrovich</remote-id>
</upstream>
diff --git a/app-admin/phpsyslogng/metadata.xml b/app-admin/phpsyslogng/metadata.xml
index afbbc8783d41..24ea077674e9 100644
--- a/app-admin/phpsyslogng/metadata.xml
+++ b/app-admin/phpsyslogng/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>matthias@dsx.at</email>
<name>Matthias Schöffmann</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">php-syslog-ng</remote-id>
</upstream>
diff --git a/app-admin/pprocm/metadata.xml b/app-admin/pprocm/metadata.xml
index 91f4e72fb544..097975e3adc2 100644
--- a/app-admin/pprocm/metadata.xml
+++ b/app-admin/pprocm/metadata.xml
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
</pkgmetadata>
diff --git a/app-admin/procinfo-ng/metadata.xml b/app-admin/procinfo-ng/metadata.xml
index dd44e0cf820c..91691a0324a8 100644
--- a/app-admin/procinfo-ng/metadata.xml
+++ b/app-admin/procinfo-ng/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>shell-tools</herd>
+ <maintainer type="project">
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">procinfo-ng</remote-id>
</upstream>
diff --git a/app-admin/procinfo/metadata.xml b/app-admin/procinfo/metadata.xml
index 91f4e72fb544..097975e3adc2 100644
--- a/app-admin/procinfo/metadata.xml
+++ b/app-admin/procinfo/metadata.xml
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
</pkgmetadata>
diff --git a/app-admin/psmon/metadata.xml b/app-admin/psmon/metadata.xml
index 81ada3d7c6ee..1595855e926c 100644
--- a/app-admin/psmon/metadata.xml
+++ b/app-admin/psmon/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <name>Default assignee for orphaned packages</name>
- </maintainer>
<longdescription lang="en">
A perl script that monitors processes to make sure they are running as
the user has intended. Will respawn dead processes and/or kill illegal
diff --git a/app-admin/puppet-agent/metadata.xml b/app-admin/puppet-agent/metadata.xml
index e0523b408eb0..aef6ae7f136c 100644
--- a/app-admin/puppet-agent/metadata.xml
+++ b/app-admin/puppet-agent/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
diff --git a/app-admin/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml
index e2e74b8fd613..2fe1abed2848 100644
--- a/app-admin/puppet-lint/metadata.xml
+++ b/app-admin/puppet-lint/metadata.xml
@@ -2,9 +2,14 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<!--
$Id$
--->
-<pkgmetadata>
-<herd>sysadmin</herd>
-<herd>ruby</herd>
+--><pkgmetadata>
+<maintainer type="project">
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+</maintainer>
+<maintainer type="project">
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+</maintainer>
<longdescription>Tim Sharpe's Puppet Linter. Enforces puppetlabs style.</longdescription>
</pkgmetadata>
diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
index 93a305eeb2e8..b6c9d23d4f0b 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -1,11 +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>prometheanfire@gentoo.org</email>
</maintainer>
- <herd>sysadmin</herd>
- <herd>ruby</herd>
+ <maintainer type="project">
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+ </maintainer>
<longdescription lang="en">
Centralised configuration management for networks
Puppet lets you centrally manage every important aspect of your system
@@ -21,9 +27,9 @@
</longdescription>
<use>
<!-- <flag name='puppetdb'>Enable puppetdb support</flag> -->
- <flag name='augeas'>Enable augeas support</flag>
- <flag name='diff'>Enable diff support</flag>
- <flag name='rrdtool'>Enable rrdtool support</flag>
- <flag name='shadow'>Enable shadow support</flag>
+ <flag name="augeas">Enable augeas support</flag>
+ <flag name="diff">Enable diff support</flag>
+ <flag name="rrdtool">Enable rrdtool support</flag>
+ <flag name="shadow">Enable shadow support</flag>
</use>
</pkgmetadata>
diff --git a/app-admin/puppetdb/metadata.xml b/app-admin/puppetdb/metadata.xml
index d238fa9a06d9..df9a6a6a1c9d 100644
--- a/app-admin/puppetdb/metadata.xml
+++ b/app-admin/puppetdb/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
diff --git a/app-admin/puppetserver/metadata.xml b/app-admin/puppetserver/metadata.xml
index e25100b94a84..13a741219359 100644
--- a/app-admin/puppetserver/metadata.xml
+++ b/app-admin/puppetserver/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
diff --git a/app-admin/pwcrypt/metadata.xml b/app-admin/pwcrypt/metadata.xml
index d4a08224d284..21dc8fdf43ff 100644
--- a/app-admin/pwcrypt/metadata.xml
+++ b/app-admin/pwcrypt/metadata.xml
@@ -1,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>hattya@gentoo.org</email>
</maintainer>
</pkgmetadata>
diff --git a/app-admin/pwgen/metadata.xml b/app-admin/pwgen/metadata.xml
index f11927632afb..03bd9479fc7d 100644
--- a/app-admin/pwgen/metadata.xml
+++ b/app-admin/pwgen/metadata.xml
@@ -1,17 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>livecd</herd>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>julian@simioni.org</email>
<name>Julian Simioni</name>
<description>Proxy-Maintainer, assign bugs</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>perfinion@gentoo.org</email>
<name>Jason Zaman</name>
</maintainer>
+ <maintainer type="project">
+ <email>livecd@gentoo.org</email>
+ <name>Gentoo LiveCD Project</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="livecd">Install init script for root password scrambling on boot</flag>
</use>
diff --git a/app-admin/pydf/metadata.xml b/app-admin/pydf/metadata.xml
index f2b4a5d1d932..dd3ef91c68ee 100644
--- a/app-admin/pydf/metadata.xml
+++ b/app-admin/pydf/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>yngwin@gentoo.org</email>
<name>Ben de Groot</name>
</maintainer>
diff --git a/app-admin/python-updater/metadata.xml b/app-admin/python-updater/metadata.xml
index de483c53568f..9e5274c5b4ae 100644
--- a/app-admin/python-updater/metadata.xml
+++ b/app-admin/python-updater/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>python</herd>
+<maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/qpage/metadata.xml b/app-admin/qpage/metadata.xml
index 05df577170f0..f61b7216e28c 100644
--- a/app-admin/qpage/metadata.xml
+++ b/app-admin/qpage/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>chutzpah@gentoo.org</email>
<name>Patrick McLean</name>
</maintainer>
diff --git a/app-admin/qtpass/metadata.xml b/app-admin/qtpass/metadata.xml
index fdc73dc12dda..e78258a6d062 100644
--- a/app-admin/qtpass/metadata.xml
+++ b/app-admin/qtpass/metadata.xml
@@ -1,12 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>spiderx@spiderx.dp.ua</email>
<name>Vladimir Pavljuchenkov</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
QtPass is a multi-platform GUI for pass, the standard unix password manager.
</longdescription>
diff --git a/app-admin/quickswitch/metadata.xml b/app-admin/quickswitch/metadata.xml
index 3c6ff9fb93de..48bacf313541 100644
--- a/app-admin/quickswitch/metadata.xml
+++ b/app-admin/quickswitch/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription>A utility for linux laptop users to use multiple network
profiles, and switch effortlessly.</longdescription>
<upstream>
diff --git a/app-admin/r10k/metadata.xml b/app-admin/r10k/metadata.xml
index bf6926ecad82..6a0cd60479a1 100644
--- a/app-admin/r10k/metadata.xml
+++ b/app-admin/r10k/metadata.xml
@@ -1,11 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>vikraman@gentoo.org</email>
<name>Vikraman Choudhury</name>
</maintainer>
- <herd>sysadmin</herd>
+ <maintainer type="project">
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
<longdescription lang="en">
r10k provides a general purpose toolset for deploying Puppet environments and modules. It implements the Puppetfile format and provides a native implementation of Puppet dynamic environments.
</longdescription>
diff --git a/app-admin/radmind/metadata.xml b/app-admin/radmind/metadata.xml
index c5692ac1bf6c..f78e8aedc331 100644
--- a/app-admin/radmind/metadata.xml
+++ b/app-admin/radmind/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<longdescription>A suite of Unix command-line tools and a server designed to remotely administer
the file systems of multiple Unix machines.</longdescription>
<upstream>
diff --git a/app-admin/ranpwd/metadata.xml b/app-admin/ranpwd/metadata.xml
index d3bec776e095..8b153cb93d0f 100644
--- a/app-admin/ranpwd/metadata.xml
+++ b/app-admin/ranpwd/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>crypto</herd>
-<longdescription></longdescription>
+<maintainer type="project">
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
+<longdescription/>
</pkgmetadata>
diff --git a/app-admin/recursos/metadata.xml b/app-admin/recursos/metadata.xml
index 73490c4cea00..11b1866ed422 100644
--- a/app-admin/recursos/metadata.xml
+++ b/app-admin/recursos/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription>
A set of script to extrac usefull info about your system and report it
in plain text or html. It can generate Grpahs using rrdtools.
diff --git a/app-admin/reportmagic/metadata.xml b/app-admin/reportmagic/metadata.xml
index 89915e672570..55b2a0ffe1ff 100644
--- a/app-admin/reportmagic/metadata.xml
+++ b/app-admin/reportmagic/metadata.xml
@@ -4,8 +4,4 @@
<longdescription lang="en">
A report generating applicaton from web site log files.
</longdescription>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <name>Default assignee for orphaned packages</name>
- </maintainer>
-</pkgmetadata>
+ </pkgmetadata>
diff --git a/app-admin/restart_services/metadata.xml b/app-admin/restart_services/metadata.xml
index ea7bd021a21e..ea6b59e79026 100644
--- a/app-admin/restart_services/metadata.xml
+++ b/app-admin/restart_services/metadata.xml
@@ -1,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/app-admin/rex/metadata.xml b/app-admin/rex/metadata.xml
index 636bea348b32..55351301847d 100644
--- a/app-admin/rex/metadata.xml
+++ b/app-admin/rex/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>erkiferenc@gmail.com</email>
<name>Ferenc Erki</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/rigo/metadata.xml b/app-admin/rigo/metadata.xml
index 187f7a710efe..15f07e411445 100644
--- a/app-admin/rigo/metadata.xml
+++ b/app-admin/rigo/metadata.xml
@@ -1,11 +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>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<use>
</use>
</pkgmetadata>
-
diff --git a/app-admin/rsyslog/metadata.xml b/app-admin/rsyslog/metadata.xml
index c032419d0bab..4fdd6c158f63 100644
--- a/app-admin/rsyslog/metadata.xml
+++ b/app-admin/rsyslog/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>ultrabug@gentoo.org</email>
<name>Ultrabug</name>
<description>Primary Maintainer</description>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>whissi@whissi.de</email>
<name>Thomas D. (Whissi)</name>
<description>Proxy-Maintainer, CC. bugs</description>
diff --git a/app-admin/sagan-rules/metadata.xml b/app-admin/sagan-rules/metadata.xml
index c9106df06540..826478aba69f 100644
--- a/app-admin/sagan-rules/metadata.xml
+++ b/app-admin/sagan-rules/metadata.xml
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
<email>andreis.vinogradovs@gmail.com</email>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>maksbotan@gentoo.org</email>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<use>
- <flag name='lognorm'>Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
+ <flag name="lognorm">Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
</use>
</pkgmetadata>
diff --git a/app-admin/sagan/metadata.xml b/app-admin/sagan/metadata.xml
index 0d04c216b673..5a7c3d4557cc 100644
--- a/app-admin/sagan/metadata.xml
+++ b/app-admin/sagan/metadata.xml
@@ -1,24 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>qnikst@gentoo.org</email>
<name>Alexander Vershilov</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
- <flag name='smtp'>Build witch SMTP (E-Mail) support</flag>
- <flag name='lognorm'>Add support for log/rules normalizations via <pkg>dev-libs/liblognorm</pkg></flag>
- <flag name='pcap'>Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
- <flag name='libdnet'>Add support for <pkg>dev-libs/libdnet</pkg></flag>
- <flag name='snort'>Add support to interact with Snort IDE using <pkg>net-analyzer/snortsam</pkg>'</flag>
+ <flag name="smtp">Build witch SMTP (E-Mail) support</flag>
+ <flag name="lognorm">Add support for log/rules normalizations via <pkg>dev-libs/liblognorm</pkg></flag>
+ <flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
+ <flag name="libdnet">Add support for <pkg>dev-libs/libdnet</pkg></flag>
+ <flag name="snort">Add support to interact with Snort IDE using <pkg>net-analyzer/snortsam</pkg>'</flag>
</use>
</pkgmetadata>
diff --git a/app-admin/salt/metadata.xml b/app-admin/salt/metadata.xml
index 70f439d4118c..a4bfde373ef0 100644
--- a/app-admin/salt/metadata.xml
+++ b/app-admin/salt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>chutzpah@gentoo.org</email>
<name>Patrick McLean</name>
</maintainer>
diff --git a/app-admin/setools/metadata.xml b/app-admin/setools/metadata.xml
index 7fb3c36d576f..8e9f11ed8b4c 100644
--- a/app-admin/setools/metadata.xml
+++ b/app-admin/setools/metadata.xml
@@ -1,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>selinux@gentoo.org</email>
<name>SELinux Team</name>
</maintainer>
diff --git a/app-admin/showconsole/metadata.xml b/app-admin/showconsole/metadata.xml
index 96a2d586367d..56c124413057 100644
--- a/app-admin/showconsole/metadata.xml
+++ b/app-admin/showconsole/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/socklog/metadata.xml b/app-admin/socklog/metadata.xml
index 96a2d586367d..56c124413057 100644
--- a/app-admin/socklog/metadata.xml
+++ b/app-admin/socklog/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/sshguard/metadata.xml b/app-admin/sshguard/metadata.xml
index 6ba8e796f6b5..d74b83ce78bc 100644
--- a/app-admin/sshguard/metadata.xml
+++ b/app-admin/sshguard/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>netmon</herd>
+ <maintainer type="project">
+ <email>netmon@gentoo.org</email>
+ <name>Gentoo network monitoring and analysis project</name>
+ </maintainer>
<use>
<flag name="ipfilter">Enable ipfilter firewall support (only for *bsd)</flag>
</use>
diff --git a/app-admin/stow/metadata.xml b/app-admin/stow/metadata.xml
index fe6e121f44e2..04f725369a73 100644
--- a/app-admin/stow/metadata.xml
+++ b/app-admin/stow/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>ewfalor@gmail.com</email>
<name>Erik Falor</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/sud/metadata.xml b/app-admin/sud/metadata.xml
index 27c217d9a05d..39516e080887 100644
--- a/app-admin/sud/metadata.xml
+++ b/app-admin/sud/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
-<maintainer>
+<maintainer type="person">
<email>lu_zero@gentoo.org</email>
</maintainer>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
<longdescription>
sud (superuser daemon) permits a user to switch to root privileges and to use a suid program in a nosuid environment. It is based on a client/server model and on the ability to pass file descriptors between processes. sud permits you to choose your authentication method, and your effective credentials will be checked by using a Unix domain socket.
</longdescription>
diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index 9116d3c7e097..de3a9b0123ff 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<longdescription lang="en">
Sudo (superuser do) allows a system administrator to give certain
users (or groups of users) the ability to run some (or all)
@@ -9,10 +12,10 @@
arguments.
</longdescription>
<use>
- <flag name='sendmail'>
+ <flag name="sendmail">
Allow sudo to send emails with sendmail.
</flag>
- <flag name='offensive'>
+ <flag name="offensive">
Let sudo print insults when the user types the wrong password.
</flag>
</use>
diff --git a/app-admin/sulfur/metadata.xml b/app-admin/sulfur/metadata.xml
index 187f7a710efe..15f07e411445 100644
--- a/app-admin/sulfur/metadata.xml
+++ b/app-admin/sulfur/metadata.xml
@@ -1,11 +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>lxnay@gentoo.org</email>
<name>Fabio Erculiani</name>
</maintainer>
<use>
</use>
</pkgmetadata>
-
diff --git a/app-admin/superadduser/metadata.xml b/app-admin/superadduser/metadata.xml
index 96a2d586367d..56c124413057 100644
--- a/app-admin/superadduser/metadata.xml
+++ b/app-admin/superadduser/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
+<maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/supernova/metadata.xml b/app-admin/supernova/metadata.xml
index e240c5fe8b82..cddfad5e8ea3 100644
--- a/app-admin/supernova/metadata.xml
+++ b/app-admin/supernova/metadata.xml
@@ -1,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>alunduil@gentoo.org</email>
<name>Alex Brandt</name>
</maintainer>
diff --git a/app-admin/supervisor/metadata.xml b/app-admin/supervisor/metadata.xml
index 0d8452b949e9..575ad348878b 100644
--- a/app-admin/supervisor/metadata.xml
+++ b/app-admin/supervisor/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
+ <maintainer type="project">
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">supervisor</remote-id>
</upstream>
diff --git a/app-admin/swatch/metadata.xml b/app-admin/swatch/metadata.xml
index 9180d4d30061..65cb32fc3e19 100644
--- a/app-admin/swatch/metadata.xml
+++ b/app-admin/swatch/metadata.xml
@@ -1,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>nimiux@gentoo.org</email>
<name>Chema Alonso</name>
</maintainer>
diff --git a/app-admin/sxid/metadata.xml b/app-admin/sxid/metadata.xml
index 66bdcb020fbe..70648c27b48f 100644
--- a/app-admin/sxid/metadata.xml
+++ b/app-admin/sxid/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- <description>This package lacks a primary herd or maintainer.</description>
- </maintainer>
<upstream>
<remote-id type="freshmeat">sxid</remote-id>
</upstream>
diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
index b3d8b65eba31..094ccd37b3fd 100644
--- a/app-admin/sysklogd/metadata.xml
+++ b/app-admin/sysklogd/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
+ <maintainer type="project">
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<use>
- <flag name='logrotate'>use app-admin/logrotate for rotating logs rather than custom cron scripts</flag>
+ <flag name="logrotate">use app-admin/logrotate for rotating logs rather than custom cron scripts</flag>
</use>
</pkgmetadata>
diff --git a/app-admin/syslog-ng/metadata.xml b/app-admin/syslog-ng/metadata.xml
index d8462695f089..149ca4378d1c 100644
--- a/app-admin/syslog-ng/metadata.xml
+++ b/app-admin/syslog-ng/metadata.xml
@@ -1,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>mr_bones_@gentoo.org</email>
<name>Michael Sterrett</name>
</maintainer>
diff --git a/app-admin/syslog-summary/metadata.xml b/app-admin/syslog-summary/metadata.xml
index 58a5df070bf2..1c01c262c6be 100644
--- a/app-admin/syslog-summary/metadata.xml
+++ b/app-admin/syslog-summary/metadata.xml
@@ -1,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>phajdan.jr@gentoo.org</email>
<name>Pawel Hajdan jr</name>
</maintainer>
diff --git a/app-admin/syslogread/metadata.xml b/app-admin/syslogread/metadata.xml
index bbae4d96569c..db2c90da05a6 100644
--- a/app-admin/syslogread/metadata.xml
+++ b/app-admin/syslogread/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription lang="en">
This package is a set of tools that are useful in receiving, analyzing,
or producing syslog messages.
diff --git a/app-admin/sysrqd/metadata.xml b/app-admin/sysrqd/metadata.xml
index a1ade138906b..b86ebd13ff32 100644
--- a/app-admin/sysrqd/metadata.xml
+++ b/app-admin/sysrqd/metadata.xml
@@ -1,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/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
index d77914bccb34..32af306ca68b 100644
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
diff --git a/app-admin/system-config-printer/metadata.xml b/app-admin/system-config-printer/metadata.xml
index aac0bbb8af46..ef7c43f6f08a 100644
--- a/app-admin/system-config-printer/metadata.xml
+++ b/app-admin/system-config-printer/metadata.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
-<herd>kde</herd>
-<maintainer>
+<maintainer type="person">
<email>reavertm@gentoo.org</email>
<name>Maciej Mrozowski</name>
</maintainer>
+<maintainer type="project">
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer type="project">
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/system-tools-backends/metadata.xml b/app-admin/system-tools-backends/metadata.xml
index a5be798c5082..a8fccb3731a6 100644
--- a/app-admin/system-tools-backends/metadata.xml
+++ b/app-admin/system-tools-backends/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>lxqt</herd>
+<maintainer type="project">
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+</maintainer>
<longdescription lang="en">
The System Tools Backends are a set of cross-platform modules for Linux,
FreeBSD, Solaris and other Unix systems. The backends provide an common DBus
diff --git a/app-admin/systemrescuecd-x86/metadata.xml b/app-admin/systemrescuecd-x86/metadata.xml
index 4b2dec1d9979..b77235f14116 100644
--- a/app-admin/systemrescuecd-x86/metadata.xml
+++ b/app-admin/systemrescuecd-x86/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>mgorny@gentoo.org</email>
<name>Michał Górny</name>
</maintainer>
diff --git a/app-admin/tenshi/metadata.xml b/app-admin/tenshi/metadata.xml
index a0fb5e875c40..1cd4d2b19887 100644
--- a/app-admin/tenshi/metadata.xml
+++ b/app-admin/tenshi/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
+<maintainer type="person">
<email>bldewolf@cpp.edu</email>
<name>Brian De Wolf</name>
</maintainer>
-<maintainer>
+<maintainer type="person">
<email>atj@pulsewidth.org.uk</email>
<name>Adam James</name>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index bcd5bf7763ec..3c5d5f26d18f 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>forensics</herd>
- <maintainer>
+ <maintainer type="person">
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
<description>Primary maintainer</description>
</maintainer>
+ <maintainer type="project">
+ <email>forensics@gentoo.org</email>
+ <name>Gentoo Forensics Project</name>
+ </maintainer>
<use>
- <flag name='ntfs'>Include the ability to read NTFS filesystems</flag>
- <flag name='reiserfs'>Include reiserfs reading ability</flag>
- <flag name='ewf'>Include ewf library</flag>
+ <flag name="ntfs">Include the ability to read NTFS filesystems</flag>
+ <flag name="reiserfs">Include reiserfs reading ability</flag>
+ <flag name="ewf">Include ewf library</flag>
</use>
</pkgmetadata>
diff --git a/app-admin/tmpreaper/metadata.xml b/app-admin/tmpreaper/metadata.xml
index 3fd73a03715e..3d217fb65213 100644
--- a/app-admin/tmpreaper/metadata.xml
+++ b/app-admin/tmpreaper/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
diff --git a/app-admin/tmpwatch/metadata.xml b/app-admin/tmpwatch/metadata.xml
index 7af4418d46d2..71b05bff0e31 100644
--- a/app-admin/tmpwatch/metadata.xml
+++ b/app-admin/tmpwatch/metadata.xml
@@ -1,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>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
diff --git a/app-admin/tripwire/metadata.xml b/app-admin/tripwire/metadata.xml
index 6e194bd6a1a8..ed45b81bfc69 100644
--- a/app-admin/tripwire/metadata.xml
+++ b/app-admin/tripwire/metadata.xml
@@ -1,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>nimiux@gentoo.org</email>
<name>Chema Alonso</name>
</maintainer>
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index 9a5941342391..cb3692902602 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/metadata.xml
@@ -1,20 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>itumaykin+gentoo@gmail.com</email>
<name>Coacher</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
- <flag name='json'>Build JSON output plugin to save packets in JSON file format.</flag>
- <flag name='pcap'>Build PCAP output plugin to save packets in libpcap file format.</flag>
- <flag name='mysql'>Build MySQL output plugin to save packets in a mysql database.</flag>
- <flag name='postgres'>Build PGSQL output plugin to save packets in a postgres database.</flag>
- <flag name='sqlite'>Build SQLITE3 output plugin to save packets in a sqlite database.</flag>
- <flag name='nflog'>Build NFLOG input plugin to support stateless packet-based logging via nfnetlink_queue.</flag>
- <flag name='nfct'>Build NFCT input plugin to support stateful flow-based logging via nf_conntrack_netlink.</flag>
- <flag name='nfacct'>Build NFACCT input plugin to support traffic accounting via nfnetlink_acct.</flag>
- <flag name='ulog'>Build ULOG input plugin to support deprecated packet-based logging via ULOG target.</flag>
+ <flag name="json">Build JSON output plugin to save packets in JSON file format.</flag>
+ <flag name="pcap">Build PCAP output plugin to save packets in libpcap file format.</flag>
+ <flag name="mysql">Build MySQL output plugin to save packets in a mysql database.</flag>
+ <flag name="postgres">Build PGSQL output plugin to save packets in a postgres database.</flag>
+ <flag name="sqlite">Build SQLITE3 output plugin to save packets in a sqlite database.</flag>
+ <flag name="nflog">Build NFLOG input plugin to support stateless packet-based logging via nfnetlink_queue.</flag>
+ <flag name="nfct">Build NFCT input plugin to support stateful flow-based logging via nf_conntrack_netlink.</flag>
+ <flag name="nfacct">Build NFACCT input plugin to support traffic accounting via nfnetlink_acct.</flag>
+ <flag name="ulog">Build ULOG input plugin to support deprecated packet-based logging via ULOG target.</flag>
</use>
</pkgmetadata>
diff --git a/app-admin/usbview/metadata.xml b/app-admin/usbview/metadata.xml
index 731225048652..2ba8e9e851e4 100644
--- a/app-admin/usbview/metadata.xml
+++ b/app-admin/usbview/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
+ <maintainer type="project">
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/usermin/metadata.xml b/app-admin/usermin/metadata.xml
index 3317d0c52e61..c5ff7ce34660 100644
--- a/app-admin/usermin/metadata.xml
+++ b/app-admin/usermin/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription>
A web-based user administration interface.
</longdescription>
diff --git a/app-admin/vault/metadata.xml b/app-admin/vault/metadata.xml
index 69a522dc6756..4ac06ef66022 100644
--- a/app-admin/vault/metadata.xml
+++ b/app-admin/vault/metadata.xml
@@ -1,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>zmedico@gentoo.org</email>
</maintainer>
<upstream>
diff --git a/app-admin/verynice/metadata.xml b/app-admin/verynice/metadata.xml
index bdc91aaef4c7..f22c2bdce834 100644
--- a/app-admin/verynice/metadata.xml
+++ b/app-admin/verynice/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>hasufell@gentoo.org</email>
</maintainer>
<longdescription lang="en">
diff --git a/app-admin/watchfolder/metadata.xml b/app-admin/watchfolder/metadata.xml
index 67a0ac76914d..696b1c71d407 100644
--- a/app-admin/watchfolder/metadata.xml
+++ b/app-admin/watchfolder/metadata.xml
@@ -1,9 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<upstream>
<remote-id type="freshmeat">watchd</remote-id>
</upstream>
diff --git a/app-admin/webalizer/metadata.xml b/app-admin/webalizer/metadata.xml
index bdcb9578b97a..dc3cf7c59bb9 100644
--- a/app-admin/webalizer/metadata.xml
+++ b/app-admin/webalizer/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
- <maintainer>
+ <maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<use>
- <flag name='xtended'>Include the 404 extension</flag>
+ <flag name="xtended">Include the 404 extension</flag>
</use>
</pkgmetadata>
diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml
index 71fb9413fd42..bf2371089c83 100644
--- a/app-admin/webapp-config/metadata.xml
+++ b/app-admin/webapp-config/metadata.xml
@@ -1,15 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>web-apps</herd>
- <maintainer>
+ <maintainer type="person">
<email>twitch153@gentoo.org</email>
<name>Devan Franchini</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer type="project">
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<use>
<flag name="portage">Propagete python_targets dependencies to sys-apps/portage</flag>
</use>
diff --git a/app-admin/webmin/metadata.xml b/app-admin/webmin/metadata.xml
index f1dbb51ddeb3..1e8cf5672e0b 100644
--- a/app-admin/webmin/metadata.xml
+++ b/app-admin/webmin/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>phobosk@fastmail.fm</email>
<name>PhobosK</name>
<description>Proxy maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">webadmin</remote-id>
</upstream>
diff --git a/app-admin/whowatch/metadata.xml b/app-admin/whowatch/metadata.xml
index a7076d48dfab..740b2bc5107f 100644
--- a/app-admin/whowatch/metadata.xml
+++ b/app-admin/whowatch/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
<pkgmetadata>
- <maintainer>
+ <maintainer type="person">
<email>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
</maintainer>
diff --git a/app-admin/xstow/metadata.xml b/app-admin/xstow/metadata.xml
index fd48bdee4f61..b3d90cf176bd 100644
--- a/app-admin/xstow/metadata.xml
+++ b/app-admin/xstow/metadata.xml
@@ -1,15 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>ewfalor@gmail.com</email>
<name>Erik Falor</name>
</maintainer>
- <maintainer>
+ <maintainer type="person">
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>A program that manages the installation of software packages.</longdescription>
<upstream>
<remote-id type="sourceforge">xstow</remote-id>
diff --git a/app-admin/xtail/metadata.xml b/app-admin/xtail/metadata.xml
index b4c2c658bbaf..c5fd4aedba8c 100644
--- a/app-admin/xtail/metadata.xml
+++ b/app-admin/xtail/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer type="person">
<email>gentoo.power@gmail.com</email>
<name>Iván</name>
</maintainer>
+<maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/yaala/metadata.xml b/app-admin/yaala/metadata.xml
index f6828df92fea..2b0fede2ea64 100644
--- a/app-admin/yaala/metadata.xml
+++ b/app-admin/yaala/metadata.xml
@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>maintainer-needed@gentoo.org</email>
- </maintainer>
<longdescription>
Yet Another Log Analyzer
</longdescription>
<use>
- <flag name='storable'>Support for persistence of Perl data structures.</flag>
+ <flag name="storable">Support for persistence of Perl data structures.</flag>
</use>
</pkgmetadata>