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-gfx
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-gfx')
-rw-r--r--media-gfx/aaphoto/metadata.xml5
-rw-r--r--media-gfx/album/metadata.xml5
-rw-r--r--media-gfx/aoi/metadata.xml5
-rw-r--r--media-gfx/apng2gif/metadata.xml5
-rw-r--r--media-gfx/apngasm/metadata.xml5
-rw-r--r--media-gfx/apngdis/metadata.xml5
-rw-r--r--media-gfx/apngopt/metadata.xml5
-rw-r--r--media-gfx/aqsis/metadata.xml5
-rw-r--r--media-gfx/asymptote/metadata.xml5
-rw-r--r--media-gfx/autopano-sift-C/metadata.xml5
-rw-r--r--media-gfx/autotrace/metadata.xml10
-rw-r--r--media-gfx/blender/metadata.xml7
-rw-r--r--media-gfx/brlcad/metadata.xml10
-rw-r--r--media-gfx/cairosvg/metadata.xml5
-rw-r--r--media-gfx/cellwriter/metadata.xml5
-rw-r--r--media-gfx/colorhug-client/metadata.xml7
-rw-r--r--media-gfx/comical/metadata.xml5
-rw-r--r--media-gfx/comix/metadata.xml5
-rw-r--r--media-gfx/converseen/metadata.xml5
-rw-r--r--media-gfx/cptutils/metadata.xml5
-rw-r--r--media-gfx/darktable/metadata.xml5
-rw-r--r--media-gfx/dawn/metadata.xml5
-rw-r--r--media-gfx/dcraw/metadata.xml5
-rw-r--r--media-gfx/digikam/metadata.xml5
-rw-r--r--media-gfx/dispcalgui/metadata.xml5
-rw-r--r--media-gfx/dpic/metadata.xml5
-rw-r--r--media-gfx/duhdraw/metadata.xml5
-rw-r--r--media-gfx/ebdftopcf/metadata.xml5
-rw-r--r--media-gfx/enblend/metadata.xml5
-rw-r--r--media-gfx/entangle/metadata.xml5
-rw-r--r--media-gfx/eog-plugins/metadata.xml5
-rw-r--r--media-gfx/eog/metadata.xml5
-rw-r--r--media-gfx/eom/metadata.xml5
-rw-r--r--media-gfx/exact-image/metadata.xml5
-rw-r--r--media-gfx/exif/metadata.xml5
-rw-r--r--media-gfx/exiftags/metadata.xml5
-rw-r--r--media-gfx/exiv2/metadata.xml10
-rw-r--r--media-gfx/feh/metadata.xml5
-rw-r--r--media-gfx/fondu/metadata.xml5
-rw-r--r--media-gfx/fontforge/metadata.xml5
-rw-r--r--media-gfx/fontypython/metadata.xml10
-rw-r--r--media-gfx/fotowall/metadata.xml5
-rw-r--r--media-gfx/fr0st/metadata.xml5
-rw-r--r--media-gfx/gif2apng/metadata.xml5
-rw-r--r--media-gfx/gif2png/metadata.xml5
-rw-r--r--media-gfx/gifsicle/metadata.xml5
-rw-r--r--media-gfx/gimageview/metadata.xml5
-rw-r--r--media-gfx/gimmage/metadata.xml5
-rw-r--r--media-gfx/gliv/metadata.xml5
-rw-r--r--media-gfx/gmic/metadata.xml5
-rw-r--r--media-gfx/gnofract4d/metadata.xml5
-rw-r--r--media-gfx/gnome-font-viewer/metadata.xml5
-rw-r--r--media-gfx/gnome-photos/metadata.xml5
-rw-r--r--media-gfx/gnome-raw-thumbnailer/metadata.xml5
-rw-r--r--media-gfx/gnome-screenshot/metadata.xml5
-rw-r--r--media-gfx/gnome-specimen/metadata.xml5
-rw-r--r--media-gfx/gphoto2/metadata.xml10
-rw-r--r--media-gfx/gphotofs/metadata.xml5
-rw-r--r--media-gfx/gpicview/metadata.xml10
-rw-r--r--media-gfx/gqview/metadata.xml5
-rw-r--r--media-gfx/graphicsmagick/metadata.xml5
-rw-r--r--media-gfx/graphite2/metadata.xml5
-rw-r--r--media-gfx/graphviz/metadata.xml5
-rw-r--r--media-gfx/grub-splashes/metadata.xml5
-rw-r--r--media-gfx/gthumb/metadata.xml5
-rw-r--r--media-gfx/gtkam/metadata.xml10
-rw-r--r--media-gfx/gtkimageview/metadata.xml5
-rw-r--r--media-gfx/hp2xx/metadata.xml12
-rw-r--r--media-gfx/hugin/metadata.xml5
-rw-r--r--media-gfx/icon-slicer/metadata.xml5
-rw-r--r--media-gfx/icoutils/metadata.xml7
-rw-r--r--media-gfx/igal/metadata.xml5
-rw-r--r--media-gfx/imagemagick/metadata.xml5
-rw-r--r--media-gfx/inkscape/metadata.xml5
-rw-r--r--media-gfx/ipe/metadata.xml5
-rw-r--r--media-gfx/iscan-data/metadata.xml5
-rw-r--r--media-gfx/iscan-plugin-gt-x770/metadata.xml5
-rw-r--r--media-gfx/iscan-plugin-gt-x820/metadata.xml5
-rw-r--r--media-gfx/iscan/metadata.xml5
-rw-r--r--media-gfx/jhead/metadata.xml5
-rw-r--r--media-gfx/jigl/metadata.xml5
-rw-r--r--media-gfx/jpeg2ps/metadata.xml5
-rw-r--r--media-gfx/jpeginfo/metadata.xml5
-rw-r--r--media-gfx/jpegoptim/metadata.xml5
-rw-r--r--media-gfx/jpegpixi/metadata.xml5
-rw-r--r--media-gfx/jpegtoavi/metadata.xml6
-rw-r--r--media-gfx/k3d/metadata.xml5
-rw-r--r--media-gfx/kcoloredit/metadata.xml5
-rw-r--r--media-gfx/kfax/metadata.xml5
-rw-r--r--media-gfx/kflickr/metadata.xml5
-rw-r--r--media-gfx/kgrab/metadata.xml5
-rw-r--r--media-gfx/kgraphviewer/metadata.xml5
-rw-r--r--media-gfx/kiconedit/metadata.xml5
-rw-r--r--media-gfx/kphotoalbum/metadata.xml5
-rw-r--r--media-gfx/kpovmodeler/metadata.xml10
-rw-r--r--media-gfx/kuickshow/metadata.xml5
-rw-r--r--media-gfx/kxstitch/metadata.xml5
-rw-r--r--media-gfx/llgal/metadata.xml5
-rw-r--r--media-gfx/luminance-hdr/metadata.xml5
-rw-r--r--media-gfx/lximage-qt/metadata.xml5
-rw-r--r--media-gfx/mandelbulber/metadata.xml5
-rw-r--r--media-gfx/mcomix/metadata.xml5
-rw-r--r--media-gfx/meshlab/metadata.xml5
-rw-r--r--media-gfx/metapixel/metadata.xml5
-rw-r--r--media-gfx/mirage/metadata.xml5
-rw-r--r--media-gfx/mscgen/metadata.xml5
-rw-r--r--media-gfx/nip2/metadata.xml5
-rw-r--r--media-gfx/nomacs/metadata.xml5
-rw-r--r--media-gfx/nvidia-cg-toolkit/metadata.xml5
-rw-r--r--media-gfx/opcion/metadata.xml5
-rw-r--r--media-gfx/openclipart/metadata.xml5
-rw-r--r--media-gfx/openexr_viewers/metadata.xml1
-rw-r--r--media-gfx/paint-mono/metadata.xml5
-rw-r--r--media-gfx/panini/metadata.xml5
-rw-r--r--media-gfx/pdf2svg/metadata.xml5
-rw-r--r--media-gfx/photivo/metadata.xml5
-rw-r--r--media-gfx/photoqt/metadata.xml5
-rw-r--r--media-gfx/phototonic/metadata.xml5
-rw-r--r--media-gfx/pinta/metadata.xml5
-rw-r--r--media-gfx/pixie/metadata.xml5
-rw-r--r--media-gfx/plantuml/metadata.xml5
-rw-r--r--media-gfx/png2ico/metadata.xml5
-rw-r--r--media-gfx/pngcheck/metadata.xml5
-rw-r--r--media-gfx/pngcrush/metadata.xml5
-rw-r--r--media-gfx/pngquant/metadata.xml10
-rw-r--r--media-gfx/pngrewrite/metadata.xml5
-rw-r--r--media-gfx/pngtools/metadata.xml5
-rw-r--r--media-gfx/postr/metadata.xml5
-rw-r--r--media-gfx/potrace/metadata.xml10
-rw-r--r--media-gfx/povtree/metadata.xml5
-rw-r--r--media-gfx/pqiv/metadata.xml5
-rw-r--r--media-gfx/pqstego/metadata.xml5
-rw-r--r--media-gfx/printrun/metadata.xml5
-rw-r--r--media-gfx/psftools/metadata.xml5
-rw-r--r--media-gfx/pstoedit/metadata.xml10
-rw-r--r--media-gfx/pydot/metadata.xml5
-rw-r--r--media-gfx/qiv/metadata.xml5
-rw-r--r--media-gfx/qiviewer/metadata.xml5
-rw-r--r--media-gfx/qosmic/metadata.xml10
-rw-r--r--media-gfx/qvv/metadata.xml5
-rw-r--r--media-gfx/raw-thumbnailer/metadata.xml5
-rw-r--r--media-gfx/rawtherapee/metadata.xml5
-rw-r--r--media-gfx/rotoscope/metadata.xml5
-rw-r--r--media-gfx/sam2p/metadata.xml5
-rw-r--r--media-gfx/scantailor/metadata.xml5
-rw-r--r--media-gfx/scrot/metadata.xml5
-rw-r--r--media-gfx/sfftobmp/metadata.xml5
-rw-r--r--media-gfx/shotwell/metadata.xml5
-rw-r--r--media-gfx/simple-scan/metadata.xml5
-rw-r--r--media-gfx/splash-themes-livecd/metadata.xml5
-rw-r--r--media-gfx/splash-themes-livedvd/metadata.xml10
-rw-r--r--media-gfx/splashutils/metadata.xml5
-rw-r--r--media-gfx/structure-synth/metadata.xml5
-rw-r--r--media-gfx/svg2rlg/metadata.xml5
-rw-r--r--media-gfx/swftools/metadata.xml5
-rw-r--r--media-gfx/sxiv/metadata.xml5
-rw-r--r--media-gfx/symboleditor/metadata.xml5
-rw-r--r--media-gfx/tachyon/metadata.xml5
-rw-r--r--media-gfx/tic98/metadata.xml5
-rw-r--r--media-gfx/tif22pnm/metadata.xml5
-rw-r--r--media-gfx/tintii/metadata.xml5
-rw-r--r--media-gfx/tuxpaint-stamps/metadata.xml5
-rw-r--r--media-gfx/tuxpaint/metadata.xml5
-rw-r--r--media-gfx/ufraw/metadata.xml5
-rw-r--r--media-gfx/uniconvertor/metadata.xml5
-rw-r--r--media-gfx/wally/metadata.xml5
-rw-r--r--media-gfx/wings/metadata.xml5
-rw-r--r--media-gfx/wkhtmltopdf/metadata.xml5
-rw-r--r--media-gfx/xli/metadata.xml5
-rw-r--r--media-gfx/xloadimage/metadata.xml5
-rw-r--r--media-gfx/xsane/metadata.xml10
-rw-r--r--media-gfx/xsvg/metadata.xml5
-rw-r--r--media-gfx/xzgv/metadata.xml5
-rw-r--r--media-gfx/yafaray/metadata.xml5
174 files changed, 756 insertions, 194 deletions
diff --git a/media-gfx/aaphoto/metadata.xml b/media-gfx/aaphoto/metadata.xml
index 62ebf7726c21..45758ad8b831 100644
--- a/media-gfx/aaphoto/metadata.xml
+++ b/media-gfx/aaphoto/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>erkiferenc@gmail.com</email>
<name>Ferenc Erki</name>
<description>Maintainer. Assign bugs to him</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="github">log69/aaphoto</remote-id>
</upstream>
diff --git a/media-gfx/album/metadata.xml b/media-gfx/album/metadata.xml
index f99fc2d51a77..ebab8c2e66bd 100644
--- a/media-gfx/album/metadata.xml
+++ b/media-gfx/album/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
<use>
<flag name="plugins">Install optional plugins</flag>
<flag name="themes">Install optional themes</flag>
diff --git a/media-gfx/aoi/metadata.xml b/media-gfx/aoi/metadata.xml
index 670266a8b580..fa02d5ba65e9 100644
--- a/media-gfx/aoi/metadata.xml
+++ b/media-gfx/aoi/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">aoi</remote-id>
</upstream>
diff --git a/media-gfx/apng2gif/metadata.xml b/media-gfx/apng2gif/metadata.xml
index cf8762004522..1babef065d29 100644
--- a/media-gfx/apng2gif/metadata.xml
+++ b/media-gfx/apng2gif/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">apng2gif</remote-id>
</upstream>
diff --git a/media-gfx/apngasm/metadata.xml b/media-gfx/apngasm/metadata.xml
index e61abad77a70..43cb51dd62b1 100644
--- a/media-gfx/apngasm/metadata.xml
+++ b/media-gfx/apngasm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">apngasm</remote-id>
</upstream>
diff --git a/media-gfx/apngdis/metadata.xml b/media-gfx/apngdis/metadata.xml
index dd79e90cbe52..88f37f1556f9 100644
--- a/media-gfx/apngdis/metadata.xml
+++ b/media-gfx/apngdis/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">apngdis</remote-id>
</upstream>
diff --git a/media-gfx/apngopt/metadata.xml b/media-gfx/apngopt/metadata.xml
index 03df6f2be2c9..383b9cc9d7ba 100644
--- a/media-gfx/apngopt/metadata.xml
+++ b/media-gfx/apngopt/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">apng</remote-id>
</upstream>
diff --git a/media-gfx/aqsis/metadata.xml b/media-gfx/aqsis/metadata.xml
index 457cf2a57988..debad32debcd 100644
--- a/media-gfx/aqsis/metadata.xml
+++ b/media-gfx/aqsis/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">aqsis</remote-id>
</upstream>
diff --git a/media-gfx/asymptote/metadata.xml b/media-gfx/asymptote/metadata.xml
index 83bd6f53fce8..8608301b517f 100644
--- a/media-gfx/asymptote/metadata.xml
+++ b/media-gfx/asymptote/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>sci</herd>
<maintainer>
<email>grozin@gentoo.org</email>
<name>Andrey Grozin</name>
</maintainer>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
Asymptote is a powerful descriptive vector graphics language that
provides a natural coordinate-based framework for technical drawing.
diff --git a/media-gfx/autopano-sift-C/metadata.xml b/media-gfx/autopano-sift-C/metadata.xml
index 239509055f5b..07ea463b1da9 100644
--- a/media-gfx/autopano-sift-C/metadata.xml
+++ b/media-gfx/autopano-sift-C/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>autopano-sift-C is a program to automatically find control points
for stitching together panoramas.</longdescription>
<upstream>
diff --git a/media-gfx/autotrace/metadata.xml b/media-gfx/autotrace/metadata.xml
index 96803e953658..1f4ec8b687be 100644
--- a/media-gfx/autotrace/metadata.xml
+++ b/media-gfx/autotrace/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
- <herd>fonts</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">autotrace</remote-id>
</upstream>
diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 6ffe7acbb6ef..d51fb381fe6e 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/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>graphics</herd>
-
<maintainer>
<email>hasufell@gentoo.org</email>
<name>Julian Ospald</name>
@@ -13,6 +11,11 @@
<name>Luca Barbato</name>
</maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+
<longdescription>
Blender, the open source software for 3D modeling, animation,
rendering, post-production, interactive creation and playback.
diff --git a/media-gfx/brlcad/metadata.xml b/media-gfx/brlcad/metadata.xml
index 83f8886b3bf8..dc7de7f7947e 100644
--- a/media-gfx/brlcad/metadata.xml
+++ b/media-gfx/brlcad/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>sci</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>dongxuli2011@gmail.com</email>
<description>please assign bugs</description>
</maintainer>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
BRL-CAD is a Combinatorial/Constructive Solid Geometry (CSG)
solid modeling system that includes an interactive geometry editor,
diff --git a/media-gfx/cairosvg/metadata.xml b/media-gfx/cairosvg/metadata.xml
index 995bd87ffbb2..3ad1d51b7fb6 100644
--- a/media-gfx/cairosvg/metadata.xml
+++ b/media-gfx/cairosvg/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="pypi">CairoSVG</remote-id>
</upstream>
diff --git a/media-gfx/cellwriter/metadata.xml b/media-gfx/cellwriter/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/cellwriter/metadata.xml
+++ b/media-gfx/cellwriter/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/colorhug-client/metadata.xml b/media-gfx/colorhug-client/metadata.xml
index 8b406a44083e..0344105eb11f 100644
--- a/media-gfx/colorhug-client/metadata.xml
+++ b/media-gfx/colorhug-client/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
- <maintainer>
+<maintainer>
<email>gregkh@gentoo.org</email>
<name>Greg Kroah-Hartman</name>
<description>Please CC him on bugs and assign to herd</description>
</maintainer>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/comical/metadata.xml b/media-gfx/comical/metadata.xml
index 20cf5ef857a0..e191632318c8 100644
--- a/media-gfx/comical/metadata.xml
+++ b/media-gfx/comical/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">comical</remote-id>
</upstream>
diff --git a/media-gfx/comix/metadata.xml b/media-gfx/comix/metadata.xml
index 2d8ef46af84b..b42f1e0fe682 100644
--- a/media-gfx/comix/metadata.xml
+++ b/media-gfx/comix/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="rar">
Pulls app-arch/unrar for rar file support
diff --git a/media-gfx/converseen/metadata.xml b/media-gfx/converseen/metadata.xml
index f40b4c7dfbaf..14fca4cd6cbf 100644
--- a/media-gfx/converseen/metadata.xml
+++ b/media-gfx/converseen/metadata.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,6 +9,10 @@
<email>maksbotan@gentoo.org</email>
<name>Maxim Koltsov</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">converseen</remote-id>
</upstream>
diff --git a/media-gfx/cptutils/metadata.xml b/media-gfx/cptutils/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/cptutils/metadata.xml
+++ b/media-gfx/cptutils/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index abd4ce3d1a03..c8662273c22f 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="colord">Support color management using <pkg>x11-misc/colord</pkg></flag>
<flag name="graphicsmagick">Use <pkg>media-gfx/graphicsmagick</pkg> for image importing</flag>
diff --git a/media-gfx/dawn/metadata.xml b/media-gfx/dawn/metadata.xml
index 7e312f55fd62..98b379cffbf8 100644
--- a/media-gfx/dawn/metadata.xml
+++ b/media-gfx/dawn/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci-physics</herd>
+<maintainer>
+ <email>sci-physics@gentoo.org</email>
+ <name>Gentoo Physics Project</name>
+</maintainer>
<longdescription lang="en">
Fukui Renderer DAWN (Drawer for Academic WritiNgs)
is a renderer, which reads 3D geometrical data and visualize them.
diff --git a/media-gfx/dcraw/metadata.xml b/media-gfx/dcraw/metadata.xml
index 6e97918e06d0..c27886870e97 100644
--- a/media-gfx/dcraw/metadata.xml
+++ b/media-gfx/dcraw/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>
This utility converts the native (RAW), format of various digital cameras into
netpbm portable pixmap (.ppm) image. Supports the following models: Canon,
diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml
index 6764ab604d64..d5b9761d1973 100644
--- a/media-gfx/digikam/metadata.xml
+++ b/media-gfx/digikam/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>kde</herd>
<maintainer><email>dilfridge@gentoo.org</email></maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+</maintainer>
<use>
<flag name="addressbook">Add support for kdepim</flag>
<flag name="themedesigner">Build the digikam theme designer</flag>
diff --git a/media-gfx/dispcalgui/metadata.xml b/media-gfx/dispcalgui/metadata.xml
index 8d4a696bdca9..ad1f7b76eb9e 100644
--- a/media-gfx/dispcalgui/metadata.xml
+++ b/media-gfx/dispcalgui/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>gentoo@xayto.net</email>
<name>Craig Inches</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/media-gfx/dpic/metadata.xml b/media-gfx/dpic/metadata.xml
index ba6a8a8800d5..da417f040a1c 100644
--- a/media-gfx/dpic/metadata.xml
+++ b/media-gfx/dpic/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>tex</herd>
+<maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/duhdraw/metadata.xml b/media-gfx/duhdraw/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/duhdraw/metadata.xml
+++ b/media-gfx/duhdraw/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/ebdftopcf/metadata.xml b/media-gfx/ebdftopcf/metadata.xml
index 0274ccfd143d..8fe8314d735f 100644
--- a/media-gfx/ebdftopcf/metadata.xml
+++ b/media-gfx/ebdftopcf/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>fonts</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
<description>Maintainer and upstream author.</description>
</maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml
index f4732882ad96..893f21b61e53 100644
--- a/media-gfx/enblend/metadata.xml
+++ b/media-gfx/enblend/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="gpu">GPU support for Enblend</flag>
<flag name="image-cache">allow for processing of large images</flag>
diff --git a/media-gfx/entangle/metadata.xml b/media-gfx/entangle/metadata.xml
index 48621e50c16b..5d058f1a8476 100644
--- a/media-gfx/entangle/metadata.xml
+++ b/media-gfx/entangle/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
<maintainer>
<email>lu_zero@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>media-video@gentoo.org</email>
+ <name>Gentoo Video project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/eog-plugins/metadata.xml b/media-gfx/eog-plugins/metadata.xml
index 041a5ae2a66d..0703e36284b2 100644
--- a/media-gfx/eog-plugins/metadata.xml
+++ b/media-gfx/eog-plugins/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<use>
<flag name="flickr">Enable uploading to Flickr</flag>
<flag name="map">Enable world map display using <pkg>media-libs/libchamplain</pkg></flag>
diff --git a/media-gfx/eog/metadata.xml b/media-gfx/eog/metadata.xml
index c303968e7ba8..70aa68e6f360 100644
--- a/media-gfx/eog/metadata.xml
+++ b/media-gfx/eog/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription lang="en">
The Eye of GNOME image viewer is the official image viewer for the GNOME
Desktop environment. With it, you can view single image files, as well
diff --git a/media-gfx/eom/metadata.xml b/media-gfx/eom/metadata.xml
index b8d1003d2c27..181599c4bc69 100644
--- a/media-gfx/eom/metadata.xml
+++ b/media-gfx/eom/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>mate</herd>
+ <maintainer>
+ <email>mate@gentoo.org</email>
+ <name>Gentoo MATE Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="github">mate-desktop/eom</remote-id>
</upstream>
diff --git a/media-gfx/exact-image/metadata.xml b/media-gfx/exact-image/metadata.xml
index dfa41b336ccd..b2d8f575742e 100644
--- a/media-gfx/exact-image/metadata.xml
+++ b/media-gfx/exact-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>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
<use>
<flag name="swig">Adds Swig support <pkg>dev-lang/swig</pkg></flag>
</use>
diff --git a/media-gfx/exif/metadata.xml b/media-gfx/exif/metadata.xml
index 5c7a0372083d..c6b9f470221a 100644
--- a/media-gfx/exif/metadata.xml
+++ b/media-gfx/exif/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">libexif</remote-id>
</upstream>
diff --git a/media-gfx/exiftags/metadata.xml b/media-gfx/exiftags/metadata.xml
index a083c07fab9e..279435125f8a 100644
--- a/media-gfx/exiftags/metadata.xml
+++ b/media-gfx/exiftags/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/exiv2/metadata.xml b/media-gfx/exiv2/metadata.xml
index c3371bd5c3aa..8232d6ff922d 100644
--- a/media-gfx/exiv2/metadata.xml
+++ b/media-gfx/exiv2/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
<longdescription lang="en">
Exiv2 is a C++ library and command line utility to read and
write EXIF, IPTC and XMP image metadata.
diff --git a/media-gfx/feh/metadata.xml b/media-gfx/feh/metadata.xml
index 72ace7364311..210d8b32d5f9 100644
--- a/media-gfx/feh/metadata.xml
+++ b/media-gfx/feh/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
<longdescription>
feh is an image viewer at heart, though it does other cool stuff.
</longdescription>
diff --git a/media-gfx/fondu/metadata.xml b/media-gfx/fondu/metadata.xml
index 53e8fc800d53..0ada140a6faf 100644
--- a/media-gfx/fondu/metadata.xml
+++ b/media-gfx/fondu/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">fondu</remote-id>
</upstream>
diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml
index fdda9ca1172d..7d742dc60f4f 100644
--- a/media-gfx/fontforge/metadata.xml
+++ b/media-gfx/fontforge/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
<maintainer>
<email>floppym@gentoo.org</email>
<name>Mike Gilbert</name>
</maintainer>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<longdescription>
FontForge -- An outline font editor that lets you create your own
postscript, truetype, opentype, cid-keyed, multi-master, cff, svg and bitmap
diff --git a/media-gfx/fontypython/metadata.xml b/media-gfx/fontypython/metadata.xml
index f7359919c39a..107310296fd5 100644
--- a/media-gfx/fontypython/metadata.xml
+++ b/media-gfx/fontypython/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>graphics</herd>
- <herd>fonts</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/fotowall/metadata.xml b/media-gfx/fotowall/metadata.xml
index 62354bfd2c85..a4e878acf0cb 100644
--- a/media-gfx/fotowall/metadata.xml
+++ b/media-gfx/fotowall/metadata.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>
<use>
<flag name="webcam">Enable webcam support</flag>
</use>
diff --git a/media-gfx/fr0st/metadata.xml b/media-gfx/fr0st/metadata.xml
index 7c84dffebda5..ad5b8f04f581 100644
--- a/media-gfx/fr0st/metadata.xml
+++ b/media-gfx/fr0st/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="launchpad">fr0st</remote-id>
</upstream>
diff --git a/media-gfx/gif2apng/metadata.xml b/media-gfx/gif2apng/metadata.xml
index 10f3816a1001..219a836fd7d9 100644
--- a/media-gfx/gif2apng/metadata.xml
+++ b/media-gfx/gif2apng/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gif2apng</remote-id>
</upstream>
diff --git a/media-gfx/gif2png/metadata.xml b/media-gfx/gif2png/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/gif2png/metadata.xml
+++ b/media-gfx/gif2png/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/gifsicle/metadata.xml b/media-gfx/gifsicle/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/gifsicle/metadata.xml
+++ b/media-gfx/gifsicle/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/gimageview/metadata.xml b/media-gfx/gimageview/metadata.xml
index 930b43de954c..75bec1677259 100644
--- a/media-gfx/gimageview/metadata.xml
+++ b/media-gfx/gimageview/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gtkmmviewer</remote-id>
</upstream>
diff --git a/media-gfx/gimmage/metadata.xml b/media-gfx/gimmage/metadata.xml
index 80e97c37d478..6bd4331efad4 100644
--- a/media-gfx/gimmage/metadata.xml
+++ b/media-gfx/gimmage/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription lang="en">
gimmage: the gtkmm image viewer
</longdescription>
diff --git a/media-gfx/gliv/metadata.xml b/media-gfx/gliv/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/gliv/metadata.xml
+++ b/media-gfx/gliv/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/gmic/metadata.xml b/media-gfx/gmic/metadata.xml
index 250b14f8c1c7..c050add39377 100644
--- a/media-gfx/gmic/metadata.xml
+++ b/media-gfx/gmic/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="graphicsmagick">Enable support for many common image file formats using the GraphicsMagick++ library</flag>
<flag name="opencv">Enable support for webcams using the OpenCV library</flag>
diff --git a/media-gfx/gnofract4d/metadata.xml b/media-gfx/gnofract4d/metadata.xml
index 4e0171efad95..f80eeaa048a5 100644
--- a/media-gfx/gnofract4d/metadata.xml
+++ b/media-gfx/gnofract4d/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gnofract4d</remote-id>
</upstream>
diff --git a/media-gfx/gnome-font-viewer/metadata.xml b/media-gfx/gnome-font-viewer/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-gfx/gnome-font-viewer/metadata.xml
+++ b/media-gfx/gnome-font-viewer/metadata.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-gfx/gnome-photos/metadata.xml b/media-gfx/gnome-photos/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-gfx/gnome-photos/metadata.xml
+++ b/media-gfx/gnome-photos/metadata.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-gfx/gnome-raw-thumbnailer/metadata.xml b/media-gfx/gnome-raw-thumbnailer/metadata.xml
index 6e0e2ecb48ca..f0f559a46623 100644
--- a/media-gfx/gnome-raw-thumbnailer/metadata.xml
+++ b/media-gfx/gnome-raw-thumbnailer/metadata.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-gfx/gnome-screenshot/metadata.xml b/media-gfx/gnome-screenshot/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-gfx/gnome-screenshot/metadata.xml
+++ b/media-gfx/gnome-screenshot/metadata.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-gfx/gnome-specimen/metadata.xml b/media-gfx/gnome-specimen/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/gnome-specimen/metadata.xml
+++ b/media-gfx/gnome-specimen/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/gphoto2/metadata.xml b/media-gfx/gphoto2/metadata.xml
index f0e3725b295f..cfab7e58e267 100644
--- a/media-gfx/gphoto2/metadata.xml
+++ b/media-gfx/gphoto2/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <herd>graphics</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gphoto</remote-id>
</upstream>
diff --git a/media-gfx/gphotofs/metadata.xml b/media-gfx/gphotofs/metadata.xml
index 8f88f2314eed..cef2527f569f 100644
--- a/media-gfx/gphotofs/metadata.xml
+++ b/media-gfx/gphotofs/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
<maintainer>
<email>zx2c4@gentoo.org</email>
<name>Jason A. Donenfeld</name>
</maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gphoto</remote-id>
</upstream>
diff --git a/media-gfx/gpicview/metadata.xml b/media-gfx/gpicview/metadata.xml
index 30802789f1b2..dda8d886b84e 100644
--- a/media-gfx/gpicview/metadata.xml
+++ b/media-gfx/gpicview/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
- <herd>lxde</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+ <maintainer>
+ <email>lxde@gentoo.org</email>
+ <name>Gentoo LXDE Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">lxde</remote-id>
</upstream>
diff --git a/media-gfx/gqview/metadata.xml b/media-gfx/gqview/metadata.xml
index e0c49a133083..18e82b531893 100644
--- a/media-gfx/gqview/metadata.xml
+++ b/media-gfx/gqview/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
<maintainer>
<email>mr_bones_@gentoo.org</email>
<name>Michael Sterrett</name>
</maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gqview</remote-id>
</upstream>
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 09f36fa05818..39b4575b486a 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription lang="en">
This is a port of GraphicsMagick(TM), the "swiss army knife" of
image processing. It provides a robust collection of tools and libraries
diff --git a/media-gfx/graphite2/metadata.xml b/media-gfx/graphite2/metadata.xml
index 46f34458c158..5869736230ba 100644
--- a/media-gfx/graphite2/metadata.xml
+++ b/media-gfx/graphite2/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>office</herd>
+ <maintainer>
+ <email>office@gentoo.org</email>
+ <name>Gentoo Office project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">silgraphite</remote-id>
</upstream>
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index 4772c3130252..424fb7e4bfc3 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>
graphviz is a set of graph drawing tools for Unix or MS-Windows
(win32), including a web service interface (webdot). Source code and
diff --git a/media-gfx/grub-splashes/metadata.xml b/media-gfx/grub-splashes/metadata.xml
index 17bf9b50f5e7..52101d55b38d 100644
--- a/media-gfx/grub-splashes/metadata.xml
+++ b/media-gfx/grub-splashes/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
<longdescription>
A collection of grub themes provided and maintained by the Gentoo Artwork project
</longdescription>
diff --git a/media-gfx/gthumb/metadata.xml b/media-gfx/gthumb/metadata.xml
index 3a949feaea9f..e8a7ac6107f2 100644
--- a/media-gfx/gthumb/metadata.xml
+++ b/media-gfx/gthumb/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="http">Enable webservice integration through <pkg>net-libs/libsoup</pkg></flag>
<flag name="json">Compile code that uses the libjson-glib library</flag>
diff --git a/media-gfx/gtkam/metadata.xml b/media-gfx/gtkam/metadata.xml
index f0e3725b295f..cfab7e58e267 100644
--- a/media-gfx/gtkam/metadata.xml
+++ b/media-gfx/gtkam/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
- <herd>graphics</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gphoto</remote-id>
</upstream>
diff --git a/media-gfx/gtkimageview/metadata.xml b/media-gfx/gtkimageview/metadata.xml
index a083c07fab9e..279435125f8a 100644
--- a/media-gfx/gtkimageview/metadata.xml
+++ b/media-gfx/gtkimageview/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/hp2xx/metadata.xml b/media-gfx/hp2xx/metadata.xml
index 6f8798ceede2..30290434cc85 100644
--- a/media-gfx/hp2xx/metadata.xml
+++ b/media-gfx/hp2xx/metadata.xml
@@ -5,6 +5,12 @@
<email>konstantin@muenning.com</email>
<name>Konstantin Münning</name>
</maintainer>
- <herd>printing</herd>
- <herd>proxy-maintainers</herd>
-</pkgmetadata>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ </pkgmetadata>
diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index 68c618299a63..0febb0af7e52 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>hugin is a panorama stitching program</longdescription>
<use>
<flag name="sift">automatically align images with
diff --git a/media-gfx/icon-slicer/metadata.xml b/media-gfx/icon-slicer/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/icon-slicer/metadata.xml
+++ b/media-gfx/icon-slicer/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/icoutils/metadata.xml b/media-gfx/icoutils/metadata.xml
index ea5470657aae..a2a255f39326 100644
--- a/media-gfx/icoutils/metadata.xml
+++ b/media-gfx/icoutils/metadata.xml
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
- <maintainer>
+ <maintainer>
<email>res@crystalspace3d.org</email>
<name>Frank Richter (upstream)</name>
</maintainer>
@@ -10,4 +9,8 @@
<email>patrick@gentoo.org</email>
<name>Patrick Lauer (proxy)</name>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/igal/metadata.xml b/media-gfx/igal/metadata.xml
index 4f711930ce13..d79fc62467f7 100644
--- a/media-gfx/igal/metadata.xml
+++ b/media-gfx/igal/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription lang="en">
iGal is a Perl program that can generate and publish an entire online
picture show (static HTML slides, thumbnails and index page) with just
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index aef99b918509..9e914b527f3f 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="autotrace">Use <pkg>media-gfx/autotrace</pkg> to convert bitmaps into vector graphics</flag>
<flag name="corefonts">Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag>
diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index df4bab735af7..d111c5dd18fd 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="cdr">Enable support for CorelDRAW Diagrams</flag>
<flag name="dia">pull in <pkg>app-office/dia</pkg> for dia import extension</flag>
diff --git a/media-gfx/ipe/metadata.xml b/media-gfx/ipe/metadata.xml
index a92043c8c104..c42db525957a 100644
--- a/media-gfx/ipe/metadata.xml
+++ b/media-gfx/ipe/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
Ipe is a drawing editor for creating figures in PDF or
(encapsulated) Postscript format. Ipe supports making small figures
diff --git a/media-gfx/iscan-data/metadata.xml b/media-gfx/iscan-data/metadata.xml
index ef34db7e8ac3..ff9e65d3d1fd 100644
--- a/media-gfx/iscan-data/metadata.xml
+++ b/media-gfx/iscan-data/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>mattsch@gmail.com</email>
<name>Matthew Schultz</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Provides the necessary support files for Image Scan! for Linux,
including device information and policy file generation logic.
diff --git a/media-gfx/iscan-plugin-gt-x770/metadata.xml b/media-gfx/iscan-plugin-gt-x770/metadata.xml
index 2b67f8ab7eb6..5f88cbfd7ed9 100644
--- a/media-gfx/iscan-plugin-gt-x770/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-x770/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>mattsch@gmail.com</email>
</maintainer>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Proprietary plugin for several EPSON scanner models, to be used
with the epkowa SANE backend (provided by
diff --git a/media-gfx/iscan-plugin-gt-x820/metadata.xml b/media-gfx/iscan-plugin-gt-x820/metadata.xml
index 16393b245a9d..9f586d066cf5 100644
--- a/media-gfx/iscan-plugin-gt-x820/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-x820/metadata.xml
@@ -1,13 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>nitro@legroom.net</email>
</maintainer>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Proprietary plugin for several EPSON scanner models, to be used
with the epkowa SANE backend (provided by
diff --git a/media-gfx/iscan/metadata.xml b/media-gfx/iscan/metadata.xml
index c36e6d4286c6..8a3d74649564 100644
--- a/media-gfx/iscan/metadata.xml
+++ b/media-gfx/iscan/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>mattsch@gmail.com</email>
<name>Matthew Schultz</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription lang="en">
Image Scan! is a graphical scanner utility for people that do not need all
the bells and whistles provided by several of the other utilities out there
diff --git a/media-gfx/jhead/metadata.xml b/media-gfx/jhead/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/jhead/metadata.xml
+++ b/media-gfx/jhead/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/jigl/metadata.xml b/media-gfx/jigl/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-gfx/jigl/metadata.xml
+++ b/media-gfx/jigl/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/jpeg2ps/metadata.xml b/media-gfx/jpeg2ps/metadata.xml
index 4048f766a6e5..084de8957f2b 100644
--- a/media-gfx/jpeg2ps/metadata.xml
+++ b/media-gfx/jpeg2ps/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="metric">
Default to A4 paper size
diff --git a/media-gfx/jpeginfo/metadata.xml b/media-gfx/jpeginfo/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/jpeginfo/metadata.xml
+++ b/media-gfx/jpeginfo/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/jpegoptim/metadata.xml b/media-gfx/jpegoptim/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/jpegoptim/metadata.xml
+++ b/media-gfx/jpegoptim/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/jpegpixi/metadata.xml b/media-gfx/jpegpixi/metadata.xml
index 3dc83742cd89..1b6ad21449e2 100644
--- a/media-gfx/jpegpixi/metadata.xml
+++ b/media-gfx/jpegpixi/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>
Almost lossless JPEG pixel interpolator, for correcting digital camera
defects.
diff --git a/media-gfx/jpegtoavi/metadata.xml b/media-gfx/jpegtoavi/metadata.xml
index 69de869b54a4..98e76403b67d 100644
--- a/media-gfx/jpegtoavi/metadata.xml
+++ b/media-gfx/jpegtoavi/metadata.xml
@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
- <herd>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">jpegtoavi</remote-id>
</upstream>
diff --git a/media-gfx/k3d/metadata.xml b/media-gfx/k3d/metadata.xml
index 815649b187cb..0f3a16d6d3fc 100644
--- a/media-gfx/k3d/metadata.xml
+++ b/media-gfx/k3d/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="3ds">Enable support for 3D Studio models</flag>
<flag name="cuda">Use nvidia cuda toolkit for speeding up
diff --git a/media-gfx/kcoloredit/metadata.xml b/media-gfx/kcoloredit/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-gfx/kcoloredit/metadata.xml
+++ b/media-gfx/kcoloredit/metadata.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-gfx/kfax/metadata.xml b/media-gfx/kfax/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-gfx/kfax/metadata.xml
+++ b/media-gfx/kfax/metadata.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-gfx/kflickr/metadata.xml b/media-gfx/kflickr/metadata.xml
index 850777e1942d..8d67957597a8 100644
--- a/media-gfx/kflickr/metadata.xml
+++ b/media-gfx/kflickr/metadata.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>KDE App for easy upload of your favourite photos to your Flickr.com account</longdescription>
<upstream>
<remote-id type="sourceforge">kflickr</remote-id>
diff --git a/media-gfx/kgrab/metadata.xml b/media-gfx/kgrab/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-gfx/kgrab/metadata.xml
+++ b/media-gfx/kgrab/metadata.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-gfx/kgraphviewer/metadata.xml b/media-gfx/kgraphviewer/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-gfx/kgraphviewer/metadata.xml
+++ b/media-gfx/kgraphviewer/metadata.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-gfx/kiconedit/metadata.xml b/media-gfx/kiconedit/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-gfx/kiconedit/metadata.xml
+++ b/media-gfx/kiconedit/metadata.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-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index eed8e30287bc..e2feaf100685 100644
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.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="face">Enable face detection and recognition using <pkg>kde-apps/libkface</pkg></flag>
<flag name="geolocation">Add support for <pkg>kde-apps/marble</pkg></flag>
diff --git a/media-gfx/kpovmodeler/metadata.xml b/media-gfx/kpovmodeler/metadata.xml
index 965fe97f7312..65ed8a3d7f88 100644
--- a/media-gfx/kpovmodeler/metadata.xml
+++ b/media-gfx/kpovmodeler/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>graphics</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+<maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/kuickshow/metadata.xml b/media-gfx/kuickshow/metadata.xml
index 8d1e86a9cefb..f38d43267b1e 100644
--- a/media-gfx/kuickshow/metadata.xml
+++ b/media-gfx/kuickshow/metadata.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-gfx/kxstitch/metadata.xml b/media-gfx/kxstitch/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-gfx/kxstitch/metadata.xml
+++ b/media-gfx/kxstitch/metadata.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-gfx/llgal/metadata.xml b/media-gfx/llgal/metadata.xml
index 83d1a5939755..5b4bc34e7092 100644
--- a/media-gfx/llgal/metadata.xml
+++ b/media-gfx/llgal/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>graphics</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/luminance-hdr/metadata.xml b/media-gfx/luminance-hdr/metadata.xml
index 8496ad6a2fad..e6490afb955e 100644
--- a/media-gfx/luminance-hdr/metadata.xml
+++ b/media-gfx/luminance-hdr/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription lang="en">
Qtpfsgui is an open source graphical user interface application that aims
to provide a workflow for HDR imaging.
diff --git a/media-gfx/lximage-qt/metadata.xml b/media-gfx/lximage-qt/metadata.xml
index d89dead0ed86..2e57419619dc 100644
--- a/media-gfx/lximage-qt/metadata.xml
+++ b/media-gfx/lximage-qt/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>lxqt</herd>
<maintainer>
<email>jauhien@gentoo.org</email>
<name>Jauhien Piatlicki</name>
</maintainer>
+<maintainer>
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/mandelbulber/metadata.xml b/media-gfx/mandelbulber/metadata.xml
index f34f1d95dc92..2f318a3d0112 100644
--- a/media-gfx/mandelbulber/metadata.xml
+++ b/media-gfx/mandelbulber/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>
Mandelbulber is an easy to use, handy but experimental application
designed to help you render 3D Mandelbrot fractals called Mandelbulb
diff --git a/media-gfx/mcomix/metadata.xml b/media-gfx/mcomix/metadata.xml
index 7cb3023cf69d..09099b933593 100644
--- a/media-gfx/mcomix/metadata.xml
+++ b/media-gfx/mcomix/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
<maintainer>
<email>rhill@gentoo.org</email>
<name>Ryan Hill</name>
</maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mcomix</remote-id>
</upstream>
diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml
index 5ef1f3b61674..4f96de83a86e 100644
--- a/media-gfx/meshlab/metadata.xml
+++ b/media-gfx/meshlab/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>3dprint</herd>
<maintainer>
<email>amynka@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>3dprint@gentoo.org</email>
+ <name>Gentoo 3D print</name>
+ </maintainer>
<longdescription lang="en">
Printrun is a set of G-code sending applications for RepRap.
It consists of printcore (dumb G-code sender), pronsole (featured command line
diff --git a/media-gfx/metapixel/metadata.xml b/media-gfx/metapixel/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/metapixel/metadata.xml
+++ b/media-gfx/metapixel/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/mirage/metadata.xml b/media-gfx/mirage/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-gfx/mirage/metadata.xml
+++ b/media-gfx/mirage/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/mscgen/metadata.xml b/media-gfx/mscgen/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/mscgen/metadata.xml
+++ b/media-gfx/mscgen/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/nip2/metadata.xml b/media-gfx/nip2/metadata.xml
index 68e745047f19..d374e3db9318 100644
--- a/media-gfx/nip2/metadata.xml
+++ b/media-gfx/nip2/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="goffice">use <pkg>x11-libs/goffice</pkg> to show plots</flag>
</use>
diff --git a/media-gfx/nomacs/metadata.xml b/media-gfx/nomacs/metadata.xml
index 0025d46170c3..e357da6f50d0 100644
--- a/media-gfx/nomacs/metadata.xml
+++ b/media-gfx/nomacs/metadata.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">nomacs</remote-id>
<bugs-to>http://www.nomacs.org/redmine/projects/nomacs</bugs-to>
diff --git a/media-gfx/nvidia-cg-toolkit/metadata.xml b/media-gfx/nvidia-cg-toolkit/metadata.xml
index 27668c513a99..a122b2de3c02 100644
--- a/media-gfx/nvidia-cg-toolkit/metadata.xml
+++ b/media-gfx/nvidia-cg-toolkit/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>
The Cg Toolkit provides a compiler for the Cg language, runtime libraries for
use with both leading graphics APIs, runtime libraries for CgFX, example
diff --git a/media-gfx/opcion/metadata.xml b/media-gfx/opcion/metadata.xml
index 4a2bc1931f55..de6d7ddc738e 100644
--- a/media-gfx/opcion/metadata.xml
+++ b/media-gfx/opcion/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>fonts</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">opcion</remote-id>
</upstream>
diff --git a/media-gfx/openclipart/metadata.xml b/media-gfx/openclipart/metadata.xml
index 7600f7a1fc40..4369682fb872 100644
--- a/media-gfx/openclipart/metadata.xml
+++ b/media-gfx/openclipart/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="gzip">Compresses clip art using gzip</flag>
</use>
diff --git a/media-gfx/openexr_viewers/metadata.xml b/media-gfx/openexr_viewers/metadata.xml
index 505d9f262d83..2751c7df7801 100644
--- a/media-gfx/openexr_viewers/metadata.xml
+++ b/media-gfx/openexr_viewers/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>video</herd>
<maintainer>
<email>media-video@gentoo.org</email>
</maintainer>
diff --git a/media-gfx/paint-mono/metadata.xml b/media-gfx/paint-mono/metadata.xml
index 3e1ab24888e2..5bc7f336a19e 100644
--- a/media-gfx/paint-mono/metadata.xml
+++ b/media-gfx/paint-mono/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>dotnet</herd>
+ <maintainer>
+ <email>dotnet@gentoo.org</email>
+ <name>Gentoo Dotnet Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">paint-mono</remote-id>
<remote-id type="github">shana/paint-mono</remote-id>
diff --git a/media-gfx/panini/metadata.xml b/media-gfx/panini/metadata.xml
index 8f3639ff8807..71f148b64b3e 100644
--- a/media-gfx/panini/metadata.xml
+++ b/media-gfx/panini/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pvqt</remote-id>
</upstream>
diff --git a/media-gfx/pdf2svg/metadata.xml b/media-gfx/pdf2svg/metadata.xml
index a083c07fab9e..279435125f8a 100644
--- a/media-gfx/pdf2svg/metadata.xml
+++ b/media-gfx/pdf2svg/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/photivo/metadata.xml b/media-gfx/photivo/metadata.xml
index 073e1fa4a9f2..51cde55380f3 100644
--- a/media-gfx/photivo/metadata.xml
+++ b/media-gfx/photivo/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>opensource@andmarios.com</email>
<name>Marios Andreopoulos</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">photivo</remote-id>
<bugs-to>https://code.google.com/p/photivo/issues/list</bugs-to>
diff --git a/media-gfx/photoqt/metadata.xml b/media-gfx/photoqt/metadata.xml
index 399fbb27eb24..55326bef8f88 100644
--- a/media-gfx/photoqt/metadata.xml
+++ b/media-gfx/photoqt/metadata.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>
<use>
<flag name="exiv2">
Use <pkg>media-gfx/exiv2</pkg> as optional dependency
diff --git a/media-gfx/phototonic/metadata.xml b/media-gfx/phototonic/metadata.xml
index 56722af239a3..344862a94a01 100644
--- a/media-gfx/phototonic/metadata.xml
+++ b/media-gfx/phototonic/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>qt</herd>
<maintainer>
<email>yngwin@gentoo.org</email>
<name>Ben de Groot</name>
</maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">oferkv/phototonic</remote-id>
</upstream>
diff --git a/media-gfx/pinta/metadata.xml b/media-gfx/pinta/metadata.xml
index 7135366e52fa..eedc4f4ab0c3 100644
--- a/media-gfx/pinta/metadata.xml
+++ b/media-gfx/pinta/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>axelgenus@gmail.com</email>
<name>Alessandro Calorì</name>
<description>Proxied maintainer; set to assignee in all bugs</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<maintainer status="active">
<email>cameronwhite91@gmail.com</email>
diff --git a/media-gfx/pixie/metadata.xml b/media-gfx/pixie/metadata.xml
index 9dc1ecece7da..7a445a8b9359 100644
--- a/media-gfx/pixie/metadata.xml
+++ b/media-gfx/pixie/metadata.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>flameeyes@gentoo.org</email>
<description>Proxying maintainer</description>
@@ -10,6 +9,10 @@
<email>toffanin.mauro@gmail.com</email>
<description>Proxied maintainer</description>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<longdescription>
Pixie is an open source photorealistic renderer that uses a RenderMan-like
interface. Features include programmable shading, motion blur, depth of
diff --git a/media-gfx/plantuml/metadata.xml b/media-gfx/plantuml/metadata.xml
index cbdad507dd9f..799e80b73f0c 100644
--- a/media-gfx/plantuml/metadata.xml
+++ b/media-gfx/plantuml/metadata.xml
@@ -5,7 +5,10 @@
<email>pva@gentoo.org</email>
<name>Peter Volkov</name>
</maintainer>
- <herd>java</herd>
+ <maintainer>
+ <email>java@gentoo.org</email>
+ <name>Java</name>
+ </maintainer>
<longdescription lang="en">
PlantUMLis a component that allows to quickly write: sequence diagram, use
case diagram, class diagram, activity diagram, component diagram, state
diff --git a/media-gfx/png2ico/metadata.xml b/media-gfx/png2ico/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/png2ico/metadata.xml
+++ b/media-gfx/png2ico/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/pngcheck/metadata.xml b/media-gfx/pngcheck/metadata.xml
index 8e5a86cf66d2..c9899d2fc4e0 100644
--- a/media-gfx/pngcheck/metadata.xml
+++ b/media-gfx/pngcheck/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">png-mng</remote-id>
</upstream>
diff --git a/media-gfx/pngcrush/metadata.xml b/media-gfx/pngcrush/metadata.xml
index bbdda004cb79..e642b9ab15a2 100644
--- a/media-gfx/pngcrush/metadata.xml
+++ b/media-gfx/pngcrush/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<maintainer status="active">
<email>glennrp@gmail.com</email>
diff --git a/media-gfx/pngquant/metadata.xml b/media-gfx/pngquant/metadata.xml
index 5c413eb1ea87..712298c2ecf9 100644
--- a/media-gfx/pngquant/metadata.xml
+++ b/media-gfx/pngquant/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>alex_y_xu@yahoo.ca</email>
<name>Alex Xu</name>
<description>Proxied maintainer</description>
</maintainer>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/pngrewrite/metadata.xml b/media-gfx/pngrewrite/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/pngrewrite/metadata.xml
+++ b/media-gfx/pngrewrite/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/pngtools/metadata.xml b/media-gfx/pngtools/metadata.xml
index 97d39bb23a76..b4b30b89ec7b 100644
--- a/media-gfx/pngtools/metadata.xml
+++ b/media-gfx/pngtools/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
<maintainer>
<email>robbat2@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/postr/metadata.xml b/media-gfx/postr/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/media-gfx/postr/metadata.xml
+++ b/media-gfx/postr/metadata.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-gfx/potrace/metadata.xml b/media-gfx/potrace/metadata.xml
index 9768ddf6ae63..fddaeb1696c5 100644
--- a/media-gfx/potrace/metadata.xml
+++ b/media-gfx/potrace/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>fonts</herd>
- <herd>graphics</herd>
+ <maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+ </maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="metric">
default to a4 paper size and metric measurement
diff --git a/media-gfx/povtree/metadata.xml b/media-gfx/povtree/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/povtree/metadata.xml
+++ b/media-gfx/povtree/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/pqiv/metadata.xml b/media-gfx/pqiv/metadata.xml
index 09572f4b3efe..836a7b3e9101 100644
--- a/media-gfx/pqiv/metadata.xml
+++ b/media-gfx/pqiv/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<maintainer>
<email>phillip.berndt@googlemail.com</email>
diff --git a/media-gfx/pqstego/metadata.xml b/media-gfx/pqstego/metadata.xml
index 6183a8f271b6..f7cb40052005 100644
--- a/media-gfx/pqstego/metadata.xml
+++ b/media-gfx/pqstego/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pqstego</remote-id>
</upstream>
diff --git a/media-gfx/printrun/metadata.xml b/media-gfx/printrun/metadata.xml
index b2ffe0a55b80..4e0e29ecb1af 100644
--- a/media-gfx/printrun/metadata.xml
+++ b/media-gfx/printrun/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>3dprint</herd>
<maintainer>
<email>amynka@gentoo.org</email>
</maintainer>
+ <maintainer>
+ <email>3dprint@gentoo.org</email>
+ <name>Gentoo 3D print</name>
+ </maintainer>
<longdescription lang="en">
Printrun is a set of G-code sending applications for RepRap.
It consists of printcore (dumb G-code sender), pronsole (featured command line
diff --git a/media-gfx/psftools/metadata.xml b/media-gfx/psftools/metadata.xml
index 696065edd338..2cee0906a0f9 100644
--- a/media-gfx/psftools/metadata.xml
+++ b/media-gfx/psftools/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>fonts</herd>
+<maintainer>
+ <email>fonts@gentoo.org</email>
+ <name>Fonts</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/pstoedit/metadata.xml b/media-gfx/pstoedit/metadata.xml
index 3ce910543639..303ada526391 100644
--- a/media-gfx/pstoedit/metadata.xml
+++ b/media-gfx/pstoedit/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>tex</herd>
- <herd>printing</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
+ <maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+ </maintainer>
<use>
<flag name="emf">Enable <pkg>media-libs/libemf</pkg> support</flag>
<flag name="flash">Enable <pkg>media-libs/ming</pkg> SWF support</flag>
diff --git a/media-gfx/pydot/metadata.xml b/media-gfx/pydot/metadata.xml
index b11b15cd9f32..14e965ada9b6 100644
--- a/media-gfx/pydot/metadata.xml
+++ b/media-gfx/pydot/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<longdescription>Python bindings for Graphviz</longdescription>
<upstream>
<remote-id type="google-code">pydot</remote-id>
diff --git a/media-gfx/qiv/metadata.xml b/media-gfx/qiv/metadata.xml
index 978159afc5ac..46ce30920e8f 100644
--- a/media-gfx/qiv/metadata.xml
+++ b/media-gfx/qiv/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="magic">Use libmagic to determine mimetypes</flag>
</use>
diff --git a/media-gfx/qiviewer/metadata.xml b/media-gfx/qiviewer/metadata.xml
index 77264be218d8..a5640bef3060 100644
--- a/media-gfx/qiviewer/metadata.xml
+++ b/media-gfx/qiviewer/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>qt</herd>
<maintainer>
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
</maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<use>
<flag name="webp">Build support for WEBP image format</flag>
</use>
diff --git a/media-gfx/qosmic/metadata.xml b/media-gfx/qosmic/metadata.xml
index a1247f0f8286..45bb9586e496 100644
--- a/media-gfx/qosmic/metadata.xml
+++ b/media-gfx/qosmic/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
- <herd>qt</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">qosmic</remote-id>
</upstream>
diff --git a/media-gfx/qvv/metadata.xml b/media-gfx/qvv/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/qvv/metadata.xml
+++ b/media-gfx/qvv/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/raw-thumbnailer/metadata.xml b/media-gfx/raw-thumbnailer/metadata.xml
index 65b786ac033f..cc4d36ccb0f4 100644
--- a/media-gfx/raw-thumbnailer/metadata.xml
+++ b/media-gfx/raw-thumbnailer/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
<maintainer>
<email>angelos@gentoo.org</email>
<name>Christoph Mende</name>
</maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">raw-thumbnailer</remote-id>
<remote-id type="github">erlendd/raw-thumbnailer</remote-id>
diff --git a/media-gfx/rawtherapee/metadata.xml b/media-gfx/rawtherapee/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/rawtherapee/metadata.xml
+++ b/media-gfx/rawtherapee/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/rotoscope/metadata.xml b/media-gfx/rotoscope/metadata.xml
index 57ee4c30506e..95f6ab045502 100644
--- a/media-gfx/rotoscope/metadata.xml
+++ b/media-gfx/rotoscope/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">rotoscope</remote-id>
</upstream>
diff --git a/media-gfx/sam2p/metadata.xml b/media-gfx/sam2p/metadata.xml
index 8c6fbf3b4e63..4fc84594994c 100644
--- a/media-gfx/sam2p/metadata.xml
+++ b/media-gfx/sam2p/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">sam2p</remote-id>
</upstream>
diff --git a/media-gfx/scantailor/metadata.xml b/media-gfx/scantailor/metadata.xml
index 84bf0479f90f..945175095646 100644
--- a/media-gfx/scantailor/metadata.xml
+++ b/media-gfx/scantailor/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">scantailor</remote-id>
</upstream>
diff --git a/media-gfx/scrot/metadata.xml b/media-gfx/scrot/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/scrot/metadata.xml
+++ b/media-gfx/scrot/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/sfftobmp/metadata.xml b/media-gfx/sfftobmp/metadata.xml
index 39922da90f27..e463ad0a34a8 100644
--- a/media-gfx/sfftobmp/metadata.xml
+++ b/media-gfx/sfftobmp/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>sff to bmp converter</longdescription>
<upstream>
<remote-id type="sourceforge">sfftools</remote-id>
diff --git a/media-gfx/shotwell/metadata.xml b/media-gfx/shotwell/metadata.xml
index fe9e3eaa0b39..b81654077d3c 100644
--- a/media-gfx/shotwell/metadata.xml
+++ b/media-gfx/shotwell/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription lang="en">
Shotwell is a digital photo organizer designed for the GNOME desktop
environment. It allows you to import photos from disk or camera, organize
diff --git a/media-gfx/simple-scan/metadata.xml b/media-gfx/simple-scan/metadata.xml
index 66fd1959cc77..dcb57f299635 100644
--- a/media-gfx/simple-scan/metadata.xml
+++ b/media-gfx/simple-scan/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription lang="en">
A really easy way to scan both documents and photos. You can crop out
the bad parts of a photo and rotate it if it is the wrong way round.
diff --git a/media-gfx/splash-themes-livecd/metadata.xml b/media-gfx/splash-themes-livecd/metadata.xml
index 88653ddd7172..ec3067b686ee 100644
--- a/media-gfx/splash-themes-livecd/metadata.xml
+++ b/media-gfx/splash-themes-livecd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>livecd</herd>
+<maintainer>
+ <email>livecd@gentoo.org</email>
+ <name>Gentoo LiveCD Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/splash-themes-livedvd/metadata.xml b/media-gfx/splash-themes-livedvd/metadata.xml
index fd827a8640da..986bb5499d61 100644
--- a/media-gfx/splash-themes-livedvd/metadata.xml
+++ b/media-gfx/splash-themes-livedvd/metadata.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>
<longdescription lang="en">
A collection of Gentoo themes for splashutils.
</longdescription>
@@ -9,5 +8,12 @@ A collection of Gentoo themes for splashutils.
<email>email@missionaccomplish.com</email>
<name>Fernando Orocu</name>
</maintainer>
-<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/splashutils/metadata.xml b/media-gfx/splashutils/metadata.xml
index bd1cf9583173..86cba6c36594 100644
--- a/media-gfx/splashutils/metadata.xml
+++ b/media-gfx/splashutils/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>proxy-maintainers</herd>
<maintainer>
<email>asaf.gery@gmail.com</email>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="fbcondecor">
Support for the fbcondecor kernel patch.
diff --git a/media-gfx/structure-synth/metadata.xml b/media-gfx/structure-synth/metadata.xml
index f40803ba438d..d6e7b6f49d11 100644
--- a/media-gfx/structure-synth/metadata.xml
+++ b/media-gfx/structure-synth/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">structuresynth</remote-id>
</upstream>
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
index edf9479ddd04..4f209cc47bf6 100644
--- a/media-gfx/svg2rlg/metadata.xml
+++ b/media-gfx/svg2rlg/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>python</herd>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<longdescription lang="en">
The tool can be used as a console application to convert SVG to PDF
files.
diff --git a/media-gfx/swftools/metadata.xml b/media-gfx/swftools/metadata.xml
index 58236c941bbb..c753635475e2 100644
--- a/media-gfx/swftools/metadata.xml
+++ b/media-gfx/swftools/metadata.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>dblaci@dblaci.hu</email>
<description>Please assign bugs</description>
@@ -10,4 +9,8 @@
<email>pacho@gentoo.org</email>
<description>proxy-maintainer, please CC on bugs</description>
</maintainer>
+<maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/sxiv/metadata.xml b/media-gfx/sxiv/metadata.xml
index 1a6425684731..ea13346a3a20 100644
--- a/media-gfx/sxiv/metadata.xml
+++ b/media-gfx/sxiv/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">muennich/sxiv</remote-id>
</upstream>
diff --git a/media-gfx/symboleditor/metadata.xml b/media-gfx/symboleditor/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/media-gfx/symboleditor/metadata.xml
+++ b/media-gfx/symboleditor/metadata.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-gfx/tachyon/metadata.xml b/media-gfx/tachyon/metadata.xml
index e7b28c02178f..0594d0592f13 100644
--- a/media-gfx/tachyon/metadata.xml
+++ b/media-gfx/tachyon/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
<maintainer>
<email>alexxy@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/tic98/metadata.xml b/media-gfx/tic98/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/tic98/metadata.xml
+++ b/media-gfx/tic98/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/tif22pnm/metadata.xml b/media-gfx/tif22pnm/metadata.xml
index 8c6fbf3b4e63..4fc84594994c 100644
--- a/media-gfx/tif22pnm/metadata.xml
+++ b/media-gfx/tif22pnm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>tex</herd>
+ <maintainer>
+ <email>tex@gentoo.org</email>
+ <name>Gentoo TeX Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">sam2p</remote-id>
</upstream>
diff --git a/media-gfx/tintii/metadata.xml b/media-gfx/tintii/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/tintii/metadata.xml
+++ b/media-gfx/tintii/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/tuxpaint-stamps/metadata.xml b/media-gfx/tuxpaint-stamps/metadata.xml
index 74f748621c92..9a12d140f4c2 100644
--- a/media-gfx/tuxpaint-stamps/metadata.xml
+++ b/media-gfx/tuxpaint-stamps/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>
These are additional stamps for the Tux Paint drawing program.
</longdescription>
diff --git a/media-gfx/tuxpaint/metadata.xml b/media-gfx/tuxpaint/metadata.xml
index 251afdaea786..bf4c65bcb6d3 100644
--- a/media-gfx/tuxpaint/metadata.xml
+++ b/media-gfx/tuxpaint/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>
Tux Paint is a free drawing program designed for young children
(kids ages 3 and up). It has a simple, easy-to-use interface, fun
diff --git a/media-gfx/ufraw/metadata.xml b/media-gfx/ufraw/metadata.xml
index 56bf6e46d23e..c9dc099bbb11 100644
--- a/media-gfx/ufraw/metadata.xml
+++ b/media-gfx/ufraw/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<use>
<flag name="contrast">
enable contrast setting option
diff --git a/media-gfx/uniconvertor/metadata.xml b/media-gfx/uniconvertor/metadata.xml
index b66884cd1c1d..3b3e78815f10 100644
--- a/media-gfx/uniconvertor/metadata.xml
+++ b/media-gfx/uniconvertor/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">uniconvertor</remote-id>
</upstream>
diff --git a/media-gfx/wally/metadata.xml b/media-gfx/wally/metadata.xml
index 60f988e1b73e..7c23b4748651 100644
--- a/media-gfx/wally/metadata.xml
+++ b/media-gfx/wally/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-misc</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">wally</remote-id>
</upstream>
diff --git a/media-gfx/wings/metadata.xml b/media-gfx/wings/metadata.xml
index 1faadf36651d..0f9b526550f8 100644
--- a/media-gfx/wings/metadata.xml
+++ b/media-gfx/wings/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<longdescription>
Wings 3D is a polygon mesh modeler inspired by Nendo and
Mirai from Izware.
diff --git a/media-gfx/wkhtmltopdf/metadata.xml b/media-gfx/wkhtmltopdf/metadata.xml
index 9022e05f424b..7d1db7cd52ec 100644
--- a/media-gfx/wkhtmltopdf/metadata.xml
+++ b/media-gfx/wkhtmltopdf/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="github">wkhtmltopdf/wkhtmltopdf</remote-id>
</upstream>
diff --git a/media-gfx/xli/metadata.xml b/media-gfx/xli/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-gfx/xli/metadata.xml
+++ b/media-gfx/xli/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/xloadimage/metadata.xml b/media-gfx/xloadimage/metadata.xml
index 9be90a258970..fad04a0b0aef 100644
--- a/media-gfx/xloadimage/metadata.xml
+++ b/media-gfx/xloadimage/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml
index f4ee3494255f..b2bf15a15461 100644
--- a/media-gfx/xsane/metadata.xml
+++ b/media-gfx/xsane/metadata.xml
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>printing</herd>
-<herd>graphics</herd>
<maintainer>
<email>pacho@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>printing@gentoo.org</email>
+ <name>Gentoo Printing Project</name>
+</maintainer>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
<use>
<flag name="ocr">Enable support for Optical Character Recognition reader</flag>
</use>
diff --git a/media-gfx/xsvg/metadata.xml b/media-gfx/xsvg/metadata.xml
index e770d1bc9a96..626f3a5a722b 100644
--- a/media-gfx/xsvg/metadata.xml
+++ b/media-gfx/xsvg/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
</pkgmetadata>
diff --git a/media-gfx/xzgv/metadata.xml b/media-gfx/xzgv/metadata.xml
index d78b1f849f9b..fd7fcca213f9 100644
--- a/media-gfx/xzgv/metadata.xml
+++ b/media-gfx/xzgv/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>graphics</herd>
+ <maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">xzgv</remote-id>
</upstream>
diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index 058d1eb998a8..1b341d030d6c 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>graphics</herd>
+<maintainer>
+ <email>graphics@gentoo.org</email>
+ <name>Gentoo Graphics Project</name>
+</maintainer>
<longdescription lang="en">
YafaRay is a raytracing open source render engine. Raytracing is a rendering technique for generating realistic images by tracing the path of light through a 3D scene.
An render engine consists of a "faceless" computer program that interacts with a host 3D application to provide very specific raytracing capabilties "on demand". Blender 3D is the host application of YafaRay.