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-libs
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-libs')
-rw-r--r--media-libs/FusionSound/metadata.xml5
-rw-r--r--media-libs/SoXt/metadata.xml1
-rw-r--r--media-libs/a52dec/metadata.xml5
-rw-r--r--media-libs/aalib/metadata.xml1
-rw-r--r--media-libs/adplug/metadata.xml5
-rw-r--r--media-libs/aften/metadata.xml5
-rw-r--r--media-libs/aldumb/metadata.xml5
-rw-r--r--media-libs/allegro/metadata.xml5
-rw-r--r--media-libs/alsa-lib/metadata.xml1
-rw-r--r--media-libs/alsa-oss/metadata.xml1
-rw-r--r--media-libs/alure/metadata.xml5
-rw-r--r--media-libs/aubio/metadata.xml5
-rw-r--r--media-libs/audiofile/metadata.xml10
-rw-r--r--media-libs/avidemux-core/metadata.xml5
-rw-r--r--media-libs/avidemux-plugins/metadata.xml5
-rw-r--r--media-libs/bio2jack/metadata.xml5
-rw-r--r--media-libs/blib/metadata.xml1
-rw-r--r--media-libs/ccaudio2/metadata.xml5
-rw-r--r--media-libs/celt/metadata.xml5
-rw-r--r--media-libs/chromaprint/metadata.xml5
-rw-r--r--media-libs/cimg/metadata.xml5
-rw-r--r--media-libs/clutter-gst/metadata.xml5
-rw-r--r--media-libs/clutter-gtk/metadata.xml5
-rw-r--r--media-libs/clutter/metadata.xml5
-rw-r--r--media-libs/cogl/metadata.xml5
-rw-r--r--media-libs/compface/metadata.xml5
-rw-r--r--media-libs/ctl/metadata.xml1
-rw-r--r--media-libs/devil/metadata.xml5
-rw-r--r--media-libs/dssi/metadata.xml5
-rw-r--r--media-libs/dumb/metadata.xml5
-rw-r--r--media-libs/edje/metadata.xml5
-rw-r--r--media-libs/elementary/metadata.xml5
-rw-r--r--media-libs/emfengine/metadata.xml1
-rw-r--r--media-libs/emotion/metadata.xml5
-rw-r--r--media-libs/esdl/metadata.xml5
-rw-r--r--media-libs/ethumb/metadata.xml5
-rw-r--r--media-libs/evas/metadata.xml5
-rw-r--r--media-libs/exempi/metadata.xml1
-rw-r--r--media-libs/exiftool/metadata.xml10
-rw-r--r--media-libs/faac/metadata.xml5
-rw-r--r--media-libs/faad2/metadata.xml5
-rw-r--r--media-libs/fdk-aac/metadata.xml5
-rw-r--r--media-libs/ffmpegsource/metadata.xml5
-rw-r--r--media-libs/fidlib/metadata.xml5
-rw-r--r--media-libs/flac/metadata.xml5
-rw-r--r--media-libs/flickcurl/metadata.xml5
-rw-r--r--media-libs/fluidsynth-dssi/metadata.xml5
-rw-r--r--media-libs/fmod/metadata.xml5
-rw-r--r--media-libs/fontconfig-infinality/metadata.xml5
-rw-r--r--media-libs/fontconfig-ultimate/metadata.xml5
-rw-r--r--media-libs/fontconfig/metadata.xml5
-rw-r--r--media-libs/freealut/metadata.xml5
-rw-r--r--media-libs/freeglut/metadata.xml5
-rw-r--r--media-libs/freeimage/metadata.xml5
-rw-r--r--media-libs/freetype/metadata.xml5
-rw-r--r--media-libs/freeverb3/metadata.xml5
-rw-r--r--media-libs/ftgl/metadata.xml5
-rw-r--r--media-libs/game-music-emu/metadata.xml5
-rw-r--r--media-libs/ganv/metadata.xml5
-rw-r--r--media-libs/gavl/metadata.xml1
-rw-r--r--media-libs/gd/metadata.xml5
-rw-r--r--media-libs/gexiv2/metadata.xml5
-rw-r--r--media-libs/giblib/metadata.xml5
-rw-r--r--media-libs/giflib/metadata.xml5
-rw-r--r--media-libs/glfw/metadata.xml5
-rw-r--r--media-libs/glu/metadata.xml5
-rw-r--r--media-libs/gluon/metadata.xml5
-rw-r--r--media-libs/glyr/metadata.xml5
-rw-r--r--media-libs/gmtk/metadata.xml1
-rw-r--r--media-libs/gnonlin/metadata.xml5
-rw-r--r--media-libs/grilo/metadata.xml5
-rw-r--r--media-libs/gsound/metadata.xml5
-rw-r--r--media-libs/gst-plugins-bad/metadata.xml5
-rw-r--r--media-libs/gst-plugins-base/metadata.xml5
-rw-r--r--media-libs/gst-plugins-good/metadata.xml5
-rw-r--r--media-libs/gst-plugins-ugly/metadata.xml5
-rw-r--r--media-libs/gst-rtsp-server/metadata.xml5
-rw-r--r--media-libs/gstreamer-editing-services/metadata.xml5
-rw-r--r--media-libs/gstreamer/metadata.xml5
-rw-r--r--media-libs/guilib/metadata.xml1
-rw-r--r--media-libs/gupnp-dlna/metadata.xml5
-rw-r--r--media-libs/harfbuzz/metadata.xml10
-rw-r--r--media-libs/herqq/metadata.xml5
-rw-r--r--media-libs/hupnp-ng/metadata.xml5
-rw-r--r--media-libs/icclib/metadata.xml10
-rw-r--r--media-libs/id3lib/metadata.xml5
-rw-r--r--media-libs/ilmbase/metadata.xml1
-rw-r--r--media-libs/imlib/metadata.xml5
-rw-r--r--media-libs/imlib2/metadata.xml5
-rw-r--r--media-libs/jasper/metadata.xml5
-rw-r--r--media-libs/jbig2dec/metadata.xml10
-rw-r--r--media-libs/jbigkit/metadata.xml5
-rw-r--r--media-libs/jpeg/metadata.xml5
-rw-r--r--media-libs/kvazaar/metadata.xml1
-rw-r--r--media-libs/ladspa-cmt/metadata.xml5
-rw-r--r--media-libs/ladspa-sdk/metadata.xml5
-rw-r--r--media-libs/lasi/metadata.xml10
-rw-r--r--media-libs/lastfmlib/metadata.xml10
-rw-r--r--media-libs/lcms/metadata.xml5
-rw-r--r--media-libs/lensfun/metadata.xml5
-rw-r--r--media-libs/lib3ds/metadata.xml10
-rw-r--r--media-libs/libaacplus/metadata.xml5
-rw-r--r--media-libs/libaacs/metadata.xml5
-rw-r--r--media-libs/libafterimage/metadata.xml5
-rw-r--r--media-libs/libao/metadata.xml5
-rw-r--r--media-libs/libart_lgpl/metadata.xml5
-rw-r--r--media-libs/libass/metadata.xml1
-rw-r--r--media-libs/libbdplus/metadata.xml5
-rw-r--r--media-libs/libbluray/metadata.xml5
-rw-r--r--media-libs/libbs2b/metadata.xml5
-rw-r--r--media-libs/libcaca/metadata.xml1
-rw-r--r--media-libs/libcanberra/metadata.xml10
-rw-r--r--media-libs/libcdaudio/metadata.xml5
-rw-r--r--media-libs/libcddb/metadata.xml5
-rw-r--r--media-libs/libcdr/metadata.xml5
-rw-r--r--media-libs/libchamplain/metadata.xml5
-rw-r--r--media-libs/libclalsadrv/metadata.xml5
-rw-r--r--media-libs/libclastfm/metadata.xml5
-rw-r--r--media-libs/libclthreads/metadata.xml5
-rw-r--r--media-libs/libclxclient/metadata.xml5
-rw-r--r--media-libs/libcue/metadata.xml5
-rw-r--r--media-libs/libcuefile/metadata.xml5
-rw-r--r--media-libs/libdc1394/metadata.xml1
-rw-r--r--media-libs/libdca/metadata.xml5
-rw-r--r--media-libs/libde265/metadata.xml1
-rw-r--r--media-libs/libdiscid/metadata.xml5
-rw-r--r--media-libs/libdmtx/metadata.xml5
-rw-r--r--media-libs/libdv/metadata.xml1
-rw-r--r--media-libs/libdvb/metadata.xml1
-rw-r--r--media-libs/libdvbpsi/metadata.xml1
-rw-r--r--media-libs/libdvdcss/metadata.xml1
-rw-r--r--media-libs/libdvdnav/metadata.xml1
-rw-r--r--media-libs/libdvdplay/metadata.xml1
-rw-r--r--media-libs/libdvdread/metadata.xml1
-rw-r--r--media-libs/libechonest/metadata.xml10
-rw-r--r--media-libs/libepoxy/metadata.xml5
-rw-r--r--media-libs/libexif-gtk/metadata.xml5
-rw-r--r--media-libs/libexif/metadata.xml5
-rw-r--r--media-libs/libextractor/metadata.xml1
-rw-r--r--media-libs/libfame/metadata.xml1
-rw-r--r--media-libs/libfishsound/metadata.xml5
-rw-r--r--media-libs/libfpx/metadata.xml5
-rw-r--r--media-libs/libfreehand/metadata.xml5
-rw-r--r--media-libs/libggi/metadata.xml1
-rw-r--r--media-libs/libggigcp/metadata.xml1
-rw-r--r--media-libs/libggimisc/metadata.xml1
-rw-r--r--media-libs/libggiwmh/metadata.xml1
-rw-r--r--media-libs/libgig/metadata.xml5
-rw-r--r--media-libs/libgii/metadata.xml1
-rw-r--r--media-libs/libgltf/metadata.xml5
-rw-r--r--media-libs/libgphoto2/metadata.xml10
-rw-r--r--media-libs/libgpod/metadata.xml1
-rw-r--r--media-libs/libgroove/metadata.xml5
-rw-r--r--media-libs/libharu/metadata.xml10
-rw-r--r--media-libs/libicns/metadata.xml5
-rw-r--r--media-libs/libid3tag/metadata.xml5
-rw-r--r--media-libs/libiec61883/metadata.xml5
-rw-r--r--media-libs/libifp/metadata.xml5
-rw-r--r--media-libs/libilbc/metadata.xml5
-rw-r--r--media-libs/libjackasyn/metadata.xml5
-rw-r--r--media-libs/libjpeg-turbo/metadata.xml5
-rw-r--r--media-libs/libjsw/metadata.xml5
-rw-r--r--media-libs/libkarma/metadata.xml10
-rw-r--r--media-libs/libkate/metadata.xml5
-rw-r--r--media-libs/liblastfm/metadata.xml5
-rw-r--r--media-libs/liblingoteach/metadata.xml5
-rw-r--r--media-libs/liblo/metadata.xml5
-rw-r--r--media-libs/liblrdf/metadata.xml5
-rw-r--r--media-libs/liblscp/metadata.xml5
-rw-r--r--media-libs/libmad/metadata.xml5
-rw-r--r--media-libs/libmatroska/metadata.xml1
-rw-r--r--media-libs/libmediaart/metadata.xml5
-rw-r--r--media-libs/libmediainfo/metadata.xml5
-rw-r--r--media-libs/libmikmod/metadata.xml5
-rw-r--r--media-libs/libmms/metadata.xml1
-rw-r--r--media-libs/libmng/metadata.xml5
-rw-r--r--media-libs/libmodplug/metadata.xml5
-rw-r--r--media-libs/libmp3splt/metadata.xml5
-rw-r--r--media-libs/libmp4v2/metadata.xml5
-rw-r--r--media-libs/libmpd/metadata.xml5
-rw-r--r--media-libs/libmpdclient/metadata.xml5
-rw-r--r--media-libs/libmpeg2/metadata.xml1
-rw-r--r--media-libs/libmpeg3/metadata.xml1
-rw-r--r--media-libs/libmtp/metadata.xml5
-rw-r--r--media-libs/libmygpo-qt/metadata.xml10
-rw-r--r--media-libs/libnjb/metadata.xml5
-rw-r--r--media-libs/libnut/metadata.xml1
-rw-r--r--media-libs/libofa/metadata.xml5
-rw-r--r--media-libs/libogg/metadata.xml5
-rw-r--r--media-libs/liboggz/metadata.xml5
-rw-r--r--media-libs/libomxil-bellagio/metadata.xml5
-rw-r--r--media-libs/libopendaap/metadata.xml1
-rw-r--r--media-libs/libopenraw/metadata.xml1
-rw-r--r--media-libs/libpagemaker/metadata.xml5
-rw-r--r--media-libs/libpano13/metadata.xml5
-rw-r--r--media-libs/libpgf/metadata.xml5
-rw-r--r--media-libs/libpng/metadata.xml5
-rw-r--r--media-libs/libpostproc/metadata.xml1
-rw-r--r--media-libs/libpqstego/metadata.xml5
-rw-r--r--media-libs/libprojectm-qt/metadata.xml5
-rw-r--r--media-libs/libprojectm/metadata.xml5
-rw-r--r--media-libs/libquicktime/metadata.xml1
-rw-r--r--media-libs/libquvi-scripts/metadata.xml5
-rw-r--r--media-libs/libquvi/metadata.xml5
-rw-r--r--media-libs/libraw/metadata.xml5
-rw-r--r--media-libs/libreplaygain/metadata.xml5
-rw-r--r--media-libs/libsamplerate/metadata.xml5
-rw-r--r--media-libs/libsbsms/metadata.xml5
-rw-r--r--media-libs/libsdl/metadata.xml5
-rw-r--r--media-libs/libsdl2/metadata.xml5
-rw-r--r--media-libs/libshout/metadata.xml5
-rw-r--r--media-libs/libsidplayfp/metadata.xml5
-rw-r--r--media-libs/libsmf/metadata.xml5
-rw-r--r--media-libs/libsndfile/metadata.xml5
-rw-r--r--media-libs/libsoundio/metadata.xml5
-rw-r--r--media-libs/libsoundtouch/metadata.xml5
-rw-r--r--media-libs/libsvg/metadata.xml5
-rw-r--r--media-libs/libtaginfo/metadata.xml5
-rw-r--r--media-libs/libtheora/metadata.xml1
-rw-r--r--media-libs/libtiger/metadata.xml5
-rw-r--r--media-libs/libtimidity/metadata.xml5
-rw-r--r--media-libs/libtxc_dxtn/metadata.xml5
-rw-r--r--media-libs/libuninameslist/metadata.xml10
-rw-r--r--media-libs/libv4l/metadata.xml1
-rw-r--r--media-libs/libvisio/metadata.xml5
-rw-r--r--media-libs/libvisual/metadata.xml5
-rw-r--r--media-libs/libvorbis/metadata.xml5
-rw-r--r--media-libs/libvpx/metadata.xml6
-rw-r--r--media-libs/libwebp/metadata.xml10
-rw-r--r--media-libs/libxmi/metadata.xml5
-rw-r--r--media-libs/libxspf/metadata.xml5
-rw-r--r--media-libs/libxtract/metadata.xml5
-rw-r--r--media-libs/libyami/metadata.xml1
-rw-r--r--media-libs/libzen/metadata.xml5
-rw-r--r--media-libs/lilv/metadata.xml5
-rw-r--r--media-libs/lv2-ui/metadata.xml5
-rw-r--r--media-libs/lv2/metadata.xml5
-rw-r--r--media-libs/lv2core/metadata.xml5
-rw-r--r--media-libs/lvtk/metadata.xml5
-rw-r--r--media-libs/mash/metadata.xml5
-rw-r--r--media-libs/memphis/metadata.xml5
-rw-r--r--media-libs/mesa/metadata.xml5
-rw-r--r--media-libs/ming/metadata.xml5
-rw-r--r--media-libs/mlt/metadata.xml6
-rw-r--r--media-libs/musicbrainz/metadata.xml5
-rw-r--r--media-libs/mutagen/metadata.xml5
-rw-r--r--media-libs/nas/metadata.xml5
-rw-r--r--media-libs/netpbm/metadata.xml5
-rw-r--r--media-libs/openal/metadata.xml5
-rw-r--r--media-libs/opencollada/metadata.xml5
-rw-r--r--media-libs/opencolorio/metadata.xml5
-rw-r--r--media-libs/opencore-amr/metadata.xml5
-rw-r--r--media-libs/openctm/metadata.xml5
-rw-r--r--media-libs/opencv/metadata.xml5
-rw-r--r--media-libs/openexr/metadata.xml1
-rw-r--r--media-libs/openexr_ctl/metadata.xml1
-rw-r--r--media-libs/opengl-apple/metadata.xml5
-rw-r--r--media-libs/opengtl/metadata.xml5
-rw-r--r--media-libs/openh264/metadata.xml3
-rw-r--r--media-libs/openimageio/metadata.xml5
-rw-r--r--media-libs/openjpeg/metadata.xml5
-rw-r--r--media-libs/opus/metadata.xml5
-rw-r--r--media-libs/phat/metadata.xml5
-rw-r--r--media-libs/phonon-gstreamer/metadata.xml5
-rw-r--r--media-libs/phonon-qt7/metadata.xml10
-rw-r--r--media-libs/phonon-vlc/metadata.xml5
-rw-r--r--media-libs/phonon/metadata.xml5
-rw-r--r--media-libs/plib/metadata.xml5
-rw-r--r--media-libs/plotutils/metadata.xml5
-rw-r--r--media-libs/pnglite/metadata.xml5
-rw-r--r--media-libs/portaudio/metadata.xml5
-rw-r--r--media-libs/portmidi/metadata.xml5
-rw-r--r--media-libs/prison/metadata.xml5
-rw-r--r--media-libs/pymemphis/metadata.xml5
-rw-r--r--media-libs/qhull/metadata.xml5
-rw-r--r--media-libs/qimageblitz/metadata.xml5
-rw-r--r--media-libs/qt-gstreamer/metadata.xml5
-rw-r--r--media-libs/quesoglc/metadata.xml5
-rw-r--r--media-libs/quvi/metadata.xml5
-rw-r--r--media-libs/raptor/metadata.xml5
-rw-r--r--media-libs/raul/metadata.xml5
-rw-r--r--media-libs/resid/metadata.xml5
-rw-r--r--media-libs/rtaudio/metadata.xml5
-rw-r--r--media-libs/rubberband/metadata.xml5
-rw-r--r--media-libs/sbc/metadata.xml5
-rw-r--r--media-libs/schroedinger/metadata.xml1
-rw-r--r--media-libs/sdif/metadata.xml5
-rw-r--r--media-libs/sdl-gfx/metadata.xml5
-rw-r--r--media-libs/sdl-image/metadata.xml5
-rw-r--r--media-libs/sdl-mixer/metadata.xml5
-rw-r--r--media-libs/sdl-net/metadata.xml5
-rw-r--r--media-libs/sdl-pango/metadata.xml10
-rw-r--r--media-libs/sdl-sound/metadata.xml5
-rw-r--r--media-libs/sdl-terminal/metadata.xml5
-rw-r--r--media-libs/sdl-ttf/metadata.xml5
-rw-r--r--media-libs/sdl2-gfx/metadata.xml5
-rw-r--r--media-libs/sdl2-image/metadata.xml5
-rw-r--r--media-libs/sdl2-mixer/metadata.xml5
-rw-r--r--media-libs/sdl2-net/metadata.xml5
-rw-r--r--media-libs/sdl2-ttf/metadata.xml5
-rw-r--r--media-libs/sg/metadata.xml5
-rw-r--r--media-libs/sge/metadata.xml5
-rw-r--r--media-libs/shivavg/metadata.xml5
-rw-r--r--media-libs/silgraphite/metadata.xml5
-rw-r--r--media-libs/slv2/metadata.xml5
-rw-r--r--media-libs/smpeg/metadata.xml5
-rw-r--r--media-libs/smpeg2/metadata.xml5
-rw-r--r--media-libs/soxr/metadata.xml5
-rw-r--r--media-libs/speex/metadata.xml5
-rw-r--r--media-libs/sratom/metadata.xml5
-rw-r--r--media-libs/stimg/metadata.xml5
-rw-r--r--media-libs/stk/metadata.xml10
-rw-r--r--media-libs/stops/metadata.xml5
-rw-r--r--media-libs/sublib/metadata.xml5
-rw-r--r--media-libs/suil/metadata.xml5
-rw-r--r--media-libs/t1lib/metadata.xml5
-rw-r--r--media-libs/taglib-extras/metadata.xml5
-rw-r--r--media-libs/taglib/metadata.xml5
-rw-r--r--media-libs/tiff/metadata.xml5
-rw-r--r--media-libs/tremor/metadata.xml5
-rw-r--r--media-libs/tse3/metadata.xml5
-rw-r--r--media-libs/urt/metadata.xml5
-rw-r--r--media-libs/vamp-plugin-sdk/metadata.xml5
-rw-r--r--media-libs/vigra/metadata.xml5
-rw-r--r--media-libs/vips/metadata.xml5
-rw-r--r--media-libs/virglrenderer/metadata.xml5
-rw-r--r--media-libs/vo-aacenc/metadata.xml5
-rw-r--r--media-libs/vo-amrwbenc/metadata.xml5
-rw-r--r--media-libs/volpack/metadata.xml5
-rw-r--r--media-libs/waffle/metadata.xml5
-rw-r--r--media-libs/wxsvg/metadata.xml5
-rw-r--r--media-libs/x264/metadata.xml1
-rw-r--r--media-libs/x265/metadata.xml1
-rw-r--r--media-libs/xine-lib/metadata.xml1
-rw-r--r--media-libs/xvid/metadata.xml1
-rw-r--r--media-libs/zimg/metadata.xml1
-rw-r--r--media-libs/zita-alsa-pcmi/metadata.xml5
-rw-r--r--media-libs/zita-convolver/metadata.xml5
-rw-r--r--media-libs/zvbi/metadata.xml1
339 files changed, 1217 insertions, 361 deletions
diff --git a/media-libs/FusionSound/metadata.xml b/media-libs/FusionSound/metadata.xml
index 5e71b4c24ef..6ee7c71b8a2 100644
--- a/media-libs/FusionSound/metadata.xml
+++ b/media-libs/FusionSound/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>hd_brummy@gentoo.org</email>
<name>Joerg Bornkessel</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/SoXt/metadata.xml b/media-libs/SoXt/metadata.xml
index 9f049b0e14b..cd5a9ae375c 100644
--- a/media-libs/SoXt/metadata.xml
+++ b/media-libs/SoXt/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>sci-physics</herd>
<maintainer>
<email>sci-physics@gentoo.org</email>
<description>Feel free to maintain/fix</description>
diff --git a/media-libs/a52dec/metadata.xml b/media-libs/a52dec/metadata.xml
index 74493e67165..2750253df5a 100644
--- a/media-libs/a52dec/metadata.xml
+++ b/media-libs/a52dec/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="djbfft">Prefer D.J. Bernstein's library for fourier transforms</flag>
</use>
diff --git a/media-libs/aalib/metadata.xml b/media-libs/aalib/metadata.xml
index b89813c0f49..9cba3215700 100644
--- a/media-libs/aalib/metadata.xml
+++ b/media-libs/aalib/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-libs/adplug/metadata.xml b/media-libs/adplug/metadata.xml
index 88d380c3ac8..2fed612d240 100644
--- a/media-libs/adplug/metadata.xml
+++ b/media-libs/adplug/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">adplug</remote-id>
</upstream>
diff --git a/media-libs/aften/metadata.xml b/media-libs/aften/metadata.xml
index 27e3137c34a..07a63fb9f16 100644
--- a/media-libs/aften/metadata.xml
+++ b/media-libs/aften/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription lang="en">
Aften is an audio encoder which generates compressed audio streams based
on ATSC A/52 specification. This type of audio is also known as AC-3 or
diff --git a/media-libs/aldumb/metadata.xml b/media-libs/aldumb/metadata.xml
index ae7b4a0b0ad..0efe2457371 100644
--- a/media-libs/aldumb/metadata.xml
+++ b/media-libs/aldumb/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">dumb</remote-id>
</upstream>
diff --git a/media-libs/allegro/metadata.xml b/media-libs/allegro/metadata.xml
index 7d103d5f8d6..23295124aac 100644
--- a/media-libs/allegro/metadata.xml
+++ b/media-libs/allegro/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<longdescription>
Allegro is a game programming library for C/C++ developers distributed
freely, supporting the following platforms: DOS, Unix (Linux, FreeBSD,
diff --git a/media-libs/alsa-lib/metadata.xml b/media-libs/alsa-lib/metadata.xml
index 0ea67aec405..0973a22eaf2 100644
--- a/media-libs/alsa-lib/metadata.xml
+++ b/media-libs/alsa-lib/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>alsa</herd>
<maintainer>
<email>alsa-bugs@gentoo.org</email>
</maintainer>
diff --git a/media-libs/alsa-oss/metadata.xml b/media-libs/alsa-oss/metadata.xml
index 8987e55f2c0..f16125d4f48 100644
--- a/media-libs/alsa-oss/metadata.xml
+++ b/media-libs/alsa-oss/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>alsa</herd>
<maintainer>
<email>alsa-bugs@gentoo.org</email>
</maintainer>
diff --git a/media-libs/alure/metadata.xml b/media-libs/alure/metadata.xml
index d2599dbf709..caf0a4baf95 100644
--- a/media-libs/alure/metadata.xml
+++ b/media-libs/alure/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="dumb">Enable <pkg>media-libs/dumb</pkg> module library support</flag>
<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis</flag>
diff --git a/media-libs/aubio/metadata.xml b/media-libs/aubio/metadata.xml
index 89e25f6460e..0eb93d14bd7 100644
--- a/media-libs/aubio/metadata.xml
+++ b/media-libs/aubio/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<use>
<flag name="double-precision">Compile in double precision mode.</flag>
</use>
diff --git a/media-libs/audiofile/metadata.xml b/media-libs/audiofile/metadata.xml
index b016c18b544..661a15a3b95 100644
--- a/media-libs/audiofile/metadata.xml
+++ b/media-libs/audiofile/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>sound</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/avidemux-core/metadata.xml b/media-libs/avidemux-core/metadata.xml
index eca3d560ed5..30fafcbabdb 100644
--- a/media-libs/avidemux-core/metadata.xml
+++ b/media-libs/avidemux-core/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-libs/avidemux-plugins/metadata.xml b/media-libs/avidemux-plugins/metadata.xml
index 795f8bbed27..39b3a41f11b 100644
--- a/media-libs/avidemux-plugins/metadata.xml
+++ b/media-libs/avidemux-plugins/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
+ <maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
<use>
<flag name="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-libs/bio2jack/metadata.xml b/media-libs/bio2jack/metadata.xml
index 43393326f92..e856506354c 100644
--- a/media-libs/bio2jack/metadata.xml
+++ b/media-libs/bio2jack/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">bio2jack</remote-id>
</upstream>
diff --git a/media-libs/blib/metadata.xml b/media-libs/blib/metadata.xml
index edccfe5754d..b0a2b2c16e0 100644
--- a/media-libs/blib/metadata.xml
+++ b/media-libs/blib/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-libs/ccaudio2/metadata.xml b/media-libs/ccaudio2/metadata.xml
index 60c7f53239e..c5570c3e872 100644
--- a/media-libs/ccaudio2/metadata.xml
+++ b/media-libs/ccaudio2/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>andreis.vinogradovs@gmail.com</email>
<name>Andreis Vinogradovs</name>
@@ -10,4 +9,8 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/celt/metadata.xml b/media-libs/celt/metadata.xml
index 07e45eced00..7cdf3557a10 100644
--- a/media-libs/celt/metadata.xml
+++ b/media-libs/celt/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>sound</herd>
<maintainer>
<email>tgurr@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>
CELT is a very low delay audio codec designed for high-quality
communications.
diff --git a/media-libs/chromaprint/metadata.xml b/media-libs/chromaprint/metadata.xml
index 43c573448c8..015a1f28be0 100644
--- a/media-libs/chromaprint/metadata.xml
+++ b/media-libs/chromaprint/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="tools">Build and install fpcalc and fpcollect tools</flag>
</use>
diff --git a/media-libs/cimg/metadata.xml b/media-libs/cimg/metadata.xml
index fe1493dba75..755b43b17bb 100644
--- a/media-libs/cimg/metadata.xml
+++ b/media-libs/cimg/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">cimg</remote-id>
<bugs-to>http://sourceforge.net/tracker/?group_id=96492</bugs-to>
diff --git a/media-libs/clutter-gst/metadata.xml b/media-libs/clutter-gst/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/media-libs/clutter-gst/metadata.xml
+++ b/media-libs/clutter-gst/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/clutter-gtk/metadata.xml b/media-libs/clutter-gtk/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/media-libs/clutter-gtk/metadata.xml
+++ b/media-libs/clutter-gtk/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/clutter/metadata.xml b/media-libs/clutter/metadata.xml
index e82af824d4b..508ea95b37b 100644
--- a/media-libs/clutter/metadata.xml
+++ b/media-libs/clutter/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="egl">Enable EGL backend.</flag>
<flag name="gtk">Use gdk-pixbuf from <pkg>x11-libs/gtk+</pkg> as image rendering backend</flag>
diff --git a/media-libs/cogl/metadata.xml b/media-libs/cogl/metadata.xml
index 465b183131a..ee35510a618 100644
--- a/media-libs/cogl/metadata.xml
+++ b/media-libs/cogl/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
<flag name="kms">Enable KMS support.</flag>
diff --git a/media-libs/compface/metadata.xml b/media-libs/compface/metadata.xml
index 01f3621f3cd..635dc9e13ba 100644
--- a/media-libs/compface/metadata.xml
+++ b/media-libs/compface/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>net-mail</herd>
<maintainer>
<email>hattya@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>net-mail@gentoo.org</email>
+ <name>Net-Mail</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/ctl/metadata.xml b/media-libs/ctl/metadata.xml
index de95417e2be..1f5be347404 100644
--- a/media-libs/ctl/metadata.xml
+++ b/media-libs/ctl/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-libs/devil/metadata.xml b/media-libs/devil/metadata.xml
index 30db632a537..7928ca1e466 100644
--- a/media-libs/devil/metadata.xml
+++ b/media-libs/devil/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<use>
<flag name="allegro">Add support for Allegro</flag>
<flag name="nvtt">Add support for <pkg>dev-util/nvidia-texture-tools</pkg></flag>
diff --git a/media-libs/dssi/metadata.xml b/media-libs/dssi/metadata.xml
index ecc06c7ce1d..27c2236954f 100644
--- a/media-libs/dssi/metadata.xml
+++ b/media-libs/dssi/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">dssi</remote-id>
</upstream>
diff --git a/media-libs/dumb/metadata.xml b/media-libs/dumb/metadata.xml
index ef5cb01f98d..c36fea69e31 100644
--- a/media-libs/dumb/metadata.xml
+++ b/media-libs/dumb/metadata.xml
@@ -5,7 +5,10 @@
<email>joker@gentoo.org</email>
<name>Christian Birchinger</name>
</maintainer>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">dumb</remote-id>
</upstream>
diff --git a/media-libs/edje/metadata.xml b/media-libs/edje/metadata.xml
index 799168dc72e..581b09eec8b 100644
--- a/media-libs/edje/metadata.xml
+++ b/media-libs/edje/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<use>
<flag name="cache">Enable caching</flag>
</use>
diff --git a/media-libs/elementary/metadata.xml b/media-libs/elementary/metadata.xml
index 2d945fa8205..15182cfa918 100644
--- a/media-libs/elementary/metadata.xml
+++ b/media-libs/elementary/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<use>
<flag name="quicklaunch">Enable quick-launch support</flag>
</use>
diff --git a/media-libs/emfengine/metadata.xml b/media-libs/emfengine/metadata.xml
index 4bf6dbc6b1e..bd11e068faa 100644
--- a/media-libs/emfengine/metadata.xml
+++ b/media-libs/emfengine/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>sci</herd>
<maintainer>
<email>sci@gentoo.org</email>
</maintainer>
diff --git a/media-libs/emotion/metadata.xml b/media-libs/emotion/metadata.xml
index 225efc96352..9b032006b53 100644
--- a/media-libs/emotion/metadata.xml
+++ b/media-libs/emotion/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<use>
<flag name="vlc">Enable support for the <pkg>media-video/vlc</pkg> player backend</flag>
</use>
diff --git a/media-libs/esdl/metadata.xml b/media-libs/esdl/metadata.xml
index 969ea43fe18..3580f39cea3 100644
--- a/media-libs/esdl/metadata.xml
+++ b/media-libs/esdl/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>graphics</herd>
<maintainer>
<email>george@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>
ESDL - What is that?
diff --git a/media-libs/ethumb/metadata.xml b/media-libs/ethumb/metadata.xml
index a54dd9c166c..8905f42418a 100644
--- a/media-libs/ethumb/metadata.xml
+++ b/media-libs/ethumb/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<use>
<flag name="emotion">Add support for <pkg>media-libs/emotion</pkg></flag>
</use>
diff --git a/media-libs/evas/metadata.xml b/media-libs/evas/metadata.xml
index fb7ffeebcd1..13178216fef 100644
--- a/media-libs/evas/metadata.xml
+++ b/media-libs/evas/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<use>
<flag name="bmp">Support windows bitmap (bmp) image loader</flag>
<flag name="eet">Support dev-libs/eet</flag>
diff --git a/media-libs/exempi/metadata.xml b/media-libs/exempi/metadata.xml
index 9879e83b822..a0f4da6903d 100644
--- a/media-libs/exempi/metadata.xml
+++ b/media-libs/exempi/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>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/media-libs/exiftool/metadata.xml b/media-libs/exiftool/metadata.xml
index 8ba0ae9d57d..8b634fcab82 100644
--- a/media-libs/exiftool/metadata.xml
+++ b/media-libs/exiftool/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>graphics</herd>
- <herd>perl</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+ <maintainer>
+ <email>perl@gentoo.org</email>
+ <name>Gentoo Perl Project</name>
+ </maintainer>
<longdescription>ExifTool is a platform-independent Perl library plus a
command-line application for reading, writing and editing meta
information in image, audio and video files. ExifTool supports
diff --git a/media-libs/faac/metadata.xml b/media-libs/faac/metadata.xml
index da0ce7d9131..6bf33cadcd1 100644
--- a/media-libs/faac/metadata.xml
+++ b/media-libs/faac/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">faac</remote-id>
</upstream>
diff --git a/media-libs/faad2/metadata.xml b/media-libs/faad2/metadata.xml
index 3cd31fce10b..9bf0301c2a2 100644
--- a/media-libs/faad2/metadata.xml
+++ b/media-libs/faad2/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>The fastest ISO AAC audio decoder available, correctly decodes all MPEG-4 and MPEG-2 MAIN, LOW, LTP, LD and ER object type AAC files</longdescription>
<use>
<flag name="digitalradio">Digital Radio Mondiale (warning: disables other decoders)</flag>
diff --git a/media-libs/fdk-aac/metadata.xml b/media-libs/fdk-aac/metadata.xml
index 8503e5e2cc1..1c8eac2ec00 100644
--- a/media-libs/fdk-aac/metadata.xml
+++ b/media-libs/fdk-aac/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription lang="en">Fraunhofer FDK AAC Codec Library for Android</longdescription>
<upstream>
<remote-id type="sourceforge">opencore-amr</remote-id>
diff --git a/media-libs/ffmpegsource/metadata.xml b/media-libs/ffmpegsource/metadata.xml
index 88c4964cd5e..dc896732e05 100644
--- a/media-libs/ffmpegsource/metadata.xml
+++ b/media-libs/ffmpegsource/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>itumaykin+gentoo@gmail.com</email>
<name>Coacher</name>
@@ -15,6 +14,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">FFMS/ffms2</remote-id>
</upstream>
diff --git a/media-libs/fidlib/metadata.xml b/media-libs/fidlib/metadata.xml
index af0275e2998..7ae4362bbf0 100644
--- a/media-libs/fidlib/metadata.xml
+++ b/media-libs/fidlib/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/flac/metadata.xml b/media-libs/flac/metadata.xml
index a2b8f3b8933..dc6b232d959 100644
--- a/media-libs/flac/metadata.xml
+++ b/media-libs/flac/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">flac</remote-id>
</upstream>
diff --git a/media-libs/flickcurl/metadata.xml b/media-libs/flickcurl/metadata.xml
index bbe3ae03679..ecbd04f84a1 100644
--- a/media-libs/flickcurl/metadata.xml
+++ b/media-libs/flickcurl/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="raptor">Use <pkg>media-libs/raptor</pkg> for proper RDF serializing</flag>
</use>
diff --git a/media-libs/fluidsynth-dssi/metadata.xml b/media-libs/fluidsynth-dssi/metadata.xml
index 8fd4eb63c1f..83da604977f 100644
--- a/media-libs/fluidsynth-dssi/metadata.xml
+++ b/media-libs/fluidsynth-dssi/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">dssi</remote-id>
</upstream>
diff --git a/media-libs/fmod/metadata.xml b/media-libs/fmod/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/fmod/metadata.xml
+++ b/media-libs/fmod/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/fontconfig-infinality/metadata.xml b/media-libs/fontconfig-infinality/metadata.xml
index 3d5889849e1..3f364ac910b 100644
--- a/media-libs/fontconfig-infinality/metadata.xml
+++ b/media-libs/fontconfig-infinality/metadata.xml
@@ -4,7 +4,10 @@
<maintainer>
<email>yngwin@gentoo.org</email>
</maintainer>
- <herd>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<use>
<flag name="nyx">Additional style using croscorefonts</flag>
</use>
diff --git a/media-libs/fontconfig-ultimate/metadata.xml b/media-libs/fontconfig-ultimate/metadata.xml
index 33de2dc0257..1dc0400d402 100644
--- a/media-libs/fontconfig-ultimate/metadata.xml
+++ b/media-libs/fontconfig-ultimate/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>fonts</herd>
<maintainer>
<email>witold.pilat@gmail.com</email>
<description>Proxied/co-maintainer. CC on bugs.</description>
</maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="github">bohoomil/fontconfig-ultimate</remote-id>
</upstream>
diff --git a/media-libs/fontconfig/metadata.xml b/media-libs/fontconfig/metadata.xml
index a46832ff9ef..2a2812f0e46 100644
--- a/media-libs/fontconfig/metadata.xml
+++ b/media-libs/fontconfig/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>fonts</herd>
<maintainer>
<email>yngwin@gentoo.org</email>
<name>Ben de Groot</name>
@@ -11,5 +10,9 @@
<name>gx86-multilib project</name>
<description>Handling the bugs related to multilib support in the package and related changes.</description>
</maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription>Fontconfig is a font configuration and customization library, which does not depend on the X Window System. It is designed to locate fonts within the system and select them according to requirements specified by applications.</longdescription>
</pkgmetadata>
diff --git a/media-libs/freealut/metadata.xml b/media-libs/freealut/metadata.xml
index ae573a60407..f0d550a9b30 100644
--- a/media-libs/freealut/metadata.xml
+++ b/media-libs/freealut/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/freeglut/metadata.xml b/media-libs/freeglut/metadata.xml
index 2bac441ccc7..4c14bd1ec41 100644
--- a/media-libs/freeglut/metadata.xml
+++ b/media-libs/freeglut/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>x11</herd>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<longdescription>
Freeglut provides an open-source alternative to the OpenGL Utility Toolkit
(GLUT) library. It is actively developed and maintained, while not being
diff --git a/media-libs/freeimage/metadata.xml b/media-libs/freeimage/metadata.xml
index a1cf48602f1..ee29d4caaac 100644
--- a/media-libs/freeimage/metadata.xml
+++ b/media-libs/freeimage/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">freeimage</remote-id>
</upstream>
diff --git a/media-libs/freetype/metadata.xml b/media-libs/freetype/metadata.xml
index d93cdef5cb0..a7543d2c800 100644
--- a/media-libs/freetype/metadata.xml
+++ b/media-libs/freetype/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>fonts</herd>
<maintainer>
<email>yngwin@gentoo.org</email>
<name>Ben de Groot</name>
@@ -16,6 +15,10 @@
<description>Handling the bugs related to multilib support in the
package and related changes.</description>
</maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<use>
<flag name="adobe-cff">Use Adobe CFF as default font-renderer</flag>
<flag name="auto-hinter">Use the unpatented auto-hinter instead
diff --git a/media-libs/freeverb3/metadata.xml b/media-libs/freeverb3/metadata.xml
index 2001569e0bb..09bf1cf549e 100644
--- a/media-libs/freeverb3/metadata.xml
+++ b/media-libs/freeverb3/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>sping@gentoo.org</email>
<name>Sebastian Pipping</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="audacious">Build Audacious plugin</flag>
<flag name="forcefpu">Disable assembly code</flag>
diff --git a/media-libs/ftgl/metadata.xml b/media-libs/ftgl/metadata.xml
index cf3590a61d8..0de95ca9bfd 100644
--- a/media-libs/ftgl/metadata.xml
+++ b/media-libs/ftgl/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">ftgl</remote-id>
</upstream>
diff --git a/media-libs/game-music-emu/metadata.xml b/media-libs/game-music-emu/metadata.xml
index 09332b4694c..8fd198b51fc 100644
--- a/media-libs/game-music-emu/metadata.xml
+++ b/media-libs/game-music-emu/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">game-music-emu</remote-id>
<remote-id type="bitbucket">mpyne/game-music-emu</remote-id>
diff --git a/media-libs/ganv/metadata.xml b/media-libs/ganv/metadata.xml
index 8f0e433951e..13221fc18b7 100644
--- a/media-libs/ganv/metadata.xml
+++ b/media-libs/ganv/metadata.xml
@@ -5,7 +5,10 @@
<email>karl.j.linden@gmail.com</email>
<name>Karl Lindén</name>
</maintainer>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<use>
<flag name="fdgl">Use experimental force-directed graph layout</flag>
</use>
diff --git a/media-libs/gavl/metadata.xml b/media-libs/gavl/metadata.xml
index 79a37f98e4a..879a0f042db 100644
--- a/media-libs/gavl/metadata.xml
+++ b/media-libs/gavl/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-libs/gd/metadata.xml b/media-libs/gd/metadata.xml
index 5d65c506741..ae8653163fa 100644
--- a/media-libs/gd/metadata.xml
+++ b/media-libs/gd/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>graphics</herd>
<maintainer>
<email>vapier@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>
gd is a graphics library. It allows your code to quickly draw images complete
with lines, arcs, text, multiple colors, cut and paste from other images, and
diff --git a/media-libs/gexiv2/metadata.xml b/media-libs/gexiv2/metadata.xml
index 9be90a25897..fad04a0b0ae 100644
--- a/media-libs/gexiv2/metadata.xml
+++ b/media-libs/gexiv2/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>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/giblib/metadata.xml b/media-libs/giblib/metadata.xml
index 2a8e42b4aa1..2e0efefbdae 100644
--- a/media-libs/giblib/metadata.xml
+++ b/media-libs/giblib/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>
giblib is a utility library used by many of the applications I write. It
incorporates doubly linked lists, some string functions, and a wrapper
diff --git a/media-libs/giflib/metadata.xml b/media-libs/giflib/metadata.xml
index c5d67410356..f3188046c2f 100644
--- a/media-libs/giflib/metadata.xml
+++ b/media-libs/giflib/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="rle">Build converters for RLE format (utah raster toolkit)</flag>
</use>
diff --git a/media-libs/glfw/metadata.xml b/media-libs/glfw/metadata.xml
index ca66c0fcb12..66422ec64c5 100644
--- a/media-libs/glfw/metadata.xml
+++ b/media-libs/glfw/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<use>
<flag name="egl">Use EGL instead of GLX for GL context creation</flag>
</use>
diff --git a/media-libs/glu/metadata.xml b/media-libs/glu/metadata.xml
index 7f7fe83cd79..306d9a0a130 100644
--- a/media-libs/glu/metadata.xml
+++ b/media-libs/glu/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>x11</herd>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/gluon/metadata.xml b/media-libs/gluon/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/media-libs/gluon/metadata.xml
+++ b/media-libs/gluon/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-libs/glyr/metadata.xml b/media-libs/glyr/metadata.xml
index f4394f6a0b5..fb9c3c55743 100644
--- a/media-libs/glyr/metadata.xml
+++ b/media-libs/glyr/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="github">sahib/glyr</remote-id>
</upstream>
diff --git a/media-libs/gmtk/metadata.xml b/media-libs/gmtk/metadata.xml
index ba67427253b..9a47f04dac4 100644
--- a/media-libs/gmtk/metadata.xml
+++ b/media-libs/gmtk/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-libs/gnonlin/metadata.xml b/media-libs/gnonlin/metadata.xml
index 2eb27a71abe..b9d01b0b829 100644
--- a/media-libs/gnonlin/metadata.xml
+++ b/media-libs/gnonlin/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>
<upstream>
<remote-id type="sourceforge">gnonlin</remote-id>
</upstream>
diff --git a/media-libs/grilo/metadata.xml b/media-libs/grilo/metadata.xml
index a2dcfcee453..bd087cda5a7 100644
--- a/media-libs/grilo/metadata.xml
+++ b/media-libs/grilo/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="network">Enable network access for media discovery using
<pkg>net-libs/libsoup</pkg></flag>
diff --git a/media-libs/gsound/metadata.xml b/media-libs/gsound/metadata.xml
index 6e0e2ecb48c..f0f559a4662 100644
--- a/media-libs/gsound/metadata.xml
+++ b/media-libs/gsound/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/gst-plugins-bad/metadata.xml b/media-libs/gst-plugins-bad/metadata.xml
index 730ab73210a..4c4566c43b8 100644
--- a/media-libs/gst-plugins-bad/metadata.xml
+++ b/media-libs/gst-plugins-bad/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gstreamer</herd>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
<use>
<flag name="egl">Enable EGL support</flag>
<flag name="gles2">Enable GLES2 support</flag>
diff --git a/media-libs/gst-plugins-base/metadata.xml b/media-libs/gst-plugins-base/metadata.xml
index 7b5b837f346..e9e812ffdd0 100644
--- a/media-libs/gst-plugins-base/metadata.xml
+++ b/media-libs/gst-plugins-base/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gstreamer</herd>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
<use>
<flag name="pango">Enable pango GStreamer plugin</flag>
<flag name="ivorbis">Enable integer based vorbis decoder.</flag>
diff --git a/media-libs/gst-plugins-good/metadata.xml b/media-libs/gst-plugins-good/metadata.xml
index d1096fb54bd..3794041ace8 100644
--- a/media-libs/gst-plugins-good/metadata.xml
+++ b/media-libs/gst-plugins-good/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-libs/gst-plugins-ugly/metadata.xml b/media-libs/gst-plugins-ugly/metadata.xml
index 2e219048870..9d06079563c 100644
--- a/media-libs/gst-plugins-ugly/metadata.xml
+++ b/media-libs/gst-plugins-ugly/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>
<upstream>
<remote-id type="sourceforge">gstreamer</remote-id>
</upstream>
diff --git a/media-libs/gst-rtsp-server/metadata.xml b/media-libs/gst-rtsp-server/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-libs/gst-rtsp-server/metadata.xml
+++ b/media-libs/gst-rtsp-server/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-libs/gstreamer-editing-services/metadata.xml b/media-libs/gstreamer-editing-services/metadata.xml
index 9e260ceca3e..1174c64e39c 100644
--- a/media-libs/gstreamer-editing-services/metadata.xml
+++ b/media-libs/gstreamer-editing-services/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-libs/gstreamer/metadata.xml b/media-libs/gstreamer/metadata.xml
index 5ed0f2f88bb..72f8311d264 100644
--- a/media-libs/gstreamer/metadata.xml
+++ b/media-libs/gstreamer/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gstreamer</herd>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
<use>
<flag name="orc">Disable some PaX memory protections to allow plugins
that use <pkg>dev-lang/orc</pkg> for runtime optimization to be
diff --git a/media-libs/guilib/metadata.xml b/media-libs/guilib/metadata.xml
index c572c7d9b47..07cb6cb09a1 100644
--- a/media-libs/guilib/metadata.xml
+++ b/media-libs/guilib/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-libs/gupnp-dlna/metadata.xml b/media-libs/gupnp-dlna/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/media-libs/gupnp-dlna/metadata.xml
+++ b/media-libs/gupnp-dlna/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/harfbuzz/metadata.xml b/media-libs/harfbuzz/metadata.xml
index aea8ccf0ec5..eef1d6e3a06 100644
--- a/media-libs/harfbuzz/metadata.xml
+++ b/media-libs/harfbuzz/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>office</herd>
- <herd>gnome</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="glib">Compile with GLib Unicode support</flag>
<flag name="graphite">Use graphite to render complex non-Roman writing systems</flag>
diff --git a/media-libs/herqq/metadata.xml b/media-libs/herqq/metadata.xml
index db06e3ffda3..429216a673f 100644
--- a/media-libs/herqq/metadata.xml
+++ b/media-libs/herqq/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">hupnp</remote-id>
</upstream>
diff --git a/media-libs/hupnp-ng/metadata.xml b/media-libs/hupnp-ng/metadata.xml
index 2db1d62a804..5a9dfc88477 100644
--- a/media-libs/hupnp-ng/metadata.xml
+++ b/media-libs/hupnp-ng/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>leechcraft</herd>
+ <maintainer>
+ <email>leechcraft@gentoo.org</email>
+ <name>LeechCraft</name>
+ </maintainer>
<upstream>
<remote-id type="github">0xd34df00d/hupnp-ng</remote-id>
</upstream>
diff --git a/media-libs/icclib/metadata.xml b/media-libs/icclib/metadata.xml
index 173bc3668b4..7cec9df393f 100644
--- a/media-libs/icclib/metadata.xml
+++ b/media-libs/icclib/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>graphics</herd>
- <herd>printing</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<upstream>
<remote-id type="freecode">icclib</remote-id>
</upstream>
diff --git a/media-libs/id3lib/metadata.xml b/media-libs/id3lib/metadata.xml
index df6eee6a10e..11160062084 100644
--- a/media-libs/id3lib/metadata.xml
+++ b/media-libs/id3lib/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">id3lib</remote-id>
</upstream>
diff --git a/media-libs/ilmbase/metadata.xml b/media-libs/ilmbase/metadata.xml
index edccfe5754d..b0a2b2c16e0 100644
--- a/media-libs/ilmbase/metadata.xml
+++ b/media-libs/ilmbase/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-libs/imlib/metadata.xml b/media-libs/imlib/metadata.xml
index e770d1bc9a9..626f3a5a722 100644
--- a/media-libs/imlib/metadata.xml
+++ b/media-libs/imlib/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>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index ce816adda01..8b6df87369c 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>enlightenment</herd>
+<maintainer>
+ <email>enlightenment@gentoo.org</email>
+ <name>Project Enlightenment</name>
+</maintainer>
<longdescription>
Imlib 2 is the successor to Imlib. It is not just a newer version - it is a
completely new library. Imlib2 can be installed alongside Imlib 1.x without any
diff --git a/media-libs/jasper/metadata.xml b/media-libs/jasper/metadata.xml
index 897aa2e6b59..721f543292b 100644
--- a/media-libs/jasper/metadata.xml
+++ b/media-libs/jasper/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>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/jbig2dec/metadata.xml b/media-libs/jbig2dec/metadata.xml
index 6a8762ea260..530b5c85233 100644
--- a/media-libs/jbig2dec/metadata.xml
+++ b/media-libs/jbig2dec/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>graphics</herd>
- <herd>printing</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">jbig2dec</remote-id>
</upstream>
diff --git a/media-libs/jbigkit/metadata.xml b/media-libs/jbigkit/metadata.xml
index 8a08fd3f9e1..c6acfc421c4 100644
--- a/media-libs/jbigkit/metadata.xml
+++ b/media-libs/jbigkit/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription lang="en">Provides a library implementing a
highly effective data compression algorithm for bi-level
high-resolution images such as fax pages or scanned documents.
diff --git a/media-libs/jpeg/metadata.xml b/media-libs/jpeg/metadata.xml
index e770d1bc9a9..626f3a5a722 100644
--- a/media-libs/jpeg/metadata.xml
+++ b/media-libs/jpeg/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>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/kvazaar/metadata.xml b/media-libs/kvazaar/metadata.xml
index b0301965a08..8d1ee8b922f 100644
--- a/media-libs/kvazaar/metadata.xml
+++ b/media-libs/kvazaar/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-libs/ladspa-cmt/metadata.xml b/media-libs/ladspa-cmt/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-libs/ladspa-cmt/metadata.xml
+++ b/media-libs/ladspa-cmt/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/ladspa-sdk/metadata.xml b/media-libs/ladspa-sdk/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-libs/ladspa-sdk/metadata.xml
+++ b/media-libs/ladspa-sdk/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/lasi/metadata.xml b/media-libs/lasi/metadata.xml
index 01ee798826c..81370e8f864 100644
--- a/media-libs/lasi/metadata.xml
+++ b/media-libs/lasi/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>sci</herd>
- <herd>graphics</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription lang="en">
libLASi is a library written by Larry Siden that provides a C++
stream output interface for creating Postscript documents that can
diff --git a/media-libs/lastfmlib/metadata.xml b/media-libs/lastfmlib/metadata.xml
index 17f241ddb54..3b140a4dbca 100644
--- a/media-libs/lastfmlib/metadata.xml
+++ b/media-libs/lastfmlib/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>sound</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>dirk.vdb@gmail.com</email>
<name>Dirk Vanden Boer</name>
<description>Proxy maintainer and upstream developer. Please CC him on bugs</description>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/media-libs/lcms/metadata.xml b/media-libs/lcms/metadata.xml
index 65b8a18eb02..3cb99eb09b6 100644
--- a/media-libs/lcms/metadata.xml
+++ b/media-libs/lcms/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>printing</herd>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">lcms</remote-id>
</upstream>
diff --git a/media-libs/lensfun/metadata.xml b/media-libs/lensfun/metadata.xml
index 007927e3fe5..314fbfa6683 100644
--- a/media-libs/lensfun/metadata.xml
+++ b/media-libs/lensfun/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription lang="en">
The project provides a database of photographic lenses and a library that allows advanced access to the database including functions to correct images based on intimate knowledge of lens characteristics and calibration data.
</longdescription>
diff --git a/media-libs/lib3ds/metadata.xml b/media-libs/lib3ds/metadata.xml
index 6dd50faab98..c8d43d04c1b 100644
--- a/media-libs/lib3ds/metadata.xml
+++ b/media-libs/lib3ds/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>games</herd>
-<herd>3dprint</herd>
<maintainer>
<email>amynka@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
+<maintainer>
+ <email>3dprint@gentoo.org</email>
+ <name>Gentoo 3D print</name>
+</maintainer>
<longdescription>
lib3ds is an overall software library for managing 3D-Studio Release 3 and 4 ".3DS" files.
</longdescription>
diff --git a/media-libs/libaacplus/metadata.xml b/media-libs/libaacplus/metadata.xml
index 3bf6bcfeb51..798a87bd625 100644
--- a/media-libs/libaacplus/metadata.xml
+++ b/media-libs/libaacplus/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libaacs/metadata.xml b/media-libs/libaacs/metadata.xml
index d9df1878d8e..654fb394806 100644
--- a/media-libs/libaacs/metadata.xml
+++ b/media-libs/libaacs/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-libs/libafterimage/metadata.xml b/media-libs/libafterimage/metadata.xml
index 1aeaad41901..c4c0c0ba01a 100644
--- a/media-libs/libafterimage/metadata.xml
+++ b/media-libs/libafterimage/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>sci-physics</herd>
+<maintainer>
+ <email>sci-physics@gentoo.org</email>
+ <name>Gentoo Physics Project</name>
+</maintainer>
<longdescription lang="en">
libAfterImage is a generic image manipulation library.
It was initially implemented to address AfterStep Window Manager's needs for
diff --git a/media-libs/libao/metadata.xml b/media-libs/libao/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/libao/metadata.xml
+++ b/media-libs/libao/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libart_lgpl/metadata.xml b/media-libs/libart_lgpl/metadata.xml
index da6fd63d008..fe3dc94b2bc 100644
--- a/media-libs/libart_lgpl/metadata.xml
+++ b/media-libs/libart_lgpl/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>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libass/metadata.xml b/media-libs/libass/metadata.xml
index 511cf814fe9..99f6ab0992f 100644
--- a/media-libs/libass/metadata.xml
+++ b/media-libs/libass/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-libs/libbdplus/metadata.xml b/media-libs/libbdplus/metadata.xml
index 20932a6cfad..6061616f99f 100644
--- a/media-libs/libbdplus/metadata.xml
+++ b/media-libs/libbdplus/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="aacs">Add support for decryption of AACS</flag>
</use>
diff --git a/media-libs/libbluray/metadata.xml b/media-libs/libbluray/metadata.xml
index 1137d0514c8..9e63922ab7b 100644
--- a/media-libs/libbluray/metadata.xml
+++ b/media-libs/libbluray/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="aacs">Add support for decryption of AACS</flag>
<flag name="bdplus">Use <pkg>media-libs/libbdplus</pkg> for BD+ decryption</flag>
diff --git a/media-libs/libbs2b/metadata.xml b/media-libs/libbs2b/metadata.xml
index 9ecb53a9d80..7db3740009b 100644
--- a/media-libs/libbs2b/metadata.xml
+++ b/media-libs/libbs2b/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">bs2b</remote-id>
</upstream>
diff --git a/media-libs/libcaca/metadata.xml b/media-libs/libcaca/metadata.xml
index edccfe5754d..b0a2b2c16e0 100644
--- a/media-libs/libcaca/metadata.xml
+++ b/media-libs/libcaca/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-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml
index 048af1d3ead..4df161fa8c8 100644
--- a/media-libs/libcanberra/metadata.xml
+++ b/media-libs/libcanberra/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <herd>sound</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>
A small and lightweight implementation of the XDG Sound Theme Specification
(http://0pointer.de/public/sound-theme-spec.html)
diff --git a/media-libs/libcdaudio/metadata.xml b/media-libs/libcdaudio/metadata.xml
index 385a5882ed4..92c77b54cad 100644
--- a/media-libs/libcdaudio/metadata.xml
+++ b/media-libs/libcdaudio/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libcdaudio</remote-id>
</upstream>
diff --git a/media-libs/libcddb/metadata.xml b/media-libs/libcddb/metadata.xml
index 9cbe1d82af9..1e1dad1e3bb 100644
--- a/media-libs/libcddb/metadata.xml
+++ b/media-libs/libcddb/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libcddb</remote-id>
</upstream>
diff --git a/media-libs/libcdr/metadata.xml b/media-libs/libcdr/metadata.xml
index b373b8b4412..1ce2220fcf6 100644
--- a/media-libs/libcdr/metadata.xml
+++ b/media-libs/libcdr/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libchamplain/metadata.xml b/media-libs/libchamplain/metadata.xml
index dad9001338d..d27adefecf3 100644
--- a/media-libs/libchamplain/metadata.xml
+++ b/media-libs/libchamplain/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>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libclalsadrv/metadata.xml b/media-libs/libclalsadrv/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/libclalsadrv/metadata.xml
+++ b/media-libs/libclalsadrv/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libclastfm/metadata.xml b/media-libs/libclastfm/metadata.xml
index 48da25009c3..d12adc99163 100644
--- a/media-libs/libclastfm/metadata.xml
+++ b/media-libs/libclastfm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">liblastfm</remote-id>
</upstream>
diff --git a/media-libs/libclthreads/metadata.xml b/media-libs/libclthreads/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/libclthreads/metadata.xml
+++ b/media-libs/libclthreads/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libclxclient/metadata.xml b/media-libs/libclxclient/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/libclxclient/metadata.xml
+++ b/media-libs/libclxclient/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libcue/metadata.xml b/media-libs/libcue/metadata.xml
index b70536994b6..195568a5c6e 100644
--- a/media-libs/libcue/metadata.xml
+++ b/media-libs/libcue/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libcue</remote-id>
</upstream>
diff --git a/media-libs/libcuefile/metadata.xml b/media-libs/libcuefile/metadata.xml
index ae573a60407..f0d550a9b30 100644
--- a/media-libs/libcuefile/metadata.xml
+++ b/media-libs/libcuefile/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libdc1394/metadata.xml b/media-libs/libdc1394/metadata.xml
index 0ad59fcffb3..8df5f86e341 100644
--- a/media-libs/libdc1394/metadata.xml
+++ b/media-libs/libdc1394/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-libs/libdca/metadata.xml b/media-libs/libdca/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/libdca/metadata.xml
+++ b/media-libs/libdca/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libde265/metadata.xml b/media-libs/libde265/metadata.xml
index dba98e6d2a8..df6b03a4cd3 100644
--- a/media-libs/libde265/metadata.xml
+++ b/media-libs/libde265/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>dlan@gentoo.org</email>
<name>Yixun Lan</name>
diff --git a/media-libs/libdiscid/metadata.xml b/media-libs/libdiscid/metadata.xml
index 22b5b2dc709..80ca3d3cae7 100644
--- a/media-libs/libdiscid/metadata.xml
+++ b/media-libs/libdiscid/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>libdiscid is a C library for creating MusicBrainz DiscIDs
from audio CDs. It reads a CD's table of contents (TOC) and generates an
identifier which can be used to lookup the CD at MusicBrainz.
diff --git a/media-libs/libdmtx/metadata.xml b/media-libs/libdmtx/metadata.xml
index d081f5e429f..58a91603c30 100644
--- a/media-libs/libdmtx/metadata.xml
+++ b/media-libs/libdmtx/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libdmtx</remote-id>
</upstream>
diff --git a/media-libs/libdv/metadata.xml b/media-libs/libdv/metadata.xml
index dbae49788e6..85cbce87382 100644
--- a/media-libs/libdv/metadata.xml
+++ b/media-libs/libdv/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-libs/libdvb/metadata.xml b/media-libs/libdvb/metadata.xml
index a6b9e38a1b9..097975e3adc 100644
--- a/media-libs/libdvb/metadata.xml
+++ b/media-libs/libdvb/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-libs/libdvbpsi/metadata.xml b/media-libs/libdvbpsi/metadata.xml
index 2677d846fc4..ef7ee8a8266 100644
--- a/media-libs/libdvbpsi/metadata.xml
+++ b/media-libs/libdvbpsi/metadata.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>media-tv</herd>
<maintainer><email>lordvan@gentoo.org</email></maintainer>
</pkgmetadata>
diff --git a/media-libs/libdvdcss/metadata.xml b/media-libs/libdvdcss/metadata.xml
index edccfe5754d..b0a2b2c16e0 100644
--- a/media-libs/libdvdcss/metadata.xml
+++ b/media-libs/libdvdcss/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-libs/libdvdnav/metadata.xml b/media-libs/libdvdnav/metadata.xml
index 1cadc2e4ec2..ef86e0c272b 100644
--- a/media-libs/libdvdnav/metadata.xml
+++ b/media-libs/libdvdnav/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-libs/libdvdplay/metadata.xml b/media-libs/libdvdplay/metadata.xml
index edccfe5754d..b0a2b2c16e0 100644
--- a/media-libs/libdvdplay/metadata.xml
+++ b/media-libs/libdvdplay/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-libs/libdvdread/metadata.xml b/media-libs/libdvdread/metadata.xml
index 1cadc2e4ec2..ef86e0c272b 100644
--- a/media-libs/libdvdread/metadata.xml
+++ b/media-libs/libdvdread/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-libs/libechonest/metadata.xml b/media-libs/libechonest/metadata.xml
index ff73030e040..6b0210f2d3b 100644
--- a/media-libs/libechonest/metadata.xml
+++ b/media-libs/libechonest/metadata.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
@@ -11,4 +9,12 @@
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libepoxy/metadata.xml b/media-libs/libepoxy/metadata.xml
index 8f185a37f13..92bb455edb4 100644
--- a/media-libs/libepoxy/metadata.xml
+++ b/media-libs/libepoxy/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>x11</herd>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<upstream>
<remote-id type="github">anholt/libepoxy</remote-id>
</upstream>
diff --git a/media-libs/libexif-gtk/metadata.xml b/media-libs/libexif-gtk/metadata.xml
index 5c7a0372083..c6b9f470221 100644
--- a/media-libs/libexif-gtk/metadata.xml
+++ b/media-libs/libexif-gtk/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libexif</remote-id>
</upstream>
diff --git a/media-libs/libexif/metadata.xml b/media-libs/libexif/metadata.xml
index 59b180fa99e..d8a8342b8c9 100644
--- a/media-libs/libexif/metadata.xml
+++ b/media-libs/libexif/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libexif</remote-id>
</upstream>
diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
index 421725e0514..7e4a2ebe08b 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/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>net-p2p</herd>
<maintainer>
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
diff --git a/media-libs/libfame/metadata.xml b/media-libs/libfame/metadata.xml
index 2fbced3903f..63aa8a10f21 100644
--- a/media-libs/libfame/metadata.xml
+++ b/media-libs/libfame/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-libs/libfishsound/metadata.xml b/media-libs/libfishsound/metadata.xml
index 3bf6bcfeb51..798a87bd625 100644
--- a/media-libs/libfishsound/metadata.xml
+++ b/media-libs/libfishsound/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libfpx/metadata.xml b/media-libs/libfpx/metadata.xml
index 9be90a25897..fad04a0b0ae 100644
--- a/media-libs/libfpx/metadata.xml
+++ b/media-libs/libfpx/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>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libfreehand/metadata.xml b/media-libs/libfreehand/metadata.xml
index b373b8b4412..1ce2220fcf6 100644
--- a/media-libs/libfreehand/metadata.xml
+++ b/media-libs/libfreehand/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libggi/metadata.xml b/media-libs/libggi/metadata.xml
index 55a6e7af8ea..d9fc536f1ad 100644
--- a/media-libs/libggi/metadata.xml
+++ b/media-libs/libggi/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-libs/libggigcp/metadata.xml b/media-libs/libggigcp/metadata.xml
index 4428fc21529..2d2ed1eb349 100644
--- a/media-libs/libggigcp/metadata.xml
+++ b/media-libs/libggigcp/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-libs/libggimisc/metadata.xml b/media-libs/libggimisc/metadata.xml
index 4428fc21529..2d2ed1eb349 100644
--- a/media-libs/libggimisc/metadata.xml
+++ b/media-libs/libggimisc/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-libs/libggiwmh/metadata.xml b/media-libs/libggiwmh/metadata.xml
index 4428fc21529..2d2ed1eb349 100644
--- a/media-libs/libggiwmh/metadata.xml
+++ b/media-libs/libggiwmh/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-libs/libgig/metadata.xml b/media-libs/libgig/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/libgig/metadata.xml
+++ b/media-libs/libgig/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libgii/metadata.xml b/media-libs/libgii/metadata.xml
index 4428fc21529..2d2ed1eb349 100644
--- a/media-libs/libgii/metadata.xml
+++ b/media-libs/libgii/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-libs/libgltf/metadata.xml b/media-libs/libgltf/metadata.xml
index b373b8b4412..1ce2220fcf6 100644
--- a/media-libs/libgltf/metadata.xml
+++ b/media-libs/libgltf/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libgphoto2/metadata.xml b/media-libs/libgphoto2/metadata.xml
index f0ad460eebf..36da28650c4 100644
--- a/media-libs/libgphoto2/metadata.xml
+++ b/media-libs/libgphoto2/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <herd>graphics</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="serial">Enable serial port support</flag>
</use>
diff --git a/media-libs/libgpod/metadata.xml b/media-libs/libgpod/metadata.xml
index 0ec33c7f18e..8e98659c8e4 100644
--- a/media-libs/libgpod/metadata.xml
+++ b/media-libs/libgpod/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>pda</herd>
<longdescription lang="en">
libgpod is a shared library to access the contents of an iPod. This
library is based on code used in the gtkpod project.
diff --git a/media-libs/libgroove/metadata.xml b/media-libs/libgroove/metadata.xml
index da18ef76799..8d100df97e0 100644
--- a/media-libs/libgroove/metadata.xml
+++ b/media-libs/libgroove/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>sir.suriv@gmail.com</email>
<name>Diogo Pereira</name>
<description>Proxy maintainer. Assign bugs to him.</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
This library provides decoding and encoding of audio on a playlist. It is intended to be used as a backend for music player applications. That said, it is also generic enough to be used as a backend for any streaming audio processing utility.
</longdescription>
diff --git a/media-libs/libharu/metadata.xml b/media-libs/libharu/metadata.xml
index 638ccc8b792..82538a4a9bb 100644
--- a/media-libs/libharu/metadata.xml
+++ b/media-libs/libharu/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>sci</herd>
- <herd>graphics</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription lang="en">
Haru PDF library is a ANSI/C library for generating PDF files.
It supports the following features:
diff --git a/media-libs/libicns/metadata.xml b/media-libs/libicns/metadata.xml
index f59bd2ed590..b3594951f99 100644
--- a/media-libs/libicns/metadata.xml
+++ b/media-libs/libicns/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">icns</remote-id>
</upstream>
diff --git a/media-libs/libid3tag/metadata.xml b/media-libs/libid3tag/metadata.xml
index 315b2eb6f52..eb6c750caeb 100644
--- a/media-libs/libid3tag/metadata.xml
+++ b/media-libs/libid3tag/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mad</remote-id>
</upstream>
diff --git a/media-libs/libiec61883/metadata.xml b/media-libs/libiec61883/metadata.xml
index 6d0be58b7c4..5eedb99f140 100644
--- a/media-libs/libiec61883/metadata.xml
+++ b/media-libs/libiec61883/metadata.xml
@@ -1,13 +1,16 @@
<?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>
<description>Main maintainer for this is the herd, please CC on
bugs.</description>
</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+</maintainer>
<longdescription lang="en">
This library provides third generation media reception and transmission for DV,
MPEG2-TS, and AMDTP (audio and music) using only raw1394 and not the complicated
diff --git a/media-libs/libifp/metadata.xml b/media-libs/libifp/metadata.xml
index 74257d7e3e8..35be62e6693 100644
--- a/media-libs/libifp/metadata.xml
+++ b/media-libs/libifp/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">ifp-driver</remote-id>
</upstream>
diff --git a/media-libs/libilbc/metadata.xml b/media-libs/libilbc/metadata.xml
index 7e328c94781..009400873a5 100644
--- a/media-libs/libilbc/metadata.xml
+++ b/media-libs/libilbc/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription lang="en">iLBC BSD implementation from WebRTC</longdescription>
<upstream>
<remote-id type="github">dekkers/libilbc</remote-id>
diff --git a/media-libs/libjackasyn/metadata.xml b/media-libs/libjackasyn/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-libs/libjackasyn/metadata.xml
+++ b/media-libs/libjackasyn/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libjpeg-turbo/metadata.xml b/media-libs/libjpeg-turbo/metadata.xml
index 0ca0b0e3817..3e29a3ebedf 100644
--- a/media-libs/libjpeg-turbo/metadata.xml
+++ b/media-libs/libjpeg-turbo/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>graphics</herd>
<maintainer>
<email>ssuominen@gentoo.org</email>
<name>Samuli Suominen</name>
@@ -10,6 +9,10 @@
<email>anarchy@gentoo.org</email>
<name>Jory A. Pratt</name>
</maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libjpeg-turbo</remote-id>
</upstream>
diff --git a/media-libs/libjsw/metadata.xml b/media-libs/libjsw/metadata.xml
index a57a2b83923..b140296e61c 100644
--- a/media-libs/libjsw/metadata.xml
+++ b/media-libs/libjsw/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<upstream>
<remote-id type="freshmeat">libjsw</remote-id>
</upstream>
diff --git a/media-libs/libkarma/metadata.xml b/media-libs/libkarma/metadata.xml
index dd3b4caeeb0..8f97b438e7f 100644
--- a/media-libs/libkarma/metadata.xml
+++ b/media-libs/libkarma/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>dotnet</herd>
- <herd>sound</herd>
+ <maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libkate/metadata.xml b/media-libs/libkate/metadata.xml
index 479ab999d31..bbe9c24f993 100644
--- a/media-libs/libkate/metadata.xml
+++ b/media-libs/libkate/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">Kate is a codec for karaoke and text encapsulation for Ogg. Most of the
time, this would be multiplexed with audio/video to carry subtitles,
song lyrics (with or without karaoke data), etc, but doesn't have to be.
diff --git a/media-libs/liblastfm/metadata.xml b/media-libs/liblastfm/metadata.xml
index c33c1c76a31..2e766e22e11 100644
--- a/media-libs/liblastfm/metadata.xml
+++ b/media-libs/liblastfm/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="fingerprint">Build the lastfm-fingerprint library</flag>
</use>
diff --git a/media-libs/liblingoteach/metadata.xml b/media-libs/liblingoteach/metadata.xml
index 8506b03f6bd..11c66a851fc 100644
--- a/media-libs/liblingoteach/metadata.xml
+++ b/media-libs/liblingoteach/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">lingoteach</remote-id>
</upstream>
diff --git a/media-libs/liblo/metadata.xml b/media-libs/liblo/metadata.xml
index 2d400e11954..d4e9f81e998 100644
--- a/media-libs/liblo/metadata.xml
+++ b/media-libs/liblo/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>liblo is an implementation of the Open Sound Control protocol for POSIX systems, started by Steve Harris.</longdescription>
<upstream>
<remote-id type="sourceforge">liblo</remote-id>
diff --git a/media-libs/liblrdf/metadata.xml b/media-libs/liblrdf/metadata.xml
index 7bbcd54ed8d..0fad5caefa7 100644
--- a/media-libs/liblrdf/metadata.xml
+++ b/media-libs/liblrdf/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="github">swh/LRDF</remote-id>
</upstream>
diff --git a/media-libs/liblscp/metadata.xml b/media-libs/liblscp/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/liblscp/metadata.xml
+++ b/media-libs/liblscp/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libmad/metadata.xml b/media-libs/libmad/metadata.xml
index 315b2eb6f52..eb6c750caeb 100644
--- a/media-libs/libmad/metadata.xml
+++ b/media-libs/libmad/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mad</remote-id>
</upstream>
diff --git a/media-libs/libmatroska/metadata.xml b/media-libs/libmatroska/metadata.xml
index 5effe57bd8d..d7e88cb8b00 100644
--- a/media-libs/libmatroska/metadata.xml
+++ b/media-libs/libmatroska/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-libs/libmediaart/metadata.xml b/media-libs/libmediaart/metadata.xml
index defff19a494..4b41c89a546 100644
--- a/media-libs/libmediaart/metadata.xml
+++ b/media-libs/libmediaart/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>
<upstream>
<remote-id type="github">GNOME/libmediaart</remote-id>
</upstream>
diff --git a/media-libs/libmediainfo/metadata.xml b/media-libs/libmediainfo/metadata.xml
index 7cc6e853bec..0557507d5f0 100644
--- a/media-libs/libmediainfo/metadata.xml
+++ b/media-libs/libmediainfo/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-libs/libmikmod/metadata.xml b/media-libs/libmikmod/metadata.xml
index b8626644078..a382cc1d7e6 100644
--- a/media-libs/libmikmod/metadata.xml
+++ b/media-libs/libmikmod/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mikmod</remote-id>
</upstream>
diff --git a/media-libs/libmms/metadata.xml b/media-libs/libmms/metadata.xml
index 5ed47c25663..896c7ad4710 100644
--- a/media-libs/libmms/metadata.xml
+++ b/media-libs/libmms/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-libs/libmng/metadata.xml b/media-libs/libmng/metadata.xml
index e0d457ab7df..d7a189ad613 100644
--- a/media-libs/libmng/metadata.xml
+++ b/media-libs/libmng/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libmng</remote-id>
</upstream>
diff --git a/media-libs/libmodplug/metadata.xml b/media-libs/libmodplug/metadata.xml
index 60a7ab7a3a5..d42accb4c01 100644
--- a/media-libs/libmodplug/metadata.xml
+++ b/media-libs/libmodplug/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">modplug-xmms</remote-id>
</upstream>
diff --git a/media-libs/libmp3splt/metadata.xml b/media-libs/libmp3splt/metadata.xml
index 33770ad622d..7155422f134 100644
--- a/media-libs/libmp3splt/metadata.xml
+++ b/media-libs/libmp3splt/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mp3splt</remote-id>
</upstream>
diff --git a/media-libs/libmp4v2/metadata.xml b/media-libs/libmp4v2/metadata.xml
index 2dbc62f1814..c908cc89467 100644
--- a/media-libs/libmp4v2/metadata.xml
+++ b/media-libs/libmp4v2/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="utils">Install command-line utilities</flag>
</use>
diff --git a/media-libs/libmpd/metadata.xml b/media-libs/libmpd/metadata.xml
index e9f44e43815..b935d1ba340 100644
--- a/media-libs/libmpd/metadata.xml
+++ b/media-libs/libmpd/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>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
<longdescription>A library handling connection to a MPD server.</longdescription>
</pkgmetadata>
diff --git a/media-libs/libmpdclient/metadata.xml b/media-libs/libmpdclient/metadata.xml
index f939777e6a3..2fa6e9be702 100644
--- a/media-libs/libmpdclient/metadata.xml
+++ b/media-libs/libmpdclient/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libmpeg2/metadata.xml b/media-libs/libmpeg2/metadata.xml
index 3086b17ad2c..d1e2cc29bd1 100644
--- a/media-libs/libmpeg2/metadata.xml
+++ b/media-libs/libmpeg2/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-libs/libmpeg3/metadata.xml b/media-libs/libmpeg3/metadata.xml
index 27f31563080..93d0965ebb5 100644
--- a/media-libs/libmpeg3/metadata.xml
+++ b/media-libs/libmpeg3/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-libs/libmtp/metadata.xml b/media-libs/libmtp/metadata.xml
index 8e741341963..d5b5c29942f 100644
--- a/media-libs/libmtp/metadata.xml
+++ b/media-libs/libmtp/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libmtp</remote-id>
</upstream>
diff --git a/media-libs/libmygpo-qt/metadata.xml b/media-libs/libmygpo-qt/metadata.xml
index 121c9aab070..492fe965721 100644
--- a/media-libs/libmygpo-qt/metadata.xml
+++ b/media-libs/libmygpo-qt/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <herd>sound</herd>
<maintainer>
<email>nikoli@gmx.us</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="github">gpodder/libmygpo-qt</remote-id>
</upstream>
diff --git a/media-libs/libnjb/metadata.xml b/media-libs/libnjb/metadata.xml
index 6a6641a7fe2..9a3d9c3a374 100644
--- a/media-libs/libnjb/metadata.xml
+++ b/media-libs/libnjb/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libnjb</remote-id>
</upstream>
diff --git a/media-libs/libnut/metadata.xml b/media-libs/libnut/metadata.xml
index 42cce5e3e85..cbe4c9e85b5 100644
--- a/media-libs/libnut/metadata.xml
+++ b/media-libs/libnut/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-libs/libofa/metadata.xml b/media-libs/libofa/metadata.xml
index 1f84290ed17..67d39d3f2a6 100644
--- a/media-libs/libofa/metadata.xml
+++ b/media-libs/libofa/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">musicip-libofa</remote-id>
</upstream>
diff --git a/media-libs/libogg/metadata.xml b/media-libs/libogg/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/libogg/metadata.xml
+++ b/media-libs/libogg/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/liboggz/metadata.xml b/media-libs/liboggz/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/liboggz/metadata.xml
+++ b/media-libs/liboggz/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libomxil-bellagio/metadata.xml b/media-libs/libomxil-bellagio/metadata.xml
index 81ed2f2df46..d2997d3cdd8 100644
--- a/media-libs/libomxil-bellagio/metadata.xml
+++ b/media-libs/libomxil-bellagio/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>x11</herd>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<use>
<flag name="audioeffects">enable audio volume/mixer effects components</flag>
<flag name="clocksrc">enable clock component</flag>
diff --git a/media-libs/libopendaap/metadata.xml b/media-libs/libopendaap/metadata.xml
index aa0f3664825..097975e3adc 100644
--- a/media-libs/libopendaap/metadata.xml
+++ b/media-libs/libopendaap/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>net-p2p</herd>
</pkgmetadata>
diff --git a/media-libs/libopenraw/metadata.xml b/media-libs/libopenraw/metadata.xml
index 8c868061b73..ed32dba4140 100644
--- a/media-libs/libopenraw/metadata.xml
+++ b/media-libs/libopenraw/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>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/media-libs/libpagemaker/metadata.xml b/media-libs/libpagemaker/metadata.xml
index eb4b372590c..26686eeba12 100644
--- a/media-libs/libpagemaker/metadata.xml
+++ b/media-libs/libpagemaker/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<use>
<flag name="tools">Build build tools</flag>
</use>
diff --git a/media-libs/libpano13/metadata.xml b/media-libs/libpano13/metadata.xml
index 9530e85e3df..aa05ebc59ab 100644
--- a/media-libs/libpano13/metadata.xml
+++ b/media-libs/libpano13/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">panotools</remote-id>
</upstream>
diff --git a/media-libs/libpgf/metadata.xml b/media-libs/libpgf/metadata.xml
index 9be90a25897..fad04a0b0ae 100644
--- a/media-libs/libpgf/metadata.xml
+++ b/media-libs/libpgf/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>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libpng/metadata.xml b/media-libs/libpng/metadata.xml
index 4cbaf67478f..cd4cdbff624 100644
--- a/media-libs/libpng/metadata.xml
+++ b/media-libs/libpng/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>base-system</herd>
+ <maintainer>
+ <email>base-system@gentoo.org</email>
+ <name>Gentoo Base System</name>
+ </maintainer>
<use>
<flag name="apng">support unofficial APNG (Animated PNG) spec</flag>
</use>
diff --git a/media-libs/libpostproc/metadata.xml b/media-libs/libpostproc/metadata.xml
index 4d39c3c2955..456e61fcfdc 100644
--- a/media-libs/libpostproc/metadata.xml
+++ b/media-libs/libpostproc/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-libs/libpqstego/metadata.xml b/media-libs/libpqstego/metadata.xml
index 6183a8f271b..f7cb4005200 100644
--- a/media-libs/libpqstego/metadata.xml
+++ b/media-libs/libpqstego/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pqstego</remote-id>
</upstream>
diff --git a/media-libs/libprojectm-qt/metadata.xml b/media-libs/libprojectm-qt/metadata.xml
index 2ace5da1910..24c142d93fa 100644
--- a/media-libs/libprojectm-qt/metadata.xml
+++ b/media-libs/libprojectm-qt/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">projectm</remote-id>
</upstream>
diff --git a/media-libs/libprojectm/metadata.xml b/media-libs/libprojectm/metadata.xml
index 2ace5da1910..24c142d93fa 100644
--- a/media-libs/libprojectm/metadata.xml
+++ b/media-libs/libprojectm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">projectm</remote-id>
</upstream>
diff --git a/media-libs/libquicktime/metadata.xml b/media-libs/libquicktime/metadata.xml
index b161cd86186..013ff226e92 100644
--- a/media-libs/libquicktime/metadata.xml
+++ b/media-libs/libquicktime/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-libs/libquvi-scripts/metadata.xml b/media-libs/libquvi-scripts/metadata.xml
index 7c06664547c..87e31fb6919 100644
--- a/media-libs/libquvi-scripts/metadata.xml
+++ b/media-libs/libquvi-scripts/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">quvi</remote-id>
</upstream>
diff --git a/media-libs/libquvi/metadata.xml b/media-libs/libquvi/metadata.xml
index 7c06664547c..87e31fb6919 100644
--- a/media-libs/libquvi/metadata.xml
+++ b/media-libs/libquvi/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">quvi</remote-id>
</upstream>
diff --git a/media-libs/libraw/metadata.xml b/media-libs/libraw/metadata.xml
index d66c6b2bece..e76f2081d7b 100644
--- a/media-libs/libraw/metadata.xml
+++ b/media-libs/libraw/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="demosaic">Enable support for external interpolation algorithms</flag>
</use>
diff --git a/media-libs/libreplaygain/metadata.xml b/media-libs/libreplaygain/metadata.xml
index ae573a60407..f0d550a9b30 100644
--- a/media-libs/libreplaygain/metadata.xml
+++ b/media-libs/libreplaygain/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libsamplerate/metadata.xml b/media-libs/libsamplerate/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/libsamplerate/metadata.xml
+++ b/media-libs/libsamplerate/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libsbsms/metadata.xml b/media-libs/libsbsms/metadata.xml
index 8b48dd28506..6445de5c6c8 100644
--- a/media-libs/libsbsms/metadata.xml
+++ b/media-libs/libsbsms/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">sbsms</remote-id>
</upstream>
diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml
index 32c5821fcc2..3c10912d716 100644
--- a/media-libs/libsdl/metadata.xml
+++ b/media-libs/libsdl/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<longdescription>
Simple DirectMedia Layer is a cross-platform multimedia library designed
to provide low level access to audio, keyboard, mouse, joystick, 3D
diff --git a/media-libs/libsdl2/metadata.xml b/media-libs/libsdl2/metadata.xml
index 008e512a52c..a1813fb517b 100644
--- a/media-libs/libsdl2/metadata.xml
+++ b/media-libs/libsdl2/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<longdescription>
Simple DirectMedia Layer is a cross-platform multimedia library
designed to provide low level access to audio, keyboard, mouse,
diff --git a/media-libs/libshout/metadata.xml b/media-libs/libshout/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/libshout/metadata.xml
+++ b/media-libs/libshout/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libsidplayfp/metadata.xml b/media-libs/libsidplayfp/metadata.xml
index 8c08b7258ee..90aa617a4a6 100644
--- a/media-libs/libsidplayfp/metadata.xml
+++ b/media-libs/libsidplayfp/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">sidplay-residfp</remote-id>
</upstream>
diff --git a/media-libs/libsmf/metadata.xml b/media-libs/libsmf/metadata.xml
index d3093c51f3e..4351f4903ca 100644
--- a/media-libs/libsmf/metadata.xml
+++ b/media-libs/libsmf/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libsmf</remote-id>
</upstream>
diff --git a/media-libs/libsndfile/metadata.xml b/media-libs/libsndfile/metadata.xml
index 3bf6bcfeb51..798a87bd625 100644
--- a/media-libs/libsndfile/metadata.xml
+++ b/media-libs/libsndfile/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libsoundio/metadata.xml b/media-libs/libsoundio/metadata.xml
index c6026bf4e06..903fe85387f 100644
--- a/media-libs/libsoundio/metadata.xml
+++ b/media-libs/libsoundio/metadata.xml
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>sir.suriv@gmail.com</email>
<name>Diogo Pereira</name>
<description>Proxy maintainer. Assign bugs to him.</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
C99 library providing cross-platform audio input and output. The API is
suitable for real-time software such as digital audio workstations as
diff --git a/media-libs/libsoundtouch/metadata.xml b/media-libs/libsoundtouch/metadata.xml
index ae573a60407..f0d550a9b30 100644
--- a/media-libs/libsoundtouch/metadata.xml
+++ b/media-libs/libsoundtouch/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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libsvg/metadata.xml b/media-libs/libsvg/metadata.xml
index 9be90a25897..fad04a0b0ae 100644
--- a/media-libs/libsvg/metadata.xml
+++ b/media-libs/libsvg/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>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/libtaginfo/metadata.xml b/media-libs/libtaginfo/metadata.xml
index 2b3b4e4e3fa..6e49a8b31da 100644
--- a/media-libs/libtaginfo/metadata.xml
+++ b/media-libs/libtaginfo/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="bitbucket">shuerhaaken/libtaginfo</remote-id>
</upstream>
diff --git a/media-libs/libtheora/metadata.xml b/media-libs/libtheora/metadata.xml
index 1cadc2e4ec2..ef86e0c272b 100644
--- a/media-libs/libtheora/metadata.xml
+++ b/media-libs/libtheora/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-libs/libtiger/metadata.xml b/media-libs/libtiger/metadata.xml
index f8d4166ac6f..a41b90d85ab 100644
--- a/media-libs/libtiger/metadata.xml
+++ b/media-libs/libtiger/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">libtiger is a rendering library for Kate streams using Pango and Cairo.
More information about Kate streams may be found at
http://wiki.xiph.org/index.php/OggKate</longdescription>
diff --git a/media-libs/libtimidity/metadata.xml b/media-libs/libtimidity/metadata.xml
index 9ec4f8c12db..e8e455339dd 100644
--- a/media-libs/libtimidity/metadata.xml
+++ b/media-libs/libtimidity/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libtimidity</remote-id>
</upstream>
diff --git a/media-libs/libtxc_dxtn/metadata.xml b/media-libs/libtxc_dxtn/metadata.xml
index 01c4c004e73..dd7d581be40 100644
--- a/media-libs/libtxc_dxtn/metadata.xml
+++ b/media-libs/libtxc_dxtn/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libuninameslist/metadata.xml b/media-libs/libuninameslist/metadata.xml
index d7c7c86a9ef..209c94908ae 100644
--- a/media-libs/libuninameslist/metadata.xml
+++ b/media-libs/libuninameslist/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>cjk</herd>
- <herd>fonts</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libuninameslist</remote-id>
</upstream>
diff --git a/media-libs/libv4l/metadata.xml b/media-libs/libv4l/metadata.xml
index 1bcf6b693d8..d41bca24b1f 100644
--- a/media-libs/libv4l/metadata.xml
+++ b/media-libs/libv4l/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
<maintainer>
<email>tetromino@gentoo.org</email>
<name>Alexandre Rostovtsev</name>
diff --git a/media-libs/libvisio/metadata.xml b/media-libs/libvisio/metadata.xml
index bbd6a9a94bf..471088e28a9 100644
--- a/media-libs/libvisio/metadata.xml
+++ b/media-libs/libvisio/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>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<use>
<flag name="tools">Build conversion tools</flag>
</use>
diff --git a/media-libs/libvisual/metadata.xml b/media-libs/libvisual/metadata.xml
index 1c16bbf70ae..77d67e18729 100644
--- a/media-libs/libvisual/metadata.xml
+++ b/media-libs/libvisual/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libvisual</remote-id>
</upstream>
diff --git a/media-libs/libvorbis/metadata.xml b/media-libs/libvorbis/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/libvorbis/metadata.xml
+++ b/media-libs/libvorbis/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/libvpx/metadata.xml b/media-libs/libvpx/metadata.xml
index 7f147f9aef7..ed218e1d752 100644
--- a/media-libs/libvpx/metadata.xml
+++ b/media-libs/libvpx/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>video</herd>
- <herd>chromium</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>chromium@gentoo.org</email>
+ <name>Chromium in Gentoo Project</name>
+ </maintainer>
<use>
<flag name="postproc">Enable additional post processing filters</flag>
</use>
diff --git a/media-libs/libwebp/metadata.xml b/media-libs/libwebp/metadata.xml
index bd8332629d5..f8bd140e32b 100644
--- a/media-libs/libwebp/metadata.xml
+++ b/media-libs/libwebp/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>graphics</herd>
- <herd>chromium</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+ <maintainer>
+ <email>chromium@gentoo.org</email>
+ <name>Chromium in Gentoo Project</name>
+ </maintainer>
<use>
<flag name="experimental">Build with -DWEBP_EXPERIMENTAL_FEATURES</flag>
<flag name="swap-16bit-csp">Enable byte swapping for 16 bit colorspace</flag>
diff --git a/media-libs/libxmi/metadata.xml b/media-libs/libxmi/metadata.xml
index d78e2cb3ed5..2992c40d523 100644
--- a/media-libs/libxmi/metadata.xml
+++ b/media-libs/libxmi/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>printing</herd>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<longdescription>
GNU libxmi is a C/C++ function library for rasterizing 2-D vector graphics. It
can draw 2-D graphical primitives, including wide polygonal lines and circular
diff --git a/media-libs/libxspf/metadata.xml b/media-libs/libxspf/metadata.xml
index 57004d18bdd..6bdf3d5ae77 100644
--- a/media-libs/libxspf/metadata.xml
+++ b/media-libs/libxspf/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription lang="en">
libxspf brings XSPF playlist reading and writing support to your C++
application. XSPF is an open XML format for sharing playlists.
diff --git a/media-libs/libxtract/metadata.xml b/media-libs/libxtract/metadata.xml
index 53685ee65c8..b52b1976782 100644
--- a/media-libs/libxtract/metadata.xml
+++ b/media-libs/libxtract/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">downloads/jamiebullock</remote-id>
</upstream>
diff --git a/media-libs/libyami/metadata.xml b/media-libs/libyami/metadata.xml
index 129f1d6b486..e5832c1d896 100644
--- a/media-libs/libyami/metadata.xml
+++ b/media-libs/libyami/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-libs/libzen/metadata.xml b/media-libs/libzen/metadata.xml
index e1410a9cfab..b1bdac7a620 100644
--- a/media-libs/libzen/metadata.xml
+++ b/media-libs/libzen/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">zenlib</remote-id>
</upstream>
diff --git a/media-libs/lilv/metadata.xml b/media-libs/lilv/metadata.xml
index 3d40c7743f8..3dce2a1697b 100644
--- a/media-libs/lilv/metadata.xml
+++ b/media-libs/lilv/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<longdescription lang="en">
Lilv is a library to make the use of LV2 plugins as simple as possible for applications. Lilv is the successor to SLV2, rewritten to be significantly faster and have minimal dependencies.
</longdescription>
diff --git a/media-libs/lv2-ui/metadata.xml b/media-libs/lv2-ui/metadata.xml
index 630499147bb..1b319f7bc02 100644
--- a/media-libs/lv2-ui/metadata.xml
+++ b/media-libs/lv2-ui/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<longdescription lang="en">
This extension defines an interface that can be used in LV2 plugins and hosts to create UIs for plugins. The UIs are similar to plugins and reside in shared object files in an LV2 bundle.
</longdescription>
diff --git a/media-libs/lv2/metadata.xml b/media-libs/lv2/metadata.xml
index 17306fa7a5a..0241349ea62 100644
--- a/media-libs/lv2/metadata.xml
+++ b/media-libs/lv2/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<use>
<flag name="plugins">Enables examples plugins.</flag>
</use>
diff --git a/media-libs/lv2core/metadata.xml b/media-libs/lv2core/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-libs/lv2core/metadata.xml
+++ b/media-libs/lv2core/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/lvtk/metadata.xml b/media-libs/lvtk/metadata.xml
index 5a7d94e97b7..d90aa0ed2bf 100644
--- a/media-libs/lvtk/metadata.xml
+++ b/media-libs/lvtk/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<use>
<flag name="gtk2">Enable <pkg>x11-libs/gtk+:2</pkg> based GUI support</flag>
<flag name="tools">Compile and install ttl2c tool</flag>
diff --git a/media-libs/mash/metadata.xml b/media-libs/mash/metadata.xml
index b4df7ab5280..58e7339b1dc 100644
--- a/media-libs/mash/metadata.xml
+++ b/media-libs/mash/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
for introspection</flag>
diff --git a/media-libs/memphis/metadata.xml b/media-libs/memphis/metadata.xml
index 71e60c617ba..4bd3379c067 100644
--- a/media-libs/memphis/metadata.xml
+++ b/media-libs/memphis/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>sci-geosciences</herd>
+ <maintainer>
+ <email>sci-geosciences@gentoo.org</email>
+ <name>Gentoo Geosciences Project</name>
+ </maintainer>
<use>
<flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
<flag name="vala">Add support for Vala</flag>
diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index 4cb96e214bf..5e435e6d5af 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/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>x11</herd>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<use>
<flag name="bindist">Disable patent-encumbered ARB_texture_float, EXT_texture_shared_exponent, and EXT_packed_float extensions.</flag>
<flag name="classic">Build drivers based on the classic architecture.</flag>
diff --git a/media-libs/ming/metadata.xml b/media-libs/ming/metadata.xml
index 7f65c68b40d..8dd6563f423 100644
--- a/media-libs/ming/metadata.xml
+++ b/media-libs/ming/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">ming</remote-id>
</upstream>
diff --git a/media-libs/mlt/metadata.xml b/media-libs/mlt/metadata.xml
index c3245e4d85a..0c136b5b24a 100644
--- a/media-libs/mlt/metadata.xml
+++ b/media-libs/mlt/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>video</herd>
- <herd>kde</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="compressed-lumas">Compress the luma files in png.</flag>
<flag name="frei0r">Build the module for <pkg>media-plugins/frei0r-plugins</pkg></flag>
diff --git a/media-libs/musicbrainz/metadata.xml b/media-libs/musicbrainz/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/musicbrainz/metadata.xml
+++ b/media-libs/musicbrainz/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/mutagen/metadata.xml b/media-libs/mutagen/metadata.xml
index 397fc006492..96ab178523f 100644
--- a/media-libs/mutagen/metadata.xml
+++ b/media-libs/mutagen/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">mutagen</remote-id>
<remote-id type="bitbucket">lazka/mutagen</remote-id>
diff --git a/media-libs/nas/metadata.xml b/media-libs/nas/metadata.xml
index c86db974637..15d4cea2d0c 100644
--- a/media-libs/nas/metadata.xml
+++ b/media-libs/nas/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">nas</remote-id>
</upstream>
diff --git a/media-libs/netpbm/metadata.xml b/media-libs/netpbm/metadata.xml
index c53b7115399..2292863276a 100644
--- a/media-libs/netpbm/metadata.xml
+++ b/media-libs/netpbm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="rle">Build converters for the RLE format (utah raster toolkit)</flag>
</use>
diff --git a/media-libs/openal/metadata.xml b/media-libs/openal/metadata.xml
index 271c2e30529..bdead0ed92b 100644
--- a/media-libs/openal/metadata.xml
+++ b/media-libs/openal/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="alstream">Build and install the FFmpeg based alstream example utility</flag>
</use>
diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index ec6ff0fdeb7..fb5cd7b315e 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/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>office</herd>
<maintainer>
<email>sping@gentoo.org</email>
<name>Sebastian Pipping</name>
</maintainer>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<upstream>
<remote-id type="github">KhronosGroup/OpenCOLLADA</remote-id>
</upstream>
diff --git a/media-libs/opencolorio/metadata.xml b/media-libs/opencolorio/metadata.xml
index 607c9d102e0..1818c01184f 100644
--- a/media-libs/opencolorio/metadata.xml
+++ b/media-libs/opencolorio/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>graphics</herd>
<maintainer>
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription lang="en">OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation.</longdescription>
<use>
<flag name="pdf">Install extra documentation in PDF format</flag>
diff --git a/media-libs/opencore-amr/metadata.xml b/media-libs/opencore-amr/metadata.xml
index e57f03bbfbe..1f679faccef 100644
--- a/media-libs/opencore-amr/metadata.xml
+++ b/media-libs/opencore-amr/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">opencore-amr</remote-id>
</upstream>
diff --git a/media-libs/openctm/metadata.xml b/media-libs/openctm/metadata.xml
index 5d3d4dbc3a6..c2f6348005f 100644
--- a/media-libs/openctm/metadata.xml
+++ b/media-libs/openctm/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>3dprint</herd>
<maintainer>
<email>amynka@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>3dprint@gentoo.org</email>
+ <name>Gentoo 3D print</name>
+ </maintainer>
<longdescription>
OpenCTM - the Open Compressed Triangle Mesh file format - is a file format, a software library and a tool set for compression of 3D triangle meshes.
</longdescription>
diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml
index eb2d81e28e2..eee03133ea3 100644
--- a/media-libs/opencv/metadata.xml
+++ b/media-libs/opencv/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>kde</herd>
<maintainer>
<email>dilfridge@gentoo.org</email>
<name>Andreas K. Huettel</name>
@@ -11,6 +10,10 @@
<name>Amy Winston</name>
<description>Assign bugs on me.</description>
</maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<longdescription>
OpenCV (Open Source Computer Vision) is a library of programming functions mainly aimed at real time computer vision.
Example applications of the OpenCV library are Human-Computer Interaction (HCI); Object Identification, Segmentation and Recognition;
diff --git a/media-libs/openexr/metadata.xml b/media-libs/openexr/metadata.xml
index edccfe5754d..b0a2b2c16e0 100644
--- a/media-libs/openexr/metadata.xml
+++ b/media-libs/openexr/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-libs/openexr_ctl/metadata.xml b/media-libs/openexr_ctl/metadata.xml
index de95417e2be..1f5be347404 100644
--- a/media-libs/openexr_ctl/metadata.xml
+++ b/media-libs/openexr_ctl/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-libs/opengl-apple/metadata.xml b/media-libs/opengl-apple/metadata.xml
index f737f232e3b..6bd94e0770d 100644
--- a/media-libs/opengl-apple/metadata.xml
+++ b/media-libs/opengl-apple/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>prefix</herd>
+ <maintainer>
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/opengtl/metadata.xml b/media-libs/opengtl/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/media-libs/opengtl/metadata.xml
+++ b/media-libs/opengtl/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-libs/openh264/metadata.xml b/media-libs/openh264/metadata.xml
index 59898d1f8d6..f29068b4615 100644
--- a/media-libs/openh264/metadata.xml
+++ b/media-libs/openh264/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
- <maintainer>
+ <maintainer>
<email>axs@gentoo.org</email>
<name>Ian Stakenvicius</name>
</maintainer>
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index c557813f5e6..ad38aabf46b 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="colorio">Use <pkg>media-gfx/opencolorio</pkg></flag>
<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
diff --git a/media-libs/openjpeg/metadata.xml b/media-libs/openjpeg/metadata.xml
index 7c804ffbed5..4ab18049bb3 100644
--- a/media-libs/openjpeg/metadata.xml
+++ b/media-libs/openjpeg/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">openjpeg</remote-id>
<remote-id type="sourceforge">openjpeg.mirror</remote-id>
diff --git a/media-libs/opus/metadata.xml b/media-libs/opus/metadata.xml
index 82bdb149a9c..0f56e249a5a 100644
--- a/media-libs/opus/metadata.xml
+++ b/media-libs/opus/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="custom-modes">Build with custom-modes.</flag>
</use>
diff --git a/media-libs/phat/metadata.xml b/media-libs/phat/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/phat/metadata.xml
+++ b/media-libs/phat/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/phonon-gstreamer/metadata.xml b/media-libs/phonon-gstreamer/metadata.xml
index cd1b62290e8..51f078e7541 100644
--- a/media-libs/phonon-gstreamer/metadata.xml
+++ b/media-libs/phonon-gstreamer/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="network">Enable network streaming support via libsoup</flag>
</use>
diff --git a/media-libs/phonon-qt7/metadata.xml b/media-libs/phonon-qt7/metadata.xml
index b968c7e47ff..73511f4340d 100644
--- a/media-libs/phonon-qt7/metadata.xml
+++ b/media-libs/phonon-qt7/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>kde</herd>
-<herd>prefix</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer>
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/phonon-vlc/metadata.xml b/media-libs/phonon-vlc/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/media-libs/phonon-vlc/metadata.xml
+++ b/media-libs/phonon-vlc/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-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index d261a0ea40f..ba5bbddd4c2 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/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>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
<flag name="vlc">Install VLC Phonon backend</flag>
diff --git a/media-libs/plib/metadata.xml b/media-libs/plib/metadata.xml
index 266d597fc58..f437c09432f 100644
--- a/media-libs/plib/metadata.xml
+++ b/media-libs/plib/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">plib</remote-id>
</upstream>
diff --git a/media-libs/plotutils/metadata.xml b/media-libs/plotutils/metadata.xml
index 447cad30a8f..81ae2b6553c 100644
--- a/media-libs/plotutils/metadata.xml
+++ b/media-libs/plotutils/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>printing</herd>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/pnglite/metadata.xml b/media-libs/pnglite/metadata.xml
index 7f56be77e1a..d73f13253ba 100644
--- a/media-libs/pnglite/metadata.xml
+++ b/media-libs/pnglite/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pnglite</remote-id>
</upstream>
diff --git a/media-libs/portaudio/metadata.xml b/media-libs/portaudio/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/portaudio/metadata.xml
+++ b/media-libs/portaudio/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/portmidi/metadata.xml b/media-libs/portmidi/metadata.xml
index 59be10030bf..08a1b91e2ee 100644
--- a/media-libs/portmidi/metadata.xml
+++ b/media-libs/portmidi/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<use>
<flag name="test-programs">Install various example programs</flag>
</use>
diff --git a/media-libs/prison/metadata.xml b/media-libs/prison/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/media-libs/prison/metadata.xml
+++ b/media-libs/prison/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-libs/pymemphis/metadata.xml b/media-libs/pymemphis/metadata.xml
index d21d1188455..bd2549cbee2 100644
--- a/media-libs/pymemphis/metadata.xml
+++ b/media-libs/pymemphis/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>sci-geosciences</herd>
+<maintainer>
+ <email>sci-geosciences@gentoo.org</email>
+ <name>Gentoo Geosciences Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/qhull/metadata.xml b/media-libs/qhull/metadata.xml
index 40b5a161adb..7d7b6765035 100644
--- a/media-libs/qhull/metadata.xml
+++ b/media-libs/qhull/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>sci-mathematics</herd>
+ <maintainer>
+ <email>sci-mathematics@gentoo.org</email>
+ <name>Gentoo Mathematics Project</name>
+ </maintainer>
<longdescription lang="en">
Qhull computes the convex hull, Delaunay triangulation, Voronoi
diagram, halfspace intersection about a point, furthest-site
diff --git a/media-libs/qimageblitz/metadata.xml b/media-libs/qimageblitz/metadata.xml
index 8d1e86a9cef..f38d43267b1 100644
--- a/media-libs/qimageblitz/metadata.xml
+++ b/media-libs/qimageblitz/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-libs/qt-gstreamer/metadata.xml b/media-libs/qt-gstreamer/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/media-libs/qt-gstreamer/metadata.xml
+++ b/media-libs/qt-gstreamer/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-libs/quesoglc/metadata.xml b/media-libs/quesoglc/metadata.xml
index 728be142d71..1a4ee44f0ba 100644
--- a/media-libs/quesoglc/metadata.xml
+++ b/media-libs/quesoglc/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">quesoglc</remote-id>
</upstream>
diff --git a/media-libs/quvi/metadata.xml b/media-libs/quvi/metadata.xml
index 1be208d63c6..8023667b762 100644
--- a/media-libs/quvi/metadata.xml
+++ b/media-libs/quvi/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="json">Enable support for JSON output</flag>
</use>
diff --git a/media-libs/raptor/metadata.xml b/media-libs/raptor/metadata.xml
index 20b42e75e86..db4112e5282 100644
--- a/media-libs/raptor/metadata.xml
+++ b/media-libs/raptor/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="json">Enable support for JSON parsing</flag>
</use>
diff --git a/media-libs/raul/metadata.xml b/media-libs/raul/metadata.xml
index 44aedffdc31..a84de306110 100644
--- a/media-libs/raul/metadata.xml
+++ b/media-libs/raul/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
<longdescription lang="en">
Raul (Realtime Audio Utility Library) is a C++ utility library primarily
aimed at audio/musical applications.
diff --git a/media-libs/resid/metadata.xml b/media-libs/resid/metadata.xml
index f13b23f890e..dfcab150551 100644
--- a/media-libs/resid/metadata.xml
+++ b/media-libs/resid/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">sidplay2</remote-id>
</upstream>
diff --git a/media-libs/rtaudio/metadata.xml b/media-libs/rtaudio/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-libs/rtaudio/metadata.xml
+++ b/media-libs/rtaudio/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/rubberband/metadata.xml b/media-libs/rubberband/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-libs/rubberband/metadata.xml
+++ b/media-libs/rubberband/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/sbc/metadata.xml b/media-libs/sbc/metadata.xml
index c9b0be6242c..15d9c6b1cce 100644
--- a/media-libs/sbc/metadata.xml
+++ b/media-libs/sbc/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>pacho@gentoo.org</email>
<name>Pacho Ramos</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/schroedinger/metadata.xml b/media-libs/schroedinger/metadata.xml
index c572c7d9b47..07cb6cb09a1 100644
--- a/media-libs/schroedinger/metadata.xml
+++ b/media-libs/schroedinger/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-libs/sdif/metadata.xml b/media-libs/sdif/metadata.xml
index c71fe6c363c..23b2159765d 100644
--- a/media-libs/sdif/metadata.xml
+++ b/media-libs/sdif/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>
The general idea of SDIF is to store information related to signal
processing and specifically of sound, in files, according to a common
diff --git a/media-libs/sdl-gfx/metadata.xml b/media-libs/sdl-gfx/metadata.xml
index 71195a1e890..f92f1ed5ab6 100644
--- a/media-libs/sdl-gfx/metadata.xml
+++ b/media-libs/sdl-gfx/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>games</herd>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
<longdescription>
SDL graphics drawing primitives and other support functions
The SDL_gfx library evolved out of the SDL_gfxPrimitives code which provided basic drawing
diff --git a/media-libs/sdl-image/metadata.xml b/media-libs/sdl-image/metadata.xml
index de3f80197ff..45fcc5d7971 100644
--- a/media-libs/sdl-image/metadata.xml
+++ b/media-libs/sdl-image/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>games</herd>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
<use>
<flag name="webp">support loading WEBP images</flag>
</use>
diff --git a/media-libs/sdl-mixer/metadata.xml b/media-libs/sdl-mixer/metadata.xml
index 98a087528ad..fa073e4ca1b 100644
--- a/media-libs/sdl-mixer/metadata.xml
+++ b/media-libs/sdl-mixer/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>games</herd>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
<use>
<flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
<flag name="midi">basic support for MIDI files</flag>
diff --git a/media-libs/sdl-net/metadata.xml b/media-libs/sdl-net/metadata.xml
index d3c2cc926f0..26e70c35170 100644
--- a/media-libs/sdl-net/metadata.xml
+++ b/media-libs/sdl-net/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-libs/sdl-pango/metadata.xml b/media-libs/sdl-pango/metadata.xml
index e3da3b15e43..4a570e1a512 100644
--- a/media-libs/sdl-pango/metadata.xml
+++ b/media-libs/sdl-pango/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>games</herd>
- <herd>gnome</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">sdlpango</remote-id>
</upstream>
diff --git a/media-libs/sdl-sound/metadata.xml b/media-libs/sdl-sound/metadata.xml
index da870654e9e..b90fc45798f 100644
--- a/media-libs/sdl-sound/metadata.xml
+++ b/media-libs/sdl-sound/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<use>
<flag name="physfs">Enable physfs support</flag>
</use>
diff --git a/media-libs/sdl-terminal/metadata.xml b/media-libs/sdl-terminal/metadata.xml
index 75fc14c3495..2a0f398feae 100644
--- a/media-libs/sdl-terminal/metadata.xml
+++ b/media-libs/sdl-terminal/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">sdl-terminal</remote-id>
</upstream>
diff --git a/media-libs/sdl-ttf/metadata.xml b/media-libs/sdl-ttf/metadata.xml
index 24f70e6408c..392d53dd002 100644
--- a/media-libs/sdl-ttf/metadata.xml
+++ b/media-libs/sdl-ttf/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>games</herd>
+<maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+</maintainer>
<longdescription>
This is a sample library which allows you to use TrueType fonts in your SDL applications. It
comes with an example program "showfont" which displays an example string for a given
diff --git a/media-libs/sdl2-gfx/metadata.xml b/media-libs/sdl2-gfx/metadata.xml
index a2c38b643e9..b15e021b871 100644
--- a/media-libs/sdl2-gfx/metadata.xml
+++ b/media-libs/sdl2-gfx/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<longdescription lang="en">
The SDL2_gfx library provides the basic drawing functions such
as lines, circles or polygons provided by SDL_gfx on SDL2 against
diff --git a/media-libs/sdl2-image/metadata.xml b/media-libs/sdl2-image/metadata.xml
index 7ac32c762e2..be2d64c2e2d 100644
--- a/media-libs/sdl2-image/metadata.xml
+++ b/media-libs/sdl2-image/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<use>
<flag name="webp">support loading WEBP images</flag>
</use>
diff --git a/media-libs/sdl2-mixer/metadata.xml b/media-libs/sdl2-mixer/metadata.xml
index 827251de7b5..fd8fbc92eb7 100644
--- a/media-libs/sdl2-mixer/metadata.xml
+++ b/media-libs/sdl2-mixer/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<use>
<flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg>
for MIDI support</flag>
diff --git a/media-libs/sdl2-net/metadata.xml b/media-libs/sdl2-net/metadata.xml
index cad5a2aa177..a72b0564b3f 100644
--- a/media-libs/sdl2-net/metadata.xml
+++ b/media-libs/sdl2-net/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-libs/sdl2-ttf/metadata.xml b/media-libs/sdl2-ttf/metadata.xml
index e7ce72ada85..3c3eb1547e9 100644
--- a/media-libs/sdl2-ttf/metadata.xml
+++ b/media-libs/sdl2-ttf/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<longdescription>
This is a sample library which allows you to use TrueType
fonts in your SDL applications. It
diff --git a/media-libs/sg/metadata.xml b/media-libs/sg/metadata.xml
index 897aa2e6b59..721f543292b 100644
--- a/media-libs/sg/metadata.xml
+++ b/media-libs/sg/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>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/sge/metadata.xml b/media-libs/sge/metadata.xml
index 2f8b9cdd638..6aa9618a964 100644
--- a/media-libs/sge/metadata.xml
+++ b/media-libs/sge/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>games</herd>
+ <maintainer>
+ <email>games@gentoo.org</email>
+ <name>Gentoo Games Project</name>
+ </maintainer>
<use>
<flag name="image">enable sdl-image support</flag>
</use>
diff --git a/media-libs/shivavg/metadata.xml b/media-libs/shivavg/metadata.xml
index 11f6c619655..c961bc38834 100644
--- a/media-libs/shivavg/metadata.xml
+++ b/media-libs/shivavg/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>x11</herd>
<maintainer>
<email>lu_zero@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<longdescription>
ShivaVG is an open-source ANSI C implementation of the Khronos'
OpenVG specification for hardware-accelerated vector graphics API. It is built
diff --git a/media-libs/silgraphite/metadata.xml b/media-libs/silgraphite/metadata.xml
index 07d4510f8b7..706650efdfb 100644
--- a/media-libs/silgraphite/metadata.xml
+++ b/media-libs/silgraphite/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>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<use>
<flag name="pango">Enables the pango-graphite pango module.</flag>
</use>
diff --git a/media-libs/slv2/metadata.xml b/media-libs/slv2/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-libs/slv2/metadata.xml
+++ b/media-libs/slv2/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/smpeg/metadata.xml b/media-libs/smpeg/metadata.xml
index d3c2cc926f0..26e70c35170 100644
--- a/media-libs/smpeg/metadata.xml
+++ b/media-libs/smpeg/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-libs/smpeg2/metadata.xml b/media-libs/smpeg2/metadata.xml
index cad5a2aa177..a72b0564b3f 100644
--- a/media-libs/smpeg2/metadata.xml
+++ b/media-libs/smpeg2/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-libs/soxr/metadata.xml b/media-libs/soxr/metadata.xml
index ef7c79f9fa7..df36fecb403 100644
--- a/media-libs/soxr/metadata.xml
+++ b/media-libs/soxr/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">soxr</remote-id>
</upstream>
diff --git a/media-libs/speex/metadata.xml b/media-libs/speex/metadata.xml
index d4990648f89..d5ea893f893 100644
--- a/media-libs/speex/metadata.xml
+++ b/media-libs/speex/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:xiph:speex</remote-id>
</upstream>
diff --git a/media-libs/sratom/metadata.xml b/media-libs/sratom/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-libs/sratom/metadata.xml
+++ b/media-libs/sratom/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/stimg/metadata.xml b/media-libs/stimg/metadata.xml
index 9be90a25897..fad04a0b0ae 100644
--- a/media-libs/stimg/metadata.xml
+++ b/media-libs/stimg/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>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-libs/stk/metadata.xml b/media-libs/stk/metadata.xml
index 3092d1fc555..1cff67b66fa 100644
--- a/media-libs/stk/metadata.xml
+++ b/media-libs/stk/metadata.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
-<herd>proxy-maintainers</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
@@ -11,4 +9,12 @@
<email>gimpel@sonnenkinder.org</email>
<name>Thomas Kuther</name>
</maintainer>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/stops/metadata.xml b/media-libs/stops/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-libs/stops/metadata.xml
+++ b/media-libs/stops/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/sublib/metadata.xml b/media-libs/sublib/metadata.xml
index 1875b60c1e8..97ba7cc0381 100644
--- a/media-libs/sublib/metadata.xml
+++ b/media-libs/sublib/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">
SubLib is a library that eases the development of subtitling applications. It
supports the most common text-based subtitle formats and allows for subtitle
diff --git a/media-libs/suil/metadata.xml b/media-libs/suil/metadata.xml
index 640383e7be8..de87eb733ec 100644
--- a/media-libs/suil/metadata.xml
+++ b/media-libs/suil/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
<longdescription lang="en">
Lilv is a library to make the use of LV2 plugins as simple as possible for applications. Lilv is the successor to SLV2, rewritten to be significantly faster and have minimal dependencies.
</longdescription>
diff --git a/media-libs/t1lib/metadata.xml b/media-libs/t1lib/metadata.xml
index 696065edd33..2cee0906a0f 100644
--- a/media-libs/t1lib/metadata.xml
+++ b/media-libs/t1lib/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>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/taglib-extras/metadata.xml b/media-libs/taglib-extras/metadata.xml
index a23f444b67d..e218a13609c 100644
--- a/media-libs/taglib-extras/metadata.xml
+++ b/media-libs/taglib-extras/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-libs/taglib/metadata.xml b/media-libs/taglib/metadata.xml
index 19057469159..3c586f3cf28 100644
--- a/media-libs/taglib/metadata.xml
+++ b/media-libs/taglib/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="asf">Provide support for Microsoft's 'advanced systems format' media container.</flag>
</use>
diff --git a/media-libs/tiff/metadata.xml b/media-libs/tiff/metadata.xml
index fee1dc15ab8..ecddd6f34ef 100644
--- a/media-libs/tiff/metadata.xml
+++ b/media-libs/tiff/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
<longdescription>TIFF image library and tools, mostly for scanner and fax
support, but also used by GIS and other imaging tools.</longdescription>
</pkgmetadata>
diff --git a/media-libs/tremor/metadata.xml b/media-libs/tremor/metadata.xml
index a1063d45eb1..bba54d209bc 100644
--- a/media-libs/tremor/metadata.xml
+++ b/media-libs/tremor/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="low-accuracy">enable 32bit only multiply operations</flag>
</use>
diff --git a/media-libs/tse3/metadata.xml b/media-libs/tse3/metadata.xml
index 715950308ec..7a69b18bfb2 100644
--- a/media-libs/tse3/metadata.xml
+++ b/media-libs/tse3/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">tse3</remote-id>
</upstream>
diff --git a/media-libs/urt/metadata.xml b/media-libs/urt/metadata.xml
index e770d1bc9a9..626f3a5a722 100644
--- a/media-libs/urt/metadata.xml
+++ b/media-libs/urt/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>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/vamp-plugin-sdk/metadata.xml b/media-libs/vamp-plugin-sdk/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-libs/vamp-plugin-sdk/metadata.xml
+++ b/media-libs/vamp-plugin-sdk/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index 20bfa7518e2..5c9039f239a 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/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>printing</herd>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">ukoethe/vigra</remote-id>
</upstream>
diff --git a/media-libs/vips/metadata.xml b/media-libs/vips/metadata.xml
index 1115b2ab2ae..8b244ed0a05 100644
--- a/media-libs/vips/metadata.xml
+++ b/media-libs/vips/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="fits">Enable support for the FITS image format through <pkg>sci-libs/cfitsio</pkg></flag>
</use>
diff --git a/media-libs/virglrenderer/metadata.xml b/media-libs/virglrenderer/metadata.xml
index a0569b3cccd..f8d5811c56c 100644
--- a/media-libs/virglrenderer/metadata.xml
+++ b/media-libs/virglrenderer/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>qemu</herd>
+<maintainer>
+ <email>qemu@gentoo.org</email>
+ <name>Gentoo QEMU Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/vo-aacenc/metadata.xml b/media-libs/vo-aacenc/metadata.xml
index 4e08d8ecdfd..13ae34c160d 100644
--- a/media-libs/vo-aacenc/metadata.xml
+++ b/media-libs/vo-aacenc/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription lang="en">VisualOn AAC encoder library This library contains an encoder implementation
of the Advanced Audio Coding (AAC) audio codec. The library is based on
a codec implementation by VisualOn, part of the Stagefright framework from
diff --git a/media-libs/vo-amrwbenc/metadata.xml b/media-libs/vo-amrwbenc/metadata.xml
index 6d37ec54497..7f5ab354166 100644
--- a/media-libs/vo-amrwbenc/metadata.xml
+++ b/media-libs/vo-amrwbenc/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription lang="en">
VisualOn AMR-WB encoder library
This library contains an encoder implementation of the Adaptive Multi
diff --git a/media-libs/volpack/metadata.xml b/media-libs/volpack/metadata.xml
index 32643e2e213..be5ed7a3340 100644
--- a/media-libs/volpack/metadata.xml
+++ b/media-libs/volpack/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>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
The VolPack Volume Rendering Library is a portable software library for
volume rendering based on a new family of fast volume rendering
diff --git a/media-libs/waffle/metadata.xml b/media-libs/waffle/metadata.xml
index 4e444db49a8..f44a4b303e5 100644
--- a/media-libs/waffle/metadata.xml
+++ b/media-libs/waffle/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>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
<use>
<flag name="egl">Enable EGL support</flag>
<flag name="gbm">Enable support for the Generic Buffer Manager (gbm)</flag>
diff --git a/media-libs/wxsvg/metadata.xml b/media-libs/wxsvg/metadata.xml
index 895135c3c2d..3d85bca72a6 100644
--- a/media-libs/wxsvg/metadata.xml
+++ b/media-libs/wxsvg/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>wxwidgets</herd>
+ <maintainer>
+ <email>wxwidgets@gentoo.org</email>
+ <name>Gentoo wxWidgets Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">wxsvg</remote-id>
</upstream>
diff --git a/media-libs/x264/metadata.xml b/media-libs/x264/metadata.xml
index 4854bbd2548..94dc544362b 100644
--- a/media-libs/x264/metadata.xml
+++ b/media-libs/x264/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-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index 65829b88a34..2165f10c107 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/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-libs/xine-lib/metadata.xml b/media-libs/xine-lib/metadata.xml
index b870e92015a..2560108f54a 100644
--- a/media-libs/xine-lib/metadata.xml
+++ b/media-libs/xine-lib/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-libs/xvid/metadata.xml b/media-libs/xvid/metadata.xml
index cc1a0288e38..a26e4a970b2 100644
--- a/media-libs/xvid/metadata.xml
+++ b/media-libs/xvid/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-libs/zimg/metadata.xml b/media-libs/zimg/metadata.xml
index 2ae93287f75..8b189279f94 100644
--- a/media-libs/zimg/metadata.xml
+++ b/media-libs/zimg/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-libs/zita-alsa-pcmi/metadata.xml b/media-libs/zita-alsa-pcmi/metadata.xml
index e1774e3d9ad..19643939653 100644
--- a/media-libs/zita-alsa-pcmi/metadata.xml
+++ b/media-libs/zita-alsa-pcmi/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>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/zita-convolver/metadata.xml b/media-libs/zita-convolver/metadata.xml
index 0dc3775f83d..b34010d8bf7 100644
--- a/media-libs/zita-convolver/metadata.xml
+++ b/media-libs/zita-convolver/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-libs/zvbi/metadata.xml b/media-libs/zvbi/metadata.xml
index d4fa9a81e2b..2415cc0d1ee 100644
--- a/media-libs/zvbi/metadata.xml
+++ b/media-libs/zvbi/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
<maintainer>
<email>media-tv@gentoo.org</email>
<name>Television related Applications in Gentoo's Portage</name>