summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2016-01-24 23:32:36 +0100
committerMichał Górny <mgorny@gentoo.org>2016-01-24 23:58:38 +0100
commitcfd93d768e79a349f1e762b92773190295c36980 (patch)
tree2239eb163651fea5371739f3e415bc11793ec557 /media-plugins
parentRemove explicit notion of maintainer-needed, for GLEP 67 (diff)
downloadgentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.gz
gentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.bz2
gentoo-cfd93d768e79a349f1e762b92773190295c36980.zip
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.
Diffstat (limited to 'media-plugins')
-rw-r--r--media-plugins/alsa-plugins/metadata.xml1
-rw-r--r--media-plugins/alsaequal/metadata.xml5
-rw-r--r--media-plugins/amb-plugins/metadata.xml5
-rw-r--r--media-plugins/ams-lv2/metadata.xml5
-rw-r--r--media-plugins/audacious-dumb/metadata.xml5
-rw-r--r--media-plugins/audacious-plugins/metadata.xml5
-rw-r--r--media-plugins/banshee-community-extensions/metadata.xml10
-rw-r--r--media-plugins/calf/metadata.xml5
-rw-r--r--media-plugins/caps-plugins/metadata.xml5
-rw-r--r--media-plugins/emotion_generic_players/metadata.xml5
-rw-r--r--media-plugins/evas_generic_loaders/metadata.xml5
-rw-r--r--media-plugins/fil-plugins/metadata.xml5
-rw-r--r--media-plugins/frei0r-plugins/metadata.xml5
-rw-r--r--media-plugins/g2reverb/metadata.xml5
-rw-r--r--media-plugins/gimp-gmic/metadata.xml5
-rw-r--r--media-plugins/gimp-lensfun/metadata.xml5
-rw-r--r--media-plugins/gkrellmpc/metadata.xml6
-rw-r--r--media-plugins/gmpc-alarm/metadata.xml5
-rw-r--r--media-plugins/gmpc-albumview/metadata.xml5
-rw-r--r--media-plugins/gmpc-avahi/metadata.xml5
-rw-r--r--media-plugins/gmpc-awn/metadata.xml5
-rw-r--r--media-plugins/gmpc-discogs/metadata.xml5
-rw-r--r--media-plugins/gmpc-extraplaylist/metadata.xml5
-rw-r--r--media-plugins/gmpc-jamendo/metadata.xml5
-rw-r--r--media-plugins/gmpc-last-fm/metadata.xml5
-rw-r--r--media-plugins/gmpc-libnotify/metadata.xml5
-rw-r--r--media-plugins/gmpc-lyrics/metadata.xml5
-rw-r--r--media-plugins/gmpc-lyricwiki/metadata.xml5
-rw-r--r--media-plugins/gmpc-magnatune/metadata.xml5
-rw-r--r--media-plugins/gmpc-mdcover/metadata.xml5
-rw-r--r--media-plugins/gmpc-mmkeys/metadata.xml5
-rw-r--r--media-plugins/gmpc-mserver/metadata.xml5
-rw-r--r--media-plugins/gmpc-playlistsort/metadata.xml5
-rw-r--r--media-plugins/gmpc-shout/metadata.xml5
-rw-r--r--media-plugins/gmpc-tagedit/metadata.xml5
-rw-r--r--media-plugins/gmpc-wikipedia/metadata.xml5
-rw-r--r--media-plugins/grilo-plugins/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-a52dec/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-alsa/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-amr/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-annodex/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-assrender/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-bluez/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-cdio/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-cdparanoia/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-dash/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-dtls/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-dts/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-dv/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-dvb/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-dvdread/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-faac/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-faad/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-ffmpeg/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-flac/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-gconf/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-gdkpixbuf/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-gio/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-gl/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-gnomevfs/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-gsm/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-hls/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-ivorbis/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-jack/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-jpeg/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-ladspa/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-lame/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-libav/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-libde265/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-libmms/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-libnice/metadata.xml10
-rw-r--r--media-plugins/gst-plugins-libpng/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-libvisual/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-mad/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-meta/metadata.xml10
-rw-r--r--media-plugins/gst-plugins-mimic/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-modplug/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-mpeg2dec/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-mpeg2enc/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-mplex/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-musepack/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-neon/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-ofa/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-ogg/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-openh264/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-opus/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-oss/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-pango/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-pulse/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-raw1394/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-resindvd/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-rtmp/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-schroedinger/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-shout2/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-sidplay/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-smoothstreaming/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-soundtouch/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-soup/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-speex/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-taglib/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-theora/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-twolame/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-uvch264/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-v4l2/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-vaapi/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-voaacenc/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-voamrwbenc/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-vorbis/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-vp8/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-vpx/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-wavpack/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-x/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-x264/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-x265/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-ximagesrc/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-xvid/metadata.xml5
-rw-r--r--media-plugins/gst-plugins-xvideo/metadata.xml5
-rw-r--r--media-plugins/hexter/metadata.xml5
-rw-r--r--media-plugins/imlib2_loaders/metadata.xml5
-rw-r--r--media-plugins/ir_lv2/metadata.xml5
-rw-r--r--media-plugins/kipi-plugins/metadata.xml5
-rw-r--r--media-plugins/libvisual-plugins/metadata.xml5
-rw-r--r--media-plugins/libvisual-projectm/metadata.xml5
-rw-r--r--media-plugins/live/metadata.xml1
-rw-r--r--media-plugins/mcp-plugins/metadata.xml5
-rw-r--r--media-plugins/mda-lv2/metadata.xml5
-rw-r--r--media-plugins/mythplugins/metadata.xml5
-rw-r--r--media-plugins/npapi-vlc/metadata.xml1
-rw-r--r--media-plugins/qmmp-plugin-pack/metadata.xml5
-rw-r--r--media-plugins/quodlibet-plugins/metadata.xml5
-rw-r--r--media-plugins/rev-plugins/metadata.xml5
-rw-r--r--media-plugins/swh-lv2/metadata.xml5
-rw-r--r--media-plugins/swh-plugins/metadata.xml5
-rw-r--r--media-plugins/tap-plugins/metadata.xml5
-rw-r--r--media-plugins/vamp-aubio-plugins/metadata.xml5
-rw-r--r--media-plugins/vamp-libxtract-plugins/metadata.xml5
-rw-r--r--media-plugins/vco-plugins/metadata.xml5
-rw-r--r--media-plugins/vdr-actuator/metadata.xml1
-rw-r--r--media-plugins/vdr-admin/metadata.xml3
-rw-r--r--media-plugins/vdr-alcd/metadata.xml6
-rw-r--r--media-plugins/vdr-arghdirector/metadata.xml1
-rw-r--r--media-plugins/vdr-atscepg/metadata.xml1
-rw-r--r--media-plugins/vdr-audiorecorder/metadata.xml1
-rw-r--r--media-plugins/vdr-autosort/metadata.xml1
-rw-r--r--media-plugins/vdr-avards/metadata.xml1
-rw-r--r--media-plugins/vdr-beep/metadata.xml1
-rw-r--r--media-plugins/vdr-bgprocess/metadata.xml1
-rw-r--r--media-plugins/vdr-browse/metadata.xml1
-rw-r--r--media-plugins/vdr-burn-templates/metadata.xml3
-rw-r--r--media-plugins/vdr-burn/metadata.xml3
-rw-r--r--media-plugins/vdr-calc/metadata.xml1
-rw-r--r--media-plugins/vdr-cdplayer/metadata.xml1
-rw-r--r--media-plugins/vdr-chanman/metadata.xml7
-rw-r--r--media-plugins/vdr-channelblocker/metadata.xml1
-rw-r--r--media-plugins/vdr-cinebars/metadata.xml1
-rw-r--r--media-plugins/vdr-clock/metadata.xml3
-rw-r--r--media-plugins/vdr-console/metadata.xml1
-rw-r--r--media-plugins/vdr-coverviewer/metadata.xml1
-rw-r--r--media-plugins/vdr-cpumon/metadata.xml1
-rw-r--r--media-plugins/vdr-decruft/metadata.xml1
-rw-r--r--media-plugins/vdr-devstatus/metadata.xml1
-rw-r--r--media-plugins/vdr-dummydevice/metadata.xml1
-rw-r--r--media-plugins/vdr-duplicates/metadata.xml1
-rw-r--r--media-plugins/vdr-dvbapi/metadata.xml1
-rw-r--r--media-plugins/vdr-dvbhddevice/metadata.xml1
-rw-r--r--media-plugins/vdr-dvbsddevice/metadata.xml3
-rw-r--r--media-plugins/vdr-dvd/metadata.xml1
-rw-r--r--media-plugins/vdr-dvdswitch/metadata.xml3
-rw-r--r--media-plugins/vdr-epgsearch/metadata.xml1
-rw-r--r--media-plugins/vdr-epgsync/metadata.xml3
-rw-r--r--media-plugins/vdr-exec/metadata.xml1
-rw-r--r--media-plugins/vdr-extb/metadata.xml3
-rw-r--r--media-plugins/vdr-extrecmenu/metadata.xml3
-rw-r--r--media-plugins/vdr-femon/metadata.xml1
-rw-r--r--media-plugins/vdr-fepg/metadata.xml1
-rw-r--r--media-plugins/vdr-ffnetdev/metadata.xml3
-rw-r--r--media-plugins/vdr-filebrowser/metadata.xml1
-rw-r--r--media-plugins/vdr-freecell/metadata.xml3
-rw-r--r--media-plugins/vdr-fritzbox/metadata.xml1
-rw-r--r--media-plugins/vdr-graphlcd/metadata.xml3
-rw-r--r--media-plugins/vdr-graphtft/metadata.xml3
-rw-r--r--media-plugins/vdr-image/metadata.xml3
-rw-r--r--media-plugins/vdr-imonlcd/metadata.xml1
-rw-r--r--media-plugins/vdr-infosatepg/metadata.xml1
-rw-r--r--media-plugins/vdr-iptv/metadata.xml1
-rw-r--r--media-plugins/vdr-joystick/metadata.xml1
-rw-r--r--media-plugins/vdr-kvdrmon/metadata.xml6
-rw-r--r--media-plugins/vdr-launcher/metadata.xml1
-rw-r--r--media-plugins/vdr-lcdproc/metadata.xml3
-rw-r--r--media-plugins/vdr-lcr/metadata.xml3
-rw-r--r--media-plugins/vdr-live/metadata.xml1
-rw-r--r--media-plugins/vdr-loadepg/metadata.xml3
-rw-r--r--media-plugins/vdr-mailbox/metadata.xml1
-rw-r--r--media-plugins/vdr-markad/metadata.xml1
-rw-r--r--media-plugins/vdr-menuorg/metadata.xml1
-rw-r--r--media-plugins/vdr-mlist/metadata.xml1
-rw-r--r--media-plugins/vdr-mount/metadata.xml1
-rw-r--r--media-plugins/vdr-mp3ng/metadata.xml1
-rw-r--r--media-plugins/vdr-mplayer/metadata.xml1
-rw-r--r--media-plugins/vdr-music/metadata.xml1
-rw-r--r--media-plugins/vdr-newsticker/metadata.xml1
-rw-r--r--media-plugins/vdr-noepg/metadata.xml1
-rw-r--r--media-plugins/vdr-nordlichtsepg/metadata.xml1
-rw-r--r--media-plugins/vdr-osdpip/metadata.xml1
-rw-r--r--media-plugins/vdr-osdserver/metadata.xml1
-rw-r--r--media-plugins/vdr-osdteletext/metadata.xml3
-rw-r--r--media-plugins/vdr-peer/metadata.xml1
-rw-r--r--media-plugins/vdr-permashift/metadata.xml1
-rw-r--r--media-plugins/vdr-picselshow/metadata.xml1
-rw-r--r--media-plugins/vdr-pilot/metadata.xml1
-rw-r--r--media-plugins/vdr-pilotskin/metadata.xml1
-rw-r--r--media-plugins/vdr-pin/metadata.xml3
-rw-r--r--media-plugins/vdr-powermate/metadata.xml3
-rw-r--r--media-plugins/vdr-prefermenu/metadata.xml1
-rw-r--r--media-plugins/vdr-proxy/metadata.xml1
-rw-r--r--media-plugins/vdr-pvr350/metadata.xml1
-rw-r--r--media-plugins/vdr-pvrinput/metadata.xml3
-rw-r--r--media-plugins/vdr-quicktimer/metadata.xml1
-rw-r--r--media-plugins/vdr-radio/metadata.xml3
-rw-r--r--media-plugins/vdr-radiolist/metadata.xml1
-rw-r--r--media-plugins/vdr-rcu/metadata.xml3
-rw-r--r--media-plugins/vdr-recsearch/metadata.xml1
-rw-r--r--media-plugins/vdr-recstatus/metadata.xml1
-rw-r--r--media-plugins/vdr-remote/metadata.xml3
-rw-r--r--media-plugins/vdr-remoteosd/metadata.xml3
-rw-r--r--media-plugins/vdr-remotetimers/metadata.xml3
-rw-r--r--media-plugins/vdr-rotor/metadata.xml1
-rw-r--r--media-plugins/vdr-rpihddevice/metadata.xml3
-rw-r--r--media-plugins/vdr-rssreader/metadata.xml1
-rw-r--r--media-plugins/vdr-satip/metadata.xml1
-rw-r--r--media-plugins/vdr-scheduler/metadata.xml1
-rw-r--r--media-plugins/vdr-screenshot/metadata.xml1
-rw-r--r--media-plugins/vdr-serial/metadata.xml1
-rw-r--r--media-plugins/vdr-skincurses/metadata.xml1
-rw-r--r--media-plugins/vdr-skinelchi/metadata.xml1
-rw-r--r--media-plugins/vdr-skinenigmang/metadata.xml3
-rw-r--r--media-plugins/vdr-skinnopacity/metadata.xml3
-rw-r--r--media-plugins/vdr-skinsoppalusikka/metadata.xml3
-rw-r--r--media-plugins/vdr-sleeptimer/metadata.xml1
-rw-r--r--media-plugins/vdr-sndctl/metadata.xml1
-rw-r--r--media-plugins/vdr-solitaire/metadata.xml1
-rw-r--r--media-plugins/vdr-span/metadata.xml1
-rw-r--r--media-plugins/vdr-spider/metadata.xml1
-rw-r--r--media-plugins/vdr-streamdev/metadata.xml1
-rw-r--r--media-plugins/vdr-sudoku/metadata.xml3
-rw-r--r--media-plugins/vdr-suspendoutput/metadata.xml1
-rw-r--r--media-plugins/vdr-svdrposd/metadata.xml3
-rw-r--r--media-plugins/vdr-svdrpservice/metadata.xml3
-rw-r--r--media-plugins/vdr-systeminfo/metadata.xml1
-rw-r--r--media-plugins/vdr-text2skin/metadata.xml1
-rw-r--r--media-plugins/vdr-ttxtsubs/metadata.xml1
-rw-r--r--media-plugins/vdr-tvguide/metadata.xml3
-rw-r--r--media-plugins/vdr-undelete/metadata.xml1
-rw-r--r--media-plugins/vdr-vcd/metadata.xml1
-rw-r--r--media-plugins/vdr-vdrmanager/metadata.xml1
-rw-r--r--media-plugins/vdr-videosystem/metadata.xml1
-rw-r--r--media-plugins/vdr-vodcatcher/metadata.xml1
-rw-r--r--media-plugins/vdr-vompserver/metadata.xml7
-rw-r--r--media-plugins/vdr-wapd/metadata.xml1
-rw-r--r--media-plugins/vdr-weatherng/metadata.xml3
-rw-r--r--media-plugins/vdr-wirbelscan/metadata.xml1
-rw-r--r--media-plugins/vdr-xine/metadata.xml1
-rw-r--r--media-plugins/vdr-xineliboutput/metadata.xml1
-rw-r--r--media-plugins/vdr-xvdr/metadata.xml1
-rw-r--r--media-plugins/vdr-zaphistory/metadata.xml1
-rw-r--r--media-plugins/vdr-zappilot/metadata.xml1
-rw-r--r--media-plugins/xbmc-addon-xvdr/metadata.xml1
-rw-r--r--media-plugins/xsynth-dssi/metadata.xml5
268 files changed, 603 insertions, 313 deletions
diff --git a/media-plugins/alsa-plugins/metadata.xml b/media-plugins/alsa-plugins/metadata.xml
index 7a7ed4ca3bb..a927b56be82 100644
--- a/media-plugins/alsa-plugins/metadata.xml
+++ b/media-plugins/alsa-plugins/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>alsa</herd>
<maintainer>
<email>alsa-bugs@gentoo.org</email>
</maintainer>
diff --git a/media-plugins/alsaequal/metadata.xml b/media-plugins/alsaequal/metadata.xml
index af0275e2998..7ae4362bbf0 100644
--- a/media-plugins/alsaequal/metadata.xml
+++ b/media-plugins/alsaequal/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>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-plugins/amb-plugins/metadata.xml b/media-plugins/amb-plugins/metadata.xml
index 3a8ea7e0297..9d7a19de1f8 100644
--- a/media-plugins/amb-plugins/metadata.xml
+++ b/media-plugins/amb-plugins/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>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-plugins/ams-lv2/metadata.xml b/media-plugins/ams-lv2/metadata.xml
index 0325c5cea54..f3455d3f39e 100644
--- a/media-plugins/ams-lv2/metadata.xml
+++ b/media-plugins/ams-lv2/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>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">blablack/ams-lv2</remote-id>
</upstream>
diff --git a/media-plugins/audacious-dumb/metadata.xml b/media-plugins/audacious-dumb/metadata.xml
index fe3c0b33333..df72aa733ba 100644
--- a/media-plugins/audacious-dumb/metadata.xml
+++ b/media-plugins/audacious-dumb/metadata.xml
@@ -5,5 +5,8 @@
<email>joker@gentoo.org</email>
<name>Christian Birchinger</name>
</maintainer>
-<herd>sound</herd>
+<maintainer>
+<email>sound@gentoo.org</email>
+<name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 3b90ee923af..67e78b5ed1e 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/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>sound</herd>
<maintainer>
<email>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
<use>
<flag name="adplug">Build with AdPlug (Adlib sound card emulation)
support</flag>
diff --git a/media-plugins/banshee-community-extensions/metadata.xml b/media-plugins/banshee-community-extensions/metadata.xml
index ceff0fb2ab2..2f64d9769fd 100644
--- a/media-plugins/banshee-community-extensions/metadata.xml
+++ b/media-plugins/banshee-community-extensions/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>dotnet</herd>
- <herd>gstreamer</herd>
+ <maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
<use>
<flag name="lastfmfingerprint">Enable support to ientify your
music automatically, using the Last.fm online service.</flag>
diff --git a/media-plugins/calf/metadata.xml b/media-plugins/calf/metadata.xml
index 7e7647c57c5..da64e3ba0ee 100644
--- a/media-plugins/calf/metadata.xml
+++ b/media-plugins/calf/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>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<use>
<flag name="lv2">Add support for Ladspa V2</flag>
</use>
diff --git a/media-plugins/caps-plugins/metadata.xml b/media-plugins/caps-plugins/metadata.xml
index b56ef9e42ed..f34e98daa64 100644
--- a/media-plugins/caps-plugins/metadata.xml
+++ b/media-plugins/caps-plugins/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>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
<longdescription>The CAPS Audio Plugin Suite - LADSPA plugin suite which includes DSP units emulating instrument amplifiers, stomp-box classics, versatile 'virtual analogue' oscillators, fractal oscillation, reverb, equalization and others</longdescription>
</pkgmetadata>
diff --git a/media-plugins/emotion_generic_players/metadata.xml b/media-plugins/emotion_generic_players/metadata.xml
index 99165add909..a9f360ec73a 100644
--- a/media-plugins/emotion_generic_players/metadata.xml
+++ b/media-plugins/emotion_generic_players/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/evas_generic_loaders/metadata.xml b/media-plugins/evas_generic_loaders/metadata.xml
index 99165add909..a9f360ec73a 100644
--- a/media-plugins/evas_generic_loaders/metadata.xml
+++ b/media-plugins/evas_generic_loaders/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/fil-plugins/metadata.xml b/media-plugins/fil-plugins/metadata.xml
index 3a8ea7e0297..9d7a19de1f8 100644
--- a/media-plugins/fil-plugins/metadata.xml
+++ b/media-plugins/fil-plugins/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>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-plugins/frei0r-plugins/metadata.xml b/media-plugins/frei0r-plugins/metadata.xml
index e831e31f37f..01ff05346be 100644
--- a/media-plugins/frei0r-plugins/metadata.xml
+++ b/media-plugins/frei0r-plugins/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>video</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<use>
<flag name="facedetect">Enables building of facedetect plugin, which
depends on <pkg>media-libs/opencv</pkg>
diff --git a/media-plugins/g2reverb/metadata.xml b/media-plugins/g2reverb/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-plugins/g2reverb/metadata.xml
+++ b/media-plugins/g2reverb/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>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gimp-gmic/metadata.xml b/media-plugins/gimp-gmic/metadata.xml
index e17a902d43a..d8c44cb7d2f 100644
--- a/media-plugins/gimp-gmic/metadata.xml
+++ b/media-plugins/gimp-gmic/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>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gmic</remote-id>
</upstream>
diff --git a/media-plugins/gimp-lensfun/metadata.xml b/media-plugins/gimp-lensfun/metadata.xml
index 91089c8462f..77fed0581bd 100644
--- a/media-plugins/gimp-lensfun/metadata.xml
+++ b/media-plugins/gimp-lensfun/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>dev@kicherer.org</email>
<name>Mario</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/media-plugins/gkrellmpc/metadata.xml b/media-plugins/gkrellmpc/metadata.xml
index 15505756c20..cd02e1e45be 100644
--- a/media-plugins/gkrellmpc/metadata.xml
+++ b/media-plugins/gkrellmpc/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>sound</herd>
- <herd>desktop-dock</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="threads">Use separate thread to init connection (unsafe)</flag>
</use>
diff --git a/media-plugins/gmpc-alarm/metadata.xml b/media-plugins/gmpc-alarm/metadata.xml
index 1e7b9d7494a..f33a41d3b88 100644
--- a/media-plugins/gmpc-alarm/metadata.xml
+++ b/media-plugins/gmpc-alarm/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gmpc-albumview/metadata.xml b/media-plugins/gmpc-albumview/metadata.xml
index 1e7b9d7494a..f33a41d3b88 100644
--- a/media-plugins/gmpc-albumview/metadata.xml
+++ b/media-plugins/gmpc-albumview/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gmpc-avahi/metadata.xml b/media-plugins/gmpc-avahi/metadata.xml
index f939777e6a3..2fa6e9be702 100644
--- a/media-plugins/gmpc-avahi/metadata.xml
+++ b/media-plugins/gmpc-avahi/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-plugins/gmpc-awn/metadata.xml b/media-plugins/gmpc-awn/metadata.xml
index 1e7b9d7494a..f33a41d3b88 100644
--- a/media-plugins/gmpc-awn/metadata.xml
+++ b/media-plugins/gmpc-awn/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gmpc-discogs/metadata.xml b/media-plugins/gmpc-discogs/metadata.xml
index 974a58e8352..f32621a8250 100644
--- a/media-plugins/gmpc-discogs/metadata.xml
+++ b/media-plugins/gmpc-discogs/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
</upstream>
diff --git a/media-plugins/gmpc-extraplaylist/metadata.xml b/media-plugins/gmpc-extraplaylist/metadata.xml
index 974a58e8352..f32621a8250 100644
--- a/media-plugins/gmpc-extraplaylist/metadata.xml
+++ b/media-plugins/gmpc-extraplaylist/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
</upstream>
diff --git a/media-plugins/gmpc-jamendo/metadata.xml b/media-plugins/gmpc-jamendo/metadata.xml
index 1e7b9d7494a..f33a41d3b88 100644
--- a/media-plugins/gmpc-jamendo/metadata.xml
+++ b/media-plugins/gmpc-jamendo/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gmpc-last-fm/metadata.xml b/media-plugins/gmpc-last-fm/metadata.xml
index 23c5bf54f89..8bb2a4ba909 100644
--- a/media-plugins/gmpc-last-fm/metadata.xml
+++ b/media-plugins/gmpc-last-fm/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>The last.fm plugin can fetch artist images, from last.fm. This plugin doesn't scrobble your music, use a dedicated client like mpdscribble for this.</longdescription>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
diff --git a/media-plugins/gmpc-libnotify/metadata.xml b/media-plugins/gmpc-libnotify/metadata.xml
index 974a58e8352..f32621a8250 100644
--- a/media-plugins/gmpc-libnotify/metadata.xml
+++ b/media-plugins/gmpc-libnotify/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
</upstream>
diff --git a/media-plugins/gmpc-lyrics/metadata.xml b/media-plugins/gmpc-lyrics/metadata.xml
index 4d4c3986b1f..10db6a7fffc 100644
--- a/media-plugins/gmpc-lyrics/metadata.xml
+++ b/media-plugins/gmpc-lyrics/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>
This plugin fetches lyrics from the internet. It uses the following websites as sources:
* LyricWiki
diff --git a/media-plugins/gmpc-lyricwiki/metadata.xml b/media-plugins/gmpc-lyricwiki/metadata.xml
index 974a58e8352..f32621a8250 100644
--- a/media-plugins/gmpc-lyricwiki/metadata.xml
+++ b/media-plugins/gmpc-lyricwiki/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
</upstream>
diff --git a/media-plugins/gmpc-magnatune/metadata.xml b/media-plugins/gmpc-magnatune/metadata.xml
index e8bfc2428ef..ffdb0a16d82 100644
--- a/media-plugins/gmpc-magnatune/metadata.xml
+++ b/media-plugins/gmpc-magnatune/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>
The magnatune plugin provides an interface to the www.magnatune.com website. The plugin allows you to browse, and preview available albums. (It uses the 128kbit mp3 version).
The magnatune plugin provides a double function, it also uses the data from the
diff --git a/media-plugins/gmpc-mdcover/metadata.xml b/media-plugins/gmpc-mdcover/metadata.xml
index 60077b677b4..e2ff34639a2 100644
--- a/media-plugins/gmpc-mdcover/metadata.xml
+++ b/media-plugins/gmpc-mdcover/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>This plugin fetches cover art, artist art,album and artist information from the file system.</longdescription>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
diff --git a/media-plugins/gmpc-mmkeys/metadata.xml b/media-plugins/gmpc-mmkeys/metadata.xml
index 1e7b9d7494a..f33a41d3b88 100644
--- a/media-plugins/gmpc-mmkeys/metadata.xml
+++ b/media-plugins/gmpc-mmkeys/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gmpc-mserver/metadata.xml b/media-plugins/gmpc-mserver/metadata.xml
index 974a58e8352..f32621a8250 100644
--- a/media-plugins/gmpc-mserver/metadata.xml
+++ b/media-plugins/gmpc-mserver/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
</upstream>
diff --git a/media-plugins/gmpc-playlistsort/metadata.xml b/media-plugins/gmpc-playlistsort/metadata.xml
index 974a58e8352..f32621a8250 100644
--- a/media-plugins/gmpc-playlistsort/metadata.xml
+++ b/media-plugins/gmpc-playlistsort/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
</upstream>
diff --git a/media-plugins/gmpc-shout/metadata.xml b/media-plugins/gmpc-shout/metadata.xml
index 974a58e8352..f32621a8250 100644
--- a/media-plugins/gmpc-shout/metadata.xml
+++ b/media-plugins/gmpc-shout/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
</upstream>
diff --git a/media-plugins/gmpc-tagedit/metadata.xml b/media-plugins/gmpc-tagedit/metadata.xml
index 974a58e8352..f32621a8250 100644
--- a/media-plugins/gmpc-tagedit/metadata.xml
+++ b/media-plugins/gmpc-tagedit/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
</upstream>
diff --git a/media-plugins/gmpc-wikipedia/metadata.xml b/media-plugins/gmpc-wikipedia/metadata.xml
index 974a58e8352..f32621a8250 100644
--- a/media-plugins/gmpc-wikipedia/metadata.xml
+++ b/media-plugins/gmpc-wikipedia/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">musicpd</remote-id>
</upstream>
diff --git a/media-plugins/grilo-plugins/metadata.xml b/media-plugins/grilo-plugins/metadata.xml
index ce10d8e0c78..86ad740d9c6 100644
--- a/media-plugins/grilo-plugins/metadata.xml
+++ b/media-plugins/grilo-plugins/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="daap">Enable dmap support through <pkg>net-libs/libdmapsharing</pkg></flag>
<flag name="flickr">Enable Flickr support</flag>
diff --git a/media-plugins/gst-plugins-a52dec/metadata.xml b/media-plugins/gst-plugins-a52dec/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-a52dec/metadata.xml
+++ b/media-plugins/gst-plugins-a52dec/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-alsa/metadata.xml b/media-plugins/gst-plugins-alsa/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-alsa/metadata.xml
+++ b/media-plugins/gst-plugins-alsa/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-amr/metadata.xml b/media-plugins/gst-plugins-amr/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-amr/metadata.xml
+++ b/media-plugins/gst-plugins-amr/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-annodex/metadata.xml b/media-plugins/gst-plugins-annodex/metadata.xml
index c5041a1fea0..016edeca0c7 100644
--- a/media-plugins/gst-plugins-annodex/metadata.xml
+++ b/media-plugins/gst-plugins-annodex/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for annodex stream manipulation
diff --git a/media-plugins/gst-plugins-assrender/metadata.xml b/media-plugins/gst-plugins-assrender/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-assrender/metadata.xml
+++ b/media-plugins/gst-plugins-assrender/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-bluez/metadata.xml b/media-plugins/gst-plugins-bluez/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-bluez/metadata.xml
+++ b/media-plugins/gst-plugins-bluez/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-cdio/metadata.xml b/media-plugins/gst-plugins-cdio/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-cdio/metadata.xml
+++ b/media-plugins/gst-plugins-cdio/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-cdparanoia/metadata.xml b/media-plugins/gst-plugins-cdparanoia/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-cdparanoia/metadata.xml
+++ b/media-plugins/gst-plugins-cdparanoia/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-dash/metadata.xml b/media-plugins/gst-plugins-dash/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-dash/metadata.xml
+++ b/media-plugins/gst-plugins-dash/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-dtls/metadata.xml b/media-plugins/gst-plugins-dtls/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-dtls/metadata.xml
+++ b/media-plugins/gst-plugins-dtls/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-dts/metadata.xml b/media-plugins/gst-plugins-dts/metadata.xml
index d1096fb54bd..3794041ace8 100644
--- a/media-plugins/gst-plugins-dts/metadata.xml
+++ b/media-plugins/gst-plugins-dts/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>gstreamer</herd>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-dv/metadata.xml b/media-plugins/gst-plugins-dv/metadata.xml
index 27e89d01dbb..57a551c018b 100644
--- a/media-plugins/gst-plugins-dv/metadata.xml
+++ b/media-plugins/gst-plugins-dv/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer DV demuxer and decoder plugin based on libdv (libdv.sf.net)
</longdescription>
diff --git a/media-plugins/gst-plugins-dvb/metadata.xml b/media-plugins/gst-plugins-dvb/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-dvb/metadata.xml
+++ b/media-plugins/gst-plugins-dvb/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-dvdread/metadata.xml b/media-plugins/gst-plugins-dvdread/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-dvdread/metadata.xml
+++ b/media-plugins/gst-plugins-dvdread/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-faac/metadata.xml b/media-plugins/gst-plugins-faac/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-faac/metadata.xml
+++ b/media-plugins/gst-plugins-faac/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-faad/metadata.xml b/media-plugins/gst-plugins-faad/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-faad/metadata.xml
+++ b/media-plugins/gst-plugins-faad/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-ffmpeg/metadata.xml b/media-plugins/gst-plugins-ffmpeg/metadata.xml
index d1096fb54bd..3794041ace8 100644
--- a/media-plugins/gst-plugins-ffmpeg/metadata.xml
+++ b/media-plugins/gst-plugins-ffmpeg/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>gstreamer</herd>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-flac/metadata.xml b/media-plugins/gst-plugins-flac/metadata.xml
index 55eedbe9d48..c1eb2871f8c 100644
--- a/media-plugins/gst-plugins-flac/metadata.xml
+++ b/media-plugins/gst-plugins-flac/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for The FLAC Lossless compressor Codec
diff --git a/media-plugins/gst-plugins-gconf/metadata.xml b/media-plugins/gst-plugins-gconf/metadata.xml
index 4cb144fa4e1..677d5f977d9 100644
--- a/media-plugins/gst-plugins-gconf/metadata.xml
+++ b/media-plugins/gst-plugins-gconf/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin wrapping the GStreamer/GConf audio/video output settings
diff --git a/media-plugins/gst-plugins-gdkpixbuf/metadata.xml b/media-plugins/gst-plugins-gdkpixbuf/metadata.xml
index 711608e2a27..f117a06d95f 100644
--- a/media-plugins/gst-plugins-gdkpixbuf/metadata.xml
+++ b/media-plugins/gst-plugins-gdkpixbuf/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for GdkPixbuf-based image decoder, overlay and sink
diff --git a/media-plugins/gst-plugins-gio/metadata.xml b/media-plugins/gst-plugins-gio/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-gio/metadata.xml
+++ b/media-plugins/gst-plugins-gio/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-gl/metadata.xml b/media-plugins/gst-plugins-gl/metadata.xml
index 0c83022c9ab..d75aa0321ca 100644
--- a/media-plugins/gst-plugins-gl/metadata.xml
+++ b/media-plugins/gst-plugins-gl/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>gstreamer</herd>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
<use>
<flag name="libvisual">Enable visualization effects via
<pkg>media-libs/libvisual</pkg></flag>
diff --git a/media-plugins/gst-plugins-gnomevfs/metadata.xml b/media-plugins/gst-plugins-gnomevfs/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-gnomevfs/metadata.xml
+++ b/media-plugins/gst-plugins-gnomevfs/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-gsm/metadata.xml b/media-plugins/gst-plugins-gsm/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-gsm/metadata.xml
+++ b/media-plugins/gst-plugins-gsm/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-hls/metadata.xml b/media-plugins/gst-plugins-hls/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-hls/metadata.xml
+++ b/media-plugins/gst-plugins-hls/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-ivorbis/metadata.xml b/media-plugins/gst-plugins-ivorbis/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-ivorbis/metadata.xml
+++ b/media-plugins/gst-plugins-ivorbis/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-jack/metadata.xml b/media-plugins/gst-plugins-jack/metadata.xml
index 7883696bd07..d8bdcf90b1a 100644
--- a/media-plugins/gst-plugins-jack/metadata.xml
+++ b/media-plugins/gst-plugins-jack/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>gstreamer</herd>
<maintainer>
<email>miknix@gentoo.org</email>
<name>Angelo Arrifano</name>
<description>Regular ebuild maintenance, bugs and stuff..</description>
</maintainer>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for JACK audio elements
diff --git a/media-plugins/gst-plugins-jpeg/metadata.xml b/media-plugins/gst-plugins-jpeg/metadata.xml
index cffe8136780..77c9425031b 100644
--- a/media-plugins/gst-plugins-jpeg/metadata.xml
+++ b/media-plugins/gst-plugins-jpeg/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for the JPEG format.
diff --git a/media-plugins/gst-plugins-ladspa/metadata.xml b/media-plugins/gst-plugins-ladspa/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-ladspa/metadata.xml
+++ b/media-plugins/gst-plugins-ladspa/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-lame/metadata.xml b/media-plugins/gst-plugins-lame/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-lame/metadata.xml
+++ b/media-plugins/gst-plugins-lame/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-libav/metadata.xml b/media-plugins/gst-plugins-libav/metadata.xml
index d1096fb54bd..3794041ace8 100644
--- a/media-plugins/gst-plugins-libav/metadata.xml
+++ b/media-plugins/gst-plugins-libav/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>gstreamer</herd>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-libde265/metadata.xml b/media-plugins/gst-plugins-libde265/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-libde265/metadata.xml
+++ b/media-plugins/gst-plugins-libde265/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-libmms/metadata.xml b/media-plugins/gst-plugins-libmms/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-libmms/metadata.xml
+++ b/media-plugins/gst-plugins-libmms/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-libnice/metadata.xml b/media-plugins/gst-plugins-libnice/metadata.xml
index e9f6bc4e048..9d3a9591fae 100644
--- a/media-plugins/gst-plugins-libnice/metadata.xml
+++ b/media-plugins/gst-plugins-libnice/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>gstreamer</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-libpng/metadata.xml b/media-plugins/gst-plugins-libpng/metadata.xml
index f42b90d2adf..4e33158f1d9 100644
--- a/media-plugins/gst-plugins-libpng/metadata.xml
+++ b/media-plugins/gst-plugins-libpng/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for the PNG format.
diff --git a/media-plugins/gst-plugins-libvisual/metadata.xml b/media-plugins/gst-plugins-libvisual/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-libvisual/metadata.xml
+++ b/media-plugins/gst-plugins-libvisual/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-mad/metadata.xml b/media-plugins/gst-plugins-mad/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-mad/metadata.xml
+++ b/media-plugins/gst-plugins-mad/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-meta/metadata.xml b/media-plugins/gst-plugins-meta/metadata.xml
index bfe7a2c4779..1b420af76d4 100644
--- a/media-plugins/gst-plugins-meta/metadata.xml
+++ b/media-plugins/gst-plugins-meta/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>gnome</herd>
-<herd>gstreamer</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
This package pulls in various gstreamer plugins based on USE flags. It's
intended to be used as a runtime-depend for apps that need various gstreamer
diff --git a/media-plugins/gst-plugins-mimic/metadata.xml b/media-plugins/gst-plugins-mimic/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-mimic/metadata.xml
+++ b/media-plugins/gst-plugins-mimic/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-modplug/metadata.xml b/media-plugins/gst-plugins-modplug/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-modplug/metadata.xml
+++ b/media-plugins/gst-plugins-modplug/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-mpeg2dec/metadata.xml b/media-plugins/gst-plugins-mpeg2dec/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-mpeg2dec/metadata.xml
+++ b/media-plugins/gst-plugins-mpeg2dec/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-mpeg2enc/metadata.xml b/media-plugins/gst-plugins-mpeg2enc/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-mpeg2enc/metadata.xml
+++ b/media-plugins/gst-plugins-mpeg2enc/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-mplex/metadata.xml b/media-plugins/gst-plugins-mplex/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-mplex/metadata.xml
+++ b/media-plugins/gst-plugins-mplex/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-musepack/metadata.xml b/media-plugins/gst-plugins-musepack/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-musepack/metadata.xml
+++ b/media-plugins/gst-plugins-musepack/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-neon/metadata.xml b/media-plugins/gst-plugins-neon/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-neon/metadata.xml
+++ b/media-plugins/gst-plugins-neon/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-ofa/metadata.xml b/media-plugins/gst-plugins-ofa/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-ofa/metadata.xml
+++ b/media-plugins/gst-plugins-ofa/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-ogg/metadata.xml b/media-plugins/gst-plugins-ogg/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-ogg/metadata.xml
+++ b/media-plugins/gst-plugins-ogg/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-openh264/metadata.xml b/media-plugins/gst-plugins-openh264/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-openh264/metadata.xml
+++ b/media-plugins/gst-plugins-openh264/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-opus/metadata.xml b/media-plugins/gst-plugins-opus/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-opus/metadata.xml
+++ b/media-plugins/gst-plugins-opus/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-oss/metadata.xml b/media-plugins/gst-plugins-oss/metadata.xml
index 9963cbaa1c7..bac28b8325f 100644
--- a/media-plugins/gst-plugins-oss/metadata.xml
+++ b/media-plugins/gst-plugins-oss/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for OSS (Open Sound System) support
diff --git a/media-plugins/gst-plugins-pango/metadata.xml b/media-plugins/gst-plugins-pango/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-pango/metadata.xml
+++ b/media-plugins/gst-plugins-pango/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-pulse/metadata.xml b/media-plugins/gst-plugins-pulse/metadata.xml
index ff5f11a5837..b4b7d34b2c2 100644
--- a/media-plugins/gst-plugins-pulse/metadata.xml
+++ b/media-plugins/gst-plugins-pulse/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>gstreamer</herd>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
<longdescription lang="en">
GStreamer plugin for the PulseAudio sound server.
diff --git a/media-plugins/gst-plugins-raw1394/metadata.xml b/media-plugins/gst-plugins-raw1394/metadata.xml
index 74db661655f..41781ab6869 100644
--- a/media-plugins/gst-plugins-raw1394/metadata.xml
+++ b/media-plugins/gst-plugins-raw1394/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for capturing video source via firewire (IEEE1394 interface).
diff --git a/media-plugins/gst-plugins-resindvd/metadata.xml b/media-plugins/gst-plugins-resindvd/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-resindvd/metadata.xml
+++ b/media-plugins/gst-plugins-resindvd/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-rtmp/metadata.xml b/media-plugins/gst-plugins-rtmp/metadata.xml
index e0cf080599c..23d17a082e0 100644
--- a/media-plugins/gst-plugins-rtmp/metadata.xml
+++ b/media-plugins/gst-plugins-rtmp/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for reading RTMP streams.
diff --git a/media-plugins/gst-plugins-schroedinger/metadata.xml b/media-plugins/gst-plugins-schroedinger/metadata.xml
index dec0396a21e..beda1250457 100644
--- a/media-plugins/gst-plugins-schroedinger/metadata.xml
+++ b/media-plugins/gst-plugins-schroedinger/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>gstreamer</herd>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-shout2/metadata.xml b/media-plugins/gst-plugins-shout2/metadata.xml
index fd4056976fa..b1ed172a8dc 100644
--- a/media-plugins/gst-plugins-shout2/metadata.xml
+++ b/media-plugins/gst-plugins-shout2/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for sending data to an icecast server using libshout2
diff --git a/media-plugins/gst-plugins-sidplay/metadata.xml b/media-plugins/gst-plugins-sidplay/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-sidplay/metadata.xml
+++ b/media-plugins/gst-plugins-sidplay/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-smoothstreaming/metadata.xml b/media-plugins/gst-plugins-smoothstreaming/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-smoothstreaming/metadata.xml
+++ b/media-plugins/gst-plugins-smoothstreaming/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-soundtouch/metadata.xml b/media-plugins/gst-plugins-soundtouch/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-soundtouch/metadata.xml
+++ b/media-plugins/gst-plugins-soundtouch/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-soup/metadata.xml b/media-plugins/gst-plugins-soup/metadata.xml
index 61a5125250b..6f2530bea92 100644
--- a/media-plugins/gst-plugins-soup/metadata.xml
+++ b/media-plugins/gst-plugins-soup/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for HTTP client source/sink via net-libs/libsoup.
diff --git a/media-plugins/gst-plugins-speex/metadata.xml b/media-plugins/gst-plugins-speex/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-speex/metadata.xml
+++ b/media-plugins/gst-plugins-speex/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-taglib/metadata.xml b/media-plugins/gst-plugins-taglib/metadata.xml
index 66221ace6e3..88a355a7e60 100644
--- a/media-plugins/gst-plugins-taglib/metadata.xml
+++ b/media-plugins/gst-plugins-taglib/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for tag writing based on taglib
diff --git a/media-plugins/gst-plugins-theora/metadata.xml b/media-plugins/gst-plugins-theora/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-theora/metadata.xml
+++ b/media-plugins/gst-plugins-theora/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-twolame/metadata.xml b/media-plugins/gst-plugins-twolame/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-twolame/metadata.xml
+++ b/media-plugins/gst-plugins-twolame/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-uvch264/metadata.xml b/media-plugins/gst-plugins-uvch264/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-uvch264/metadata.xml
+++ b/media-plugins/gst-plugins-uvch264/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-v4l2/metadata.xml b/media-plugins/gst-plugins-v4l2/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-v4l2/metadata.xml
+++ b/media-plugins/gst-plugins-v4l2/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-vaapi/metadata.xml b/media-plugins/gst-plugins-vaapi/metadata.xml
index b591b2bb285..9417409478a 100644
--- a/media-plugins/gst-plugins-vaapi/metadata.xml
+++ b/media-plugins/gst-plugins-vaapi/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>gstreamer</herd>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
<use>
<flag name="drm">Enable DRM renderer</flag>
</use>
diff --git a/media-plugins/gst-plugins-voaacenc/metadata.xml b/media-plugins/gst-plugins-voaacenc/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-voaacenc/metadata.xml
+++ b/media-plugins/gst-plugins-voaacenc/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-voamrwbenc/metadata.xml b/media-plugins/gst-plugins-voamrwbenc/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-voamrwbenc/metadata.xml
+++ b/media-plugins/gst-plugins-voamrwbenc/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-vorbis/metadata.xml b/media-plugins/gst-plugins-vorbis/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-vorbis/metadata.xml
+++ b/media-plugins/gst-plugins-vorbis/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-vp8/metadata.xml b/media-plugins/gst-plugins-vp8/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-vp8/metadata.xml
+++ b/media-plugins/gst-plugins-vp8/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-vpx/metadata.xml b/media-plugins/gst-plugins-vpx/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-vpx/metadata.xml
+++ b/media-plugins/gst-plugins-vpx/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-wavpack/metadata.xml b/media-plugins/gst-plugins-wavpack/metadata.xml
index 641f9a3068e..dc748e3c3c7 100644
--- a/media-plugins/gst-plugins-wavpack/metadata.xml
+++ b/media-plugins/gst-plugins-wavpack/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for Wavpack lossless/lossy audio format handling.
diff --git a/media-plugins/gst-plugins-x/metadata.xml b/media-plugins/gst-plugins-x/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-x/metadata.xml
+++ b/media-plugins/gst-plugins-x/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-x264/metadata.xml b/media-plugins/gst-plugins-x264/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-x264/metadata.xml
+++ b/media-plugins/gst-plugins-x264/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-x265/metadata.xml b/media-plugins/gst-plugins-x265/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-x265/metadata.xml
+++ b/media-plugins/gst-plugins-x265/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-ximagesrc/metadata.xml b/media-plugins/gst-plugins-ximagesrc/metadata.xml
index 48f1b8d00ae..76490c44999 100644
--- a/media-plugins/gst-plugins-ximagesrc/metadata.xml
+++ b/media-plugins/gst-plugins-ximagesrc/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
<longdescription lang="en">
GStreamer plugin for X11 video input using standard Xlib calls.
diff --git a/media-plugins/gst-plugins-xvid/metadata.xml b/media-plugins/gst-plugins-xvid/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-xvid/metadata.xml
+++ b/media-plugins/gst-plugins-xvid/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/gst-plugins-xvideo/metadata.xml b/media-plugins/gst-plugins-xvideo/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-plugins/gst-plugins-xvideo/metadata.xml
+++ b/media-plugins/gst-plugins-xvideo/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>gstreamer</herd>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/hexter/metadata.xml b/media-plugins/hexter/metadata.xml
index 7453a0fa222..f6f92e745c8 100644
--- a/media-plugins/hexter/metadata.xml
+++ b/media-plugins/hexter/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>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<use>
<flag name="gtk2">Enable <pkg>x11-libs/gtk+:2</pkg> based GUI</flag>
</use>
diff --git a/media-plugins/imlib2_loaders/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index 596ac20fca9..add83e74e58 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/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>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<use>
<flag name="eet">Enable Eet image loader</flag>
<flag name="xcf">Enable XCF image loader</flag>
diff --git a/media-plugins/ir_lv2/metadata.xml b/media-plugins/ir_lv2/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-plugins/ir_lv2/metadata.xml
+++ b/media-plugins/ir_lv2/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>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/kipi-plugins/metadata.xml b/media-plugins/kipi-plugins/metadata.xml
index 3f965084285..757b516f8ee 100644
--- a/media-plugins/kipi-plugins/metadata.xml
+++ b/media-plugins/kipi-plugins/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>kde</herd>
<maintainer>
<email>dilfridge@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="expoblending">Build the expoblending plugin, which requires media-gfx/hugin</flag>
<flag name="gpssync">Build the gpssync plugin, which requires kde-apps/libkgeomap and thereby marble</flag>
diff --git a/media-plugins/libvisual-plugins/metadata.xml b/media-plugins/libvisual-plugins/metadata.xml
index 1c16bbf70ae..77d67e18729 100644
--- a/media-plugins/libvisual-plugins/metadata.xml
+++ b/media-plugins/libvisual-plugins/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libvisual</remote-id>
</upstream>
diff --git a/media-plugins/libvisual-projectm/metadata.xml b/media-plugins/libvisual-projectm/metadata.xml
index 2ace5da1910..24c142d93fa 100644
--- a/media-plugins/libvisual-projectm/metadata.xml
+++ b/media-plugins/libvisual-projectm/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">projectm</remote-id>
</upstream>
diff --git a/media-plugins/live/metadata.xml b/media-plugins/live/metadata.xml
index 1cadc2e4ec2..ef86e0c272b 100644
--- a/media-plugins/live/metadata.xml
+++ b/media-plugins/live/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>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
diff --git a/media-plugins/mcp-plugins/metadata.xml b/media-plugins/mcp-plugins/metadata.xml
index 3a8ea7e0297..9d7a19de1f8 100644
--- a/media-plugins/mcp-plugins/metadata.xml
+++ b/media-plugins/mcp-plugins/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>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-plugins/mda-lv2/metadata.xml b/media-plugins/mda-lv2/metadata.xml
index a9d9d38c292..b5054fc3e3f 100644
--- a/media-plugins/mda-lv2/metadata.xml
+++ b/media-plugins/mda-lv2/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>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
<longdescription lang="en">
MDA-LV2 is an LV2 port of the MDA plugins by Paul Kellett. It contains 36 high-quality plugins for a variety of tasks.
diff --git a/media-plugins/mythplugins/metadata.xml b/media-plugins/mythplugins/metadata.xml
index c33b6b928fa..77682f691f1 100644
--- a/media-plugins/mythplugins/metadata.xml
+++ b/media-plugins/mythplugins/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="cdr">Allows MythMusic to burn CD-Rs</flag>
<flag name="exif">Allows MythGallery to read EXIF data from photos</flag>
diff --git a/media-plugins/npapi-vlc/metadata.xml b/media-plugins/npapi-vlc/metadata.xml
index 0d9b0dcb7f3..7b0b0a767d0 100644
--- a/media-plugins/npapi-vlc/metadata.xml
+++ b/media-plugins/npapi-vlc/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>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
diff --git a/media-plugins/qmmp-plugin-pack/metadata.xml b/media-plugins/qmmp-plugin-pack/metadata.xml
index 94277f8e157..a9d9c2e813f 100644
--- a/media-plugins/qmmp-plugin-pack/metadata.xml
+++ b/media-plugins/qmmp-plugin-pack/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>sound</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+<maintainer>
+<email>sound@gentoo.org</email>
+<name>Gentoo Sound project</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/media-plugins/quodlibet-plugins/metadata.xml b/media-plugins/quodlibet-plugins/metadata.xml
index a007fa29315..f6d05be69db 100644
--- a/media-plugins/quodlibet-plugins/metadata.xml
+++ b/media-plugins/quodlibet-plugins/metadata.xml
@@ -5,7 +5,10 @@
<email>tamiko@gentoo.org</email>
<name>Matthias Maier</name>
</maintainer>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="github">quodlibet/quodlibet</remote-id>
<remote-id type="bitbucket">lazka/quodlibet-files</remote-id>
diff --git a/media-plugins/rev-plugins/metadata.xml b/media-plugins/rev-plugins/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-plugins/rev-plugins/metadata.xml
+++ b/media-plugins/rev-plugins/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>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/swh-lv2/metadata.xml b/media-plugins/swh-lv2/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-plugins/swh-lv2/metadata.xml
+++ b/media-plugins/swh-lv2/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>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/swh-plugins/metadata.xml b/media-plugins/swh-plugins/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-plugins/swh-plugins/metadata.xml
+++ b/media-plugins/swh-plugins/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>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/tap-plugins/metadata.xml b/media-plugins/tap-plugins/metadata.xml
index a4924a938c0..d0776990168 100644
--- a/media-plugins/tap-plugins/metadata.xml
+++ b/media-plugins/tap-plugins/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>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<longdescription>
TAP-plugins is short for Tom's Audio Processing plugins. It is a bunch of
LADSPA plugins for digital audio processing, intended for use in a
diff --git a/media-plugins/vamp-aubio-plugins/metadata.xml b/media-plugins/vamp-aubio-plugins/metadata.xml
index 5179b9fb44c..616443c1fa9 100644
--- a/media-plugins/vamp-aubio-plugins/metadata.xml
+++ b/media-plugins/vamp-aubio-plugins/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>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">vamp</remote-id>
</upstream>
diff --git a/media-plugins/vamp-libxtract-plugins/metadata.xml b/media-plugins/vamp-libxtract-plugins/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-plugins/vamp-libxtract-plugins/metadata.xml
+++ b/media-plugins/vamp-libxtract-plugins/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>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/vco-plugins/metadata.xml b/media-plugins/vco-plugins/metadata.xml
index 3a8ea7e0297..9d7a19de1f8 100644
--- a/media-plugins/vco-plugins/metadata.xml
+++ b/media-plugins/vco-plugins/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>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-plugins/vdr-actuator/metadata.xml b/media-plugins/vdr-actuator/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-actuator/metadata.xml
+++ b/media-plugins/vdr-actuator/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-plugins/vdr-admin/metadata.xml b/media-plugins/vdr-admin/metadata.xml
index 73b27a4b5d0..9fb49a4ad53 100644
--- a/media-plugins/vdr-admin/metadata.xml
+++ b/media-plugins/vdr-admin/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-alcd/metadata.xml b/media-plugins/vdr-alcd/metadata.xml
index 4964df77e70..c43dce7637f 100644
--- a/media-plugins/vdr-alcd/metadata.xml
+++ b/media-plugins/vdr-alcd/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>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
@@ -12,6 +10,10 @@
<name>Helmut Auer</name>
<description>Upstream maintainer</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
VDR plugin: Control the LCD of the Siemens Activy 300
</longdescription>
diff --git a/media-plugins/vdr-arghdirector/metadata.xml b/media-plugins/vdr-arghdirector/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-arghdirector/metadata.xml
+++ b/media-plugins/vdr-arghdirector/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-plugins/vdr-atscepg/metadata.xml b/media-plugins/vdr-atscepg/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-atscepg/metadata.xml
+++ b/media-plugins/vdr-atscepg/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-plugins/vdr-audiorecorder/metadata.xml b/media-plugins/vdr-audiorecorder/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-audiorecorder/metadata.xml
+++ b/media-plugins/vdr-audiorecorder/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-plugins/vdr-autosort/metadata.xml b/media-plugins/vdr-autosort/metadata.xml
index a993cc4be30..a691bc4532a 100644
--- a/media-plugins/vdr-autosort/metadata.xml
+++ b/media-plugins/vdr-autosort/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-plugins/vdr-avards/metadata.xml b/media-plugins/vdr-avards/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-plugins/vdr-avards/metadata.xml
+++ b/media-plugins/vdr-avards/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-plugins/vdr-beep/metadata.xml b/media-plugins/vdr-beep/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-plugins/vdr-beep/metadata.xml
+++ b/media-plugins/vdr-beep/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-plugins/vdr-bgprocess/metadata.xml b/media-plugins/vdr-bgprocess/metadata.xml
index 6b0025393c6..dce5a439843 100644
--- a/media-plugins/vdr-bgprocess/metadata.xml
+++ b/media-plugins/vdr-bgprocess/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-plugins/vdr-browse/metadata.xml b/media-plugins/vdr-browse/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-browse/metadata.xml
+++ b/media-plugins/vdr-browse/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-plugins/vdr-burn-templates/metadata.xml b/media-plugins/vdr-burn-templates/metadata.xml
index 8c6d2f5bb1d..b1e2935dced 100644
--- a/media-plugins/vdr-burn-templates/metadata.xml
+++ b/media-plugins/vdr-burn-templates/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-burn/metadata.xml b/media-plugins/vdr-burn/metadata.xml
index 0f7a5460e2b..6187ccff299 100644
--- a/media-plugins/vdr-burn/metadata.xml
+++ b/media-plugins/vdr-burn/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-calc/metadata.xml b/media-plugins/vdr-calc/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-calc/metadata.xml
+++ b/media-plugins/vdr-calc/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-plugins/vdr-cdplayer/metadata.xml b/media-plugins/vdr-cdplayer/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-cdplayer/metadata.xml
+++ b/media-plugins/vdr-cdplayer/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-plugins/vdr-chanman/metadata.xml b/media-plugins/vdr-chanman/metadata.xml
index cbc3523c031..e8820368932 100644
--- a/media-plugins/vdr-chanman/metadata.xml
+++ b/media-plugins/vdr-chanman/metadata.xml
@@ -1,9 +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>christian.gmeiner@gmail.com</email>
<name>Christian Gmeiner</name>
@@ -16,4 +13,8 @@
<description>Proxying maintainer</description>
</maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/vdr-channelblocker/metadata.xml b/media-plugins/vdr-channelblocker/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-plugins/vdr-channelblocker/metadata.xml
+++ b/media-plugins/vdr-channelblocker/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-plugins/vdr-cinebars/metadata.xml b/media-plugins/vdr-cinebars/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-cinebars/metadata.xml
+++ b/media-plugins/vdr-cinebars/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-plugins/vdr-clock/metadata.xml b/media-plugins/vdr-clock/metadata.xml
index c395a8b3dd4..4555f8b3099 100644
--- a/media-plugins/vdr-clock/metadata.xml
+++ b/media-plugins/vdr-clock/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
<description>
diff --git a/media-plugins/vdr-console/metadata.xml b/media-plugins/vdr-console/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-plugins/vdr-console/metadata.xml
+++ b/media-plugins/vdr-console/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-plugins/vdr-coverviewer/metadata.xml b/media-plugins/vdr-coverviewer/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-coverviewer/metadata.xml
+++ b/media-plugins/vdr-coverviewer/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-plugins/vdr-cpumon/metadata.xml b/media-plugins/vdr-cpumon/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-plugins/vdr-cpumon/metadata.xml
+++ b/media-plugins/vdr-cpumon/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-plugins/vdr-decruft/metadata.xml b/media-plugins/vdr-decruft/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-decruft/metadata.xml
+++ b/media-plugins/vdr-decruft/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-plugins/vdr-devstatus/metadata.xml b/media-plugins/vdr-devstatus/metadata.xml
index 6b0025393c6..dce5a439843 100644
--- a/media-plugins/vdr-devstatus/metadata.xml
+++ b/media-plugins/vdr-devstatus/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-plugins/vdr-dummydevice/metadata.xml b/media-plugins/vdr-dummydevice/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-dummydevice/metadata.xml
+++ b/media-plugins/vdr-dummydevice/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-plugins/vdr-duplicates/metadata.xml b/media-plugins/vdr-duplicates/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-duplicates/metadata.xml
+++ b/media-plugins/vdr-duplicates/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-plugins/vdr-dvbapi/metadata.xml b/media-plugins/vdr-dvbapi/metadata.xml
index e947c6b9b74..e3a0aeedb5e 100644
--- a/media-plugins/vdr-dvbapi/metadata.xml
+++ b/media-plugins/vdr-dvbapi/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>
<name>Joerg Bornkessel</name>
diff --git a/media-plugins/vdr-dvbhddevice/metadata.xml b/media-plugins/vdr-dvbhddevice/metadata.xml
index 9a88eb10622..c2e094a1fce 100644
--- a/media-plugins/vdr-dvbhddevice/metadata.xml
+++ b/media-plugins/vdr-dvbhddevice/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-plugins/vdr-dvbsddevice/metadata.xml b/media-plugins/vdr-dvbsddevice/metadata.xml
index 94d2eca26f1..18bf54be7ee 100644
--- a/media-plugins/vdr-dvbsddevice/metadata.xml
+++ b/media-plugins/vdr-dvbsddevice/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-dvd/metadata.xml b/media-plugins/vdr-dvd/metadata.xml
index bdc2d42290e..f726922d66e 100644
--- a/media-plugins/vdr-dvd/metadata.xml
+++ b/media-plugins/vdr-dvd/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-plugins/vdr-dvdswitch/metadata.xml b/media-plugins/vdr-dvdswitch/metadata.xml
index fb313c2b3c4..d458e4e7d37 100644
--- a/media-plugins/vdr-dvdswitch/metadata.xml
+++ b/media-plugins/vdr-dvdswitch/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-epgsearch/metadata.xml b/media-plugins/vdr-epgsearch/metadata.xml
index a5a8c517a70..7016024ba7b 100644
--- a/media-plugins/vdr-epgsearch/metadata.xml
+++ b/media-plugins/vdr-epgsearch/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-plugins/vdr-epgsync/metadata.xml b/media-plugins/vdr-epgsync/metadata.xml
index 57cbe8aa99b..1f944efea5d 100644
--- a/media-plugins/vdr-epgsync/metadata.xml
+++ b/media-plugins/vdr-epgsync/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-exec/metadata.xml b/media-plugins/vdr-exec/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-exec/metadata.xml
+++ b/media-plugins/vdr-exec/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-plugins/vdr-extb/metadata.xml b/media-plugins/vdr-extb/metadata.xml
index 4c7ba1e416d..015b5bc048c 100644
--- a/media-plugins/vdr-extb/metadata.xml
+++ b/media-plugins/vdr-extb/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-extrecmenu/metadata.xml b/media-plugins/vdr-extrecmenu/metadata.xml
index 4c7ba1e416d..015b5bc048c 100644
--- a/media-plugins/vdr-extrecmenu/metadata.xml
+++ b/media-plugins/vdr-extrecmenu/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-femon/metadata.xml b/media-plugins/vdr-femon/metadata.xml
index ac952716b14..10d8a08e9c1 100644
--- a/media-plugins/vdr-femon/metadata.xml
+++ b/media-plugins/vdr-femon/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-plugins/vdr-fepg/metadata.xml b/media-plugins/vdr-fepg/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-fepg/metadata.xml
+++ b/media-plugins/vdr-fepg/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-plugins/vdr-ffnetdev/metadata.xml b/media-plugins/vdr-ffnetdev/metadata.xml
index 7b3fdfd9ff6..a11e67683e8 100644
--- a/media-plugins/vdr-ffnetdev/metadata.xml
+++ b/media-plugins/vdr-ffnetdev/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-filebrowser/metadata.xml b/media-plugins/vdr-filebrowser/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-filebrowser/metadata.xml
+++ b/media-plugins/vdr-filebrowser/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-plugins/vdr-freecell/metadata.xml b/media-plugins/vdr-freecell/metadata.xml
index 4a858b6a7d4..acbbc3cdf03 100644
--- a/media-plugins/vdr-freecell/metadata.xml
+++ b/media-plugins/vdr-freecell/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-fritzbox/metadata.xml b/media-plugins/vdr-fritzbox/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-plugins/vdr-fritzbox/metadata.xml
+++ b/media-plugins/vdr-fritzbox/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-plugins/vdr-graphlcd/metadata.xml b/media-plugins/vdr-graphlcd/metadata.xml
index ea78167eef7..befde039498 100644
--- a/media-plugins/vdr-graphlcd/metadata.xml
+++ b/media-plugins/vdr-graphlcd/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-graphtft/metadata.xml b/media-plugins/vdr-graphtft/metadata.xml
index 3e10421fa1a..58b7140f61b 100644
--- a/media-plugins/vdr-graphtft/metadata.xml
+++ b/media-plugins/vdr-graphtft/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-image/metadata.xml b/media-plugins/vdr-image/metadata.xml
index e820fe1a899..0170c4319b4 100644
--- a/media-plugins/vdr-image/metadata.xml
+++ b/media-plugins/vdr-image/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
<description>
diff --git a/media-plugins/vdr-imonlcd/metadata.xml b/media-plugins/vdr-imonlcd/metadata.xml
index 53d38987c8c..097975e3adc 100644
--- a/media-plugins/vdr-imonlcd/metadata.xml
+++ b/media-plugins/vdr-imonlcd/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-plugins/vdr-infosatepg/metadata.xml b/media-plugins/vdr-infosatepg/metadata.xml
index 313ba359cda..3062b3bfc5b 100644
--- a/media-plugins/vdr-infosatepg/metadata.xml
+++ b/media-plugins/vdr-infosatepg/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-plugins/vdr-iptv/metadata.xml b/media-plugins/vdr-iptv/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-iptv/metadata.xml
+++ b/media-plugins/vdr-iptv/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-plugins/vdr-joystick/metadata.xml b/media-plugins/vdr-joystick/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-joystick/metadata.xml
+++ b/media-plugins/vdr-joystick/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-plugins/vdr-kvdrmon/metadata.xml b/media-plugins/vdr-kvdrmon/metadata.xml
index 375121aa42b..4c2e7033b4c 100644
--- a/media-plugins/vdr-kvdrmon/metadata.xml
+++ b/media-plugins/vdr-kvdrmon/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>gentoo@bjusystems.de</email>
<name>Bernd Juraschek</name>
@@ -11,6 +9,10 @@
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">vdr-statusleds</remote-id>
</upstream>
diff --git a/media-plugins/vdr-launcher/metadata.xml b/media-plugins/vdr-launcher/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-launcher/metadata.xml
+++ b/media-plugins/vdr-launcher/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-plugins/vdr-lcdproc/metadata.xml b/media-plugins/vdr-lcdproc/metadata.xml
index 9528e201da6..948cb9ebf16 100644
--- a/media-plugins/vdr-lcdproc/metadata.xml
+++ b/media-plugins/vdr-lcdproc/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-lcr/metadata.xml b/media-plugins/vdr-lcr/metadata.xml
index 0c60c8206fe..02a041c8344 100644
--- a/media-plugins/vdr-lcr/metadata.xml
+++ b/media-plugins/vdr-lcr/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
<description>
diff --git a/media-plugins/vdr-live/metadata.xml b/media-plugins/vdr-live/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-live/metadata.xml
+++ b/media-plugins/vdr-live/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-plugins/vdr-loadepg/metadata.xml b/media-plugins/vdr-loadepg/metadata.xml
index 4a5789f10e2..398fe838bac 100644
--- a/media-plugins/vdr-loadepg/metadata.xml
+++ b/media-plugins/vdr-loadepg/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-mailbox/metadata.xml b/media-plugins/vdr-mailbox/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-mailbox/metadata.xml
+++ b/media-plugins/vdr-mailbox/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-plugins/vdr-markad/metadata.xml b/media-plugins/vdr-markad/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-markad/metadata.xml
+++ b/media-plugins/vdr-markad/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-plugins/vdr-menuorg/metadata.xml b/media-plugins/vdr-menuorg/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-plugins/vdr-menuorg/metadata.xml
+++ b/media-plugins/vdr-menuorg/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-plugins/vdr-mlist/metadata.xml b/media-plugins/vdr-mlist/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-mlist/metadata.xml
+++ b/media-plugins/vdr-mlist/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-plugins/vdr-mount/metadata.xml b/media-plugins/vdr-mount/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-mount/metadata.xml
+++ b/media-plugins/vdr-mount/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-plugins/vdr-mp3ng/metadata.xml b/media-plugins/vdr-mp3ng/metadata.xml
index 5c2dd67dc7f..81fae0b7713 100644
--- a/media-plugins/vdr-mp3ng/metadata.xml
+++ b/media-plugins/vdr-mp3ng/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-plugins/vdr-mplayer/metadata.xml b/media-plugins/vdr-mplayer/metadata.xml
index 7db232940db..84a5fcff324 100644
--- a/media-plugins/vdr-mplayer/metadata.xml
+++ b/media-plugins/vdr-mplayer/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-plugins/vdr-music/metadata.xml b/media-plugins/vdr-music/metadata.xml
index 20dc06c0521..11707e1b32d 100644
--- a/media-plugins/vdr-music/metadata.xml
+++ b/media-plugins/vdr-music/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-plugins/vdr-newsticker/metadata.xml b/media-plugins/vdr-newsticker/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-newsticker/metadata.xml
+++ b/media-plugins/vdr-newsticker/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-plugins/vdr-noepg/metadata.xml b/media-plugins/vdr-noepg/metadata.xml
index ce006eaf85a..1f8cb3dbe2f 100644
--- a/media-plugins/vdr-noepg/metadata.xml
+++ b/media-plugins/vdr-noepg/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-plugins/vdr-nordlichtsepg/metadata.xml b/media-plugins/vdr-nordlichtsepg/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-plugins/vdr-nordlichtsepg/metadata.xml
+++ b/media-plugins/vdr-nordlichtsepg/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-plugins/vdr-osdpip/metadata.xml b/media-plugins/vdr-osdpip/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-osdpip/metadata.xml
+++ b/media-plugins/vdr-osdpip/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-plugins/vdr-osdserver/metadata.xml b/media-plugins/vdr-osdserver/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-osdserver/metadata.xml
+++ b/media-plugins/vdr-osdserver/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-plugins/vdr-osdteletext/metadata.xml b/media-plugins/vdr-osdteletext/metadata.xml
index fd3c9ce9ec5..5c1d28978c7 100644
--- a/media-plugins/vdr-osdteletext/metadata.xml
+++ b/media-plugins/vdr-osdteletext/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
<description>Please contacts maintainer before you change something.</description>
diff --git a/media-plugins/vdr-peer/metadata.xml b/media-plugins/vdr-peer/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-peer/metadata.xml
+++ b/media-plugins/vdr-peer/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-plugins/vdr-permashift/metadata.xml b/media-plugins/vdr-permashift/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-permashift/metadata.xml
+++ b/media-plugins/vdr-permashift/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-plugins/vdr-picselshow/metadata.xml b/media-plugins/vdr-picselshow/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-picselshow/metadata.xml
+++ b/media-plugins/vdr-picselshow/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-plugins/vdr-pilot/metadata.xml b/media-plugins/vdr-pilot/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-pilot/metadata.xml
+++ b/media-plugins/vdr-pilot/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-plugins/vdr-pilotskin/metadata.xml b/media-plugins/vdr-pilotskin/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-pilotskin/metadata.xml
+++ b/media-plugins/vdr-pilotskin/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-plugins/vdr-pin/metadata.xml b/media-plugins/vdr-pin/metadata.xml
index c07666634ae..d59c34bb826 100644
--- a/media-plugins/vdr-pin/metadata.xml
+++ b/media-plugins/vdr-pin/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-powermate/metadata.xml b/media-plugins/vdr-powermate/metadata.xml
index 20b21cfa6df..897076276e6 100644
--- a/media-plugins/vdr-powermate/metadata.xml
+++ b/media-plugins/vdr-powermate/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-prefermenu/metadata.xml b/media-plugins/vdr-prefermenu/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-prefermenu/metadata.xml
+++ b/media-plugins/vdr-prefermenu/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-plugins/vdr-proxy/metadata.xml b/media-plugins/vdr-proxy/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-proxy/metadata.xml
+++ b/media-plugins/vdr-proxy/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-plugins/vdr-pvr350/metadata.xml b/media-plugins/vdr-pvr350/metadata.xml
index b228325bbfe..5f25ff08d53 100644
--- a/media-plugins/vdr-pvr350/metadata.xml
+++ b/media-plugins/vdr-pvr350/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-plugins/vdr-pvrinput/metadata.xml b/media-plugins/vdr-pvrinput/metadata.xml
index 26edd4801fb..c29102abfbc 100644
--- a/media-plugins/vdr-pvrinput/metadata.xml
+++ b/media-plugins/vdr-pvrinput/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-quicktimer/metadata.xml b/media-plugins/vdr-quicktimer/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-quicktimer/metadata.xml
+++ b/media-plugins/vdr-quicktimer/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-plugins/vdr-radio/metadata.xml b/media-plugins/vdr-radio/metadata.xml
index c6c589a5443..776309c646d 100644
--- a/media-plugins/vdr-radio/metadata.xml
+++ b/media-plugins/vdr-radio/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-radiolist/metadata.xml b/media-plugins/vdr-radiolist/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-radiolist/metadata.xml
+++ b/media-plugins/vdr-radiolist/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-plugins/vdr-rcu/metadata.xml b/media-plugins/vdr-rcu/metadata.xml
index 94d2eca26f1..18bf54be7ee 100644
--- a/media-plugins/vdr-rcu/metadata.xml
+++ b/media-plugins/vdr-rcu/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-recsearch/metadata.xml b/media-plugins/vdr-recsearch/metadata.xml
index da5ebae7110..672c18f25b9 100644
--- a/media-plugins/vdr-recsearch/metadata.xml
+++ b/media-plugins/vdr-recsearch/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-plugins/vdr-recstatus/metadata.xml b/media-plugins/vdr-recstatus/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-recstatus/metadata.xml
+++ b/media-plugins/vdr-recstatus/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-plugins/vdr-remote/metadata.xml b/media-plugins/vdr-remote/metadata.xml
index 8bd006c2ea3..51e66b74746 100644
--- a/media-plugins/vdr-remote/metadata.xml
+++ b/media-plugins/vdr-remote/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-remoteosd/metadata.xml b/media-plugins/vdr-remoteosd/metadata.xml
index 57cbe8aa99b..1f944efea5d 100644
--- a/media-plugins/vdr-remoteosd/metadata.xml
+++ b/media-plugins/vdr-remoteosd/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-remotetimers/metadata.xml b/media-plugins/vdr-remotetimers/metadata.xml
index 57cbe8aa99b..1f944efea5d 100644
--- a/media-plugins/vdr-remotetimers/metadata.xml
+++ b/media-plugins/vdr-remotetimers/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-rotor/metadata.xml b/media-plugins/vdr-rotor/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-rotor/metadata.xml
+++ b/media-plugins/vdr-rotor/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-plugins/vdr-rpihddevice/metadata.xml b/media-plugins/vdr-rpihddevice/metadata.xml
index 94d2eca26f1..18bf54be7ee 100644
--- a/media-plugins/vdr-rpihddevice/metadata.xml
+++ b/media-plugins/vdr-rpihddevice/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-rssreader/metadata.xml b/media-plugins/vdr-rssreader/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-rssreader/metadata.xml
+++ b/media-plugins/vdr-rssreader/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-plugins/vdr-satip/metadata.xml b/media-plugins/vdr-satip/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-satip/metadata.xml
+++ b/media-plugins/vdr-satip/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-plugins/vdr-scheduler/metadata.xml b/media-plugins/vdr-scheduler/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-scheduler/metadata.xml
+++ b/media-plugins/vdr-scheduler/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-plugins/vdr-screenshot/metadata.xml b/media-plugins/vdr-screenshot/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-screenshot/metadata.xml
+++ b/media-plugins/vdr-screenshot/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-plugins/vdr-serial/metadata.xml b/media-plugins/vdr-serial/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-serial/metadata.xml
+++ b/media-plugins/vdr-serial/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-plugins/vdr-skincurses/metadata.xml b/media-plugins/vdr-skincurses/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-skincurses/metadata.xml
+++ b/media-plugins/vdr-skincurses/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-plugins/vdr-skinelchi/metadata.xml b/media-plugins/vdr-skinelchi/metadata.xml
index cb4801091e1..42cd39a3316 100644
--- a/media-plugins/vdr-skinelchi/metadata.xml
+++ b/media-plugins/vdr-skinelchi/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-plugins/vdr-skinenigmang/metadata.xml b/media-plugins/vdr-skinenigmang/metadata.xml
index 4cbd0a3e5ea..db07426a4e3 100644
--- a/media-plugins/vdr-skinenigmang/metadata.xml
+++ b/media-plugins/vdr-skinenigmang/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-skinnopacity/metadata.xml b/media-plugins/vdr-skinnopacity/metadata.xml
index ceb45da48f6..116ba243471 100644
--- a/media-plugins/vdr-skinnopacity/metadata.xml
+++ b/media-plugins/vdr-skinnopacity/metadata.xml
@@ -5,5 +5,4 @@
<email>idl0r@gentoo.org</email>
<name>Christian Ruppert</name>
</maintainer>
- <herd>media-tv</herd>
-</pkgmetadata>
+ </pkgmetadata>
diff --git a/media-plugins/vdr-skinsoppalusikka/metadata.xml b/media-plugins/vdr-skinsoppalusikka/metadata.xml
index 4cbd0a3e5ea..db07426a4e3 100644
--- a/media-plugins/vdr-skinsoppalusikka/metadata.xml
+++ b/media-plugins/vdr-skinsoppalusikka/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-sleeptimer/metadata.xml b/media-plugins/vdr-sleeptimer/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-sleeptimer/metadata.xml
+++ b/media-plugins/vdr-sleeptimer/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-plugins/vdr-sndctl/metadata.xml b/media-plugins/vdr-sndctl/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-sndctl/metadata.xml
+++ b/media-plugins/vdr-sndctl/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-plugins/vdr-solitaire/metadata.xml b/media-plugins/vdr-solitaire/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-plugins/vdr-solitaire/metadata.xml
+++ b/media-plugins/vdr-solitaire/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-plugins/vdr-span/metadata.xml b/media-plugins/vdr-span/metadata.xml
index 04664717a4f..42885e96928 100644
--- a/media-plugins/vdr-span/metadata.xml
+++ b/media-plugins/vdr-span/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-plugins/vdr-spider/metadata.xml b/media-plugins/vdr-spider/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-spider/metadata.xml
+++ b/media-plugins/vdr-spider/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-plugins/vdr-streamdev/metadata.xml b/media-plugins/vdr-streamdev/metadata.xml
index afdf685c26a..48f11f300e3 100644
--- a/media-plugins/vdr-streamdev/metadata.xml
+++ b/media-plugins/vdr-streamdev/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-plugins/vdr-sudoku/metadata.xml b/media-plugins/vdr-sudoku/metadata.xml
index 4c210f4c475..3b56bb6f5e0 100644
--- a/media-plugins/vdr-sudoku/metadata.xml
+++ b/media-plugins/vdr-sudoku/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
<description>
diff --git a/media-plugins/vdr-suspendoutput/metadata.xml b/media-plugins/vdr-suspendoutput/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-plugins/vdr-suspendoutput/metadata.xml
+++ b/media-plugins/vdr-suspendoutput/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-plugins/vdr-svdrposd/metadata.xml b/media-plugins/vdr-svdrposd/metadata.xml
index 57cbe8aa99b..1f944efea5d 100644
--- a/media-plugins/vdr-svdrposd/metadata.xml
+++ b/media-plugins/vdr-svdrposd/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-svdrpservice/metadata.xml b/media-plugins/vdr-svdrpservice/metadata.xml
index 57cbe8aa99b..1f944efea5d 100644
--- a/media-plugins/vdr-svdrpservice/metadata.xml
+++ b/media-plugins/vdr-svdrpservice/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
- <maintainer>
+ <maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-systeminfo/metadata.xml b/media-plugins/vdr-systeminfo/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-systeminfo/metadata.xml
+++ b/media-plugins/vdr-systeminfo/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-plugins/vdr-text2skin/metadata.xml b/media-plugins/vdr-text2skin/metadata.xml
index bbdf85da384..0403c666558 100644
--- a/media-plugins/vdr-text2skin/metadata.xml
+++ b/media-plugins/vdr-text2skin/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-plugins/vdr-ttxtsubs/metadata.xml b/media-plugins/vdr-ttxtsubs/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-ttxtsubs/metadata.xml
+++ b/media-plugins/vdr-ttxtsubs/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-plugins/vdr-tvguide/metadata.xml b/media-plugins/vdr-tvguide/metadata.xml
index ceb45da48f6..116ba243471 100644
--- a/media-plugins/vdr-tvguide/metadata.xml
+++ b/media-plugins/vdr-tvguide/metadata.xml
@@ -5,5 +5,4 @@
<email>idl0r@gentoo.org</email>
<name>Christian Ruppert</name>
</maintainer>
- <herd>media-tv</herd>
-</pkgmetadata>
+ </pkgmetadata>
diff --git a/media-plugins/vdr-undelete/metadata.xml b/media-plugins/vdr-undelete/metadata.xml
index 7b718b6f976..7fd918fbaf8 100644
--- a/media-plugins/vdr-undelete/metadata.xml
+++ b/media-plugins/vdr-undelete/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-plugins/vdr-vcd/metadata.xml b/media-plugins/vdr-vcd/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-vcd/metadata.xml
+++ b/media-plugins/vdr-vcd/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-plugins/vdr-vdrmanager/metadata.xml b/media-plugins/vdr-vdrmanager/metadata.xml
index 957b9a18d07..62d0bb6c574 100644
--- a/media-plugins/vdr-vdrmanager/metadata.xml
+++ b/media-plugins/vdr-vdrmanager/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-plugins/vdr-videosystem/metadata.xml b/media-plugins/vdr-videosystem/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-videosystem/metadata.xml
+++ b/media-plugins/vdr-videosystem/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-plugins/vdr-vodcatcher/metadata.xml b/media-plugins/vdr-vodcatcher/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-vodcatcher/metadata.xml
+++ b/media-plugins/vdr-vodcatcher/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-plugins/vdr-vompserver/metadata.xml b/media-plugins/vdr-vompserver/metadata.xml
index 9942f60ccf4..4b8a7b59cbd 100644
--- a/media-plugins/vdr-vompserver/metadata.xml
+++ b/media-plugins/vdr-vompserver/metadata.xml
@@ -1,9 +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>pfrank@gmx.de</email>
<name>Petric Frank</name>
@@ -14,4 +11,8 @@
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-plugins/vdr-wapd/metadata.xml b/media-plugins/vdr-wapd/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-wapd/metadata.xml
+++ b/media-plugins/vdr-wapd/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-plugins/vdr-weatherng/metadata.xml b/media-plugins/vdr-weatherng/metadata.xml
index 3b68ca7b4c3..3de5f565543 100644
--- a/media-plugins/vdr-weatherng/metadata.xml
+++ b/media-plugins/vdr-weatherng/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
- <maintainer>
+<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
diff --git a/media-plugins/vdr-wirbelscan/metadata.xml b/media-plugins/vdr-wirbelscan/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-wirbelscan/metadata.xml
+++ b/media-plugins/vdr-wirbelscan/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-plugins/vdr-xine/metadata.xml b/media-plugins/vdr-xine/metadata.xml
index 6c98ab766c2..bd87c8cc2e1 100644
--- a/media-plugins/vdr-xine/metadata.xml
+++ b/media-plugins/vdr-xine/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="yaepg">Enables support for the plugin vdr-yaepg (showing scaled video besides OSD)</flag>
</use>
diff --git a/media-plugins/vdr-xineliboutput/metadata.xml b/media-plugins/vdr-xineliboutput/metadata.xml
index cea235f8534..e3fceb3eaa6 100644
--- a/media-plugins/vdr-xineliboutput/metadata.xml
+++ b/media-plugins/vdr-xineliboutput/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>idl0r@gentoo.org</email>
<name>Christian Ruppert</name>
diff --git a/media-plugins/vdr-xvdr/metadata.xml b/media-plugins/vdr-xvdr/metadata.xml
index d7ad70b1cd8..af3a9b10cc3 100644
--- a/media-plugins/vdr-xvdr/metadata.xml
+++ b/media-plugins/vdr-xvdr/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-plugins/vdr-zaphistory/metadata.xml b/media-plugins/vdr-zaphistory/metadata.xml
index 905c5486aaf..56de7c24a7f 100644
--- a/media-plugins/vdr-zaphistory/metadata.xml
+++ b/media-plugins/vdr-zaphistory/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-plugins/vdr-zappilot/metadata.xml b/media-plugins/vdr-zappilot/metadata.xml
index 4399dba1955..3e5e0295f4f 100644
--- a/media-plugins/vdr-zappilot/metadata.xml
+++ b/media-plugins/vdr-zappilot/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-plugins/xbmc-addon-xvdr/metadata.xml b/media-plugins/xbmc-addon-xvdr/metadata.xml
index 33b9b3faab2..2b0d8ca5bad 100644
--- a/media-plugins/xbmc-addon-xvdr/metadata.xml
+++ b/media-plugins/xbmc-addon-xvdr/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-plugins/xsynth-dssi/metadata.xml b/media-plugins/xsynth-dssi/metadata.xml
index ecc06c7ce1d..27c2236954f 100644
--- a/media-plugins/xsynth-dssi/metadata.xml
+++ b/media-plugins/xsynth-dssi/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>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">dssi</remote-id>
</upstream>