20 files changed, 80 insertions, 20 deletions
diff --git a/sci-calculators/calcoo/metadata.xml b/sci-calculators/calcoo/metadata.xml
index c5a8a0875d1a..f70b3eb37b88 100644
--- a/sci-calculators/calcoo/metadata.xml
+++ b/sci-calculators/calcoo/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>
   Calcoo is a scientific calculator designed to provide maximum
   usability.
diff --git a/sci-calculators/calculator/metadata.xml b/sci-calculators/calculator/metadata.xml
index 82d1363de62e..a3d9e1e09aa4 100644
--- a/sci-calculators/calculator/metadata.xml
+++ b/sci-calculators/calculator/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>mabi@gentoo.org</email>
     <name>Matti Bickel</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription>
   The FOX Calculator is a simple desktop calculator geared toward the
   programmer for the FOX Toolkit. It supports not only a full
diff --git a/sci-calculators/galculator/metadata.xml b/sci-calculators/galculator/metadata.xml
index f6131cfba999..66daf2593f6c 100644
--- a/sci-calculators/galculator/metadata.xml
+++ b/sci-calculators/galculator/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="github">galculator/galculator</remote-id>
 		<remote-id type="sourceforge">galculator</remote-id>
diff --git a/sci-calculators/gonvert/metadata.xml b/sci-calculators/gonvert/metadata.xml
index c9d73bdff576..c09ea47b95ec 100644
--- a/sci-calculators/gonvert/metadata.xml
+++ b/sci-calculators/gonvert/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>chainsaw@gentoo.org</email>
     <name>Tony Vroon</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <longdescription lang="en">
   gonvert is a conversion utility that allows conversion between many
   units like CGS, Ancient, Imperial with many categories like length,
diff --git a/sci-calculators/grpn/metadata.xml b/sci-calculators/grpn/metadata.xml
index 7ece1bced204..1367b173c74b 100644
--- a/sci-calculators/grpn/metadata.xml
+++ b/sci-calculators/grpn/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>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
+<maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-calculators/hcalc/metadata.xml b/sci-calculators/hcalc/metadata.xml
index cc77603f55d0..c152966dd298 100644
--- a/sci-calculators/hcalc/metadata.xml
+++ b/sci-calculators/hcalc/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>
   Small X hexadecimal calculator
 </longdescription>
diff --git a/sci-calculators/hexcalc/metadata.xml b/sci-calculators/hexcalc/metadata.xml
index e5e99f310994..11f69bb5f66b 100644
--- a/sci-calculators/hexcalc/metadata.xml
+++ b/sci-calculators/hexcalc/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>
   hexcalc is a mutli-radix calculator that offers the standard C
   integer operations.
diff --git a/sci-calculators/keurocalc/metadata.xml b/sci-calculators/keurocalc/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/sci-calculators/keurocalc/metadata.xml
+++ b/sci-calculators/keurocalc/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/sci-calculators/orpie/metadata.xml b/sci-calculators/orpie/metadata.xml
index c3fb63e00ce6..2044f6dae6c1 100644
--- a/sci-calculators/orpie/metadata.xml
+++ b/sci-calculators/orpie/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">
   Orpie is a fullscreen RPN calculator for the console. Its operation is
   similar to that of modern HP calculators, but data entry has been
diff --git a/sci-calculators/pcalc/metadata.xml b/sci-calculators/pcalc/metadata.xml
index f7f2c211445a..08fb1649594e 100644
--- a/sci-calculators/pcalc/metadata.xml
+++ b/sci-calculators/pcalc/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>vapier@gentoo.org</email>
 	</maintainer>
+	<maintainer>
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pcalc</remote-id>
 		<remote-id type="github">vapier/pcalc</remote-id>
diff --git a/sci-calculators/qalculate-bases/metadata.xml b/sci-calculators/qalculate-bases/metadata.xml
index 2a0407dd1c41..60ae568380ca 100644
--- a/sci-calculators/qalculate-bases/metadata.xml
+++ b/sci-calculators/qalculate-bases/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">qalculate</remote-id>
 	</upstream>
diff --git a/sci-calculators/qalculate-currency/metadata.xml b/sci-calculators/qalculate-currency/metadata.xml
index 2a0407dd1c41..60ae568380ca 100644
--- a/sci-calculators/qalculate-currency/metadata.xml
+++ b/sci-calculators/qalculate-currency/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">qalculate</remote-id>
 	</upstream>
diff --git a/sci-calculators/qalculate-gtk/metadata.xml b/sci-calculators/qalculate-gtk/metadata.xml
index 5260b5c72e5f..13067ea00f42 100644
--- a/sci-calculators/qalculate-gtk/metadata.xml
+++ b/sci-calculators/qalculate-gtk/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">
   Qalculate! is a multi-purpose desktop calculator for GNU/Linux. It is
   small and simple to use but with much power and versatility
diff --git a/sci-calculators/qalculate-units/metadata.xml b/sci-calculators/qalculate-units/metadata.xml
index 2a0407dd1c41..60ae568380ca 100644
--- a/sci-calculators/qalculate-units/metadata.xml
+++ b/sci-calculators/qalculate-units/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">qalculate</remote-id>
 	</upstream>
diff --git a/sci-calculators/qalculator/metadata.xml b/sci-calculators/qalculator/metadata.xml
index 3cbebd85b7e2..75d755d08063 100644
--- a/sci-calculators/qalculator/metadata.xml
+++ b/sci-calculators/qalculator/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>qt</herd>
+  <maintainer>
+    <email>qt@gentoo.org</email>
+    <name>Gentoo Qt Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sci-calculators/speedcrunch/metadata.xml b/sci-calculators/speedcrunch/metadata.xml
index 8568f761ebc5..498cf61c1be2 100644
--- a/sci-calculators/speedcrunch/metadata.xml
+++ b/sci-calculators/speedcrunch/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">A fast and usable calculator for power users.</longdescription>
   <upstream>
     <remote-id type="google-code">speedcrunch</remote-id>
diff --git a/sci-calculators/tiemu/metadata.xml b/sci-calculators/tiemu/metadata.xml
index 3f72a1c51b7d..2af248f53f3f 100644
--- a/sci-calculators/tiemu/metadata.xml
+++ b/sci-calculators/tiemu/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 project aims to develop a fast emulator for the
   TI89(titanium), 92(+), and V200PLT calculators. This emulator
diff --git a/sci-calculators/tilp2/metadata.xml b/sci-calculators/tilp2/metadata.xml
index e3505ed44c9e..aa9356c986ca 100644
--- a/sci-calculators/tilp2/metadata.xml
+++ b/sci-calculators/tilp2/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">
   TiLP is a linking program for Texas Instruments' graphing
   calculators. It can handle any TI calculator (from TI73 to V200) with
diff --git a/sci-calculators/transcalc/metadata.xml b/sci-calculators/transcalc/metadata.xml
index 6242740909b2..040b26230afb 100644
--- a/sci-calculators/transcalc/metadata.xml
+++ b/sci-calculators/transcalc/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>
     Transcalc is an analysis and synthesis tool for calculating the
     electrical and physical properties of different kinds of RF and
diff --git a/sci-calculators/wcalc/metadata.xml b/sci-calculators/wcalc/metadata.xml
index 2f71e70ac84f..176ce095937a 100644
--- a/sci-calculators/wcalc/metadata.xml
+++ b/sci-calculators/wcalc/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">
   Wcalc is a very capable calculator. It has standard functions (sin,
   asin, and sinh for example, in either radians or degrees), many