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.

34 files changed, 136 insertions, 35 deletions

diff --git a/app-editors/amyedit/metadata.xml b/app-editors/amyedit/metadata.xml
index 01c0744c8231..3b6e0ff7228b 100644
--- a/app-editors/amyedit/metadata.xml
+++ b/app-editors/amyedit/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>tex</herd>
+  <maintainer>
+    <email>tex@gentoo.org</email>
+    <name>Gentoo TeX Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">amyedit</remote-id>
   </upstream>
diff --git a/app-editors/beaver/metadata.xml b/app-editors/beaver/metadata.xml
index 756a13c648f5..0ef050bf2cbc 100644
--- a/app-editors/beaver/metadata.xml
+++ b/app-editors/beaver/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="sourceforge">beaver-editor</remote-id>
 	</upstream>
diff --git a/app-editors/bluefish/metadata.xml b/app-editors/bluefish/metadata.xml
index 80fb9b49f00e..4a92cf92dd14 100644
--- a/app-editors/bluefish/metadata.xml
+++ b/app-editors/bluefish/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>sdnick484@gmail.com</email>
 		<name>Nick Andrade</name>
 		<description>Active Maintainer, Assign bugs</description>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <use>
 	<flag name="gucharmap">Enable gucharmap dictionary plugin</flag>
 </use>
diff --git a/app-editors/editra/metadata.xml b/app-editors/editra/metadata.xml
index a191ef54b9b3..c03e05d18cbf 100644
--- a/app-editors/editra/metadata.xml
+++ b/app-editors/editra/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>wxwidgets</herd>
+	<maintainer>
+		<email>wxwidgets@gentoo.org</email>
+		<name>Gentoo wxWidgets Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-editors/elvis/metadata.xml b/app-editors/elvis/metadata.xml
index 5fcb67350f69..b8b913650da6 100644
--- a/app-editors/elvis/metadata.xml
+++ b/app-editors/elvis/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>vim</herd>
+<maintainer>
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-editors/focuswriter/metadata.xml b/app-editors/focuswriter/metadata.xml
index ab02f994fdd2..3a6dcf68b823 100644
--- a/app-editors/focuswriter/metadata.xml
+++ b/app-editors/focuswriter/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/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml
index 7b45ad6b3a1c..b198900e33ac 100644
--- a/app-editors/gedit-plugins/metadata.xml
+++ b/app-editors/gedit-plugins/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>
 <longdescription>Official plugins for gedit</longdescription>
 <use>
 	<flag name="charmap">Insert special characters just by clicking on
diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-editors/gedit/metadata.xml
+++ b/app-editors/gedit/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>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-editors/ghex/metadata.xml b/app-editors/ghex/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/app-editors/ghex/metadata.xml
+++ b/app-editors/ghex/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>gnome</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-editors/gummi/metadata.xml b/app-editors/gummi/metadata.xml
index a9cd9b4eb473..195680632c50 100644
--- a/app-editors/gummi/metadata.xml
+++ b/app-editors/gummi/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>alexvandermey@gmail.com</email>
 <name>Alexander van der Mey</name>
@@ -12,6 +11,10 @@
 <name>Markos Chandras</name>
 <description>Proxy maintainer.</description>
 </maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
index f4007d12d814..617bbb647801 100644
--- a/app-editors/gvim/metadata.xml
+++ b/app-editors/gvim/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>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <use>
     <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
     <flag name="netbeans">Include netbeans external editor integration support</flag>
diff --git a/app-editors/hexcurse/metadata.xml b/app-editors/hexcurse/metadata.xml
index eccdb28e857d..76bae4ae405d 100644
--- a/app-editors/hexcurse/metadata.xml
+++ b/app-editors/hexcurse/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>
 <longdescription>
 A console-based hex editor for the *NIX platform which uses the ncurses library.
 </longdescription>
diff --git a/app-editors/jedit/metadata.xml b/app-editors/jedit/metadata.xml
index e0ffd1dacbbe..985fc4de8843 100644
--- a/app-editors/jedit/metadata.xml
+++ b/app-editors/jedit/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>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jedit</remote-id>
 	</upstream>
diff --git a/app-editors/jext/metadata.xml b/app-editors/jext/metadata.xml
index bf4c75acc9b5..5c1ad70c20a6 100644
--- a/app-editors/jext/metadata.xml
+++ b/app-editors/jext/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>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">jext</remote-id>
 	</upstream>
diff --git a/app-editors/juffed/metadata.xml b/app-editors/juffed/metadata.xml
index ac2cf167fb14..104db3fae9cc 100644
--- a/app-editors/juffed/metadata.xml
+++ b/app-editors/juffed/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="sourceforge">juffed</remote-id>
 	</upstream>
diff --git a/app-editors/kile/metadata.xml b/app-editors/kile/metadata.xml
index 184766816831..de52bb50c215 100644
--- a/app-editors/kile/metadata.xml
+++ b/app-editors/kile/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>tex</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>tex@gentoo.org</email>
+		<name>Gentoo TeX Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">kile</remote-id>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
diff --git a/app-editors/latexila/metadata.xml b/app-editors/latexila/metadata.xml
index bba9d6cb634f..506b38acdfbd 100644
--- a/app-editors/latexila/metadata.xml
+++ b/app-editors/latexila/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="latexmk">Install <pkg>dev-tex/latexmk</pkg> (used by default
 		for the build tools)</flag>
diff --git a/app-editors/leo/metadata.xml b/app-editors/leo/metadata.xml
index 31615d44deee..9e447ce37968 100644
--- a/app-editors/leo/metadata.xml
+++ b/app-editors/leo/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>python</herd>
+  <maintainer>
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="github">leo-editor/leo-editor</remote-id>
     <remote-id type="sourceforge">leo</remote-id>
diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index e227b2c1c966..7add4235c5b4 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/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>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <use>
     <flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
diff --git a/app-editors/ng/metadata.xml b/app-editors/ng/metadata.xml
index 2d5852c16c60..898a22cc377c 100644
--- a/app-editors/ng/metadata.xml
+++ b/app-editors/ng/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/app-editors/padre/metadata.xml b/app-editors/padre/metadata.xml
index c4e883858d94..5b2c20b086a6 100644
--- a/app-editors/padre/metadata.xml
+++ b/app-editors/padre/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>perl</herd>
+  <maintainer>
+    <email>perl@gentoo.org</email>
+    <name>Gentoo Perl Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="cpan">Padre</remote-id>
   </upstream>
diff --git a/app-editors/pluma/metadata.xml b/app-editors/pluma/metadata.xml
index cf4c89f861f5..35e6cf12a306 100644
--- a/app-editors/pluma/metadata.xml
+++ b/app-editors/pluma/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/pluma</remote-id>
     </upstream>
diff --git a/app-editors/qxmledit/metadata.xml b/app-editors/qxmledit/metadata.xml
index 64f2a9e844c3..e4fc88c700a7 100644
--- a/app-editors/qxmledit/metadata.xml
+++ b/app-editors/qxmledit/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>qt</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+	<maintainer>
+		<email>qt@gentoo.org</email>
+		<name>Gentoo Qt Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		QXmlEdit is a simple XML editor written in Qt4. Its main
 		features are unusual data visualization modes, it has some
diff --git a/app-editors/scite/metadata.xml b/app-editors/scite/metadata.xml
index ad77fe863a08..02ef8bae19fe 100644
--- a/app-editors/scite/metadata.xml
+++ b/app-editors/scite/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>ervin.peters@ervnet.de</email>
 		<name>Ervin Peters</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scintilla</remote-id>
 	</upstream>
diff --git a/app-editors/tea/metadata.xml b/app-editors/tea/metadata.xml
index 79ad70798a5b..35d9e67fff4b 100644
--- a/app-editors/tea/metadata.xml
+++ b/app-editors/tea/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>
   <longdescription>
     A very small Qt text editor. It has lots of extra features including syntax
     highlighting and a built in file manager as well as a built in image viewer.
diff --git a/app-editors/vile/metadata.xml b/app-editors/vile/metadata.xml
index d221a8d4b42c..5c6a6add557c 100644
--- a/app-editors/vile/metadata.xml
+++ b/app-editors/vile/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>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-editors/vim-core/metadata.xml b/app-editors/vim-core/metadata.xml
index 4728811b89d9..cf63c79b2da6 100644
--- a/app-editors/vim-core/metadata.xml
+++ b/app-editors/vim-core/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>vim</herd>
+	<maintainer>
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">vim/vim</remote-id>
 	</upstream>
diff --git a/app-editors/vim-qt/metadata.xml b/app-editors/vim-qt/metadata.xml
index 108fd3e09ab2..0a6690208773 100644
--- a/app-editors/vim-qt/metadata.xml
+++ b/app-editors/vim-qt/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>
   <use>
     <flag name="lto">Enable configure workaround for -flto</flag>
     <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
diff --git a/app-editors/vim/metadata.xml b/app-editors/vim/metadata.xml
index 6ec53ae58520..08d1823d285a 100644
--- a/app-editors/vim/metadata.xml
+++ b/app-editors/vim/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>vim</herd>
+  <maintainer>
+    <email>vim@gentoo.org</email>
+    <name>Gentoo Vim Project</name>
+  </maintainer>
   <use>
     <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg></flag>
     <flag name="racket">Enable support for Scheme using <pkg>dev-lang/racket</pkg></flag>
diff --git a/app-editors/wxhexeditor/metadata.xml b/app-editors/wxhexeditor/metadata.xml
index fee87e271829..72299366447d 100644
--- a/app-editors/wxhexeditor/metadata.xml
+++ b/app-editors/wxhexeditor/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>wxwidgets</herd>
+  <maintainer>
+    <email>wxwidgets@gentoo.org</email>
+    <name>Gentoo wxWidgets Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">wxhexeditor</remote-id>
   </upstream>
diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index 413e8714efd4..60f767952aed 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/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>xemacs</herd>
   <maintainer>
     <email>xemacs@gentoo.org</email>
     <description>Primary Maintainer</description>
diff --git a/app-editors/xmlcopyeditor/metadata.xml b/app-editors/xmlcopyeditor/metadata.xml
index 5c04de6911fc..3da8128085ba 100644
--- a/app-editors/xmlcopyeditor/metadata.xml
+++ b/app-editors/xmlcopyeditor/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>dabbott@gentoo.org</email>
 		<name>David Abbott</name>
 		<description>Maintainer. Assign bugs to him</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 	Fast, free, validating XML editor.
 </longdescription>
diff --git a/app-editors/xvile/metadata.xml b/app-editors/xvile/metadata.xml
index 5fcb67350f69..b8b913650da6 100644
--- a/app-editors/xvile/metadata.xml
+++ b/app-editors/xvile/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>vim</herd>
+<maintainer>
+	<email>vim@gentoo.org</email>
+	<name>Gentoo Vim Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-editors/znotes/metadata.xml b/app-editors/znotes/metadata.xml
index 1fc9dad40de4..eeafdeadaffc 100644
--- a/app-editors/znotes/metadata.xml
+++ b/app-editors/znotes/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="sourceforge">znotes</remote-id>
 		<remote-id type="github">proton/zNotes</remote-id>