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.

23 files changed, 48 insertions, 24 deletions

diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
index 694128c76da0..9138b855e775 100644
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/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>app-backup</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<description>Primary maintainer</description>
@@ -18,6 +16,10 @@
 		<description>Upstream. Please CC on bugs.</description>
 		<name>Dustin J. Mitchell</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="xfs">Support for backing up raw XFS filesystems using xfsdump</flag>
 		<flag name="s3">Support for backing up to the Amazon S3 system</flag>
diff --git a/app-backup/backup-manager/metadata.xml b/app-backup/backup-manager/metadata.xml
index 4c100da6216e..2dbad1a4a8de 100644
--- a/app-backup/backup-manager/metadata.xml
+++ b/app-backup/backup-manager/metadata.xml
@@ -5,7 +5,6 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
-	<herd>app-backup</herd>
 	<longdescription>command line backup tool, designed to help make daily archives of the file system. It can make archives in lots of open formats (tar, gzip, bzip2, lzma, dar, zip) and provides interesting features (such as network exports or CD/DVD automated-burning)</longdescription>
 	<use>
 		<flag name="s3">Support for backing up to the Amazon S3 system</flag>
diff --git a/app-backup/backupninja/metadata.xml b/app-backup/backupninja/metadata.xml
index e7059eab1b95..c6bd378ff01c 100644
--- a/app-backup/backupninja/metadata.xml
+++ b/app-backup/backupninja/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>proxy-maintainers</herd>
 <maintainer>
 	<email>premek@vohnout.cz</email>
 	<name>Přemysl Vohnout</name>
 </maintainer>
+<maintainer>
+	<email>proxy-maint@gentoo.org</email>
+	<name>Proxy Maintainers</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-backup/backuppc/metadata.xml b/app-backup/backuppc/metadata.xml
index 1d438e3031fe..9b6fcba8d33b 100644
--- a/app-backup/backuppc/metadata.xml
+++ b/app-backup/backuppc/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>app-backup</herd>
 	<upstream>
 		<remote-id type="sourceforge">backuppc</remote-id>
 	</upstream>
diff --git a/app-backup/bacula/metadata.xml b/app-backup/bacula/metadata.xml
index ee8e4ede21a2..73009da88973 100644
--- a/app-backup/bacula/metadata.xml
+++ b/app-backup/bacula/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>app-backup</herd>
 	<maintainer>
 		<email>tomjbe@gentoo.org</email>
 		<name>Thomas Beierlein</name>
diff --git a/app-backup/boxbackup/metadata.xml b/app-backup/boxbackup/metadata.xml
index 65452a7de81c..2da53a6fa649 100644
--- a/app-backup/boxbackup/metadata.xml
+++ b/app-backup/boxbackup/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>app-backup</herd>
 	<longdescription>An open source, completely automatic on-line backup
 		system for UNIX.</longdescription>
 	<use>
diff --git a/app-backup/cdbackup/metadata.xml b/app-backup/cdbackup/metadata.xml
index e94d7236906d..097975e3adc2 100644
--- a/app-backup/cdbackup/metadata.xml
+++ b/app-backup/cdbackup/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>app-backup</herd>
 </pkgmetadata>
diff --git a/app-backup/cdbkup/metadata.xml b/app-backup/cdbkup/metadata.xml
index a41124469c09..a1639af4475b 100644
--- a/app-backup/cdbkup/metadata.xml
+++ b/app-backup/cdbkup/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>app-backup</herd>
 	<longdescription>A backup application capable of full/incremental backups on
 	local and remote systems onto cd-r and cd-rw discs.</longdescription>
 	<upstream>
diff --git a/app-backup/cpdup/metadata.xml b/app-backup/cpdup/metadata.xml
index ecedda4aa2cc..d7caf7d3b1d4 100644
--- a/app-backup/cpdup/metadata.xml
+++ b/app-backup/cpdup/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>bsd</herd>
+<maintainer>
+	<email>bsd@gentoo.org</email>
+	<name>BSD Project</name>
+</maintainer>
 </pkgmetadata>
diff --git a/app-backup/deja-dup/metadata.xml b/app-backup/deja-dup/metadata.xml
index 2c112e3cab72..f1b134a85370 100644
--- a/app-backup/deja-dup/metadata.xml
+++ b/app-backup/deja-dup/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="nautilus">Build gnome-base/nautilus extension</flag>
   </use>
diff --git a/app-backup/dirvish/metadata.xml b/app-backup/dirvish/metadata.xml
index aa871bad3b06..5c68cd756e92 100644
--- a/app-backup/dirvish/metadata.xml
+++ b/app-backup/dirvish/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>app-backup</herd>
 	<longdescription lang="en">Dirvish is a fast, disk based, rotating network
 		backup system. With dirvish you can maintain a set of complete images 
 		of your filesystems with unattended creation and expiration. A dirvish 
diff --git a/app-backup/duply/metadata.xml b/app-backup/duply/metadata.xml
index caa0d45789d2..668d2b9665e1 100644
--- a/app-backup/duply/metadata.xml
+++ b/app-backup/duply/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>gentoo@pennewiss.de</email>
     <name>Marcel Pennewiß</name>
     <description>Proxy-maintainer. Assign bugs to him</description>
   </maintainer>
+  <maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
 </longdescription>
   <upstream>
diff --git a/app-backup/kbackup/metadata.xml b/app-backup/kbackup/metadata.xml
index 8d36d5b01cd2..710850e4961f 100644
--- a/app-backup/kbackup/metadata.xml
+++ b/app-backup/kbackup/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>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-backup/luckybackup/metadata.xml b/app-backup/luckybackup/metadata.xml
index 2185e73b79c7..c75bb6ae3331 100644
--- a/app-backup/luckybackup/metadata.xml
+++ b/app-backup/luckybackup/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">luckybackup</remote-id>
 	</upstream>
diff --git a/app-backup/mylvmbackup/metadata.xml b/app-backup/mylvmbackup/metadata.xml
index d30bc5bf280c..ea1ee845dd24 100644
--- a/app-backup/mylvmbackup/metadata.xml
+++ b/app-backup/mylvmbackup/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>app-backup</herd>
 	<maintainer>
 		<email>robbat2@gentoo.org</email>
 		<description>Primary maintainer</description>
diff --git a/app-backup/pdumpfs/metadata.xml b/app-backup/pdumpfs/metadata.xml
index 3717738d65d6..40139472fe4b 100644
--- a/app-backup/pdumpfs/metadata.xml
+++ b/app-backup/pdumpfs/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>lmiphay@gmail.com</email>
 		<name>Paul Healy</name>
@@ -11,6 +10,10 @@
 		<email>idella4@gentoo.org</email>
 		<name>Ian Delaney</name>
 	</maintainer>
+<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <longdescription>
 pdumpfs is a simple daily backup system similar to Plan9's dumpfs which
 preserves every daily snapshot. pdumpfs is written in Ruby. You can access
diff --git a/app-backup/rdiff-backup/metadata.xml b/app-backup/rdiff-backup/metadata.xml
index 95ce537c7b9d..7ad0dbf2fa8e 100644
--- a/app-backup/rdiff-backup/metadata.xml
+++ b/app-backup/rdiff-backup/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>app-backup</herd>
 	<maintainer>
 		<email>alunduil@gentoo.org</email>
 		<name>Alex Brandt</name>
diff --git a/app-backup/rear/metadata.xml b/app-backup/rear/metadata.xml
index 0c450b378cdb..9a073b83ca0b 100644
--- a/app-backup/rear/metadata.xml
+++ b/app-backup/rear/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>morlix@morlix.de</email>
 		<name>Timo Eissler</name>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		Relax and Recover (Rear) is the leading Open Source disaster recovery solution, and successor to mkcdrec. It comprises of a modular framework and ready-to-go workflows for many common situations to produce a bootable image and restore from backup using this image. As a benefit, it allows to restore to different hardware and can therefore be used as a migration tool as well.
 	</longdescription>
diff --git a/app-backup/rsnapshot/metadata.xml b/app-backup/rsnapshot/metadata.xml
index feced77e05ac..8aa6d751a999 100644
--- a/app-backup/rsnapshot/metadata.xml
+++ b/app-backup/rsnapshot/metadata.xml
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>proxy-maintainers</herd>
   <maintainer>
     <email>Sergiy.Borodych@gmail.com</email>
     <name> Sergiy Borodych</name>
     <description>proxied maintainer</description>
   </maintainer>
+<maintainer>
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-backup/simplebackup/metadata.xml b/app-backup/simplebackup/metadata.xml
index 7b360064112f..6853f88a9e3f 100644
--- a/app-backup/simplebackup/metadata.xml
+++ b/app-backup/simplebackup/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>app-backup</herd>
 	<upstream>
 		<remote-id type="sourceforge">migas-sbackup</remote-id>
 	</upstream>
diff --git a/app-backup/snapback2/metadata.xml b/app-backup/snapback2/metadata.xml
index edb1c6588c22..7c6cd4bb5fcd 100644
--- a/app-backup/snapback2/metadata.xml
+++ b/app-backup/snapback2/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>app-backup</herd>
 	<upstream>
 		<remote-id type="cpan">Snapback2</remote-id>
 		<remote-id type="cpan-module">Backup::Snapback</remote-id>
diff --git a/app-backup/snapper/metadata.xml b/app-backup/snapper/metadata.xml
index 0f0eb6ff1c19..87ec64d3c2e1 100644
--- a/app-backup/snapper/metadata.xml
+++ b/app-backup/snapper/metadata.xml
@@ -6,7 +6,6 @@
 		It can create, delete and compare snapshots and undo changes done
 		between  snapshots. It supports both btrfs and ext4.
 	</longdescription>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>pastas4@gmail.com</email>
 		<name>Dainius Masiliūnas (GreatEmerald)</name>
@@ -17,6 +16,10 @@
 		<name>Yixun Lan</name>
 		<description>co-maintainer, CC bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>aschnell@suse.de</email>
diff --git a/app-backup/tsm/metadata.xml b/app-backup/tsm/metadata.xml
index 6328f119b348..ed58bccf4261 100644
--- a/app-backup/tsm/metadata.xml
+++ b/app-backup/tsm/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>Martin.vGagern@gmx.net</email>
 		<name>Martin von Gagern</name>
@@ -20,6 +19,10 @@
 		<name>Michael Weber</name>
 		<description>Proxy maintainer, CC him in bugs.</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="hsm">Installs Tivoli Storage Manager for Space Management</flag>
 		<flag name="tsm_cit">IBM Tivoli Common Inventory Technology</flag>