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, 60 insertions, 15 deletions

diff --git a/x11-terms/evilvte/metadata.xml b/x11-terms/evilvte/metadata.xml
index 540f810e069d..b83938893367 100644
--- a/x11-terms/evilvte/metadata.xml
+++ b/x11-terms/evilvte/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>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-terms/gnome-terminal/metadata.xml b/x11-terms/gnome-terminal/metadata.xml
index 04c70dc7bc27..80d300c4fbd9 100644
--- a/x11-terms/gnome-terminal/metadata.xml
+++ b/x11-terms/gnome-terminal/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>
 <use>
 	<flag name="gnome-shell">Integrate with <pkg>gnome-base/gnome-shell</pkg> search</flag>
 	<flag name="nautilus">Build gnome-base/nautilus extension</flag>
diff --git a/x11-terms/guake/metadata.xml b/x11-terms/guake/metadata.xml
index 41ba86c657b9..c9fa4ad1118e 100644
--- a/x11-terms/guake/metadata.xml
+++ b/x11-terms/guake/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>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">Guake/guake</remote-id>
   </upstream>
diff --git a/x11-terms/hanterm/metadata.xml b/x11-terms/hanterm/metadata.xml
index fbc6117c50fb..0f0ed2e44cf7 100644
--- a/x11-terms/hanterm/metadata.xml
+++ b/x11-terms/hanterm/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>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 <use>
 	<flag name="utempter">Records user logins. Useful on multi-user
 		systems</flag>
diff --git a/x11-terms/kterm/metadata.xml b/x11-terms/kterm/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/x11-terms/kterm/metadata.xml
+++ b/x11-terms/kterm/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>cjk</herd>
+<maintainer>
+	<email>cjk@gentoo.org</email>
+	<name>Cjk</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-terms/lilyterm/metadata.xml b/x11-terms/lilyterm/metadata.xml
index 4bff79f2c77e..46dc3fc75e20 100644
--- a/x11-terms/lilyterm/metadata.xml
+++ b/x11-terms/lilyterm/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>desktop-misc</herd>
 <maintainer>
 <email>jer@gentoo.org</email>
 </maintainer>
+<maintainer>
+<email>desktop-misc@gentoo.org</email>
+<name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-terms/mate-terminal/metadata.xml b/x11-terms/mate-terminal/metadata.xml
index 8cdad0d38750..d937c3998faa 100644
--- a/x11-terms/mate-terminal/metadata.xml
+++ b/x11-terms/mate-terminal/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>mate</herd>
+    <maintainer>
+        <email>mate@gentoo.org</email>
+        <name>Gentoo MATE Desktop</name>
+    </maintainer>
     <upstream>
         <remote-id type="github">mate-desktop/mate-terminal</remote-id>
     </upstream>
diff --git a/x11-terms/mlterm/metadata.xml b/x11-terms/mlterm/metadata.xml
index 1ca794ab6c6c..102a8660d1ea 100644
--- a/x11-terms/mlterm/metadata.xml
+++ b/x11-terms/mlterm/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>cjk</herd>
+  <maintainer>
+    <email>cjk@gentoo.org</email>
+    <name>Cjk</name>
+  </maintainer>
   <use>
     <flag name="fcitx">Enable <pkg>app-i18n/fcitx</pkg> support</flag>
     <flag name="ibus">Enable <pkg>app-i18n/ibus</pkg> support</flag>
diff --git a/x11-terms/qterminal/metadata.xml b/x11-terms/qterminal/metadata.xml
index 1a44f652bb9a..1d38166fd58e 100644
--- a/x11-terms/qterminal/metadata.xml
+++ b/x11-terms/qterminal/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>qt</herd>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">qterminal/qterminal</remote-id>
 	</upstream>
diff --git a/x11-terms/roxterm/metadata.xml b/x11-terms/roxterm/metadata.xml
index f949b64efa02..556b4a10ef9d 100644
--- a/x11-terms/roxterm/metadata.xml
+++ b/x11-terms/roxterm/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>russell@annunaki2k2.co.uk</email>
 		<name>Russell Knighton</name>
 		<description>Proxy (user) maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">roxterm</remote-id>
 	</upstream>
diff --git a/x11-terms/sakura/metadata.xml b/x11-terms/sakura/metadata.xml
index dd8e5f462cab..dcd7e4689cbd 100644
--- a/x11-terms/sakura/metadata.xml
+++ b/x11-terms/sakura/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>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <longdescription>
     sakura is a terminal emulator based on GTK and VTE. It's a terminal emulator
     with few dependencies, so you don't need a full GNOME desktop installed to
diff --git a/x11-terms/terminator/metadata.xml b/x11-terms/terminator/metadata.xml
index 656ec8ecc71e..a489336e3717 100644
--- a/x11-terms/terminator/metadata.xml
+++ b/x11-terms/terminator/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>desktop-misc</herd>
+  <maintainer>
+    <email>desktop-misc@gentoo.org</email>
+    <name>Gentoo Desktop Miscellaneous Project</name>
+  </maintainer>
   <longdescription>
 	Much of the behaviour of Terminator is based on GNOME Terminal, and 
 	we are adding more features from that as time goes by, but we also 
diff --git a/x11-terms/terminology/metadata.xml b/x11-terms/terminology/metadata.xml
index b501a2013950..53ab9c19792a 100644
--- a/x11-terms/terminology/metadata.xml
+++ b/x11-terms/terminology/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>enlightenment</herd>
 <maintainer>
 	<email>sera@gentoo.org</email>
 </maintainer>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-terms/xterm/metadata.xml b/x11-terms/xterm/metadata.xml
index eb809ad385f4..baff5deb0584 100644
--- a/x11-terms/xterm/metadata.xml
+++ b/x11-terms/xterm/metadata.xml
@@ -5,8 +5,14 @@
     <email>dickey@invisible-island.net</email>
     <name>Thomas Dickey</name>
   </maintainer>
-  <herd>x11</herd>
-  <herd>proxy-maintainers</herd>
+  <maintainer>
+    <email>x11@gentoo.org</email>
+    <name>X11</name>
+  </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="openpty">Use openpty() in preference to posix_openpt()</flag>
     <flag name="toolbar">Enable the xterm toolbar to be built</flag>