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-text
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-text')
-rw-r--r--app-text/a2ps/metadata.xml10
-rw-r--r--app-text/acroread/metadata.xml5
-rw-r--r--app-text/active-dvi/metadata.xml5
-rw-r--r--app-text/agrep/metadata.xml5
-rw-r--r--app-text/aiksaurus/metadata.xml5
-rw-r--r--app-text/antiword/metadata.xml5
-rw-r--r--app-text/asciidoc/metadata.xml5
-rw-r--r--app-text/aspell/metadata.xml5
-rw-r--r--app-text/atril/metadata.xml5
-rw-r--r--app-text/bibclean/metadata.xml5
-rw-r--r--app-text/bibletime/metadata.xml5
-rw-r--r--app-text/bibus/metadata.xml5
-rw-r--r--app-text/bibutils/metadata.xml5
-rw-r--r--app-text/bogosort/metadata.xml5
-rw-r--r--app-text/c2ps/metadata.xml5
-rw-r--r--app-text/catdoc/metadata.xml5
-rw-r--r--app-text/cb2bib/metadata.xml5
-rw-r--r--app-text/chasen/metadata.xml5
-rw-r--r--app-text/cmigemo/metadata.xml5
-rw-r--r--app-text/crf++/metadata.xml5
-rw-r--r--app-text/crm114/metadata.xml10
-rw-r--r--app-text/cuneiform/metadata.xml5
-rw-r--r--app-text/dblatex/metadata.xml5
-rw-r--r--app-text/delta/metadata.xml5
-rw-r--r--app-text/diction/metadata.xml5
-rw-r--r--app-text/djview/metadata.xml5
-rw-r--r--app-text/djvu/metadata.xml5
-rw-r--r--app-text/dos2unix/metadata.xml5
-rw-r--r--app-text/dvibook/metadata.xml5
-rw-r--r--app-text/dvipdfm/metadata.xml5
-rw-r--r--app-text/dvipdfmx/metadata.xml15
-rw-r--r--app-text/dvipng/metadata.xml10
-rw-r--r--app-text/dvipsk/metadata.xml5
-rw-r--r--app-text/dvisvgm/metadata.xml5
-rw-r--r--app-text/ebook-tools/metadata.xml5
-rw-r--r--app-text/enchant/metadata.xml5
-rw-r--r--app-text/enscript/metadata.xml5
-rw-r--r--app-text/epspdf/metadata.xml5
-rw-r--r--app-text/evince/metadata.xml5
-rw-r--r--app-text/fdftk/metadata.xml5
-rw-r--r--app-text/flpsed/metadata.xml5
-rw-r--r--app-text/ghostscript-gpl/metadata.xml5
-rw-r--r--app-text/glark/metadata.xml5
-rw-r--r--app-text/glosung/metadata.xml1
-rw-r--r--app-text/gnome-doc-utils/metadata.xml5
-rw-r--r--app-text/gocr/metadata.xml5
-rw-r--r--app-text/goldendict/metadata.xml10
-rw-r--r--app-text/gspell/metadata.xml5
-rw-r--r--app-text/gtkspell/metadata.xml5
-rw-r--r--app-text/gtranslator/metadata.xml5
-rw-r--r--app-text/gv/metadata.xml5
-rw-r--r--app-text/hd2u/metadata.xml5
-rw-r--r--app-text/highlight/metadata.xml5
-rw-r--r--app-text/htag/metadata.xml5
-rw-r--r--app-text/html2text/metadata.xml5
-rw-r--r--app-text/htmlc/metadata.xml5
-rw-r--r--app-text/htp/metadata.xml5
-rw-r--r--app-text/hunspell/metadata.xml5
-rw-r--r--app-text/hyperestraier/metadata.xml5
-rw-r--r--app-text/info2html/metadata.xml5
-rw-r--r--app-text/iso-codes/metadata.xml5
-rw-r--r--app-text/jabref-bin/metadata.xml10
-rw-r--r--app-text/jabref/metadata.xml10
-rw-r--r--app-text/jadetex/metadata.xml5
-rw-r--r--app-text/jist/metadata.xml5
-rw-r--r--app-text/jmupdf/metadata.xml5
-rw-r--r--app-text/jpdftweak/metadata.xml5
-rw-r--r--app-text/kbibtex/metadata.xml5
-rw-r--r--app-text/kchmviewer/metadata.xml5
-rw-r--r--app-text/kding/metadata.xml5
-rw-r--r--app-text/kpaste/metadata.xml5
-rw-r--r--app-text/krop/metadata.xml5
-rw-r--r--app-text/lcdf-typetools/metadata.xml5
-rw-r--r--app-text/letterize/metadata.xml5
-rw-r--r--app-text/libabw/metadata.xml5
-rw-r--r--app-text/libebook/metadata.xml5
-rw-r--r--app-text/libetonyek/metadata.xml5
-rw-r--r--app-text/libexttextcat/metadata.xml5
-rw-r--r--app-text/libgxps/metadata.xml5
-rw-r--r--app-text/liblangtag/metadata.xml5
-rw-r--r--app-text/libmspub/metadata.xml5
-rw-r--r--app-text/libmwaw/metadata.xml5
-rw-r--r--app-text/libodfgen/metadata.xml5
-rw-r--r--app-text/libpaper/metadata.xml5
-rw-r--r--app-text/libspectre/metadata.xml1
-rw-r--r--app-text/libwpd/metadata.xml5
-rw-r--r--app-text/libwpg/metadata.xml10
-rw-r--r--app-text/libwps/metadata.xml10
-rw-r--r--app-text/linuxdoc-tools/metadata.xml5
-rw-r--r--app-text/lv/metadata.xml5
-rw-r--r--app-text/manpager/metadata.xml5
-rw-r--r--app-text/mecab/metadata.xml5
-rw-r--r--app-text/mftrace/metadata.xml10
-rw-r--r--app-text/multitail/metadata.xml5
-rw-r--r--app-text/mythes/metadata.xml5
-rw-r--r--app-text/namazu/metadata.xml5
-rw-r--r--app-text/noweb/metadata.xml5
-rw-r--r--app-text/ocrad/metadata.xml5
-rw-r--r--app-text/odt2txt/metadata.xml5
-rw-r--r--app-text/pandoc/metadata.xml1
-rw-r--r--app-text/passivetex/metadata.xml5
-rw-r--r--app-text/pdf2djvu/metadata.xml5
-rw-r--r--app-text/pdf2html/metadata.xml5
-rw-r--r--app-text/pdfgrep/metadata.xml5
-rw-r--r--app-text/pdfjam/metadata.xml5
-rw-r--r--app-text/pdfminer/metadata.xml5
-rw-r--r--app-text/pdftk/metadata.xml10
-rw-r--r--app-text/po4a/metadata.xml5
-rw-r--r--app-text/poppler-data/metadata.xml5
-rw-r--r--app-text/poppler/metadata.xml10
-rw-r--r--app-text/ps2eps/metadata.xml5
-rw-r--r--app-text/ps2pkm/metadata.xml5
-rw-r--r--app-text/pstotext/metadata.xml5
-rw-r--r--app-text/psutils/metadata.xml5
-rw-r--r--app-text/pylize/metadata.xml5
-rw-r--r--app-text/pytextile/metadata.xml5
-rw-r--r--app-text/qpdf/metadata.xml5
-rw-r--r--app-text/qpdfview/metadata.xml5
-rw-r--r--app-text/queequeg/metadata.xml5
-rw-r--r--app-text/rarian/metadata.xml5
-rw-r--r--app-text/recode/metadata.xml5
-rw-r--r--app-text/refbase/metadata.xml5
-rw-r--r--app-text/referencer/metadata.xml5
-rw-r--r--app-text/rman/metadata.xml5
-rw-r--r--app-text/rnv/metadata.xml5
-rw-r--r--app-text/ronn/metadata.xml5
-rw-r--r--app-text/rpl/metadata.xml5
-rw-r--r--app-text/sary/metadata.xml5
-rw-r--r--app-text/scrollkeeper-dtd/metadata.xml5
-rw-r--r--app-text/scrollkeeper/metadata.xml5
-rw-r--r--app-text/sigil/metadata.xml5
-rw-r--r--app-text/silvercity/metadata.xml5
-rw-r--r--app-text/skribe/metadata.xml5
-rw-r--r--app-text/sword-modules/metadata.xml1
-rw-r--r--app-text/sword/metadata.xml1
-rw-r--r--app-text/t1utils/metadata.xml5
-rw-r--r--app-text/talkfilters/metadata.xml5
-rw-r--r--app-text/teckit/metadata.xml5
-rw-r--r--app-text/texi2html/metadata.xml5
-rw-r--r--app-text/texlive-core/metadata.xml5
-rw-r--r--app-text/texlive/metadata.xml5
-rw-r--r--app-text/trang/metadata.xml5
-rw-r--r--app-text/ttf2pk2/metadata.xml5
-rw-r--r--app-text/ttf2pt1/metadata.xml5
-rw-r--r--app-text/uvconv/metadata.xml5
-rw-r--r--app-text/vilistextum/metadata.xml5
-rw-r--r--app-text/vlna/metadata.xml10
-rw-r--r--app-text/wdiff/metadata.xml5
-rw-r--r--app-text/webgen/metadata.xml5
-rw-r--r--app-text/winefish/metadata.xml5
-rw-r--r--app-text/writerperfect/metadata.xml5
-rw-r--r--app-text/wv/metadata.xml5
-rw-r--r--app-text/wv2/metadata.xml10
-rw-r--r--app-text/xapian-omega/metadata.xml5
-rw-r--r--app-text/xchm/metadata.xml5
-rw-r--r--app-text/xdvik/metadata.xml10
-rw-r--r--app-text/xdvipdfmx/metadata.xml5
-rw-r--r--app-text/xindy/metadata.xml10
-rw-r--r--app-text/xiphos/metadata.xml1
-rw-r--r--app-text/yagf/metadata.xml5
-rw-r--r--app-text/yelp-tools/metadata.xml5
-rw-r--r--app-text/zemberek-server/metadata.xml5
162 files changed, 692 insertions, 179 deletions
diff --git a/app-text/a2ps/metadata.xml b/app-text/a2ps/metadata.xml
index c050a28d58f..01872ccf67c 100644
--- a/app-text/a2ps/metadata.xml
+++ b/app-text/a2ps/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>printing</herd>
-<herd>cjk</herd>
+<maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/acroread/metadata.xml b/app-text/acroread/metadata.xml
index a799f700d3b..4620cd7d0be 100644
--- a/app-text/acroread/metadata.xml
+++ b/app-text/acroread/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>printing</herd>
+<maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+</maintainer>
<use>
<flag name="html">HTML support and help reading capability (only for x86).</flag>
</use>
diff --git a/app-text/active-dvi/metadata.xml b/app-text/active-dvi/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/active-dvi/metadata.xml
+++ b/app-text/active-dvi/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/agrep/metadata.xml b/app-text/agrep/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-text/agrep/metadata.xml
+++ b/app-text/agrep/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-text/aiksaurus/metadata.xml b/app-text/aiksaurus/metadata.xml
index 70f95901f8d..99abbffa286 100644
--- a/app-text/aiksaurus/metadata.xml
+++ b/app-text/aiksaurus/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>mg_gentoo@yahoo.com</email>
<name>Mark Gilbert</name>
<description>Third-party maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">aiksaurus</remote-id>
</upstream>
diff --git a/app-text/antiword/metadata.xml b/app-text/antiword/metadata.xml
index aaaf98dcc44..b037ee73fc5 100644
--- a/app-text/antiword/metadata.xml
+++ b/app-text/antiword/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>grobian@gentoo.org</email>
<name>Fabian Groffen</name>
@@ -11,6 +10,10 @@
<name>LABBE Corentin (Montjoie)</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="cpe">cpe:/a:antiword_project:antiword</remote-id>
</upstream>
diff --git a/app-text/asciidoc/metadata.xml b/app-text/asciidoc/metadata.xml
index 65b9a64fce6..2e57b8c1572 100644
--- a/app-text/asciidoc/metadata.xml
+++ b/app-text/asciidoc/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>marcec@gmx.de</email>
<name>Marc Joliet</name>
<description>Proxied maintainer. Assign bugs to him.</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="highlight">Enable source code highlighting</flag>
</use>
diff --git a/app-text/aspell/metadata.xml b/app-text/aspell/metadata.xml
index 2cfa7063165..531e4546cdc 100644
--- a/app-text/aspell/metadata.xml
+++ b/app-text/aspell/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>elizabeth@interlinked.me</email>
<name>Elizabeth Myers</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-text/atril/metadata.xml b/app-text/atril/metadata.xml
index 57e299e777c..0660b01d6ba 100644
--- a/app-text/atril/metadata.xml
+++ b/app-text/atril/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>
<use>
<flag name="caja">Enable property page extension in
<pkg>mate-base/mate-file-manager</pkg></flag>
diff --git a/app-text/bibclean/metadata.xml b/app-text/bibclean/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/bibclean/metadata.xml
+++ b/app-text/bibclean/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/bibletime/metadata.xml b/app-text/bibletime/metadata.xml
index 9d025d57a4a..587618a123d 100644
--- a/app-text/bibletime/metadata.xml
+++ b/app-text/bibletime/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>theology</herd>
+ <maintainer>
+ <email>theology@gentoo.org</email>
+ <name>Theology</name>
+ </maintainer>
<longdescription>
BibleTime is a Bible study application for Linux. It is based on the
K Desktop Environment and uses the SWORD programming library to work
diff --git a/app-text/bibus/metadata.xml b/app-text/bibus/metadata.xml
index 3786591536b..3ea9b6db54c 100644
--- a/app-text/bibus/metadata.xml
+++ b/app-text/bibus/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>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">bibus-biblio</remote-id>
</upstream>
diff --git a/app-text/bibutils/metadata.xml b/app-text/bibutils/metadata.xml
index b229aec85b8..f7bb205b238 100644
--- a/app-text/bibutils/metadata.xml
+++ b/app-text/bibutils/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>sci</herd>
+<maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/bogosort/metadata.xml b/app-text/bogosort/metadata.xml
index 190b1c47c93..d13e124cb0c 100644
--- a/app-text/bogosort/metadata.xml
+++ b/app-text/bogosort/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 bogosort will sort a file in a similar way to sort(1), but using
the bogosort algorithm rather than the conventional qsort. The tool
diff --git a/app-text/c2ps/metadata.xml b/app-text/c2ps/metadata.xml
index 1fa0ca56950..6439400ee19 100644
--- a/app-text/c2ps/metadata.xml
+++ b/app-text/c2ps/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>printing</herd>
+<maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/catdoc/metadata.xml b/app-text/catdoc/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/catdoc/metadata.xml
+++ b/app-text/catdoc/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/cb2bib/metadata.xml b/app-text/cb2bib/metadata.xml
index 0452c21ae39..a2abd80daf9 100644
--- a/app-text/cb2bib/metadata.xml
+++ b/app-text/cb2bib/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<bugs-to>webmaster@molspaces.com</bugs-to>
</upstream>
diff --git a/app-text/chasen/metadata.xml b/app-text/chasen/metadata.xml
index 92a7b59f364..ca749c5ff99 100644
--- a/app-text/chasen/metadata.xml
+++ b/app-text/chasen/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>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge-jp">chasen-legacy</remote-id>
</upstream>
diff --git a/app-text/cmigemo/metadata.xml b/app-text/cmigemo/metadata.xml
index aef01fc3d59..c746f2860f8 100644
--- a/app-text/cmigemo/metadata.xml
+++ b/app-text/cmigemo/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-text/crf++/metadata.xml b/app-text/crf++/metadata.xml
index 83e476cf4da..e4cacc3562f 100644
--- a/app-text/crf++/metadata.xml
+++ b/app-text/crf++/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>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<longdescription lang="en">
CRF++ is a simple, customizable, and open source implementation
of Conditional Random Fields (CRFs) for segmenting/labeling
diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
index 60f90ea435e..2ca549fe7d8 100644
--- a/app-text/crm114/metadata.xml
+++ b/app-text/crm114/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>shell-tools</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>steev@gentoo.org</email>
<name>Steev Klimaszewski</name>
@@ -14,6 +12,14 @@
<description>Consider him the user-maintainer of this package, and please
CC him on bug reports (if he's not the reporter).</description>
</maintainer>
+ <maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="mew">Add support for using the mewdecode mime decoder
(<pkg>app-emacs/mew</pkg>)</flag>
diff --git a/app-text/cuneiform/metadata.xml b/app-text/cuneiform/metadata.xml
index bcd97db1803..fef8a746158 100644
--- a/app-text/cuneiform/metadata.xml
+++ b/app-text/cuneiform/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>yaleks@gmail.com</email>
<name>Aleksandr Yakimov</name>
@@ -10,6 +9,10 @@
<email>rich0@gentoo.org</email>
<name>Richard Freeman</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Cuneiform is an multi-language OCR system.
</longdescription>
diff --git a/app-text/dblatex/metadata.xml b/app-text/dblatex/metadata.xml
index 83266c0907a..65c2fee21dd 100644
--- a/app-text/dblatex/metadata.xml
+++ b/app-text/dblatex/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>zoltan@sinustrom.info</email>
<name>Zoltan Puskas</name>
<description>Proxied maintainer. Assign bugs to him.</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
dbaltex is an opensource DocBook to LaTeX publishing software
that originally started as DB2LaTeX clone, but now is more
diff --git a/app-text/delta/metadata.xml b/app-text/delta/metadata.xml
index b3b3c56d65a..dcdba3203b8 100644
--- a/app-text/delta/metadata.xml
+++ b/app-text/delta/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>toolchain</herd>
+ <maintainer>
+ <email>toolchain@gentoo.org</email>
+ <name>Gentoo Toolchain Project</name>
+ </maintainer>
<longdescription>
Delta assists you in minimizing "interesting" files
subject to a test of their interestingness. A common such situation
diff --git a/app-text/diction/metadata.xml b/app-text/diction/metadata.xml
index 237f17d365d..95cb6f2a9d2 100644
--- a/app-text/diction/metadata.xml
+++ b/app-text/diction/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>jer@gentoo.org</email>
<name>Jeroen Roovers</name>
@@ -10,6 +9,10 @@
<email>jnrowe@gmail.com</email>
<name>James Rowe</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
GNU diction and style are free implementations of old standard unix
commands, that are not available on many modern systems, because they
diff --git a/app-text/djview/metadata.xml b/app-text/djview/metadata.xml
index d15d5065b15..e9275383926 100644
--- a/app-text/djview/metadata.xml
+++ b/app-text/djview/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>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">djvu</remote-id>
</upstream>
diff --git a/app-text/djvu/metadata.xml b/app-text/djvu/metadata.xml
index b485c3124aa..a38d6186c11 100644
--- a/app-text/djvu/metadata.xml
+++ b/app-text/djvu/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>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<longdescription>
DjVu is a web-centric format and software platform for distributing documents
and images. DjVu can advantageously replace PDF, PS, TIFF, JPEG, and GIF for
diff --git a/app-text/dos2unix/metadata.xml b/app-text/dos2unix/metadata.xml
index 60f3692a577..7744d6af5c3 100644
--- a/app-text/dos2unix/metadata.xml
+++ b/app-text/dos2unix/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">dos2unix</remote-id>
</upstream>
diff --git a/app-text/dvibook/metadata.xml b/app-text/dvibook/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/dvibook/metadata.xml
+++ b/app-text/dvibook/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/dvipdfm/metadata.xml b/app-text/dvipdfm/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/dvipdfm/metadata.xml
+++ b/app-text/dvipdfm/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/dvipdfmx/metadata.xml b/app-text/dvipdfmx/metadata.xml
index 084e4884bf3..64b4da4fbd9 100644
--- a/app-text/dvipdfmx/metadata.xml
+++ b/app-text/dvipdfmx/metadata.xml
@@ -1,9 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>cjk</herd>
- <herd>tex</herd>
- <herd>printing</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<longdescription lang="en">
The DVIPDFMx (formerly dvipdfm-cjk) project provides an eXtended
version of the dvipdfm, a DVI to PDF translator developed by Mark A.
diff --git a/app-text/dvipng/metadata.xml b/app-text/dvipng/metadata.xml
index dda18346778..6d75c13e024 100644
--- a/app-text/dvipng/metadata.xml
+++ b/app-text/dvipng/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>tex</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
This program makes PNG and/or GIF graphics from DVI files as obtained
from TeX and its relatives.
diff --git a/app-text/dvipsk/metadata.xml b/app-text/dvipsk/metadata.xml
index 4c5b18fe19e..0c43c99fb88 100644
--- a/app-text/dvipsk/metadata.xml
+++ b/app-text/dvipsk/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>tex</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/dvisvgm/metadata.xml b/app-text/dvisvgm/metadata.xml
index cdb4a49863d..0245762ce86 100644
--- a/app-text/dvisvgm/metadata.xml
+++ b/app-text/dvisvgm/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>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">dvisvgm</remote-id>
</upstream>
diff --git a/app-text/ebook-tools/metadata.xml b/app-text/ebook-tools/metadata.xml
index 5f9aaf4ba85..c9ec4630830 100644
--- a/app-text/ebook-tools/metadata.xml
+++ b/app-text/ebook-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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">ebook-tools</remote-id>
</upstream>
diff --git a/app-text/enchant/metadata.xml b/app-text/enchant/metadata.xml
index d74743a1990..430ac6d264c 100644
--- a/app-text/enchant/metadata.xml
+++ b/app-text/enchant/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-office</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="aspell">Adds support for <pkg>app-text/aspell</pkg> spell checker</flag>
<flag name="hunspell">Adds support for <pkg>app-text/hunspell</pkg> spell checker</flag>
diff --git a/app-text/enscript/metadata.xml b/app-text/enscript/metadata.xml
index 1fa0ca56950..6439400ee19 100644
--- a/app-text/enscript/metadata.xml
+++ b/app-text/enscript/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>printing</herd>
+<maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/epspdf/metadata.xml b/app-text/epspdf/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/epspdf/metadata.xml
+++ b/app-text/epspdf/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index fb5b2ec5278..085209dbae3 100644
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/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="dvi">Enable the built-in DVI viewer</flag>
<flag name="libsecret">Enable support for credentials store</flag>
diff --git a/app-text/fdftk/metadata.xml b/app-text/fdftk/metadata.xml
index fc9b2c132a6..f6ce145803a 100644
--- a/app-text/fdftk/metadata.xml
+++ b/app-text/fdftk/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>tex</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/flpsed/metadata.xml b/app-text/flpsed/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/flpsed/metadata.xml
+++ b/app-text/flpsed/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/ghostscript-gpl/metadata.xml b/app-text/ghostscript-gpl/metadata.xml
index cfe6470e77d..d0f38b1d38f 100644
--- a/app-text/ghostscript-gpl/metadata.xml
+++ b/app-text/ghostscript-gpl/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>printing</herd>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">djvu</remote-id>
</upstream>
diff --git a/app-text/glark/metadata.xml b/app-text/glark/metadata.xml
index 833edc26e0f..fa5b554a852 100644
--- a/app-text/glark/metadata.xml
+++ b/app-text/glark/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="zip">Support for ZIP files using <pkg>dev-ruby/rubyzip</pkg></flag>
</use>
diff --git a/app-text/glosung/metadata.xml b/app-text/glosung/metadata.xml
index 9d0a422b1f4..d1558913263 100644
--- a/app-text/glosung/metadata.xml
+++ b/app-text/glosung/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>theology</herd>
<maintainer>
<email>theology@gentoo.org</email>
</maintainer>
diff --git a/app-text/gnome-doc-utils/metadata.xml b/app-text/gnome-doc-utils/metadata.xml
index 6e0e2ecb48c..f0f559a4662 100644
--- a/app-text/gnome-doc-utils/metadata.xml
+++ b/app-text/gnome-doc-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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/gocr/metadata.xml b/app-text/gocr/metadata.xml
index e207110b374..722089cc18a 100644
--- a/app-text/gocr/metadata.xml
+++ b/app-text/gocr/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>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">jocr</remote-id>
</upstream>
diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
index c438ed871d3..7029bead40a 100644
--- a/app-text/goldendict/metadata.xml
+++ b/app-text/goldendict/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
</maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">goldendict</remote-id>
</upstream>
diff --git a/app-text/gspell/metadata.xml b/app-text/gspell/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/app-text/gspell/metadata.xml
+++ b/app-text/gspell/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-text/gtkspell/metadata.xml b/app-text/gtkspell/metadata.xml
index d38dbc1104a..9a3239b96ae 100644
--- a/app-text/gtkspell/metadata.xml
+++ b/app-text/gtkspell/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="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
</use>
diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
index cb4aa704230..780b0b88bff 100644
--- a/app-text/gtranslator/metadata.xml
+++ b/app-text/gtranslator/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="sourceforge">gtranslator</remote-id>
</upstream>
diff --git a/app-text/gv/metadata.xml b/app-text/gv/metadata.xml
index 1fa0ca56950..6439400ee19 100644
--- a/app-text/gv/metadata.xml
+++ b/app-text/gv/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>printing</herd>
+<maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/hd2u/metadata.xml b/app-text/hd2u/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-text/hd2u/metadata.xml
+++ b/app-text/hd2u/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-text/highlight/metadata.xml b/app-text/highlight/metadata.xml
index 21ff3a53848..057df7463e6 100644
--- a/app-text/highlight/metadata.xml
+++ b/app-text/highlight/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>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/htag/metadata.xml b/app-text/htag/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-text/htag/metadata.xml
+++ b/app-text/htag/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-text/html2text/metadata.xml b/app-text/html2text/metadata.xml
index 7b03face72e..d2826690304 100644
--- a/app-text/html2text/metadata.xml
+++ b/app-text/html2text/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>jazzoslav@gmail.com</email>
<name>Jaroslav Rakhmatoullin</name>
<description>Proxied maintainer, assign bugs to him</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/htmlc/metadata.xml b/app-text/htmlc/metadata.xml
index a273949ac55..ebdb009a15e 100644
--- a/app-text/htmlc/metadata.xml
+++ b/app-text/htmlc/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-text/htp/metadata.xml b/app-text/htp/metadata.xml
index 5920e0eee87..94b0f78dd40 100644
--- a/app-text/htp/metadata.xml
+++ b/app-text/htp/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">htp</remote-id>
</upstream>
diff --git a/app-text/hunspell/metadata.xml b/app-text/hunspell/metadata.xml
index 599d7cff92d..08291645153 100644
--- a/app-text/hunspell/metadata.xml
+++ b/app-text/hunspell/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>elizabeth@interlinked.me</email>
<name>Elizabeth Myers</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">hunspell</remote-id>
</upstream>
diff --git a/app-text/hyperestraier/metadata.xml b/app-text/hyperestraier/metadata.xml
index fab2b827ef7..037cd9f5ca0 100644
--- a/app-text/hyperestraier/metadata.xml
+++ b/app-text/hyperestraier/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>cjk</herd>
<maintainer>
<email>hattya@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
<use>
<flag name="mecab">Enable <pkg>app-text/mecab</pkg> support
for Estraier</flag>
diff --git a/app-text/info2html/metadata.xml b/app-text/info2html/metadata.xml
index 725dac8e56c..2b94e1e88d6 100644
--- a/app-text/info2html/metadata.xml
+++ b/app-text/info2html/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">info2html</remote-id>
</upstream>
diff --git a/app-text/iso-codes/metadata.xml b/app-text/iso-codes/metadata.xml
index e98e18570ec..3bfad8a9653 100644
--- a/app-text/iso-codes/metadata.xml
+++ b/app-text/iso-codes/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>
<longdescription lang="en">
This package provides the ISO-639 Language code list, the ISO-3166
Territory code list, and ISO-3166-2 sub-territory lists, and all their
diff --git a/app-text/jabref-bin/metadata.xml b/app-text/jabref-bin/metadata.xml
index ac4685933be..4e01abc43bb 100644
--- a/app-text/jabref-bin/metadata.xml
+++ b/app-text/jabref-bin/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
- <herd>sci</herd>
<maintainer>
<email>nicolasbock@gentoo.org</email>
<name>Nicolas Bock</name>
</maintainer>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
JabRef is an open source bibliography reference manager. The native
file format used by JabRef is BibTeX, the standard LaTeX bibliography
diff --git a/app-text/jabref/metadata.xml b/app-text/jabref/metadata.xml
index 1e25d5f01ac..5b4638dec61 100644
--- a/app-text/jabref/metadata.xml
+++ b/app-text/jabref/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
- <herd>sci</herd>
<maintainer>
<email>nicolasbock@gentoo.org</email>
<name>Nicolas Bock</name>
</maintainer>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">jabref</remote-id>
</upstream>
diff --git a/app-text/jadetex/metadata.xml b/app-text/jadetex/metadata.xml
index 0e2778e9301..f62e7a58bdc 100644
--- a/app-text/jadetex/metadata.xml
+++ b/app-text/jadetex/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>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">jadetex</remote-id>
</upstream>
diff --git a/app-text/jist/metadata.xml b/app-text/jist/metadata.xml
index 5cf15b09757..065ed30d15d 100644
--- a/app-text/jist/metadata.xml
+++ b/app-text/jist/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>ruby</herd>
+ <maintainer>
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">ConradIrwin/jist</remote-id>
</upstream>
diff --git a/app-text/jmupdf/metadata.xml b/app-text/jmupdf/metadata.xml
index 1e6990819e1..776d82dca67 100644
--- a/app-text/jmupdf/metadata.xml
+++ b/app-text/jmupdf/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>java</herd>
<maintainer>
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
+<maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
<use>
<flag name="system-mupdf">Link against system version of app-text/mupdf</flag>
</use>
diff --git a/app-text/jpdftweak/metadata.xml b/app-text/jpdftweak/metadata.xml
index 554ee22ae34..4f5fc692975 100644
--- a/app-text/jpdftweak/metadata.xml
+++ b/app-text/jpdftweak/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>
jPDF Tweak is a Java Swing application that can combine, split, rotate,
reorder, watermark, encrypt, sign, and otherwise tweak PDF files.
diff --git a/app-text/kbibtex/metadata.xml b/app-text/kbibtex/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/app-text/kbibtex/metadata.xml
+++ b/app-text/kbibtex/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/kchmviewer/metadata.xml b/app-text/kchmviewer/metadata.xml
index 49db28713e3..2508f3337ff 100644
--- a/app-text/kchmviewer/metadata.xml
+++ b/app-text/kchmviewer/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<longdescription lang="en">
KchmViewer is a chm (MS HTML help file format) viewer It uses Trolltech Qt
widget library with optional KDE libraries. It does not require KDE, but may
diff --git a/app-text/kding/metadata.xml b/app-text/kding/metadata.xml
index ce6f882a6f4..8b38474b3ea 100644
--- a/app-text/kding/metadata.xml
+++ b/app-text/kding/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>kde</herd>
<maintainer>
<email>tgurr@gentoo.org</email>
<name>Timo Gurr</name>
</maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<longdescription lang="en">
KDing is a KDE port of Ding, a dictionary lookup program. It is
a simple program sitting in KDE's system tray that can translate
diff --git a/app-text/kpaste/metadata.xml b/app-text/kpaste/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/app-text/kpaste/metadata.xml
+++ b/app-text/kpaste/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/krop/metadata.xml b/app-text/krop/metadata.xml
index bdb617ccf69..dd951012ca3 100644
--- a/app-text/krop/metadata.xml
+++ b/app-text/krop/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>printing</herd>
<maintainer>
<email>dilfridge@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/lcdf-typetools/metadata.xml b/app-text/lcdf-typetools/metadata.xml
index 6b0490c2200..17c3ac3d48a 100644
--- a/app-text/lcdf-typetools/metadata.xml
+++ b/app-text/lcdf-typetools/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>fonts</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
<longdescription lang="en">
The LCDF Typetools package contains several programs for manipulating
PostScript Type 1, Type 1 multiple master, and PostScript-flavored OpenType
diff --git a/app-text/letterize/metadata.xml b/app-text/letterize/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/letterize/metadata.xml
+++ b/app-text/letterize/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/libabw/metadata.xml b/app-text/libabw/metadata.xml
index b373b8b4412..1ce2220fcf6 100644
--- a/app-text/libabw/metadata.xml
+++ b/app-text/libabw/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/libebook/metadata.xml b/app-text/libebook/metadata.xml
index 1677302f1b1..618e1373ac0 100644
--- a/app-text/libebook/metadata.xml
+++ b/app-text/libebook/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libebook</remote-id>
</upstream>
diff --git a/app-text/libetonyek/metadata.xml b/app-text/libetonyek/metadata.xml
index 254a397ff97..6766c67a7ae 100644
--- a/app-text/libetonyek/metadata.xml
+++ b/app-text/libetonyek/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>office</herd>
+<maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/libexttextcat/metadata.xml b/app-text/libexttextcat/metadata.xml
index b373b8b4412..1ce2220fcf6 100644
--- a/app-text/libexttextcat/metadata.xml
+++ b/app-text/libexttextcat/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/libgxps/metadata.xml b/app-text/libgxps/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/app-text/libgxps/metadata.xml
+++ b/app-text/libgxps/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-text/liblangtag/metadata.xml b/app-text/liblangtag/metadata.xml
index 8146c52742b..3c18f187218 100644
--- a/app-text/liblangtag/metadata.xml
+++ b/app-text/liblangtag/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<use>
<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
</use>
diff --git a/app-text/libmspub/metadata.xml b/app-text/libmspub/metadata.xml
index b373b8b4412..1ce2220fcf6 100644
--- a/app-text/libmspub/metadata.xml
+++ b/app-text/libmspub/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/libmwaw/metadata.xml b/app-text/libmwaw/metadata.xml
index 8741eba6fb9..2d9fd0c56f0 100644
--- a/app-text/libmwaw/metadata.xml
+++ b/app-text/libmwaw/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libmwaw</remote-id>
</upstream>
diff --git a/app-text/libodfgen/metadata.xml b/app-text/libodfgen/metadata.xml
index 78ef25a46b5..f1a4a4e28cf 100644
--- a/app-text/libodfgen/metadata.xml
+++ b/app-text/libodfgen/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libwpd</remote-id>
</upstream>
diff --git a/app-text/libpaper/metadata.xml b/app-text/libpaper/metadata.xml
index 1fa0ca56950..6439400ee19 100644
--- a/app-text/libpaper/metadata.xml
+++ b/app-text/libpaper/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>printing</herd>
+<maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/libspectre/metadata.xml b/app-text/libspectre/metadata.xml
index 9879e83b822..a0f4da6903d 100644
--- a/app-text/libspectre/metadata.xml
+++ b/app-text/libspectre/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-text/libwpd/metadata.xml b/app-text/libwpd/metadata.xml
index 58ead25eaa3..66bc549b5ec 100644
--- a/app-text/libwpd/metadata.xml
+++ b/app-text/libwpd/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<use>
<flag name="tools">Build miscellaneous tools</flag>
</use>
diff --git a/app-text/libwpg/metadata.xml b/app-text/libwpg/metadata.xml
index 9cca31d9919..5b38bd38015 100644
--- a/app-text/libwpg/metadata.xml
+++ b/app-text/libwpg/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>kde</herd>
- <herd>office</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libwpg</remote-id>
</upstream>
diff --git a/app-text/libwps/metadata.xml b/app-text/libwps/metadata.xml
index 95c395ce440..a0d42ded2c4 100644
--- a/app-text/libwps/metadata.xml
+++ b/app-text/libwps/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>kde</herd>
- <herd>office</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libwps</remote-id>
</upstream>
diff --git a/app-text/linuxdoc-tools/metadata.xml b/app-text/linuxdoc-tools/metadata.xml
index 3eae0091b61..c00fc644898 100644
--- a/app-text/linuxdoc-tools/metadata.xml
+++ b/app-text/linuxdoc-tools/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>
<longdescription>
Linuxdoc-Tools is a small bug-fix version of SGML-Tools 1.0.9,
and is a toolset for processing LinuxDoc DTD SGML files.
diff --git a/app-text/lv/metadata.xml b/app-text/lv/metadata.xml
index cb36a2fd8c7..a694eb49aaa 100644
--- a/app-text/lv/metadata.xml
+++ b/app-text/lv/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-text/manpager/metadata.xml b/app-text/manpager/metadata.xml
index 96a2d586367..c9e13ee6a3c 100644
--- a/app-text/manpager/metadata.xml
+++ b/app-text/manpager/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-text/mecab/metadata.xml b/app-text/mecab/metadata.xml
index ed7f2d4ce9a..3fa5e363aed 100644
--- a/app-text/mecab/metadata.xml
+++ b/app-text/mecab/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>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">mecab</remote-id>
<remote-id type="sourceforge">mecab</remote-id>
diff --git a/app-text/mftrace/metadata.xml b/app-text/mftrace/metadata.xml
index f967eaf5ae9..f0ba0a6403c 100644
--- a/app-text/mftrace/metadata.xml
+++ b/app-text/mftrace/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>fonts</herd>
-<herd>tex</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml
index 68d82602a73..5eb59b01be3 100644
--- a/app-text/multitail/metadata.xml
+++ b/app-text/multitail/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>wschlich@gentoo.org</email>
<name>Wolfram Schlich</name>
<description>Primary maintainer</description>
</maintainer>
+<maintainer>
+ <email>shell-tools@gentoo.org</email>
+ <name>Gentoo Shell Tools Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/mythes/metadata.xml b/app-text/mythes/metadata.xml
index 7cc81f65d94..436358886ba 100644
--- a/app-text/mythes/metadata.xml
+++ b/app-text/mythes/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">hunspell</remote-id>
</upstream>
diff --git a/app-text/namazu/metadata.xml b/app-text/namazu/metadata.xml
index 561e1ecf38b..bfca2c2e783 100644
--- a/app-text/namazu/metadata.xml
+++ b/app-text/namazu/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>cjk</herd>
<maintainer>
<email>hattya@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/noweb/metadata.xml b/app-text/noweb/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/noweb/metadata.xml
+++ b/app-text/noweb/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/ocrad/metadata.xml b/app-text/ocrad/metadata.xml
index 860a5b48290..7bb8dafa0c5 100644
--- a/app-text/ocrad/metadata.xml
+++ b/app-text/ocrad/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
<longdescription>GNU Ocrad is an OCR (Optical Character Recognition)
program impleme nted as a filter and based on a feature extraction
method. It reads a bitmap ima ge in pbm format and outputs text in
diff --git a/app-text/odt2txt/metadata.xml b/app-text/odt2txt/metadata.xml
index be1fa93cdfb..05bc5ddeb1a 100644
--- a/app-text/odt2txt/metadata.xml
+++ b/app-text/odt2txt/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>clabbe.montjoie@gmail.com</email>
<name>LABBE Corentin (Montjoie)</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-text/pandoc/metadata.xml b/app-text/pandoc/metadata.xml
index 72bbcbf76c8..62a3a03cb1d 100644
--- a/app-text/pandoc/metadata.xml
+++ b/app-text/pandoc/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>haskell</herd>
<maintainer>
<email>haskell@gentoo.org</email>
</maintainer>
diff --git a/app-text/passivetex/metadata.xml b/app-text/passivetex/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/passivetex/metadata.xml
+++ b/app-text/passivetex/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/pdf2djvu/metadata.xml b/app-text/pdf2djvu/metadata.xml
index 43d330322fd..3f1c9eff338 100644
--- a/app-text/pdf2djvu/metadata.xml
+++ b/app-text/pdf2djvu/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>printing</herd>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<use>
<flag name="graphicsmagick">Enable <pkg>media-gfx/graphicsmagick</pkg> support</flag>
</use>
diff --git a/app-text/pdf2html/metadata.xml b/app-text/pdf2html/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/pdf2html/metadata.xml
+++ b/app-text/pdf2html/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/pdfgrep/metadata.xml b/app-text/pdfgrep/metadata.xml
index e77acea2191..121a7b941df 100644
--- a/app-text/pdfgrep/metadata.xml
+++ b/app-text/pdfgrep/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>jlec@gentoo.org</email>
<description>Tree Proxy</description>
@@ -10,6 +9,10 @@
<email>flo@geekplace.eu</email>
<description>Maintainer, CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="unac">Removing accents and ligatures before search</flag>
</use>
diff --git a/app-text/pdfjam/metadata.xml b/app-text/pdfjam/metadata.xml
index 21ff3a53848..057df7463e6 100644
--- a/app-text/pdfjam/metadata.xml
+++ b/app-text/pdfjam/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>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/pdfminer/metadata.xml b/app-text/pdfminer/metadata.xml
index 6814ae17fc9..bd2c25c68ef 100644
--- a/app-text/pdfminer/metadata.xml
+++ b/app-text/pdfminer/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">pdfminer</remote-id>
</upstream>
diff --git a/app-text/pdftk/metadata.xml b/app-text/pdftk/metadata.xml
index a8a5788d684..5b39289541d 100644
--- a/app-text/pdftk/metadata.xml
+++ b/app-text/pdftk/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>printing</herd>
-<herd>java</herd>
+<maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/po4a/metadata.xml b/app-text/po4a/metadata.xml
index c75fe577173..a69e3149dcf 100644
--- a/app-text/po4a/metadata.xml
+++ b/app-text/po4a/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>fatzer2@gmail.com</email>
<name>Alexander Golubev</name>
<description>Proxu maintainer. Assign bugs on him</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/poppler-data/metadata.xml b/app-text/poppler-data/metadata.xml
index 1fa0ca56950..6439400ee19 100644
--- a/app-text/poppler-data/metadata.xml
+++ b/app-text/poppler-data/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>printing</herd>
+<maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 2c2e86c2545..1fbf81c0b7c 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
-<herd>printing</herd>
<maintainer>
<email>reavertm@gentoo.org</email>
<name>Maciej Mrozowski</name>
</maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+</maintainer>
<use>
<flag name="introspection">Enable GObject introspection.</flag>
<flag name="utils">Install command-line PDF converters and various utilities.</flag>
diff --git a/app-text/ps2eps/metadata.xml b/app-text/ps2eps/metadata.xml
index 7898eff4643..f6aab4cd6a3 100644
--- a/app-text/ps2eps/metadata.xml
+++ b/app-text/ps2eps/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>printing</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<longdescription lang="en">
Tool for generating Encapsulated Postscript Format (EPS,EPSF) files
from one-page Postscript documents
diff --git a/app-text/ps2pkm/metadata.xml b/app-text/ps2pkm/metadata.xml
index 4c5b18fe19e..0c43c99fb88 100644
--- a/app-text/ps2pkm/metadata.xml
+++ b/app-text/ps2pkm/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>tex</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/pstotext/metadata.xml b/app-text/pstotext/metadata.xml
index 21ff3a53848..057df7463e6 100644
--- a/app-text/pstotext/metadata.xml
+++ b/app-text/pstotext/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>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/psutils/metadata.xml b/app-text/psutils/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/psutils/metadata.xml
+++ b/app-text/psutils/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/pylize/metadata.xml b/app-text/pylize/metadata.xml
index 280f01f0e4a..3ffca77bf0c 100644
--- a/app-text/pylize/metadata.xml
+++ b/app-text/pylize/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>
<longdescription>
pylize is a Python script that generates a set of HTML files that
make up an on-screen presentation from a master file. The HTML files
diff --git a/app-text/pytextile/metadata.xml b/app-text/pytextile/metadata.xml
index 6c8bf0f9e05..384e2a7eb6d 100644
--- a/app-text/pytextile/metadata.xml
+++ b/app-text/pytextile/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>
<longdescription lang="en">A Python implementation of Textile, Dean Allen's Human Text Generator.
Textile simplifies the work of creating (X)HTML.</longdescription>
<upstream>
diff --git a/app-text/qpdf/metadata.xml b/app-text/qpdf/metadata.xml
index 7db5520ddbd..2bc27f944fc 100644
--- a/app-text/qpdf/metadata.xml
+++ b/app-text/qpdf/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>printing</herd>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">qpdf</remote-id>
</upstream>
diff --git a/app-text/qpdfview/metadata.xml b/app-text/qpdfview/metadata.xml
index 40dcf6c24c5..308560ee415 100644
--- a/app-text/qpdfview/metadata.xml
+++ b/app-text/qpdfview/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>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<use>
<flag name="fitz">
Use experimental fitz rendering, provided by <pkg>app-text/mupdf</pkg>,
diff --git a/app-text/queequeg/metadata.xml b/app-text/queequeg/metadata.xml
index db1b3ad443a..a95b2d0072b 100644
--- a/app-text/queequeg/metadata.xml
+++ b/app-text/queequeg/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>cjk</herd>
<maintainer>
<email>hattya@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">queequeg</remote-id>
</upstream>
diff --git a/app-text/rarian/metadata.xml b/app-text/rarian/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/app-text/rarian/metadata.xml
+++ b/app-text/rarian/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-text/recode/metadata.xml b/app-text/recode/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-text/recode/metadata.xml
+++ b/app-text/recode/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-text/refbase/metadata.xml b/app-text/refbase/metadata.xml
index 1dfe25bebf1..e26514a5909 100644
--- a/app-text/refbase/metadata.xml
+++ b/app-text/refbase/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>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">refbase</remote-id>
</upstream>
diff --git a/app-text/referencer/metadata.xml b/app-text/referencer/metadata.xml
index c56f26420c8..b57f98c88ae 100644
--- a/app-text/referencer/metadata.xml
+++ b/app-text/referencer/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>dominik.kriegner+gentoo@gmail.com</email>
<name>Dominik Kriegner</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">
</longdescription>
<upstream>
diff --git a/app-text/rman/metadata.xml b/app-text/rman/metadata.xml
index 1acf6907a67..a10cc10e30b 100644
--- a/app-text/rman/metadata.xml
+++ b/app-text/rman/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>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">polyglotman</remote-id>
</upstream>
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
index 64bd34360c4..a57198f756c 100644
--- a/app-text/rnv/metadata.xml
+++ b/app-text/rnv/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>l.valerimanera@gmail.com</email>
</maintainer>
<maintainer>
<email>dma05@web.de</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">rnv</remote-id>
</upstream>
diff --git a/app-text/ronn/metadata.xml b/app-text/ronn/metadata.xml
index ae24f128b70..4dcb1ffaf33 100644
--- a/app-text/ronn/metadata.xml
+++ b/app-text/ronn/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>ruby</herd>
+ <maintainer>
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">rtomayko/ronn</remote-id>
</upstream>
diff --git a/app-text/rpl/metadata.xml b/app-text/rpl/metadata.xml
index 6a90974eb08..a7be41a038f 100644
--- a/app-text/rpl/metadata.xml
+++ b/app-text/rpl/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">rpl</remote-id>
</upstream>
diff --git a/app-text/sary/metadata.xml b/app-text/sary/metadata.xml
index ef93e4b8613..6cc7031e0e6 100644
--- a/app-text/sary/metadata.xml
+++ b/app-text/sary/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>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<longdescription>Sary is a suffix array library and tools. It provides
fast full-text search facilities for text files on the order of 10 to
100 MB using a data structure called a suffix array. It can also
diff --git a/app-text/scrollkeeper-dtd/metadata.xml b/app-text/scrollkeeper-dtd/metadata.xml
index 341ceba9651..7229a10f612 100644
--- a/app-text/scrollkeeper-dtd/metadata.xml
+++ b/app-text/scrollkeeper-dtd/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="sourceforge">scrollkeeper</remote-id>
</upstream>
diff --git a/app-text/scrollkeeper/metadata.xml b/app-text/scrollkeeper/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/app-text/scrollkeeper/metadata.xml
+++ b/app-text/scrollkeeper/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-text/sigil/metadata.xml b/app-text/sigil/metadata.xml
index 384cf8e3576..54b57679f84 100644
--- a/app-text/sigil/metadata.xml
+++ b/app-text/sigil/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>tomboy64@sina.cn</email>
<description>Maintainer, assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">Sigil is a multi-platform WYSIWYG ebook editor.
It is designed to edit books in ePub format.</longdescription>
<upstream>
diff --git a/app-text/silvercity/metadata.xml b/app-text/silvercity/metadata.xml
index cd6ea64ec5c..0762c2e8d51 100644
--- a/app-text/silvercity/metadata.xml
+++ b/app-text/silvercity/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">silvercity</remote-id>
</upstream>
diff --git a/app-text/skribe/metadata.xml b/app-text/skribe/metadata.xml
index 08fe6cdd140..1e578658f23 100644
--- a/app-text/skribe/metadata.xml
+++ b/app-text/skribe/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>scheme</herd>
+<maintainer>
+ <email>scheme@gentoo.org</email>
+ <name>Gentoo Scheme Project</name>
+</maintainer>
<longdescription lang="en">
Skribe is a text processor. Even if it is a general purpose tool, it best
suits the writing of technical documents such as web pages or technical
diff --git a/app-text/sword-modules/metadata.xml b/app-text/sword-modules/metadata.xml
index fa2785e61cc..6a725874c66 100644
--- a/app-text/sword-modules/metadata.xml
+++ b/app-text/sword-modules/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>theology</herd>
<maintainer>
<email>theology@gentoo.org</email>
</maintainer>
diff --git a/app-text/sword/metadata.xml b/app-text/sword/metadata.xml
index 212f74428c4..7c26978734b 100644
--- a/app-text/sword/metadata.xml
+++ b/app-text/sword/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>theology</herd>
<maintainer>
<email>theology@gentoo.org</email>
</maintainer>
diff --git a/app-text/t1utils/metadata.xml b/app-text/t1utils/metadata.xml
index 8c5d39f263d..1caaf1d84e6 100644
--- a/app-text/t1utils/metadata.xml
+++ b/app-text/t1utils/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>fonts</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/talkfilters/metadata.xml b/app-text/talkfilters/metadata.xml
index 37139870616..a4a931385f0 100644
--- a/app-text/talkfilters/metadata.xml
+++ b/app-text/talkfilters/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 GNU Talk Filters are filter programs that convert ordinary English text
into text that mimics a stereotyped or otherwise humorous dialect. These
diff --git a/app-text/teckit/metadata.xml b/app-text/teckit/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/teckit/metadata.xml
+++ b/app-text/teckit/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/texi2html/metadata.xml b/app-text/texi2html/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/texi2html/metadata.xml
+++ b/app-text/texi2html/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/texlive-core/metadata.xml b/app-text/texlive-core/metadata.xml
index d96b59371a0..56838727111 100644
--- a/app-text/texlive-core/metadata.xml
+++ b/app-text/texlive-core/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>tex</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<longdescription lang="en">
TeXLive core binaries
</longdescription>
diff --git a/app-text/texlive/metadata.xml b/app-text/texlive/metadata.xml
index 0d7a5f3371e..4cee8f4efb9 100644
--- a/app-text/texlive/metadata.xml
+++ b/app-text/texlive/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
<use>
<flag name="context">Add support for the ConTeXt format
(<pkg>dev-texlive/texlive-context</pkg>)</flag>
diff --git a/app-text/trang/metadata.xml b/app-text/trang/metadata.xml
index 8c6a042450d..5aa9bbd4e5c 100644
--- a/app-text/trang/metadata.xml
+++ b/app-text/trang/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>
<upstream>
<remote-id type="google-code">jing-trang</remote-id>
</upstream>
diff --git a/app-text/ttf2pk2/metadata.xml b/app-text/ttf2pk2/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/ttf2pk2/metadata.xml
+++ b/app-text/ttf2pk2/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/ttf2pt1/metadata.xml b/app-text/ttf2pt1/metadata.xml
index 385e589278e..eddf8212b75 100644
--- a/app-text/ttf2pt1/metadata.xml
+++ b/app-text/ttf2pt1/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>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">ttf2pt1</remote-id>
</upstream>
diff --git a/app-text/uvconv/metadata.xml b/app-text/uvconv/metadata.xml
index c225088eb91..f0711335fbe 100644
--- a/app-text/uvconv/metadata.xml
+++ b/app-text/uvconv/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>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">unikey</remote-id>
</upstream>
diff --git a/app-text/vilistextum/metadata.xml b/app-text/vilistextum/metadata.xml
index f23b9cae159..7cb4266e65a 100644
--- a/app-text/vilistextum/metadata.xml
+++ b/app-text/vilistextum/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-text/vlna/metadata.xml b/app-text/vlna/metadata.xml
index 040f708c840..d616bd8d783 100644
--- a/app-text/vlna/metadata.xml
+++ b/app-text/vlna/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>tex</herd>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>malenko@email.cz</email>
<name>Jaromir Malenko</name>
<description>Jaromir is helping us with Czeck and Slovak support in
Gentoo. He is also a maintainer of cstetex. See bug #31657</description>
</maintainer>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/wdiff/metadata.xml b/app-text/wdiff/metadata.xml
index 4fb185fbe04..a0a347f151c 100644
--- a/app-text/wdiff/metadata.xml
+++ b/app-text/wdiff/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="experimental">Build experimental utilities (mdiff, unify, wdiff2)</flag>
</use>
diff --git a/app-text/webgen/metadata.xml b/app-text/webgen/metadata.xml
index c2054050ea9..426cb5bc99e 100644
--- a/app-text/webgen/metadata.xml
+++ b/app-text/webgen/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>ruby</herd>
+ <maintainer>
+ <email>ruby@gentoo.org</email>
+ <name>Gentoo Ruby Project</name>
+ </maintainer>
<use>
<flag name="builder">Enable programmatic HTML/XML generation</flag>
<flag name="highlight">Enable syntax highlighting for certain plugins</flag>
diff --git a/app-text/winefish/metadata.xml b/app-text/winefish/metadata.xml
index ba6a8a8800d..da417f040a1 100644
--- a/app-text/winefish/metadata.xml
+++ b/app-text/winefish/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>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/writerperfect/metadata.xml b/app-text/writerperfect/metadata.xml
index abbd11198e8..62052936e88 100644
--- a/app-text/writerperfect/metadata.xml
+++ b/app-text/writerperfect/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<use>
<flag name="abiword">Add support for abiword format using <pkg>app-text/libabw</pkg></flag>
<flag name="ebook">Add support for various ebook formats using <pkg>app-text/libebook</pkg></flag>
diff --git a/app-text/wv/metadata.xml b/app-text/wv/metadata.xml
index 67ba29b6ddb..3a453f11dae 100644
--- a/app-text/wv/metadata.xml
+++ b/app-text/wv/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="tools">Install optional utilities considered deprecated in favor of using AbiWord.</flag>
</use>
diff --git a/app-text/wv2/metadata.xml b/app-text/wv2/metadata.xml
index f931fd09f05..c310a7b4595 100644
--- a/app-text/wv2/metadata.xml
+++ b/app-text/wv2/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>kde</herd>
- <herd>tex</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">wvware</remote-id>
<bugs-to>http://sourceforge.net/tracker/?group_id=10501</bugs-to>
diff --git a/app-text/xapian-omega/metadata.xml b/app-text/xapian-omega/metadata.xml
index 0441f135510..530e27530e1 100644
--- a/app-text/xapian-omega/metadata.xml
+++ b/app-text/xapian-omega/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>blueness@gentoo.org</email>
<name>Anthony G. Basile</name>
@@ -10,4 +9,8 @@
<email>bugs@bergstroem.nu</email>
<name>Johan Bergström</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/app-text/xchm/metadata.xml b/app-text/xchm/metadata.xml
index 7f7a2225303..390910dcd05 100644
--- a/app-text/xchm/metadata.xml
+++ b/app-text/xchm/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>desktop-misc</herd>
<maintainer>
<email>rhill@gentoo.org</email>
<name>Ryan Hill</name>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xchm</remote-id>
</upstream>
diff --git a/app-text/xdvik/metadata.xml b/app-text/xdvik/metadata.xml
index 1de599fc5b2..23dab7b804b 100644
--- a/app-text/xdvik/metadata.xml
+++ b/app-text/xdvik/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>cjk</herd>
- <herd>tex</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<longdescription lang="en">
XDVIK is a dvi previewer on X with kpathsea support. It also supports
multibyte character rendering via Xft2 (or VFlib2).
diff --git a/app-text/xdvipdfmx/metadata.xml b/app-text/xdvipdfmx/metadata.xml
index 5f5d6bb2fac..8f86268a39c 100644
--- a/app-text/xdvipdfmx/metadata.xml
+++ b/app-text/xdvipdfmx/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>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<longdescription lang="en">
This package provides the extended xdvi to pdf converter
needed to deal with unicode enabled TeX's.
diff --git a/app-text/xindy/metadata.xml b/app-text/xindy/metadata.xml
index b206ed83dc2..8d9511b0c5d 100644
--- a/app-text/xindy/metadata.xml
+++ b/app-text/xindy/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>tex</herd>
-<herd>common-lisp</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
+<maintainer>
+ <email>common-lisp@gentoo.org</email>
+ <name>Gentoo Common Lisp Project</name>
+</maintainer>
<longdescription lang="en">
xindy is an index processor that can be used to generate book-like indexes
for arbitrary document-preparation systems. This includes systems such as
diff --git a/app-text/xiphos/metadata.xml b/app-text/xiphos/metadata.xml
index 02263c72542..88f97f94958 100644
--- a/app-text/xiphos/metadata.xml
+++ b/app-text/xiphos/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>theology</herd>
<maintainer>
<email>theology@gentoo.org</email>
</maintainer>
diff --git a/app-text/yagf/metadata.xml b/app-text/yagf/metadata.xml
index af56acd7940..9f4a68ff06b 100644
--- a/app-text/yagf/metadata.xml
+++ b/app-text/yagf/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>yaleks@gmail.com</email>
<name>Aleksandr Yakimov</name>
@@ -12,6 +11,10 @@
<name>Sergey Popov</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">
YAGF is a graphical front-end for cuneiform and tesseract OCR tools.
With YAGF you can open already scanned image files or obtain new images
diff --git a/app-text/yelp-tools/metadata.xml b/app-text/yelp-tools/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/app-text/yelp-tools/metadata.xml
+++ b/app-text/yelp-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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-text/zemberek-server/metadata.xml b/app-text/zemberek-server/metadata.xml
index 1484b932b98..a367f385a8e 100644
--- a/app-text/zemberek-server/metadata.xml
+++ b/app-text/zemberek-server/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>
<upstream>
<remote-id type="google-code">zemberek</remote-id>
<remote-id type="github">ahmetaa/zemberek-nlp</remote-id>