21 files changed, 80 insertions, 21 deletions
diff --git a/app-emacs/auctex/metadata.xml b/app-emacs/auctex/metadata.xml
index a7b402869aaf..2456a4998cc4 100644
--- a/app-emacs/auctex/metadata.xml
+++ b/app-emacs/auctex/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>tex</herd>
+<maintainer>
+  <email>tex@gentoo.org</email>
+  <name>Gentoo TeX Project</name>
+</maintainer>
 <longdescription>
   AUCTeX is an extensible package for writing and formatting TeX files
   in GNU Emacs and XEmacs. It supports many different TeX macro packages,
diff --git a/app-emacs/cldoc/metadata.xml b/app-emacs/cldoc/metadata.xml
index 13c0f1e7ba37..bed1925dc6ff 100644
--- a/app-emacs/cldoc/metadata.xml
+++ b/app-emacs/cldoc/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>common-lisp</herd>
+<maintainer>
+  <email>common-lisp@gentoo.org</email>
+  <name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription>
   Show Common Lisp operators and variables information in echo area.
   cldoc.el has a database of parameters and results of Common Lisp's
diff --git a/app-emacs/ddskk/metadata.xml b/app-emacs/ddskk/metadata.xml
index 7fb92b25f5a4..5040a8886ce7 100644
--- a/app-emacs/ddskk/metadata.xml
+++ b/app-emacs/ddskk/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>cjk</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/eselect-mode/metadata.xml b/app-emacs/eselect-mode/metadata.xml
index 400f45cc2bf2..b7e7a1eeef3e 100644
--- a/app-emacs/eselect-mode/metadata.xml
+++ b/app-emacs/eselect-mode/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>eselect</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>eselect@gentoo.org</email>
+  <name>eselect configuration and management tool</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/ghc-mod/metadata.xml b/app-emacs/ghc-mod/metadata.xml
index d999aca2da6e..9d114c30acf3 100644
--- a/app-emacs/ghc-mod/metadata.xml
+++ b/app-emacs/ghc-mod/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>haskell</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>haskell@gentoo.org</email>
+  <name>Gentoo Haskell</name>
+</maintainer>
 <longdescription>
   This packages includes Elisp files and a Haskell command, "ghc-mod".
   "ghc*.el" enable completion of Haskell symbols on Emacs. Flymake is
diff --git a/app-emacs/google-c-style/metadata.xml b/app-emacs/google-c-style/metadata.xml
index c4a025804ec8..493d6df30e6a 100644
--- a/app-emacs/google-c-style/metadata.xml
+++ b/app-emacs/google-c-style/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>chromium</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>chromium@gentoo.org</email>
+  <name>Chromium in Gentoo Project</name>
+</maintainer>
 <upstream>
   <remote-id type="github">google/styleguide</remote-id>
 </upstream>
diff --git a/app-emacs/imaxima/metadata.xml b/app-emacs/imaxima/metadata.xml
index dff6ceb4b947..1a7ea110cb71 100644
--- a/app-emacs/imaxima/metadata.xml
+++ b/app-emacs/imaxima/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>sci-mathematics</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>sci-mathematics@gentoo.org</email>
+  <name>Gentoo Mathematics Project</name>
+</maintainer>
 <longdescription lang="en">
   Imaxima provides support for interacting with the computer algebra system
   Maxima in an Emacs buffer. Imaxima processes the output from Maxima with TeX
diff --git a/app-emacs/jde/metadata.xml b/app-emacs/jde/metadata.xml
index ba9dba3feeb2..a0bf777ce7ad 100644
--- a/app-emacs/jde/metadata.xml
+++ b/app-emacs/jde/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>java</herd>
+<maintainer>
+  <email>java@gentoo.org</email>
+  <name>Java</name>
+</maintainer>
 <longdescription>
   The Java Development Environment for Emacs is a software package
   that interfaces Emacs to command-line Java development tools (for
diff --git a/app-emacs/lookup/metadata.xml b/app-emacs/lookup/metadata.xml
index 202265529129..5040a8886ce7 100644
--- a/app-emacs/lookup/metadata.xml
+++ b/app-emacs/lookup/metadata.xml
@@ -5,5 +5,8 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>cjk</herd>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/mu-cite/metadata.xml b/app-emacs/mu-cite/metadata.xml
index 202265529129..5040a8886ce7 100644
--- a/app-emacs/mu-cite/metadata.xml
+++ b/app-emacs/mu-cite/metadata.xml
@@ -5,5 +5,8 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>cjk</herd>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/navi2ch/metadata.xml b/app-emacs/navi2ch/metadata.xml
index 4e09ad0e30fd..78964ec687f9 100644
--- a/app-emacs/navi2ch/metadata.xml
+++ b/app-emacs/navi2ch/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>cjk</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 <upstream>
   <remote-id type="sourceforge">navi2ch</remote-id>
 </upstream>
diff --git a/app-emacs/nxml-libvirt-schemas/metadata.xml b/app-emacs/nxml-libvirt-schemas/metadata.xml
index 9078b5ed03d6..42f6ade928f7 100644
--- a/app-emacs/nxml-libvirt-schemas/metadata.xml
+++ b/app-emacs/nxml-libvirt-schemas/metadata.xml
@@ -8,5 +8,8 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>virtualization</herd>
+<maintainer>
+  <email>virtualization@gentoo.org</email>
+  <name>Gentoo Virtualization Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/ocaml-mode/metadata.xml b/app-emacs/ocaml-mode/metadata.xml
index 987ffbd1b686..4f645e55309a 100644
--- a/app-emacs/ocaml-mode/metadata.xml
+++ b/app-emacs/ocaml-mode/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>ml</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>ml@gentoo.org</email>
+  <name>Gentoo ML Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml
index 25d3fe951b7e..26e975a3a7c1 100644
--- a/app-emacs/pymacs/metadata.xml
+++ b/app-emacs/pymacs/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>python</herd>
+<maintainer>
+  <email>python@gentoo.org</email>
+  <name>Python</name>
+</maintainer>
 <upstream>
   <remote-id type="github">pinard/Pymacs</remote-id>
 </upstream>
diff --git a/app-emacs/riece/metadata.xml b/app-emacs/riece/metadata.xml
index fbb92e6910c1..9daa11a4ea20 100644
--- a/app-emacs/riece/metadata.xml
+++ b/app-emacs/riece/metadata.xml
@@ -5,5 +5,4 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>net-irc</herd>
 </pkgmetadata>
diff --git a/app-emacs/slime/metadata.xml b/app-emacs/slime/metadata.xml
index 1cf8ad40d03d..863b99736534 100644
--- a/app-emacs/slime/metadata.xml
+++ b/app-emacs/slime/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>common-lisp</herd>
+<maintainer>
+  <email>common-lisp@gentoo.org</email>
+  <name>Gentoo Common Lisp Project</name>
+</maintainer>
 <longdescription>
   SLIME: The Superior Lisp Interaction Mode for Emacs.  SLIME is a
   fresh, new Emacs mode for Common Lisp development inspired by existing
diff --git a/app-emacs/sumibi/metadata.xml b/app-emacs/sumibi/metadata.xml
index 0672c8815592..b463054f76d0 100644
--- a/app-emacs/sumibi/metadata.xml
+++ b/app-emacs/sumibi/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>cjk</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 <upstream>
   <remote-id type="sourceforge-jp">sumibi</remote-id>
 </upstream>
diff --git a/app-emacs/tuareg-mode/metadata.xml b/app-emacs/tuareg-mode/metadata.xml
index 53adc5aad66b..1597a6098f54 100644
--- a/app-emacs/tuareg-mode/metadata.xml
+++ b/app-emacs/tuareg-mode/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>ml</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>ml@gentoo.org</email>
+  <name>Gentoo ML Project</name>
+</maintainer>
 <longdescription>
   Tuareg is an Object Caml/Camllight mode for Emacs. It handles automatic
   indentation and syntax highlighting of code. It also supports an interactive
diff --git a/app-emacs/wanderlust/metadata.xml b/app-emacs/wanderlust/metadata.xml
index 3e2504b4bb23..adc3998abe76 100644
--- a/app-emacs/wanderlust/metadata.xml
+++ b/app-emacs/wanderlust/metadata.xml
@@ -5,7 +5,10 @@
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
-<herd>net-mail</herd>
+<maintainer>
+  <email>net-mail@gentoo.org</email>
+  <name>Net-Mail</name>
+</maintainer>
 <use>
   <flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
 </use>
diff --git a/app-emacs/yatex/metadata.xml b/app-emacs/yatex/metadata.xml
index 51d2849fce16..8dccdd3f7db3 100644
--- a/app-emacs/yatex/metadata.xml
+++ b/app-emacs/yatex/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>cjk</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 <longdescription lang="en">
   YaTeX is an intelligent, acquisitive and integrated package which reduces
   your efforts of composing LaTeX source on Emacs. And yahtml is the honest
diff --git a/app-emacs/yc/metadata.xml b/app-emacs/yc/metadata.xml
index 7fb92b25f5a4..5040a8886ce7 100644
--- a/app-emacs/yc/metadata.xml
+++ b/app-emacs/yc/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>cjk</herd>
 <maintainer>
   <email>gnu-emacs@gentoo.org</email>
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
+<maintainer>
+  <email>cjk@gentoo.org</email>
+  <name>Cjk</name>
+</maintainer>
 </pkgmetadata>