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.

18 files changed, 56 insertions, 20 deletions

diff --git a/net-ftp/bareftp/metadata.xml b/net-ftp/bareftp/metadata.xml
index e85974a7fa17..76cf08b17733 100644
--- a/net-ftp/bareftp/metadata.xml
+++ b/net-ftp/bareftp/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>dotnet</herd>
+<maintainer>
+	<email>dotnet@gentoo.org</email>
+	<name>Gentoo Dotnet Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-ftp/cmdftp/metadata.xml b/net-ftp/cmdftp/metadata.xml
index 6710eddd2582..f6e9bcab3c3e 100644
--- a/net-ftp/cmdftp/metadata.xml
+++ b/net-ftp/cmdftp/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-ftp</herd>
 <longdescription lang="en">
   Light weight, yet robust command line FTP client with shell-like
   functions.
diff --git a/net-ftp/filezilla/metadata.xml b/net-ftp/filezilla/metadata.xml
index 86db3c1f8f04..6cef8fb41be5 100644
--- a/net-ftp/filezilla/metadata.xml
+++ b/net-ftp/filezilla/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-ftp</herd>
   <maintainer>
     <email>voyageur@gentoo.org</email>
     <name>Bernard Cafarelli</name>
diff --git a/net-ftp/frox/metadata.xml b/net-ftp/frox/metadata.xml
index 349948f1c316..a65447d9f366 100644
--- a/net-ftp/frox/metadata.xml
+++ b/net-ftp/frox/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>bertrand@jacquin.bzh</email>
         <name>Bertrand Jacquin</name>
         <description>Proxied maintainer.</description>
     </maintainer>
+    <maintainer>
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
     <use>
         <flag name="transparent">Enable transparent proxying of data connections</flag>
     </use>
diff --git a/net-ftp/ftp/metadata.xml b/net-ftp/ftp/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-ftp/ftp/metadata.xml
+++ b/net-ftp/ftp/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-ftp/gftp/metadata.xml b/net-ftp/gftp/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/net-ftp/gftp/metadata.xml
+++ b/net-ftp/gftp/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/net-ftp/linksys-tftp/metadata.xml b/net-ftp/linksys-tftp/metadata.xml
index 4ef473d6087e..13a12dff115a 100644
--- a/net-ftp/linksys-tftp/metadata.xml
+++ b/net-ftp/linksys-tftp/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>embedded</herd>
+  <maintainer>
+    <email>embedded@gentoo.org</email>
+    <name>Embedded Gentoo</name>
+  </maintainer>
   <longdescription>An extended version of BSD tftp with passwords</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/netkit-ftpd/metadata.xml b/net-ftp/netkit-ftpd/metadata.xml
index 0384a4ab03a7..c9e13ee6a3c9 100644
--- a/net-ftp/netkit-ftpd/metadata.xml
+++ b/net-ftp/netkit-ftpd/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-ftp/oneclickftp/metadata.xml b/net-ftp/oneclickftp/metadata.xml
index 4b2e4c0373d9..759978409bbb 100644
--- a/net-ftp/oneclickftp/metadata.xml
+++ b/net-ftp/oneclickftp/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">oneclickftp</remote-id>
   </upstream>
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 969249534920..2d395284c7fe 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -15,8 +15,10 @@
 		<name>Sergei Trofimovich</name>
 		<description>Mostly user.</description>
 	</maintainer>
-	<herd>net-ftp</herd>
-	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>ProFTPD grew out of the desire to have a secure and 
 configurable FTP server, and out of a significant admiration of the Apache web 
 server.</longdescription>
diff --git a/net-ftp/pure-ftpd/metadata.xml b/net-ftp/pure-ftpd/metadata.xml
index 6a6ebebb7ad1..08029f27e60d 100644
--- a/net-ftp/pure-ftpd/metadata.xml
+++ b/net-ftp/pure-ftpd/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-ftp</herd>
 <maintainer>
 	<email>polynomial-c@gentoo.org</email>
 	<name>Lars Wendler</name>
diff --git a/net-ftp/pybootd/metadata.xml b/net-ftp/pybootd/metadata.xml
index e256526db2cd..15420dadcb8d 100644
--- a/net-ftp/pybootd/metadata.xml
+++ b/net-ftp/pybootd/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="pypi">pybootd</remote-id>
 		<remote-id type="github">eblot/pybootd</remote-id>
diff --git a/net-ftp/qshare/metadata.xml b/net-ftp/qshare/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/net-ftp/qshare/metadata.xml
+++ b/net-ftp/qshare/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/net-ftp/scythia/metadata.xml b/net-ftp/scythia/metadata.xml
index 3cbebd85b7e2..75d755d08063 100644
--- a/net-ftp/scythia/metadata.xml
+++ b/net-ftp/scythia/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/net-ftp/tftp-hpa/metadata.xml b/net-ftp/tftp-hpa/metadata.xml
index 96a2d586367d..c9e13ee6a3c9 100644
--- a/net-ftp/tftp-hpa/metadata.xml
+++ b/net-ftp/tftp-hpa/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-ftp/tlswrap/metadata.xml b/net-ftp/tlswrap/metadata.xml
index 7a92e30a3922..ffff2d3014a6 100644
--- a/net-ftp/tlswrap/metadata.xml
+++ b/net-ftp/tlswrap/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-ftp</herd>
 	<longdescription lang="en">
 		TLSWRAP is a TLS/SSL FTP wrapper/proxy which allows to use TLS with
 		every FTP client
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index 53e430c2243d..d9f2079175c6 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>net-ftp</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
@@ -16,6 +14,10 @@
 		<name>Johan Bergström</name>
 		<description>Proxy Maintainer. CC him on bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Very Secure FTP Daemon written with speed, size and security
 		in mind
diff --git a/net-ftp/yafc/metadata.xml b/net-ftp/yafc/metadata.xml
index 7bd2aa1c49f0..b93472d83d0b 100644
--- a/net-ftp/yafc/metadata.xml
+++ b/net-ftp/yafc/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>page@cubata.homelinux.net</email>
 		<name>Carles Pagès</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="ssh">Build with SFTP support</flag>
 	</use>