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.

26 files changed, 80 insertions, 26 deletions

diff --git a/x11-wm/afterstep/metadata.xml b/x11-wm/afterstep/metadata.xml
index f06b35b32d00..01b0968807b4 100644
--- a/x11-wm/afterstep/metadata.xml
+++ b/x11-wm/afterstep/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>gentoo.org@vaevictus.net</email>
 		<name>Nathan Mahon</name>
 		<description>Upstream developer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">afterstep</remote-id>
 	</upstream>
diff --git a/x11-wm/awesome/metadata.xml b/x11-wm/awesome/metadata.xml
index 16b654d606c0..b3858662d0b2 100644
--- a/x11-wm/awesome/metadata.xml
+++ b/x11-wm/awesome/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>itumaykin+gentoo@gmail.com</email>
     <name>Coacher</name>
@@ -19,4 +18,8 @@
     <email>wired@gentoo.org</email>
     <name>Alex Alexander</name>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/x11-wm/compiz-fusion/metadata.xml b/x11-wm/compiz-fusion/metadata.xml
index 9e592b3de0a6..796b198e51aa 100644
--- a/x11-wm/compiz-fusion/metadata.xml
+++ b/x11-wm/compiz-fusion/metadata.xml
@@ -5,7 +5,10 @@
   <flag name="emerald">Install the <pkg>x11-wm/emerald</pkg> package.</flag>
   <flag name="unsupported">Install the <pkg>x11-plugins/compiz-fusion-plugins-unsupported</pkg> package.</flag>
 </use>
-<herd>desktop-effects</herd>
+<maintainer>
+  <email>desktop-effects@gentoo.org</email>
+  <name>Desktop effects</name>
+</maintainer>
 <longdescription>
 compiz-fusion is a community-driven project that is aimed at extending the compiz window manager.
 </longdescription>
diff --git a/x11-wm/compiz/metadata.xml b/x11-wm/compiz/metadata.xml
index bf856f7d43b5..fcc8fdcee372 100644
--- a/x11-wm/compiz/metadata.xml
+++ b/x11-wm/compiz/metadata.xml
@@ -11,7 +11,10 @@
       used.
     </flag>
   </use>
-  <herd>desktop-effects</herd>
+  <maintainer>
+    <email>desktop-effects@gentoo.org</email>
+    <name>Desktop effects</name>
+  </maintainer>
   <longdescription>
     compiz is a compositing window manager that uses 3D graphics acceleration via OpenGL.
   </longdescription>
diff --git a/x11-wm/dwm/metadata.xml b/x11-wm/dwm/metadata.xml
index 4f357a207350..44bc61a2424a 100644
--- a/x11-wm/dwm/metadata.xml
+++ b/x11-wm/dwm/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>proxy-maintainers</herd>
 <maintainer>
 	<email>hm.stahl@web.de</email>
 	<name>Michael Stahn</name>
 	<description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription>dwm is a dynamic window manager for X. It manages windows in tiling and floating modes. Either mode can be applied dynamically, optimizing the environment for the application in use and the task performed.</longdescription>
 </pkgmetadata>
diff --git a/x11-wm/echinus/metadata.xml b/x11-wm/echinus/metadata.xml
index 52850330ad34..d475ee0194bb 100644
--- a/x11-wm/echinus/metadata.xml
+++ b/x11-wm/echinus/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>proxy-maintainers</herd>
 	<maintainer>
 		<email>nico@lifeisabug.com</email>
 		<name>Nico R. Wohlgemuth</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="xrandr">Enable support for multihead configuration</flag>
 	</use>
diff --git a/x11-wm/emerald/metadata.xml b/x11-wm/emerald/metadata.xml
index 13d892cb8836..8a2805db49e9 100644
--- a/x11-wm/emerald/metadata.xml
+++ b/x11-wm/emerald/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+	<email>desktop-effects@gentoo.org</email>
+	<name>Desktop effects</name>
+</maintainer>
 <longdescription lang="en">Emerald is a 3D window decorator for compositing window managers such as compiz.</longdescription>
 </pkgmetadata>
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index 46f7522cca3e..b7503ac1f513 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/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>enlightenment</herd>
+<maintainer>
+	<email>enlightenment@gentoo.org</email>
+	<name>Project Enlightenment</name>
+</maintainer>
 <use>
 	<flag name="pango">Enable pango font rendering</flag>
 	<flag name="xrandr">Enable support for the X xrandr extension</flag>
diff --git a/x11-wm/evilwm/metadata.xml b/x11-wm/evilwm/metadata.xml
index cc1d791cf3c8..1125a18285e8 100644
--- a/x11-wm/evilwm/metadata.xml
+++ b/x11-wm/evilwm/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>jaco@uls.co.za</email>
 		<name>Jaco Kroon</name>
 		<description>Proxy-Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 	A minimalist window manager for the X Window System. It maximises screen 
 	real estate and provides good keyboard control. It is currently based on 
diff --git a/x11-wm/fvwm/metadata.xml b/x11-wm/fvwm/metadata.xml
index 703edaa82170..8387f78dd5b3 100644
--- a/x11-wm/fvwm/metadata.xml
+++ b/x11-wm/fvwm/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>proxy-maintainers</herd>
   <maintainer>
 	  <email>i92guboj@gentoo.org</email>
 	  <description>Proxied committer, assign bugs</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
 		fvwm is an ICCCM-compliant X window manager providing a 3D look for
 		window decorations, multiple discontiguous virtual desktops, a high
diff --git a/x11-wm/jwm/metadata.xml b/x11-wm/jwm/metadata.xml
index 986da1cd5ce6..1261c92909a7 100644
--- a/x11-wm/jwm/metadata.xml
+++ b/x11-wm/jwm/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>proxy-maintainers</herd>
 	<maintainer>
 		<email>wraeth@wraeth.id.au</email>
 		<name>Sam Jorna</name>
 		<description>Proxy maintainer for assignee of bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/x11-wm/marco/metadata.xml b/x11-wm/marco/metadata.xml
index 1a53cd0586f6..96d6168dc2c2 100644
--- a/x11-wm/marco/metadata.xml
+++ b/x11-wm/marco/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/marco</remote-id>
     </upstream>
diff --git a/x11-wm/matchbox-common/metadata.xml b/x11-wm/matchbox-common/metadata.xml
index 0f45a914148b..59ca8723f9d0 100644
--- a/x11-wm/matchbox-common/metadata.xml
+++ b/x11-wm/matchbox-common/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>gpe</herd>
 <use>
 	<flag name="pda">Support for pda folders</flag>
 </use>
diff --git a/x11-wm/matchbox-desktop/metadata.xml b/x11-wm/matchbox-desktop/metadata.xml
index 0c994964d804..91130aa74dfc 100644
--- a/x11-wm/matchbox-desktop/metadata.xml
+++ b/x11-wm/matchbox-desktop/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>gpe</herd>
   <use>
     <flag name="dnotify">Use the linux kernel directory notification feature.</flag>
   </use>
diff --git a/x11-wm/matchbox-panel/metadata.xml b/x11-wm/matchbox-panel/metadata.xml
index 26f436c695d4..9e349018ff53 100644
--- a/x11-wm/matchbox-panel/metadata.xml
+++ b/x11-wm/matchbox-panel/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>gpe</herd>
   <use>
     <flag name="dnotify">Use the linux kernel directory notification feature.</flag>
     <flag name="lowres">Optimize for low resolution screens.</flag>
diff --git a/x11-wm/matchbox-window-manager/metadata.xml b/x11-wm/matchbox-window-manager/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-wm/matchbox-window-manager/metadata.xml
+++ b/x11-wm/matchbox-window-manager/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-wm/matchbox/metadata.xml b/x11-wm/matchbox/metadata.xml
index 6a17403e0ad0..097975e3adc2 100644
--- a/x11-wm/matchbox/metadata.xml
+++ b/x11-wm/matchbox/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gpe</herd>
 </pkgmetadata>
diff --git a/x11-wm/muffin/metadata.xml b/x11-wm/muffin/metadata.xml
index fc4050a85c75..b054626321c3 100644
--- a/x11-wm/muffin/metadata.xml
+++ b/x11-wm/muffin/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">linuxmint/muffin</remote-id>
 	</upstream>
diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 31e8de5153d5..73990875cc81 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/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="kms">Enable KMS support.</flag>
 	</use>
diff --git a/x11-wm/notion/metadata.xml b/x11-wm/notion/metadata.xml
index 653526ddc2c3..6e0baf3e1ff7 100644
--- a/x11-wm/notion/metadata.xml
+++ b/x11-wm/notion/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>proxy-maintainers</herd>
 	<maintainer>
 		<email>moaxcp@gmail.com</email>
 		<name>John Mercier</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="xrandr">Add support for xrandr</flag>
 	</use>
diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
index 3aa0a2352d79..d202d71e035a 100644
--- a/x11-wm/openbox/metadata.xml
+++ b/x11-wm/openbox/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>lxde</herd>
   <maintainer>
   	<email>hwoarang@gentoo.org</email>
 	<name>Markos Chandras</name>
   </maintainer>
+  <maintainer>
+    <email>lxde@gentoo.org</email>
+    <name>Gentoo LXDE Project</name>
+  </maintainer>
   <use>
  	 <flag name="session">Enables support for session managers</flag>
 	 <flag name="xdg">Install the python xdg files for xdg autostart</flag>
diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml
index ffd0128b67b2..87e8c4f429f4 100644
--- a/x11-wm/pekwm/metadata.xml
+++ b/x11-wm/pekwm/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>jer@gentoo.org</email>
 	</maintainer>
@@ -9,6 +8,10 @@
 		<email>linbug+gbz@posteo.org</email>
 		<name>Andreas Schlick</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		Pekwm is a window manager based on aewm++, but it no longer resembles 
 		it. It is highly configurable, rather fast, and aimed towards being 
diff --git a/x11-wm/twm/metadata.xml b/x11-wm/twm/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-wm/twm/metadata.xml
+++ b/x11-wm/twm/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>x11</herd>
+<maintainer>
+	<email>x11@gentoo.org</email>
+	<name>X11</name>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-wm/windowmaker/metadata.xml b/x11-wm/windowmaker/metadata.xml
index a1c7b30fe81c..d6d007a2a772 100644
--- a/x11-wm/windowmaker/metadata.xml
+++ b/x11-wm/windowmaker/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>gnustep</herd>
+	<maintainer>
+		<email>gnustep@gentoo.org</email>
+		<name>Gentoo GNUstep Project</name>
+	</maintainer>
 	<use>
 		<flag name="modelock">Enable XKB language status lock support. README
 			says: "If you don't know what it is you probably don't need
diff --git a/x11-wm/xmonad-contrib/metadata.xml b/x11-wm/xmonad-contrib/metadata.xml
index a6f9a08c6dc0..ed5970bd1ddf 100644
--- a/x11-wm/xmonad-contrib/metadata.xml
+++ b/x11-wm/xmonad-contrib/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>haskell</herd>
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
diff --git a/x11-wm/xmonad/metadata.xml b/x11-wm/xmonad/metadata.xml
index 68b3928591d4..2da1a934e2d2 100644
--- a/x11-wm/xmonad/metadata.xml
+++ b/x11-wm/xmonad/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>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
 	<use>
 		<flag name="default-term">Pull terminal specified in default xmonad config
 			to be a bit less hostile by default.</flag>