6 files changed, 7 insertions, 21 deletions
diff --git a/dev-vcs/git-cola/metadata.xml b/dev-vcs/git-cola/metadata.xml
index 7ee28e37558e..583b3d36c086 100644
--- a/dev-vcs/git-cola/metadata.xml
+++ b/dev-vcs/git-cola/metadata.xml
@@ -5,10 +5,6 @@
     <email>dev-zero@gentoo.org</email>
     <name>Tiziano Müller</name>
   </maintainer>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher</name>
-  </maintainer>
   <upstream>
     <remote-id type="github">git-cola/git-cola</remote-id>
   </upstream>
diff --git a/dev-vcs/git-sh/metadata.xml b/dev-vcs/git-sh/metadata.xml
index cca713b1b431..c6a8dc624659 100644
--- a/dev-vcs/git-sh/metadata.xml
+++ b/dev-vcs/git-sh/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
+  <herd>dev-tools</herd>
   <longdescription lang="en">
 	</longdescription>
   <upstream>
diff --git a/dev-vcs/gitinspector/metadata.xml b/dev-vcs/gitinspector/metadata.xml
index d2c36602f3e1..a831c76ff49a 100644
--- a/dev-vcs/gitinspector/metadata.xml
+++ b/dev-vcs/gitinspector/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
+  <herd>dev-tools</herd>
   <upstream>
     <remote-id type="github">ejwa/gitinspector</remote-id>
   </upstream>
diff --git a/dev-vcs/gitsh/metadata.xml b/dev-vcs/gitsh/metadata.xml
index f89100e407ee..17ad8d3eedf3 100644
--- a/dev-vcs/gitsh/metadata.xml
+++ b/dev-vcs/gitsh/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
+  <herd>dev-tools</herd>
   <upstream>
     <remote-id type="github">thoughtbot/gitsh</remote-id>
   </upstream>
diff --git a/dev-vcs/gitstats/metadata.xml b/dev-vcs/gitstats/metadata.xml
index a61302b2299d..b28b4604fda4 100644
--- a/dev-vcs/gitstats/metadata.xml
+++ b/dev-vcs/gitstats/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-  </maintainer>
+  <herd>dev-tools</herd>
   <upstream>
     <remote-id type="sourceforge">gitstats</remote-id>
   </upstream>
diff --git a/dev-vcs/rapidsvn/metadata.xml b/dev-vcs/rapidsvn/metadata.xml
index c975c4e39268..f093f104d17c 100644
--- a/dev-vcs/rapidsvn/metadata.xml
+++ b/dev-vcs/rapidsvn/metadata.xml
@@ -2,11 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>dev-tools</herd>
-  <maintainer>
-    <email>jlec@gentoo.org</email>
-    <name>Justin Lecher</name>
-  </maintainer>
   <longdescription>
-RapidSVN is a cross-platform GUI front-end for the Subversion revision system written in C++ using the wxWidgets framework. This project also includes a Subversion client C++ API.
+RapidSVN is a cross-platform GUI front-end for the Subversion revision 
+system written in C++ using the wxWidgets framework. This project also 
+includes a Subversion client C++ API.
 </longdescription>
 </pkgmetadata>