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.

30 files changed, 124 insertions, 32 deletions

diff --git a/net-print/apsfilter/metadata.xml b/net-print/apsfilter/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/net-print/apsfilter/metadata.xml
+++ b/net-print/apsfilter/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>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/c2esp/metadata.xml b/net-print/c2esp/metadata.xml
index dd23d29d0696..9dc64197e883 100644
--- a/net-print/c2esp/metadata.xml
+++ b/net-print/c2esp/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>printing</herd>
   <maintainer>
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
   </maintainer>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
   <upstream>
     <remote-id type="sourceforge">cupsdriverkodak</remote-id>
   </upstream>
diff --git a/net-print/cups-bjnp/metadata.xml b/net-print/cups-bjnp/metadata.xml
index 88a6a6da2e3b..1b5cd12ab62c 100644
--- a/net-print/cups-bjnp/metadata.xml
+++ b/net-print/cups-bjnp/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cups-bjnp</remote-id>
 	</upstream>
diff --git a/net-print/cups-filters/metadata.xml b/net-print/cups-filters/metadata.xml
index 791a4963fd3e..610c338d7d59 100644
--- a/net-print/cups-filters/metadata.xml
+++ b/net-print/cups-filters/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>printing</herd>
+  <maintainer>
+  <email>printing@gentoo.org</email>
+  <name>Gentoo Printing Project</name>
+  </maintainer>
   <use>
   <flag name="foomatic">
      Build the included foomatic-rip printer driver. Strongly recommended.
diff --git a/net-print/cups-pdf/metadata.xml b/net-print/cups-pdf/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/net-print/cups-pdf/metadata.xml
+++ b/net-print/cups-pdf/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>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/cups-pk-helper/metadata.xml b/net-print/cups-pk-helper/metadata.xml
index dad9001338dc..d27adefecf34 100644
--- a/net-print/cups-pk-helper/metadata.xml
+++ b/net-print/cups-pk-helper/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-print/cups-windows/metadata.xml b/net-print/cups-windows/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/net-print/cups-windows/metadata.xml
+++ b/net-print/cups-windows/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>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index 21c1b4c36efa..ab783f3821bf 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/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>printing</herd>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
   <use>
     <flag name="lprng-compat">
       Do not install lp... binaries so cups and lprng can coexist.
diff --git a/net-print/fax4cups/metadata.xml b/net-print/fax4cups/metadata.xml
index b5041330ba8b..5cb42a7ae10c 100644
--- a/net-print/fax4cups/metadata.xml
+++ b/net-print/fax4cups/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>printing</herd>
+<maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+</maintainer>
 <use>
     <flag name="hylafax">Install net-misc/hylafax backend</flag>
     <flag name="efax">Install net-misc/efax backend</flag>
diff --git a/net-print/foo2zjs/metadata.xml b/net-print/foo2zjs/metadata.xml
index 447cad30a8fc..81ae2b6553cf 100644
--- a/net-print/foo2zjs/metadata.xml
+++ b/net-print/foo2zjs/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>printing</herd>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/net-print/foomatic-db-engine/metadata.xml b/net-print/foomatic-db-engine/metadata.xml
index e450ba260ec9..caf1e679c130 100644
--- a/net-print/foomatic-db-engine/metadata.xml
+++ b/net-print/foomatic-db-engine/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/foomatic-db-ppds/metadata.xml b/net-print/foomatic-db-ppds/metadata.xml
index e450ba260ec9..caf1e679c130 100644
--- a/net-print/foomatic-db-ppds/metadata.xml
+++ b/net-print/foomatic-db-ppds/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/foomatic-db/metadata.xml b/net-print/foomatic-db/metadata.xml
index e450ba260ec9..caf1e679c130 100644
--- a/net-print/foomatic-db/metadata.xml
+++ b/net-print/foomatic-db/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/foomatic-filters/metadata.xml b/net-print/foomatic-filters/metadata.xml
index e450ba260ec9..caf1e679c130 100644
--- a/net-print/foomatic-filters/metadata.xml
+++ b/net-print/foomatic-filters/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/foomatic-gui/metadata.xml b/net-print/foomatic-gui/metadata.xml
index f5e9aa5b215c..184d76fb5055 100644
--- a/net-print/foomatic-gui/metadata.xml
+++ b/net-print/foomatic-gui/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">foomatic-gui</remote-id>
 	</upstream>
diff --git a/net-print/gmso2/metadata.xml b/net-print/gmso2/metadata.xml
index 6a298fd15827..6eea05a26e4c 100644
--- a/net-print/gmso2/metadata.xml
+++ b/net-print/gmso2/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>java</herd>
 	<maintainer>
 		<email>java@gentoo.org</email>
 	</maintainer>
diff --git a/net-print/gtklp/metadata.xml b/net-print/gtklp/metadata.xml
index 943c68620e38..07ae5a9e0477 100644
--- a/net-print/gtklp/metadata.xml
+++ b/net-print/gtklp/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<longdescription>
 	GtkLP is an graphical frontend for CUPS, the Common UNIX Printing System.
 	It is used to have an easy (and graphical) access to all of the many options
diff --git a/net-print/gutenprint/metadata.xml b/net-print/gutenprint/metadata.xml
index 09e04478b8db..e9c5e42ce556 100644
--- a/net-print/gutenprint/metadata.xml
+++ b/net-print/gutenprint/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gimp-print</remote-id>
 	</upstream>
diff --git a/net-print/hplip/metadata.xml b/net-print/hplip/metadata.xml
index 36375d8c02c9..4c7772592632 100644
--- a/net-print/hplip/metadata.xml
+++ b/net-print/hplip/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>printing</herd>
 	<maintainer>
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
 	</maintainer>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<use>
 		<flag name="doc">Build documentation</flag>
 		<flag name="fax">Enable fax on multifunction devices which support it</flag>
diff --git a/net-print/ink/metadata.xml b/net-print/ink/metadata.xml
index f2b69ae1caa4..efcb3a5dcaf3 100644
--- a/net-print/ink/metadata.xml
+++ b/net-print/ink/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ink</remote-id>
 	</upstream>
diff --git a/net-print/libgnomecups/metadata.xml b/net-print/libgnomecups/metadata.xml
index f7a4fe6435e1..2582d48eac7a 100644
--- a/net-print/libgnomecups/metadata.xml
+++ b/net-print/libgnomecups/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<herd>printing</herd>
+<maintainer>
+	<email>gnome@gentoo.org</email>
+	<name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/libinklevel/metadata.xml b/net-print/libinklevel/metadata.xml
index d737387c7805..4660d0b1743c 100644
--- a/net-print/libinklevel/metadata.xml
+++ b/net-print/libinklevel/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libinklevel</remote-id>
 	</upstream>
diff --git a/net-print/lprng/metadata.xml b/net-print/lprng/metadata.xml
index b04e4cfadbc6..a1cc1d39d881 100644
--- a/net-print/lprng/metadata.xml
+++ b/net-print/lprng/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>printing</herd>
 	<maintainer>
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
+<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/net-print/magicfilter/metadata.xml b/net-print/magicfilter/metadata.xml
index 865a3c330b0e..421660d2cb94 100644
--- a/net-print/magicfilter/metadata.xml
+++ b/net-print/magicfilter/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>printing</herd>
+  <maintainer>
+    <email>printing@gentoo.org</email>
+    <name>Gentoo Printing Project</name>
+  </maintainer>
   <use>
     <flag name="lprng-failsafe">Refuse options for compability with certain LPRng versions.</flag>
   </use>
diff --git a/net-print/mtink/metadata.xml b/net-print/mtink/metadata.xml
index 403e2746cbe2..d8615272250d 100644
--- a/net-print/mtink/metadata.xml
+++ b/net-print/mtink/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>printing</herd>
-<herd>proxy-maintainers</herd>
 <maintainer><email>SebastianLuther@gmx.de</email></maintainer>
+<maintainer>
+<email>printing@gentoo.org</email>
+<name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/npadmin/metadata.xml b/net-print/npadmin/metadata.xml
index 911d11367046..5293d779b230 100644
--- a/net-print/npadmin/metadata.xml
+++ b/net-print/npadmin/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">npadmin</remote-id>
 	</upstream>
diff --git a/net-print/pnm2ppa/metadata.xml b/net-print/pnm2ppa/metadata.xml
index 9a586855c36c..ea03a7d8de22 100644
--- a/net-print/pnm2ppa/metadata.xml
+++ b/net-print/pnm2ppa/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>printing</herd>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pnm2ppa</remote-id>
 	</upstream>
diff --git a/net-print/poster/metadata.xml b/net-print/poster/metadata.xml
index 1fa0ca569505..6439400ee194 100644
--- a/net-print/poster/metadata.xml
+++ b/net-print/poster/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>printing</herd>
+<maintainer>
+	<email>printing@gentoo.org</email>
+	<name>Gentoo Printing Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/net-print/pykota/metadata.xml b/net-print/pykota/metadata.xml
index e3972d2e16ea..0db81fc0278f 100644
--- a/net-print/pykota/metadata.xml
+++ b/net-print/pykota/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>printing</herd>
 	<maintainer>
 		<email>chutzpah@gentoo.org</email>
 		<name>Patrick McLean</name>
 	</maintainer>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<longdescription lang="en">
 		PyKota is a complete GPLed Print Quota and Accounting Software Solution
 		for the Common UNIX Printing System (CUPS).
diff --git a/net-print/splix/metadata.xml b/net-print/splix/metadata.xml
index 4e6e5d745b1c..9cc8e98d0bdb 100644
--- a/net-print/splix/metadata.xml
+++ b/net-print/splix/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>printing</herd>
 	<maintainer>
 		<email>wschlich@gentoo.org</email>
 		<name>Wolfram Schlich</name>
@@ -11,6 +10,10 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
+	<maintainer>
+		<email>printing@gentoo.org</email>
+		<name>Gentoo Printing Project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">splix</remote-id>
 	</upstream>