18 files changed, 72 insertions, 18 deletions
diff --git a/sys-cluster/blcr/metadata.xml b/sys-cluster/blcr/metadata.xml
index 1c287012d..3c53aa7bd 100644
--- a/sys-cluster/blcr/metadata.xml
+++ b/sys-cluster/blcr/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>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription>
 Berkeley Lab Checkpoint/Restart for Linux
 </longdescription>
diff --git a/sys-cluster/empi/metadata.xml b/sys-cluster/empi/metadata.xml
index 16a601fe0..8ca444334 100644
--- a/sys-cluster/empi/metadata.xml
+++ b/sys-cluster/empi/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>cluster</herd>
   <maintainer>
     <email>jsbronder@gentoo.org</email>
   </maintainer>
+<maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/ganglia_jobmonarch/metadata.xml b/sys-cluster/ganglia_jobmonarch/metadata.xml
index 081af556e..5acd99b6e 100644
--- a/sys-cluster/ganglia_jobmonarch/metadata.xml
+++ b/sys-cluster/ganglia_jobmonarch/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>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/gasnet/metadata.xml b/sys-cluster/gasnet/metadata.xml
index 98defee4b..5ade5a0aa 100644
--- a/sys-cluster/gasnet/metadata.xml
+++ b/sys-cluster/gasnet/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>cluster</herd>
   <maintainer>
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
+<maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/hpl/metadata.xml b/sys-cluster/hpl/metadata.xml
index c4c0f8c68..1b6af8e78 100644
--- a/sys-cluster/hpl/metadata.xml
+++ b/sys-cluster/hpl/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>cluster</herd>
   <maintainer>
     <email>tantive@gentoo.org</email>
     <name>Michael Imhof</name>
     <description>Release manager, patch manager</description>
   </maintainer>
+<maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/hpx/metadata.xml b/sys-cluster/hpx/metadata.xml
index a0669011b..b1ffc3b13 100644
--- a/sys-cluster/hpx/metadata.xml
+++ b/sys-cluster/hpx/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>cluster</herd>
   <longdescription>
   HPX (High Performance ParalleX) is a general C++ runtime system
   for parallel and distributed applications of any scale. It is the
@@ -14,6 +13,10 @@
   <maintainer>
     <email>gentryx@gmx.de</email>
   </maintainer>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <use>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation</flag>
     <flag name="perftools">Use <pkg>dev-util/google-perftools</pkg> for
diff --git a/sys-cluster/htcondor/metadata.xml b/sys-cluster/htcondor/metadata.xml
index 7767e2fac..50e02c429 100644
--- a/sys-cluster/htcondor/metadata.xml
+++ b/sys-cluster/htcondor/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>cluster</herd>
   <maintainer>
     <email>cjk34@cam.ac.uk</email>
   </maintainer>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription lang="en">
   HTCondor is a open-source, specialized workload management system for
   compute-intensive jobs. Like other full-featured batch systems, HTCondor
diff --git a/sys-cluster/libquo/metadata.xml b/sys-cluster/libquo/metadata.xml
index 119d0fde1..14166e8bf 100644
--- a/sys-cluster/libquo/metadata.xml
+++ b/sys-cluster/libquo/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>sci</herd>
 	<maintainer>
 		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
+<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/lustre/metadata.xml b/sys-cluster/lustre/metadata.xml
index f667429fc..0cd6c37b6 100644
--- a/sys-cluster/lustre/metadata.xml
+++ b/sys-cluster/lustre/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>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription>
 Lustre is a parallel distributed file system, generally used for large scale cluster computing
 </longdescription>
diff --git a/sys-cluster/modules/metadata.xml b/sys-cluster/modules/metadata.xml
index 348e6f428..be4270778 100644
--- a/sys-cluster/modules/metadata.xml
+++ b/sys-cluster/modules/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>cluster</herd>
   <maintainer>
     <email>nicolasbock@gentoo.org</email>
     <name>Nicolas Bock</name>
   </maintainer>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription lang="en">
   The environment modules package provides for an easy dynamic
   modification of a user's environment via modulefiles. which
diff --git a/sys-cluster/mpe2/metadata.xml b/sys-cluster/mpe2/metadata.xml
index 55dd68aad..d3fa01923 100644
--- a/sys-cluster/mpe2/metadata.xml
+++ b/sys-cluster/mpe2/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>cluster</herd>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/mpich/metadata.xml b/sys-cluster/mpich/metadata.xml
index 1738cc60e..8a8f0c342 100644
--- a/sys-cluster/mpich/metadata.xml
+++ b/sys-cluster/mpich/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>cluster</herd>
 	<maintainer>
 		<email>jsbronder@gentoo.org</email>
 		<name>Justin Bronder</name>
@@ -11,6 +10,10 @@
 		<name>Pavan Balaji</name>
 		<description>Upstream Contact</description>
 	</maintainer>
+	<maintainer>
+		<email>cluster@gentoo.org</email>
+		<name>Gentoo Cluster Project</name>
+	</maintainer>
 	<use>
 		<flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
 		<flag name="romio">Build the ROMIO MPI-IO component</flag>
diff --git a/sys-cluster/mpich2/metadata.xml b/sys-cluster/mpich2/metadata.xml
index cd2dfc57b..90eb214c8 100644
--- a/sys-cluster/mpich2/metadata.xml
+++ b/sys-cluster/mpich2/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>cluster</herd>
   <maintainer>
     <email>jsbronder@gentoo.org</email>
     <name>Justin Bronder</name>
@@ -11,6 +10,10 @@
     <name>Pavan Balaji</name>
     <description>Upstream Contact</description>
   </maintainer>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <use>
     <flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
     <flag name="romio">Build the ROMIO MPI-IO component</flag>
diff --git a/sys-cluster/mvapich2/metadata.xml b/sys-cluster/mvapich2/metadata.xml
index 90e009179..ec7db4199 100644
--- a/sys-cluster/mvapich2/metadata.xml
+++ b/sys-cluster/mvapich2/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>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription>
 MVAPICH2 MPI-over-infiniband package auto-configured for OpenIB.
 </longdescription>
diff --git a/sys-cluster/nullmpi/metadata.xml b/sys-cluster/nullmpi/metadata.xml
index 98defee4b..5ade5a0aa 100644
--- a/sys-cluster/nullmpi/metadata.xml
+++ b/sys-cluster/nullmpi/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>cluster</herd>
   <maintainer>
     <email>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
+<maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index fc3a75b44..36690d364 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/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>cluster</herd>
   <maintainer>
     <email>jsbronder@gentoo.org</email>
   </maintainer>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <use>
     <flag name="cma">Enable the CMA (Cross Memory Attach) MCA</flag>
     <flag name="cuda">Add GPU direct support</flag>
diff --git a/sys-cluster/ovis/metadata.xml b/sys-cluster/ovis/metadata.xml
index 4ad7e9bcd..2769a0dde 100644
--- a/sys-cluster/ovis/metadata.xml
+++ b/sys-cluster/ovis/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>sci</herd>
   <maintainer>
     <email>andyspiros@gmail.com</email>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 		The OVIS project addresses scalable, real-time statistical analysis of
 		very large data sets. It contains tools for intelligent, real-time
diff --git a/sys-cluster/pyslice/metadata.xml b/sys-cluster/pyslice/metadata.xml
index 7f2373dfd..403d8253a 100644
--- a/sys-cluster/pyslice/metadata.xml
+++ b/sys-cluster/pyslice/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>cluster</herd>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <longdescription>
 Templating system for parametric modeling.
   </longdescription>