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.

56 files changed, 30 insertions, 61 deletions

diff --git a/app-cdr/acetoneiso/metadata.xml b/app-cdr/acetoneiso/metadata.xml
index 9ead352eca2..cfdd4df01b7 100644
--- a/app-cdr/acetoneiso/metadata.xml
+++ b/app-cdr/acetoneiso/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>media-optical</herd>
   <upstream>
     <remote-id type="sourceforge">acetoneiso</remote-id>
   </upstream>
diff --git a/app-cdr/b5i2iso/metadata.xml b/app-cdr/b5i2iso/metadata.xml
index bb93fa2613e..097975e3adc 100644
--- a/app-cdr/b5i2iso/metadata.xml
+++ b/app-cdr/b5i2iso/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/bashburn/metadata.xml b/app-cdr/bashburn/metadata.xml
index bb93fa2613e..097975e3adc 100644
--- a/app-cdr/bashburn/metadata.xml
+++ b/app-cdr/bashburn/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/bchunk/metadata.xml b/app-cdr/bchunk/metadata.xml
index e32589f7217..7dcabc2a68b 100644
--- a/app-cdr/bchunk/metadata.xml
+++ b/app-cdr/bchunk/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>media-optical</herd>
 <longdescription>binchunker converts a CD image in a ".bin / .cue" format
 (sometimes ".raw / .cue") to a set of .iso and .cdr tracks.</longdescription>
 </pkgmetadata>
diff --git a/app-cdr/bin2iso/metadata.xml b/app-cdr/bin2iso/metadata.xml
index 0937d8ba053..fd0828bdd8e 100644
--- a/app-cdr/bin2iso/metadata.xml
+++ b/app-cdr/bin2iso/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>media-optical</herd>
 <longdescription>
 Converts RAW format (.bin) files to ISO/WAV format and recovers .cue 
 files from .bin ones
diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index de61cac68a7..44edd6a0f9c 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>gnome</herd>
-	<herd>media-optical</herd>
+	<maintainer>
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
 	<use>
 		<flag name="packagekit">Enable support for the distro-neutral package
 			manager GUI <pkg>app-admin/packagekit</pkg></flag>
diff --git a/app-cdr/burn-cd/metadata.xml b/app-cdr/burn-cd/metadata.xml
index e44077c4cb8..f03f516df74 100644
--- a/app-cdr/burn-cd/metadata.xml
+++ b/app-cdr/burn-cd/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>media-optical</herd>
 	<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">burn-cd</remote-id>
diff --git a/app-cdr/burncdda/metadata.xml b/app-cdr/burncdda/metadata.xml
index b8ea64ff3be..49b8334784b 100644
--- a/app-cdr/burncdda/metadata.xml
+++ b/app-cdr/burncdda/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>media-optical</herd>
 <longdescription>
 	burnCDDA is a console frontend to cdrdao, cdrecord, mpg123, oggdec, mppdec,
 	flac, normalize, and mp3_check. It can be used to create audio CDs from an
diff --git a/app-cdr/burncenter/metadata.xml b/app-cdr/burncenter/metadata.xml
index 39c34fb79ef..411b44bd9cb 100644
--- a/app-cdr/burncenter/metadata.xml
+++ b/app-cdr/burncenter/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>media-optical</herd>
 <longdescription>
 	 Burncenter is a very easy-to-use text-based interface to cd-burning tools
 	 under UNIX (cdrecord, cdda2wav, mkisofs). Burncenter 3.x is a Perl module
diff --git a/app-cdr/ccd2iso/metadata.xml b/app-cdr/ccd2iso/metadata.xml
index 8ef18cc24d1..6e62f1cb43a 100644
--- a/app-cdr/ccd2iso/metadata.xml
+++ b/app-cdr/ccd2iso/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>media-optical</herd>
 	<longdescription>
 CloneCD image to ISO image file converter
 </longdescription>
diff --git a/app-cdr/cdck/metadata.xml b/app-cdr/cdck/metadata.xml
index 33e32af6ee6..e1af3906fa9 100644
--- a/app-cdr/cdck/metadata.xml
+++ b/app-cdr/cdck/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>media-optical</herd>
   <maintainer>
     <email>zzam@gentoo.org</email>
     <name>Matthias Schwarzott</name>
diff --git a/app-cdr/cdcover/metadata.xml b/app-cdr/cdcover/metadata.xml
index 0b02723d0fa..cf949f007b0 100644
--- a/app-cdr/cdcover/metadata.xml
+++ b/app-cdr/cdcover/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>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">cdcover</remote-id>
 	</upstream>
diff --git a/app-cdr/cddetect/metadata.xml b/app-cdr/cddetect/metadata.xml
index 3ca6ae763b3..097975e3adc 100644
--- a/app-cdr/cddetect/metadata.xml
+++ b/app-cdr/cddetect/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/cdlabelgen/metadata.xml b/app-cdr/cdlabelgen/metadata.xml
index bb93fa2613e..097975e3adc 100644
--- a/app-cdr/cdlabelgen/metadata.xml
+++ b/app-cdr/cdlabelgen/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/cdrdao/metadata.xml b/app-cdr/cdrdao/metadata.xml
index 3c7976dc0e4..d346dd12cfb 100644
--- a/app-cdr/cdrdao/metadata.xml
+++ b/app-cdr/cdrdao/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>media-optical</herd>
   <longdescription>
   CD command line recording, ripping and copying tool.  Especially ISOs- and
   bin/cue-files are handled very well.
diff --git a/app-cdr/cdrkit/metadata.xml b/app-cdr/cdrkit/metadata.xml
index aae6e808883..7f7e040e3e8 100644
--- a/app-cdr/cdrkit/metadata.xml
+++ b/app-cdr/cdrkit/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>media-optical</herd>
 <use>
 	<flag name="hfs">Provide building of HFS (Apple) CD-images</flag>
 </use>
diff --git a/app-cdr/cdrtools/metadata.xml b/app-cdr/cdrtools/metadata.xml
index 070540f5528..b8f6c8df37a 100644
--- a/app-cdr/cdrtools/metadata.xml
+++ b/app-cdr/cdrtools/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>media-optical</herd>
 	<maintainer>
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
diff --git a/app-cdr/cdw/metadata.xml b/app-cdr/cdw/metadata.xml
index ef2c6a7ab80..855d9a99867 100644
--- a/app-cdr/cdw/metadata.xml
+++ b/app-cdr/cdw/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>media-optical</herd>
 	<maintainer>
 		<email>mr_bones_@gentoo.org</email>
 		<name>Michael Sterrett</name>
diff --git a/app-cdr/cue2toc/metadata.xml b/app-cdr/cue2toc/metadata.xml
index 132f38b47fc..ee1fa09cb6d 100644
--- a/app-cdr/cue2toc/metadata.xml
+++ b/app-cdr/cue2toc/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>media-optical</herd>
 	<longdescription lang="en">
 		cue2toc is a free program for UNIX systems to convert CUE files to cdrdao's
 		TOC format. Features include: support for complete set of CUE commands (e.g.
diff --git a/app-cdr/cuecue/metadata.xml b/app-cdr/cuecue/metadata.xml
index e0d2f24a702..21d34a828bd 100644
--- a/app-cdr/cuecue/metadata.xml
+++ b/app-cdr/cuecue/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>media-optical</herd>
 	<longdescription lang="en">
 		cuecue is a command line program to convert .cue + [.ogg|.flac|.wav|.mp3] to
 		.cue + .bin, in order to make them easier to burn with standard burning software.
diff --git a/app-cdr/cuegen/metadata.xml b/app-cdr/cuegen/metadata.xml
index 0b894b75abe..1d6ffcbb92e 100644
--- a/app-cdr/cuegen/metadata.xml
+++ b/app-cdr/cuegen/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>media-optical</herd>
 	<longdescription lang="en">
 		CUEgen is a FLAC-compatible cuesheet generator for Linux. The FLAC
 		format allows cuesheets to be embedded in .flac files by storing 
diff --git a/app-cdr/cuetools/metadata.xml b/app-cdr/cuetools/metadata.xml
index 3594ad3a363..574c03ef7d8 100644
--- a/app-cdr/cuetools/metadata.xml
+++ b/app-cdr/cuetools/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>media-optical</herd>
 	<use>
 		<flag name="extras">Install additional script that tag files based on cue/toc file information</flag>
 	</use>
diff --git a/app-cdr/disc-cover/metadata.xml b/app-cdr/disc-cover/metadata.xml
index 2aaa56d0ca8..f3e138a3a73 100644
--- a/app-cdr/disc-cover/metadata.xml
+++ b/app-cdr/disc-cover/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>media-optical</herd>
   <longdescription>
     This is the disc-cover CLI only. For the web application,
     see www-apps/disc-cover. These two packages are tightly
diff --git a/app-cdr/dvd+rw-tools/metadata.xml b/app-cdr/dvd+rw-tools/metadata.xml
index 6829312d3db..93642c6ae02 100644
--- a/app-cdr/dvd+rw-tools/metadata.xml
+++ b/app-cdr/dvd+rw-tools/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>media-optical</herd>
 <longdescription>
 dvdrtools is a fork of cdrtools, with the primary goal of supporting
 writable DVD drives.
diff --git a/app-cdr/dvd95/metadata.xml b/app-cdr/dvd95/metadata.xml
index 917d7033c48..ae9e54150d4 100644
--- a/app-cdr/dvd95/metadata.xml
+++ b/app-cdr/dvd95/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>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">dvd95</remote-id>
 	</upstream>
diff --git a/app-cdr/dvdisaster/metadata.xml b/app-cdr/dvdisaster/metadata.xml
index f02ca884db9..dec8156ad95 100644
--- a/app-cdr/dvdisaster/metadata.xml
+++ b/app-cdr/dvdisaster/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>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">dvdisaster</remote-id>
 	</upstream>
diff --git a/app-cdr/dvdshrink/metadata.xml b/app-cdr/dvdshrink/metadata.xml
index f82fae79b6a..13c5e3e1ae0 100644
--- a/app-cdr/dvdshrink/metadata.xml
+++ b/app-cdr/dvdshrink/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>media-optical</herd>
 	<longdescription>
 XDVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use
 archival copies of DVD content on single-layer writable DVDs.
diff --git a/app-cdr/extract-xiso/metadata.xml b/app-cdr/extract-xiso/metadata.xml
index ca3c1304c92..438b3201cc7 100644
--- a/app-cdr/extract-xiso/metadata.xml
+++ b/app-cdr/extract-xiso/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xbox</herd>
+  <maintainer>
+    <email>vapier@gentoo.org</email>
+  </maintainer>
   <longdescription>Tool for extracting and creating optimised Xbox ISO images</longdescription>
   <upstream>
     <remote-id type="sourceforge">extract-xiso</remote-id>
diff --git a/app-cdr/gnomebaker/metadata.xml b/app-cdr/gnomebaker/metadata.xml
index ffe73314bd8..5c5c9ba25a9 100644
--- a/app-cdr/gnomebaker/metadata.xml
+++ b/app-cdr/gnomebaker/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>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">gnomebaker</remote-id>
 	</upstream>
diff --git a/app-cdr/graveman/metadata.xml b/app-cdr/graveman/metadata.xml
index 3ca6ae763b3..097975e3adc 100644
--- a/app-cdr/graveman/metadata.xml
+++ b/app-cdr/graveman/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/gtkcdlabel/metadata.xml b/app-cdr/gtkcdlabel/metadata.xml
index 37d0a75406c..a4ab4cb4946 100644
--- a/app-cdr/gtkcdlabel/metadata.xml
+++ b/app-cdr/gtkcdlabel/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>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">gtkcdlabel</remote-id>
 	</upstream>
diff --git a/app-cdr/iat/metadata.xml b/app-cdr/iat/metadata.xml
index 3ca6ae763b3..097975e3adc 100644
--- a/app-cdr/iat/metadata.xml
+++ b/app-cdr/iat/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/isomaster/metadata.xml b/app-cdr/isomaster/metadata.xml
index 588a5b809ef..16bcc9f800a 100644
--- a/app-cdr/isomaster/metadata.xml
+++ b/app-cdr/isomaster/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>media-optical</herd>
 	<maintainer>
 		<email>sping@gentoo.org</email>
 		<name>Sebastian Pipping</name>
diff --git a/app-cdr/k3b/metadata.xml b/app-cdr/k3b/metadata.xml
index faefd0ab4bb..b9115d7a02b 100644
--- a/app-cdr/k3b/metadata.xml
+++ b/app-cdr/k3b/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>media-optical</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
 	<use>
 		<flag name="emovix">Enable burning support for eMoviX images</flag>
 	</use>
diff --git a/app-cdr/k9copy/metadata.xml b/app-cdr/k9copy/metadata.xml
index d4420fa11d7..09c5f3b334b 100644
--- a/app-cdr/k9copy/metadata.xml
+++ b/app-cdr/k9copy/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>kde</herd>
-	<herd>video</herd>
+	<maintainer>
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<maintainer>
+		<email>media-video@gentoo.org</email>
+		<name>Gentoo Video project</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">k9copy</remote-id>
 	</upstream>
diff --git a/app-cdr/kcdemu/metadata.xml b/app-cdr/kcdemu/metadata.xml
index 8fddefa5d03..710850e4961 100644
--- a/app-cdr/kcdemu/metadata.xml
+++ b/app-cdr/kcdemu/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>media-optical</herd>
-  <herd>kde</herd>
+  <maintainer>
+    <email>kde@gentoo.org</email>
+    <name>Gentoo KDE Project</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/app-cdr/mode2cdmaker/metadata.xml b/app-cdr/mode2cdmaker/metadata.xml
index 3ca6ae763b3..097975e3adc 100644
--- a/app-cdr/mode2cdmaker/metadata.xml
+++ b/app-cdr/mode2cdmaker/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/mp3burn/metadata.xml b/app-cdr/mp3burn/metadata.xml
index ecaafbfb654..c3543eefe8f 100644
--- a/app-cdr/mp3burn/metadata.xml
+++ b/app-cdr/mp3burn/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>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">mp3burn</remote-id>
 	</upstream>
diff --git a/app-cdr/multicd/metadata.xml b/app-cdr/multicd/metadata.xml
index 3ca6ae763b3..097975e3adc 100644
--- a/app-cdr/multicd/metadata.xml
+++ b/app-cdr/multicd/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/mybashburn/metadata.xml b/app-cdr/mybashburn/metadata.xml
index e3262c6b7f1..26af9704b1f 100644
--- a/app-cdr/mybashburn/metadata.xml
+++ b/app-cdr/mybashburn/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>media-optical</herd>
 	<use>
 		<flag name="normalize">Add support for normalizing audio file volume levels</flag>
 	</use>
diff --git a/app-cdr/nero/metadata.xml b/app-cdr/nero/metadata.xml
index bb93fa2613e..097975e3adc 100644
--- a/app-cdr/nero/metadata.xml
+++ b/app-cdr/nero/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/nrg2iso/metadata.xml b/app-cdr/nrg2iso/metadata.xml
index 6259b967011..9a6a05f617c 100644
--- a/app-cdr/nrg2iso/metadata.xml
+++ b/app-cdr/nrg2iso/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>media-optical</herd>
 <longdescription>Nrg2Iso is a linux utils for converting CD (or DVD) image
 generated by Nero Burning Rom to ISO format.
 </longdescription>
diff --git a/app-cdr/pburn/metadata.xml b/app-cdr/pburn/metadata.xml
index 3ca6ae763b3..097975e3adc 100644
--- a/app-cdr/pburn/metadata.xml
+++ b/app-cdr/pburn/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/plextor-tool/metadata.xml b/app-cdr/plextor-tool/metadata.xml
index 645443001f0..6ec9f833c35 100644
--- a/app-cdr/plextor-tool/metadata.xml
+++ b/app-cdr/plextor-tool/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>media-optical</herd>
 	<longdescription>A console utility that can set certain parameters of Plextor/MMC cdrom and cd-rw drives.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">plextor-tool</remote-id>
diff --git a/app-cdr/poweriso/metadata.xml b/app-cdr/poweriso/metadata.xml
index bb93fa2613e..097975e3adc 100644
--- a/app-cdr/poweriso/metadata.xml
+++ b/app-cdr/poweriso/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/qmultirecord/metadata.xml b/app-cdr/qmultirecord/metadata.xml
index 8f92762cc1c..097975e3adc 100644
--- a/app-cdr/qmultirecord/metadata.xml
+++ b/app-cdr/qmultirecord/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/qpxtool/metadata.xml b/app-cdr/qpxtool/metadata.xml
index 6396beb75f9..333e84f6749 100644
--- a/app-cdr/qpxtool/metadata.xml
+++ b/app-cdr/qpxtool/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>media-optical</herd>
 	<upstream>
 		<remote-id type="sourceforge">qpxtool</remote-id>
 	</upstream>
diff --git a/app-cdr/recorder/metadata.xml b/app-cdr/recorder/metadata.xml
index 71fa8c59867..26c362c8ce3 100644
--- a/app-cdr/recorder/metadata.xml
+++ b/app-cdr/recorder/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>media-optical</herd>
   <longdescription lang="en">
     Recorder is a graphical frontend of cdrecord/cdrtools, cdrdao, mkisofs
     and growisofs. It aims to be simple and easy to use, free of large
diff --git a/app-cdr/sync2cd/metadata.xml b/app-cdr/sync2cd/metadata.xml
index 1f9afb61bd0..5601a2cac62 100644
--- a/app-cdr/sync2cd/metadata.xml
+++ b/app-cdr/sync2cd/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>media-optical</herd>
 <longdescription>
 sync2cd is an incremental archiving tool. It allows backing up complete filesystem hierarchies to multiple backup 
 media (e.g. CD-R). Files are archived incrementally, i.e. only new or changed files are stored during an archive 
diff --git a/app-cdr/tkdvd/metadata.xml b/app-cdr/tkdvd/metadata.xml
index 8f92762cc1c..097975e3adc 100644
--- a/app-cdr/tkdvd/metadata.xml
+++ b/app-cdr/tkdvd/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>media-optical</herd>
 </pkgmetadata>
diff --git a/app-cdr/uif2iso/metadata.xml b/app-cdr/uif2iso/metadata.xml
index fadf539e8a0..53f09a6d8ca 100644
--- a/app-cdr/uif2iso/metadata.xml
+++ b/app-cdr/uif2iso/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>media-optical</herd>
   <maintainer>
     <email>flameeyes@gentoo.org</email>
   </maintainer>
diff --git a/app-cdr/webcdwriter/metadata.xml b/app-cdr/webcdwriter/metadata.xml
index 44bbb0fe973..eff5becbae1 100644
--- a/app-cdr/webcdwriter/metadata.xml
+++ b/app-cdr/webcdwriter/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>media-optical</herd>
-	<herd>java</herd>
+	<maintainer>
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
 <longdescription>webCDwriter can be used to make the CD- and DVD-writer(s)
 	connected to a Linux box available to all users in your network. It consists
 	of the server CDWserver and the clients webCDcreator and rcdrecord.
diff --git a/app-cdr/xbiso/metadata.xml b/app-cdr/xbiso/metadata.xml
index d580470d000..b37a98113a3 100644
--- a/app-cdr/xbiso/metadata.xml
+++ b/app-cdr/xbiso/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>media-optical</herd>
   <longdescription>Tools for manipulating Xbox ISO images</longdescription>
   <upstream>
     <remote-id type="sourceforge">xbiso</remote-id>
diff --git a/app-cdr/xcdroast/metadata.xml b/app-cdr/xcdroast/metadata.xml
index a180a61abbc..39a231aac70 100644
--- a/app-cdr/xcdroast/metadata.xml
+++ b/app-cdr/xcdroast/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>media-optical</herd>
 	<longdescription>Menu based front-end to mkisofs and cdrecord</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">xcdroast</remote-id>
diff --git a/app-cdr/xdvdfs-tools/metadata.xml b/app-cdr/xdvdfs-tools/metadata.xml
index 14dba77325f..f3486506bec 100644
--- a/app-cdr/xdvdfs-tools/metadata.xml
+++ b/app-cdr/xdvdfs-tools/metadata.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>xbox</herd>
+  <maintainer>
+    <email>vapier@gentoo.org</email>
+  </maintainer>
   <longdescription>Tools for manipulating Xbox ISO images</longdescription>
 </pkgmetadata>
diff --git a/app-cdr/xfburn/metadata.xml b/app-cdr/xfburn/metadata.xml
index 9251991fca7..4d1ca6862d6 100644
--- a/app-cdr/xfburn/metadata.xml
+++ b/app-cdr/xfburn/metadata.xml
@@ -5,7 +5,6 @@
     <email>xfce@gentoo.org</email>
     <name>XFCE Team</name>
   </maintainer>
-  <herd>media-optical</herd>
   <upstream>
     <maintainer>
       <email>mario@xfce.org</email>