Replace all herds with appropriate projects (GLEP 67)

Replace all uses of herd with appropriate project maintainers, or no
maintainers in case of herds requested to be disbanded.

14 files changed, 56 insertions, 14 deletions

diff --git a/app-shells/bash-completion/metadata.xml b/app-shells/bash-completion/metadata.xml
index 3b671124159..12406d266d6 100644
--- a/app-shells/bash-completion/metadata.xml
+++ b/app-shells/bash-completion/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>shell-tools</herd>
 <maintainer>
 	<email>mgorny@gentoo.org</email>
 	<name>Michał Górny</name>
 </maintainer>
+<maintainer>
+	<email>shell-tools@gentoo.org</email>
+	<name>Gentoo Shell Tools Project</name>
+</maintainer>
 <longdescription>
   Since v2.04, bash has allowed you to intelligently program and extend its
   standard completion behavior to achieve complex command lines with just a
diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index a35daa8bc6d..1dcaaef97e3 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/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="bashlogger">Log ALL commands typed into bash; should ONLY be
     used in restricted environments such as honeypots</flag>
diff --git a/app-shells/bashdb/metadata.xml b/app-shells/bashdb/metadata.xml
index cd565ccf05d..2d59bec34fa 100644
--- a/app-shells/bashdb/metadata.xml
+++ b/app-shells/bashdb/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>
 	<upstream>
 		<remote-id type="sourceforge">bashdb</remote-id>
 	</upstream>
diff --git a/app-shells/dash/metadata.xml b/app-shells/dash/metadata.xml
index 54de097c10a..3c9a5032f8b 100644
--- a/app-shells/dash/metadata.xml
+++ b/app-shells/dash/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>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:dash:dash</remote-id>
 	</upstream>
diff --git a/app-shells/dsh/metadata.xml b/app-shells/dsh/metadata.xml
index 348e6c4de81..77e2a9a7903 100644
--- a/app-shells/dsh/metadata.xml
+++ b/app-shells/dsh/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/app-shells/gentoo-bashcomp/metadata.xml b/app-shells/gentoo-bashcomp/metadata.xml
index 40149c99556..32cb706ccf7 100644
--- a/app-shells/gentoo-bashcomp/metadata.xml
+++ b/app-shells/gentoo-bashcomp/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>shell-tools</herd>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-shells/hstr/metadata.xml b/app-shells/hstr/metadata.xml
index d96b6993b80..841839c88ab 100644
--- a/app-shells/hstr/metadata.xml
+++ b/app-shells/hstr/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>shell-tools</herd>
 	<maintainer>
 		<email>monsieurp@gentoo.org</email>
 		<name>Patrice Clement</name>
 	</maintainer>
+	<maintainer>
+		<email>shell-tools@gentoo.org</email>
+		<name>Gentoo Shell Tools Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">dvorka/hstr</remote-id>
 	</upstream>
diff --git a/app-shells/mpibash/metadata.xml b/app-shells/mpibash/metadata.xml
index 519354940f1..eef19fd3a3d 100644
--- a/app-shells/mpibash/metadata.xml
+++ b/app-shells/mpibash/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>ottxor@gentoo.org</email>
     <name>Christoph Junghans</name>
   </maintainer>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">losalamos/MPI-Bash</remote-id>
   </upstream>
diff --git a/app-shells/pdsh/metadata.xml b/app-shells/pdsh/metadata.xml
index a2891d92847..1d65aa27b25 100644
--- a/app-shells/pdsh/metadata.xml
+++ b/app-shells/pdsh/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>
 Pdsh is a high-performance, parallel remote shell utility. It has built-in,
 thread-safe clients for Berkeley and Kerberos V4 rsh, and can call SSH
diff --git a/app-shells/push/metadata.xml b/app-shells/push/metadata.xml
index 904fe4e422c..7c9a1dcc313 100644
--- a/app-shells/push/metadata.xml
+++ b/app-shells/push/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>proxy-maintainers</herd>
   <maintainer>
     <email>martin@mvath.de</email>
     <name>Martin Väth</name>
@@ -11,6 +10,10 @@
     <email>axs@gentoo.org</email>
     <description>Proxy committer, CC bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <upstream>
     <maintainer>
       <email>martin@mvath.de</email>
diff --git a/app-shells/rc/metadata.xml b/app-shells/rc/metadata.xml
index bee9f9ae6f0..aff39ca735f 100644
--- a/app-shells/rc/metadata.xml
+++ b/app-shells/rc/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-shells/scsh-install-lib/metadata.xml b/app-shells/scsh-install-lib/metadata.xml
index 5a56f6e7a85..ab856c5af1f 100644
--- a/app-shells/scsh-install-lib/metadata.xml
+++ b/app-shells/scsh-install-lib/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>scheme</herd>
+<maintainer>
+  <email>scheme@gentoo.org</email>
+  <name>Gentoo Scheme Project</name>
+</maintainer>
 <use>
   <flag name="scsh">Use a non-FHS directory layout</flag>
 </use>
diff --git a/app-shells/scsh/metadata.xml b/app-shells/scsh/metadata.xml
index 6b82e4519c9..93ab0784d91 100644
--- a/app-shells/scsh/metadata.xml
+++ b/app-shells/scsh/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>scheme</herd>
+<maintainer>
+	<email>scheme@gentoo.org</email>
+	<name>Gentoo Scheme Project</name>
+</maintainer>
 <longdescription>
 Scsh has two main components: a process notation for running programs
 and setting up pipelines and redirections, and a complete syscall
diff --git a/app-shells/smrsh/metadata.xml b/app-shells/smrsh/metadata.xml
index 51f94e3fbe0..5f39b000ab6 100644
--- a/app-shells/smrsh/metadata.xml
+++ b/app-shells/smrsh/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>net-mail</herd>
+<maintainer>
+	<email>net-mail@gentoo.org</email>
+	<name>Net-Mail</name>
+</maintainer>
 </pkgmetadata>