18 files changed, 60 insertions, 18 deletions
diff --git a/app-doc/abs-guide/metadata.xml b/app-doc/abs-guide/metadata.xml
index 659da0ca93c2..1234f04cfb34 100644
--- a/app-doc/abs-guide/metadata.xml
+++ b/app-doc/abs-guide/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-doc/autobook/metadata.xml b/app-doc/autobook/metadata.xml
index 659da0ca93c2..1234f04cfb34 100644
--- a/app-doc/autobook/metadata.xml
+++ b/app-doc/autobook/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-doc/blas-docs/metadata.xml b/app-doc/blas-docs/metadata.xml
index 55cdc5494fbb..a802fad1f861 100644
--- a/app-doc/blas-docs/metadata.xml
+++ b/app-doc/blas-docs/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>
 <longdescription lang="en">
 BLAS (Basic Linear Algebra Subroutines) is a set of efficient routines
 for most of the basic vector and matrix operations. They are widely
diff --git a/app-doc/csound-manual/metadata.xml b/app-doc/csound-manual/metadata.xml
index bd13905b6d0a..1a3458bc134e 100644
--- a/app-doc/csound-manual/metadata.xml
+++ b/app-doc/csound-manual/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>proaudio</herd>
+	<maintainer>
+		<email>proaudio@gentoo.org</email>
+		<name>Gentoo ProAudio Project</name>
+	</maintainer>
 	<use>
 		<flag name="html">Install HTML documentation</flag>
 	</use>
diff --git a/app-doc/doxygen/metadata.xml b/app-doc/doxygen/metadata.xml
index c573796b03a8..b35396859ceb 100644
--- a/app-doc/doxygen/metadata.xml
+++ b/app-doc/doxygen/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>dev-tools</herd>
 <longdescription>Doxygen is a tool for analyzing, documenting, and reverse-engineering 
     source code of various languages using a variety of output formats 
     (try it and see).  Doxygen supports C++, C, Java, Objective-C, Python, 
diff --git a/app-doc/edox-data/metadata.xml b/app-doc/edox-data/metadata.xml
index ac83800a5389..4fbe32c84e9d 100644
--- a/app-doc/edox-data/metadata.xml
+++ b/app-doc/edox-data/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>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <upstream>
 	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
diff --git a/app-doc/geant-docs/metadata.xml b/app-doc/geant-docs/metadata.xml
index fa9b4cb556d3..8656bb5d037a 100644
--- a/app-doc/geant-docs/metadata.xml
+++ b/app-doc/geant-docs/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-physics</herd>
+<maintainer>
+	<email>sci-physics@gentoo.org</email>
+	<name>Gentoo Physics Project</name>
+</maintainer>
 <longdescription lang="en">
   This package contains all the user documentation for the Geant4
   simulation toolkit in PDF formats.
diff --git a/app-doc/gnucash-docs/metadata.xml b/app-doc/gnucash-docs/metadata.xml
index f360b30a1cce..8a68b2d50d12 100644
--- a/app-doc/gnucash-docs/metadata.xml
+++ b/app-doc/gnucash-docs/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>
 	<upstream>
 		<remote-id type="sourceforge">gnucash</remote-id>
 	</upstream>
diff --git a/app-doc/jargon/metadata.xml b/app-doc/jargon/metadata.xml
index fac0ae6714e5..097975e3adc2 100644
--- a/app-doc/jargon/metadata.xml
+++ b/app-doc/jargon/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>app-doc</herd>
 </pkgmetadata>
diff --git a/app-doc/kicad-doc/metadata.xml b/app-doc/kicad-doc/metadata.xml
index 186e47339e54..f4f9d40611ee 100644
--- a/app-doc/kicad-doc/metadata.xml
+++ b/app-doc/kicad-doc/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>
 	<use>
 		<flag name="html">Generate documentation in HTML format</flag>
 		<flag name="pdf">Generate documentation in PDF format</flag>
diff --git a/app-doc/lapack-docs/metadata.xml b/app-doc/lapack-docs/metadata.xml
index cd3018de2bb8..ed0373fc4a96 100644
--- a/app-doc/lapack-docs/metadata.xml
+++ b/app-doc/lapack-docs/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>
 <longdescription lang="en">
 LAPACK is a comprehensive FORTRAN library that does linear
 algebra operations including matrix inversions, least squared
diff --git a/app-doc/linux-device-drivers/metadata.xml b/app-doc/linux-device-drivers/metadata.xml
index 74d25af22b2e..097975e3adc2 100644
--- a/app-doc/linux-device-drivers/metadata.xml
+++ b/app-doc/linux-device-drivers/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kernel-misc</herd>
 </pkgmetadata>
diff --git a/app-doc/linuxfromscratch/metadata.xml b/app-doc/linuxfromscratch/metadata.xml
index 512a5f321eac..f0cd2eaed52c 100644
--- a/app-doc/linuxfromscratch/metadata.xml
+++ b/app-doc/linuxfromscratch/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="htmlsingle">Install all-on-one-page HTML version.</flag>
 	</use>
diff --git a/app-doc/php-docs/metadata.xml b/app-doc/php-docs/metadata.xml
index a8b98f4e37fa..89c1515aa43f 100644
--- a/app-doc/php-docs/metadata.xml
+++ b/app-doc/php-docs/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>php</herd>
+    <maintainer>
+        <email>php-bugs@gentoo.org</email>
+        <name>PHP</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/app-doc/podbrowser/metadata.xml b/app-doc/podbrowser/metadata.xml
index 708bcbd30056..efe799b2b50a 100644
--- a/app-doc/podbrowser/metadata.xml
+++ b/app-doc/podbrowser/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>perl</herd>
+<maintainer>
+	<email>perl@gentoo.org</email>
+	<name>Gentoo Perl Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-doc/root-docs/metadata.xml b/app-doc/root-docs/metadata.xml
index 4947d04a2988..3d3ffb2f7f88 100644
--- a/app-doc/root-docs/metadata.xml
+++ b/app-doc/root-docs/metadata.xml
@@ -5,7 +5,10 @@
     <email>bircoph@gentoo.org</email>
     <name>Andrew Savchenko</name>
   </maintainer>
-  <herd>sci-physics</herd>
+  <maintainer>
+    <email>sci-physics@gentoo.org</email>
+    <name>Gentoo Physics Project</name>
+  </maintainer>
   <longdescription lang="en">
   This package contains the automatically generated ROOT class
   documentation.
diff --git a/app-doc/single-unix-specification/metadata.xml b/app-doc/single-unix-specification/metadata.xml
index 659da0ca93c2..1234f04cfb34 100644
--- a/app-doc/single-unix-specification/metadata.xml
+++ b/app-doc/single-unix-specification/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-doc/tldp-howto/metadata.xml b/app-doc/tldp-howto/metadata.xml
index 0abe3fa9b6f9..5bcee00a8486 100644
--- a/app-doc/tldp-howto/metadata.xml
+++ b/app-doc/tldp-howto/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>base-system</herd>
+	<maintainer>
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
 	<use>
 		<flag name="html">Install multi-chapter HTML docs</flag>
 		<flag name="htmlsingle">Install all-on-one-page HTML docs</flag>