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.

27 files changed, 34 insertions, 30 deletions

diff --git a/media-tv/channeleditor/metadata.xml b/media-tv/channeleditor/metadata.xml
index 9a66f97c7923..9f5304387031 100644
--- a/media-tv/channeleditor/metadata.xml
+++ b/media-tv/channeleditor/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-tv</herd>
 	<maintainer>
 		<email>billie@gentoo.org</email>
 		<name>Daniel Pielmeier</name>
diff --git a/media-tv/dvbstream/metadata.xml b/media-tv/dvbstream/metadata.xml
index d95d55ae0fab..4a0e6697c96b 100644
--- a/media-tv/dvbstream/metadata.xml
+++ b/media-tv/dvbstream/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-tv</herd>
 	<upstream>
 		<remote-id type="sourceforge">dvbtools</remote-id>
 	</upstream>
diff --git a/media-tv/dvbstreamer/metadata.xml b/media-tv/dvbstreamer/metadata.xml
index 0a94620f9cce..62f2db1f7025 100644
--- a/media-tv/dvbstreamer/metadata.xml
+++ b/media-tv/dvbstreamer/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-tv</herd>
 	<upstream>
 		<remote-id type="sourceforge">dvbstreamer</remote-id>
 	</upstream>
diff --git a/media-tv/dvbtune/metadata.xml b/media-tv/dvbtune/metadata.xml
index d95d55ae0fab..4a0e6697c96b 100644
--- a/media-tv/dvbtune/metadata.xml
+++ b/media-tv/dvbtune/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-tv</herd>
 	<upstream>
 		<remote-id type="sourceforge">dvbtools</remote-id>
 	</upstream>
diff --git a/media-tv/freevo/metadata.xml b/media-tv/freevo/metadata.xml
index 33f7fbe95a66..33e56cabe146 100644
--- a/media-tv/freevo/metadata.xml
+++ b/media-tv/freevo/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-tv</herd>
   <longdescription>Freevo is an open-source home theatre PC platform based
 		on Linux and a number of open-source audio/video tools. MPlayer
 		and/or Xine can be used to play audio and video files in most
diff --git a/media-tv/gentoo-vdr-scripts/metadata.xml b/media-tv/gentoo-vdr-scripts/metadata.xml
index ecc47f16b873..5724fb25c0fc 100644
--- a/media-tv/gentoo-vdr-scripts/metadata.xml
+++ b/media-tv/gentoo-vdr-scripts/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-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-tv/gtk-v4l/metadata.xml b/media-tv/gtk-v4l/metadata.xml
index 91724ddf6152..5854c2c6b09e 100644
--- a/media-tv/gtk-v4l/metadata.xml
+++ b/media-tv/gtk-v4l/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-tv</herd>
 	<maintainer>
 		<email>ssuominen@gentoo.org</email>
 		<name>Samuli Suominen</name>
diff --git a/media-tv/ivtv-utils/metadata.xml b/media-tv/ivtv-utils/metadata.xml
index 1d7f067588e9..64d5c6c6a117 100644
--- a/media-tv/ivtv-utils/metadata.xml
+++ b/media-tv/ivtv-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>media-tv</herd>
   <maintainer>
     <email>cardoe@gentoo.org</email>
     <name>Doug Goldstein</name>
diff --git a/media-tv/ivtvplayer/metadata.xml b/media-tv/ivtvplayer/metadata.xml
index eba6f2829624..f701cb1cf1c1 100644
--- a/media-tv/ivtvplayer/metadata.xml
+++ b/media-tv/ivtvplayer/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-tv</herd>
 	<upstream>
 		<remote-id type="sourceforge">ivtvplayer</remote-id>
 	</upstream>
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
index a05dcb6b1142..2d6007cab9d1 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xbox</herd>
-<herd>video</herd>
+<maintainer>
+ <email>vapier@gentoo.org</email>
+</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
 <use>
  <flag name="airplay">enable AirPlay support</flag>
  <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
diff --git a/media-tv/linuxtv-dvb-apps/metadata.xml b/media-tv/linuxtv-dvb-apps/metadata.xml
index cd4366c20fb3..dd3c4d3a4217 100644
--- a/media-tv/linuxtv-dvb-apps/metadata.xml
+++ b/media-tv/linuxtv-dvb-apps/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-tv</herd>
 <use>
 	<flag name="alevt">Build videotext decoder</flag>
 </use>
diff --git a/media-tv/linuxtv-dvb-firmware/metadata.xml b/media-tv/linuxtv-dvb-firmware/metadata.xml
index a6b9e38a1b93..097975e3adc2 100644
--- a/media-tv/linuxtv-dvb-firmware/metadata.xml
+++ b/media-tv/linuxtv-dvb-firmware/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-tv</herd>
 </pkgmetadata>
diff --git a/media-tv/me-tv/metadata.xml b/media-tv/me-tv/metadata.xml
index 07a130c0c9a5..08736a452df6 100644
--- a/media-tv/me-tv/metadata.xml
+++ b/media-tv/me-tv/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-tv</herd>
   <maintainer>
     <email>lordvan@gentoo.org</email>
     <name>Thomas Raschbacher</name>
diff --git a/media-tv/mythtv-status/metadata.xml b/media-tv/mythtv-status/metadata.xml
index be191b9f54b3..f2dbe1fc3eae 100644
--- a/media-tv/mythtv-status/metadata.xml
+++ b/media-tv/mythtv-status/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>mythtv</herd>
+  <maintainer>
+    <email>mythtv@gentoo.org</email>
+    <name>MythTV</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/media-tv/mythtv/metadata.xml b/media-tv/mythtv/metadata.xml
index a1e2ee6a6769..4953bd19d298 100644
--- a/media-tv/mythtv/metadata.xml
+++ b/media-tv/mythtv/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>mythtv</herd>
+	<maintainer>
+		<email>mythtv@gentoo.org</email>
+		<name>MythTV</name>
+	</maintainer>
 	<use>
 		<flag name="alsa">Allows MythTV to directly output sound to ALSA devices,
 		this is needed if you are using ALSA dmix or SPDIF. Note, you will have
diff --git a/media-tv/nvtv/metadata.xml b/media-tv/nvtv/metadata.xml
index 2e8d3be4630d..ef3dbdc0e9bd 100644
--- a/media-tv/nvtv/metadata.xml
+++ b/media-tv/nvtv/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-tv</herd>
 	<maintainer>
 		<email>media-tv@gentoo.org</email>
 		<name>media-tv</name>
diff --git a/media-tv/shoutcast2vdr/metadata.xml b/media-tv/shoutcast2vdr/metadata.xml
index 905c5486aafa..56de7c24a7fc 100644
--- a/media-tv/shoutcast2vdr/metadata.xml
+++ b/media-tv/shoutcast2vdr/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-tv</herd>
 <maintainer>
 <email>vdr@gentoo.org</email>
 <name>Gentoo VDR Project</name>
diff --git a/media-tv/tvbrowser/metadata.xml b/media-tv/tvbrowser/metadata.xml
index a4609f401178..c00c67604d7b 100644
--- a/media-tv/tvbrowser/metadata.xml
+++ b/media-tv/tvbrowser/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>java</herd>
+  <maintainer>
+    <email>java@gentoo.org</email>
+    <name>Java</name>
+  </maintainer>
   <use>
     <flag name="themes">Install extra theme packs</flag>
   </use>
diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index dc0fc18e7239..2daca85bdd69 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/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>wraeth@wraeth.id.au</email>
 		<name>Sam Jorna</name>
 		<description>Proxy maintaner, to be assugned to bugs</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="capmt">Enable support for capmt (dvbapi) protocol</flag>
 		<flag name="constcw">Enable support for the constcw protocol</flag>
diff --git a/media-tv/tvmovie2vdr/metadata.xml b/media-tv/tvmovie2vdr/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-tv/tvmovie2vdr/metadata.xml
+++ b/media-tv/tvmovie2vdr/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-tv</herd>
 	<maintainer>
 		<email>vdr@gentoo.org</email>
 		<name>Gentoo VDR Project</name>
diff --git a/media-tv/v4l-dvb-saa716x/metadata.xml b/media-tv/v4l-dvb-saa716x/metadata.xml
index 8bbb40ee4126..699c028dadb1 100644
--- a/media-tv/v4l-dvb-saa716x/metadata.xml
+++ b/media-tv/v4l-dvb-saa716x/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>media-tv</herd>
-	<herd>proxy-maintainers</herd>
 	<maintainer>
 		<email>martin.dummer@gmx.net</email>
 		<name>Martin Dummer</name>
@@ -13,6 +11,10 @@
 		<name>Joerg Bornkessel</name>
 		<description>Proxying maintainer</description>
 	</maintainer>
+	<maintainer>
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="firmware">Install firmware</flag>
 	</use>
diff --git a/media-tv/v4l-utils/metadata.xml b/media-tv/v4l-utils/metadata.xml
index 39e45a6e4062..21ba9b5773cc 100644
--- a/media-tv/v4l-utils/metadata.xml
+++ b/media-tv/v4l-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>media-tv</herd>
 	<maintainer>
 		<email>tetromino@gentoo.org</email>
 		<name>Alexandre Rostovtsev</name>
diff --git a/media-tv/w_scan/metadata.xml b/media-tv/w_scan/metadata.xml
index 636266bdd0b2..ae81f64ffc7f 100644
--- a/media-tv/w_scan/metadata.xml
+++ b/media-tv/w_scan/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-tv</herd>
 	<maintainer>
 		<email>hd_brummy@gentoo.org</email>
 	</maintainer>
diff --git a/media-tv/wis-go7007/metadata.xml b/media-tv/wis-go7007/metadata.xml
index a6b9e38a1b93..097975e3adc2 100644
--- a/media-tv/wis-go7007/metadata.xml
+++ b/media-tv/wis-go7007/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-tv</herd>
 </pkgmetadata>
diff --git a/media-tv/xawtv/metadata.xml b/media-tv/xawtv/metadata.xml
index 277f360d0e90..8c450e10da82 100644
--- a/media-tv/xawtv/metadata.xml
+++ b/media-tv/xawtv/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-tv</herd>
   <use>
     <flag name="xext">Enable use of XFree extensions (DGA,VidMode,DPMS)</flag>
     <flag name="zvbi">Enable VBI Decoding Library for Zapping</flag>
diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
index 6cbfa2dc8655..8ef2e763cd92 100644
--- a/media-tv/xbmc/metadata.xml
+++ b/media-tv/xbmc/metadata.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>xbox</herd>
-<herd>video</herd>
+<maintainer>
+ <email>vapier@gentoo.org</email>
+</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
 <use>
  <flag name="airplay">enable AirPlay support</flag>
  <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
diff --git a/media-tv/xmltv/metadata.xml b/media-tv/xmltv/metadata.xml
index 49b400605ee8..722fc9ef8605 100644
--- a/media-tv/xmltv/metadata.xml
+++ b/media-tv/xmltv/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-tv</herd>
   <use>
     <flag name="ar">Argentina tv listing grabber</flag>
     <flag name="ch">Switzerland bluewin tv listing grabber</flag>