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 /x11-libs
parentRemove explicit notion of maintainer-needed, for GLEP 67 (diff)
downloadgentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.gz
gentoo-cfd93d768e79a349f1e762b92773190295c36980.tar.bz2
gentoo-cfd93d768e79a349f1e762b92773190295c36980.zip
Replace all herds with appropriate projects (GLEP 67)
Replace all uses of herd with appropriate project maintainers, or no maintainers in case of herds requested to be disbanded.
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/c++-gtk-utils/metadata.xml5
-rw-r--r--x11-libs/cairo/metadata.xml5
-rw-r--r--x11-libs/colord-gtk/metadata.xml5
-rw-r--r--x11-libs/compiz-bcop/metadata.xml5
-rw-r--r--x11-libs/compizconfig-backend-gconf/metadata.xml5
-rw-r--r--x11-libs/compizconfig-backend-kconfig4/metadata.xml5
-rw-r--r--x11-libs/flowcanvas/metadata.xml5
-rw-r--r--x11-libs/fltk/metadata.xml5
-rw-r--r--x11-libs/gdk-pixbuf/metadata.xml5
-rw-r--r--x11-libs/gksu/metadata.xml5
-rw-r--r--x11-libs/gl2ps/metadata.xml5
-rw-r--r--x11-libs/glamor/metadata.xml5
-rw-r--r--x11-libs/gnome-pty-helper/metadata.xml5
-rw-r--r--x11-libs/goffice/metadata.xml5
-rw-r--r--x11-libs/goocanvas/metadata.xml5
-rw-r--r--x11-libs/gtk+/metadata.xml5
-rw-r--r--x11-libs/gtk+extra/metadata.xml5
-rw-r--r--x11-libs/gtk-mac-integration/metadata.xml5
-rw-r--r--x11-libs/gtkdatabox/metadata.xml5
-rw-r--r--x11-libs/gtkglarea/metadata.xml5
-rw-r--r--x11-libs/gtkglext/metadata.xml5
-rw-r--r--x11-libs/gtkmathview/metadata.xml5
-rw-r--r--x11-libs/gtksourceview/metadata.xml5
-rw-r--r--x11-libs/guile-gtk/metadata.xml5
-rw-r--r--x11-libs/ige-mac-integration/metadata.xml5
-rw-r--r--x11-libs/libFS/metadata.xml5
-rw-r--r--x11-libs/libGLw/metadata.xml5
-rw-r--r--x11-libs/libICE/metadata.xml5
-rw-r--r--x11-libs/libSM/metadata.xml5
-rw-r--r--x11-libs/libX11/metadata.xml5
-rw-r--r--x11-libs/libXCalibrate/metadata.xml10
-rw-r--r--x11-libs/libXScrnSaver/metadata.xml5
-rw-r--r--x11-libs/libXTrap/metadata.xml5
-rw-r--r--x11-libs/libXau/metadata.xml5
-rw-r--r--x11-libs/libXaw/metadata.xml5
-rw-r--r--x11-libs/libXaw3d/metadata.xml5
-rw-r--r--x11-libs/libXcomposite/metadata.xml5
-rw-r--r--x11-libs/libXcursor/metadata.xml5
-rw-r--r--x11-libs/libXdamage/metadata.xml5
-rw-r--r--x11-libs/libXdmcp/metadata.xml5
-rw-r--r--x11-libs/libXext/metadata.xml5
-rw-r--r--x11-libs/libXfixes/metadata.xml5
-rw-r--r--x11-libs/libXfont/metadata.xml5
-rw-r--r--x11-libs/libXfont2/metadata.xml5
-rw-r--r--x11-libs/libXfontcache/metadata.xml5
-rw-r--r--x11-libs/libXft/metadata.xml5
-rw-r--r--x11-libs/libXi/metadata.xml5
-rw-r--r--x11-libs/libXinerama/metadata.xml5
-rw-r--r--x11-libs/libXmu/metadata.xml5
-rw-r--r--x11-libs/libXp/metadata.xml5
-rw-r--r--x11-libs/libXpm/metadata.xml5
-rw-r--r--x11-libs/libXrandr/metadata.xml5
-rw-r--r--x11-libs/libXrender/metadata.xml5
-rw-r--r--x11-libs/libXres/metadata.xml5
-rw-r--r--x11-libs/libXt/metadata.xml5
-rw-r--r--x11-libs/libXtst/metadata.xml5
-rw-r--r--x11-libs/libXv/metadata.xml5
-rw-r--r--x11-libs/libXvMC/metadata.xml5
-rw-r--r--x11-libs/libXxf86dga/metadata.xml5
-rw-r--r--x11-libs/libXxf86misc/metadata.xml5
-rw-r--r--x11-libs/libXxf86vm/metadata.xml5
-rw-r--r--x11-libs/libcompizconfig/metadata.xml5
-rw-r--r--x11-libs/libcryptui/metadata.xml5
-rw-r--r--x11-libs/libdmx/metadata.xml5
-rw-r--r--x11-libs/libdockapp/metadata.xml1
-rw-r--r--x11-libs/libdrm/metadata.xml5
-rw-r--r--x11-libs/libfakekey/metadata.xml6
-rw-r--r--x11-libs/libfm-extra/metadata.xml10
-rw-r--r--x11-libs/libfm/metadata.xml10
-rw-r--r--x11-libs/libfontenc/metadata.xml5
-rw-r--r--x11-libs/libgksu/metadata.xml5
-rw-r--r--x11-libs/libgxim/metadata.xml5
-rw-r--r--x11-libs/libiterm-mbt/metadata.xml5
-rw-r--r--x11-libs/libkscreen/metadata.xml5
-rw-r--r--x11-libs/libmatchbox/metadata.xml1
-rw-r--r--x11-libs/libnotify/metadata.xml5
-rw-r--r--x11-libs/liboglappth/metadata.xml5
-rw-r--r--x11-libs/libpciaccess/metadata.xml5
-rw-r--r--x11-libs/libqxt/metadata.xml5
-rw-r--r--x11-libs/libsexy/metadata.xml5
-rw-r--r--x11-libs/libva-intel-driver/metadata.xml5
-rw-r--r--x11-libs/libva-vdpau-driver/metadata.xml5
-rw-r--r--x11-libs/libview/metadata.xml5
-rw-r--r--x11-libs/libwnck/metadata.xml5
-rw-r--r--x11-libs/libxcb/metadata.xml5
-rw-r--r--x11-libs/libxkbcommon/metadata.xml5
-rw-r--r--x11-libs/libxkbfile/metadata.xml5
-rw-r--r--x11-libs/libxkbui/metadata.xml5
-rw-r--r--x11-libs/libxklavier/metadata.xml1
-rw-r--r--x11-libs/libxsettings-client/metadata.xml6
-rw-r--r--x11-libs/libxshmfence/metadata.xml5
-rw-r--r--x11-libs/mx/metadata.xml5
-rw-r--r--x11-libs/pango/metadata.xml5
-rw-r--r--x11-libs/pangox-compat/metadata.xml5
-rw-r--r--x11-libs/pixman/metadata.xml5
-rw-r--r--x11-libs/qscintilla/metadata.xml10
-rw-r--r--x11-libs/qtermwidget/metadata.xml5
-rw-r--r--x11-libs/qtscriptgenerator/metadata.xml10
-rw-r--r--x11-libs/qwt/metadata.xml5
-rw-r--r--x11-libs/qwtplot3d/metadata.xml5
-rw-r--r--x11-libs/qwtpolar/metadata.xml5
-rw-r--r--x11-libs/snorenotify/metadata.xml5
-rw-r--r--x11-libs/startup-notification/metadata.xml1
-rw-r--r--x11-libs/tslib/metadata.xml5
-rw-r--r--x11-libs/vte/metadata.xml5
-rw-r--r--x11-libs/wxGTK/metadata.xml1
-rw-r--r--x11-libs/xbae/metadata.xml5
-rw-r--r--x11-libs/xcb-util-cursor/metadata.xml5
-rw-r--r--x11-libs/xcb-util-image/metadata.xml5
-rw-r--r--x11-libs/xcb-util-keysyms/metadata.xml5
-rw-r--r--x11-libs/xcb-util-renderutil/metadata.xml5
-rw-r--r--x11-libs/xcb-util-wm/metadata.xml5
-rw-r--r--x11-libs/xcb-util/metadata.xml5
-rw-r--r--x11-libs/xpa/metadata.xml5
-rw-r--r--x11-libs/xpyb/metadata.xml5
-rw-r--r--x11-libs/xtrans/metadata.xml5
-rw-r--r--x11-libs/xvba-video/metadata.xml5
117 files changed, 468 insertions, 124 deletions
diff --git a/x11-libs/c++-gtk-utils/metadata.xml b/x11-libs/c++-gtk-utils/metadata.xml
index 4ac61867094f..6e3887754976 100644
--- a/x11-libs/c++-gtk-utils/metadata.xml
+++ b/x11-libs/c++-gtk-utils/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">cxx-gtk-utils</remote-id>
</upstream>
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index b076360db45e..839a18052010 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/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>x11</herd>
<maintainer>
<email>tetromino@gentoo.org</email>
<name>Alexandre Rostovtsev</name>
@@ -11,6 +10,10 @@
<name>Ben de Groot</name>
<description>Secondary maintainer (x11 team is primary)</description>
</maintainer>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<use>
<flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">
Use Mesa backend for acceleration</flag>
diff --git a/x11-libs/colord-gtk/metadata.xml b/x11-libs/colord-gtk/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/colord-gtk/metadata.xml
+++ b/x11-libs/colord-gtk/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/compiz-bcop/metadata.xml b/x11-libs/compiz-bcop/metadata.xml
index b8c820e5807e..524d8b2e1df5 100644
--- a/x11-libs/compiz-bcop/metadata.xml
+++ b/x11-libs/compiz-bcop/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+ <email>desktop-effects@gentoo.org</email>
+ <name>Desktop effects</name>
+</maintainer>
<longdescription lang="en">
BCOP is a code generator that provides an easy way to handle plugin options by
generating parts of the plugin code directly from the xml metadata file.
diff --git a/x11-libs/compizconfig-backend-gconf/metadata.xml b/x11-libs/compizconfig-backend-gconf/metadata.xml
index aad6dbb7276c..10ae9d7df39d 100644
--- a/x11-libs/compizconfig-backend-gconf/metadata.xml
+++ b/x11-libs/compizconfig-backend-gconf/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+ <email>desktop-effects@gentoo.org</email>
+ <name>Desktop effects</name>
+</maintainer>
<longdescription lang="en">The gconf backend for CompizConfig.</longdescription>
</pkgmetadata>
diff --git a/x11-libs/compizconfig-backend-kconfig4/metadata.xml b/x11-libs/compizconfig-backend-kconfig4/metadata.xml
index 6b904364e152..d9434b3bbbdf 100644
--- a/x11-libs/compizconfig-backend-kconfig4/metadata.xml
+++ b/x11-libs/compizconfig-backend-kconfig4/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+ <email>desktop-effects@gentoo.org</email>
+ <name>Desktop effects</name>
+</maintainer>
<longdescription lang="en">The kconfig backend for CompizConfig.</longdescription>
</pkgmetadata>
diff --git a/x11-libs/flowcanvas/metadata.xml b/x11-libs/flowcanvas/metadata.xml
index 6292b8c1f28d..df77019bb066 100644
--- a/x11-libs/flowcanvas/metadata.xml
+++ b/x11-libs/flowcanvas/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>proaudio</herd>
+<maintainer>
+ <email>proaudio@gentoo.org</email>
+ <name>Gentoo ProAudio Project</name>
+</maintainer>
<longdescription lang="en">
FlowCanvas is an interactive Gtkmm/Gnomecanvasmm widget for "boxes and
lines" environments (ie modular synths or interactive finite state automata
diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
index b77585c4741b..2efd757f556d 100644
--- a/x11-libs/fltk/metadata.xml
+++ b/x11-libs/fltk/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>desktop-misc</herd>
+<maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+</maintainer>
<longdescription>
The Fast Light ToolKit is a cross-platform C++ user interface
toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/gdk-pixbuf/metadata.xml
+++ b/x11-libs/gdk-pixbuf/metadata.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/x11-libs/gksu/metadata.xml b/x11-libs/gksu/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/gksu/metadata.xml
+++ b/x11-libs/gksu/metadata.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/x11-libs/gl2ps/metadata.xml b/x11-libs/gl2ps/metadata.xml
index 678526ea433f..6cad271d9c04 100644
--- a/x11-libs/gl2ps/metadata.xml
+++ b/x11-libs/gl2ps/metadata.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">
GL2PS is a C library providing high quality vector output for any
OpenGL application. The main difference between GL2PS and other
diff --git a/x11-libs/glamor/metadata.xml b/x11-libs/glamor/metadata.xml
index a61f7113f618..1e18854c32d5 100644
--- a/x11-libs/glamor/metadata.xml
+++ b/x11-libs/glamor/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
<use>
<flag name="gles">Build glamor based on gles2</flag>
</use>
diff --git a/x11-libs/gnome-pty-helper/metadata.xml b/x11-libs/gnome-pty-helper/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/gnome-pty-helper/metadata.xml
+++ b/x11-libs/gnome-pty-helper/metadata.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/x11-libs/goffice/metadata.xml b/x11-libs/goffice/metadata.xml
index dd404721855d..a229b10010ac 100644
--- a/x11-libs/goffice/metadata.xml
+++ b/x11-libs/goffice/metadata.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-office</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription lang="en">
GOffice is a library of document-centric objects and utilities building
on top of GLib and Gtk+ and used by software such as Gnumeric.
diff --git a/x11-libs/goocanvas/metadata.xml b/x11-libs/goocanvas/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/goocanvas/metadata.xml
+++ b/x11-libs/goocanvas/metadata.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/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index f5d67e73f0e5..4e736cb89fd1 100644
--- a/x11-libs/gtk+/metadata.xml
+++ b/x11-libs/gtk+/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<longdescription>
GTK+ is a multi-platform toolkit for creating graphical user
interfaces. Offering a complete set of widgets, GTK+ is suitable
diff --git a/x11-libs/gtk+extra/metadata.xml b/x11-libs/gtk+extra/metadata.xml
index a97fafc3ceec..9fdfae2e19e8 100644
--- a/x11-libs/gtk+extra/metadata.xml
+++ b/x11-libs/gtk+extra/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gtkextra</remote-id>
</upstream>
diff --git a/x11-libs/gtk-mac-integration/metadata.xml b/x11-libs/gtk-mac-integration/metadata.xml
index 4561e552bd04..4609b17cbb97 100644
--- a/x11-libs/gtk-mac-integration/metadata.xml
+++ b/x11-libs/gtk-mac-integration/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>prefix</herd>
+ <maintainer>
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-libs/gtkdatabox/metadata.xml b/x11-libs/gtkdatabox/metadata.xml
index 6e85d8cc60ad..5f435e2e0b7d 100644
--- a/x11-libs/gtkdatabox/metadata.xml
+++ b/x11-libs/gtkdatabox/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-electronics</herd>
<maintainer>
<email>xmw@gentoo.org</email>
<name>Michael Weber</name>
</maintainer>
+ <maintainer>
+ <email>sci-electronics@gentoo.org</email>
+ <name>Gentoo Electronics Project</name>
+ </maintainer>
<longdescription>Gtk+ Widgets for live display fluctuating numerical data</longdescription>
<use>
<flag name="glade">Build with libglade and glade-3 supports, which includes a glade's module for GtkDataBox widget</flag>
diff --git a/x11-libs/gtkglarea/metadata.xml b/x11-libs/gtkglarea/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/gtkglarea/metadata.xml
+++ b/x11-libs/gtkglarea/metadata.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/x11-libs/gtkglext/metadata.xml b/x11-libs/gtkglext/metadata.xml
index c77e80cdedf9..9f0aa705356d 100644
--- a/x11-libs/gtkglext/metadata.xml
+++ b/x11-libs/gtkglext/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">gtkglext</remote-id>
</upstream>
diff --git a/x11-libs/gtkmathview/metadata.xml b/x11-libs/gtkmathview/metadata.xml
index 9ca29e5e82b5..76bcaa0f3090 100644
--- a/x11-libs/gtkmathview/metadata.xml
+++ b/x11-libs/gtkmathview/metadata.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="mathml">Install additional fonts for proper mathml
support.</flag>
diff --git a/x11-libs/gtksourceview/metadata.xml b/x11-libs/gtksourceview/metadata.xml
index 11d9db8be33d..79102e9a50b1 100644
--- a/x11-libs/gtksourceview/metadata.xml
+++ b/x11-libs/gtksourceview/metadata.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="glade">Install a glade catalog file</flag>
</use>
diff --git a/x11-libs/guile-gtk/metadata.xml b/x11-libs/guile-gtk/metadata.xml
index 344196c171d9..a2bfa753eee5 100644
--- a/x11-libs/guile-gtk/metadata.xml
+++ b/x11-libs/guile-gtk/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>scheme</herd>
<maintainer>
<email>hkBst@gentoo.org</email>
<name>Marijn Schouten</name>
</maintainer>
+ <maintainer>
+ <email>scheme@gentoo.org</email>
+ <name>Gentoo Scheme Project</name>
+ </maintainer>
<longdescription lang="en">
The guile-gtk project brings the power of Scheme to your graphical application.
</longdescription>
diff --git a/x11-libs/ige-mac-integration/metadata.xml b/x11-libs/ige-mac-integration/metadata.xml
index 46dee96f4e7a..fd87a77caa6a 100644
--- a/x11-libs/ige-mac-integration/metadata.xml
+++ b/x11-libs/ige-mac-integration/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>prefix</herd>
+<maintainer>
+ <email>prefix@gentoo.org</email>
+ <name>Gentoo Prefix</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libFS/metadata.xml b/x11-libs/libFS/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libFS/metadata.xml
+++ b/x11-libs/libFS/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libGLw/metadata.xml b/x11-libs/libGLw/metadata.xml
index dd4783e45f5e..4fd5fa390eab 100644
--- a/x11-libs/libGLw/metadata.xml
+++ b/x11-libs/libGLw/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>x11</herd>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mesa3d</remote-id>
</upstream>
diff --git a/x11-libs/libICE/metadata.xml b/x11-libs/libICE/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libICE/metadata.xml
+++ b/x11-libs/libICE/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libSM/metadata.xml b/x11-libs/libSM/metadata.xml
index 8b3fa73a30b0..0aa9922043f4 100644
--- a/x11-libs/libSM/metadata.xml
+++ b/x11-libs/libSM/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
<use>
<flag name="uuid">Use UUID for session identification instead of IP address
and system time.
diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml
index ef95d0c2c840..c919877614ac 100644
--- a/x11-libs/libX11/metadata.xml
+++ b/x11-libs/libX11/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:x.org:libx11</remote-id>
</upstream>
diff --git a/x11-libs/libXCalibrate/metadata.xml b/x11-libs/libXCalibrate/metadata.xml
index d7e55682affc..cf4a860c1118 100644
--- a/x11-libs/libXCalibrate/metadata.xml
+++ b/x11-libs/libXCalibrate/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>x11</herd>
-<herd>embedded</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
+<maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXScrnSaver/metadata.xml b/x11-libs/libXScrnSaver/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXScrnSaver/metadata.xml
+++ b/x11-libs/libXScrnSaver/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXTrap/metadata.xml b/x11-libs/libXTrap/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXTrap/metadata.xml
+++ b/x11-libs/libXTrap/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXau/metadata.xml b/x11-libs/libXau/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXau/metadata.xml
+++ b/x11-libs/libXau/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXaw/metadata.xml b/x11-libs/libXaw/metadata.xml
index f58d351da9d8..e70578ebf580 100644
--- a/x11-libs/libXaw/metadata.xml
+++ b/x11-libs/libXaw/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
<use>
<flag name="deprecated">Install deprecated Xaw6 library.</flag>
</use>
diff --git a/x11-libs/libXaw3d/metadata.xml b/x11-libs/libXaw3d/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXaw3d/metadata.xml
+++ b/x11-libs/libXaw3d/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXcomposite/metadata.xml b/x11-libs/libXcomposite/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXcomposite/metadata.xml
+++ b/x11-libs/libXcomposite/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXcursor/metadata.xml b/x11-libs/libXcursor/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXcursor/metadata.xml
+++ b/x11-libs/libXcursor/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXdamage/metadata.xml b/x11-libs/libXdamage/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXdamage/metadata.xml
+++ b/x11-libs/libXdamage/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXdmcp/metadata.xml
+++ b/x11-libs/libXdmcp/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXext/metadata.xml b/x11-libs/libXext/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXext/metadata.xml
+++ b/x11-libs/libXext/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXfixes/metadata.xml b/x11-libs/libXfixes/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXfixes/metadata.xml
+++ b/x11-libs/libXfixes/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXfont/metadata.xml b/x11-libs/libXfont/metadata.xml
index ce1f6e1a2b55..0acc578f2896 100644
--- a/x11-libs/libXfont/metadata.xml
+++ b/x11-libs/libXfont/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>x11</herd>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<use>
<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
<flag name="truetype">Use media-libs/freetype for font rasterization.</flag>
diff --git a/x11-libs/libXfont2/metadata.xml b/x11-libs/libXfont2/metadata.xml
index ce1f6e1a2b55..0acc578f2896 100644
--- a/x11-libs/libXfont2/metadata.xml
+++ b/x11-libs/libXfont2/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>x11</herd>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<use>
<flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
<flag name="truetype">Use media-libs/freetype for font rasterization.</flag>
diff --git a/x11-libs/libXfontcache/metadata.xml b/x11-libs/libXfontcache/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXfontcache/metadata.xml
+++ b/x11-libs/libXfontcache/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXft/metadata.xml b/x11-libs/libXft/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXft/metadata.xml
+++ b/x11-libs/libXft/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXi/metadata.xml b/x11-libs/libXi/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXi/metadata.xml
+++ b/x11-libs/libXi/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXinerama/metadata.xml b/x11-libs/libXinerama/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXinerama/metadata.xml
+++ b/x11-libs/libXinerama/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXmu/metadata.xml b/x11-libs/libXmu/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXmu/metadata.xml
+++ b/x11-libs/libXmu/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXp/metadata.xml b/x11-libs/libXp/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXp/metadata.xml
+++ b/x11-libs/libXp/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXpm/metadata.xml b/x11-libs/libXpm/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXpm/metadata.xml
+++ b/x11-libs/libXpm/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXrandr/metadata.xml b/x11-libs/libXrandr/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXrandr/metadata.xml
+++ b/x11-libs/libXrandr/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXrender/metadata.xml b/x11-libs/libXrender/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXrender/metadata.xml
+++ b/x11-libs/libXrender/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXres/metadata.xml b/x11-libs/libXres/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXres/metadata.xml
+++ b/x11-libs/libXres/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXt/metadata.xml b/x11-libs/libXt/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXt/metadata.xml
+++ b/x11-libs/libXt/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXtst/metadata.xml b/x11-libs/libXtst/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXtst/metadata.xml
+++ b/x11-libs/libXtst/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXv/metadata.xml b/x11-libs/libXv/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXv/metadata.xml
+++ b/x11-libs/libXv/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXvMC/metadata.xml b/x11-libs/libXvMC/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXvMC/metadata.xml
+++ b/x11-libs/libXvMC/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXxf86dga/metadata.xml b/x11-libs/libXxf86dga/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXxf86dga/metadata.xml
+++ b/x11-libs/libXxf86dga/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXxf86misc/metadata.xml b/x11-libs/libXxf86misc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXxf86misc/metadata.xml
+++ b/x11-libs/libXxf86misc/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libXxf86vm/metadata.xml b/x11-libs/libXxf86vm/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libXxf86vm/metadata.xml
+++ b/x11-libs/libXxf86vm/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libcompizconfig/metadata.xml b/x11-libs/libcompizconfig/metadata.xml
index 237116b437d9..d5bf5b265d95 100644
--- a/x11-libs/libcompizconfig/metadata.xml
+++ b/x11-libs/libcompizconfig/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>desktop-effects</herd>
+<maintainer>
+ <email>desktop-effects@gentoo.org</email>
+ <name>Desktop effects</name>
+</maintainer>
<longdescription lang="en">Libcompizconfig is an alternative configuration system for compiz.</longdescription>
</pkgmetadata>
diff --git a/x11-libs/libcryptui/metadata.xml b/x11-libs/libcryptui/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/libcryptui/metadata.xml
+++ b/x11-libs/libcryptui/metadata.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/x11-libs/libdmx/metadata.xml b/x11-libs/libdmx/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libdmx/metadata.xml
+++ b/x11-libs/libdmx/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libdockapp/metadata.xml b/x11-libs/libdockapp/metadata.xml
index 3ef3d17b3eeb..05f7125026e3 100644
--- a/x11-libs/libdockapp/metadata.xml
+++ b/x11-libs/libdockapp/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>desktop-dock</herd>
<maintainer>
<email>voyageur@gentoo.org</email>
<name>Bernard Cafarelli</name>
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index ff58990ed2db..50b7ca6a769a 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+<email>x11@gentoo.org</email>
+<name>X11</name>
+</maintainer>
<use>
<flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag>
<flag name="valgrind">Compile in valgrind memory hints</flag>
diff --git a/x11-libs/libfakekey/metadata.xml b/x11-libs/libfakekey/metadata.xml
index 13070094fdcc..e218a13609c3 100644
--- a/x11-libs/libfakekey/metadata.xml
+++ b/x11-libs/libfakekey/metadata.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gpe</herd>
- <herd>kde</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-libs/libfm-extra/metadata.xml b/x11-libs/libfm-extra/metadata.xml
index 68e971611724..56db2d4eea00 100644
--- a/x11-libs/libfm-extra/metadata.xml
+++ b/x11-libs/libfm-extra/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>lxde</herd>
- <herd>lxqt</herd>
+ <maintainer>
+ <email>lxde@gentoo.org</email>
+ <name>Gentoo LXDE Project</name>
+ </maintainer>
+ <maintainer>
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">pcmanfm</remote-id>
</upstream>
diff --git a/x11-libs/libfm/metadata.xml b/x11-libs/libfm/metadata.xml
index 82f76ad43b71..8444adaad472 100644
--- a/x11-libs/libfm/metadata.xml
+++ b/x11-libs/libfm/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>lxde</herd>
<maintainer>
<email>hwoarang@gentoo.org</email>
<name>Markos Chandras</name>
</maintainer>
- <herd>lxqt</herd>
+ <maintainer>
+ <email>lxde@gentoo.org</email>
+ <name>Gentoo LXDE Project</name>
+ </maintainer>
+ <maintainer>
+ <email>lxqt@gentoo.org</email>
+ <name>LXQt</name>
+ </maintainer>
<use>
<flag name="vala">Support custom actions in menus</flag>
<flag name="udisks">Use libfm's udisks-based volume monitor implementation instead of using the one from gvfs</flag>
diff --git a/x11-libs/libfontenc/metadata.xml b/x11-libs/libfontenc/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libfontenc/metadata.xml
+++ b/x11-libs/libfontenc/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libgksu/metadata.xml b/x11-libs/libgksu/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/libgksu/metadata.xml
+++ b/x11-libs/libgksu/metadata.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/x11-libs/libgxim/metadata.xml b/x11-libs/libgxim/metadata.xml
index 09b23c20c59c..66e80c95a98a 100644
--- a/x11-libs/libgxim/metadata.xml
+++ b/x11-libs/libgxim/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>cjk</herd>
+ <maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">libgxim</remote-id>
<remote-id type="bitbucket">tagoh/libgxim</remote-id>
diff --git a/x11-libs/libiterm-mbt/metadata.xml b/x11-libs/libiterm-mbt/metadata.xml
index 75ea3d5af77b..e116a84be222 100644
--- a/x11-libs/libiterm-mbt/metadata.xml
+++ b/x11-libs/libiterm-mbt/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>cjk</herd>
+<maintainer>
+ <email>cjk@gentoo.org</email>
+ <name>Cjk</name>
+</maintainer>
<longdescription>
Hacked version of the libiterm library.
</longdescription>
diff --git a/x11-libs/libkscreen/metadata.xml b/x11-libs/libkscreen/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-libs/libkscreen/metadata.xml
+++ b/x11-libs/libkscreen/metadata.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/x11-libs/libmatchbox/metadata.xml b/x11-libs/libmatchbox/metadata.xml
index a7fef72f1e2f..0efb326489f3 100644
--- a/x11-libs/libmatchbox/metadata.xml
+++ b/x11-libs/libmatchbox/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>gpe</herd>
<use>
<flag name="pango">Enable <pkg>x11-libs/pango</pkg> support</flag>
<flag name="xsettings">Enable the use of xsettings for settings
diff --git a/x11-libs/libnotify/metadata.xml b/x11-libs/libnotify/metadata.xml
index 2953eb8e0471..a23c699962da 100644
--- a/x11-libs/libnotify/metadata.xml
+++ b/x11-libs/libnotify/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
+ <maintainer>
+ <email>freedesktop-bugs@gentoo.org</email>
+ <name>Gentoo Freedesktop Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-libs/liboglappth/metadata.xml b/x11-libs/liboglappth/metadata.xml
index 81439daa1259..19ea34996e84 100644
--- a/x11-libs/liboglappth/metadata.xml
+++ b/x11-libs/liboglappth/metadata.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-chemistry</herd>
+<maintainer>
+ <email>sci-chemistry@gentoo.org</email>
+ <name>Gentoo Chemistry Project</name>
+</maintainer>
<longdescription>
Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models
and molecular mechanics models (there is an experimental Tripos 5.2-like force
diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libpciaccess/metadata.xml
+++ b/x11-libs/libpciaccess/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libqxt/metadata.xml b/x11-libs/libqxt/metadata.xml
index 32c24a498f1d..83b4efffe7a2 100644
--- a/x11-libs/libqxt/metadata.xml
+++ b/x11-libs/libqxt/metadata.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="berkdb">Build the QxtBerkeley module</flag>
<flag name="sql">Build the QxtSql module</flag>
diff --git a/x11-libs/libsexy/metadata.xml b/x11-libs/libsexy/metadata.xml
index 2953eb8e0471..a23c699962da 100644
--- a/x11-libs/libsexy/metadata.xml
+++ b/x11-libs/libsexy/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
+ <maintainer>
+ <email>freedesktop-bugs@gentoo.org</email>
+ <name>Gentoo Freedesktop Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
index 2d8e058094e0..327bb4ef39d2 100644
--- a/x11-libs/libva-intel-driver/metadata.xml
+++ b/x11-libs/libva-intel-driver/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>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
@@ -10,6 +9,10 @@
<email>jekarlson@gmail.com</email>
<name>Emil Karlson</name>
</maintainer>
+ <maintainer>
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<use>
<flag name="drm">Enables VA/DRM API support.</flag>
</use>
diff --git a/x11-libs/libva-vdpau-driver/metadata.xml b/x11-libs/libva-vdpau-driver/metadata.xml
index 2861eaad42d0..b70cbaa3985f 100644
--- a/x11-libs/libva-vdpau-driver/metadata.xml
+++ b/x11-libs/libva-vdpau-driver/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>x11</herd>
<maintainer>
<email>aballier@gentoo.org</email>
<name>Alexis Ballier</name>
</maintainer>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-libs/libview/metadata.xml b/x11-libs/libview/metadata.xml
index d34f18b75014..fa005babbacc 100644
--- a/x11-libs/libview/metadata.xml
+++ b/x11-libs/libview/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>vmware</herd>
+ <maintainer>
+ <email>vmware@gentoo.org</email>
+ <name>Gentoo VMware Project</name>
+ </maintainer>
<longdescription lang="en">
</longdescription>
<upstream>
diff --git a/x11-libs/libwnck/metadata.xml b/x11-libs/libwnck/metadata.xml
index 8e1b6e57a01a..355cc78e7922 100644
--- a/x11-libs/libwnck/metadata.xml
+++ b/x11-libs/libwnck/metadata.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="tools">Install wnckprop-3 and wnck-urgency-monitor-3
command-line tools</flag>
diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
index 6d157b5ddcf9..37fcd63cee04 100644
--- a/x11-libs/libxcb/metadata.xml
+++ b/x11-libs/libxcb/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>x11</herd>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
<use>
<flag name="xkb">Enable the XCB keyboard extension</flag>
</use>
diff --git a/x11-libs/libxkbcommon/metadata.xml b/x11-libs/libxkbcommon/metadata.xml
index 6cc3982431f8..b02788085e0b 100644
--- a/x11-libs/libxkbcommon/metadata.xml
+++ b/x11-libs/libxkbcommon/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>x11</herd>
+ <maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-libs/libxkbfile/metadata.xml b/x11-libs/libxkbfile/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libxkbfile/metadata.xml
+++ b/x11-libs/libxkbfile/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libxkbui/metadata.xml b/x11-libs/libxkbui/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libxkbui/metadata.xml
+++ b/x11-libs/libxkbui/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/libxklavier/metadata.xml b/x11-libs/libxklavier/metadata.xml
index 1d2462d712ff..fe2720bebdab 100644
--- a/x11-libs/libxklavier/metadata.xml
+++ b/x11-libs/libxklavier/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/x11-libs/libxsettings-client/metadata.xml b/x11-libs/libxsettings-client/metadata.xml
index 8619aae1ffb5..3447e5c316aa 100644
--- a/x11-libs/libxsettings-client/metadata.xml
+++ b/x11-libs/libxsettings-client/metadata.xml
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>desktop-misc</herd>
- <herd>gpe</herd>
+ <maintainer>
+ <email>desktop-misc@gentoo.org</email>
+ <name>Gentoo Desktop Miscellaneous Project</name>
+ </maintainer>
</pkgmetadata>
diff --git a/x11-libs/libxshmfence/metadata.xml b/x11-libs/libxshmfence/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/libxshmfence/metadata.xml
+++ b/x11-libs/libxshmfence/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/mx/metadata.xml b/x11-libs/mx/metadata.xml
index 819f47669909..f77211fc5f0f 100644
--- a/x11-libs/mx/metadata.xml
+++ b/x11-libs/mx/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>gnome</herd>
+ <maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+ </maintainer>
<use>
<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
for introspection</flag>
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
index 1ebecbbd0df7..0bc5bdf48caf 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>gnome</herd>
+<maintainer>
+ <email>gnome@gentoo.org</email>
+ <name>Gentoo GNOME Desktop</name>
+</maintainer>
<upstream>
<remote-id type="cpe">cpe:/a:pango:pango</remote-id>
</upstream>
diff --git a/x11-libs/pangox-compat/metadata.xml b/x11-libs/pangox-compat/metadata.xml
index da6fd63d0085..fe3dc94b2bcd 100644
--- a/x11-libs/pangox-compat/metadata.xml
+++ b/x11-libs/pangox-compat/metadata.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/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml
index ab31961e33f1..5d147a55d479 100644
--- a/x11-libs/pixman/metadata.xml
+++ b/x11-libs/pixman/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
<use>
<flag name="loongson2f">Enable Loongson2f MMI optimizations.</flag>
</use>
diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
index 661ed4fe6647..8426531e290f 100644
--- a/x11-libs/qscintilla/metadata.xml
+++ b/x11-libs/qscintilla/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
- <herd>python</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
+ <maintainer>
+ <email>python@gentoo.org</email>
+ <name>Python</name>
+ </maintainer>
<use>
<flag name="designer">Build plugin for Qt Designer</flag>
</use>
diff --git a/x11-libs/qtermwidget/metadata.xml b/x11-libs/qtermwidget/metadata.xml
index c6123b692e1b..26b3a49f8458 100644
--- a/x11-libs/qtermwidget/metadata.xml
+++ b/x11-libs/qtermwidget/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>qt</herd>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<longdescription lang="en">
QTermWidget is an opensource project based on KDE4 Konsole application.
The main goal of this project is to provide unicode-enabled, embeddable
diff --git a/x11-libs/qtscriptgenerator/metadata.xml b/x11-libs/qtscriptgenerator/metadata.xml
index 6e3dc974f22a..a460a8ac4617 100644
--- a/x11-libs/qtscriptgenerator/metadata.xml
+++ b/x11-libs/qtscriptgenerator/metadata.xml
@@ -1,8 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>kde</herd>
- <herd>qt</herd>
+ <maintainer>
+ <email>kde@gentoo.org</email>
+ <name>Gentoo KDE Project</name>
+ </maintainer>
+ <maintainer>
+ <email>qt@gentoo.org</email>
+ <name>Gentoo Qt Project</name>
+ </maintainer>
<upstream>
<remote-id type="google-code">qtscriptgenerator</remote-id>
</upstream>
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
index afa034e934b1..b94f120bbeb7 100644
--- a/x11-libs/qwt/metadata.xml
+++ b/x11-libs/qwt/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
The Qwt library contains GUI Components and utility classes which are
primarily useful for programs with a technical background.
diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml
index e06eb8b1e62d..f75330cdbf7b 100644
--- a/x11-libs/qwtplot3d/metadata.xml
+++ b/x11-libs/qwtplot3d/metadata.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>
QwtPlot3D isa feature-rich Qt/OpenGL-based C++ programming library,
providing essentially a bunch of 3D-widgets for programmers.
diff --git a/x11-libs/qwtpolar/metadata.xml b/x11-libs/qwtpolar/metadata.xml
index 9d090eca6c3f..2e9c8f3ab50f 100644
--- a/x11-libs/qwtpolar/metadata.xml
+++ b/x11-libs/qwtpolar/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci-geosciences</herd>
+ <maintainer>
+ <email>sci-geosciences@gentoo.org</email>
+ <name>Gentoo Geosciences Project</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">qwtpolar</remote-id>
</upstream>
diff --git a/x11-libs/snorenotify/metadata.xml b/x11-libs/snorenotify/metadata.xml
index a23f444b67d6..e218a13609c3 100644
--- a/x11-libs/snorenotify/metadata.xml
+++ b/x11-libs/snorenotify/metadata.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/x11-libs/startup-notification/metadata.xml b/x11-libs/startup-notification/metadata.xml
index 8c868061b739..ed32dba4140b 100644
--- a/x11-libs/startup-notification/metadata.xml
+++ b/x11-libs/startup-notification/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>freedesktop</herd>
<maintainer>
<email>freedesktop-bugs@gentoo.org</email>
</maintainer>
diff --git a/x11-libs/tslib/metadata.xml b/x11-libs/tslib/metadata.xml
index 0288e627e3ff..bb9d4ee8bd1d 100644
--- a/x11-libs/tslib/metadata.xml
+++ b/x11-libs/tslib/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>embedded</herd>
+ <maintainer>
+ <email>embedded@gentoo.org</email>
+ <name>Embedded Gentoo</name>
+ </maintainer>
<upstream>
<remote-id type="github">kergoth/tslib</remote-id>
</upstream>
diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
index cd6612f9502d..cc74c276d1e8 100644
--- a/x11-libs/vte/metadata.xml
+++ b/x11-libs/vte/metadata.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="glade">Provide integration with <pkg>dev-util/glade</pkg>.</flag>
</use>
diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml
index aa7aa5e656fd..288d62d5d7fe 100644
--- a/x11-libs/wxGTK/metadata.xml
+++ b/x11-libs/wxGTK/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>wxwidgets</herd>
<maintainer>
<email>wxwidgets@gentoo.org</email>
<description>All modifications to this package must be approved by the wxwidgets herd.</description>
diff --git a/x11-libs/xbae/metadata.xml b/x11-libs/xbae/metadata.xml
index 821284b9a309..a8dda16b099c 100644
--- a/x11-libs/xbae/metadata.xml
+++ b/x11-libs/xbae/metadata.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">
XbaeMatrix is a free Motif(R) table widget (also compatible with the free
LessTif) which presents an editable array of string data to the user in a
diff --git a/x11-libs/xcb-util-cursor/metadata.xml b/x11-libs/xcb-util-cursor/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util-cursor/metadata.xml
+++ b/x11-libs/xcb-util-cursor/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/xcb-util-image/metadata.xml b/x11-libs/xcb-util-image/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util-image/metadata.xml
+++ b/x11-libs/xcb-util-image/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/xcb-util-keysyms/metadata.xml b/x11-libs/xcb-util-keysyms/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util-keysyms/metadata.xml
+++ b/x11-libs/xcb-util-keysyms/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/xcb-util-renderutil/metadata.xml b/x11-libs/xcb-util-renderutil/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util-renderutil/metadata.xml
+++ b/x11-libs/xcb-util-renderutil/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/xcb-util-wm/metadata.xml b/x11-libs/xcb-util-wm/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util-wm/metadata.xml
+++ b/x11-libs/xcb-util-wm/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/xcb-util/metadata.xml b/x11-libs/xcb-util/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xcb-util/metadata.xml
+++ b/x11-libs/xcb-util/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/xpa/metadata.xml b/x11-libs/xpa/metadata.xml
index 4bab88844f54..62a5579a2fac 100644
--- a/x11-libs/xpa/metadata.xml
+++ b/x11-libs/xpa/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ <name>Gentoo Science Project</name>
+ </maintainer>
<longdescription lang="en">
The XPA messaging system provides seamless communication between many
kinds of Unix programs, including X programs and Tcl/Tk programs.
diff --git a/x11-libs/xpyb/metadata.xml b/x11-libs/xpyb/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xpyb/metadata.xml
+++ b/x11-libs/xpyb/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/xtrans/metadata.xml b/x11-libs/xtrans/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xtrans/metadata.xml
+++ b/x11-libs/xtrans/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>
diff --git a/x11-libs/xvba-video/metadata.xml b/x11-libs/xvba-video/metadata.xml
index 01c4c004e735..dd7d581be40b 100644
--- a/x11-libs/xvba-video/metadata.xml
+++ b/x11-libs/xvba-video/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>x11</herd>
+<maintainer>
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
</pkgmetadata>