summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-24 23:32:36 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-24 23:58:38 +0100
commitcfd93d768e79a349f1e762b92773190295c36980 (patch)
tree2239eb163651fea5371739f3e415bc11793ec557 /app-admin
parentRemove explicit notion of maintainer-needed, for GLEP 67 (diff)
downloadgentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.gz
gentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.bz2
gentoo-cfd93d768e79a349f1e762b92773190295c36980.zip
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no maintainers in case of herds requested to be disbanded.
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/389-admin-console/metadata.xml5
-rw-r--r--app-admin/389-console/metadata.xml5
-rw-r--r--app-admin/389-ds-console/metadata.xml5
-rw-r--r--app-admin/abrt/metadata.xml5
-rw-r--r--app-admin/apg/metadata.xml5
-rw-r--r--app-admin/aws-as-tools/metadata.xml5
-rw-r--r--app-admin/aws-cw-tools/metadata.xml5
-rw-r--r--app-admin/aws-iam-tools/metadata.xml5
-rw-r--r--app-admin/aws-rds-tools/metadata.xml5
-rw-r--r--app-admin/bastille/metadata.xml5
-rw-r--r--app-admin/bcfg2/metadata.xml5
-rw-r--r--app-admin/cdist/metadata.xml5
-rw-r--r--app-admin/chrpath/metadata.xml5
-rw-r--r--app-admin/collectd/metadata.xml5
-rw-r--r--app-admin/conserver/metadata.xml5
-rw-r--r--app-admin/consolehm/metadata.xml5
-rw-r--r--app-admin/dio/metadata.xml5
-rw-r--r--app-admin/entr/metadata.xml5
-rw-r--r--app-admin/eselect/metadata.xml5
-rw-r--r--app-admin/filebeat-bin/metadata.xml5
-rw-r--r--app-admin/gam-server/metadata.xml1
-rw-r--r--app-admin/gamin/metadata.xml1
-rw-r--r--app-admin/gentoo-rsync-mirror/metadata.xml5
-rw-r--r--app-admin/geolizer/metadata.xml5
-rw-r--r--app-admin/gkrellm/metadata.xml1
-rw-r--r--app-admin/glance/metadata.xml5
-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.xml5
-rw-r--r--app-admin/haskell-updater/metadata.xml5
-rw-r--r--app-admin/integrit/metadata.xml5
-rw-r--r--app-admin/keepass/metadata.xml5
-rw-r--r--app-admin/kpcli/metadata.xml5
-rw-r--r--app-admin/lastpass-cli/metadata.xml5
-rw-r--r--app-admin/lastpass/metadata.xml5
-rw-r--r--app-admin/localepurge/metadata.xml5
-rw-r--r--app-admin/logstash-bin/metadata.xml5
-rw-r--r--app-admin/mate-system-tools/metadata.xml5
-rw-r--r--app-admin/mcelog/metadata.xml5
-rw-r--r--app-admin/metalog/metadata.xml5
-rw-r--r--app-admin/mms-agent/metadata.xml5
-rw-r--r--app-admin/mongo-tools/metadata.xml5
-rw-r--r--app-admin/openrc-settingsd/metadata.xml5
-rw-r--r--app-admin/paxtest/metadata.xml5
-rw-r--r--app-admin/perl-cleaner/metadata.xml5
-rw-r--r--app-admin/phpsyslogng/metadata.xml5
-rw-r--r--app-admin/procinfo-ng/metadata.xml5
-rw-r--r--app-admin/puppet-lint/metadata.xml10
-rw-r--r--app-admin/puppet/metadata.xml10
-rw-r--r--app-admin/pwgen/metadata.xml10
-rw-r--r--app-admin/python-updater/metadata.xml5
-rw-r--r--app-admin/qtpass/metadata.xml5
-rw-r--r--app-admin/r10k/metadata.xml5
-rw-r--r--app-admin/radmind/metadata.xml5
-rw-r--r--app-admin/ranpwd/metadata.xml5
-rw-r--r--app-admin/rex/metadata.xml5
-rw-r--r--app-admin/sagan-rules/metadata.xml5
-rw-r--r--app-admin/sagan/metadata.xml5
-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.xml5
-rw-r--r--app-admin/sud/metadata.xml5
-rw-r--r--app-admin/sudo/metadata.xml5
-rw-r--r--app-admin/superadduser/metadata.xml5
-rw-r--r--app-admin/supervisor/metadata.xml5
-rw-r--r--app-admin/sysklogd/metadata.xml5
-rw-r--r--app-admin/system-config-printer/metadata.xml10
-rw-r--r--app-admin/system-tools-backends/metadata.xml5
-rw-r--r--app-admin/tenshi/metadata.xml5
-rw-r--r--app-admin/testdisk/metadata.xml5
-rw-r--r--app-admin/ulogd/metadata.xml5
-rw-r--r--app-admin/usbview/metadata.xml5
-rw-r--r--app-admin/webalizer/metadata.xml5
-rw-r--r--app-admin/webapp-config/metadata.xml5
-rw-r--r--app-admin/webmin/metadata.xml5
-rw-r--r--app-admin/xstow/metadata.xml5
-rw-r--r--app-admin/xtail/metadata.xml5
78 files changed, 316 insertions, 82 deletions
diff --git a/app-admin/389-admin-console/metadata.xml b/app-admin/389-admin-console/metadata.xml
index 838c00a4a448..6cb58e33adfe 100644
--- a/app-admin/389-admin-console/metadata.xml
+++ b/app-admin/389-admin-console/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>java</herd>
+<maintainer>
+ <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 838c00a4a448..6cb58e33adfe 100644
--- a/app-admin/389-console/metadata.xml
+++ b/app-admin/389-console/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>java</herd>
+<maintainer>
+ <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 838c00a4a448..6cb58e33adfe 100644
--- a/app-admin/389-ds-console/metadata.xml
+++ b/app-admin/389-ds-console/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>java</herd>
+<maintainer>
+ <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..d27adefecf34 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>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/apg/metadata.xml b/app-admin/apg/metadata.xml
index 9cf9bbc84c78..66a2081f4d91 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>
<email>DuPol@gmx.de</email>
<name>Dustin Polke</name>
<description>Proxy Maintainer. CC him on bugs.</description>
</maintainer>
+<maintainer>
+ <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/aws-as-tools/metadata.xml b/app-admin/aws-as-tools/metadata.xml
index 1a971abe53b5..23c553df65e0 100644
--- a/app-admin/aws-as-tools/metadata.xml
+++ b/app-admin/aws-as-tools/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>lxnay@gentoo.org</email>
</maintainer>
@@ -10,4 +9,8 @@
<name>Sergey Zhuga</name>
<description>Proxy maintainers. CC him on bugs</description>
</maintainer>
+<maintainer>
+ <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..23c553df65e0 100644
--- a/app-admin/aws-cw-tools/metadata.xml
+++ b/app-admin/aws-cw-tools/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>lxnay@gentoo.org</email>
</maintainer>
@@ -10,4 +9,8 @@
<name>Sergey Zhuga</name>
<description>Proxy maintainers. CC him on bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/aws-iam-tools/metadata.xml b/app-admin/aws-iam-tools/metadata.xml
index 1a971abe53b5..23c553df65e0 100644
--- a/app-admin/aws-iam-tools/metadata.xml
+++ b/app-admin/aws-iam-tools/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>lxnay@gentoo.org</email>
</maintainer>
@@ -10,4 +9,8 @@
<name>Sergey Zhuga</name>
<description>Proxy maintainers. CC him on bugs</description>
</maintainer>
+<maintainer>
+ <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..23c553df65e0 100644
--- a/app-admin/aws-rds-tools/metadata.xml
+++ b/app-admin/aws-rds-tools/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>lxnay@gentoo.org</email>
</maintainer>
@@ -10,4 +9,8 @@
<name>Sergey Zhuga</name>
<description>Proxy maintainers. CC him on bugs</description>
</maintainer>
+<maintainer>
+ <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..a837415c65ad 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>
+ <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 5647529c2f0b..1c2bf9fdfc8f 100644
--- a/app-admin/bcfg2/metadata.xml
+++ b/app-admin/bcfg2/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
@@ -11,6 +10,10 @@
<email>mjinks@uchicago.edu</email>
<name>Michael Jinks</name>
</maintainer>
+<maintainer>
+ <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>
diff --git a/app-admin/cdist/metadata.xml b/app-admin/cdist/metadata.xml
index 688513dd0ab0..71c62e967233 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>
<email>nerve@ipwar.ch</email>
<name>Daniel Heule</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <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/chrpath/metadata.xml b/app-admin/chrpath/metadata.xml
index 66cf774185dd..d76976705498 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>
<email>grobian@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 5b48ac87d7e3..8e894a896dc8 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/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>
<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>
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
<description>Proxied Maintainer</description>
</maintainer>
+ <maintainer>
+ <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>
diff --git a/app-admin/conserver/metadata.xml b/app-admin/conserver/metadata.xml
index c3a63c8f01d2..721bd857f02d 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>
<email>dan@danweeks.net</email>
<name>Dan Weeks</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <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..d7caf7d3b1d4 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>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/dio/metadata.xml b/app-admin/dio/metadata.xml
index 67cb71579bde..c07d60ec1ee0 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>
<email>donaldbmcintosh@yahoo.co.uk</email>
<name>Donald McIntosh</name>
</maintainer>
+ <maintainer>
+ <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/entr/metadata.xml b/app-admin/entr/metadata.xml
index 0a5d54b123ef..71ab4419cfb2 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>
<email>monsieurp@gentoo.org</email>
<name>Patrice Clement</name>
</maintainer>
+<maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/eselect/metadata.xml b/app-admin/eselect/metadata.xml
index dc5dc4fc2cc8..c7b22287dea6 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>
+ <email>eselect@gentoo.org</email>
+ <name>eselect configuration and management tool</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/filebeat-bin/metadata.xml b/app-admin/filebeat-bin/metadata.xml
index fe6f9ccf1a7e..e782c4f79125 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>
<email>hydrapolic@gmail.com</email>
<name>Tomas Mozes</name>
<description>Proxy maintainer</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/gam-server/metadata.xml b/app-admin/gam-server/metadata.xml
index 9879e83b822e..a0f4da6903dc 100644
--- a/app-admin/gam-server/metadata.xml
+++ b/app-admin/gam-server/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/app-admin/gamin/metadata.xml b/app-admin/gamin/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/app-admin/gamin/metadata.xml
+++ b/app-admin/gamin/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/app-admin/gentoo-rsync-mirror/metadata.xml b/app-admin/gentoo-rsync-mirror/metadata.xml
index 2a2586cc30ca..51811d92688c 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>
<email>rgkmg25@gmail.com</email>
<name>Robert Kowalski</name>
</maintainer>
+<maintainer>
+ <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..0496fdd3267f 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>
+ <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..befcb5266d14 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>
<email>prometheanfire@gentoo.org</email>
<name>Matthew Thode</name>
</maintainer>
+ <maintainer>
+ <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..fe3dc94b2bcd 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>
+ <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..c9e13ee6a3c9 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>
+ <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 878ec1961863..a8981d663fac 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>BM-2cTVBXjxdVtEQCycBQjMxszLsgTNVujvM5@bitmessage.ch</email>
<name>Samuel Bauer</name>
@@ -10,6 +9,10 @@
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
+ <maintainer>
+ <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/haskell-updater/metadata.xml b/app-admin/haskell-updater/metadata.xml
index ddb2b453cd1f..320f819da1e3 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>
+ <email>haskell@gentoo.org</email>
+ <name>Gentoo Haskell</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/integrit/metadata.xml b/app-admin/integrit/metadata.xml
index f22d1250efc5..74a1c23145da 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>
+ <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/keepass/metadata.xml b/app-admin/keepass/metadata.xml
index b9e748b54d3c..87a1f1f7f512 100644
--- a/app-admin/keepass/metadata.xml
+++ b/app-admin/keepass/metadata.xml
@@ -9,7 +9,10 @@
<email>kensington@gentoo.org</email>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <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/kpcli/metadata.xml b/app-admin/kpcli/metadata.xml
index 87d50c975d7e..46fe35375dfe 100644
--- a/app-admin/kpcli/metadata.xml
+++ b/app-admin/kpcli/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>perl</herd>
+ <maintainer>
+ <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..d4665ae0b87f 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>
<email>gokturk@binghamton.edu</email>
<name>Gokturk 'gokturk' Yuksek</name>
</maintainer>
+ <maintainer>
+ <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..5777da872c44 100644
--- a/app-admin/lastpass/metadata.xml
+++ b/app-admin/lastpass/metadata.xml
@@ -5,12 +5,15 @@
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
</maintainer>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>gokturk@binghamton.edu</email>
<name>Gokturk Yuksek</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer>
+ <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/localepurge/metadata.xml b/app-admin/localepurge/metadata.xml
index 2d52d39e1dca..3e755f763438 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>
<email>wimmuskee@gmail.com</email>
<name>Wim Muskee</name>
</maintainer>
+<maintainer>
+ <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/logstash-bin/metadata.xml b/app-admin/logstash-bin/metadata.xml
index a853f25a4654..577c553231bf 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>
<email>hydrapolic@gmail.com</email>
<name>Tomas Mozes</name>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer>
+ <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/mate-system-tools/metadata.xml b/app-admin/mate-system-tools/metadata.xml
index a4054046af53..64acb15db30d 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>
+ <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/mcelog/metadata.xml b/app-admin/mcelog/metadata.xml
index df75688b46dc..baff5b083a1c 100644
--- a/app-admin/mcelog/metadata.xml
+++ b/app-admin/mcelog/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
@@ -12,6 +11,10 @@
<name>Ben Kohler</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <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/metalog/metadata.xml b/app-admin/metalog/metadata.xml
index c0a75cd058dd..e9f4563386cc 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>
<email>vapier@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <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/mms-agent/metadata.xml b/app-admin/mms-agent/metadata.xml
index fbeacea0e583..af732331eb4d 100644
--- a/app-admin/mms-agent/metadata.xml
+++ b/app-admin/mms-agent/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>ultrabug@gentoo.org</email>
<name>Alexys Jacob</name>
@@ -11,6 +10,10 @@
<name>Johan Bergström</name>
<description>Proxy Maintainer. CC on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
MongoDB MMS agents collection.
</longdescription>
diff --git a/app-admin/mongo-tools/metadata.xml b/app-admin/mongo-tools/metadata.xml
index 0f961a2a1f9b..9a3cb144c23e 100644
--- a/app-admin/mongo-tools/metadata.xml
+++ b/app-admin/mongo-tools/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>ultrabug@gentoo.org</email>
<name>Alexys Jacob</name>
@@ -11,6 +10,10 @@
<name>Johan Bergström</name>
<description>Proxy Maintainer. CC on bugs</description>
</maintainer>
+ <maintainer>
+ <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/openrc-settingsd/metadata.xml b/app-admin/openrc-settingsd/metadata.xml
index cb6c8006990a..59b4427196e3 100644
--- a/app-admin/openrc-settingsd/metadata.xml
+++ b/app-admin/openrc-settingsd/metadata.xml
@@ -5,7 +5,10 @@
<email>tetromino@gentoo.org</email>
<name>Alexandre Rostovtsev</name>
</maintainer>
-<herd>gnome</herd>
+<maintainer>
+ <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/paxtest/metadata.xml b/app-admin/paxtest/metadata.xml
index 04475d3958f3..5ece4cfbb70c 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>
<email>blueness@gentoo.org</email>
<description>Primary Maintainer</description>
</maintainer>
+ <maintainer>
+ <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..68e036fb4760 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>
<email>fuzzyray@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/phpsyslogng/metadata.xml b/app-admin/phpsyslogng/metadata.xml
index afbbc8783d41..bfe273b3f162 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>
<email>matthias@dsx.at</email>
<name>Matthias Schöffmann</name>
</maintainer>
+ <maintainer>
+ <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/procinfo-ng/metadata.xml b/app-admin/procinfo-ng/metadata.xml
index dd44e0cf820c..bc58f4d2bc5e 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>
+ <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/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml
index 428baa80ceb8..b3e50e1ac0b1 100644
--- a/app-admin/puppet-lint/metadata.xml
+++ b/app-admin/puppet-lint/metadata.xml
@@ -3,7 +3,13 @@
<!--
$Id$
--><pkgmetadata>
-<herd>sysadmin</herd>
-<herd>ruby</herd>
+<maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+</maintainer>
+<maintainer>
+ <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 8ce3d934457c..afa7d6134445 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -4,8 +4,14 @@
<maintainer>
<email>prometheanfire@gentoo.org</email>
</maintainer>
- <herd>sysadmin</herd>
- <herd>ruby</herd>
+ <maintainer>
+ <email>sysadmin@gentoo.org</email>
+ <name>Gentoo Sysadmin Project</name>
+ </maintainer>
+ <maintainer>
+ <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
diff --git a/app-admin/pwgen/metadata.xml b/app-admin/pwgen/metadata.xml
index f11927632afb..a3ec5e3b39a5 100644
--- a/app-admin/pwgen/metadata.xml
+++ b/app-admin/pwgen/metadata.xml
@@ -1,8 +1,6 @@
<?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>
<email>julian@simioni.org</email>
<name>Julian Simioni</name>
@@ -12,6 +10,14 @@
<email>perfinion@gentoo.org</email>
<name>Jason Zaman</name>
</maintainer>
+ <maintainer>
+ <email>livecd@gentoo.org</email>
+ <name>Gentoo LiveCD Project</name>
+ </maintainer>
+ <maintainer>
+ <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/python-updater/metadata.xml b/app-admin/python-updater/metadata.xml
index de483c53568f..87d7825812f4 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>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/qtpass/metadata.xml b/app-admin/qtpass/metadata.xml
index 20196e781a7b..bb520aad7cdd 100644
--- a/app-admin/qtpass/metadata.xml
+++ b/app-admin/qtpass/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>
<email>spiderx@spiderx.dp.ua</email>
<name>Vladimir Pavljuchenkov</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer>
+ <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/r10k/metadata.xml b/app-admin/r10k/metadata.xml
index f60aedb32c1c..8cf82d0de50f 100644
--- a/app-admin/r10k/metadata.xml
+++ b/app-admin/r10k/metadata.xml
@@ -5,7 +5,10 @@
<email>vikraman@gentoo.org</email>
<name>Vikraman Choudhury</name>
</maintainer>
- <herd>sysadmin</herd>
+ <maintainer>
+ <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..a611cc095e59 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>
+ <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 06ed5d761a90..4198e0c9c3d3 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>
+<maintainer>
+ <email>crypto@gentoo.org</email>
+ <name>Crypto</name>
+</maintainer>
<longdescription/>
</pkgmetadata>
diff --git a/app-admin/rex/metadata.xml b/app-admin/rex/metadata.xml
index 636bea348b32..6beb73a8ad04 100644
--- a/app-admin/rex/metadata.xml
+++ b/app-admin/rex/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>erkiferenc@gmail.com</email>
<name>Ferenc Erki</name>
@@ -10,4 +9,8 @@
<email>patrick@gentoo.org</email>
<name>Patrick Lauer</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/sagan-rules/metadata.xml b/app-admin/sagan-rules/metadata.xml
index 7d27bc09fbd5..864354577d85 100644
--- a/app-admin/sagan-rules/metadata.xml
+++ b/app-admin/sagan-rules/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>
<email>andreis.vinogradovs@gmail.com</email>
</maintainer>
<maintainer>
<email>maksbotan@gentoo.org</email>
</maintainer>
+<maintainer>
+ <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>
</use>
diff --git a/app-admin/sagan/metadata.xml b/app-admin/sagan/metadata.xml
index c980dc4295fb..36cefe2b733c 100644
--- a/app-admin/sagan/metadata.xml
+++ b/app-admin/sagan/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
@@ -14,6 +13,10 @@
<email>qnikst@gentoo.org</email>
<name>Alexander Vershilov</name>
</maintainer>
+ <maintainer>
+ <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>
diff --git a/app-admin/showconsole/metadata.xml b/app-admin/showconsole/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 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>
+ <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..c9e13ee6a3c9 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>
+ <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..8ce9a8f243bc 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>
+ <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..ad09ed6ce10b 100644
--- a/app-admin/stow/metadata.xml
+++ b/app-admin/stow/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>ewfalor@gmail.com</email>
<name>Erik Falor</name>
@@ -10,4 +9,8 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+<maintainer>
+ <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..2d8a9d901e20 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>
<email>lu_zero@gentoo.org</email>
</maintainer>
+<maintainer>
+ <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 535e864c6bed..080e5d018cae 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>
+ <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)
diff --git a/app-admin/superadduser/metadata.xml b/app-admin/superadduser/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 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>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-admin/supervisor/metadata.xml b/app-admin/supervisor/metadata.xml
index 0d8452b949e9..697f4cb91b9a 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>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">supervisor</remote-id>
</upstream>
diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
index 5a2dd624378e..5d455eb770ce 100644
--- a/app-admin/sysklogd/metadata.xml
+++ b/app-admin/sysklogd/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>
+ <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>
</use>
diff --git a/app-admin/system-config-printer/metadata.xml b/app-admin/system-config-printer/metadata.xml
index aac0bbb8af46..574ef83a6ad5 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>
<email>reavertm@gentoo.org</email>
<name>Maciej Mrozowski</name>
</maintainer>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+ <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..2576b36202d8 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>
+ <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/tenshi/metadata.xml b/app-admin/tenshi/metadata.xml
index a0fb5e875c40..1117781f6d80 100644
--- a/app-admin/tenshi/metadata.xml
+++ b/app-admin/tenshi/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>bldewolf@cpp.edu</email>
<name>Brian De Wolf</name>
@@ -10,4 +9,8 @@
<email>atj@pulsewidth.org.uk</email>
<name>Adam James</name>
</maintainer>
+<maintainer>
+ <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 1cb2f3841556..890e06741eb3 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/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>forensics</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
<name>Robin H. Johnson</name>
<description>Primary maintainer</description>
</maintainer>
+ <maintainer>
+ <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>
diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index 800262ca17b7..87260d8c6491 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/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>
<email>itumaykin+gentoo@gmail.com</email>
<name>Coacher</name>
</maintainer>
+ <maintainer>
+ <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>
diff --git a/app-admin/usbview/metadata.xml b/app-admin/usbview/metadata.xml
index 731225048652..90e28ed17f63 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>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-admin/webalizer/metadata.xml b/app-admin/webalizer/metadata.xml
index 8b8468ce778d..11bfbef8f3f1 100644
--- a/app-admin/webalizer/metadata.xml
+++ b/app-admin/webalizer/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>web-apps</herd>
<maintainer>
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<use>
<flag name="xtended">Include the 404 extension</flag>
</use>
diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml
index 173f01fa5443..032965b0cd60 100644
--- a/app-admin/webapp-config/metadata.xml
+++ b/app-admin/webapp-config/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>web-apps</herd>
<maintainer>
<email>twitch153@gentoo.org</email>
<name>Devan Franchini</name>
@@ -10,6 +9,10 @@
<email>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
</maintainer>
+ <maintainer>
+ <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..2b4337cc3469 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>
<email>phobosk@fastmail.fm</email>
<name>PhobosK</name>
<description>Proxy maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <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/xstow/metadata.xml b/app-admin/xstow/metadata.xml
index fd48bdee4f61..9a416ffe117b 100644
--- a/app-admin/xstow/metadata.xml
+++ b/app-admin/xstow/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>ewfalor@gmail.com</email>
<name>Erik Falor</name>
@@ -10,6 +9,10 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+ <maintainer>
+ <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..b1f61e9b3aef 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>
<email>gentoo.power@gmail.com</email>
<name>Iván</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>