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.

16 files changed, 20 insertions, 17 deletions

diff --git a/net-fs/autofs/metadata.xml b/net-fs/autofs/metadata.xml
index c212ce4e2fe6..2a7f710fb3eb 100644
--- a/net-fs/autofs/metadata.xml
+++ b/net-fs/autofs/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>net-fs</herd>
   <maintainer>
     <email>dlan@gentoo.org</email>
     <name>Yixun Lan</name>
diff --git a/net-fs/cifs-utils/metadata.xml b/net-fs/cifs-utils/metadata.xml
index a31a339fc794..e4e47cc32e2a 100644
--- a/net-fs/cifs-utils/metadata.xml
+++ b/net-fs/cifs-utils/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>samba</herd>
 	<maintainer>
 		<email>samba@gentoo.org</email>
 		<name>Samba Team</name>
diff --git a/net-fs/curlftpfs/metadata.xml b/net-fs/curlftpfs/metadata.xml
index d4820325dccf..5c97eb176d87 100644
--- a/net-fs/curlftpfs/metadata.xml
+++ b/net-fs/curlftpfs/metadata.xml
@@ -5,7 +5,6 @@
     <email>slyfox@gentoo.org</email>
     <name>Sergei Trofimovich</name>
   </maintainer>
-  <herd>net-fs</herd>
   <upstream>
     <remote-id type="sourceforge">curlftpfs</remote-id>
   </upstream>
diff --git a/net-fs/davfs2/metadata.xml b/net-fs/davfs2/metadata.xml
index 962495542556..7dff430d9e74 100644
--- a/net-fs/davfs2/metadata.xml
+++ b/net-fs/davfs2/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-fs</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>gokturk@binghamton.edu</email>
 		<name>Gokturk 'gokturk' Yuksek</name>
 		<description>Maintainer. Assign bugs on him</description>
 	</maintainer>	
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-fs/libnfs/metadata.xml b/net-fs/libnfs/metadata.xml
index 355d2a63d717..0852a8e84e32 100644
--- a/net-fs/libnfs/metadata.xml
+++ b/net-fs/libnfs/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="github">sahlberg/libnfs</remote-id>
 	</upstream>
diff --git a/net-fs/netatalk/metadata.xml b/net-fs/netatalk/metadata.xml
index 402c843654a1..ad118d5dbc55 100644
--- a/net-fs/netatalk/metadata.xml
+++ b/net-fs/netatalk/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>net-fs</herd>
   <use>
     <flag name="pgp">
 			Add support pgp authentication module
diff --git a/net-fs/nfs-utils/metadata.xml b/net-fs/nfs-utils/metadata.xml
index 1edec5a78d94..8e8d92002b39 100644
--- a/net-fs/nfs-utils/metadata.xml
+++ b/net-fs/nfs-utils/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>NFS client and server daemons</longdescription>
   <use>
     <flag name="libmount">Link mount.nfs with libmount</flag>
diff --git a/net-fs/nfs4-acl-tools/metadata.xml b/net-fs/nfs4-acl-tools/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-fs/nfs4-acl-tools/metadata.xml
+++ b/net-fs/nfs4-acl-tools/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/net-fs/nfstest/metadata.xml b/net-fs/nfstest/metadata.xml
index 1197f94b2450..e29d3e7703ae 100644
--- a/net-fs/nfstest/metadata.xml
+++ b/net-fs/nfstest/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>net-fs</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
   </maintainer>
diff --git a/net-fs/openafs-kernel/metadata.xml b/net-fs/openafs-kernel/metadata.xml
index 57e1cce72b17..4f8c230c79f7 100644
--- a/net-fs/openafs-kernel/metadata.xml
+++ b/net-fs/openafs-kernel/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>net-fs</herd>
 <maintainer>
 	<email>NP-Hardass@gentoo.org</email>
 	<description>please assign bugs to</description>
diff --git a/net-fs/openafs-legacy/metadata.xml b/net-fs/openafs-legacy/metadata.xml
index dfc945c61126..097975e3adc2 100644
--- a/net-fs/openafs-legacy/metadata.xml
+++ b/net-fs/openafs-legacy/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>net-fs</herd>
 </pkgmetadata>
diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml
index 12670c7a96cc..a1c083b48078 100644
--- a/net-fs/openafs/metadata.xml
+++ b/net-fs/openafs/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>net-fs</herd>
 <maintainer>
 	<email>NP-Hardass@gentoo.org</email>
 	<description>please assign bugs to</description>
diff --git a/net-fs/samba/metadata.xml b/net-fs/samba/metadata.xml
index 9c4471915d80..5bf8ef3d324a 100644
--- a/net-fs/samba/metadata.xml
+++ b/net-fs/samba/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>samba</herd>
 	<maintainer>
 		<email>samba@gentoo.org</email>
 		<name>Samba Team</name>
diff --git a/net-fs/smbnetfs/metadata.xml b/net-fs/smbnetfs/metadata.xml
index e66bb8abaa12..97ad1c6d52cf 100644
--- a/net-fs/smbnetfs/metadata.xml
+++ b/net-fs/smbnetfs/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>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 		<description>Primary Maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		SMBNetFS is a Linux/FreeBSD FUSE filesystem that allow you to use samba/microsoft network.
 
diff --git a/net-fs/smbtad/metadata.xml b/net-fs/smbtad/metadata.xml
index f3b584e4d0b0..76035c6b4f39 100644
--- a/net-fs/smbtad/metadata.xml
+++ b/net-fs/smbtad/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>samba</herd>
   <maintainer>
     <email>samba@gentoo.org</email>
     <name>Samba Team</name>
diff --git a/net-fs/smbtatools/metadata.xml b/net-fs/smbtatools/metadata.xml
index d3af04c2780b..7d8d3aff114b 100644
--- a/net-fs/smbtatools/metadata.xml
+++ b/net-fs/smbtatools/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>samba</herd>
   <maintainer>
     <email>samba@gentoo.org</email>
     <name>Samba Team</name>