9 files changed, 36 insertions, 9 deletions
diff --git a/dev-libs/asmjit/metadata.xml b/dev-libs/asmjit/metadata.xml
index c532e117a..633deb642 100644
--- a/dev-libs/asmjit/metadata.xml
+++ b/dev-libs/asmjit/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</herd>
   <maintainer>
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
 		AsmJit is complete x86/x64 JIT-Assembler for C++ language. It supports
 		32/64-bit x86 processors including all usable extensions (FPU, MMX,
diff --git a/dev-libs/boost-compute/metadata.xml b/dev-libs/boost-compute/metadata.xml
index b93ef2986..0d4aa20c6 100644
--- a/dev-libs/boost-compute/metadata.xml
+++ b/dev-libs/boost-compute/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</herd>
   <maintainer>
     <email>marbre@linux.sungazer.de</email>
     <name>Marius Brehler</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
     Boost.Compute is a GPU/parallel-computing library for C++ based on
     OpenCL. The core library is a thin C++ wrapper over the OpenCL API
diff --git a/dev-libs/fortrancl/metadata.xml b/dev-libs/fortrancl/metadata.xml
index 399d32c0c..8241e62fc 100644
--- a/dev-libs/fortrancl/metadata.xml
+++ b/dev-libs/fortrancl/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</herd>
   <maintainer>
     <email>xarthisius@gentoo.org</email>
     <name>Kacper Kowalik</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
 		FortranCL is an OpenCL interface for Fortran 90. It allows programmers to call
 		the OpenCL parallel programming framework directly from Fortran, so developers
diff --git a/dev-libs/intel-common/metadata.xml b/dev-libs/intel-common/metadata.xml
index 269cea16e..3e849d66e 100644
--- a/dev-libs/intel-common/metadata.xml
+++ b/dev-libs/intel-common/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">
   This package contains the core files to be installed for the Intel
   compilers and libraries. Probably useless if installed standalone.
diff --git a/dev-libs/libconfig/metadata.xml b/dev-libs/libconfig/metadata.xml
index b76530ac9..f760b511c 100644
--- a/dev-libs/libconfig/metadata.xml
+++ b/dev-libs/libconfig/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">
         Libconfig is a simple library for processing structured configuration files.
         Libconfig is very compact — a fraction of the size of the expat XML parser library.
diff --git a/dev-libs/libflatarray/metadata.xml b/dev-libs/libflatarray/metadata.xml
index debafee2a..98a6bf60d 100644
--- a/dev-libs/libflatarray/metadata.xml
+++ b/dev-libs/libflatarray/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>
     LibGeoDecomp is a multi-dimensional C++ array class which provides
     an object-oriented view (a.k.a. array of structs, AoS) while
@@ -11,6 +10,10 @@
   <maintainer>
     <email>gentryx@gmx.de</email>
   </maintainer>
+  <maintainer>
+    <email>cluster@gentoo.org</email>
+    <name>Gentoo Cluster Project</name>
+  </maintainer>
   <use>
     <flag name="cuda">
 	  Enables plugins for NVIDIA GPUs (e.g. CUDAAllocator)
diff --git a/dev-libs/mxml/metadata.xml b/dev-libs/mxml/metadata.xml
index d2f2e69c0..7176399a3 100644
--- a/dev-libs/mxml/metadata.xml
+++ b/dev-libs/mxml/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>sci</herd>
 <maintainer>
   <email>cjk34@cam.ac.uk</email>
   <name>Chris Kerr</name>
   <description>I don't develop this software, I'm just a Gentoo user who
     wanted to install it</description>
 </maintainer>
+<maintainer>
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+</maintainer>
 <longdescription>Mini-XML is a lightweight, ultra-portable XML library
   that requires only an ANSI C compiler and a 'make' program.</longdescription>
 <use/>
diff --git a/dev-libs/simclist/metadata.xml b/dev-libs/simclist/metadata.xml
index 1da3891dc..9aad0a0a8 100644
--- a/dev-libs/simclist/metadata.xml
+++ b/dev-libs/simclist/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>
   SimCList is a high quality C (C++ embeddable) library for handling
   lists. It exploits several advanced techniques for improving
diff --git a/dev-libs/utf8proc/metadata.xml b/dev-libs/utf8proc/metadata.xml
index 4d104ac19..14f64a104 100644
--- a/dev-libs/utf8proc/metadata.xml
+++ b/dev-libs/utf8proc/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>
   utf8proc is a library for processing UTF-8 encoded Unicode
   strings. Some features are Unicode normalization, stripping of