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-video
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-video')
-rw-r--r--media-video/2mandvd/metadata.xml5
-rw-r--r--media-video/aacskeys/metadata.xml1
-rw-r--r--media-video/abby/metadata.xml1
-rw-r--r--media-video/acidrip/metadata.xml1
-rw-r--r--media-video/aegisub/metadata.xml5
-rw-r--r--media-video/alevt/metadata.xml1
-rw-r--r--media-video/aravis/metadata.xml6
-rw-r--r--media-video/asfrecorder/metadata.xml1
-rw-r--r--media-video/atomicparsley-wez/metadata.xml1
-rw-r--r--media-video/atomicparsley/metadata.xml1
-rw-r--r--media-video/avidemux/metadata.xml5
-rw-r--r--media-video/avinfo/metadata.xml1
-rw-r--r--media-video/baka-mplayer/metadata.xml10
-rw-r--r--media-video/bbtools/metadata.xml1
-rw-r--r--media-video/bdsup2sub/metadata.xml5
-rw-r--r--media-video/binkplayer/metadata.xml5
-rw-r--r--media-video/bino/metadata.xml5
-rw-r--r--media-video/blinkensim/metadata.xml1
-rw-r--r--media-video/blinkenthemes/metadata.xml1
-rw-r--r--media-video/blinkentools/metadata.xml1
-rw-r--r--media-video/camorama/metadata.xml1
-rw-r--r--media-video/ccextractor/metadata.xml5
-rw-r--r--media-video/cclive/metadata.xml5
-rw-r--r--media-video/chaplin/metadata.xml1
-rw-r--r--media-video/cheese/metadata.xml5
-rw-r--r--media-video/cinelerra/metadata.xml5
-rw-r--r--media-video/clive/metadata.xml1
-rw-r--r--media-video/coherence/metadata.xml5
-rw-r--r--media-video/cpdvd/metadata.xml1
-rw-r--r--media-video/cpvts/metadata.xml1
-rw-r--r--media-video/cxfe/metadata.xml1
-rw-r--r--media-video/devede/metadata.xml1
-rw-r--r--media-video/dfbsee/metadata.xml1
-rw-r--r--media-video/dirac/metadata.xml1
-rw-r--r--media-video/dv2sub/metadata.xml5
-rw-r--r--media-video/dvbackup/metadata.xml1
-rw-r--r--media-video/dvbsnoop/metadata.xml1
-rw-r--r--media-video/dvd-slideshow/metadata.xml1
-rw-r--r--media-video/dvd9to5/metadata.xml1
-rw-r--r--media-video/dvdauthor/metadata.xml1
-rw-r--r--media-video/dvdbackup/metadata.xml1
-rw-r--r--media-video/dvdimagecmp/metadata.xml1
-rw-r--r--media-video/dvdrip/metadata.xml1
-rw-r--r--media-video/dvdstyler/metadata.xml1
-rw-r--r--media-video/dvgrab/metadata.xml1
-rw-r--r--media-video/emovix/metadata.xml1
-rw-r--r--media-video/episoder/metadata.xml1
-rw-r--r--media-video/ffcast/metadata.xml5
-rw-r--r--media-video/ffdiaporama/metadata.xml5
-rw-r--r--media-video/ffmpeg/metadata.xml1
-rw-r--r--media-video/ffmpeg2theora/metadata.xml1
-rw-r--r--media-video/ffmpegthumbnailer/metadata.xml1
-rw-r--r--media-video/flumotion/metadata.xml5
-rw-r--r--media-video/flvstreamer/metadata.xml10
-rw-r--r--media-video/frameworks/metadata.xml1
-rw-r--r--media-video/gaupol/metadata.xml10
-rw-r--r--media-video/gnome-mplayer/metadata.xml1
-rw-r--r--media-video/gnome-subtitles/metadata.xml15
-rw-r--r--media-video/gnome-video-effects/metadata.xml15
-rw-r--r--media-video/google2srt/metadata.xml5
-rw-r--r--media-video/gpac/metadata.xml1
-rw-r--r--media-video/griffith/metadata.xml5
-rw-r--r--media-video/gtk-recordmydesktop/metadata.xml1
-rw-r--r--media-video/guvcview/metadata.xml1
-rw-r--r--media-video/gxine/metadata.xml1
-rw-r--r--media-video/h264enc/metadata.xml1
-rw-r--r--media-video/harvid/metadata.xml1
-rw-r--r--media-video/hasciicam/metadata.xml1
-rw-r--r--media-video/hwdecode-demos/metadata.xml1
-rw-r--r--media-video/istanbul/metadata.xml5
-rw-r--r--media-video/jubler/metadata.xml1
-rw-r--r--media-video/kaffeine/metadata.xml10
-rw-r--r--media-video/kamerka/metadata.xml5
-rw-r--r--media-video/kamoso/metadata.xml5
-rw-r--r--media-video/kffmpegthumbnailer/metadata.xml6
-rw-r--r--media-video/kino/metadata.xml5
-rw-r--r--media-video/kmplayer/metadata.xml10
-rw-r--r--media-video/kplayer/metadata.xml10
-rw-r--r--media-video/libav/metadata.xml1
-rw-r--r--media-video/lives/metadata.xml5
-rw-r--r--media-video/loopy/metadata.xml6
-rw-r--r--media-video/lsdvd/metadata.xml1
-rw-r--r--media-video/luvcview/metadata.xml5
-rw-r--r--media-video/lxdvdrip/metadata.xml1
-rw-r--r--media-video/m2vrequantizer/metadata.xml5
-rw-r--r--media-video/matroxset/metadata.xml6
-rw-r--r--media-video/maven-poke/metadata.xml6
-rw-r--r--media-video/mediainfo/metadata.xml5
-rw-r--r--media-video/minitube/metadata.xml10
-rw-r--r--media-video/mjpegtools/metadata.xml6
-rw-r--r--media-video/mjpg-streamer/metadata.xml5
-rw-r--r--media-video/mkclean/metadata.xml5
-rw-r--r--media-video/mkvalidator/metadata.xml5
-rw-r--r--media-video/mkvtoolnix/metadata.xml5
-rw-r--r--media-video/motion/metadata.xml1
-rw-r--r--media-video/motiontrack/metadata.xml1
-rw-r--r--media-video/mpeg-tools/metadata.xml1
-rw-r--r--media-video/mpeg2vidcodec/metadata.xml1
-rw-r--r--media-video/mpglen/metadata.xml1
-rw-r--r--media-video/mpgtx/metadata.xml1
-rw-r--r--media-video/mplay-sh/metadata.xml1
-rw-r--r--media-video/mplayer-resume/metadata.xml5
-rw-r--r--media-video/mplayer-sh/metadata.xml1
-rw-r--r--media-video/mplayer/metadata.xml1
-rw-r--r--media-video/mpv/metadata.xml10
-rw-r--r--media-video/noad/metadata.xml5
-rw-r--r--media-video/nvidia_video_sdk/metadata.xml1
-rw-r--r--media-video/ogmrip/metadata.xml10
-rw-r--r--media-video/oxine/metadata.xml1
-rw-r--r--media-video/pgmfindclip/metadata.xml1
-rw-r--r--media-video/photofilmstrip/metadata.xml5
-rw-r--r--media-video/pitivi/metadata.xml10
-rw-r--r--media-video/plasma-mediacenter/metadata.xml5
-rw-r--r--media-video/projectx/metadata.xml5
-rw-r--r--media-video/pymp/metadata.xml1
-rw-r--r--media-video/qgifer/metadata.xml5
-rw-r--r--media-video/qt-recordmydesktop/metadata.xml10
-rw-r--r--media-video/qx11grab/metadata.xml5
-rw-r--r--media-video/recmpeg/metadata.xml1
-rw-r--r--media-video/recordmydesktop/metadata.xml1
-rw-r--r--media-video/replex/metadata.xml1
-rw-r--r--media-video/rovclock/metadata.xml5
-rw-r--r--media-video/setpwc/metadata.xml5
-rw-r--r--media-video/shrip/metadata.xml10
-rw-r--r--media-video/smplayer/metadata.xml10
-rw-r--r--media-video/snappy/metadata.xml5
-rw-r--r--media-video/sonic-snap/metadata.xml5
-rw-r--r--media-video/sswf/metadata.xml1
-rw-r--r--media-video/streamdvd/metadata.xml1
-rw-r--r--media-video/sub2srt/metadata.xml1
-rw-r--r--media-video/subcheck/metadata.xml5
-rw-r--r--media-video/subdl/metadata.xml1
-rw-r--r--media-video/subdownloader/metadata.xml5
-rw-r--r--media-video/subliminal/metadata.xml5
-rw-r--r--media-video/submux-dvd/metadata.xml5
-rw-r--r--media-video/subsync/metadata.xml5
-rw-r--r--media-video/subtitlecomposer/metadata.xml10
-rw-r--r--media-video/subtitleeditor/metadata.xml5
-rw-r--r--media-video/subtitler-yuv/metadata.xml5
-rw-r--r--media-video/subtitleripper/metadata.xml5
-rw-r--r--media-video/super_demux/metadata.xml1
-rw-r--r--media-video/tcmplex-panteltje/metadata.xml5
-rw-r--r--media-video/tivodecode/metadata.xml1
-rw-r--r--media-video/totem/metadata.xml15
-rw-r--r--media-video/tovid/metadata.xml5
-rw-r--r--media-video/transcode/metadata.xml1
-rw-r--r--media-video/tsmuxer/metadata.xml5
-rw-r--r--media-video/ttcut/metadata.xml5
-rw-r--r--media-video/vamps/metadata.xml1
-rw-r--r--media-video/vcdgear/metadata.xml1
-rw-r--r--media-video/vcdimager/metadata.xml1
-rw-r--r--media-video/vdr/metadata.xml1
-rw-r--r--media-video/vdr2jpeg/metadata.xml7
-rw-r--r--media-video/vdrsync/metadata.xml5
-rw-r--r--media-video/vdrtools-genindex/metadata.xml5
-rw-r--r--media-video/videocut/metadata.xml6
-rw-r--r--media-video/videotrans/metadata.xml5
-rw-r--r--media-video/vlc/metadata.xml10
-rw-r--r--media-video/vobcopy/metadata.xml5
-rw-r--r--media-video/vstrip/metadata.xml1
-rw-r--r--media-video/winki/metadata.xml1
-rw-r--r--media-video/x264-encoder/metadata.xml1
-rw-r--r--media-video/xanim-export/metadata.xml1
-rw-r--r--media-video/xanim/metadata.xml1
-rw-r--r--media-video/xine-ui/metadata.xml1
-rw-r--r--media-video/xvattr/metadata.xml1
-rw-r--r--media-video/xvid4conf/metadata.xml1
-rw-r--r--media-video/xvideoservicethief/metadata.xml10
168 files changed, 422 insertions, 197 deletions
diff --git a/media-video/2mandvd/metadata.xml b/media-video/2mandvd/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/media-video/2mandvd/metadata.xml
+++ b/media-video/2mandvd/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>qt</herd>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/aacskeys/metadata.xml b/media-video/aacskeys/metadata.xml
index 413d6414f00a..45296f1c8c56 100644
--- a/media-video/aacskeys/metadata.xml
+++ b/media-video/aacskeys/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-video/abby/metadata.xml b/media-video/abby/metadata.xml
index b179b885161c..e6150062dd76 100644
--- a/media-video/abby/metadata.xml
+++ b/media-video/abby/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-video/acidrip/metadata.xml b/media-video/acidrip/metadata.xml
index ad983ca71dc9..0565bc0dc0b4 100644
--- a/media-video/acidrip/metadata.xml
+++ b/media-video/acidrip/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-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml
index dc3909a1a958..d2da8a3b3aaf 100644
--- a/media-video/aegisub/metadata.xml
+++ b/media-video/aegisub/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
@@ -14,6 +13,10 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">Aegisub/Aegisub</remote-id>
</upstream>
diff --git a/media-video/alevt/metadata.xml b/media-video/alevt/metadata.xml
index a6b9e38a1b93..097975e3adc2 100644
--- a/media-video/alevt/metadata.xml
+++ b/media-video/alevt/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-video/aravis/metadata.xml b/media-video/aravis/metadata.xml
index 2c3064327a35..2b509d9860ef 100644
--- a/media-video/aravis/metadata.xml
+++ b/media-video/aravis/metadata.xml
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
<maintainer>
<email>lu_zero@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+
<use>
<flag name="X">
Build the GTK+-based video viewer for aravis. This requires
diff --git a/media-video/asfrecorder/metadata.xml b/media-video/asfrecorder/metadata.xml
index ef1903383336..b5634b9aa5b5 100644
--- a/media-video/asfrecorder/metadata.xml
+++ b/media-video/asfrecorder/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-video/atomicparsley-wez/metadata.xml b/media-video/atomicparsley-wez/metadata.xml
index fba78be2a12c..65652c2d76ec 100644
--- a/media-video/atomicparsley-wez/metadata.xml
+++ b/media-video/atomicparsley-wez/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-video/atomicparsley/metadata.xml b/media-video/atomicparsley/metadata.xml
index 78fe4c411e54..3c428cbee0a1 100644
--- a/media-video/atomicparsley/metadata.xml
+++ b/media-video/atomicparsley/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-video/avidemux/metadata.xml b/media-video/avidemux/metadata.xml
index 3f82cb4412c7..3e49b161e70d 100644
--- a/media-video/avidemux/metadata.xml
+++ b/media-video/avidemux/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="aften">Enable A/52 (AC-3) audio encoder support.</flag>
<flag name="amr">Enable Adaptive Multi-Rate format support via <pkg>media-libs/opencore-amr</pkg>.</flag>
diff --git a/media-video/avinfo/metadata.xml b/media-video/avinfo/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/avinfo/metadata.xml
+++ b/media-video/avinfo/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-video/baka-mplayer/metadata.xml b/media-video/baka-mplayer/metadata.xml
index a19b49626ecc..d91c9257f02a 100644
--- a/media-video/baka-mplayer/metadata.xml
+++ b/media-video/baka-mplayer/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>qt</herd>
- <herd>video</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<upstream>
<remote-id type="github">u8sand/Baka-MPlayer</remote-id>
</upstream>
diff --git a/media-video/bbtools/metadata.xml b/media-video/bbtools/metadata.xml
index f26a52cf120c..3dfca5fe8b0a 100644
--- a/media-video/bbtools/metadata.xml
+++ b/media-video/bbtools/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-video/bdsup2sub/metadata.xml b/media-video/bdsup2sub/metadata.xml
index 93f8bf687fd8..9a013515d9d6 100644
--- a/media-video/bdsup2sub/metadata.xml
+++ b/media-video/bdsup2sub/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>
<longdescription lang="en">
BDSup2Sub - A tool to convert and tweak bitmap based subtitle streams.
</longdescription>
diff --git a/media-video/binkplayer/metadata.xml b/media-video/binkplayer/metadata.xml
index d3c2cc926f0b..26e70c35170a 100644
--- a/media-video/binkplayer/metadata.xml
+++ b/media-video/binkplayer/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>games</herd>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/bino/metadata.xml b/media-video/bino/metadata.xml
index 2b9b03c8c6d0..83de9f390b9f 100644
--- a/media-video/bino/metadata.xml
+++ b/media-video/bino/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>cuchac@email.cz</email>
<name>Jožka Kejzlar (cuchac)</name>
@@ -11,4 +10,8 @@
<email>robbat2@gentoo.org</email>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/blinkensim/metadata.xml b/media-video/blinkensim/metadata.xml
index 284559a05f2f..380b8e459135 100644
--- a/media-video/blinkensim/metadata.xml
+++ b/media-video/blinkensim/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-video/blinkenthemes/metadata.xml b/media-video/blinkenthemes/metadata.xml
index 950e903bf988..0c3e9a0a58ee 100644
--- a/media-video/blinkenthemes/metadata.xml
+++ b/media-video/blinkenthemes/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-video/blinkentools/metadata.xml b/media-video/blinkentools/metadata.xml
index ac44c06197cd..e1608d53f541 100644
--- a/media-video/blinkentools/metadata.xml
+++ b/media-video/blinkentools/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-video/camorama/metadata.xml b/media-video/camorama/metadata.xml
index 2c5e04917119..f45f1becab42 100644
--- a/media-video/camorama/metadata.xml
+++ b/media-video/camorama/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-video/ccextractor/metadata.xml b/media-video/ccextractor/metadata.xml
index 76d8e402b9f1..171cf3d8b677 100644
--- a/media-video/ccextractor/metadata.xml
+++ b/media-video/ccextractor/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>
<longdescription lang="en">
A tool that analyzes video files and produces independent subtitle files from the closed captions data. Exports to SRT subtitle format.
</longdescription>
diff --git a/media-video/cclive/metadata.xml b/media-video/cclive/metadata.xml
index 318029858c42..82847f3c7506 100644
--- a/media-video/cclive/metadata.xml
+++ b/media-video/cclive/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>
<longdescription lang="en">
Command line tool for extracting videos from Youtube, Google Video,
Dailymotion, Guba (free) and Stage6 websites
diff --git a/media-video/chaplin/metadata.xml b/media-video/chaplin/metadata.xml
index 6cd197348689..1eded3a234a9 100644
--- a/media-video/chaplin/metadata.xml
+++ b/media-video/chaplin/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-video/cheese/metadata.xml b/media-video/cheese/metadata.xml
index 4b9fd4dc592b..b5d41d57598e 100644
--- a/media-video/cheese/metadata.xml
+++ b/media-video/cheese/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>
<longdescription lang="en">
Cheese uses your webcam to take photos and videos, applies fancy special
effects, and lets you share the fun with others.
diff --git a/media-video/cinelerra/metadata.xml b/media-video/cinelerra/metadata.xml
index 92e4dbc04f50..15695fd40e4a 100644
--- a/media-video/cinelerra/metadata.xml
+++ b/media-video/cinelerra/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>video</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/clive/metadata.xml b/media-video/clive/metadata.xml
index 3af39e89a618..0b89a49abd9d 100644
--- a/media-video/clive/metadata.xml
+++ b/media-video/clive/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-video/coherence/metadata.xml b/media-video/coherence/metadata.xml
index d9df1878d8e2..654fb394806c 100644
--- a/media-video/coherence/metadata.xml
+++ b/media-video/coherence/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>video</herd>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/cpdvd/metadata.xml b/media-video/cpdvd/metadata.xml
index c572c7d9b478..07cb6cb09a12 100644
--- a/media-video/cpdvd/metadata.xml
+++ b/media-video/cpdvd/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-video/cpvts/metadata.xml b/media-video/cpvts/metadata.xml
index c572c7d9b478..07cb6cb09a12 100644
--- a/media-video/cpvts/metadata.xml
+++ b/media-video/cpvts/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-video/cxfe/metadata.xml b/media-video/cxfe/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/cxfe/metadata.xml
+++ b/media-video/cxfe/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-video/devede/metadata.xml b/media-video/devede/metadata.xml
index d893518b9d6b..f15eac38c07a 100644
--- a/media-video/devede/metadata.xml
+++ b/media-video/devede/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-video/dfbsee/metadata.xml b/media-video/dfbsee/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/dfbsee/metadata.xml
+++ b/media-video/dfbsee/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-video/dirac/metadata.xml b/media-video/dirac/metadata.xml
index 0627acf562a8..39c659cd7a91 100644
--- a/media-video/dirac/metadata.xml
+++ b/media-video/dirac/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-video/dv2sub/metadata.xml b/media-video/dv2sub/metadata.xml
index b24d9c82485d..5bcf18c20aad 100644
--- a/media-video/dv2sub/metadata.xml
+++ b/media-video/dv2sub/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>
<longdescription lang="en">
Utility dv2sub reads raw DV stream from file argument dv-file or
standard input if absent. It can generate a parameter log about
diff --git a/media-video/dvbackup/metadata.xml b/media-video/dvbackup/metadata.xml
index fd6948928d80..313456dd826c 100644
--- a/media-video/dvbackup/metadata.xml
+++ b/media-video/dvbackup/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-video/dvbsnoop/metadata.xml b/media-video/dvbsnoop/metadata.xml
index 70732c4e54bf..bf8a654c4ca6 100644
--- a/media-video/dvbsnoop/metadata.xml
+++ b/media-video/dvbsnoop/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
<upstream>
<remote-id type="sourceforge">dvbsnoop</remote-id>
</upstream>
diff --git a/media-video/dvd-slideshow/metadata.xml b/media-video/dvd-slideshow/metadata.xml
index 1b05378ec9bd..265699fdb68d 100644
--- a/media-video/dvd-slideshow/metadata.xml
+++ b/media-video/dvd-slideshow/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-video/dvd9to5/metadata.xml b/media-video/dvd9to5/metadata.xml
index 4f753aa0528d..c8ca70b255db 100644
--- a/media-video/dvd9to5/metadata.xml
+++ b/media-video/dvd9to5/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-video/dvdauthor/metadata.xml b/media-video/dvdauthor/metadata.xml
index 07aa9c9d8ea8..315fd9364cc8 100644
--- a/media-video/dvdauthor/metadata.xml
+++ b/media-video/dvdauthor/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-video/dvdbackup/metadata.xml b/media-video/dvdbackup/metadata.xml
index 8b06e13576fb..a75d15681509 100644
--- a/media-video/dvdbackup/metadata.xml
+++ b/media-video/dvdbackup/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-video/dvdimagecmp/metadata.xml b/media-video/dvdimagecmp/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/dvdimagecmp/metadata.xml
+++ b/media-video/dvdimagecmp/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-video/dvdrip/metadata.xml b/media-video/dvdrip/metadata.xml
index 4fd94f12f704..bc6667910e0b 100644
--- a/media-video/dvdrip/metadata.xml
+++ b/media-video/dvdrip/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-video/dvdstyler/metadata.xml b/media-video/dvdstyler/metadata.xml
index aeb24d12ca57..f01cb9d8c21a 100644
--- a/media-video/dvdstyler/metadata.xml
+++ b/media-video/dvdstyler/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-video/dvgrab/metadata.xml b/media-video/dvgrab/metadata.xml
index 0cc79757a8c6..1b7140f0d773 100644
--- a/media-video/dvgrab/metadata.xml
+++ b/media-video/dvgrab/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-video/emovix/metadata.xml b/media-video/emovix/metadata.xml
index 689143030330..66023c618a45 100644
--- a/media-video/emovix/metadata.xml
+++ b/media-video/emovix/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-video/episoder/metadata.xml b/media-video/episoder/metadata.xml
index 3a490c20ddc8..7a85b193752c 100644
--- a/media-video/episoder/metadata.xml
+++ b/media-video/episoder/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-video/ffcast/metadata.xml b/media-video/ffcast/metadata.xml
index f5798318d75a..0a8371f6da24 100644
--- a/media-video/ffcast/metadata.xml
+++ b/media-video/ffcast/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>video</herd>
<maintainer>
<email>zx2c4@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<upstream>
<remote-id type="github">lolilolicon/ffcast</remote-id>
</upstream>
diff --git a/media-video/ffdiaporama/metadata.xml b/media-video/ffdiaporama/metadata.xml
index 93804e123880..5958cae8418f 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
@@ -12,6 +11,10 @@
<name>Olivier Laurantin</name>
<description>Proxy maintainer. CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<changelog>http://ffdiaporama.tuxfamily.org/?page_id=7266&amp;lang=en</changelog>
<doc lang="en">http://ffdiaporama.tuxfamily.org/?page_id=6268</doc>
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index c39cb9715f75..cf9ac9a0ce8e 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/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-video/ffmpeg2theora/metadata.xml b/media-video/ffmpeg2theora/metadata.xml
index 6c1f70ed2108..9a56b8b6c23b 100644
--- a/media-video/ffmpeg2theora/metadata.xml
+++ b/media-video/ffmpeg2theora/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-video/ffmpegthumbnailer/metadata.xml b/media-video/ffmpegthumbnailer/metadata.xml
index 3d5799472796..8eed44809f99 100644
--- a/media-video/ffmpegthumbnailer/metadata.xml
+++ b/media-video/ffmpegthumbnailer/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-video/flumotion/metadata.xml b/media-video/flumotion/metadata.xml
index dec0396a21e7..beda1250457b 100644
--- a/media-video/flumotion/metadata.xml
+++ b/media-video/flumotion/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-video/flvstreamer/metadata.xml b/media-video/flvstreamer/metadata.xml
index 662c2b16ab57..fa961e8cf773 100644
--- a/media-video/flvstreamer/metadata.xml
+++ b/media-video/flvstreamer/metadata.xml
@@ -1,10 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
- <herd>sound</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/frameworks/metadata.xml b/media-video/frameworks/metadata.xml
index 8f10bed21b5a..fd805b9a2e45 100644
--- a/media-video/frameworks/metadata.xml
+++ b/media-video/frameworks/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-video/gaupol/metadata.xml b/media-video/gaupol/metadata.xml
index 862cfbc4e837..d4e54f619ffa 100644
--- a/media-video/gaupol/metadata.xml
+++ b/media-video/gaupol/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>video</herd>
- <herd>python</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+<maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/gnome-mplayer/metadata.xml b/media-video/gnome-mplayer/metadata.xml
index 6c6f1e6b6275..a757aa07ddd0 100644
--- a/media-video/gnome-mplayer/metadata.xml
+++ b/media-video/gnome-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>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
diff --git a/media-video/gnome-subtitles/metadata.xml b/media-video/gnome-subtitles/metadata.xml
index 82a9dd81ffbf..8995c2e2d7b3 100644
--- a/media-video/gnome-subtitles/metadata.xml
+++ b/media-video/gnome-subtitles/metadata.xml
@@ -1,14 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
- <herd>proxy-maintainers</herd>
- <herd>dotnet</herd>
<maintainer>
<email>mail@pedrocastro.org</email>
<name>Pedro Castro</name>
<description>Upstream</description>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gnome-subtitles</remote-id>
</upstream>
diff --git a/media-video/gnome-video-effects/metadata.xml b/media-video/gnome-video-effects/metadata.xml
index 6788bc4c7246..dba755c1efb6 100644
--- a/media-video/gnome-video-effects/metadata.xml
+++ b/media-video/gnome-video-effects/metadata.xml
@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
-<herd>video</herd>
-<herd>gstreamer</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/google2srt/metadata.xml b/media-video/google2srt/metadata.xml
index 1d4bb6fd9529..1bc4383343d3 100644
--- a/media-video/google2srt/metadata.xml
+++ b/media-video/google2srt/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>
<longdescription lang="en">
Google2SRT allows you to convert subtitles from Google Video and YouTube
to SubRip (.srt) format, which is recognized by most video players. You
diff --git a/media-video/gpac/metadata.xml b/media-video/gpac/metadata.xml
index 012c2b432c0b..5095fd94ea20 100644
--- a/media-video/gpac/metadata.xml
+++ b/media-video/gpac/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-video/griffith/metadata.xml b/media-video/griffith/metadata.xml
index 8553c721b731..794759343fbb 100644
--- a/media-video/griffith/metadata.xml
+++ b/media-video/griffith/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>video</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">griffith</remote-id>
</upstream>
diff --git a/media-video/gtk-recordmydesktop/metadata.xml b/media-video/gtk-recordmydesktop/metadata.xml
index 7856fb20cfe0..4d73f31a212d 100644
--- a/media-video/gtk-recordmydesktop/metadata.xml
+++ b/media-video/gtk-recordmydesktop/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-video/guvcview/metadata.xml b/media-video/guvcview/metadata.xml
index 5739a5c57b50..19f2b7933e32 100644
--- a/media-video/guvcview/metadata.xml
+++ b/media-video/guvcview/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-video/gxine/metadata.xml b/media-video/gxine/metadata.xml
index 1eba2fb5514f..6eb45a499dcc 100644
--- a/media-video/gxine/metadata.xml
+++ b/media-video/gxine/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-video/h264enc/metadata.xml b/media-video/h264enc/metadata.xml
index a8cedca7a02f..e8e98af82282 100644
--- a/media-video/h264enc/metadata.xml
+++ b/media-video/h264enc/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-video/harvid/metadata.xml b/media-video/harvid/metadata.xml
index a4f3bfb3c10b..868a7c569ff0 100644
--- a/media-video/harvid/metadata.xml
+++ b/media-video/harvid/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-video/hasciicam/metadata.xml b/media-video/hasciicam/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/hasciicam/metadata.xml
+++ b/media-video/hasciicam/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-video/hwdecode-demos/metadata.xml b/media-video/hwdecode-demos/metadata.xml
index c572c7d9b478..07cb6cb09a12 100644
--- a/media-video/hwdecode-demos/metadata.xml
+++ b/media-video/hwdecode-demos/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-video/istanbul/metadata.xml b/media-video/istanbul/metadata.xml
index 9e260ceca3e3..1174c64e39cf 100644
--- a/media-video/istanbul/metadata.xml
+++ b/media-video/istanbul/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-video/jubler/metadata.xml b/media-video/jubler/metadata.xml
index b6ef6ca43386..6452de575ba0 100644
--- a/media-video/jubler/metadata.xml
+++ b/media-video/jubler/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
<maintainer>
<email>java@gentoo.org</email>
</maintainer>
diff --git a/media-video/kaffeine/metadata.xml b/media-video/kaffeine/metadata.xml
index 62c56c83007a..9b6ec4b2a500 100644
--- a/media-video/kaffeine/metadata.xml
+++ b/media-video/kaffeine/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>video</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">kaffeine</remote-id>
</upstream>
diff --git a/media-video/kamerka/metadata.xml b/media-video/kamerka/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-video/kamerka/metadata.xml
+++ b/media-video/kamerka/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/kamoso/metadata.xml b/media-video/kamoso/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-video/kamoso/metadata.xml
+++ b/media-video/kamoso/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/kffmpegthumbnailer/metadata.xml b/media-video/kffmpegthumbnailer/metadata.xml
index 6e5a6249ce5f..e95d758106ef 100644
--- a/media-video/kffmpegthumbnailer/metadata.xml
+++ b/media-video/kffmpegthumbnailer/metadata.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">ffmpegthumbnailer</remote-id>
<remote-id type="github">dirkvdb/ffmpegthumbnailer</remote-id>
diff --git a/media-video/kino/metadata.xml b/media-video/kino/metadata.xml
index 576101d0b53d..558c325642e7 100644
--- a/media-video/kino/metadata.xml
+++ b/media-video/kino/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>video</herd>
<maintainer>
<email>calchan@gentoo.org</email>
<name>Denis Dupeyron</name>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<use>
<flag name="gpac">Enable GPAC support when exporting to 3GPP format</flag>
</use>
diff --git a/media-video/kmplayer/metadata.xml b/media-video/kmplayer/metadata.xml
index 3c7839b53efe..31c3afd0fe74 100644
--- a/media-video/kmplayer/metadata.xml
+++ b/media-video/kmplayer/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>video</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<use>
<flag name="npp">Compile the npp backend that plays xembed style browser plugins.</flag>
</use>
diff --git a/media-video/kplayer/metadata.xml b/media-video/kplayer/metadata.xml
index 276e593205a6..c36831d22303 100644
--- a/media-video/kplayer/metadata.xml
+++ b/media-video/kplayer/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>video</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/libav/metadata.xml b/media-video/libav/metadata.xml
index a9f4504e0231..2d3e89f255b8 100644
--- a/media-video/libav/metadata.xml
+++ b/media-video/libav/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-video/lives/metadata.xml b/media-video/lives/metadata.xml
index 6c02db49f2ff..a08c922c1bfa 100644
--- a/media-video/lives/metadata.xml
+++ b/media-video/lives/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>video</herd>
<maintainer>
<email>lu_zero@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<use>
<flag name="libvisual">Enable libvisual support</flag>
</use>
diff --git a/media-video/loopy/metadata.xml b/media-video/loopy/metadata.xml
index 914f6144a6d5..eae85dd40f09 100644
--- a/media-video/loopy/metadata.xml
+++ b/media-video/loopy/metadata.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/lsdvd/metadata.xml b/media-video/lsdvd/metadata.xml
index 657b63f08556..76ddc5a65229 100644
--- a/media-video/lsdvd/metadata.xml
+++ b/media-video/lsdvd/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-video/luvcview/metadata.xml b/media-video/luvcview/metadata.xml
index 92e4dbc04f50..15695fd40e4a 100644
--- a/media-video/luvcview/metadata.xml
+++ b/media-video/luvcview/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>video</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/lxdvdrip/metadata.xml b/media-video/lxdvdrip/metadata.xml
index 26d1bcd90abc..bcbbb642e728 100644
--- a/media-video/lxdvdrip/metadata.xml
+++ b/media-video/lxdvdrip/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-video/m2vrequantizer/metadata.xml b/media-video/m2vrequantizer/metadata.xml
index 40d504a77773..16f63322c62d 100644
--- a/media-video/m2vrequantizer/metadata.xml
+++ b/media-video/m2vrequantizer/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>video</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
+<maintainer>
+<email>media-video@gentoo.org</email>
+<name>Gentoo Video project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/matroxset/metadata.xml b/media-video/matroxset/metadata.xml
index d4279a059acd..7e59bfdff184 100644
--- a/media-video/matroxset/metadata.xml
+++ b/media-video/matroxset/metadata.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
- <herd>media-tv</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/maven-poke/metadata.xml b/media-video/maven-poke/metadata.xml
index d4279a059acd..7e59bfdff184 100644
--- a/media-video/maven-poke/metadata.xml
+++ b/media-video/maven-poke/metadata.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
- <herd>media-tv</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/mediainfo/metadata.xml b/media-video/mediainfo/metadata.xml
index 7cc6e853becc..0557507d5f04 100644
--- a/media-video/mediainfo/metadata.xml
+++ b/media-video/mediainfo/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>
<upstream>
<remote-id type="sourceforge">mediainfo</remote-id>
</upstream>
diff --git a/media-video/minitube/metadata.xml b/media-video/minitube/metadata.xml
index 8bb01305ca16..9dbe77f1189a 100644
--- a/media-video/minitube/metadata.xml
+++ b/media-video/minitube/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>qt</herd>
- <herd>video</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<use>
<flag name="download">Enable support for downloading YouTube videos</flag>
</use>
diff --git a/media-video/mjpegtools/metadata.xml b/media-video/mjpegtools/metadata.xml
index 15e084cb227d..23c61306e66d 100644
--- a/media-video/mjpegtools/metadata.xml
+++ b/media-video/mjpegtools/metadata.xml
@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
- <herd>media-tv</herd>
<maintainer>
<email>billie@gentoo.org</email>
<name>Daniel Pielmeier</name>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<use>
<flag name="sdlgfx">Enables y4mhist to display a graphical histogram</flag>
</use>
diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml
index bdf42c9478fc..16e1eadb0bd5 100644
--- a/media-video/mjpg-streamer/metadata.xml
+++ b/media-video/mjpg-streamer/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>andrzej.pauli@gmail.com</email>
<name>Andrzej Pauli</name>
@@ -12,6 +11,10 @@
<name>Amadeusz Żołnowski</name>
<description>Proxy maintainer. CC him on bugs.</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
MJPG-streamer takes JPGs from Linux-UVC compatible webcams, filesystem or
other input plugins and streams them as M-JPEG via HTTP to webbrowsers,
diff --git a/media-video/mkclean/metadata.xml b/media-video/mkclean/metadata.xml
index b41d036b3bd4..3c9bffa23293 100644
--- a/media-video/mkclean/metadata.xml
+++ b/media-video/mkclean/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>
<longdescription lang="en">
mkclean is a command line tool to clean and optimize Matroska (.mkv / .mka / .mks / .mk3d) and WebM (.webm / .weba) files that have already been muxed. It reorders the elements with the Cues at the front, so your Matroska files are ready to be streamed efficiently over the web. It also removes elements not found in the Matroska specs and the extra Meta Seek list of Clusters that some program add to their file. It can also optionally remux the Cluster blocks to start each boundary with a keyframe and the matching audio/subtitle blocks for that keyframe.
</longdescription>
diff --git a/media-video/mkvalidator/metadata.xml b/media-video/mkvalidator/metadata.xml
index 65315e976b6e..9758adbc9404 100644
--- a/media-video/mkvalidator/metadata.xml
+++ b/media-video/mkvalidator/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>
<longdescription lang="en">
mkvalidator is a simple command line tool to verify Matroska and WebM files for spec conformance. It checks the various bogus or missing key elements against the EBML DocType version of the file and reports the errors/warnings in the command line.
</longdescription>
diff --git a/media-video/mkvtoolnix/metadata.xml b/media-video/mkvtoolnix/metadata.xml
index d9df1878d8e2..654fb394806c 100644
--- a/media-video/mkvtoolnix/metadata.xml
+++ b/media-video/mkvtoolnix/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>video</herd>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/motion/metadata.xml b/media-video/motion/metadata.xml
index e47a59dd51e8..d2ae59a07904 100644
--- a/media-video/motion/metadata.xml
+++ b/media-video/motion/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-video/motiontrack/metadata.xml b/media-video/motiontrack/metadata.xml
index f793f53e201a..b7d13d86c715 100644
--- a/media-video/motiontrack/metadata.xml
+++ b/media-video/motiontrack/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-video/mpeg-tools/metadata.xml b/media-video/mpeg-tools/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/mpeg-tools/metadata.xml
+++ b/media-video/mpeg-tools/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
diff --git a/media-video/mpeg2vidcodec/metadata.xml b/media-video/mpeg2vidcodec/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/mpeg2vidcodec/metadata.xml
+++ b/media-video/mpeg2vidcodec/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-video/mpglen/metadata.xml b/media-video/mpglen/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/mpglen/metadata.xml
+++ b/media-video/mpglen/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-video/mpgtx/metadata.xml b/media-video/mpgtx/metadata.xml
index 9d7e585c63e9..5d8dd798a878 100644
--- a/media-video/mpgtx/metadata.xml
+++ b/media-video/mpgtx/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-video/mplay-sh/metadata.xml b/media-video/mplay-sh/metadata.xml
index 4399dba19554..3e5e0295f4f7 100644
--- a/media-video/mplay-sh/metadata.xml
+++ b/media-video/mplay-sh/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-video/mplayer-resume/metadata.xml b/media-video/mplayer-resume/metadata.xml
index d9df1878d8e2..654fb394806c 100644
--- a/media-video/mplayer-resume/metadata.xml
+++ b/media-video/mplayer-resume/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>video</herd>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/mplayer-sh/metadata.xml b/media-video/mplayer-sh/metadata.xml
index e346761c018b..73d77312986a 100644
--- a/media-video/mplayer-sh/metadata.xml
+++ b/media-video/mplayer-sh/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-video/mplayer/metadata.xml b/media-video/mplayer/metadata.xml
index 0e3701050a08..d98c218a7da1 100644
--- a/media-video/mplayer/metadata.xml
+++ b/media-video/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>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
diff --git a/media-video/mpv/metadata.xml b/media-video/mpv/metadata.xml
index d4ea40d4d1d7..001f1a7c95c3 100644
--- a/media-video/mpv/metadata.xml
+++ b/media-video/mpv/metadata.xml
@@ -16,8 +16,14 @@
<maintainer>
<email>nikoli@gmx.us</email>
</maintainer>
- <herd>video</herd>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="archive">Enable support for various archive formats via <pkg>app-arch/libarchive</pkg></flag>
<flag name="bluray">Enable playback of Blu-ray filesystems</flag>
diff --git a/media-video/noad/metadata.xml b/media-video/noad/metadata.xml
index 5c64a44cf7c5..789e5b206e32 100644
--- a/media-video/noad/metadata.xml
+++ b/media-video/noad/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>video</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<use>
<flag name="libmpeg2">Support for libmpeg2 library</flag>
</use>
diff --git a/media-video/nvidia_video_sdk/metadata.xml b/media-video/nvidia_video_sdk/metadata.xml
index bb54234cd05d..e84ea43cdc91 100644
--- a/media-video/nvidia_video_sdk/metadata.xml
+++ b/media-video/nvidia_video_sdk/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-video/ogmrip/metadata.xml b/media-video/ogmrip/metadata.xml
index 8ec700d9cc50..8d2429e793df 100644
--- a/media-video/ogmrip/metadata.xml
+++ b/media-video/ogmrip/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>billl@users.sf.net</email>
<name>Olivier Rolland</name>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<use>
diff --git a/media-video/oxine/metadata.xml b/media-video/oxine/metadata.xml
index 3df2181b12a2..75c4533dda33 100644
--- a/media-video/oxine/metadata.xml
+++ b/media-video/oxine/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-video/pgmfindclip/metadata.xml b/media-video/pgmfindclip/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/pgmfindclip/metadata.xml
+++ b/media-video/pgmfindclip/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-video/photofilmstrip/metadata.xml b/media-video/photofilmstrip/metadata.xml
index 9f19064500ee..c03945d42915 100644
--- a/media-video/photofilmstrip/metadata.xml
+++ b/media-video/photofilmstrip/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>phobosk@fastmail.fm</email>
<name>PhobosK</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
PhotoFilmStrip creates movies out of your pictures in just three steps.
There are several output possibilities for VCD, SVCD, DVD up to FULL-HD.
diff --git a/media-video/pitivi/metadata.xml b/media-video/pitivi/metadata.xml
index 8444afb93dd2..816259cb43aa 100644
--- a/media-video/pitivi/metadata.xml
+++ b/media-video/pitivi/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-video/plasma-mediacenter/metadata.xml b/media-video/plasma-mediacenter/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-video/plasma-mediacenter/metadata.xml
+++ b/media-video/plasma-mediacenter/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-video/projectx/metadata.xml b/media-video/projectx/metadata.xml
index 5301530dabca..e6b760f29943 100644
--- a/media-video/projectx/metadata.xml
+++ b/media-video/projectx/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>video</herd>
<maintainer>
<email>billie@gentoo.org</email>
<name>Daniel Pielmeier</name>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<longdescription lang="en">
European digital radio &amp; television uses the DVB standard to broadcast
its data. Project X gives you a look behind the transmissions and tries
diff --git a/media-video/pymp/metadata.xml b/media-video/pymp/metadata.xml
index 0d9b0dcb7f33..7b0b0a767d03 100644
--- a/media-video/pymp/metadata.xml
+++ b/media-video/pymp/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-video/qgifer/metadata.xml b/media-video/qgifer/metadata.xml
index 7f6973555f3f..ae5ee63548cc 100644
--- a/media-video/qgifer/metadata.xml
+++ b/media-video/qgifer/metadata.xml
@@ -6,7 +6,10 @@
<name>Andrzej Pauli</name>
<description>Maintainer. Assign bugs to him.</description>
</maintainer>
- <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
QGifer is a tool for extracting part of a video to an animated GIF file.
</longdescription>
diff --git a/media-video/qt-recordmydesktop/metadata.xml b/media-video/qt-recordmydesktop/metadata.xml
index 2f0746fb146b..3025af177713 100644
--- a/media-video/qt-recordmydesktop/metadata.xml
+++ b/media-video/qt-recordmydesktop/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>video</herd>
- <herd>qt</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">recordmydesktop</remote-id>
</upstream>
diff --git a/media-video/qx11grab/metadata.xml b/media-video/qx11grab/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/media-video/qx11grab/metadata.xml
+++ b/media-video/qx11grab/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>qt</herd>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/recmpeg/metadata.xml b/media-video/recmpeg/metadata.xml
index 2fbced3903fb..63aa8a10f213 100644
--- a/media-video/recmpeg/metadata.xml
+++ b/media-video/recmpeg/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-video/recordmydesktop/metadata.xml b/media-video/recordmydesktop/metadata.xml
index 7856fb20cfe0..4d73f31a212d 100644
--- a/media-video/recordmydesktop/metadata.xml
+++ b/media-video/recordmydesktop/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-video/replex/metadata.xml b/media-video/replex/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/replex/metadata.xml
+++ b/media-video/replex/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-video/rovclock/metadata.xml b/media-video/rovclock/metadata.xml
index 303b5a066944..5146d7b553f6 100644
--- a/media-video/rovclock/metadata.xml
+++ b/media-video/rovclock/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>se.witt@gmx.net</email>
<name>Sebastian Witt</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/setpwc/metadata.xml b/media-video/setpwc/metadata.xml
index d9df1878d8e2..654fb394806c 100644
--- a/media-video/setpwc/metadata.xml
+++ b/media-video/setpwc/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>video</herd>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/shrip/metadata.xml b/media-video/shrip/metadata.xml
index cfdc18af1791..5bd09f9f2ac8 100644
--- a/media-video/shrip/metadata.xml
+++ b/media-video/shrip/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>billl@users.sf.net</email>
<name>Olivier Rolland</name>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/media-video/smplayer/metadata.xml b/media-video/smplayer/metadata.xml
index 567479d306a7..b29e50b61e6d 100644
--- a/media-video/smplayer/metadata.xml
+++ b/media-video/smplayer/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>qt</herd>
- <herd>video</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<use>
<flag name="autoshutdown">
Enable the option to shutdown your computer after finishing the playlist.
diff --git a/media-video/snappy/metadata.xml b/media-video/snappy/metadata.xml
index 8343b79cd5dc..fced74c6df1e 100644
--- a/media-video/snappy/metadata.xml
+++ b/media-video/snappy/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">
Snappy is a gstreamer + clutter media player with powerful features in mind
</longdescription>
diff --git a/media-video/sonic-snap/metadata.xml b/media-video/sonic-snap/metadata.xml
index 7747d838bc0b..77c050c2661d 100644
--- a/media-video/sonic-snap/metadata.xml
+++ b/media-video/sonic-snap/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>video</herd>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
<longdescription>Minimal webcam app for sn9c10x based camera controllers (mostly USB), with optional MPEG4 support.</longdescription>
</pkgmetadata>
diff --git a/media-video/sswf/metadata.xml b/media-video/sswf/metadata.xml
index 0c1c744d9343..ee9f6aebf63e 100644
--- a/media-video/sswf/metadata.xml
+++ b/media-video/sswf/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-video/streamdvd/metadata.xml b/media-video/streamdvd/metadata.xml
index 338a4e316169..0a304b764218 100644
--- a/media-video/streamdvd/metadata.xml
+++ b/media-video/streamdvd/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-video/sub2srt/metadata.xml b/media-video/sub2srt/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/sub2srt/metadata.xml
+++ b/media-video/sub2srt/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-video/subcheck/metadata.xml b/media-video/subcheck/metadata.xml
index da7d01380bc1..4ce9798193bb 100644
--- a/media-video/subcheck/metadata.xml
+++ b/media-video/subcheck/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>
<longdescription lang="en">
Subcheck is a perl script which checks srt (SubRip) subtitle files for
errors. Such as overlapping, negative duration, to short displaytime,
diff --git a/media-video/subdl/metadata.xml b/media-video/subdl/metadata.xml
index e87744a17fe7..0e4e1ae25aa3 100644
--- a/media-video/subdl/metadata.xml
+++ b/media-video/subdl/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-video/subdownloader/metadata.xml b/media-video/subdownloader/metadata.xml
index 23b382ba9296..1756fb11ff58 100644
--- a/media-video/subdownloader/metadata.xml
+++ b/media-video/subdownloader/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>ThyArmageddon+Gentoo@Gmail.com</email>
<name>Elijah El Lazkani</name>
@@ -10,6 +9,10 @@
<email>tampakrap@gentoo.org</email>
<name>Theo Chatzimichos</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
SubDownloader is a program for automatic download/upload subtitles for
videofiles (DIVX,MPEG,AVI,VOB,etc) and DVD's using fast hashing
diff --git a/media-video/subliminal/metadata.xml b/media-video/subliminal/metadata.xml
index edcbae0dde7c..faea18f4ee7a 100644
--- a/media-video/subliminal/metadata.xml
+++ b/media-video/subliminal/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>nikoli@gmx.us</email>
<name>Nikoli</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">subliminal</remote-id>
<remote-id type="github">Diaoul/subliminal</remote-id>
diff --git a/media-video/submux-dvd/metadata.xml b/media-video/submux-dvd/metadata.xml
index 8b5ccd61088e..1e611238d54c 100644
--- a/media-video/submux-dvd/metadata.xml
+++ b/media-video/submux-dvd/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>video</herd>
<maintainer>
<email>lordvan@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/subsync/metadata.xml b/media-video/subsync/metadata.xml
index bdf23f1b60aa..69f8f8dbb64a 100644
--- a/media-video/subsync/metadata.xml
+++ b/media-video/subsync/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>
<longdescription lang="en">
Subtitle Synchronizer is a easy command-line utility that synchronizes
subrip(srt) subtitles that use time format to given timings.
diff --git a/media-video/subtitlecomposer/metadata.xml b/media-video/subtitlecomposer/metadata.xml
index d76e08856ffd..a884b9730994 100644
--- a/media-video/subtitlecomposer/metadata.xml
+++ b/media-video/subtitlecomposer/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>video</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">maxrd2/subtitlecomposer</remote-id>
</upstream>
diff --git a/media-video/subtitleeditor/metadata.xml b/media-video/subtitleeditor/metadata.xml
index 1d70fc9df22c..bdc0ea118138 100644
--- a/media-video/subtitleeditor/metadata.xml
+++ b/media-video/subtitleeditor/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>gnome</herd>
<maintainer>
<email>eva@gentoo.org</email>
<name>Gilles Dartiguelongue</name>
</maintainer>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<longdescription lang="en">
Subtitle Editor is a GTK+2 tool to edit subtitles for GNU/Linux/*BSD. It can be used for new subtitles or as a tool to transform, edit, correct and refine existing subtitle. This program also shows sound waves, which makes it easier to synchronise subtitles to voices.
</longdescription>
diff --git a/media-video/subtitler-yuv/metadata.xml b/media-video/subtitler-yuv/metadata.xml
index 8b5ccd61088e..1e611238d54c 100644
--- a/media-video/subtitler-yuv/metadata.xml
+++ b/media-video/subtitler-yuv/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>video</herd>
<maintainer>
<email>lordvan@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/subtitleripper/metadata.xml b/media-video/subtitleripper/metadata.xml
index 8eeb88921a30..9ee987262629 100644
--- a/media-video/subtitleripper/metadata.xml
+++ b/media-video/subtitleripper/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>
<upstream>
<remote-id type="sourceforge">subtitleripper</remote-id>
</upstream>
diff --git a/media-video/super_demux/metadata.xml b/media-video/super_demux/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/super_demux/metadata.xml
+++ b/media-video/super_demux/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-video/tcmplex-panteltje/metadata.xml b/media-video/tcmplex-panteltje/metadata.xml
index 9f6437db2546..502353db4d52 100644
--- a/media-video/tcmplex-panteltje/metadata.xml
+++ b/media-video/tcmplex-panteltje/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>lordvan@gentoo.org</email>
</maintainer>
@@ -9,4 +8,8 @@
<email>hd_brummy@gentoo.org</email>
<name>Joerg Bornkessel</name>
</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/tivodecode/metadata.xml b/media-video/tivodecode/metadata.xml
index a31d9764569d..9bfe07ee6ee1 100644
--- a/media-video/tivodecode/metadata.xml
+++ b/media-video/tivodecode/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-video/totem/metadata.xml b/media-video/totem/metadata.xml
index c12849eff439..f3040f0048b3 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -1,9 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <herd>video</herd>
- <herd>gstreamer</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
<longdescription>
Totem is movie player for the GNOME desktop. It features a playlist, fullscreen mode, seek and volume controls, as well as a pretty complete keyboard navigation. It comes with added functionality such as a video thumbnailer for Nautilus, Nautilus properties tab and a webcam utility.
</longdescription>
diff --git a/media-video/tovid/metadata.xml b/media-video/tovid/metadata.xml
index 9955bf09d26e..12d228dfdedf 100644
--- a/media-video/tovid/metadata.xml
+++ b/media-video/tovid/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>
<upstream>
<remote-id type="google-code">tovid</remote-id>
<remote-id type="github">tovid-suite/tovid</remote-id>
diff --git a/media-video/transcode/metadata.xml b/media-video/transcode/metadata.xml
index 3f38fbefc8f7..b60ad732e1f6 100644
--- a/media-video/transcode/metadata.xml
+++ b/media-video/transcode/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-video/tsmuxer/metadata.xml b/media-video/tsmuxer/metadata.xml
index 37f3133f90e2..c51957e54f90 100644
--- a/media-video/tsmuxer/metadata.xml
+++ b/media-video/tsmuxer/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>
<longdescription lang="en">
SmartLabs tsMuxeR - the software utility to create TS and M2TS files for
IP broadcasting as well as for viewing at hardware video players (i.e.,
diff --git a/media-video/ttcut/metadata.xml b/media-video/ttcut/metadata.xml
index c050f53a91d0..bb6393d8482a 100644
--- a/media-video/ttcut/metadata.xml
+++ b/media-video/ttcut/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>video</herd>
<maintainer>
<email>billie@gentoo.org</email>
<name>Daniel Pielmeier</name>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<longdescription><pkg>media-video/ttcut</pkg> is a tool designed to remove commercials from
DVB (European standard for digital radio and television broadcast)
recordings. It only accepts the elementary video and audio streams. This is
diff --git a/media-video/vamps/metadata.xml b/media-video/vamps/metadata.xml
index d769aab5e32c..139293da3ac3 100644
--- a/media-video/vamps/metadata.xml
+++ b/media-video/vamps/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-video/vcdgear/metadata.xml b/media-video/vcdgear/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/vcdgear/metadata.xml
+++ b/media-video/vcdgear/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-video/vcdimager/metadata.xml b/media-video/vcdimager/metadata.xml
index 0d9b0dcb7f33..7b0b0a767d03 100644
--- a/media-video/vcdimager/metadata.xml
+++ b/media-video/vcdimager/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-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 9ffa7fd2d058..31b0327bd347 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/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-video/vdr2jpeg/metadata.xml b/media-video/vdr2jpeg/metadata.xml
index b3e2a5f7a5f0..cb2d756f2fa6 100644
--- a/media-video/vdr2jpeg/metadata.xml
+++ b/media-video/vdr2jpeg/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>video</herd>
- <maintainer>
+ <maintainer>
<email>hd_brummy@gentoo.org</email>
<name>Joerg Bornkessel</name>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<longdescription lang="en">
Addon needed for XXV - WWW Admin for the Video Disk Recorder
Creating jpeg pics from *.vdr files
diff --git a/media-video/vdrsync/metadata.xml b/media-video/vdrsync/metadata.xml
index 40d504a77773..16f63322c62d 100644
--- a/media-video/vdrsync/metadata.xml
+++ b/media-video/vdrsync/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>video</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
+<maintainer>
+<email>media-video@gentoo.org</email>
+<name>Gentoo Video project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/vdrtools-genindex/metadata.xml b/media-video/vdrtools-genindex/metadata.xml
index 3c9ab19af68c..95f2997fba08 100644
--- a/media-video/vdrtools-genindex/metadata.xml
+++ b/media-video/vdrtools-genindex/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>video</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
<longdescription>
</longdescription>
</pkgmetadata>
diff --git a/media-video/videocut/metadata.xml b/media-video/videocut/metadata.xml
index 3ab9197e8603..f3b77b973a29 100644
--- a/media-video/videocut/metadata.xml
+++ b/media-video/videocut/metadata.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
- <herd>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">videocut</remote-id>
</upstream>
diff --git a/media-video/videotrans/metadata.xml b/media-video/videotrans/metadata.xml
index 7460eda6954f..bf74fcec8657 100644
--- a/media-video/videotrans/metadata.xml
+++ b/media-video/videotrans/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>
<longdescription lang="en">
Videotrans is a set of scripts that convert a movie file in any format
that mplayer understands to a DVD-compatible VOB file, doing all the
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 458ad8e56083..00fb934bb313 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -1,13 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>sdnick484@gmail.com</email>
<name>Nick Andrade</name>
<description>Active Maintainer, Assign bugs</description>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="atmo">Enables support for AtmoLight (homebrew Ambient Lighting Technology)</flag>
<flag name="audioqueue">Enables AudioQueue audio module for Mac OS X.</flag>
diff --git a/media-video/vobcopy/metadata.xml b/media-video/vobcopy/metadata.xml
index d9df1878d8e2..654fb394806c 100644
--- a/media-video/vobcopy/metadata.xml
+++ b/media-video/vobcopy/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>video</herd>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-video/vstrip/metadata.xml b/media-video/vstrip/metadata.xml
index 51e7075f13dd..0a68bb06d120 100644
--- a/media-video/vstrip/metadata.xml
+++ b/media-video/vstrip/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-video/winki/metadata.xml b/media-video/winki/metadata.xml
index 8de312f6db3f..b29d91dc22f2 100644
--- a/media-video/winki/metadata.xml
+++ b/media-video/winki/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-video/x264-encoder/metadata.xml b/media-video/x264-encoder/metadata.xml
index 83ba4ce14f4d..cdc409276ab2 100644
--- a/media-video/x264-encoder/metadata.xml
+++ b/media-video/x264-encoder/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-video/xanim-export/metadata.xml b/media-video/xanim-export/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/xanim-export/metadata.xml
+++ b/media-video/xanim-export/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-video/xanim/metadata.xml b/media-video/xanim/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/xanim/metadata.xml
+++ b/media-video/xanim/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-video/xine-ui/metadata.xml b/media-video/xine-ui/metadata.xml
index 4f92b9f020b8..2cc6e535609e 100644
--- a/media-video/xine-ui/metadata.xml
+++ b/media-video/xine-ui/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-video/xvattr/metadata.xml b/media-video/xvattr/metadata.xml
index edccfe5754d2..b0a2b2c16e04 100644
--- a/media-video/xvattr/metadata.xml
+++ b/media-video/xvattr/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-video/xvid4conf/metadata.xml b/media-video/xvid4conf/metadata.xml
index 1cadc2e4ec21..ef86e0c272b1 100644
--- a/media-video/xvid4conf/metadata.xml
+++ b/media-video/xvid4conf/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-video/xvideoservicethief/metadata.xml b/media-video/xvideoservicethief/metadata.xml
index ab398e0b55c2..4236bf654321 100644
--- a/media-video/xvideoservicethief/metadata.xml
+++ b/media-video/xvideoservicethief/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
- <herd>qt</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xviservicethief</remote-id>
</upstream>