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-misc
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-misc')
-rw-r--r--app-misc/abduco/metadata.xml5
-rw-r--r--app-misc/abook/metadata.xml5
-rw-r--r--app-misc/activylircd/metadata.xml6
-rw-r--r--app-misc/astrolog-ephemeris/metadata.xml6
-rw-r--r--app-misc/banner/metadata.xml5
-rw-r--r--app-misc/beep/metadata.xml5
-rw-r--r--app-misc/bfm/metadata.xml5
-rw-r--r--app-misc/bfr/metadata.xml5
-rw-r--r--app-misc/bijiben/metadata.xml5
-rw-r--r--app-misc/binclock/metadata.xml5
-rw-r--r--app-misc/birthday/metadata.xml5
-rw-r--r--app-misc/boxes/metadata.xml5
-rw-r--r--app-misc/byobu/metadata.xml5
-rw-r--r--app-misc/c_rehash/metadata.xml5
-rw-r--r--app-misc/ca-certificates/metadata.xml5
-rw-r--r--app-misc/calendar/metadata.xml5
-rw-r--r--app-misc/cdargs/metadata.xml5
-rw-r--r--app-misc/chkcrontab/metadata.xml5
-rw-r--r--app-misc/ckermit/metadata.xml5
-rw-r--r--app-misc/color/metadata.xml5
-rw-r--r--app-misc/colordiff/metadata.xml5
-rw-r--r--app-misc/countrycodes/metadata.xml5
-rw-r--r--app-misc/cw/metadata.xml5
-rw-r--r--app-misc/cwiid/metadata.xml5
-rw-r--r--app-misc/delay/metadata.xml5
-rw-r--r--app-misc/detachtty/metadata.xml10
-rw-r--r--app-misc/detox/metadata.xml5
-rw-r--r--app-misc/devtodo/metadata.xml5
-rw-r--r--app-misc/dtach/metadata.xml5
-rw-r--r--app-misc/editor-wrapper/metadata.xml10
-rw-r--r--app-misc/eid-viewer-bin/metadata.xml5
-rw-r--r--app-misc/elasticsearch/metadata.xml5
-rw-r--r--app-misc/email2trac/metadata.xml10
-rw-r--r--app-misc/emelfm2/metadata.xml5
-rw-r--r--app-misc/fdupes/metadata.xml5
-rw-r--r--app-misc/fdutils/metadata.xml1
-rw-r--r--app-misc/freemind/metadata.xml5
-rw-r--r--app-misc/fsniper/metadata.xml5
-rw-r--r--app-misc/gcal/metadata.xml5
-rw-r--r--app-misc/gentoo/metadata.xml5
-rw-r--r--app-misc/geoclue/metadata.xml10
-rw-r--r--app-misc/getopt/metadata.xml10
-rw-r--r--app-misc/gnote/metadata.xml5
-rw-r--r--app-misc/gnuit/metadata.xml5
-rw-r--r--app-misc/goobook/metadata.xml5
-rw-r--r--app-misc/grc/metadata.xml5
-rw-r--r--app-misc/gtypist/metadata.xml5
-rw-r--r--app-misc/hatools/metadata.xml5
-rw-r--r--app-misc/hilite/metadata.xml5
-rw-r--r--app-misc/hivex/metadata.xml5
-rw-r--r--app-misc/ifp-line/metadata.xml5
-rw-r--r--app-misc/iguanaIR/metadata.xml1
-rw-r--r--app-misc/inputlircd/metadata.xml1
-rw-r--r--app-misc/irtrans-irclient/metadata.xml5
-rw-r--r--app-misc/irtrans-irserver/metadata.xml5
-rw-r--r--app-misc/jail/metadata.xml5
-rw-r--r--app-misc/jitac/metadata.xml5
-rw-r--r--app-misc/jot/metadata.xml5
-rw-r--r--app-misc/joymouse/metadata.xml5
-rw-r--r--app-misc/kanatest/metadata.xml5
-rw-r--r--app-misc/lcd-stuff/metadata.xml5
-rw-r--r--app-misc/leave/metadata.xml5
-rw-r--r--app-misc/ledit/metadata.xml5
-rw-r--r--app-misc/lirc/metadata.xml1
-rw-r--r--app-misc/livecd-tools/metadata.xml5
-rw-r--r--app-misc/logitech-applet/metadata.xml5
-rw-r--r--app-misc/lxsplit/metadata.xml5
-rw-r--r--app-misc/matew/metadata.xml5
-rw-r--r--app-misc/mc/metadata.xml5
-rw-r--r--app-misc/media-player-info/metadata.xml5
-rw-r--r--app-misc/metromap/metadata.xml5
-rw-r--r--app-misc/mime-types/metadata.xml5
-rw-r--r--app-misc/mmv/metadata.xml5
-rw-r--r--app-misc/mtail/metadata.xml5
-rw-r--r--app-misc/ondir/metadata.xml5
-rw-r--r--app-misc/oneko/metadata.xml5
-rw-r--r--app-misc/pip/metadata.xml5
-rw-r--r--app-misc/ps3pf_utils/metadata.xml5
-rw-r--r--app-misc/pwsafe/metadata.xml5
-rw-r--r--app-misc/realpath/metadata.xml5
-rw-r--r--app-misc/regionset/metadata.xml1
-rw-r--r--app-misc/remind/metadata.xml5
-rw-r--r--app-misc/reptyr/metadata.xml5
-rw-r--r--app-misc/rl/metadata.xml5
-rw-r--r--app-misc/rlwrap/metadata.xml5
-rw-r--r--app-misc/roadnav/metadata.xml5
-rw-r--r--app-misc/rox-filer/metadata.xml5
-rw-r--r--app-misc/screen/metadata.xml5
-rw-r--r--app-misc/screenie/metadata.xml5
-rw-r--r--app-misc/slashtime/metadata.xml5
-rw-r--r--app-misc/spacenavd/metadata.xml5
-rw-r--r--app-misc/splitvt/metadata.xml5
-rw-r--r--app-misc/strigi/metadata.xml5
-rw-r--r--app-misc/subsurface/metadata.xml5
-rw-r--r--app-misc/supercat/metadata.xml5
-rw-r--r--app-misc/symlinks/metadata.xml5
-rw-r--r--app-misc/tasque/metadata.xml5
-rw-r--r--app-misc/tdl/metadata.xml5
-rw-r--r--app-misc/timestamp/metadata.xml5
-rw-r--r--app-misc/tmux/metadata.xml5
-rw-r--r--app-misc/tomboy/metadata.xml5
-rw-r--r--app-misc/tpipe/metadata.xml5
-rw-r--r--app-misc/tracker/metadata.xml5
-rw-r--r--app-misc/trash-cli/metadata.xml5
-rw-r--r--app-misc/unfoo/metadata.xml5
-rw-r--r--app-misc/usbirboy/metadata.xml1
-rw-r--r--app-misc/utimer/metadata.xml5
-rw-r--r--app-misc/vcp/metadata.xml5
-rw-r--r--app-misc/vlock/metadata.xml5
-rw-r--r--app-misc/vzstats/metadata.xml5
-rw-r--r--app-misc/wcd/metadata.xml5
-rw-r--r--app-misc/when/metadata.xml5
-rw-r--r--app-misc/workrave/metadata.xml5
-rw-r--r--app-misc/wyrd/metadata.xml5
-rw-r--r--app-misc/yworklog/metadata.xml5
-rw-r--r--app-misc/zisofs-tools/metadata.xml1
116 files changed, 456 insertions, 123 deletions
diff --git a/app-misc/abduco/metadata.xml b/app-misc/abduco/metadata.xml
index e062d001b11..6d631a3d8f7 100644
--- a/app-misc/abduco/metadata.xml
+++ b/app-misc/abduco/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>hendrik@consetetur.de</email>
<name>Hendrik v. Raven (lorem_ipsum)</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 lang="en">
abduco provides session management i.e. it allows programs to be run independently from its controlling terminal. That is programs can be detached - run in the background - and then later reattached. Together with dvtm it provides a simpler and cleaner alternative to tmux or screen.
</longdescription>
diff --git a/app-misc/abook/metadata.xml b/app-misc/abook/metadata.xml
index d749e27f51b..4089996a8aa 100644
--- a/app-misc/abook/metadata.xml
+++ b/app-misc/abook/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>net-mail</herd>
+ <maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
<longdescription>Abook is a text-based addressbook program designed to use with mutt mail client.</longdescription>
<upstream>
<remote-id type="sourceforge">abook</remote-id>
diff --git a/app-misc/activylircd/metadata.xml b/app-misc/activylircd/metadata.xml
index 332e9ad12d8..cc1cf8eb4d1 100644
--- a/app-misc/activylircd/metadata.xml
+++ b/app-misc/activylircd/metadata.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>vdr@helmutauer.de</email>
<name>Helmut Auer</name>
<description>Proxy maintaining through zzam</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/astrolog-ephemeris/metadata.xml b/app-misc/astrolog-ephemeris/metadata.xml
index ccfb996d72e..8eaa54f3351 100644
--- a/app-misc/astrolog-ephemeris/metadata.xml
+++ b/app-misc/astrolog-ephemeris/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>sci</herd>
-
<maintainer>
<email>george@gentoo.org</email>
<name>George Shapovalov</name>
@@ -12,4 +10,8 @@
</description>
</maintainer>
+<maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/banner/metadata.xml b/app-misc/banner/metadata.xml
index 73122504865..90e28ed17f6 100644
--- a/app-misc/banner/metadata.xml
+++ b/app-misc/banner/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-misc/beep/metadata.xml b/app-misc/beep/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-misc/beep/metadata.xml
+++ b/app-misc/beep/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/bfm/metadata.xml b/app-misc/bfm/metadata.xml
index 05f7df690ca..dc71c9fa338 100644
--- a/app-misc/bfm/metadata.xml
+++ b/app-misc/bfm/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>java</herd>
+<maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
<longdescription>
BFM, the Brutal File Manager is a combined file manager and first
diff --git a/app-misc/bfr/metadata.xml b/app-misc/bfr/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-misc/bfr/metadata.xml
+++ b/app-misc/bfr/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/bijiben/metadata.xml b/app-misc/bijiben/metadata.xml
index 8a8cf37ba41..af75837c8c6 100644
--- a/app-misc/bijiben/metadata.xml
+++ b/app-misc/bijiben/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
</use>
diff --git a/app-misc/binclock/metadata.xml b/app-misc/binclock/metadata.xml
index dbf8947073a..e54c60ce3af 100644
--- a/app-misc/binclock/metadata.xml
+++ b/app-misc/binclock/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<longdescription>binclock displays a binary clock in your terminal.</longdescription>
</pkgmetadata>
diff --git a/app-misc/birthday/metadata.xml b/app-misc/birthday/metadata.xml
index 66d5c054373..c18d7dbe26c 100644
--- a/app-misc/birthday/metadata.xml
+++ b/app-misc/birthday/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">birthday</remote-id>
</upstream>
diff --git a/app-misc/boxes/metadata.xml b/app-misc/boxes/metadata.xml
index 940c759eeb8..45a036af24c 100644
--- a/app-misc/boxes/metadata.xml
+++ b/app-misc/boxes/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="github">ascii-boxes/boxes</remote-id>
</upstream>
diff --git a/app-misc/byobu/metadata.xml b/app-misc/byobu/metadata.xml
index 1c7747e4094..0c02297275d 100644
--- a/app-misc/byobu/metadata.xml
+++ b/app-misc/byobu/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>
<longdescription>
Byobu is a GPLv3 open source text-based window manager and terminal multiplexer.
It was originally designed to provide elegant enhancements to the otherwise
diff --git a/app-misc/c_rehash/metadata.xml b/app-misc/c_rehash/metadata.xml
index 652357b5c42..b843c6c14b9 100644
--- a/app-misc/c_rehash/metadata.xml
+++ b/app-misc/c_rehash/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>base-system</herd>
<maintainer>
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
</maintainer>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/ca-certificates/metadata.xml b/app-misc/ca-certificates/metadata.xml
index e6feee22786..a3377c56d17 100644
--- a/app-misc/ca-certificates/metadata.xml
+++ b/app-misc/ca-certificates/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="cacert">
Include root certs from CAcert (http://www.cacert.org/) and
diff --git a/app-misc/calendar/metadata.xml b/app-misc/calendar/metadata.xml
index a0c9932e6ed..1651271178f 100644
--- a/app-misc/calendar/metadata.xml
+++ b/app-misc/calendar/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">bsdcalendar</remote-id>
</upstream>
diff --git a/app-misc/cdargs/metadata.xml b/app-misc/cdargs/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-misc/cdargs/metadata.xml
+++ b/app-misc/cdargs/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/chkcrontab/metadata.xml b/app-misc/chkcrontab/metadata.xml
index d8aa7d5ac92..1b88be0ced1 100644
--- a/app-misc/chkcrontab/metadata.xml
+++ b/app-misc/chkcrontab/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>
<upstream>
<remote-id type="github">lyda/chkcrontab</remote-id>
</upstream>
diff --git a/app-misc/ckermit/metadata.xml b/app-misc/ckermit/metadata.xml
index 8dc8f03abd0..27dd36968d6 100644
--- a/app-misc/ckermit/metadata.xml
+++ b/app-misc/ckermit/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>embedded</herd>
+ <maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/color/metadata.xml b/app-misc/color/metadata.xml
index c1bead0461d..4885f232b53 100644
--- a/app-misc/color/metadata.xml
+++ b/app-misc/color/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>
<longdescription lang="en">
Color is a nifty little utility that you can call from shell scripts,
that will let you easily use ANSI escape codes (for colors, bold,
diff --git a/app-misc/colordiff/metadata.xml b/app-misc/colordiff/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-misc/colordiff/metadata.xml
+++ b/app-misc/colordiff/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/countrycodes/metadata.xml b/app-misc/countrycodes/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-misc/countrycodes/metadata.xml
+++ b/app-misc/countrycodes/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/cw/metadata.xml b/app-misc/cw/metadata.xml
index ffe1cdfd604..0a7f69a8c44 100644
--- a/app-misc/cw/metadata.xml
+++ b/app-misc/cw/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">cwrapper</remote-id>
</upstream>
diff --git a/app-misc/cwiid/metadata.xml b/app-misc/cwiid/metadata.xml
index a5f3f76b89b..9ac23130119 100644
--- a/app-misc/cwiid/metadata.xml
+++ b/app-misc/cwiid/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>Marco Clocchiatti</name>
<description>Proxied co-maintainer</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/delay/metadata.xml b/app-misc/delay/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-misc/delay/metadata.xml
+++ b/app-misc/delay/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/detachtty/metadata.xml b/app-misc/detachtty/metadata.xml
index 95138c2e6f6..493811d3db2 100644
--- a/app-misc/detachtty/metadata.xml
+++ b/app-misc/detachtty/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>shell-tools</herd>
-<herd>common-lisp</herd>
+<maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+</maintainer>
+<maintainer>
+ <email>common-lisp@gentoo.org</email>
+ <name>Gentoo Common Lisp Project</name>
+</maintainer>
<longdescription>
detachtty is a utility that lets you run interactive programs non-interactively.
Reattaching can be done locally or over the network. detachtty is similar in
diff --git a/app-misc/detox/metadata.xml b/app-misc/detox/metadata.xml
index 73c014e4f0b..07c66b8e1b7 100644
--- a/app-misc/detox/metadata.xml
+++ b/app-misc/detox/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">detox</remote-id>
</upstream>
diff --git a/app-misc/devtodo/metadata.xml b/app-misc/devtodo/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-misc/devtodo/metadata.xml
+++ b/app-misc/devtodo/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/dtach/metadata.xml b/app-misc/dtach/metadata.xml
index 31d4e7b5558..3e5418f5c5d 100644
--- a/app-misc/dtach/metadata.xml
+++ b/app-misc/dtach/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">dtach</remote-id>
</upstream>
diff --git a/app-misc/editor-wrapper/metadata.xml b/app-misc/editor-wrapper/metadata.xml
index 83d335031da..af8ca538609 100644
--- a/app-misc/editor-wrapper/metadata.xml
+++ b/app-misc/editor-wrapper/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>base-system</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+</maintainer>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/eid-viewer-bin/metadata.xml b/app-misc/eid-viewer-bin/metadata.xml
index 66cfa910805..b787e2db1af 100644
--- a/app-misc/eid-viewer-bin/metadata.xml
+++ b/app-misc/eid-viewer-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>vincent.hardy.be@gmail.com</email>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<longdescription>
eid-mw is Belgian Electronic Identity Card (eID) middleware supplied by the Belgian Federal Government.
diff --git a/app-misc/elasticsearch/metadata.xml b/app-misc/elasticsearch/metadata.xml
index 896195d6d5c..aca96b9724f 100644
--- a/app-misc/elasticsearch/metadata.xml
+++ b/app-misc/elasticsearch/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>erkiferenc@gmail.com</email>
<name>Ferenc Erki</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/email2trac/metadata.xml b/app-misc/email2trac/metadata.xml
index 07e1e715082..5ce05de541e 100644
--- a/app-misc/email2trac/metadata.xml
+++ b/app-misc/email2trac/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>web-apps</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>lukas@dzunko.sk</email>
<name>Lukas Dzunko</name>
</maintainer>
+<maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/emelfm2/metadata.xml b/app-misc/emelfm2/metadata.xml
index e1e6d97fc81..e733650b537 100644
--- a/app-misc/emelfm2/metadata.xml
+++ b/app-misc/emelfm2/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>desktop-misc</herd>
+ <maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<use><flag name="ansi">Add support for ANSI escape sequences</flag></use>
<use><flag name="gtk3">Use <pkg>x11-libs/gtk:3</pkg> instead of <pkg>x11-libs/gtk:2</pkg></flag></use>
</pkgmetadata>
diff --git a/app-misc/fdupes/metadata.xml b/app-misc/fdupes/metadata.xml
index b33a33f26d1..4cc90446112 100644
--- a/app-misc/fdupes/metadata.xml
+++ b/app-misc/fdupes/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="github">adrianlopezroche/fdupes</remote-id>
</upstream>
diff --git a/app-misc/fdutils/metadata.xml b/app-misc/fdutils/metadata.xml
index 74d25af22b2..097975e3adc 100644
--- a/app-misc/fdutils/metadata.xml
+++ b/app-misc/fdutils/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kernel-misc</herd>
</pkgmetadata>
diff --git a/app-misc/freemind/metadata.xml b/app-misc/freemind/metadata.xml
index 9ada244d0d9..ca80e94847a 100644
--- a/app-misc/freemind/metadata.xml
+++ b/app-misc/freemind/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>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<use>
<flag name="groovy">Build plugin for scripting via Groovy</flag>
<flag name="latex">Build plugin for inserting mathematical formulas in LaTeX syntax</flag>
diff --git a/app-misc/fsniper/metadata.xml b/app-misc/fsniper/metadata.xml
index 12e19ee50e9..624b0cefa87 100644
--- a/app-misc/fsniper/metadata.xml
+++ b/app-misc/fsniper/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="github">l3ib/fsniper</remote-id>
</upstream>
diff --git a/app-misc/gcal/metadata.xml b/app-misc/gcal/metadata.xml
index d8de67ce3e0..630d83f9dd9 100644
--- a/app-misc/gcal/metadata.xml
+++ b/app-misc/gcal/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>
<longdescription>
Gcal is a program similar the standard calendar programs BSD "cal" and
"calendar". Gcal displays hybrid and proleptic Julian and Gregorian calendar
diff --git a/app-misc/gentoo/metadata.xml b/app-misc/gentoo/metadata.xml
index 2c6f3bff035..56a06de1190 100644
--- a/app-misc/gentoo/metadata.xml
+++ b/app-misc/gentoo/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>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gentoo</remote-id>
</upstream>
diff --git a/app-misc/geoclue/metadata.xml b/app-misc/geoclue/metadata.xml
index 977a113098c..c19ad9f5a7d 100644
--- a/app-misc/geoclue/metadata.xml
+++ b/app-misc/geoclue/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <herd>desktop-misc</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<use>
<flag name="geonames">Install geonames.org provider</flag>
<flag name="gsmloc">Install GSM location provider</flag>
diff --git a/app-misc/getopt/metadata.xml b/app-misc/getopt/metadata.xml
index f4618b6e7fe..9f8ca40391a 100644
--- a/app-misc/getopt/metadata.xml
+++ b/app-misc/getopt/metadata.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>bsd</herd>
-<herd>prefix</herd>
+<maintainer>
+ <email>bsd@gentoo.org</email>
+ <name>BSD Project</name>
+</maintainer>
+<maintainer>
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/gnote/metadata.xml b/app-misc/gnote/metadata.xml
index 348778d4331..232223cc9b9 100644
--- a/app-misc/gnote/metadata.xml
+++ b/app-misc/gnote/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="github">tsuna/boost.m4</remote-id>
</upstream>
diff --git a/app-misc/gnuit/metadata.xml b/app-misc/gnuit/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-misc/gnuit/metadata.xml
+++ b/app-misc/gnuit/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/goobook/metadata.xml b/app-misc/goobook/metadata.xml
index 20b50d5355b..bde960c03fe 100644
--- a/app-misc/goobook/metadata.xml
+++ b/app-misc/goobook/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>fabiano.francesconi@gmail.com</email>
<name>Fabiano Francesconi</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/app-misc/grc/metadata.xml b/app-misc/grc/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-misc/grc/metadata.xml
+++ b/app-misc/grc/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/gtypist/metadata.xml b/app-misc/gtypist/metadata.xml
index 60174908018..bb630be7557 100644
--- a/app-misc/gtypist/metadata.xml
+++ b/app-misc/gtypist/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>dabbott@gentoo.org</email>
<name>David Abbott</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/hatools/metadata.xml b/app-misc/hatools/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-misc/hatools/metadata.xml
+++ b/app-misc/hatools/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/hilite/metadata.xml b/app-misc/hilite/metadata.xml
index 4d9e7a6e090..649774a0e37 100644
--- a/app-misc/hilite/metadata.xml
+++ b/app-misc/hilite/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">hilite</remote-id>
</upstream>
diff --git a/app-misc/hivex/metadata.xml b/app-misc/hivex/metadata.xml
index 60c7f53239e..c5570c3e872 100644
--- a/app-misc/hivex/metadata.xml
+++ b/app-misc/hivex/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>
@@ -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-misc/ifp-line/metadata.xml b/app-misc/ifp-line/metadata.xml
index 74257d7e3e8..35be62e6693 100644
--- a/app-misc/ifp-line/metadata.xml
+++ b/app-misc/ifp-line/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">ifp-driver</remote-id>
</upstream>
diff --git a/app-misc/iguanaIR/metadata.xml b/app-misc/iguanaIR/metadata.xml
index 7fe8613fea0..4ba667b89e1 100644
--- a/app-misc/iguanaIR/metadata.xml
+++ b/app-misc/iguanaIR/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>media-tv</herd>
<maintainer>
<email>hd_brummy@gentoo.org</email>
<name>Joerg Bornkessel</name>
diff --git a/app-misc/inputlircd/metadata.xml b/app-misc/inputlircd/metadata.xml
index a6b9e38a1b9..097975e3adc 100644
--- a/app-misc/inputlircd/metadata.xml
+++ b/app-misc/inputlircd/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
</pkgmetadata>
diff --git a/app-misc/irtrans-irclient/metadata.xml b/app-misc/irtrans-irclient/metadata.xml
index c6a2181d8d6..a4823db8814 100644
--- a/app-misc/irtrans-irclient/metadata.xml
+++ b/app-misc/irtrans-irclient/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>mario.fetka@gmail.com</email>
<name>Mario Fetka</name>
@@ -13,4 +12,8 @@
<name>Joerg Bornkessel</name>
<description>Proxying maintainer</description>
</maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/irtrans-irserver/metadata.xml b/app-misc/irtrans-irserver/metadata.xml
index 44fa8a3b7cb..c3499819e17 100644
--- a/app-misc/irtrans-irserver/metadata.xml
+++ b/app-misc/irtrans-irserver/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>mario.fetka@gmail.com</email>
<name>Mario Fetka</name>
@@ -12,6 +11,10 @@
<name>Joerg Bornkessel</name>
<description>Proxying maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="mono">Enable mono support</flag>
</use>
diff --git a/app-misc/jail/metadata.xml b/app-misc/jail/metadata.xml
index 48f89fef7f3..61e4e6d9276 100644
--- a/app-misc/jail/metadata.xml
+++ b/app-misc/jail/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>spiculator@gmail.com</email>
<name>Sergey Redin</name>
<description>Maintainer, Assign bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">spiculator/jail</remote-id>
<bugs-to>https://github.com/spiculator/jail/issues</bugs-to>
diff --git a/app-misc/jitac/metadata.xml b/app-misc/jitac/metadata.xml
index 838c00a4a44..6cb58e33adf 100644
--- a/app-misc/jitac/metadata.xml
+++ b/app-misc/jitac/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-misc/jot/metadata.xml b/app-misc/jot/metadata.xml
index 8316cf847a6..68ba47ea8ff 100644
--- a/app-misc/jot/metadata.xml
+++ b/app-misc/jot/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="freshmeat">bsd-jot</remote-id>
</upstream>
diff --git a/app-misc/joymouse/metadata.xml b/app-misc/joymouse/metadata.xml
index 1ad1c0a5d38..1b7d6fe8e5d 100644
--- a/app-misc/joymouse/metadata.xml
+++ b/app-misc/joymouse/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">joymouse-linux</remote-id>
</upstream>
diff --git a/app-misc/kanatest/metadata.xml b/app-misc/kanatest/metadata.xml
index 2d5852c16c6..898a22cc377 100644
--- a/app-misc/kanatest/metadata.xml
+++ b/app-misc/kanatest/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>cjk</herd>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/lcd-stuff/metadata.xml b/app-misc/lcd-stuff/metadata.xml
index f49cd001cf3..f78a107f56b 100644
--- a/app-misc/lcd-stuff/metadata.xml
+++ b/app-misc/lcd-stuff/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>bernhard.walle@gmx.de</email>
<name>Bernhard Walle</name>
<description>Upstream maintainer wants to be CC'ed directly on bugs.</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
lcd-stuff is a client for app-misc/lcdproc written in C. It features
displaying of e-mail using POP3 and IMAP, mpd control, news items using RSS,
diff --git a/app-misc/leave/metadata.xml b/app-misc/leave/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-misc/leave/metadata.xml
+++ b/app-misc/leave/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/ledit/metadata.xml b/app-misc/ledit/metadata.xml
index 849ed8ebf13..ae2b03abbe3 100644
--- a/app-misc/ledit/metadata.xml
+++ b/app-misc/ledit/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/lirc/metadata.xml b/app-misc/lirc/metadata.xml
index 199a453f60e..b99f291ccb1 100644
--- a/app-misc/lirc/metadata.xml
+++ b/app-misc/lirc/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>media-tv</herd>
<use>
<flag name="hardware-carrier">The transmitter device generates its clock
signal in hardware</flag>
diff --git a/app-misc/livecd-tools/metadata.xml b/app-misc/livecd-tools/metadata.xml
index 88653ddd717..ec3067b686e 100644
--- a/app-misc/livecd-tools/metadata.xml
+++ b/app-misc/livecd-tools/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>livecd</herd>
+<maintainer>
+ <email>livecd@gentoo.org</email>
+ <name>Gentoo LiveCD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/logitech-applet/metadata.xml b/app-misc/logitech-applet/metadata.xml
index 40838bc3678..b5602711928 100644
--- a/app-misc/logitech-applet/metadata.xml
+++ b/app-misc/logitech-applet/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-misc/lxsplit/metadata.xml b/app-misc/lxsplit/metadata.xml
index 25dad7549cd..2d92d9415ec 100644
--- a/app-misc/lxsplit/metadata.xml
+++ b/app-misc/lxsplit/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">lxsplit</remote-id>
</upstream>
diff --git a/app-misc/matew/metadata.xml b/app-misc/matew/metadata.xml
index ba7f2323324..d89712ea4c9 100644
--- a/app-misc/matew/metadata.xml
+++ b/app-misc/matew/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>web-apps</herd>
+ <maintainer>
+ <email>web-apps@gentoo.org</email>
+ <name>Gentoo Webapps</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">matew</remote-id>
</upstream>
diff --git a/app-misc/mc/metadata.xml b/app-misc/mc/metadata.xml
index 2045d54a304..834579a868c 100644
--- a/app-misc/mc/metadata.xml
+++ b/app-misc/mc/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-misc</herd>
<maintainer>
<email>wired@gentoo.org</email>
<name>Alex Alexander</name>
@@ -14,6 +13,10 @@
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<use>
<flag name="edit">Compile and install the mcedit application</flag>
<flag name="mclib">Compile and install the libmc.so shared library</flag>
diff --git a/app-misc/media-player-info/metadata.xml b/app-misc/media-player-info/metadata.xml
index 941d094fcec..7588e7760ae 100644
--- a/app-misc/media-player-info/metadata.xml
+++ b/app-misc/media-player-info/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>freedesktop</herd>
+<maintainer>
+ <email>freedesktop-bugs@gentoo.org</email>
+ <name>Gentoo Freedesktop Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/metromap/metadata.xml b/app-misc/metromap/metadata.xml
index 496cc906a4c..3f45642c35e 100644
--- a/app-misc/metromap/metadata.xml
+++ b/app-misc/metromap/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>nikoli@gmx.us</email>
<name>Nikoli</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-misc/mime-types/metadata.xml b/app-misc/mime-types/metadata.xml
index f93bc00f409..47f7f8eb6cd 100644
--- a/app-misc/mime-types/metadata.xml
+++ b/app-misc/mime-types/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>net-mail</herd>
<maintainer>
<email>djc@gentoo.org</email>
<name>Dirkjan Ochtman</name>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/mmv/metadata.xml b/app-misc/mmv/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-misc/mmv/metadata.xml
+++ b/app-misc/mmv/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/mtail/metadata.xml b/app-misc/mtail/metadata.xml
index 36a21bace4d..a30c0740670 100644
--- a/app-misc/mtail/metadata.xml
+++ b/app-misc/mtail/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>
<longdescription lang="en">
mtail is a small tail workalike that performs output coloring using
ansi escape sequences (although the sequences are overridable, so you
diff --git a/app-misc/ondir/metadata.xml b/app-misc/ondir/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-misc/ondir/metadata.xml
+++ b/app-misc/ondir/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/oneko/metadata.xml b/app-misc/oneko/metadata.xml
index 73122504865..90e28ed17f6 100644
--- a/app-misc/oneko/metadata.xml
+++ b/app-misc/oneko/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-misc/pip/metadata.xml b/app-misc/pip/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-misc/pip/metadata.xml
+++ b/app-misc/pip/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/ps3pf_utils/metadata.xml b/app-misc/ps3pf_utils/metadata.xml
index f9a5b22fcbe..8278b9b25ff 100644
--- a/app-misc/ps3pf_utils/metadata.xml
+++ b/app-misc/ps3pf_utils/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>ppc64</herd>
+<maintainer>
+ <email>ppc@gentoo.org</email>
+ <name>Gentoo Linux PowerPC Development</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/pwsafe/metadata.xml b/app-misc/pwsafe/metadata.xml
index bc5ec521530..60fd80ada13 100644
--- a/app-misc/pwsafe/metadata.xml
+++ b/app-misc/pwsafe/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>chead@chead.ca</email>
<name>Christopher Head</name>
<description>Proxy maintainer, assign bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
pwsafe is a commandline password database utility compatible with
Counterpane's Password Safe. It is compatible with Counterpane Password
diff --git a/app-misc/realpath/metadata.xml b/app-misc/realpath/metadata.xml
index c0dd433566a..8df698ec0e9 100644
--- a/app-misc/realpath/metadata.xml
+++ b/app-misc/realpath/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>
<longdescription lang="en">
The realpath utility finds the canonicalized absolute pathname of its
arguments in a similar way to readlink -f.
diff --git a/app-misc/regionset/metadata.xml b/app-misc/regionset/metadata.xml
index bb93fa2613e..097975e3adc 100644
--- a/app-misc/regionset/metadata.xml
+++ b/app-misc/regionset/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-optical</herd>
</pkgmetadata>
diff --git a/app-misc/remind/metadata.xml b/app-misc/remind/metadata.xml
index 540f810e069..b8393889336 100644
--- a/app-misc/remind/metadata.xml
+++ b/app-misc/remind/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-misc/reptyr/metadata.xml b/app-misc/reptyr/metadata.xml
index e24b4c3fe4b..10142625e8a 100644
--- a/app-misc/reptyr/metadata.xml
+++ b/app-misc/reptyr/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>shell-tools</herd>
<maintainer>
<email>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
</maintainer>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">nelhage/reptyr</remote-id>
</upstream>
diff --git a/app-misc/rl/metadata.xml b/app-misc/rl/metadata.xml
index 7d749dcbefb..c5023017edb 100644
--- a/app-misc/rl/metadata.xml
+++ b/app-misc/rl/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>shell-tools</herd>
<maintainer>
<email>swegener@gentoo.org</email>
<description>primary maintainer</description>
</maintainer>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<longdescription>randomize lines can be used to randomize the contents of text files or standard input.</longdescription>
</pkgmetadata>
diff --git a/app-misc/rlwrap/metadata.xml b/app-misc/rlwrap/metadata.xml
index 0c2b9b15728..91ceadca3d8 100644
--- a/app-misc/rlwrap/metadata.xml
+++ b/app-misc/rlwrap/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>common-lisp</herd>
+ <maintainer>
+ <email>common-lisp@gentoo.org</email>
+ <name>Gentoo Common Lisp Project</name>
+ </maintainer>
<longdescription>
rlwrap is a 'readline wrapper' that uses the GNU Readline library to
allow the editing of keyboard input for any other command. Input
diff --git a/app-misc/roadnav/metadata.xml b/app-misc/roadnav/metadata.xml
index 29dde1bff37..6ccfb901447 100644
--- a/app-misc/roadnav/metadata.xml
+++ b/app-misc/roadnav/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>andrew.cremins@gmail.com</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="festival">Enable support for
<pkg>app-accessibility/festival</pkg></flag>
diff --git a/app-misc/rox-filer/metadata.xml b/app-misc/rox-filer/metadata.xml
index 386e0d25ea9..9effdff5573 100644
--- a/app-misc/rox-filer/metadata.xml
+++ b/app-misc/rox-filer/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>ppurka@gmail.com</email>
<name>Punarbasu 'ppurka' Purkayastha</name>
@@ -12,6 +11,10 @@
<name>sitquietly</name>
<description>Co Maintainer, CC bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<upstream>
<maintainer status="active">
<email>talex5@gmail.com</email>
diff --git a/app-misc/screen/metadata.xml b/app-misc/screen/metadata.xml
index 87bfb0b9eb6..65850952e64 100644
--- a/app-misc/screen/metadata.xml
+++ b/app-misc/screen/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>shell-tools</herd>
<maintainer>
<email>swegener@gentoo.org</email>
<description>Primary Maintainer</description>
</maintainer>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<longdescription>
Screen is a full-screen window manager that multiplexes a physical terminal
between several processes, typically interactive shells. Each virtual terminal
diff --git a/app-misc/screenie/metadata.xml b/app-misc/screenie/metadata.xml
index b614aabc039..cad975906de 100644
--- a/app-misc/screenie/metadata.xml
+++ b/app-misc/screenie/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>rgkmg25@gmail.com</email>
<name>Robert Kowalski</name>
<description>Proxy Maintainer. CC on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Screenie is a small and lightweight GNU screen(1) frontend that is
designed to be a session handler that simplifies the process of
diff --git a/app-misc/slashtime/metadata.xml b/app-misc/slashtime/metadata.xml
index 7303cef9696..b424f92446a 100644
--- a/app-misc/slashtime/metadata.xml
+++ b/app-misc/slashtime/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-misc/spacenavd/metadata.xml b/app-misc/spacenavd/metadata.xml
index 7427fff8018..1a72108323d 100644
--- a/app-misc/spacenavd/metadata.xml
+++ b/app-misc/spacenavd/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>anthoine.bourgeois@gmail.com</email>
<name>Anthoine Bourgeois</name>
@@ -10,6 +9,10 @@
<email>sping@gentoo.org</email>
<name>Sebastian Pipping</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
The spacenavd daemon can be used directly as a drop-in replacement
to the 3DxWare daemon. It can communicate with the official magellan
diff --git a/app-misc/splitvt/metadata.xml b/app-misc/splitvt/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-misc/splitvt/metadata.xml
+++ b/app-misc/splitvt/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/strigi/metadata.xml b/app-misc/strigi/metadata.xml
index ceb0f7756c4..0070341ebde 100644
--- a/app-misc/strigi/metadata.xml
+++ b/app-misc/strigi/metadata.xml
@@ -6,5 +6,8 @@
<flag name="inotify">Enable support for inotify.</flag>
<flag name="log">Enables advanced logging through <pkg>dev-libs/log4cxx</pkg>.</flag>
</use>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
index 4aae21b6e0e..5dbf8d6bff4 100644
--- a/app-misc/subsurface/metadata.xml
+++ b/app-misc/subsurface/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>me@bearsh.org</email>
<name>Martin Gysel</name>
<description>Proxy maintainer. Assign bugs to him.</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
An open source dive log program.
</longdescription>
diff --git a/app-misc/supercat/metadata.xml b/app-misc/supercat/metadata.xml
index 80ac69d9c2f..85e9d1a546f 100644
--- a/app-misc/supercat/metadata.xml
+++ b/app-misc/supercat/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>shell-tools</herd>
+<maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/symlinks/metadata.xml b/app-misc/symlinks/metadata.xml
index 8cefae8361f..737ee06a8b5 100644
--- a/app-misc/symlinks/metadata.xml
+++ b/app-misc/symlinks/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>
<longdescription lang="en">
Symlinks scans directories for symbolic links and lists them on stdout.
Each link is prefixed with a classification of relative, absolute,
diff --git a/app-misc/tasque/metadata.xml b/app-misc/tasque/metadata.xml
index 3c068913d44..65fcc9f5cf3 100644
--- a/app-misc/tasque/metadata.xml
+++ b/app-misc/tasque/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>dotnet</herd>
+ <maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
<use>
<flag name="rememberthemilk">
Allows you to use http://www.rememberthemilk.com/ as your storage backend.
diff --git a/app-misc/tdl/metadata.xml b/app-misc/tdl/metadata.xml
index 26e00e65cfb..5b3d4299137 100644
--- a/app-misc/tdl/metadata.xml
+++ b/app-misc/tdl/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>
<longdescription lang="en">
tdl is a command-line application for managing a list of outstanding
tasks that you have to do. It can organise tasks in a hierarchy, produce
diff --git a/app-misc/timestamp/metadata.xml b/app-misc/timestamp/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-misc/timestamp/metadata.xml
+++ b/app-misc/timestamp/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml
index e9b1261b1a9..c8b010cfbb8 100644
--- a/app-misc/tmux/metadata.xml
+++ b/app-misc/tmux/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>shell-tools</herd>
<maintainer>
<email>wired@gentoo.org</email>
<name>Alex Alexander</name>
</maintainer>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
<longdescription>
tmux is a "terminal multiplexer", it enables a number of terminals
(or windows) to be accessed and controlled from a single terminal.
diff --git a/app-misc/tomboy/metadata.xml b/app-misc/tomboy/metadata.xml
index d35e9300c54..b578be7f7b3 100644
--- a/app-misc/tomboy/metadata.xml
+++ b/app-misc/tomboy/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>dotnet</herd>
+ <maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/tpipe/metadata.xml b/app-misc/tpipe/metadata.xml
index 3fe269f0a5a..b45914b6dea 100644
--- a/app-misc/tpipe/metadata.xml
+++ b/app-misc/tpipe/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>shell-tools</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-misc/tracker/metadata.xml b/app-misc/tracker/metadata.xml
index 4772252bde2..162bb0be031 100644
--- a/app-misc/tracker/metadata.xml
+++ b/app-misc/tracker/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="cue">Enable cue sheet parsing</flag>
<!-- 'firefox-bookmarks' instead of 'firefox' to prevent most users from
diff --git a/app-misc/trash-cli/metadata.xml b/app-misc/trash-cli/metadata.xml
index eaee8326e08..ab4d52b881b 100644
--- a/app-misc/trash-cli/metadata.xml
+++ b/app-misc/trash-cli/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>alex_y_xu@yahoo.ca</email>
<name>Alex Xu</name>
<description>Proxied maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<maintainer status="active">
<email>sito@andreafrancia.it</email>
diff --git a/app-misc/unfoo/metadata.xml b/app-misc/unfoo/metadata.xml
index 01018901a9f..5ee26fc68bf 100644
--- a/app-misc/unfoo/metadata.xml
+++ b/app-misc/unfoo/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>
<use>
<flag name="minimal">Do not install all support archive binaries</flag>
</use>
diff --git a/app-misc/usbirboy/metadata.xml b/app-misc/usbirboy/metadata.xml
index d07e38bcb91..34cd99026cc 100644
--- a/app-misc/usbirboy/metadata.xml
+++ b/app-misc/usbirboy/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>media-tv</herd>
<upstream>
<remote-id type="sourceforge">usbirboy</remote-id>
</upstream>
diff --git a/app-misc/utimer/metadata.xml b/app-misc/utimer/metadata.xml
index d1a7b5241a3..4c6e8374d3a 100644
--- a/app-misc/utimer/metadata.xml
+++ b/app-misc/utimer/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>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
@@ -12,6 +11,10 @@
<name>Kfir Lavi</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/app-misc/vcp/metadata.xml b/app-misc/vcp/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-misc/vcp/metadata.xml
+++ b/app-misc/vcp/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/vlock/metadata.xml b/app-misc/vlock/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-misc/vlock/metadata.xml
+++ b/app-misc/vlock/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/vzstats/metadata.xml b/app-misc/vzstats/metadata.xml
index a9d54a531d5..ef4215a3c41 100644
--- a/app-misc/vzstats/metadata.xml
+++ b/app-misc/vzstats/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>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
<description>Primary maintainer, assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<maintainer status="active">
<email>kir@openvz.org</email>
diff --git a/app-misc/wcd/metadata.xml b/app-misc/wcd/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-misc/wcd/metadata.xml
+++ b/app-misc/wcd/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/when/metadata.xml b/app-misc/when/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-misc/when/metadata.xml
+++ b/app-misc/when/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>shell-tools</herd>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-misc/workrave/metadata.xml b/app-misc/workrave/metadata.xml
index 5e2b26791f5..872ae9ffc76 100644
--- a/app-misc/workrave/metadata.xml
+++ b/app-misc/workrave/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="distribution">Enable networking. See
http://www.workrave.org/features/</flag>
diff --git a/app-misc/wyrd/metadata.xml b/app-misc/wyrd/metadata.xml
index 70a77c240af..944233e46f1 100644
--- a/app-misc/wyrd/metadata.xml
+++ b/app-misc/wyrd/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>ml</herd>
+ <maintainer>
+ <email>ml@gentoo.org</email>
+ <name>Gentoo ML Project</name>
+ </maintainer>
<longdescription lang="en">
Wyrd is a text-based front-end to Remind, a sophisticated calendar and alarm
program. Remind's power lies in its programmability, and Wyrd does not hide this
diff --git a/app-misc/yworklog/metadata.xml b/app-misc/yworklog/metadata.xml
index d70174a2e00..f8a4e197b42 100644
--- a/app-misc/yworklog/metadata.xml
+++ b/app-misc/yworklog/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>python</herd>
<maintainer>
<email>yac@gentoo.org</email>
<name>Jan Matejka</name>
</maintainer>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/app-misc/zisofs-tools/metadata.xml b/app-misc/zisofs-tools/metadata.xml
index 74d25af22b2..097975e3adc 100644
--- a/app-misc/zisofs-tools/metadata.xml
+++ b/app-misc/zisofs-tools/metadata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kernel-misc</herd>
</pkgmetadata>