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-sound
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-sound')
-rw-r--r--media-sound/SmarTagger/metadata.xml5
-rw-r--r--media-sound/a2jmidid/metadata.xml10
-rw-r--r--media-sound/aacplusenc/metadata.xml5
-rw-r--r--media-sound/abcde/metadata.xml5
-rw-r--r--media-sound/abcm2ps/metadata.xml5
-rw-r--r--media-sound/abcmidi/metadata.xml5
-rw-r--r--media-sound/adplay/metadata.xml5
-rw-r--r--media-sound/aeolus/metadata.xml5
-rw-r--r--media-sound/alsa-tools/metadata.xml1
-rw-r--r--media-sound/alsa-utils/metadata.xml1
-rw-r--r--media-sound/alsamixer-app/metadata.xml7
-rw-r--r--media-sound/alsamixergui/metadata.xml5
-rw-r--r--media-sound/alsaplayer/metadata.xml5
-rw-r--r--media-sound/amarok/metadata.xml10
-rw-r--r--media-sound/ams/metadata.xml5
-rw-r--r--media-sound/amsynth/metadata.xml5
-rw-r--r--media-sound/apetag/metadata.xml5
-rw-r--r--media-sound/aqualung/metadata.xml5
-rw-r--r--media-sound/ardour/metadata.xml5
-rw-r--r--media-sound/aseqview/metadata.xml5
-rw-r--r--media-sound/asunder/metadata.xml5
-rw-r--r--media-sound/aucdtect/metadata.xml5
-rw-r--r--media-sound/audacious/metadata.xml5
-rw-r--r--media-sound/audacity/metadata.xml5
-rw-r--r--media-sound/audex/metadata.xml5
-rw-r--r--media-sound/audiocompress/metadata.xml5
-rw-r--r--media-sound/audiotag/metadata.xml5
-rw-r--r--media-sound/aumix/metadata.xml5
-rw-r--r--media-sound/awesfx/metadata.xml5
-rw-r--r--media-sound/aylet/metadata.xml5
-rw-r--r--media-sound/banshee/metadata.xml10
-rw-r--r--media-sound/bempc/metadata.xml7
-rw-r--r--media-sound/bitmeter/metadata.xml5
-rw-r--r--media-sound/bladeenc/metadata.xml5
-rw-r--r--media-sound/bplay/metadata.xml5
-rw-r--r--media-sound/bpmdetect/metadata.xml5
-rw-r--r--media-sound/bristol/metadata.xml5
-rw-r--r--media-sound/brutefir/metadata.xml5
-rw-r--r--media-sound/cantata/metadata.xml5
-rw-r--r--media-sound/cd-discid/metadata.xml5
-rw-r--r--media-sound/cdcd/metadata.xml5
-rw-r--r--media-sound/cdparanoia/metadata.xml5
-rw-r--r--media-sound/cdplay/metadata.xml5
-rw-r--r--media-sound/cdstatus/metadata.xml5
-rw-r--r--media-sound/cdtool/metadata.xml5
-rw-r--r--media-sound/chordii/metadata.xml5
-rw-r--r--media-sound/christine/metadata.xml5
-rw-r--r--media-sound/clementine/metadata.xml10
-rw-r--r--media-sound/cmix/metadata.xml5
-rw-r--r--media-sound/cmus/metadata.xml5
-rw-r--r--media-sound/cmusfm/metadata.xml5
-rw-r--r--media-sound/codecgraph/metadata.xml5
-rw-r--r--media-sound/combine_wave/metadata.xml5
-rw-r--r--media-sound/coquillo/metadata.xml10
-rw-r--r--media-sound/cplay/metadata.xml5
-rw-r--r--media-sound/csound/metadata.xml5
-rw-r--r--media-sound/cvoicecontrol/metadata.xml5
-rw-r--r--media-sound/dagrab/metadata.xml5
-rw-r--r--media-sound/darkice/metadata.xml5
-rw-r--r--media-sound/darksnow/metadata.xml5
-rw-r--r--media-sound/daudio/metadata.xml5
-rw-r--r--media-sound/dcaenc/metadata.xml5
-rw-r--r--media-sound/dcd/metadata.xml5
-rw-r--r--media-sound/denemo/metadata.xml5
-rw-r--r--media-sound/din/metadata.xml5
-rw-r--r--media-sound/dir2ogg/metadata.xml5
-rw-r--r--media-sound/drumstick/metadata.xml10
-rw-r--r--media-sound/dvda-author/metadata.xml5
-rw-r--r--media-sound/easytag/metadata.xml5
-rw-r--r--media-sound/ecasound/metadata.xml5
-rw-r--r--media-sound/edna/metadata.xml5
-rw-r--r--media-sound/entagged-tageditor/metadata.xml1
-rw-r--r--media-sound/erec/metadata.xml5
-rw-r--r--media-sound/exaile/metadata.xml5
-rw-r--r--media-sound/ezstream/metadata.xml5
-rw-r--r--media-sound/fapg/metadata.xml5
-rw-r--r--media-sound/flac-image/metadata.xml5
-rw-r--r--media-sound/flac123/metadata.xml5
-rw-r--r--media-sound/flack/metadata.xml5
-rw-r--r--media-sound/flacon/metadata.xml5
-rw-r--r--media-sound/flake/metadata.xml5
-rw-r--r--media-sound/fluid-soundfont/metadata.xml5
-rw-r--r--media-sound/fluidsynth/metadata.xml5
-rw-r--r--media-sound/fmdrv/metadata.xml5
-rw-r--r--media-sound/fmtools/metadata.xml5
-rw-r--r--media-sound/freebirth/metadata.xml5
-rw-r--r--media-sound/freewheeling/metadata.xml5
-rw-r--r--media-sound/frescobaldi/metadata.xml10
-rw-r--r--media-sound/galan/metadata.xml5
-rw-r--r--media-sound/gbsplay/metadata.xml5
-rw-r--r--media-sound/gejengel/metadata.xml7
-rw-r--r--media-sound/giada/metadata.xml5
-rw-r--r--media-sound/gigedit/metadata.xml5
-rw-r--r--media-sound/gimmix/metadata.xml5
-rw-r--r--media-sound/glmix/metadata.xml5
-rw-r--r--media-sound/glurp/metadata.xml5
-rw-r--r--media-sound/gmorgan/metadata.xml5
-rw-r--r--media-sound/gmpc/metadata.xml5
-rw-r--r--media-sound/gmtp/metadata.xml5
-rw-r--r--media-sound/gmusicbrowser/metadata.xml5
-rw-r--r--media-sound/gnac/metadata.xml5
-rw-r--r--media-sound/gnomad/metadata.xml5
-rw-r--r--media-sound/gnome-music/metadata.xml5
-rw-r--r--media-sound/gnome-sound-recorder/metadata.xml5
-rw-r--r--media-sound/gnomoradio/metadata.xml5
-rw-r--r--media-sound/gnump3d/metadata.xml5
-rw-r--r--media-sound/gom/metadata.xml5
-rw-r--r--media-sound/gpodder/metadata.xml5
-rw-r--r--media-sound/gqmpeg/metadata.xml5
-rw-r--r--media-sound/gqradio/metadata.xml5
-rw-r--r--media-sound/gramofile/metadata.xml5
-rw-r--r--media-sound/grip/metadata.xml5
-rw-r--r--media-sound/gsm/metadata.xml5
-rw-r--r--media-sound/gst123/metadata.xml5
-rw-r--r--media-sound/gstreamripper/metadata.xml5
-rw-r--r--media-sound/gtick/metadata.xml5
-rw-r--r--media-sound/gtkguitune/metadata.xml5
-rw-r--r--media-sound/guayadeque/metadata.xml5
-rw-r--r--media-sound/hearnet/metadata.xml5
-rw-r--r--media-sound/helm/metadata.xml5
-rw-r--r--media-sound/herrie/metadata.xml5
-rw-r--r--media-sound/horgand/metadata.xml5
-rw-r--r--media-sound/hydrogen/metadata.xml5
-rw-r--r--media-sound/icecream/metadata.xml5
-rw-r--r--media-sound/id3/metadata.xml5
-rw-r--r--media-sound/id3ed/metadata.xml5
-rw-r--r--media-sound/id3ted/metadata.xml5
-rw-r--r--media-sound/id3tool/metadata.xml5
-rw-r--r--media-sound/id3v2/metadata.xml5
-rw-r--r--media-sound/ifp-gnome/metadata.xml5
-rw-r--r--media-sound/imp3sh/metadata.xml5
-rw-r--r--media-sound/jaaa/metadata.xml5
-rw-r--r--media-sound/jack-audio-connection-kit/metadata.xml5
-rw-r--r--media-sound/jack-keyboard/metadata.xml5
-rw-r--r--media-sound/jack-rack/metadata.xml5
-rw-r--r--media-sound/jack-smf-utils/metadata.xml5
-rw-r--r--media-sound/jack/metadata.xml5
-rw-r--r--media-sound/jackbeat/metadata.xml5
-rw-r--r--media-sound/jalv/metadata.xml5
-rw-r--r--media-sound/jamin/metadata.xml5
-rw-r--r--media-sound/jokosher/metadata.xml5
-rw-r--r--media-sound/jtagger/metadata.xml5
-rw-r--r--media-sound/justeport/metadata.xml5
-rw-r--r--media-sound/k4guitune/metadata.xml10
-rw-r--r--media-sound/karlyriceditor/metadata.xml10
-rw-r--r--media-sound/kaudiocreator/metadata.xml10
-rw-r--r--media-sound/kenvy24/metadata.xml10
-rw-r--r--media-sound/kid3/metadata.xml10
-rw-r--r--media-sound/kmetronome/metadata.xml10
-rw-r--r--media-sound/kmid/metadata.xml10
-rw-r--r--media-sound/kmidimon/metadata.xml10
-rw-r--r--media-sound/konvertible/metadata.xml10
-rw-r--r--media-sound/kradio/metadata.xml5
-rw-r--r--media-sound/kstreamripper/metadata.xml10
-rw-r--r--media-sound/kwave/metadata.xml5
-rw-r--r--media-sound/lame/metadata.xml5
-rw-r--r--media-sound/lash/metadata.xml5
-rw-r--r--media-sound/lastfm-desktop/metadata.xml5
-rw-r--r--media-sound/lastfmplayer/metadata.xml5
-rw-r--r--media-sound/lilypond/metadata.xml10
-rw-r--r--media-sound/lingot/metadata.xml5
-rw-r--r--media-sound/linuxsampler/metadata.xml5
-rw-r--r--media-sound/listen/metadata.xml5
-rw-r--r--media-sound/litestream/metadata.xml5
-rw-r--r--media-sound/lltag/metadata.xml5
-rw-r--r--media-sound/lmms/metadata.xml10
-rw-r--r--media-sound/lxmusic/metadata.xml5
-rw-r--r--media-sound/lyvi/metadata.xml10
-rw-r--r--media-sound/mac/metadata.xml5
-rw-r--r--media-sound/madplay/metadata.xml5
-rw-r--r--media-sound/mangler/metadata.xml5
-rw-r--r--media-sound/mcdp/metadata.xml5
-rw-r--r--media-sound/meterbridge/metadata.xml5
-rw-r--r--media-sound/mhwaveedit/metadata.xml5
-rw-r--r--media-sound/mikmod/metadata.xml5
-rw-r--r--media-sound/milkytracker/metadata.xml5
-rw-r--r--media-sound/mimd/metadata.xml5
-rw-r--r--media-sound/mixxx/metadata.xml5
-rw-r--r--media-sound/mmix/metadata.xml5
-rw-r--r--media-sound/moc/metadata.xml5
-rw-r--r--media-sound/modplugtools/metadata.xml5
-rw-r--r--media-sound/moodbar/metadata.xml10
-rw-r--r--media-sound/moosic/metadata.xml5
-rw-r--r--media-sound/mp32ogg/metadata.xml5
-rw-r--r--media-sound/mp3_check/metadata.xml5
-rw-r--r--media-sound/mp3asm/metadata.xml5
-rw-r--r--media-sound/mp3blaster/metadata.xml5
-rw-r--r--media-sound/mp3c/metadata.xml5
-rw-r--r--media-sound/mp3cat/metadata.xml5
-rw-r--r--media-sound/mp3check/metadata.xml5
-rw-r--r--media-sound/mp3diags/metadata.xml5
-rw-r--r--media-sound/mp3gain/metadata.xml5
-rw-r--r--media-sound/mp3info/metadata.xml5
-rw-r--r--media-sound/mp3report/metadata.xml5
-rw-r--r--media-sound/mp3splt-gtk/metadata.xml5
-rw-r--r--media-sound/mp3splt/metadata.xml5
-rw-r--r--media-sound/mp3unicode/metadata.xml5
-rw-r--r--media-sound/mp3wrap/metadata.xml5
-rw-r--r--media-sound/mpc/metadata.xml5
-rw-r--r--media-sound/mpck/metadata.xml5
-rw-r--r--media-sound/mpd/metadata.xml5
-rw-r--r--media-sound/mpdas/metadata.xml5
-rw-r--r--media-sound/mpdscribble/metadata.xml5
-rw-r--r--media-sound/mpfc/metadata.xml5
-rw-r--r--media-sound/mpg123/metadata.xml5
-rw-r--r--media-sound/mpg321/metadata.xml5
-rw-r--r--media-sound/mplay/metadata.xml5
-rw-r--r--media-sound/mserv/metadata.xml5
-rw-r--r--media-sound/mt-daapd/metadata.xml5
-rw-r--r--media-sound/muine/metadata.xml10
-rw-r--r--media-sound/multimux/metadata.xml5
-rw-r--r--media-sound/mup/metadata.xml5
-rw-r--r--media-sound/muse/metadata.xml5
-rw-r--r--media-sound/musepack-tools/metadata.xml5
-rw-r--r--media-sound/musescore/metadata.xml5
-rw-r--r--media-sound/musique/metadata.xml5
-rw-r--r--media-sound/ncmpc/metadata.xml5
-rw-r--r--media-sound/ncmpcpp/metadata.xml5
-rw-r--r--media-sound/neutrino/metadata.xml5
-rw-r--r--media-sound/normalize/metadata.xml5
-rw-r--r--media-sound/ogg2mp3/metadata.xml10
-rw-r--r--media-sound/oggtst/metadata.xml5
-rw-r--r--media-sound/ogmtools/metadata.xml5
-rw-r--r--media-sound/opus-tools/metadata.xml5
-rw-r--r--media-sound/orpheus/metadata.xml5
-rw-r--r--media-sound/paprefs/metadata.xml5
-rw-r--r--media-sound/pasystray/metadata.xml10
-rw-r--r--media-sound/patchage/metadata.xml5
-rw-r--r--media-sound/pavucontrol/metadata.xml5
-rw-r--r--media-sound/pavumeter/metadata.xml5
-rw-r--r--media-sound/peercast/metadata.xml5
-rw-r--r--media-sound/phasex/metadata.xml5
-rw-r--r--media-sound/pianobooster/metadata.xml5
-rw-r--r--media-sound/picard/metadata.xml5
-rw-r--r--media-sound/picoxine/metadata.xml5
-rw-r--r--media-sound/pitchtune/metadata.xml5
-rw-r--r--media-sound/playmidi/metadata.xml5
-rw-r--r--media-sound/poc/metadata.xml5
-rw-r--r--media-sound/podcatcher/metadata.xml5
-rw-r--r--media-sound/podget/metadata.xml5
-rw-r--r--media-sound/positron/metadata.xml5
-rw-r--r--media-sound/potamus/metadata.xml5
-rw-r--r--media-sound/projectm-jack/metadata.xml5
-rw-r--r--media-sound/projectm-pulseaudio/metadata.xml5
-rw-r--r--media-sound/protux/metadata.xml10
-rw-r--r--media-sound/ptabtools/metadata.xml5
-rw-r--r--media-sound/pulseaudio/metadata.xml10
-rw-r--r--media-sound/pwavecat/metadata.xml5
-rw-r--r--media-sound/pympd/metadata.xml5
-rw-r--r--media-sound/qarecord/metadata.xml5
-rw-r--r--media-sound/qastools/metadata.xml5
-rw-r--r--media-sound/qjackctl/metadata.xml5
-rw-r--r--media-sound/qmidiarp/metadata.xml5
-rw-r--r--media-sound/qmidiroute/metadata.xml5
-rw-r--r--media-sound/qmmp/metadata.xml5
-rw-r--r--media-sound/qmpdclient/metadata.xml5
-rw-r--r--media-sound/qpitch/metadata.xml10
-rw-r--r--media-sound/qsampler/metadata.xml5
-rw-r--r--media-sound/qsynth/metadata.xml5
-rw-r--r--media-sound/qtagconvert/metadata.xml5
-rw-r--r--media-sound/qtagger/metadata.xml5
-rw-r--r--media-sound/qtgain/metadata.xml10
-rw-r--r--media-sound/qtmpc/metadata.xml5
-rw-r--r--media-sound/qtractor/metadata.xml5
-rw-r--r--media-sound/qtscrobbler/metadata.xml5
-rw-r--r--media-sound/quark/metadata.xml5
-rw-r--r--media-sound/quimup/metadata.xml5
-rw-r--r--media-sound/quodlibet/metadata.xml5
-rw-r--r--media-sound/rawrec/metadata.xml5
-rw-r--r--media-sound/rcenter/metadata.xml5
-rw-r--r--media-sound/redoflacs/metadata.xml5
-rw-r--r--media-sound/retrovol/metadata.xml5
-rw-r--r--media-sound/rexima/metadata.xml5
-rw-r--r--media-sound/rezound/metadata.xml5
-rw-r--r--media-sound/rhythmbox/metadata.xml10
-rw-r--r--media-sound/rip/metadata.xml5
-rw-r--r--media-sound/ripperx/metadata.xml5
-rw-r--r--media-sound/rosegarden/metadata.xml5
-rw-r--r--media-sound/rplay/metadata.xml5
-rw-r--r--media-sound/saydate/metadata.xml5
-rw-r--r--media-sound/schismtracker/metadata.xml5
-rw-r--r--media-sound/seq24/metadata.xml5
-rw-r--r--media-sound/setmixer/metadata.xml5
-rw-r--r--media-sound/sexypsf/metadata.xml5
-rw-r--r--media-sound/sfc/metadata.xml5
-rw-r--r--media-sound/shell-fm/metadata.xml5
-rw-r--r--media-sound/shntool/metadata.xml5
-rw-r--r--media-sound/shorten/metadata.xml5
-rw-r--r--media-sound/shoutcast-search/metadata.xml5
-rw-r--r--media-sound/shoutcast-server-bin/metadata.xml5
-rw-r--r--media-sound/shoutcast-trans-bin/metadata.xml5
-rw-r--r--media-sound/sidplay/metadata.xml5
-rw-r--r--media-sound/sidplayfp/metadata.xml5
-rw-r--r--media-sound/smixer/metadata.xml5
-rw-r--r--media-sound/snd/metadata.xml5
-rw-r--r--media-sound/sndfile-tools/metadata.xml5
-rw-r--r--media-sound/sndpeek/metadata.xml5
-rw-r--r--media-sound/solfege/metadata.xml5
-rw-r--r--media-sound/sonata/metadata.xml5
-rw-r--r--media-sound/sonic-visualiser/metadata.xml5
-rw-r--r--media-sound/sooperlooper/metadata.xml5
-rw-r--r--media-sound/sound-juicer/metadata.xml5
-rw-r--r--media-sound/soundconverter/metadata.xml5
-rw-r--r--media-sound/soundkonverter/metadata.xml10
-rw-r--r--media-sound/sox/metadata.xml5
-rw-r--r--media-sound/specimen/metadata.xml5
-rw-r--r--media-sound/splay/metadata.xml5
-rw-r--r--media-sound/split2flac/metadata.xml10
-rw-r--r--media-sound/streamripper/metadata.xml5
-rw-r--r--media-sound/streamtranscoder/metadata.xml5
-rw-r--r--media-sound/substract_wave/metadata.xml5
-rw-r--r--media-sound/sweep/metadata.xml5
-rw-r--r--media-sound/synaesthesia/metadata.xml5
-rw-r--r--media-sound/taginfo/metadata.xml5
-rw-r--r--media-sound/tagtool/metadata.xml5
-rw-r--r--media-sound/takcd/metadata.xml5
-rw-r--r--media-sound/tap-reverbed/metadata.xml5
-rw-r--r--media-sound/tapiir/metadata.xml5
-rw-r--r--media-sound/teamspeak-client-bin/metadata.xml5
-rw-r--r--media-sound/teamspeak-server-bin/metadata.xml5
-rw-r--r--media-sound/tempest_for_eliza/metadata.xml5
-rw-r--r--media-sound/terminatorx/metadata.xml5
-rw-r--r--media-sound/timemachine/metadata.xml5
-rw-r--r--media-sound/timidity++/metadata.xml5
-rw-r--r--media-sound/timidity-eawpatches/metadata.xml5
-rw-r--r--media-sound/timidity-freepats/metadata.xml5
-rw-r--r--media-sound/tk707/metadata.xml5
-rw-r--r--media-sound/tomahawk/metadata.xml5
-rw-r--r--media-sound/toolame/metadata.xml5
-rw-r--r--media-sound/traverso/metadata.xml5
-rw-r--r--media-sound/trommler/metadata.xml5
-rw-r--r--media-sound/ttaenc/metadata.xml5
-rw-r--r--media-sound/tudor-volumed/metadata.xml5
-rw-r--r--media-sound/tunapie/metadata.xml5
-rw-r--r--media-sound/twolame/metadata.xml5
-rw-r--r--media-sound/umix/metadata.xml5
-rw-r--r--media-sound/umurmur/metadata.xml5
-rw-r--r--media-sound/vb2rip/metadata.xml5
-rw-r--r--media-sound/vdramgw/metadata.xml1
-rw-r--r--media-sound/ventrilo-server-bin/metadata.xml5
-rw-r--r--media-sound/vimpc/metadata.xml5
-rw-r--r--media-sound/vitunes/metadata.xml5
-rw-r--r--media-sound/vkeybd/metadata.xml5
-rw-r--r--media-sound/vlevel/metadata.xml5
-rw-r--r--media-sound/vlorb/metadata.xml5
-rw-r--r--media-sound/vmpk/metadata.xml5
-rw-r--r--media-sound/volti/metadata.xml5
-rw-r--r--media-sound/volumeicon/metadata.xml5
-rw-r--r--media-sound/volwheel/metadata.xml5
-rw-r--r--media-sound/vorbis-tools/metadata.xml5
-rw-r--r--media-sound/vorbisgain/metadata.xml5
-rw-r--r--media-sound/vsound/metadata.xml5
-rw-r--r--media-sound/waheela/metadata.xml5
-rw-r--r--media-sound/wavbreaker/metadata.xml5
-rw-r--r--media-sound/wavegain/metadata.xml5
-rw-r--r--media-sound/wavpack/metadata.xml5
-rw-r--r--media-sound/wavplay/metadata.xml5
-rw-r--r--media-sound/wavsplit/metadata.xml5
-rw-r--r--media-sound/wmsound-data/metadata.xml5
-rw-r--r--media-sound/xineadump/metadata.xml5
-rw-r--r--media-sound/xmp/metadata.xml5
-rw-r--r--media-sound/xnoise/metadata.xml5
-rw-r--r--media-sound/xwax/metadata.xml5
-rw-r--r--media-sound/yoshimi/metadata.xml5
-rw-r--r--media-sound/zynaddsubfx/metadata.xml5
365 files changed, 1571 insertions, 399 deletions
diff --git a/media-sound/SmarTagger/metadata.xml b/media-sound/SmarTagger/metadata.xml
index b5e5f691ef67..db64734dac21 100644
--- a/media-sound/SmarTagger/metadata.xml
+++ b/media-sound/SmarTagger/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="freshmeat">smartagger</remote-id>
</upstream>
diff --git a/media-sound/a2jmidid/metadata.xml b/media-sound/a2jmidid/metadata.xml
index 9c64e0edad0d..1d39bfb6e3c8 100644
--- a/media-sound/a2jmidid/metadata.xml
+++ b/media-sound/a2jmidid/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>l33tmmx@gmail.com</email>
<name>Jouni Rinne</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-sound/aacplusenc/metadata.xml b/media-sound/aacplusenc/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/aacplusenc/metadata.xml
+++ b/media-sound/aacplusenc/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-sound/abcde/metadata.xml b/media-sound/abcde/metadata.xml
index 02333a889508..ec5e11f539a8 100644
--- a/media-sound/abcde/metadata.xml
+++ b/media-sound/abcde/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="id3tag">Support ID3, ID3v2 tagging of audio files</flag>
<flag name="mac">Enable support for Monkey's Audio files</flag>
diff --git a/media-sound/abcm2ps/metadata.xml b/media-sound/abcm2ps/metadata.xml
index 9e9e140a45df..fa8e3da3de40 100644
--- a/media-sound/abcm2ps/metadata.xml
+++ b/media-sound/abcm2ps/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="pango">Use the pango library to render fonts with non-latin characters</flag>
</use>
diff --git a/media-sound/abcmidi/metadata.xml b/media-sound/abcmidi/metadata.xml
index b67060c7320f..b273e0ab0d8d 100644
--- a/media-sound/abcmidi/metadata.xml
+++ b/media-sound/abcmidi/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">abc</remote-id>
</upstream>
diff --git a/media-sound/adplay/metadata.xml b/media-sound/adplay/metadata.xml
index 88d380c3ac81..2fed612d2400 100644
--- a/media-sound/adplay/metadata.xml
+++ b/media-sound/adplay/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-sound/aeolus/metadata.xml b/media-sound/aeolus/metadata.xml
index a2cd58b8094c..d9b39212d6dc 100644
--- a/media-sound/aeolus/metadata.xml
+++ b/media-sound/aeolus/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">
Aeolus is a synthesised (i.e. not sampled) pipe organ emulator that should
be good enough to make an organist enjoy playing it. It is a software
diff --git a/media-sound/alsa-tools/metadata.xml b/media-sound/alsa-tools/metadata.xml
index 4ce038f08186..b9688ed05549 100644
--- a/media-sound/alsa-tools/metadata.xml
+++ b/media-sound/alsa-tools/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>alsa</herd>
<maintainer>
<email>alsa-bugs@gentoo.org</email>
</maintainer>
diff --git a/media-sound/alsa-utils/metadata.xml b/media-sound/alsa-utils/metadata.xml
index 128591833ac1..2d033a67e692 100644
--- a/media-sound/alsa-utils/metadata.xml
+++ b/media-sound/alsa-utils/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>alsa</herd>
<maintainer>
<email>alsa-bugs@gentoo.org</email>
</maintainer>
diff --git a/media-sound/alsamixer-app/metadata.xml b/media-sound/alsamixer-app/metadata.xml
index 6cca9a9b2612..52cf649535db 100644
--- a/media-sound/alsamixer-app/metadata.xml
+++ b/media-sound/alsamixer-app/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>desktop-dock</herd>
<maintainer>
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
</maintainer>
-<herd>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
+
</pkgmetadata>
diff --git a/media-sound/alsamixergui/metadata.xml b/media-sound/alsamixergui/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/alsamixergui/metadata.xml
+++ b/media-sound/alsamixergui/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-sound/alsaplayer/metadata.xml b/media-sound/alsaplayer/metadata.xml
index 58f0ddd695be..e550874bef11 100644
--- a/media-sound/alsaplayer/metadata.xml
+++ b/media-sound/alsaplayer/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="id3tag">Enables ID3 tagging with id3tag library</flag>
</use>
diff --git a/media-sound/amarok/metadata.xml b/media-sound/amarok/metadata.xml
index c964fd8c4bac..f0ba570a532e 100644
--- a/media-sound/amarok/metadata.xml
+++ b/media-sound/amarok/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
-<herd>sound</herd>
<maintainer>
<email>jmbsvicetto@gentoo.org</email>
<name>Jorge Manuel B. S. Vicetto</name>
</maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
<use>
<flag name="embedded">Use libmysqld, MySQL embedded server library.
Try disabling this if you encounter -PIC related in amarok,
diff --git a/media-sound/ams/metadata.xml b/media-sound/ams/metadata.xml
index 939a2c64eb67..5c956ac2c61f 100644
--- a/media-sound/ams/metadata.xml
+++ b/media-sound/ams/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">alsamodular</remote-id>
</upstream>
diff --git a/media-sound/amsynth/metadata.xml b/media-sound/amsynth/metadata.xml
index 934627feac58..df0b013d136b 100644
--- a/media-sound/amsynth/metadata.xml
+++ b/media-sound/amsynth/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="dssi">Enable support for DSSI Soft Synth Interface</flag>
</use>
diff --git a/media-sound/apetag/metadata.xml b/media-sound/apetag/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/apetag/metadata.xml
+++ b/media-sound/apetag/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-sound/aqualung/metadata.xml b/media-sound/aqualung/metadata.xml
index 49f3ae2cc86b..c5dd8459b68b 100644
--- a/media-sound/aqualung/metadata.xml
+++ b/media-sound/aqualung/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>billie@gentoo.org</email>
<name>Daniel Pielmeier</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="ifp">Enable support for iRiver iFP portable audio players</flag>
<flag name="lua">Enable support for programmable title formatting with
diff --git a/media-sound/ardour/metadata.xml b/media-sound/ardour/metadata.xml
index 7a22596af972..3a5f409e2c33 100644
--- a/media-sound/ardour/metadata.xml
+++ b/media-sound/ardour/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proaudio</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<use>
<flag name="lv2">Add support for Ladspa V2</flag>
</use>
diff --git a/media-sound/aseqview/metadata.xml b/media-sound/aseqview/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/aseqview/metadata.xml
+++ b/media-sound/aseqview/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-sound/asunder/metadata.xml b/media-sound/asunder/metadata.xml
index 21e8ec2ec85f..f1aed4c99646 100644
--- a/media-sound/asunder/metadata.xml
+++ b/media-sound/asunder/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="mac">Support for creation of Monkey's Audio files (APE)</flag>
<flag name="opus">Support for creation of Opus files</flag>
diff --git a/media-sound/aucdtect/metadata.xml b/media-sound/aucdtect/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/aucdtect/metadata.xml
+++ b/media-sound/aucdtect/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-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index cf82d9d8a5f2..0c78ab267420 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="chardet">Try to handle non-UTF8 chinese/japanese/korean ID3 tags</flag>
<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index b524f7543704..1a7ce37a98f1 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/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>proaudio</herd>
<maintainer>
<email>richard@audacityteam.org</email>
<name>Richard Ash</name>
<description>Upstream - please CC on bugs that concerns upstream</description>
</maintainer>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
<use>
<flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
<flag name="libsoxr">
diff --git a/media-sound/audex/metadata.xml b/media-sound/audex/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-sound/audex/metadata.xml
+++ b/media-sound/audex/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-sound/audiocompress/metadata.xml b/media-sound/audiocompress/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/audiocompress/metadata.xml
+++ b/media-sound/audiocompress/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-sound/audiotag/metadata.xml b/media-sound/audiotag/metadata.xml
index c670e555e241..d339e4ba0d43 100644
--- a/media-sound/audiotag/metadata.xml
+++ b/media-sound/audiotag/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">downloads/Daenyth</remote-id>
</upstream>
diff --git a/media-sound/aumix/metadata.xml b/media-sound/aumix/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/aumix/metadata.xml
+++ b/media-sound/aumix/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-sound/awesfx/metadata.xml b/media-sound/awesfx/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/awesfx/metadata.xml
+++ b/media-sound/awesfx/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-sound/aylet/metadata.xml b/media-sound/aylet/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/aylet/metadata.xml
+++ b/media-sound/aylet/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-sound/banshee/metadata.xml b/media-sound/banshee/metadata.xml
index 82bea70c98b2..58b0fbc8e8c4 100644
--- a/media-sound/banshee/metadata.xml
+++ b/media-sound/banshee/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dotnet</herd>
- <herd>gstreamer</herd>
+ <maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
<use>
<flag name="bpm">Build beats per minute detection extension</flag>
<flag name="cdda">Build with audio CD support</flag>
diff --git a/media-sound/bempc/metadata.xml b/media-sound/bempc/metadata.xml
index 860c306fcfde..b61cc533e391 100644
--- a/media-sound/bempc/metadata.xml
+++ b/media-sound/bempc/metadata.xml
@@ -5,5 +5,8 @@
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
- <herd>qt</herd>
-</pkgmetadata>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/media-sound/bitmeter/metadata.xml b/media-sound/bitmeter/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/bitmeter/metadata.xml
+++ b/media-sound/bitmeter/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-sound/bladeenc/metadata.xml b/media-sound/bladeenc/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/bladeenc/metadata.xml
+++ b/media-sound/bladeenc/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-sound/bplay/metadata.xml b/media-sound/bplay/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/bplay/metadata.xml
+++ b/media-sound/bplay/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-sound/bpmdetect/metadata.xml b/media-sound/bpmdetect/metadata.xml
index 605408c4b7f1..f308b63e236b 100644
--- a/media-sound/bpmdetect/metadata.xml
+++ b/media-sound/bpmdetect/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">bpmdetect</remote-id>
</upstream>
diff --git a/media-sound/bristol/metadata.xml b/media-sound/bristol/metadata.xml
index bafa55c948c1..900a6ef75576 100644
--- a/media-sound/bristol/metadata.xml
+++ b/media-sound/bristol/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">
Bristol is synth emulation package for a diverse range of vintage
synthesisers, electric pianos and organs. The application consists of a
diff --git a/media-sound/brutefir/metadata.xml b/media-sound/brutefir/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/brutefir/metadata.xml
+++ b/media-sound/brutefir/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-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index 312ce3f77280..62ad484aa536 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/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="dynamic">Enable support for dynamic playlists</flag>
<flag name="http-server">Enable internal HTTP server to play non-MPD files</flag>
diff --git a/media-sound/cd-discid/metadata.xml b/media-sound/cd-discid/metadata.xml
index 0e4409843539..1e4b20438c6c 100644
--- a/media-sound/cd-discid/metadata.xml
+++ b/media-sound/cd-discid/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">taem/cd-discid</remote-id>
</upstream>
diff --git a/media-sound/cdcd/metadata.xml b/media-sound/cdcd/metadata.xml
index 385a5882ed42..92c77b54cad5 100644
--- a/media-sound/cdcd/metadata.xml
+++ b/media-sound/cdcd/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-sound/cdparanoia/metadata.xml b/media-sound/cdparanoia/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/cdparanoia/metadata.xml
+++ b/media-sound/cdparanoia/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-sound/cdplay/metadata.xml b/media-sound/cdplay/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/cdplay/metadata.xml
+++ b/media-sound/cdplay/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-sound/cdstatus/metadata.xml b/media-sound/cdstatus/metadata.xml
index d28761dbf1e3..da364d419dae 100644
--- a/media-sound/cdstatus/metadata.xml
+++ b/media-sound/cdstatus/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">cdstatus</remote-id>
</upstream>
diff --git a/media-sound/cdtool/metadata.xml b/media-sound/cdtool/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/cdtool/metadata.xml
+++ b/media-sound/cdtool/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-sound/chordii/metadata.xml b/media-sound/chordii/metadata.xml
index c1cc2cbeaab8..3cf6f7c59c76 100644
--- a/media-sound/chordii/metadata.xml
+++ b/media-sound/chordii/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">
Chordii is a fork of Chord, a program very popular several years
ago and most famous for its trendsetting 'ChordPro' music file format.
diff --git a/media-sound/christine/metadata.xml b/media-sound/christine/metadata.xml
index a5fef3064c61..0a7370490c23 100644
--- a/media-sound/christine/metadata.xml
+++ b/media-sound/christine/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">christine</remote-id>
</upstream>
diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml
index 3f662b4da6d5..3820b47cdc72 100644
--- a/media-sound/clementine/metadata.xml
+++ b/media-sound/clementine/metadata.xml
@@ -1,12 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <herd>sound</herd>
<maintainer>
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
</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>
<use>
<flag name="box">Enable Box support</flag>
<flag name="dropbox">Enable Dropbox support</flag>
diff --git a/media-sound/cmix/metadata.xml b/media-sound/cmix/metadata.xml
index eccafa91989c..e6ef5903f3db 100644
--- a/media-sound/cmix/metadata.xml
+++ b/media-sound/cmix/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">cmix</remote-id>
</upstream>
diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index 585134186f56..d38e8aca314f 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/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>fauli@gentoo.org</email>
<name>Christian Faulhammer</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="cdio">use libcdio for CD support </flag>
<flag name="cue">enable CUE sheet parsing</flag>
diff --git a/media-sound/cmusfm/metadata.xml b/media-sound/cmusfm/metadata.xml
index 4ee9765db591..61896389a217 100644
--- a/media-sound/cmusfm/metadata.xml
+++ b/media-sound/cmusfm/metadata.xml
@@ -5,7 +5,10 @@
<email>yngwin@gentoo.org</email>
<name>Ben de Groot</name>
</maintainer>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="github">Arkq/cmusfm</remote-id>
</upstream>
diff --git a/media-sound/codecgraph/metadata.xml b/media-sound/codecgraph/metadata.xml
index a025c77c7636..d610f01bea87 100644
--- a/media-sound/codecgraph/metadata.xml
+++ b/media-sound/codecgraph/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>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-sound/combine_wave/metadata.xml b/media-sound/combine_wave/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/combine_wave/metadata.xml
+++ b/media-sound/combine_wave/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-sound/coquillo/metadata.xml b/media-sound/coquillo/metadata.xml
index 30d1023796f6..49caddf99969 100644
--- a/media-sound/coquillo/metadata.xml
+++ b/media-sound/coquillo/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>sound</herd>
- <herd>qt</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-sound/cplay/metadata.xml b/media-sound/cplay/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/cplay/metadata.xml
+++ b/media-sound/cplay/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-sound/csound/metadata.xml b/media-sound/csound/metadata.xml
index 7bab04e3178c..0ccf5b131054 100644
--- a/media-sound/csound/metadata.xml
+++ b/media-sound/csound/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="beats">Build the beats score frontend</flag>
<flag name="chua">Build the chua opcodes</flag>
diff --git a/media-sound/cvoicecontrol/metadata.xml b/media-sound/cvoicecontrol/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/cvoicecontrol/metadata.xml
+++ b/media-sound/cvoicecontrol/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-sound/dagrab/metadata.xml b/media-sound/dagrab/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/dagrab/metadata.xml
+++ b/media-sound/dagrab/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-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index 73e5d357f4e0..29cc1b6ee076 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/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="aacplus">AAC+ encoding via media-libs/libaacplus</flag>
<flag name="opus">Enable Opus audio codec support</flag>
diff --git a/media-sound/darksnow/metadata.xml b/media-sound/darksnow/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/darksnow/metadata.xml
+++ b/media-sound/darksnow/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-sound/daudio/metadata.xml b/media-sound/daudio/metadata.xml
index 0840b254c78f..5c4a332900bc 100644
--- a/media-sound/daudio/metadata.xml
+++ b/media-sound/daudio/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">daudio</remote-id>
</upstream>
diff --git a/media-sound/dcaenc/metadata.xml b/media-sound/dcaenc/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/dcaenc/metadata.xml
+++ b/media-sound/dcaenc/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-sound/dcd/metadata.xml b/media-sound/dcd/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/dcd/metadata.xml
+++ b/media-sound/dcd/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-sound/denemo/metadata.xml b/media-sound/denemo/metadata.xml
index cb4e278a0624..b719c34b5982 100644
--- a/media-sound/denemo/metadata.xml
+++ b/media-sound/denemo/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="fluidsynth">Enable Fluidsynth MIDI software synthesis</flag>
<flag name="portmidi">Enable support for the portmidi backend</flag>
diff --git a/media-sound/din/metadata.xml b/media-sound/din/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/din/metadata.xml
+++ b/media-sound/din/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-sound/dir2ogg/metadata.xml b/media-sound/dir2ogg/metadata.xml
index 892b41956295..d212df4bb7b3 100644
--- a/media-sound/dir2ogg/metadata.xml
+++ b/media-sound/dir2ogg/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="mac">Add support for decoding Monkey's Audio files</flag>
<flag name="wma">Add support for wma files through mplayer</flag>
diff --git a/media-sound/drumstick/metadata.xml b/media-sound/drumstick/metadata.xml
index 1438ab505c5b..32c34264e197 100644
--- a/media-sound/drumstick/metadata.xml
+++ b/media-sound/drumstick/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>sound</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">drumstick</remote-id>
</upstream>
diff --git a/media-sound/dvda-author/metadata.xml b/media-sound/dvda-author/metadata.xml
index 1d76118d5daf..2ed34169aabb 100644
--- a/media-sound/dvda-author/metadata.xml
+++ b/media-sound/dvda-author/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">dvd-audio</remote-id>
</upstream>
diff --git a/media-sound/easytag/metadata.xml b/media-sound/easytag/metadata.xml
index 5a1b546a1d79..02b21d7f026a 100644
--- a/media-sound/easytag/metadata.xml
+++ b/media-sound/easytag/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="opus">Enable support for <pkg>media-libs/opus</pkg> and <pkg>media-libs/opusfile</pkg> (opus audio codec)</flag>
<flag name="gtk2">Enable GTK+:2 support and disable default GTK+:3 support</flag>
diff --git a/media-sound/ecasound/metadata.xml b/media-sound/ecasound/metadata.xml
index c48ef0397652..43b8126f98e3 100644
--- a/media-sound/ecasound/metadata.xml
+++ b/media-sound/ecasound/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>
Ecasound is a software package designed for multitrack audio
processing. It can be used for simple tasks like audio playback,
diff --git a/media-sound/edna/metadata.xml b/media-sound/edna/metadata.xml
index 096a93c11ccf..c68060c3a208 100644
--- a/media-sound/edna/metadata.xml
+++ b/media-sound/edna/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>
Edna is Greg Stein's http streaming audio server for mp3 and ogg files.
</longdescription>
diff --git a/media-sound/entagged-tageditor/metadata.xml b/media-sound/entagged-tageditor/metadata.xml
index d996167872e4..6accd0e7385d 100644
--- a/media-sound/entagged-tageditor/metadata.xml
+++ b/media-sound/entagged-tageditor/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
<maintainer>
<email>java@gentoo.org</email>
</maintainer>
diff --git a/media-sound/erec/metadata.xml b/media-sound/erec/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/erec/metadata.xml
+++ b/media-sound/erec/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-sound/exaile/metadata.xml b/media-sound/exaile/metadata.xml
index 70b17978b4e1..f9c30c7c3c46 100644
--- a/media-sound/exaile/metadata.xml
+++ b/media-sound/exaile/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="launchpad">exaile</remote-id>
<remote-id type="github">exaile/exaile</remote-id>
diff --git a/media-sound/ezstream/metadata.xml b/media-sound/ezstream/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/ezstream/metadata.xml
+++ b/media-sound/ezstream/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-sound/fapg/metadata.xml b/media-sound/fapg/metadata.xml
index 72d447316a74..12ffc3c9499a 100644
--- a/media-sound/fapg/metadata.xml
+++ b/media-sound/fapg/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="xspf">Enable support for saving XSPF playlists.</flag>
</use>
diff --git a/media-sound/flac-image/metadata.xml b/media-sound/flac-image/metadata.xml
index b1cf7fe492bb..c2ac0b233351 100644
--- a/media-sound/flac-image/metadata.xml
+++ b/media-sound/flac-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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription lang="en">
A tiny utility for stuffing image files (e.g. album cover art) into
metadata blocks in FLAC files. Actually you could store and retrieve
diff --git a/media-sound/flac123/metadata.xml b/media-sound/flac123/metadata.xml
index 38f02c77fdf9..afda10fb8f19 100644
--- a/media-sound/flac123/metadata.xml
+++ b/media-sound/flac123/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-tools</remote-id>
</upstream>
diff --git a/media-sound/flack/metadata.xml b/media-sound/flack/metadata.xml
index 926971b47d4f..98c94141d262 100644
--- a/media-sound/flack/metadata.xml
+++ b/media-sound/flack/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">
A menu-driven BASH script to easily tag your collection of FLAC files
from the command line, without the need for a GUI.
diff --git a/media-sound/flacon/metadata.xml b/media-sound/flacon/metadata.xml
index d35aac6619e4..1ce32018b6bd 100644
--- a/media-sound/flacon/metadata.xml
+++ b/media-sound/flacon/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
@@ -15,6 +14,10 @@
<name>Coacher</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="mac">Add support for Monkey's Audio input files</flag>
<flag name="opus">Add support for Opus output files</flag>
diff --git a/media-sound/flake/metadata.xml b/media-sound/flake/metadata.xml
index 8364f22a83d2..0fee1ce101c8 100644
--- a/media-sound/flake/metadata.xml
+++ b/media-sound/flake/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">flake-enc</remote-id>
</upstream>
diff --git a/media-sound/fluid-soundfont/metadata.xml b/media-sound/fluid-soundfont/metadata.xml
index 4c753d66e1f7..82d5d4eae878 100644
--- a/media-sound/fluid-soundfont/metadata.xml
+++ b/media-sound/fluid-soundfont/metadata.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>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
@@ -12,6 +11,10 @@
<name>Nikoli</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+<maintainer>
+<email>proxy-maint@gentoo.org</email>
+<name>Proxy Maintainers</name>
+</maintainer>
<longdescription lang="en">
</longdescription>
</pkgmetadata>
diff --git a/media-sound/fluidsynth/metadata.xml b/media-sound/fluidsynth/metadata.xml
index 5ff04da9d27e..cd9e95515d87 100644
--- a/media-sound/fluidsynth/metadata.xml
+++ b/media-sound/fluidsynth/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">fluidsynth</remote-id>
</upstream>
diff --git a/media-sound/fmdrv/metadata.xml b/media-sound/fmdrv/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/fmdrv/metadata.xml
+++ b/media-sound/fmdrv/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-sound/fmtools/metadata.xml b/media-sound/fmtools/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/fmtools/metadata.xml
+++ b/media-sound/fmtools/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-sound/freebirth/metadata.xml b/media-sound/freebirth/metadata.xml
index d9ad7481ae97..c14f50a9fae6 100644
--- a/media-sound/freebirth/metadata.xml
+++ b/media-sound/freebirth/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="freshmeat">8834</remote-id>
</upstream>
diff --git a/media-sound/freewheeling/metadata.xml b/media-sound/freewheeling/metadata.xml
index d0cb3eb7115f..346dac00411c 100644
--- a/media-sound/freewheeling/metadata.xml
+++ b/media-sound/freewheeling/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="fluidsynth">compile with support for fluidsynth</flag>
</use>
diff --git a/media-sound/frescobaldi/metadata.xml b/media-sound/frescobaldi/metadata.xml
index cf9a3e330f8e..d84724ac4652 100644
--- a/media-sound/frescobaldi/metadata.xml
+++ b/media-sound/frescobaldi/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>sound</herd>
- <herd>python</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<use>
<flag name="portmidi">Enable <pkg>media-libs/portmidi</pkg> support</flag>
</use>
diff --git a/media-sound/galan/metadata.xml b/media-sound/galan/metadata.xml
index 8fc1bf513343..7ba92019f5ea 100644
--- a/media-sound/galan/metadata.xml
+++ b/media-sound/galan/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">galan</remote-id>
</upstream>
diff --git a/media-sound/gbsplay/metadata.xml b/media-sound/gbsplay/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/gbsplay/metadata.xml
+++ b/media-sound/gbsplay/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-sound/gejengel/metadata.xml b/media-sound/gejengel/metadata.xml
index 850d42a5998e..203260e2504d 100644
--- a/media-sound/gejengel/metadata.xml
+++ b/media-sound/gejengel/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>
+ <maintainer>
<email>DuPol@gmx.de</email>
<name>Dustin Polke</name>
<description>Proxy maintainer, to be assigned bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="audioscrobbler">Enable track submission on last.fm</flag>
</use>
diff --git a/media-sound/giada/metadata.xml b/media-sound/giada/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/giada/metadata.xml
+++ b/media-sound/giada/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-sound/gigedit/metadata.xml b/media-sound/gigedit/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gigedit/metadata.xml
+++ b/media-sound/gigedit/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-sound/gimmix/metadata.xml b/media-sound/gimmix/metadata.xml
index 43d99907214a..0a99ce511b0e 100644
--- a/media-sound/gimmix/metadata.xml
+++ b/media-sound/gimmix/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>
<use>
<flag name="cover">Enable cover art fetching</flag>
<flag name="lyrics">Enable lyric fetching</flag>
diff --git a/media-sound/glmix/metadata.xml b/media-sound/glmix/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/glmix/metadata.xml
+++ b/media-sound/glmix/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-sound/glurp/metadata.xml b/media-sound/glurp/metadata.xml
index 65f6531b04b5..f12beb449865 100644
--- a/media-sound/glurp/metadata.xml
+++ b/media-sound/glurp/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">glurp</remote-id>
</upstream>
diff --git a/media-sound/gmorgan/metadata.xml b/media-sound/gmorgan/metadata.xml
index f507623abb56..53230382fffb 100644
--- a/media-sound/gmorgan/metadata.xml
+++ b/media-sound/gmorgan/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">gmorgan</remote-id>
</upstream>
diff --git a/media-sound/gmpc/metadata.xml b/media-sound/gmpc/metadata.xml
index 969d55282588..b78def83654f 100644
--- a/media-sound/gmpc/metadata.xml
+++ b/media-sound/gmpc/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>
<use>
<flag name="unique">Enable single instance support using <pkg>dev-libs/libunique</pkg></flag>
<flag name="xspf">Enable support for reading and saving XSPF playlists</flag>
diff --git a/media-sound/gmtp/metadata.xml b/media-sound/gmtp/metadata.xml
index cfe9c2c04f39..ade8ba02ceed 100644
--- a/media-sound/gmtp/metadata.xml
+++ b/media-sound/gmtp/metadata.xml
@@ -5,7 +5,10 @@
<email>tomka@gentoo.org</email>
<name>Thomas Kahle</name>
</maintainer>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription lang="en">
gMTP is a graphical frontend to libmtp. It allows to transfer files to mtp devices like mp3 players or android tablets.
</longdescription>
diff --git a/media-sound/gmusicbrowser/metadata.xml b/media-sound/gmusicbrowser/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/gmusicbrowser/metadata.xml
+++ b/media-sound/gmusicbrowser/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-sound/gnac/metadata.xml b/media-sound/gnac/metadata.xml
index 4ad88e363608..ec67d3ab9cb3 100644
--- a/media-sound/gnac/metadata.xml
+++ b/media-sound/gnac/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">gnac</remote-id>
</upstream>
diff --git a/media-sound/gnomad/metadata.xml b/media-sound/gnomad/metadata.xml
index 05ec0f5c79ec..381a594fe101 100644
--- a/media-sound/gnomad/metadata.xml
+++ b/media-sound/gnomad/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">gnomad2</remote-id>
</upstream>
diff --git a/media-sound/gnome-music/metadata.xml b/media-sound/gnome-music/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-sound/gnome-music/metadata.xml
+++ b/media-sound/gnome-music/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-sound/gnome-sound-recorder/metadata.xml b/media-sound/gnome-sound-recorder/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-sound/gnome-sound-recorder/metadata.xml
+++ b/media-sound/gnome-sound-recorder/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-sound/gnomoradio/metadata.xml b/media-sound/gnomoradio/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gnomoradio/metadata.xml
+++ b/media-sound/gnomoradio/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-sound/gnump3d/metadata.xml b/media-sound/gnump3d/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gnump3d/metadata.xml
+++ b/media-sound/gnump3d/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-sound/gom/metadata.xml b/media-sound/gom/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gom/metadata.xml
+++ b/media-sound/gom/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-sound/gpodder/metadata.xml b/media-sound/gpodder/metadata.xml
index bf727c453ed0..74755ee6233c 100644
--- a/media-sound/gpodder/metadata.xml
+++ b/media-sound/gpodder/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="webkit">Enable the webkit rendering engine for HTML episode shownotes</flag>
</use>
diff --git a/media-sound/gqmpeg/metadata.xml b/media-sound/gqmpeg/metadata.xml
index c1a71961758e..78f2713aa370 100644
--- a/media-sound/gqmpeg/metadata.xml
+++ b/media-sound/gqmpeg/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">gqmpeg</remote-id>
</upstream>
diff --git a/media-sound/gqradio/metadata.xml b/media-sound/gqradio/metadata.xml
index 2946d7c23fef..649f729de86b 100644
--- a/media-sound/gqradio/metadata.xml
+++ b/media-sound/gqradio/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>
GQradio interfaces with radio cards through the video4linux API.
Stations can be tuned manually, set to presets, or auto seek can find
diff --git a/media-sound/gramofile/metadata.xml b/media-sound/gramofile/metadata.xml
index f6f41985a82b..efc762530ef8 100644
--- a/media-sound/gramofile/metadata.xml
+++ b/media-sound/gramofile/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">
GramoFile is intended primarily for transferring gramophone records to CDs, but
has many other possible uses. It can record very long .wav files with a bargraph
diff --git a/media-sound/grip/metadata.xml b/media-sound/grip/metadata.xml
index b9d0f75b5165..1af304799bdf 100644
--- a/media-sound/grip/metadata.xml
+++ b/media-sound/grip/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">grip</remote-id>
</upstream>
diff --git a/media-sound/gsm/metadata.xml b/media-sound/gsm/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gsm/metadata.xml
+++ b/media-sound/gsm/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sound</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-sound/gst123/metadata.xml b/media-sound/gst123/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gst123/metadata.xml
+++ b/media-sound/gst123/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-sound/gstreamripper/metadata.xml b/media-sound/gstreamripper/metadata.xml
index ceaa2f3b8c4b..2c559ecc47a2 100644
--- a/media-sound/gstreamripper/metadata.xml
+++ b/media-sound/gstreamripper/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">gstreamripper</remote-id>
</upstream>
diff --git a/media-sound/gtick/metadata.xml b/media-sound/gtick/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/gtick/metadata.xml
+++ b/media-sound/gtick/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-sound/gtkguitune/metadata.xml b/media-sound/gtkguitune/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/gtkguitune/metadata.xml
+++ b/media-sound/gtkguitune/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-sound/guayadeque/metadata.xml b/media-sound/guayadeque/metadata.xml
index e4e01ee02b7e..805b7e87430f 100644
--- a/media-sound/guayadeque/metadata.xml
+++ b/media-sound/guayadeque/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">guayadeque</remote-id>
</upstream>
diff --git a/media-sound/hearnet/metadata.xml b/media-sound/hearnet/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/hearnet/metadata.xml
+++ b/media-sound/hearnet/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-sound/helm/metadata.xml b/media-sound/helm/metadata.xml
index a6410ec46591..c81c4621b9d1 100644
--- a/media-sound/helm/metadata.xml
+++ b/media-sound/helm/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">mtytel/helm</remote-id>
</upstream>
diff --git a/media-sound/herrie/metadata.xml b/media-sound/herrie/metadata.xml
index 45200fa35db8..b5961c2bb27e 100644
--- a/media-sound/herrie/metadata.xml
+++ b/media-sound/herrie/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">
Herrie is a minimalistic music player that uses the command
line. It is written to support a variety of operating systems,
diff --git a/media-sound/horgand/metadata.xml b/media-sound/horgand/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/horgand/metadata.xml
+++ b/media-sound/horgand/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-sound/hydrogen/metadata.xml b/media-sound/hydrogen/metadata.xml
index d77759037425..2a2c1d7767f7 100644
--- a/media-sound/hydrogen/metadata.xml
+++ b/media-sound/hydrogen/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="archive">Use libarchive instead of libtar</flag>
</use>
diff --git a/media-sound/icecream/metadata.xml b/media-sound/icecream/metadata.xml
index b1fb858f25be..06541fa1498c 100644
--- a/media-sound/icecream/metadata.xml
+++ b/media-sound/icecream/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">icecream</remote-id>
</upstream>
diff --git a/media-sound/id3/metadata.xml b/media-sound/id3/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/id3/metadata.xml
+++ b/media-sound/id3/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-sound/id3ed/metadata.xml b/media-sound/id3ed/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/id3ed/metadata.xml
+++ b/media-sound/id3ed/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-sound/id3ted/metadata.xml b/media-sound/id3ted/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/id3ted/metadata.xml
+++ b/media-sound/id3ted/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-sound/id3tool/metadata.xml b/media-sound/id3tool/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/id3tool/metadata.xml
+++ b/media-sound/id3tool/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-sound/id3v2/metadata.xml b/media-sound/id3v2/metadata.xml
index 0fb660950983..a0e6d0643d2c 100644
--- a/media-sound/id3v2/metadata.xml
+++ b/media-sound/id3v2/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">id3v2</remote-id>
</upstream>
diff --git a/media-sound/ifp-gnome/metadata.xml b/media-sound/ifp-gnome/metadata.xml
index 5ddd82b6cb49..e67992f86ba5 100644
--- a/media-sound/ifp-gnome/metadata.xml
+++ b/media-sound/ifp-gnome/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-gnome</remote-id>
</upstream>
diff --git a/media-sound/imp3sh/metadata.xml b/media-sound/imp3sh/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/imp3sh/metadata.xml
+++ b/media-sound/imp3sh/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-sound/jaaa/metadata.xml b/media-sound/jaaa/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/jaaa/metadata.xml
+++ b/media-sound/jaaa/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-sound/jack-audio-connection-kit/metadata.xml b/media-sound/jack-audio-connection-kit/metadata.xml
index 63276d7c70ea..7cefb121360e 100644
--- a/media-sound/jack-audio-connection-kit/metadata.xml
+++ b/media-sound/jack-audio-connection-kit/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="coreaudio">Build the CoreAudio driver on Mac OS X systems</flag>
<flag name="cpudetection">Enables runtime cpudetection</flag>
diff --git a/media-sound/jack-keyboard/metadata.xml b/media-sound/jack-keyboard/metadata.xml
index 66b06171fa91..0a5b92788825 100644
--- a/media-sound/jack-keyboard/metadata.xml
+++ b/media-sound/jack-keyboard/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">
jack-keyboard is a virtual MIDI keyboard - a program that allows you to send
JACK MIDI events (play ;-) using your PC keyboard. It's somewhat similar to
diff --git a/media-sound/jack-rack/metadata.xml b/media-sound/jack-rack/metadata.xml
index c4d8e2d1a1fd..2684b011436b 100644
--- a/media-sound/jack-rack/metadata.xml
+++ b/media-sound/jack-rack/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">jack-rack</remote-id>
</upstream>
diff --git a/media-sound/jack-smf-utils/metadata.xml b/media-sound/jack-smf-utils/metadata.xml
index bb34255979d6..3f0cd5152d72 100644
--- a/media-sound/jack-smf-utils/metadata.xml
+++ b/media-sound/jack-smf-utils/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">
Jack-smf-utils is a set of two utilities - jack-smf-player and
jack-smf-recorder - whose purpose is to play and record MIDI streams from/to
diff --git a/media-sound/jack/metadata.xml b/media-sound/jack/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/jack/metadata.xml
+++ b/media-sound/jack/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-sound/jackbeat/metadata.xml b/media-sound/jackbeat/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/jackbeat/metadata.xml
+++ b/media-sound/jackbeat/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-sound/jalv/metadata.xml b/media-sound/jalv/metadata.xml
index a07c92332af9..ff009327a7a4 100644
--- a/media-sound/jalv/metadata.xml
+++ b/media-sound/jalv/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">
Jalv is a simple but fully featured LV2 host for Jack. It runs LV2 plugins and exposes their ports as Jack ports, essentially making any LV2 plugin function as a Jack application.
diff --git a/media-sound/jamin/metadata.xml b/media-sound/jamin/metadata.xml
index f5edf9bf1515..eabb3eda28ed 100644
--- a/media-sound/jamin/metadata.xml
+++ b/media-sound/jamin/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">jamin</remote-id>
</upstream>
diff --git a/media-sound/jokosher/metadata.xml b/media-sound/jokosher/metadata.xml
index 42f09df9bad2..339b52c7d6b2 100644
--- a/media-sound/jokosher/metadata.xml
+++ b/media-sound/jokosher/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="launchpad">jokosher</remote-id>
</upstream>
diff --git a/media-sound/jtagger/metadata.xml b/media-sound/jtagger/metadata.xml
index f467e695da5e..d5c96f4b4fc1 100644
--- a/media-sound/jtagger/metadata.xml
+++ b/media-sound/jtagger/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<longdescription lang="en">
jTagger is an powerful MP3 tag and filename editor. It can update
tags and filenames in different batch editing modes. Basic MP3
diff --git a/media-sound/justeport/metadata.xml b/media-sound/justeport/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/justeport/metadata.xml
+++ b/media-sound/justeport/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-sound/k4guitune/metadata.xml b/media-sound/k4guitune/metadata.xml
index 3f15b98a4e84..1e6767b73b62 100644
--- a/media-sound/k4guitune/metadata.xml
+++ b/media-sound/k4guitune/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>sound</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-sound/karlyriceditor/metadata.xml b/media-sound/karlyriceditor/metadata.xml
index b060190a0f50..ab269bf7cdc8 100644
--- a/media-sound/karlyriceditor/metadata.xml
+++ b/media-sound/karlyriceditor/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>sound</herd>
- <herd>qt</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">karlyriceditor</remote-id>
</upstream>
diff --git a/media-sound/kaudiocreator/metadata.xml b/media-sound/kaudiocreator/metadata.xml
index ede2e3c0508d..e061ace22615 100644
--- a/media-sound/kaudiocreator/metadata.xml
+++ b/media-sound/kaudiocreator/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>sound</herd>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-sound/kenvy24/metadata.xml b/media-sound/kenvy24/metadata.xml
index b33fb2b8cf32..6041e54f15ec 100644
--- a/media-sound/kenvy24/metadata.xml
+++ b/media-sound/kenvy24/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>sound</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">kenvy24</remote-id>
</upstream>
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
index 3455b8613e31..7281065803a1 100644
--- a/media-sound/kid3/metadata.xml
+++ b/media-sound/kid3/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>sound</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="acoustid">Enable support for acoustic fingerprinting plugin using
(<pkg>media-libs/chromaprint</pkg>)</flag>
diff --git a/media-sound/kmetronome/metadata.xml b/media-sound/kmetronome/metadata.xml
index 9a940c2c43f6..e610d4bc13d2 100644
--- a/media-sound/kmetronome/metadata.xml
+++ b/media-sound/kmetronome/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>sound</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">kmetronome</remote-id>
</upstream>
diff --git a/media-sound/kmid/metadata.xml b/media-sound/kmid/metadata.xml
index 3f64f0879217..3232f5773dab 100644
--- a/media-sound/kmid/metadata.xml
+++ b/media-sound/kmid/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>sound</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">kmid2</remote-id>
</upstream>
diff --git a/media-sound/kmidimon/metadata.xml b/media-sound/kmidimon/metadata.xml
index 692f59fa5841..b9e15e8ab395 100644
--- a/media-sound/kmidimon/metadata.xml
+++ b/media-sound/kmidimon/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>sound</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">kmidimon</remote-id>
</upstream>
diff --git a/media-sound/konvertible/metadata.xml b/media-sound/konvertible/metadata.xml
index e737e3a436d2..dca33e591f21 100644
--- a/media-sound/konvertible/metadata.xml
+++ b/media-sound/konvertible/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>sound</herd>
-<herd>kde</herd>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-sound/kradio/metadata.xml b/media-sound/kradio/metadata.xml
index 2b76613721f7..1d0ae25b40c8 100644
--- a/media-sound/kradio/metadata.xml
+++ b/media-sound/kradio/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">kradio</remote-id>
</upstream>
diff --git a/media-sound/kstreamripper/metadata.xml b/media-sound/kstreamripper/metadata.xml
index 9236e6b99c1d..be634fa3b7b4 100644
--- a/media-sound/kstreamripper/metadata.xml
+++ b/media-sound/kstreamripper/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>sound</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">kstreamripper</remote-id>
</upstream>
diff --git a/media-sound/kwave/metadata.xml b/media-sound/kwave/metadata.xml
index 44d8bd70fea4..c26d7caae024 100644
--- a/media-sound/kwave/metadata.xml
+++ b/media-sound/kwave/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>
<longdescription>With Kwave you can edit many sorts of wav-files including multi-channel files. You are able to alter and play back each channel on its own. Kwave also includes many plugins (most are still under development) to transform the wave-file in several ways and presents a graphical view with a complete zoom- and scroll capability.</longdescription>
<use>
<flag name="opus">Enable Opus audio codec support</flag>
diff --git a/media-sound/lame/metadata.xml b/media-sound/lame/metadata.xml
index 3b49a3fd60bf..3096488249d4 100644
--- a/media-sound/lame/metadata.xml
+++ b/media-sound/lame/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="mp3rtp">Build the mp3-to-RTP streaming utility. **UNSUPPORTED**</flag>
</use>
diff --git a/media-sound/lash/metadata.xml b/media-sound/lash/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/lash/metadata.xml
+++ b/media-sound/lash/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-sound/lastfm-desktop/metadata.xml b/media-sound/lastfm-desktop/metadata.xml
index 8ab053686c08..45ea44fd0ffe 100644
--- a/media-sound/lastfm-desktop/metadata.xml
+++ b/media-sound/lastfm-desktop/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">lastfm/lastfm-desktop</remote-id>
</upstream>
diff --git a/media-sound/lastfmplayer/metadata.xml b/media-sound/lastfmplayer/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/lastfmplayer/metadata.xml
+++ b/media-sound/lastfmplayer/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-sound/lilypond/metadata.xml b/media-sound/lilypond/metadata.xml
index 988c0d0c5fe2..eaff3f190935 100644
--- a/media-sound/lilypond/metadata.xml
+++ b/media-sound/lilypond/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>scheme</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>hkBst@gentoo.org</email>
<name>Marijn Schouten</name>
@@ -15,6 +13,14 @@
<email>karl.j.linden@gmail.com</email>
<name>Karl Linden</name>
</maintainer>
+ <maintainer>
+ <email>scheme@gentoo.org</email>
+ <name>Gentoo Scheme Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
LilyPond is an automated engraving system. It formats music beautifully and automatically, and has a friendly syntax for its input files.
</longdescription>
diff --git a/media-sound/lingot/metadata.xml b/media-sound/lingot/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/lingot/metadata.xml
+++ b/media-sound/lingot/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-sound/linuxsampler/metadata.xml b/media-sound/linuxsampler/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/linuxsampler/metadata.xml
+++ b/media-sound/linuxsampler/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-sound/listen/metadata.xml b/media-sound/listen/metadata.xml
index fbb7560bc15d..14c4125617e7 100644
--- a/media-sound/listen/metadata.xml
+++ b/media-sound/listen/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>
Listen, a music management and playback for GNOME
diff --git a/media-sound/litestream/metadata.xml b/media-sound/litestream/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/litestream/metadata.xml
+++ b/media-sound/litestream/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-sound/lltag/metadata.xml b/media-sound/lltag/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/lltag/metadata.xml
+++ b/media-sound/lltag/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-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
index 076791f8a9e2..c97a8b433e87 100644
--- a/media-sound/lmms/metadata.xml
+++ b/media-sound/lmms/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>
@@ -21,6 +19,14 @@
<name>Jonathan Aquilina</name>
<description>Please assign bugs</description>
</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>
<use>
<flag name="fluidsynth">Enables Fluidsynth MIDI software synthesis plugin.</flag>
<flag name="stk">Enables STK Mallet plugin.</flag>
diff --git a/media-sound/lxmusic/metadata.xml b/media-sound/lxmusic/metadata.xml
index f8f477c04966..4c90d0fde16f 100644
--- a/media-sound/lxmusic/metadata.xml
+++ b/media-sound/lxmusic/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>lxde</herd>
+ <maintainer>
+ <email>lxde@gentoo.org</email>
+ <name>Gentoo LXDE Project</name>
+ </maintainer>
<longdescription>LXMusic is a simple GUI XMMS2 client with minimal functionality. It can do nothing more than playing music files.</longdescription>
<upstream>
<remote-id type="sourceforge">lxde</remote-id>
diff --git a/media-sound/lyvi/metadata.xml b/media-sound/lyvi/metadata.xml
index 1646c2fcad92..3d0d714b99f6 100644
--- a/media-sound/lyvi/metadata.xml
+++ b/media-sound/lyvi/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>python</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>idella4@gentoo.org</email>
</maintainer>
@@ -11,6 +9,14 @@
<name>Witold Pilat</name>
<description>Proxy maintainer</description>
</maintainer>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>Lyvi is a lyrics, artist info and guitar tabs
viewer. On supported terminals, Lyvi can also show artist photos and
cover images.
diff --git a/media-sound/mac/metadata.xml b/media-sound/mac/metadata.xml
index 1d564b87f116..9a9ae39ad271 100644
--- a/media-sound/mac/metadata.xml
+++ b/media-sound/mac/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>billie@gentoo.org</email>
<name>Daniel Pielmeier</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-sound/madplay/metadata.xml b/media-sound/madplay/metadata.xml
index 315b2eb6f52e..eb6c750caeba 100644
--- a/media-sound/madplay/metadata.xml
+++ b/media-sound/madplay/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-sound/mangler/metadata.xml b/media-sound/mangler/metadata.xml
index 07e68d257297..f061e6a5677f 100644
--- a/media-sound/mangler/metadata.xml
+++ b/media-sound/mangler/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<use>
<flag name="espeak">Text to speech engine</flag>
<flag name="g15">Logitech g15 lcd support</flag>
@@ -10,4 +9,8 @@
<maintainer>
<email>prometheanfire@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-sound/mcdp/metadata.xml b/media-sound/mcdp/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mcdp/metadata.xml
+++ b/media-sound/mcdp/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-sound/meterbridge/metadata.xml b/media-sound/meterbridge/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/meterbridge/metadata.xml
+++ b/media-sound/meterbridge/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-sound/mhwaveedit/metadata.xml b/media-sound/mhwaveedit/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mhwaveedit/metadata.xml
+++ b/media-sound/mhwaveedit/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-sound/mikmod/metadata.xml b/media-sound/mikmod/metadata.xml
index b86266440788..a382cc1d7e6c 100644
--- a/media-sound/mikmod/metadata.xml
+++ b/media-sound/mikmod/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-sound/milkytracker/metadata.xml b/media-sound/milkytracker/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/milkytracker/metadata.xml
+++ b/media-sound/milkytracker/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-sound/mimd/metadata.xml b/media-sound/mimd/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mimd/metadata.xml
+++ b/media-sound/mimd/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-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 8d08bbb05339..4db84a09a771 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/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="hid">Enable HID controller support</flag>
<flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
diff --git a/media-sound/mmix/metadata.xml b/media-sound/mmix/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mmix/metadata.xml
+++ b/media-sound/mmix/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-sound/moc/metadata.xml b/media-sound/moc/metadata.xml
index 0ed4f43541ba..3b031ffbeb92 100644
--- a/media-sound/moc/metadata.xml
+++ b/media-sound/moc/metadata.xml
@@ -5,7 +5,10 @@
<email>radhermit@gentoo.org</email>
<name>Tim Harder</name>
</maintainer>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="cache">Enable tags caching support</flag>
<flag name="magic">Use libmagic to determine mimetypes</flag>
diff --git a/media-sound/modplugtools/metadata.xml b/media-sound/modplugtools/metadata.xml
index f38b8dd871f0..f0c4bfed03b7 100644
--- a/media-sound/modplugtools/metadata.xml
+++ b/media-sound/modplugtools/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">modplug-xmms</remote-id>
</upstream>
diff --git a/media-sound/moodbar/metadata.xml b/media-sound/moodbar/metadata.xml
index 3cbd34b008ee..cbb24e3b00e0 100644
--- a/media-sound/moodbar/metadata.xml
+++ b/media-sound/moodbar/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>sound</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-sound/moosic/metadata.xml b/media-sound/moosic/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/moosic/metadata.xml
+++ b/media-sound/moosic/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-sound/mp32ogg/metadata.xml b/media-sound/mp32ogg/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mp32ogg/metadata.xml
+++ b/media-sound/mp32ogg/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-sound/mp3_check/metadata.xml b/media-sound/mp3_check/metadata.xml
index b285f3ae22f0..471cbd214e1f 100644
--- a/media-sound/mp3_check/metadata.xml
+++ b/media-sound/mp3_check/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">mp3check</remote-id>
</upstream>
diff --git a/media-sound/mp3asm/metadata.xml b/media-sound/mp3asm/metadata.xml
index 68c47aa31f4d..750e38f0c392 100644
--- a/media-sound/mp3asm/metadata.xml
+++ b/media-sound/mp3asm/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">mp3asm</remote-id>
</upstream>
diff --git a/media-sound/mp3blaster/metadata.xml b/media-sound/mp3blaster/metadata.xml
index dbdb14e66904..dbbf50566e27 100644
--- a/media-sound/mp3blaster/metadata.xml
+++ b/media-sound/mp3blaster/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="sid">Build with SID (Commodore 64 Audio) support</flag>
</use>
diff --git a/media-sound/mp3c/metadata.xml b/media-sound/mp3c/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mp3c/metadata.xml
+++ b/media-sound/mp3c/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-sound/mp3cat/metadata.xml b/media-sound/mp3cat/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mp3cat/metadata.xml
+++ b/media-sound/mp3cat/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-sound/mp3check/metadata.xml b/media-sound/mp3check/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mp3check/metadata.xml
+++ b/media-sound/mp3check/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-sound/mp3diags/metadata.xml b/media-sound/mp3diags/metadata.xml
index 32a4a36c9c56..43ff5e9615e4 100644
--- a/media-sound/mp3diags/metadata.xml
+++ b/media-sound/mp3diags/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">mp3diags</remote-id>
</upstream>
diff --git a/media-sound/mp3gain/metadata.xml b/media-sound/mp3gain/metadata.xml
index ea3b89738a14..04950321cc92 100644
--- a/media-sound/mp3gain/metadata.xml
+++ b/media-sound/mp3gain/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">mp3gain</remote-id>
</upstream>
diff --git a/media-sound/mp3info/metadata.xml b/media-sound/mp3info/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mp3info/metadata.xml
+++ b/media-sound/mp3info/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-sound/mp3report/metadata.xml b/media-sound/mp3report/metadata.xml
index ef0d54f2d511..c86d5150dd3b 100644
--- a/media-sound/mp3report/metadata.xml
+++ b/media-sound/mp3report/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">mp3report</remote-id>
</upstream>
diff --git a/media-sound/mp3splt-gtk/metadata.xml b/media-sound/mp3splt-gtk/metadata.xml
index 1f6ffde17d63..1990ed42d526 100644
--- a/media-sound/mp3splt-gtk/metadata.xml
+++ b/media-sound/mp3splt-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>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="audacious">Include <pkg>media-sound/audacious</pkg> support</flag>
<flag name="gtk3">Link against <pkg>x11-libs/gtk+</pkg>:3 instead of <pkg>x11-libs/gtk+</pkg>:2</flag>
diff --git a/media-sound/mp3splt/metadata.xml b/media-sound/mp3splt/metadata.xml
index 33770ad622d0..7155422f134e 100644
--- a/media-sound/mp3splt/metadata.xml
+++ b/media-sound/mp3splt/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-sound/mp3unicode/metadata.xml b/media-sound/mp3unicode/metadata.xml
index d620a24b2746..7ea86839e3fb 100644
--- a/media-sound/mp3unicode/metadata.xml
+++ b/media-sound/mp3unicode/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">alonbl/mp3unicode</remote-id>
<remote-id type="sourceforge">mp3unicode</remote-id>
diff --git a/media-sound/mp3wrap/metadata.xml b/media-sound/mp3wrap/metadata.xml
index 63c81edecdb3..9d8f5ba63195 100644
--- a/media-sound/mp3wrap/metadata.xml
+++ b/media-sound/mp3wrap/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">mp3wrap</remote-id>
</upstream>
diff --git a/media-sound/mpc/metadata.xml b/media-sound/mpc/metadata.xml
index f939777e6a35..2fa6e9be702f 100644
--- a/media-sound/mpc/metadata.xml
+++ b/media-sound/mpc/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-sound/mpck/metadata.xml b/media-sound/mpck/metadata.xml
index a025c77c7636..d610f01bea87 100644
--- a/media-sound/mpck/metadata.xml
+++ b/media-sound/mpck/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>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-sound/mpd/metadata.xml b/media-sound/mpd/metadata.xml
index bd5d3c419b34..dc3bff13f6e9 100644
--- a/media-sound/mpd/metadata.xml
+++ b/media-sound/mpd/metadata.xml
@@ -1,7 +1,6 @@
<?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>
@@ -10,6 +9,10 @@
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="adplug">Enable the AdPlug decoder plugin</flag>
<flag name="cdio">Use libcdio for ISO9660 parsing support</flag>
diff --git a/media-sound/mpdas/metadata.xml b/media-sound/mpdas/metadata.xml
index 159a30662957..4e34420f9448 100644
--- a/media-sound/mpdas/metadata.xml
+++ b/media-sound/mpdas/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-sound/mpdscribble/metadata.xml b/media-sound/mpdscribble/metadata.xml
index 5789d68fda54..0b03994b1f8a 100644
--- a/media-sound/mpdscribble/metadata.xml
+++ b/media-sound/mpdscribble/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription lang="en">
A client for the Music Player Daemon that sends information to
Audioscrobbler -- a website (www.last.fm) displaying what various people
diff --git a/media-sound/mpfc/metadata.xml b/media-sound/mpfc/metadata.xml
index 2227ff7a1ff4..6538db374809 100644
--- a/media-sound/mpfc/metadata.xml
+++ b/media-sound/mpfc/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="wav">Enable wav audio codec support</flag>
</use>
diff --git a/media-sound/mpg123/metadata.xml b/media-sound/mpg123/metadata.xml
index 0ddbd9e20b42..039258391218 100644
--- a/media-sound/mpg123/metadata.xml
+++ b/media-sound/mpg123/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>
<maintainer>
<email>thomas-forum@orgis.org</email>
diff --git a/media-sound/mpg321/metadata.xml b/media-sound/mpg321/metadata.xml
index e16c7f691b28..2e5864c49a3c 100644
--- a/media-sound/mpg321/metadata.xml
+++ b/media-sound/mpg321/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">mpg321</remote-id>
</upstream>
diff --git a/media-sound/mplay/metadata.xml b/media-sound/mplay/metadata.xml
index d70777d3bcb5..a8cce87015c4 100644
--- a/media-sound/mplay/metadata.xml
+++ b/media-sound/mplay/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">mplay</remote-id>
</upstream>
diff --git a/media-sound/mserv/metadata.xml b/media-sound/mserv/metadata.xml
index 40df0e99544a..3087bb9043dc 100644
--- a/media-sound/mserv/metadata.xml
+++ b/media-sound/mserv/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">mserv</remote-id>
</upstream>
diff --git a/media-sound/mt-daapd/metadata.xml b/media-sound/mt-daapd/metadata.xml
index ca0aef2e58a7..3123ea00e8d7 100644
--- a/media-sound/mt-daapd/metadata.xml
+++ b/media-sound/mt-daapd/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">mt-daapd</remote-id>
</upstream>
diff --git a/media-sound/muine/metadata.xml b/media-sound/muine/metadata.xml
index 42d1ea6516db..30256e4f2faa 100644
--- a/media-sound/muine/metadata.xml
+++ b/media-sound/muine/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>gstreamer</herd>
+ <maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
+<maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-sound/multimux/metadata.xml b/media-sound/multimux/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/multimux/metadata.xml
+++ b/media-sound/multimux/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-sound/mup/metadata.xml b/media-sound/mup/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/mup/metadata.xml
+++ b/media-sound/mup/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-sound/muse/metadata.xml b/media-sound/muse/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/muse/metadata.xml
+++ b/media-sound/muse/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-sound/musepack-tools/metadata.xml b/media-sound/musepack-tools/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/musepack-tools/metadata.xml
+++ b/media-sound/musepack-tools/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-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index d6612ec42ab0..40a68b5f23f9 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/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">mscore</remote-id>
<remote-id type="github">musescore/MuseScore</remote-id>
diff --git a/media-sound/musique/metadata.xml b/media-sound/musique/metadata.xml
index dc439f7e84f5..4f773f3cebf0 100644
--- a/media-sound/musique/metadata.xml
+++ b/media-sound/musique/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>qt</herd>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-sound/ncmpc/metadata.xml b/media-sound/ncmpc/metadata.xml
index 33213f752747..7f54a1cf6bd1 100644
--- a/media-sound/ncmpc/metadata.xml
+++ b/media-sound/ncmpc/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>
<use>
<flag name="artist-screen">Enable artist screen</flag>
<flag name="chat-screen">Enable the chat screen</flag>
diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
index 26ee4d9a205a..7f919ed14846 100644
--- a/media-sound/ncmpcpp/metadata.xml
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>jer@gentoo.org</email>
</maintainer>
@@ -9,6 +8,10 @@
<email>wired@gentoo.org</email>
<name>Alex Alexander</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="clock">Enable clock screen</flag>
<flag name="outputs">Enable outputs screen</flag>
diff --git a/media-sound/neutrino/metadata.xml b/media-sound/neutrino/metadata.xml
index 86c665161c18..d703f5e6fef8 100644
--- a/media-sound/neutrino/metadata.xml
+++ b/media-sound/neutrino/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">neutrino</remote-id>
</upstream>
diff --git a/media-sound/normalize/metadata.xml b/media-sound/normalize/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/normalize/metadata.xml
+++ b/media-sound/normalize/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-sound/ogg2mp3/metadata.xml b/media-sound/ogg2mp3/metadata.xml
index c1af6c114e5b..fbfbece0c8e8 100644
--- a/media-sound/ogg2mp3/metadata.xml
+++ b/media-sound/ogg2mp3/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>chainsaw@gentoo.org</email>
<name>Tony Vroon</name>
@@ -11,6 +9,14 @@
<email>james.ausmus@gmail.com</email>
<name>James Ausmus</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>
<upstream>
<changelog>http://www.gitorious.org/ogg2mp3/ogg2mp3/commits/master</changelog>
<doc>http://www.gitorious.org/ogg2mp3/pages/Home</doc>
diff --git a/media-sound/oggtst/metadata.xml b/media-sound/oggtst/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/oggtst/metadata.xml
+++ b/media-sound/oggtst/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-sound/ogmtools/metadata.xml b/media-sound/ogmtools/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/ogmtools/metadata.xml
+++ b/media-sound/ogmtools/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-sound/opus-tools/metadata.xml b/media-sound/opus-tools/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/opus-tools/metadata.xml
+++ b/media-sound/opus-tools/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-sound/orpheus/metadata.xml b/media-sound/orpheus/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/orpheus/metadata.xml
+++ b/media-sound/orpheus/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-sound/paprefs/metadata.xml b/media-sound/paprefs/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/paprefs/metadata.xml
+++ b/media-sound/paprefs/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-sound/pasystray/metadata.xml b/media-sound/pasystray/metadata.xml
index fe4fdc23e030..2a91428e0e02 100644
--- a/media-sound/pasystray/metadata.xml
+++ b/media-sound/pasystray/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>lmiphay@gmail.com</email>
<name>Paul Healy</name>
<description>Proxy maintainer</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>
<upstream>
<remote-id type="github">christophgysin/pasystray</remote-id>
</upstream>
diff --git a/media-sound/patchage/metadata.xml b/media-sound/patchage/metadata.xml
index 2f46d3c78999..47128f39a008 100644
--- a/media-sound/patchage/metadata.xml
+++ b/media-sound/patchage/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="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
<flag name="session">Include experimental Jack session management
diff --git a/media-sound/pavucontrol/metadata.xml b/media-sound/pavucontrol/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/pavucontrol/metadata.xml
+++ b/media-sound/pavucontrol/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-sound/pavumeter/metadata.xml b/media-sound/pavumeter/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/pavumeter/metadata.xml
+++ b/media-sound/pavumeter/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-sound/peercast/metadata.xml b/media-sound/peercast/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/peercast/metadata.xml
+++ b/media-sound/peercast/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-sound/phasex/metadata.xml b/media-sound/phasex/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/phasex/metadata.xml
+++ b/media-sound/phasex/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-sound/pianobooster/metadata.xml b/media-sound/pianobooster/metadata.xml
index 3f6f2798fdcb..3719b10ada09 100644
--- a/media-sound/pianobooster/metadata.xml
+++ b/media-sound/pianobooster/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="fluidsynth">Enable Fluidsynth MIDI software synthesis</flag>
</use>
diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
index 3e7045f9a689..f923d02aed27 100644
--- a/media-sound/picard/metadata.xml
+++ b/media-sound/picard/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>MusicBrainz Picard is a cross-platform MusicBrainz tag editor
written in Python. Picard Tagger is intended to be the next generation of
tagger for MusicBrainz, with a focus on album oriented tagging as opposed to
diff --git a/media-sound/picoxine/metadata.xml b/media-sound/picoxine/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/picoxine/metadata.xml
+++ b/media-sound/picoxine/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-sound/pitchtune/metadata.xml b/media-sound/pitchtune/metadata.xml
index ce1975285068..95206245c04d 100644
--- a/media-sound/pitchtune/metadata.xml
+++ b/media-sound/pitchtune/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">pitchtune</remote-id>
</upstream>
diff --git a/media-sound/playmidi/metadata.xml b/media-sound/playmidi/metadata.xml
index 5084ba319789..48a626b579bc 100644
--- a/media-sound/playmidi/metadata.xml
+++ b/media-sound/playmidi/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">playmidi</remote-id>
</upstream>
diff --git a/media-sound/poc/metadata.xml b/media-sound/poc/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/poc/metadata.xml
+++ b/media-sound/poc/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-sound/podcatcher/metadata.xml b/media-sound/podcatcher/metadata.xml
index c7e80b89344d..e3666375744a 100644
--- a/media-sound/podcatcher/metadata.xml
+++ b/media-sound/podcatcher/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">
</longdescription>
<use>
diff --git a/media-sound/podget/metadata.xml b/media-sound/podget/metadata.xml
index 1cae8b0fa16a..72600e510b99 100644
--- a/media-sound/podget/metadata.xml
+++ b/media-sound/podget/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>kitcat490@gmail.com</email>
<name>Michael Niehoff</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">podget</remote-id>
</upstream>
diff --git a/media-sound/positron/metadata.xml b/media-sound/positron/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/positron/metadata.xml
+++ b/media-sound/positron/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-sound/potamus/metadata.xml b/media-sound/potamus/metadata.xml
index ac6c4aa59c7f..54be525ca87b 100644
--- a/media-sound/potamus/metadata.xml
+++ b/media-sound/potamus/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="opus">Adds support for the Opus codec.</flag>
</use>
diff --git a/media-sound/projectm-jack/metadata.xml b/media-sound/projectm-jack/metadata.xml
index 2ace5da19108..24c142d93fad 100644
--- a/media-sound/projectm-jack/metadata.xml
+++ b/media-sound/projectm-jack/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-sound/projectm-pulseaudio/metadata.xml b/media-sound/projectm-pulseaudio/metadata.xml
index 2ace5da19108..24c142d93fad 100644
--- a/media-sound/projectm-pulseaudio/metadata.xml
+++ b/media-sound/projectm-pulseaudio/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-sound/protux/metadata.xml b/media-sound/protux/metadata.xml
index f5ceb6749c2d..0949ed8a775e 100644
--- a/media-sound/protux/metadata.xml
+++ b/media-sound/protux/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>proaudio</herd>
- <herd>java</herd>
+ <maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+ </maintainer>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">protux</remote-id>
</upstream>
diff --git a/media-sound/ptabtools/metadata.xml b/media-sound/ptabtools/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/ptabtools/metadata.xml
+++ b/media-sound/ptabtools/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-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 11ddd79c4996..33fbae98214d 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/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>
<use>
<flag name="X">
Build the X11 publish module to export PulseAudio information
diff --git a/media-sound/pwavecat/metadata.xml b/media-sound/pwavecat/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/pwavecat/metadata.xml
+++ b/media-sound/pwavecat/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-sound/pympd/metadata.xml b/media-sound/pympd/metadata.xml
index c1c8b1075dc8..9c72fc854ed2 100644
--- a/media-sound/pympd/metadata.xml
+++ b/media-sound/pympd/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>
pympd is a GTK+ front end client for the music playing daemon MPD
</longdescription>
diff --git a/media-sound/qarecord/metadata.xml b/media-sound/qarecord/metadata.xml
index 939a2c64eb67..5c956ac2c61f 100644
--- a/media-sound/qarecord/metadata.xml
+++ b/media-sound/qarecord/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">alsamodular</remote-id>
</upstream>
diff --git a/media-sound/qastools/metadata.xml b/media-sound/qastools/metadata.xml
index 6a60bbd94825..79a7e1901f0c 100644
--- a/media-sound/qastools/metadata.xml
+++ b/media-sound/qastools/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">qastools</remote-id>
</upstream>
diff --git a/media-sound/qjackctl/metadata.xml b/media-sound/qjackctl/metadata.xml
index a82e3bf98ee3..5846e77640c3 100644
--- a/media-sound/qjackctl/metadata.xml
+++ b/media-sound/qjackctl/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">qjackctl</remote-id>
</upstream>
diff --git a/media-sound/qmidiarp/metadata.xml b/media-sound/qmidiarp/metadata.xml
index a612400d0ddf..37b0d202c748 100644
--- a/media-sound/qmidiarp/metadata.xml
+++ b/media-sound/qmidiarp/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">qmidiarp</remote-id>
</upstream>
diff --git a/media-sound/qmidiroute/metadata.xml b/media-sound/qmidiroute/metadata.xml
index 939a2c64eb67..5c956ac2c61f 100644
--- a/media-sound/qmidiroute/metadata.xml
+++ b/media-sound/qmidiroute/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">alsamodular</remote-id>
</upstream>
diff --git a/media-sound/qmmp/metadata.xml b/media-sound/qmmp/metadata.xml
index 2bef1e643661..e1d5dc6a042d 100644
--- a/media-sound/qmmp/metadata.xml
+++ b/media-sound/qmmp/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<use>
<flag name="analyzer">Enable visual analyzer</flag>
<flag name="bs2b">Enable Bauer stereophonic-to-binaural headphone filter</flag>
diff --git a/media-sound/qmpdclient/metadata.xml b/media-sound/qmpdclient/metadata.xml
index 4e2154e07e54..59af5a19e45d 100644
--- a/media-sound/qmpdclient/metadata.xml
+++ b/media-sound/qmpdclient/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription lang="en">
QMPDClient is an easy to use Qt4 client for MPD
</longdescription>
diff --git a/media-sound/qpitch/metadata.xml b/media-sound/qpitch/metadata.xml
index 84d667565f36..73a64b271252 100644
--- a/media-sound/qpitch/metadata.xml
+++ b/media-sound/qpitch/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>qt</herd>
- <herd>sound</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-sound/qsampler/metadata.xml b/media-sound/qsampler/metadata.xml
index fcd34008ac32..c816e36019b0 100644
--- a/media-sound/qsampler/metadata.xml
+++ b/media-sound/qsampler/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="libgig">Enable libgig support for loading Gigasampler files and
DLS (Downloadable Sounds) Level 1/2 files</flag>
diff --git a/media-sound/qsynth/metadata.xml b/media-sound/qsynth/metadata.xml
index 7047d1231fd4..baca8975bbfd 100644
--- a/media-sound/qsynth/metadata.xml
+++ b/media-sound/qsynth/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>
QSynth is a fluidsynth GUI front-end application written in C++ around the
Qt3 toolkit using Qt Designer. Eventually it may evolve into a softsynth
diff --git a/media-sound/qtagconvert/metadata.xml b/media-sound/qtagconvert/metadata.xml
index 263a40f9ba45..b0a3c058c846 100644
--- a/media-sound/qtagconvert/metadata.xml
+++ b/media-sound/qtagconvert/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">qtagconvert</remote-id>
</upstream>
diff --git a/media-sound/qtagger/metadata.xml b/media-sound/qtagger/metadata.xml
index d3a41ffbcc64..3db5ea04703f 100644
--- a/media-sound/qtagger/metadata.xml
+++ b/media-sound/qtagger/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>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/media-sound/qtgain/metadata.xml b/media-sound/qtgain/metadata.xml
index 30d1023796f6..49caddf99969 100644
--- a/media-sound/qtgain/metadata.xml
+++ b/media-sound/qtgain/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>sound</herd>
- <herd>qt</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+<maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-sound/qtmpc/metadata.xml b/media-sound/qtmpc/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-sound/qtmpc/metadata.xml
+++ b/media-sound/qtmpc/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-sound/qtractor/metadata.xml b/media-sound/qtractor/metadata.xml
index 2ff56672fdc9..d6dc735dd109 100644
--- a/media-sound/qtractor/metadata.xml
+++ b/media-sound/qtractor/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="dssi">Enable support for DSSI Soft Synth Interface</flag>
<flag name="rubberband">Enable support for in-place audio clip pitch-shifting through the rubberband library</flag>
diff --git a/media-sound/qtscrobbler/metadata.xml b/media-sound/qtscrobbler/metadata.xml
index dd2281bd0c8a..0bbb96dba18c 100644
--- a/media-sound/qtscrobbler/metadata.xml
+++ b/media-sound/qtscrobbler/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="cli">Build commandline client</flag>
</use>
diff --git a/media-sound/quark/metadata.xml b/media-sound/quark/metadata.xml
index 55d06d8daede..ce44a3c6fe68 100644
--- a/media-sound/quark/metadata.xml
+++ b/media-sound/quark/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="gnome">Provides tray-icon and enables gconf support</flag>
</use>
diff --git a/media-sound/quimup/metadata.xml b/media-sound/quimup/metadata.xml
index 00412319d72b..050a27d6cf86 100644
--- a/media-sound/quimup/metadata.xml
+++ b/media-sound/quimup/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">quimup</remote-id>
</upstream>
diff --git a/media-sound/quodlibet/metadata.xml b/media-sound/quodlibet/metadata.xml
index 6b9595c1ae51..cc2b2332e1fd 100644
--- a/media-sound/quodlibet/metadata.xml
+++ b/media-sound/quodlibet/metadata.xml
@@ -5,7 +5,10 @@
<email>tamiko@gentoo.org</email>
<name>Matthias Maier</name>
</maintainer>
- <herd>sound</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>Quod Libet is a GTK+-based audio player written in Python. It's
designed around the idea that you know better than we do how to
organize your music. It lets you make playlists based on regular
diff --git a/media-sound/rawrec/metadata.xml b/media-sound/rawrec/metadata.xml
index 1421a55ad46b..ddd0a32fd2ba 100644
--- a/media-sound/rawrec/metadata.xml
+++ b/media-sound/rawrec/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">rawrec</remote-id>
</upstream>
diff --git a/media-sound/rcenter/metadata.xml b/media-sound/rcenter/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/rcenter/metadata.xml
+++ b/media-sound/rcenter/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-sound/redoflacs/metadata.xml b/media-sound/redoflacs/metadata.xml
index 83782c22fa7c..c9dc5a6cee04 100644
--- a/media-sound/redoflacs/metadata.xml
+++ b/media-sound/redoflacs/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">sirjaren/redoflacs</remote-id>
</upstream>
diff --git a/media-sound/retrovol/metadata.xml b/media-sound/retrovol/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/retrovol/metadata.xml
+++ b/media-sound/retrovol/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-sound/rexima/metadata.xml b/media-sound/rexima/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/rexima/metadata.xml
+++ b/media-sound/rexima/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-sound/rezound/metadata.xml b/media-sound/rezound/metadata.xml
index 5200ae4c725e..b268de27c68e 100644
--- a/media-sound/rezound/metadata.xml
+++ b/media-sound/rezound/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="16bittmp">Use 16bit temporary files (default 32bit float), useful for slower computers</flag>
<flag name="soundtouch">compile with support for soundtouch</flag>
diff --git a/media-sound/rhythmbox/metadata.xml b/media-sound/rhythmbox/metadata.xml
index bb30c380f030..cd0cb49b7ad0 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <herd>gstreamer</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer>
+ <email>gstreamer@gentoo.org</email>
+ <name>GStreamer package maintainers</name>
+ </maintainer>
<use>
<flag name="daap">Build the local network music sharing plugin which uses the DAAP protocol using <pkg>net-libs/libdmapsharing</pkg></flag>
<flag name="html">Use <pkg>net-libs/webkit-gtk</pkg> for detecting and displaying HTML podcast episode descriptions.</flag>
diff --git a/media-sound/rip/metadata.xml b/media-sound/rip/metadata.xml
index 93a666f25047..4b42cef271c9 100644
--- a/media-sound/rip/metadata.xml
+++ b/media-sound/rip/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">rip</remote-id>
</upstream>
diff --git a/media-sound/ripperx/metadata.xml b/media-sound/ripperx/metadata.xml
index 29910c778d39..d62377eaea6a 100644
--- a/media-sound/ripperx/metadata.xml
+++ b/media-sound/ripperx/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">ripperx</remote-id>
</upstream>
diff --git a/media-sound/rosegarden/metadata.xml b/media-sound/rosegarden/metadata.xml
index b1d330caed72..40f44d1705d4 100644
--- a/media-sound/rosegarden/metadata.xml
+++ b/media-sound/rosegarden/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">rosegarden</remote-id>
</upstream>
diff --git a/media-sound/rplay/metadata.xml b/media-sound/rplay/metadata.xml
index 4acb13994e2f..c78682cd2d3c 100644
--- a/media-sound/rplay/metadata.xml
+++ b/media-sound/rplay/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">
rplay is a flexible network audio system that allows sounds to be played
to and from local and remote Unix systems. Sounds can be played with or
diff --git a/media-sound/saydate/metadata.xml b/media-sound/saydate/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/saydate/metadata.xml
+++ b/media-sound/saydate/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-sound/schismtracker/metadata.xml b/media-sound/schismtracker/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/schismtracker/metadata.xml
+++ b/media-sound/schismtracker/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-sound/seq24/metadata.xml b/media-sound/seq24/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/seq24/metadata.xml
+++ b/media-sound/seq24/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-sound/setmixer/metadata.xml b/media-sound/setmixer/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/setmixer/metadata.xml
+++ b/media-sound/setmixer/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-sound/sexypsf/metadata.xml b/media-sound/sexypsf/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/sexypsf/metadata.xml
+++ b/media-sound/sexypsf/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-sound/sfc/metadata.xml b/media-sound/sfc/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/sfc/metadata.xml
+++ b/media-sound/sfc/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-sound/shell-fm/metadata.xml b/media-sound/shell-fm/metadata.xml
index 8868a09811d7..290bab4f0a7b 100644
--- a/media-sound/shell-fm/metadata.xml
+++ b/media-sound/shell-fm/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">
Shell.FM is a lightweight console based player for Last.FM radio
streams. It's written mainly for Linux, but should be able to run on any
diff --git a/media-sound/shntool/metadata.xml b/media-sound/shntool/metadata.xml
index 640e5338ce75..33420c4b1694 100644
--- a/media-sound/shntool/metadata.xml
+++ b/media-sound/shntool/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="mac">Add support for Monkey's Audio files</flag>
<flag name="alac">Add support for Apple Lossless Audio Codec files</flag>
diff --git a/media-sound/shorten/metadata.xml b/media-sound/shorten/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/shorten/metadata.xml
+++ b/media-sound/shorten/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-sound/shoutcast-search/metadata.xml b/media-sound/shoutcast-search/metadata.xml
index 3239b7ba12bd..f7f25e1bbc05 100644
--- a/media-sound/shoutcast-search/metadata.xml
+++ b/media-sound/shoutcast-search/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">halhen/shoutcast-search</remote-id>
</upstream>
diff --git a/media-sound/shoutcast-server-bin/metadata.xml b/media-sound/shoutcast-server-bin/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/shoutcast-server-bin/metadata.xml
+++ b/media-sound/shoutcast-server-bin/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-sound/shoutcast-trans-bin/metadata.xml b/media-sound/shoutcast-trans-bin/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/shoutcast-trans-bin/metadata.xml
+++ b/media-sound/shoutcast-trans-bin/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-sound/sidplay/metadata.xml b/media-sound/sidplay/metadata.xml
index f13b23f890ed..dfcab150551c 100644
--- a/media-sound/sidplay/metadata.xml
+++ b/media-sound/sidplay/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-sound/sidplayfp/metadata.xml b/media-sound/sidplayfp/metadata.xml
index 8c08b7258eec..90aa617a4a63 100644
--- a/media-sound/sidplayfp/metadata.xml
+++ b/media-sound/sidplayfp/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-sound/smixer/metadata.xml b/media-sound/smixer/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/smixer/metadata.xml
+++ b/media-sound/smixer/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-sound/snd/metadata.xml b/media-sound/snd/metadata.xml
index 54673e45ae1f..7e9194309543 100644
--- a/media-sound/snd/metadata.xml
+++ b/media-sound/snd/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="s7">Enable the s7 extension language (a version of Scheme)</flag>
</use>
diff --git a/media-sound/sndfile-tools/metadata.xml b/media-sound/sndfile-tools/metadata.xml
index a2af0b606f0e..4c9c9f2d25f5 100644
--- a/media-sound/sndfile-tools/metadata.xml
+++ b/media-sound/sndfile-tools/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">
Sndfile-tools is a small collection of programs that use libsndfile and
other libraries to do useful things. The collection currently includes
diff --git a/media-sound/sndpeek/metadata.xml b/media-sound/sndpeek/metadata.xml
index 0aef688d14e5..b1b7ec81de1c 100644
--- a/media-sound/sndpeek/metadata.xml
+++ b/media-sound/sndpeek/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">
real-time audio visualization
</longdescription>
diff --git a/media-sound/solfege/metadata.xml b/media-sound/solfege/metadata.xml
index cc9b6dc7e0d3..4ff75b5201ef 100644
--- a/media-sound/solfege/metadata.xml
+++ b/media-sound/solfege/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">solfege</remote-id>
</upstream>
diff --git a/media-sound/sonata/metadata.xml b/media-sound/sonata/metadata.xml
index 77f49ada89be..3fa78a3b0bed 100644
--- a/media-sound/sonata/metadata.xml
+++ b/media-sound/sonata/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sound</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription>
Sonata is a lightweight GTK+ music client for the Music Player Daemon
(MPD). It aims to be efficient (no toolbar, main menu, or statusbar),
diff --git a/media-sound/sonic-visualiser/metadata.xml b/media-sound/sonic-visualiser/metadata.xml
index 44897b8eb8c0..da1b2604ebeb 100644
--- a/media-sound/sonic-visualiser/metadata.xml
+++ b/media-sound/sonic-visualiser/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="id3tag">Enables ID3 tagging with id3tag library</flag>
</use>
diff --git a/media-sound/sooperlooper/metadata.xml b/media-sound/sooperlooper/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/sooperlooper/metadata.xml
+++ b/media-sound/sooperlooper/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-sound/sound-juicer/metadata.xml b/media-sound/sound-juicer/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-sound/sound-juicer/metadata.xml
+++ b/media-sound/sound-juicer/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-sound/soundconverter/metadata.xml b/media-sound/soundconverter/metadata.xml
index 091f59ec4098..df70e6b56322 100644
--- a/media-sound/soundconverter/metadata.xml
+++ b/media-sound/soundconverter/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="opus">Enable Opus audio codec support</flag>
</use>
diff --git a/media-sound/soundkonverter/metadata.xml b/media-sound/soundkonverter/metadata.xml
index 3cbd34b008ee..cbb24e3b00e0 100644
--- a/media-sound/soundkonverter/metadata.xml
+++ b/media-sound/soundkonverter/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>sound</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-sound/sox/metadata.xml b/media-sound/sox/metadata.xml
index b3cb9b5d9c38..b23cd0e999af 100644
--- a/media-sound/sox/metadata.xml
+++ b/media-sound/sox/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="amr">Enables Adaptive Multi-Rate Audio support</flag>
<flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
diff --git a/media-sound/specimen/metadata.xml b/media-sound/specimen/metadata.xml
index ea3e2d913f8b..a14c596b64fb 100644
--- a/media-sound/specimen/metadata.xml
+++ b/media-sound/specimen/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>
Specimen is a midi controlled audio sampler for GNU/Linux systems. It
allows you to create music using various sound files, or "samples", in
diff --git a/media-sound/splay/metadata.xml b/media-sound/splay/metadata.xml
index a60a87642cef..70549a63919e 100644
--- a/media-sound/splay/metadata.xml
+++ b/media-sound/splay/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">splay</remote-id>
</upstream>
diff --git a/media-sound/split2flac/metadata.xml b/media-sound/split2flac/metadata.xml
index 5fc663412224..f00d7d0fcb48 100644
--- a/media-sound/split2flac/metadata.xml
+++ b/media-sound/split2flac/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>nikoli@gmx.us</email>
<name>Nikoli</name>
@@ -10,7 +9,14 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
- <herd>sound</herd>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
<longdescription lang="en">
Split2flac splits one big APE/FLAC/WV/WAV audio image (or a collection of
such files, recursively) with CUE sheet into FLAC/M4A/MP3/OGG_VORBIS/WAV
diff --git a/media-sound/streamripper/metadata.xml b/media-sound/streamripper/metadata.xml
index f22b3e40ffce..a9337885cbc8 100644
--- a/media-sound/streamripper/metadata.xml
+++ b/media-sound/streamripper/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">streamripper</remote-id>
</upstream>
diff --git a/media-sound/streamtranscoder/metadata.xml b/media-sound/streamtranscoder/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/streamtranscoder/metadata.xml
+++ b/media-sound/streamtranscoder/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-sound/substract_wave/metadata.xml b/media-sound/substract_wave/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/substract_wave/metadata.xml
+++ b/media-sound/substract_wave/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-sound/sweep/metadata.xml b/media-sound/sweep/metadata.xml
index c78de3906349..525e83ea1a7f 100644
--- a/media-sound/sweep/metadata.xml
+++ b/media-sound/sweep/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">sweep</remote-id>
</upstream>
diff --git a/media-sound/synaesthesia/metadata.xml b/media-sound/synaesthesia/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/synaesthesia/metadata.xml
+++ b/media-sound/synaesthesia/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-sound/taginfo/metadata.xml b/media-sound/taginfo/metadata.xml
index 9b13f666fe41..bda9b95ea21e 100644
--- a/media-sound/taginfo/metadata.xml
+++ b/media-sound/taginfo/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="freshmeat">taginfo</remote-id>
</upstream>
diff --git a/media-sound/tagtool/metadata.xml b/media-sound/tagtool/metadata.xml
index 03cfae90382d..4871a9ad3f64 100644
--- a/media-sound/tagtool/metadata.xml
+++ b/media-sound/tagtool/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">tagtool</remote-id>
</upstream>
diff --git a/media-sound/takcd/metadata.xml b/media-sound/takcd/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/takcd/metadata.xml
+++ b/media-sound/takcd/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-sound/tap-reverbed/metadata.xml b/media-sound/tap-reverbed/metadata.xml
index 41e894deb351..394e48a96406 100644
--- a/media-sound/tap-reverbed/metadata.xml
+++ b/media-sound/tap-reverbed/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">tap-plugins</remote-id>
</upstream>
diff --git a/media-sound/tapiir/metadata.xml b/media-sound/tapiir/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/tapiir/metadata.xml
+++ b/media-sound/tapiir/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-sound/teamspeak-client-bin/metadata.xml b/media-sound/teamspeak-client-bin/metadata.xml
index 4a48abc1f4d1..97d20e321dae 100644
--- a/media-sound/teamspeak-client-bin/metadata.xml
+++ b/media-sound/teamspeak-client-bin/metadata.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>gentoo@karolherbst.de</email>
<name>Karol Herbst</name>
@@ -12,5 +11,9 @@
<name>Sami Loone</name>
<description>Proxy-Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>TeamSpeak Client (Voice Communication Software)</longdescription>
</pkgmetadata>
diff --git a/media-sound/teamspeak-server-bin/metadata.xml b/media-sound/teamspeak-server-bin/metadata.xml
index 10b549928c5b..534be945cdec 100644
--- a/media-sound/teamspeak-server-bin/metadata.xml
+++ b/media-sound/teamspeak-server-bin/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>ck+gentoobugzilla@bl4ckb0x.de</email>
<name>Conrad Kostecki</name>
<description>Proxy maintaine, assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>TeamSpeak Server (Voice Communication Software)</longdescription>
<use>
<flag name="tsdns">Make use of TeamSpeak DNS.</flag>
diff --git a/media-sound/tempest_for_eliza/metadata.xml b/media-sound/tempest_for_eliza/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/tempest_for_eliza/metadata.xml
+++ b/media-sound/tempest_for_eliza/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-sound/terminatorx/metadata.xml b/media-sound/terminatorx/metadata.xml
index 0dc3775f83d7..b34010d8bf7a 100644
--- a/media-sound/terminatorx/metadata.xml
+++ b/media-sound/terminatorx/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-sound/timemachine/metadata.xml b/media-sound/timemachine/metadata.xml
index d4dd2647026b..9b6b28ab6950 100644
--- a/media-sound/timemachine/metadata.xml
+++ b/media-sound/timemachine/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>
Timemachine is a simple jack client record button remembering the last
ten seconds of audio when pressed.
diff --git a/media-sound/timidity++/metadata.xml b/media-sound/timidity++/metadata.xml
index 3c8a06a44add..9b738783d72f 100644
--- a/media-sound/timidity++/metadata.xml
+++ b/media-sound/timidity++/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">timidity</remote-id>
</upstream>
diff --git a/media-sound/timidity-eawpatches/metadata.xml b/media-sound/timidity-eawpatches/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/timidity-eawpatches/metadata.xml
+++ b/media-sound/timidity-eawpatches/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-sound/timidity-freepats/metadata.xml b/media-sound/timidity-freepats/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/timidity-freepats/metadata.xml
+++ b/media-sound/timidity-freepats/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-sound/tk707/metadata.xml b/media-sound/tk707/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/tk707/metadata.xml
+++ b/media-sound/tk707/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-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index bec753f04b2f..7d72736cdf4b 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/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>kde</herd>
<maintainer>
<email>johu@gentoo.org</email>
<name>Johannes Huber</name>
</maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<use>
<flag name="hatchet">Enable support for the synchronisation through Hatchet</flag>
<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
diff --git a/media-sound/toolame/metadata.xml b/media-sound/toolame/metadata.xml
index 606e35ac166d..fd46f058d418 100644
--- a/media-sound/toolame/metadata.xml
+++ b/media-sound/toolame/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">toolame</remote-id>
</upstream>
diff --git a/media-sound/traverso/metadata.xml b/media-sound/traverso/metadata.xml
index 4bb017c09afe..e33100bfe3b3 100644
--- a/media-sound/traverso/metadata.xml
+++ b/media-sound/traverso/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">
Traverso is a multitrack audio recording and editing program for GNU/Linux with
special emphasis to create an easy to use program with a clean and
diff --git a/media-sound/trommler/metadata.xml b/media-sound/trommler/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/trommler/metadata.xml
+++ b/media-sound/trommler/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-sound/ttaenc/metadata.xml b/media-sound/ttaenc/metadata.xml
index af7bf4d5d068..3389dbe2524c 100644
--- a/media-sound/ttaenc/metadata.xml
+++ b/media-sound/ttaenc/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">tta</remote-id>
</upstream>
diff --git a/media-sound/tudor-volumed/metadata.xml b/media-sound/tudor-volumed/metadata.xml
index 8e4208ba6486..c18a3715b07a 100644
--- a/media-sound/tudor-volumed/metadata.xml
+++ b/media-sound/tudor-volumed/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">darvid/tudor-volumed</remote-id>
</upstream>
diff --git a/media-sound/tunapie/metadata.xml b/media-sound/tunapie/metadata.xml
index 47dc2fb9efa8..c1f8fd44d5c7 100644
--- a/media-sound/tunapie/metadata.xml
+++ b/media-sound/tunapie/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">tunapie</remote-id>
</upstream>
diff --git a/media-sound/twolame/metadata.xml b/media-sound/twolame/metadata.xml
index 9d29a9e027ca..f5382dbb0756 100644
--- a/media-sound/twolame/metadata.xml
+++ b/media-sound/twolame/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">twolame</remote-id>
</upstream>
diff --git a/media-sound/umix/metadata.xml b/media-sound/umix/metadata.xml
index 2bfbe00af0a5..9eba7e8fca83 100644
--- a/media-sound/umix/metadata.xml
+++ b/media-sound/umix/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">umix</remote-id>
</upstream>
diff --git a/media-sound/umurmur/metadata.xml b/media-sound/umurmur/metadata.xml
index 3506df7afe67..8244e7b01a83 100644
--- a/media-sound/umurmur/metadata.xml
+++ b/media-sound/umurmur/metadata.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>polynomial-c@gentoo.org</email>
<name>Lars Wendler</name>
@@ -11,6 +10,10 @@
<name>Alex Xu</name>
<description>Co maintainer, CC bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
uMurmur is a minimalistic Mumble server primarily targeted to
run on routers with an open OS like OpenWRT. The server part
diff --git a/media-sound/vb2rip/metadata.xml b/media-sound/vb2rip/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/vb2rip/metadata.xml
+++ b/media-sound/vb2rip/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-sound/vdramgw/metadata.xml b/media-sound/vdramgw/metadata.xml
index 7b718b6f9765..7fd918fbaf8d 100644
--- a/media-sound/vdramgw/metadata.xml
+++ b/media-sound/vdramgw/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>media-tv</herd>
<maintainer>
<email>vdr@gentoo.org</email>
<name>Gentoo VDR Project</name>
diff --git a/media-sound/ventrilo-server-bin/metadata.xml b/media-sound/ventrilo-server-bin/metadata.xml
index 8afc3cbfa0c6..364b9983d4a6 100644
--- a/media-sound/ventrilo-server-bin/metadata.xml
+++ b/media-sound/ventrilo-server-bin/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>gurligebis@gentoo.org</email>
<name>Bjarke Istrup Pedersen</name>
</maintainer>
+<maintainer>
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-sound/vimpc/metadata.xml b/media-sound/vimpc/metadata.xml
index 9021b40430a1..1ea278ff34cb 100644
--- a/media-sound/vimpc/metadata.xml
+++ b/media-sound/vimpc/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>
<use>
<flag name="boost">Use boost instead of C++11 libraries</flag>
</use>
diff --git a/media-sound/vitunes/metadata.xml b/media-sound/vitunes/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/vitunes/metadata.xml
+++ b/media-sound/vitunes/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-sound/vkeybd/metadata.xml b/media-sound/vkeybd/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/vkeybd/metadata.xml
+++ b/media-sound/vkeybd/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-sound/vlevel/metadata.xml b/media-sound/vlevel/metadata.xml
index c599f7d93efd..7c9262a36f6e 100644
--- a/media-sound/vlevel/metadata.xml
+++ b/media-sound/vlevel/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">vlevel</remote-id>
</upstream>
diff --git a/media-sound/vlorb/metadata.xml b/media-sound/vlorb/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/vlorb/metadata.xml
+++ b/media-sound/vlorb/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-sound/vmpk/metadata.xml b/media-sound/vmpk/metadata.xml
index d2bcdcb7858b..4aa80d627ebc 100644
--- a/media-sound/vmpk/metadata.xml
+++ b/media-sound/vmpk/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">
Virtual MIDI Piano Keyboard is a MIDI event generator and receiver. It
doesn't produce any sound by itself, but can be used to drive a MIDI
diff --git a/media-sound/volti/metadata.xml b/media-sound/volti/metadata.xml
index be06d1013244..64fe62fb2431 100644
--- a/media-sound/volti/metadata.xml
+++ b/media-sound/volti/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">volti</remote-id>
<remote-id type="github">gen2brain/volti</remote-id>
diff --git a/media-sound/volumeicon/metadata.xml b/media-sound/volumeicon/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/volumeicon/metadata.xml
+++ b/media-sound/volumeicon/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-sound/volwheel/metadata.xml b/media-sound/volwheel/metadata.xml
index b49e5b281a6f..dbe953da9d09 100644
--- a/media-sound/volwheel/metadata.xml
+++ b/media-sound/volwheel/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">olwtools</remote-id>
</upstream>
diff --git a/media-sound/vorbis-tools/metadata.xml b/media-sound/vorbis-tools/metadata.xml
index 3763d957eade..10239ad23364 100644
--- a/media-sound/vorbis-tools/metadata.xml
+++ b/media-sound/vorbis-tools/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="kate">Adds support for Ogg Kate subtitles via libkate.</flag>
<flag name="ogg123">Build ogg123 player, needs libao and curl</flag>
diff --git a/media-sound/vorbisgain/metadata.xml b/media-sound/vorbisgain/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/vorbisgain/metadata.xml
+++ b/media-sound/vorbisgain/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-sound/vsound/metadata.xml b/media-sound/vsound/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/vsound/metadata.xml
+++ b/media-sound/vsound/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-sound/waheela/metadata.xml b/media-sound/waheela/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-sound/waheela/metadata.xml
+++ b/media-sound/waheela/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-sound/wavbreaker/metadata.xml b/media-sound/wavbreaker/metadata.xml
index be77b558ac12..61c5ea71004a 100644
--- a/media-sound/wavbreaker/metadata.xml
+++ b/media-sound/wavbreaker/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">wavbreaker</remote-id>
</upstream>
diff --git a/media-sound/wavegain/metadata.xml b/media-sound/wavegain/metadata.xml
index 3bf6bcfeb512..798a87bd625c 100644
--- a/media-sound/wavegain/metadata.xml
+++ b/media-sound/wavegain/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-sound/wavpack/metadata.xml b/media-sound/wavpack/metadata.xml
index ae573a60407f..f0d550a9b302 100644
--- a/media-sound/wavpack/metadata.xml
+++ b/media-sound/wavpack/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-sound/wavplay/metadata.xml b/media-sound/wavplay/metadata.xml
index f57d1923288b..a95f4f009dd6 100644
--- a/media-sound/wavplay/metadata.xml
+++ b/media-sound/wavplay/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">wavplay</remote-id>
</upstream>
diff --git a/media-sound/wavsplit/metadata.xml b/media-sound/wavsplit/metadata.xml
index e7e1a15d4e50..63a2d945b131 100644
--- a/media-sound/wavsplit/metadata.xml
+++ b/media-sound/wavsplit/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">wavsplit</remote-id>
</upstream>
diff --git a/media-sound/wmsound-data/metadata.xml b/media-sound/wmsound-data/metadata.xml
index e1774e3d9ad7..196439396531 100644
--- a/media-sound/wmsound-data/metadata.xml
+++ b/media-sound/wmsound-data/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-sound/xineadump/metadata.xml b/media-sound/xineadump/metadata.xml
index b7522fc56f9f..f82a54530815 100644
--- a/media-sound/xineadump/metadata.xml
+++ b/media-sound/xineadump/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">transkode</remote-id>
</upstream>
diff --git a/media-sound/xmp/metadata.xml b/media-sound/xmp/metadata.xml
index 1157eb8fbc38..cea0a9301f60 100644
--- a/media-sound/xmp/metadata.xml
+++ b/media-sound/xmp/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="audacious">Enable audacious support</flag>
</use>
diff --git a/media-sound/xnoise/metadata.xml b/media-sound/xnoise/metadata.xml
index b3e227faae4b..7632b795c1c8 100644
--- a/media-sound/xnoise/metadata.xml
+++ b/media-sound/xnoise/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>
<use>
<flag name="lastfm">Enable support for lastfm cover art fetching and scrobbling</flag>
<flag name="lyrics">Enable support for lyrics fetching</flag>
diff --git a/media-sound/xwax/metadata.xml b/media-sound/xwax/metadata.xml
index 545a18ab147c..32048bad080c 100644
--- a/media-sound/xwax/metadata.xml
+++ b/media-sound/xwax/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="alsa">Adds support for ALSA audio input/output.</flag>
<flag name="jack">Adds support for audio input/output via the JACK Audio Connection Kit.</flag>
diff --git a/media-sound/yoshimi/metadata.xml b/media-sound/yoshimi/metadata.xml
index 9b0639b50aaf..033c97f3dcaa 100644
--- a/media-sound/yoshimi/metadata.xml
+++ b/media-sound/yoshimi/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="lv2">Add support for Ladspa V2</flag>
</use>
diff --git a/media-sound/zynaddsubfx/metadata.xml b/media-sound/zynaddsubfx/metadata.xml
index b8228fecd796..6f2582f7b4f1 100644
--- a/media-sound/zynaddsubfx/metadata.xml
+++ b/media-sound/zynaddsubfx/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">zynaddsubfx</remote-id>
</upstream>