commit:     6781c9ab4faff24a578803f7fbd1b7d591bf3a9e
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 23:40:25 2016 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 23:42:15 2016 +0000
URL:        https://gitweb.gentoo.org/proj/gnome.git/commit/?id=6781c9ab

Sync metadata.xml with main tree

herd tag is deprecated and banned, sync with main tree to update

 app-accessibility/at-spi2-atk/metadata.xml         |  5 +++-
 app-accessibility/at-spi2-core/metadata.xml        |  5 +++-
 app-admin/gnome-system-log/metadata.xml            |  5 +++-
 app-arch/file-roller/metadata.xml                  | 16 ++++++----
 app-cdr/brasero/metadata.xml                       | 19 +++++++-----
 app-crypt/gcr/metadata.xml                         |  5 +++-
 app-crypt/libsecret/metadata.xml                   | 11 ++++---
 app-crypt/p11-kit/metadata.xml                     |  5 +++-
 app-crypt/seahorse-sharing/metadata.xml            |  5 +++-
 app-crypt/seahorse/metadata.xml                    | 15 ++++++----
 app-dicts/gnome-dictionary/metadata.xml            |  5 +++-
 app-editors/gedit/metadata.xml                     |  5 +++-
 app-editors/ghex/metadata.xml                      |  5 +++-
 app-emulation/libvirt-glib/metadata.xml            | 15 ++++++----
 app-misc/gnote/metadata.xml                        | 10 ++++---
 app-mobilephone/gnome-phone-manager/metadata.xml   |  5 +++-
 app-office/planner/metadata.xml                    |  5 +++-
 app-text/evince/metadata.xml                       | 23 ++++++++-------
 app-text/libgxps/metadata.xml                      |  9 +++---
 app-text/yelp-tools/metadata.xml                   |  5 +++-
 dev-libs/folks/metadata.xml                        | 18 +++++++-----
 dev-libs/gdl/metadata.xml                          |  5 +++-
 dev-libs/gjs/metadata.xml                          |  5 +++-
 dev-libs/glib/metadata.xml                         |  5 +++-
 dev-libs/gmime/metadata.xml                        |  9 ++++--
 dev-libs/gobject-introspection-common/metadata.xml |  5 +++-
 dev-libs/gobject-introspection/metadata.xml        |  5 +++-
 dev-libs/libgdata/metadata.xml                     | 11 ++++---
 dev-libs/libgweather/metadata.xml                  | 11 ++++---
 dev-libs/libpeas/metadata.xml                      |  5 +++-
 dev-libs/totem-pl-parser/metadata.xml              | 11 +++----
 dev-python/pyatspi/metadata.xml                    |  5 +++-
 dev-python/pygobject/metadata.xml                  | 10 +++++--
 dev-util/gdbus-codegen/metadata.xml                |  5 +++-
 dev-util/itstool/metadata.xml                      |  7 +++--
 games-arcade/gnome-robots/metadata.xml             |  5 +++-
 games-board/four-in-a-row/metadata.xml             |  5 +++-
 games-puzzle/gnome-klotski/metadata.xml            |  5 +++-
 games-puzzle/gnome-sudoku/metadata.xml             |  5 +++-
 gnome-base/dconf/metadata.xml                      |  5 +++-
 gnome-base/gconf/metadata.xml                      |  5 +++-
 gnome-base/gdm/metadata.xml                        |  5 +++-
 gnome-base/gnome-control-center/metadata.xml       | 15 ++++++----
 gnome-base/gnome-core-libs/metadata.xml            |  5 +++-
 gnome-base/gnome-desktop/metadata.xml              |  5 +++-
 gnome-base/gnome-keyring/metadata.xml              | 31 +++++++++++---------
 gnome-base/gnome-light/metadata.xml                |  5 +++-
 gnome-base/gnome-menus/metadata.xml                |  5 +++-
 gnome-base/gnome-session/metadata.xml              | 11 ++++---
 gnome-base/gnome-settings-daemon/metadata.xml      | 15 ++++++----
 gnome-base/gnome-shell/metadata.xml                | 21 +++++++------
 gnome-base/gsettings-desktop-schemas/metadata.xml  |  5 +++-
 gnome-base/gvfs/metadata.xml                       | 22 +++++++-------
 gnome-base/libgnome-keyring/metadata.xml           | 11 ++++---
 gnome-base/nautilus/metadata.xml                   | 17 ++++++-----
 gnome-extra/evolution-data-server/metadata.xml     |  6 ++--
 gnome-extra/evolution-ews/metadata.xml             |  5 +++-
 gnome-extra/gnome-boxes/metadata.xml               |  5 +++-
 gnome-extra/gnome-color-manager/metadata.xml       | 11 ++++---
 gnome-extra/gnome-contacts/metadata.xml            |  5 +++-
 gnome-extra/gnome-documents/metadata.xml           |  5 +++-
 gnome-extra/gnome-power-manager/metadata.xml       |  9 +++++-
 gnome-extra/gnome-search-tool/metadata.xml         |  5 +++-
 gnome-extra/gnome-shell-extensions/metadata.xml    |  5 +++-
 gnome-extra/gnome-system-monitor/metadata.xml      | 11 ++++---
 gnome-extra/gnome-tweak-tool/metadata.xml          |  5 +++-
 gnome-extra/gtkhtml/metadata.xml                   |  5 +++-
 gnome-extra/libgda/metadata.xml                    |  8 +++--
 gnome-extra/seahorse-nautilus/metadata.xml         |  5 +++-
 gnome-extra/sushi/metadata.xml                     | 11 ++++---
 gnome-extra/yelp-xsl/metadata.xml                  |  5 +++-
 gnome-extra/yelp/metadata.xml                      |  5 +++-
 mail-client/evolution/metadata.xml                 |  5 +++-
 media-gfx/eog/metadata.xml                         |  7 +++--
 media-gfx/gnome-font-viewer/metadata.xml           |  5 +++-
 media-gfx/gnome-screenshot/metadata.xml            |  5 +++-
 media-libs/clutter-gtk/metadata.xml                |  5 +++-
 media-libs/clutter/metadata.xml                    | 13 +++++----
 media-libs/cogl/metadata.xml                       | 12 ++++----
 media-libs/gsound/metadata.xml                     |  5 +++-
 media-libs/mash/metadata.xml                       |  9 +++++-
 media-sound/rhythmbox/metadata.xml                 | 10 +++++--
 media-sound/sound-juicer/metadata.xml              |  5 +++-
 media-video/cheese/metadata.xml                    | 13 +++++----
 media-video/totem/metadata.xml                     | 34 +++++++++++++---------
 net-analyzer/gnome-nettool/metadata.xml            |  5 +++-
 net-im/empathy/metadata.xml                        | 20 +++++++------
 net-libs/gnome-online-accounts/metadata.xml        | 13 ++++++---
 net-libs/gtk-vnc/metadata.xml                      | 13 +++++----
 net-libs/libsoup/metadata.xml                      | 11 ++++---
 net-libs/libzapojit/metadata.xml                   |  5 +++-
 net-libs/rest/metadata.xml                         |  5 +++-
 net-misc/spice-gtk/metadata.xml                    |  7 +++--
 net-misc/vinagre/metadata.xml                      |  5 +++-
 net-misc/vino/metadata.xml                         | 13 +++++----
 net-wireless/gnome-bluetooth/metadata.xml          | 11 +++----
 sys-apps/baobab/metadata.xml                       |  5 +++-
 sys-apps/gnome-disk-utility/metadata.xml           | 11 ++++---
 sys-libs/libosinfo/metadata.xml                    |  8 ++---
 www-client/epiphany/metadata.xml                   | 11 ++++---
 x11-libs/colord-gtk/metadata.xml                   |  8 ++---
 x11-libs/gdk-pixbuf/metadata.xml                   |  5 +++-
 x11-libs/gtk+/metadata.xml                         |  5 +++-
 x11-libs/gtksourceview/metadata.xml                |  7 +++--
 x11-libs/libcryptui/metadata.xml                   |  5 +++-
 x11-libs/libwnck/metadata.xml                      |  5 +++-
 x11-libs/pango/metadata.xml                        |  8 ++++-
 x11-libs/pangox-compat/metadata.xml                |  5 +++-
 x11-libs/vte/metadata.xml                          | 11 ++++---
 x11-misc/colord/metadata.xml                       |  7 +++--
 x11-terms/gnome-terminal/metadata.xml              | 13 +++++----
 x11-themes/adwaita-icon-theme/metadata.xml         |  5 +++-
 x11-themes/gnome-backgrounds/metadata.xml          |  5 +++-
 x11-themes/gnome-icon-theme-symbolic/metadata.xml  |  5 +++-
 x11-themes/gnome-themes-standard/metadata.xml      |  5 +++-
 x11-themes/gtk-engines-unico/metadata.xml          |  8 ++++-
 x11-wm/mutter/metadata.xml                         |  5 +++-
 117 files changed, 672 insertions(+), 320 deletions(-)

diff --git a/app-accessibility/at-spi2-atk/metadata.xml 
b/app-accessibility/at-spi2-atk/metadata.xml
index d9f21e6..3998080 100644
--- a/app-accessibility/at-spi2-atk/metadata.xml
+++ b/app-accessibility/at-spi2-atk/metadata.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-accessibility</herd>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/app-accessibility/at-spi2-core/metadata.xml 
b/app-accessibility/at-spi2-core/metadata.xml
index d9f21e6..3998080 100644
--- a/app-accessibility/at-spi2-core/metadata.xml
+++ b/app-accessibility/at-spi2-core/metadata.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-accessibility</herd>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/app-admin/gnome-system-log/metadata.xml 
b/app-admin/gnome-system-log/metadata.xml
index 6e0e2ec..3998080 100644
--- a/app-admin/gnome-system-log/metadata.xml
+++ b/app-admin/gnome-system-log/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/app-arch/file-roller/metadata.xml 
b/app-arch/file-roller/metadata.xml
index 2b358a2..a1511de 100644
--- a/app-arch/file-roller/metadata.xml
+++ b/app-arch/file-roller/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>gnome</herd>
-  <use>
-    <flag name="nautilus">Enable file-roller to integrate with
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="nautilus">Enable file-roller to integrate with
                        <pkg>gnome-base/nautilus</pkg> by providing entries in 
its context
                        menu</flag>
-    <flag name="packagekit">Enable support for the distro-neutral package
+               <flag name="packagekit">Enable support for the distro-neutral 
package
                        manager GUI <pkg>app-admin/packagekit</pkg></flag>
-  </use>
+       </use>
+       <upstream>
+               <remote-id type="sourceforge">fileroller</remote-id>
+       </upstream>
 </pkgmetadata>

diff --git a/app-cdr/brasero/metadata.xml b/app-cdr/brasero/metadata.xml
index d20df9c..af93b7c 100644
--- a/app-cdr/brasero/metadata.xml
+++ b/app-cdr/brasero/metadata.xml
@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="packagekit">Enable support for the distro-neutral package
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="packagekit">Enable support for the distro-neutral 
package
                        manager GUI <pkg>app-admin/packagekit</pkg></flag>
-    <flag name="nautilus">Build the <pkg>gnome-base/nautilus</pkg>
+               <flag name="nautilus">Build the <pkg>gnome-base/nautilus</pkg>
                        extension</flag>
-    <flag name="libburn">Enable <pkg>dev-libs/libburn</pkg> backend</flag>
-    <flag name="playlist">Enable support for playlists through
+               <flag name="libburn">Enable <pkg>dev-libs/libburn</pkg> 
backend</flag>
+               <flag name="playlist">Enable support for playlists through
                        <pkg>dev-libs/totem-pl-parser</pkg></flag>
-    <flag name="tracker">Enable audio playlist search using the
+               <flag name="tracker">Enable audio playlist search using the
                        <pkg>app-misc/tracker</pkg> indexer</flag>
-  </use>
+       </use>
 </pkgmetadata>

diff --git a/app-crypt/gcr/metadata.xml b/app-crypt/gcr/metadata.xml
index 6e0e2ec..3998080 100644
--- a/app-crypt/gcr/metadata.xml
+++ b/app-crypt/gcr/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/app-crypt/libsecret/metadata.xml b/app-crypt/libsecret/metadata.xml
index 92265e5..25f333c 100644
--- a/app-crypt/libsecret/metadata.xml
+++ b/app-crypt/libsecret/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>gnome</herd>
-  <use>
-    <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
-  </use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="vala">Enable bindings for 
<pkg>dev-lang/vala</pkg></flag>
+       </use>
 </pkgmetadata>

diff --git a/app-crypt/p11-kit/metadata.xml b/app-crypt/p11-kit/metadata.xml
index b756e0a..526448b 100644
--- a/app-crypt/p11-kit/metadata.xml
+++ b/app-crypt/p11-kit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>crypto</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Crypto</name>
+       </maintainer>
        <use>
                <flag name="asn1">Enable ASN.1 certificate support</flag>
                <flag name="trust">Build the trust policy module</flag>

diff --git a/app-crypt/seahorse-sharing/metadata.xml 
b/app-crypt/seahorse-sharing/metadata.xml
index 6e0e2ec..3998080 100644
--- a/app-crypt/seahorse-sharing/metadata.xml
+++ b/app-crypt/seahorse-sharing/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/app-crypt/seahorse/metadata.xml b/app-crypt/seahorse/metadata.xml
index 3a3eec1..6789dec 100644
--- a/app-crypt/seahorse/metadata.xml
+++ b/app-crypt/seahorse/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="ldap">Enable seahorse to manipulate GPG keys on a LDAP 
server.</flag>
-  </use>
-  <longdescription>Seahorse is a Gnome interface for GnuPG.  It's main purpose 
is to be a PGP/GPG Key Manager, though 
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="ldap">Enable seahorse to manipulate GPG keys on a LDAP 
server.</flag>
+</use>
+<longdescription>Seahorse is a Gnome interface for GnuPG.  It's main purpose 
is to be a PGP/GPG Key Manager, though 
 it has other components including a text editor and file manager.
 
 Key Manager Features:
@@ -26,5 +29,5 @@ Delete Key
 Plugins:
 Nautilus Integration
 Gedit plugin
-  </longdescription>
+</longdescription>
 </pkgmetadata>

diff --git a/app-dicts/gnome-dictionary/metadata.xml 
b/app-dicts/gnome-dictionary/metadata.xml
index 6e0e2ec..3998080 100644
--- a/app-dicts/gnome-dictionary/metadata.xml
+++ b/app-dicts/gnome-dictionary/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/app-editors/gedit/metadata.xml b/app-editors/gedit/metadata.xml
index 6e0e2ec..3998080 100644
--- a/app-editors/gedit/metadata.xml
+++ b/app-editors/gedit/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/app-editors/ghex/metadata.xml b/app-editors/ghex/metadata.xml
index 6e0e2ec..3998080 100644
--- a/app-editors/ghex/metadata.xml
+++ b/app-editors/ghex/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/app-emulation/libvirt-glib/metadata.xml 
b/app-emulation/libvirt-glib/metadata.xml
index 38f7f9e..3d9b69d 100644
--- a/app-emulation/libvirt-glib/metadata.xml
+++ b/app-emulation/libvirt-glib/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>
-<use>
-       <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-               for introspection</flag>
-       <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
-</use>
+<maintainer type="person">
+       <email>[email protected]</email>
+       <name>Matthias Maier</name>
+       <description>Please CC me on bugs</description>
+</maintainer>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/app-misc/gnote/metadata.xml b/app-misc/gnote/metadata.xml
index ee7f6ac..9c70dba 100644
--- a/app-misc/gnote/metadata.xml
+++ b/app-misc/gnote/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <maintainer>
-    <email>[email protected]</email>
-    <name>Gilles Dartiguelongue</name>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Gentoo GNOME Desktop</name>
   </maintainer>
+  <upstream>
+    <remote-id type="github">tsuna/boost.m4</remote-id>
+  </upstream>
 </pkgmetadata>

diff --git a/app-mobilephone/gnome-phone-manager/metadata.xml 
b/app-mobilephone/gnome-phone-manager/metadata.xml
index 755902a..ee14c5d 100644
--- a/app-mobilephone/gnome-phone-manager/metadata.xml
+++ b/app-mobilephone/gnome-phone-manager/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription>Phone Manager is a program created to allow you to control 
aspects 
 of your mobile phone from your GNOME desktop.
 

diff --git a/app-office/planner/metadata.xml b/app-office/planner/metadata.xml
index 20d13ee..4cbddca 100644
--- a/app-office/planner/metadata.xml
+++ b/app-office/planner/metadata.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-office</herd>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>

diff --git a/app-text/evince/metadata.xml b/app-text/evince/metadata.xml
index d0f2b2e..96e3660 100644
--- a/app-text/evince/metadata.xml
+++ b/app-text/evince/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="dvi">Enable the built-in DVI viewer</flag>
-    <flag name="multimedia">Enable multimedia support</flag>
-    <flag name="nautilus">Enable property page extension in 
<pkg>gnome-base/nautilus</pkg></flag>
-    <flag name="libsecret">Enable support for credentials store</flag>
-    <flag name="t1lib">Enable the Type-1 fonts for the built-in DVI viewer
-    (<pkg>media-libs/t1lib</pkg>)</flag>
-    <flag name="xps">Enable XPS viewer using <pkg>app-text/libgxps</pkg></flag>
-  </use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="dvi">Enable the built-in DVI viewer</flag>
+               <flag name="libsecret">Enable support for credentials 
store</flag>
+               <flag name="multimedia">Enable multimedia support</flag>
+               <flag name="nautilus">Enable property page extension in 
<pkg>gnome-base/nautilus</pkg></flag>
+               <flag name="t1lib">Enable the Type-1 fonts for the built-in DVI 
viewer
+                       (<pkg>media-libs/t1lib</pkg>)</flag>
+               <flag name="xps">Enable XPS viewer using 
<pkg>app-text/libgxps</pkg></flag>
+       </use>
 </pkgmetadata>

diff --git a/app-text/libgxps/metadata.xml b/app-text/libgxps/metadata.xml
index b4df7ab..3998080 100644
--- a/app-text/libgxps/metadata.xml
+++ b/app-text/libgxps/metadata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>gnome</herd>
-<use>
-  <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-    for introspection</flag>
-</use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/app-text/yelp-tools/metadata.xml b/app-text/yelp-tools/metadata.xml
index da6fd63..3998080 100644
--- a/app-text/yelp-tools/metadata.xml
+++ b/app-text/yelp-tools/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/folks/metadata.xml b/dev-libs/folks/metadata.xml
index a4dbc68..b7d6873 100644
--- a/dev-libs/folks/metadata.xml
+++ b/dev-libs/folks/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="telepathy">Load contacts from the Telepathy framework</flag>
-    <flag name="tracker">Load contacts from <pkg>app-misc/tracker</pkg>
-         index</flag>
-    <flag name="utils">Build the folks-inspect utility</flag>
-    <flag name="zeitgeist">Add support for Zeitgeist event tracking 
system</flag>
-  </use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="tracker">Load contacts from <pkg>app-misc/tracker</pkg> 
index</flag>
+       <flag name="telepathy">Load contacts from the Telepathy framework</flag>
+       <flag name="utils">Build the folks-inspect utility</flag>
+       <flag name="zeitgeist">Add support for Zeitgeist event tracking 
system</flag>
+</use>
 </pkgmetadata>

diff --git a/dev-libs/gdl/metadata.xml b/dev-libs/gdl/metadata.xml
index da6fd63..3998080 100644
--- a/dev-libs/gdl/metadata.xml
+++ b/dev-libs/gdl/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/gjs/metadata.xml b/dev-libs/gjs/metadata.xml
index 6e0e2ec..4cbddca 100644
--- a/dev-libs/gjs/metadata.xml
+++ b/dev-libs/gjs/metadata.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 type="project">
+    <email>[email protected]</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>

diff --git a/dev-libs/glib/metadata.xml b/dev-libs/glib/metadata.xml
index 9dda65d..b73f9ed 100644
--- a/dev-libs/glib/metadata.xml
+++ b/dev-libs/glib/metadata.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 type="project">
+    <email>[email protected]</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
        <flag name="dbus">Enable dependencies required by glib libraries
                using dbus service to manage settings saving</flag>

diff --git a/dev-libs/gmime/metadata.xml b/dev-libs/gmime/metadata.xml
index d3b647f..24ed35a 100644
--- a/dev-libs/gmime/metadata.xml
+++ b/dev-libs/gmime/metadata.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>net-mail</herd>
-  <herd>gnome</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <upstream>
+               <remote-id type="sourceforge">spruce</remote-id>
+       </upstream>
 </pkgmetadata>

diff --git a/dev-libs/gobject-introspection-common/metadata.xml 
b/dev-libs/gobject-introspection-common/metadata.xml
index da6fd63..3998080 100644
--- a/dev-libs/gobject-introspection-common/metadata.xml
+++ b/dev-libs/gobject-introspection-common/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/gobject-introspection/metadata.xml 
b/dev-libs/gobject-introspection/metadata.xml
index d1585c3..ed75a82 100644
--- a/dev-libs/gobject-introspection/metadata.xml
+++ b/dev-libs/gobject-introspection/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
        <flag name="doctool">Install g-ir-doc-tool for generating documentation
                from introspected data</flag>

diff --git a/dev-libs/libgdata/metadata.xml b/dev-libs/libgdata/metadata.xml
index 005177f..4b8d03f 100644
--- a/dev-libs/libgdata/metadata.xml
+++ b/dev-libs/libgdata/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>gnome</herd>
-       <use>
-               <flag name="vala">Enable bindings for dev-lang/vala</flag>
-       </use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="gnome-online-accounts">Enable 
<pkg>net-libs/gnome-online-accounts</pkg> support</flag>
+</use>
 </pkgmetadata>

diff --git a/dev-libs/libgweather/metadata.xml 
b/dev-libs/libgweather/metadata.xml
index d65521d..9889b0b 100644
--- a/dev-libs/libgweather/metadata.xml
+++ b/dev-libs/libgweather/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>gnome</herd>
-  <use>
-       <flag name="glade">Installs catalog files for 
<pkg>dev-util/glade</pkg></flag>
-  </use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="glade">Installs catalog files for 
<pkg>dev-util/glade</pkg></flag>
+       </use>
 </pkgmetadata>

diff --git a/dev-libs/libpeas/metadata.xml b/dev-libs/libpeas/metadata.xml
index 1ee0353..f955af2 100644
--- a/dev-libs/libpeas/metadata.xml
+++ b/dev-libs/libpeas/metadata.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 type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
        <use>
                <flag name="glade">Install the glade catalog</flag>
                <flag name="python">Build support for loading 
<pkg>dev-lang/python</pkg>

diff --git a/dev-libs/totem-pl-parser/metadata.xml 
b/dev-libs/totem-pl-parser/metadata.xml
index 4c6d9e9..b40fbdb 100644
--- a/dev-libs/totem-pl-parser/metadata.xml
+++ b/dev-libs/totem-pl-parser/metadata.xml
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
-    <flag name='archive'>Enables support for accessing media files in archives
+       <flag name="archive">Enables support for accessing media files in 
archives
                transparently via <pkg>app-arch/libarchive</pkg></flag>
-       <flag name="introspection">Use 
<pkg>dev-libs/gobject-introspection</pkg> for
-               introspection</flag>
-       <flag name="quvi">Use <pkg>media-libs/quvi</pkg> for parsing video
+       <flag name="quvi">Use <pkg>media-libs/libquvi</pkg> for parsing video
                links</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-python/pyatspi/metadata.xml b/dev-python/pyatspi/metadata.xml
index d9f21e6..3998080 100644
--- a/dev-python/pyatspi/metadata.xml
+++ b/dev-python/pyatspi/metadata.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-accessibility</herd>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-python/pygobject/metadata.xml 
b/dev-python/pygobject/metadata.xml
index 7c374a2..08a5bd4 100644
--- a/dev-python/pygobject/metadata.xml
+++ b/dev-python/pygobject/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>gnome</herd>
-       <herd>python</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+<maintainer type="project">
+               <email>[email protected]</email>
+               <name>Python</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/dev-util/gdbus-codegen/metadata.xml 
b/dev-util/gdbus-codegen/metadata.xml
index 6e0e2ec..3998080 100644
--- a/dev-util/gdbus-codegen/metadata.xml
+++ b/dev-util/gdbus-codegen/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/dev-util/itstool/metadata.xml b/dev-util/itstool/metadata.xml
index 7375ab1..90e918d 100644
--- a/dev-util/itstool/metadata.xml
+++ b/dev-util/itstool/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>gnome</herd>
-<longdescription lang="en">ITS Tool allows you to translate your XML documents
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <longdescription lang="en">ITS Tool allows you to translate your XML 
documents
   with gettext PO files, using rules from the W3C Internationalization Tag Set
   (ITS) to determine what to translate and how to separate it into PO file
   messages.

diff --git a/games-arcade/gnome-robots/metadata.xml 
b/games-arcade/gnome-robots/metadata.xml
index 6e0e2ec..3998080 100644
--- a/games-arcade/gnome-robots/metadata.xml
+++ b/games-arcade/gnome-robots/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/games-board/four-in-a-row/metadata.xml 
b/games-board/four-in-a-row/metadata.xml
index 6e0e2ec..3998080 100644
--- a/games-board/four-in-a-row/metadata.xml
+++ b/games-board/four-in-a-row/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/games-puzzle/gnome-klotski/metadata.xml 
b/games-puzzle/gnome-klotski/metadata.xml
index 6e0e2ec..3998080 100644
--- a/games-puzzle/gnome-klotski/metadata.xml
+++ b/games-puzzle/gnome-klotski/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/games-puzzle/gnome-sudoku/metadata.xml 
b/games-puzzle/gnome-sudoku/metadata.xml
index da6fd63..3998080 100644
--- a/games-puzzle/gnome-sudoku/metadata.xml
+++ b/games-puzzle/gnome-sudoku/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-base/dconf/metadata.xml b/gnome-base/dconf/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-base/dconf/metadata.xml
+++ b/gnome-base/dconf/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-base/gconf/metadata.xml b/gnome-base/gconf/metadata.xml
index 07f0b7f..5ca14b0 100644
--- a/gnome-base/gconf/metadata.xml
+++ b/gnome-base/gconf/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
        <flag name="ldap">Build backend which enables default mail accounts,
        addressbooks and calendars for Evolution to be configured using each

diff --git a/gnome-base/gdm/metadata.xml b/gnome-base/gdm/metadata.xml
index ee4b03e..98d052e 100644
--- a/gnome-base/gdm/metadata.xml
+++ b/gnome-base/gdm/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
   <use>
     <flag name="audit">Enable support for <pkg>sys-process/audit</pkg></flag>
     <flag name="fprint">Enables experimental fingerprint authentication using

diff --git a/gnome-base/gnome-control-center/metadata.xml 
b/gnome-base/gnome-control-center/metadata.xml
index 04485bd..89591e9 100644
--- a/gnome-base/gnome-control-center/metadata.xml
+++ b/gnome-base/gnome-control-center/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>gnome</herd>
-  <use>
-    <flag name="colord">Support color management using
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="colord">Support color management using
                        <pkg>x11-misc/colord</pkg></flag>
-    <flag name="gnome-online-accounts">Enable configuration panel for
+               <flag name="gnome-online-accounts">Enable configuration panel 
for
                        <pkg>net-libs/gnome-online-accounts</pkg> 
accounts</flag>
-    <flag name="i18n">Enable support for enhanced input methods through
+               <flag name="i18n">Enable support for enhanced input methods 
through
                        <pkg>app-i18n/ibus</pkg></flag>
-  </use>
+       </use>
 </pkgmetadata>

diff --git a/gnome-base/gnome-core-libs/metadata.xml 
b/gnome-base/gnome-core-libs/metadata.xml
index da6fd63..3998080 100644
--- a/gnome-base/gnome-core-libs/metadata.xml
+++ b/gnome-base/gnome-core-libs/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-base/gnome-desktop/metadata.xml 
b/gnome-base/gnome-desktop/metadata.xml
index 6e0e2ec..996e7ca 100644
--- a/gnome-base/gnome-desktop/metadata.xml
+++ b/gnome-base/gnome-desktop/metadata.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 type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/gnome-base/gnome-keyring/metadata.xml 
b/gnome-base/gnome-keyring/metadata.xml
index e771efd..f8058de 100644
--- a/gnome-base/gnome-keyring/metadata.xml
+++ b/gnome-base/gnome-keyring/metadata.xml
@@ -1,18 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <longdescription lang="en">
-    GNOME Keyring is a collection of components in GNOME that store
-    secrets, passwords, keys, certificates and make them available to
-    applications. It is integrated with the user's login, so that
-    their secret storage can be unlocked when the user logins into their
-    session. It is based around a standard called PKCS#11, which is a
-    standard way for applications to manage certificates and keys on
-    smart cards or secure storage.
-  </longdescription>
-  <use>
-    <flag name="ssh-agent">Use GNOME Keyring to unlock SSH keys.
-      Recommended unless you are using ECDSA or Ed25519 keys.</flag>
-  </use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <longdescription lang="en">
+               GNOME Keyring is a collection of components in GNOME that store
+               secrets, passwords, keys, certificates and make them available 
to
+               applications. It is integrated with the user's login, so that
+               their secret storage can be unlocked when the user logins into 
their
+               session. It is based around a standard called PKCS#11, which is 
a
+               standard way for applications to manage certificates and keys on
+               smart cards or secure storage.
+       </longdescription>
+       <use>
+               <flag name="ssh-agent">Use GNOME Keyring to unlock SSH keys.
+                       Recommended unless you are using ECDSA or Ed25519 
keys.</flag>
+       </use>
 </pkgmetadata>

diff --git a/gnome-base/gnome-light/metadata.xml 
b/gnome-base/gnome-light/metadata.xml
index bda1c54..b0d8e7f 100644
--- a/gnome-base/gnome-light/metadata.xml
+++ b/gnome-base/gnome-light/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
        <flag name="gnome-shell">Install <pkg>gnome-base/gnome-shell</pkg> and
                <pkg>x11-wm/mutter</pkg> for the standard GNOME 3 desktop 
mode</flag>

diff --git a/gnome-base/gnome-menus/metadata.xml 
b/gnome-base/gnome-menus/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-base/gnome-menus/metadata.xml
+++ b/gnome-base/gnome-menus/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-base/gnome-session/metadata.xml 
b/gnome-base/gnome-session/metadata.xml
index e7c9a75..06d13a5 100644
--- a/gnome-base/gnome-session/metadata.xml
+++ b/gnome-base/gnome-session/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>gnome</herd>
-  <use>
-    <flag name="gconf">Optional support for <pkg>gnome-base/gconf</pkg>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="gconf">Optional support for <pkg>gnome-base/gconf</pkg>
                configuration storage system</flag>
-  </use>
+</use>
 </pkgmetadata>

diff --git a/gnome-base/gnome-settings-daemon/metadata.xml 
b/gnome-base/gnome-settings-daemon/metadata.xml
index ae9d0bf..a242ebb 100644
--- a/gnome-base/gnome-settings-daemon/metadata.xml
+++ b/gnome-base/gnome-settings-daemon/metadata.xml
@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="colord">Support color management using
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="colord">Support color management using
                        <pkg>x11-misc/colord</pkg></flag>
-       <flag name="openrc-force">Skip systemd dependency (#480336),
+               <flag name="openrc-force">Skip systemd dependency (#480336),
                        enabling this flag will become your setup to be fully
                        unsupported by upstream and downstream Gnome team. Do 
not
                        try to enable it unless completely needed</flag>
-    <flag name="short-touchpad-timeout">Change the touchpad timeout so that 
+               <flag name="short-touchpad-timeout">Change the touchpad timeout 
so that 
                        it's effective for fast typists</flag>
-  </use>
+       </use>
 </pkgmetadata>

diff --git a/gnome-base/gnome-shell/metadata.xml 
b/gnome-base/gnome-shell/metadata.xml
index c2ad070..e08281c 100644
--- a/gnome-base/gnome-shell/metadata.xml
+++ b/gnome-base/gnome-shell/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>gnome</herd>
-  <use>
-    <flag name="i18n">Enable support for enhanced input methods through
-      <pkg>app-i18n/ibus</pkg></flag>
-    <flag name="openrc-force">Skip systemd dependency (#480336),
-      enabling this flag will become your setup to be fully
-      unsupported by upstream and downstream Gnome team. Do not
-      try to enable it unless completely needed</flag>
-  </use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="i18n">Enable support for enhanced input methods through
+               <pkg>app-i18n/ibus</pkg></flag>
+       <flag name="openrc-force">Skip systemd dependency (#480336),
+               enabling this flag will become your setup to be fully
+               unsupported by upstream and downstream Gnome team. Do not
+               try to enable it unless completely needed</flag>
+</use>
 </pkgmetadata>

diff --git a/gnome-base/gsettings-desktop-schemas/metadata.xml 
b/gnome-base/gsettings-desktop-schemas/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-base/gsettings-desktop-schemas/metadata.xml
+++ b/gnome-base/gsettings-desktop-schemas/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index cb602d6..cc414d9 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -1,30 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <longdescription lang="en">
 gvfs is a userspace virtual filesystem designed to work with the i/o
-abstractions of gio (a library availible in glib >= 2.15.1). It
+abstractions of gio (a library availible in glib &gt;= 2.15.1). It
 installs several modules that are automatically used by applications
 using the APIs of libgio. There is also fuse support that allows
 applications not using gio to access the gvfs filesystems.
 </longdescription>
 <use>
-       <flag name='afp'>Enables support for accessing AFP (Apple Filing 
Protocol)
-               network shares</flag>
-       <flag name='archive'>Enables support for accessing files in archives
-               transparently via <pkg>app-arch/libarchive</pkg></flag>
-       <flag name='bluray'>Enable playback of Blu-ray filesystems using 
<pkg>media-libs/libbluray</pkg></flag>
-       <flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy
-               application access</flag>
+       <flag name="afp">Enables support for accessing AFP (Apple Filing 
Protocol) network shares</flag>
+       <flag name="archive">Enables support for accessing files in archives 
transparently via <pkg>app-arch/libarchive</pkg></flag>
+       <flag name="bluray">Enable playback of Blu-ray filesystems using 
<pkg>media-libs/libbluray</pkg></flag>
+       <flag name="fuse">Enables fuse mount points in $HOME/.gvfs for legacy 
application access</flag>
        <flag name="gcr">Enable support for <pkg>app-crypt/gcr</pkg></flag>
        <flag name="gnome-online-accounts">Enable configuration panel for 
<pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
-       <flag name="google">Add google drive support</flag>
+       <flag name="google">Enables support for accessing Google accounts via 
<pkg>dev-libs/libgdata</pkg></flag>
        <flag name="http">Enable the HTTP/DAV backend using 
<pkg>net-libs/libsoup-gnome</pkg></flag>
        <flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to 
store login credentials.</flag>
        <flag name="nfs">Enable NFS client support via 
<pkg>net-fs/libnfs</pkg>.</flag>
        <flag name="udev">Enable udev base replacement code for cdda 
feature</flag>
-       <flag name="udisks">Enable volume monitoring using 
<pkg>sys-fs/udisks</pkg></flag>
 </use>
 </pkgmetadata>
-

diff --git a/gnome-base/libgnome-keyring/metadata.xml 
b/gnome-base/libgnome-keyring/metadata.xml
index 92265e5..9037a1d 100644
--- a/gnome-base/libgnome-keyring/metadata.xml
+++ b/gnome-base/libgnome-keyring/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>gnome</herd>
-  <use>
-    <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
-  </use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
+</use>
 </pkgmetadata>

diff --git a/gnome-base/nautilus/metadata.xml b/gnome-base/nautilus/metadata.xml
index af972bd..4e3c7a3 100644
--- a/gnome-base/nautilus/metadata.xml
+++ b/gnome-base/nautilus/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="packagekit">Use packagekit to search for programs to open
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="packagekit">Use packagekit to search for programs to open
                unknown file types</flag>
-    <flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files
+       <flag name="previewer">Use <pkg>gnome-extra/sushi</pkg> to preview files
                from the file mananger</flag>
-    <flag name="sendto">Enable the nautilus-sendto extension to send files to
+       <flag name="sendto">Enable the nautilus-sendto extension to send files 
to
                various locations/devices</flag>
-    <flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> 
search</flag>
-  </use>
+       <flag name="tracker">Add support for <pkg>app-misc/tracker</pkg> 
search</flag>
+</use>
 </pkgmetadata>

diff --git a/gnome-extra/evolution-data-server/metadata.xml 
b/gnome-extra/evolution-data-server/metadata.xml
index db353b5..fce6455 100644
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>gnome</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
        <use>
                <flag name="api-doc-extras">Build documentation for private 
APIs</flag>
                <flag name="gnome-online-accounts">Enable using
                        <pkg>net-libs/gnome-online-accounts</pkg> for 
authorization</flag>
-               <flag name="vala">Build <pkg>dev-lang/vala</pkg> bindings</flag>
                <flag name="weather">Enable optional weather calendar 
support</flag>
        </use>
 </pkgmetadata>

diff --git a/gnome-extra/evolution-ews/metadata.xml 
b/gnome-extra/evolution-ews/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-extra/evolution-ews/metadata.xml
+++ b/gnome-extra/evolution-ews/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-extra/gnome-boxes/metadata.xml 
b/gnome-extra/gnome-boxes/metadata.xml
index fa5ebd0..c6debef 100644
--- a/gnome-extra/gnome-boxes/metadata.xml
+++ b/gnome-extra/gnome-boxes/metadata.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 type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
        <use>
                <flag name="usbredir">Use <pkg>sys-apps/usbredir</pkg> to 
redirect USB
                        devices to another machine over TCP</flag>

diff --git a/gnome-extra/gnome-color-manager/metadata.xml 
b/gnome-extra/gnome-color-manager/metadata.xml
index aca77a8..6968539 100644
--- a/gnome-extra/gnome-color-manager/metadata.xml
+++ b/gnome-extra/gnome-color-manager/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>gnome</herd>
-  <use>
-    <flag name="packagekit">Enable support for the distro-neutral package
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="packagekit">Enable support for the distro-neutral 
package
                        manager GUI <pkg>app-admin/packagekit</pkg></flag>
-  </use>
+       </use>
 </pkgmetadata>

diff --git a/gnome-extra/gnome-contacts/metadata.xml 
b/gnome-extra/gnome-contacts/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-extra/gnome-contacts/metadata.xml
+++ b/gnome-extra/gnome-contacts/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-extra/gnome-documents/metadata.xml 
b/gnome-extra/gnome-documents/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-extra/gnome-documents/metadata.xml
+++ b/gnome-extra/gnome-documents/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-extra/gnome-power-manager/metadata.xml 
b/gnome-extra/gnome-power-manager/metadata.xml
index 6e0e2ec..8b88d42 100644
--- a/gnome-extra/gnome-power-manager/metadata.xml
+++ b/gnome-extra/gnome-power-manager/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <longdescription lang="en">
+               Power Manager daemon for the GNOME desktop environment that 
makes it
+               easy to manage your laptop or desktop system.
+       </longdescription>
 </pkgmetadata>

diff --git a/gnome-extra/gnome-search-tool/metadata.xml 
b/gnome-extra/gnome-search-tool/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-extra/gnome-search-tool/metadata.xml
+++ b/gnome-extra/gnome-search-tool/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-extra/gnome-shell-extensions/metadata.xml 
b/gnome-extra/gnome-shell-extensions/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-extra/gnome-shell-extensions/metadata.xml
+++ b/gnome-extra/gnome-shell-extensions/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-extra/gnome-system-monitor/metadata.xml 
b/gnome-extra/gnome-system-monitor/metadata.xml
index 845f00d..f4a330c 100644
--- a/gnome-extra/gnome-system-monitor/metadata.xml
+++ b/gnome-extra/gnome-system-monitor/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>gnome</herd>
-  <use>
-    <flag name="systemd">Display <pkg>sys-apps/systemd</pkg> metadata, e.g.
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="systemd">Display <pkg>sys-apps/systemd</pkg> metadata, e.g.
                unit names, for running processes</flag>
-  </use>
+</use>
 </pkgmetadata>

diff --git a/gnome-extra/gnome-tweak-tool/metadata.xml 
b/gnome-extra/gnome-tweak-tool/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-extra/gnome-tweak-tool/metadata.xml
+++ b/gnome-extra/gnome-tweak-tool/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-extra/gtkhtml/metadata.xml b/gnome-extra/gtkhtml/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-extra/gtkhtml/metadata.xml
+++ b/gnome-extra/gtkhtml/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-extra/libgda/metadata.xml b/gnome-extra/libgda/metadata.xml
index c7fcdf4..b009aff 100644
--- a/gnome-extra/libgda/metadata.xml
+++ b/gnome-extra/libgda/metadata.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 type="project">
+    <email>[email protected]</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="bindist">Disable support for <pkg>dev-db/firebird</pkg> 
database
         which is not GPL compatible.</flag>
@@ -10,10 +13,9 @@
     <flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to
         store login credentials</flag>
     <flag name="json">Enable support for JSON format</flag>
-    <flag name="mdb">Enable support for Microsoft Access database using
+    <flag name="mdb">Enable support for Microsoft Access database using 
                <pkg>app-office/mdbtools</pkg></flag>
     <flag name="reports">Install tools for generating graphical reports</flag>
     <flag name="sourceview">Enable support for 
<pkg>x11-libs/gtksourceview</pkg></flag>
-    <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/gnome-extra/seahorse-nautilus/metadata.xml 
b/gnome-extra/seahorse-nautilus/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-extra/seahorse-nautilus/metadata.xml
+++ b/gnome-extra/seahorse-nautilus/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-extra/sushi/metadata.xml b/gnome-extra/sushi/metadata.xml
index e7badbc..367fae8 100644
--- a/gnome-extra/sushi/metadata.xml
+++ b/gnome-extra/sushi/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>gnome</herd>
-  <use>
-    <flag name="office">Support viewing file formats such as generated by
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="office">Support viewing file formats such as 
generated by
                        <pkg>app-office/libreoffice</pkg></flag>
-  </use>
+       </use>
 </pkgmetadata>

diff --git a/gnome-extra/yelp-xsl/metadata.xml 
b/gnome-extra/yelp-xsl/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-extra/yelp-xsl/metadata.xml
+++ b/gnome-extra/yelp-xsl/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/gnome-extra/yelp/metadata.xml b/gnome-extra/yelp/metadata.xml
index 6e0e2ec..3998080 100644
--- a/gnome-extra/yelp/metadata.xml
+++ b/gnome-extra/yelp/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/mail-client/evolution/metadata.xml 
b/mail-client/evolution/metadata.xml
index cfd0a31..ad4605b 100644
--- a/mail-client/evolution/metadata.xml
+++ b/mail-client/evolution/metadata.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 type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
        <use>
                <flag name="bogofilter">Build <pkg>mail-filter/bogofilter</pkg> 
plugin</flag>
                <flag name="crypt">Enable GPG encryption support using

diff --git a/media-gfx/eog/metadata.xml b/media-gfx/eog/metadata.xml
index c53de9a..eda0593 100644
--- a/media-gfx/eog/metadata.xml
+++ b/media-gfx/eog/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>gnome</herd>
-  <longdescription lang="en">
+       <maintainer type="project">
+               <email>[email protected]</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 
                as large image collections.

diff --git a/media-gfx/gnome-font-viewer/metadata.xml 
b/media-gfx/gnome-font-viewer/metadata.xml
index 6e0e2ec..3998080 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 type="project">
+       <email>[email protected]</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 6e0e2ec..3998080 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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/media-libs/clutter-gtk/metadata.xml 
b/media-libs/clutter-gtk/metadata.xml
index 6e0e2ec..3998080 100644
--- a/media-libs/clutter-gtk/metadata.xml
+++ b/media-libs/clutter-gtk/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/media-libs/clutter/metadata.xml b/media-libs/clutter/metadata.xml
index 102c5fc..ca9d2af 100644
--- a/media-libs/clutter/metadata.xml
+++ b/media-libs/clutter/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>gnome</herd>
-  <use>
-    <flag name="egl">Enable EGL backend.</flag>
-    <flag name="gtk">Use gdk-pixbuf from <pkg>x11-libs/gtk+</pkg> as image 
rendering backend</flag>
-  </use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="egl">Enable EGL backend.</flag>
+       <flag name="gtk">Use gdk-pixbuf from <pkg>x11-libs/gtk+</pkg> as image 
rendering backend</flag>
+</use>
 </pkgmetadata>

diff --git a/media-libs/cogl/metadata.xml b/media-libs/cogl/metadata.xml
index e3cc855..009b6ab 100644
--- a/media-libs/cogl/metadata.xml
+++ b/media-libs/cogl/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>gnome</herd>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
-  <flag name="gles2">Enable OpenGL ES 2.0 support</flag>
-  <flag name="kms">Enable KMS support.</flag>
-  <flag name="pango">Build cogl-pango library for <pkg>x11-libs/pango</pkg>
-    integration</flag>
+       <flag name="gles2">Enable OpenGL ES 2.0 support</flag>
+       <flag name="kms">Enable KMS support.</flag>
+       <flag name="pango">Build cogl-pango library for 
<pkg>x11-libs/pango</pkg> integration</flag>
 </use>
 </pkgmetadata>

diff --git a/media-libs/gsound/metadata.xml b/media-libs/gsound/metadata.xml
index 6e0e2ec..4cbddca 100644
--- a/media-libs/gsound/metadata.xml
+++ b/media-libs/gsound/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
 </pkgmetadata>

diff --git a/media-libs/mash/metadata.xml b/media-libs/mash/metadata.xml
index 6e0e2ec..f31bff4 100644
--- a/media-libs/mash/metadata.xml
+++ b/media-libs/mash/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
+<maintainer type="project">
+  <email>[email protected]</email>
+  <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+  <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+    for introspection</flag>
+</use>
 </pkgmetadata>

diff --git a/media-sound/rhythmbox/metadata.xml 
b/media-sound/rhythmbox/metadata.xml
index bb30c38..011552e 100644
--- a/media-sound/rhythmbox/metadata.xml
+++ b/media-sound/rhythmbox/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <herd>gstreamer</herd>
+  <maintainer type="project">
+  <email>[email protected]</email>
+  <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer type="project">
+  <email>[email protected]</email>
+  <name>GStreamer package maintainers</name>
+  </maintainer>
   <use>
        <flag name="daap">Build the local network music sharing plugin which 
uses the DAAP protocol using <pkg>net-libs/libdmapsharing</pkg></flag>
        <flag name="html">Use <pkg>net-libs/webkit-gtk</pkg> for detecting and 
displaying HTML podcast episode descriptions.</flag>

diff --git a/media-sound/sound-juicer/metadata.xml 
b/media-sound/sound-juicer/metadata.xml
index 6e0e2ec..3998080 100644
--- a/media-sound/sound-juicer/metadata.xml
+++ b/media-sound/sound-juicer/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/media-video/cheese/metadata.xml b/media-video/cheese/metadata.xml
index 7d99bc3..b2c5fa1 100644
--- a/media-video/cheese/metadata.xml
+++ b/media-video/cheese/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>gnome</herd>
-  <use>
-    <flag name="sendto">Build the <pkg>gnome-extra/nautilus-sendto</pkg>
-                       plugin</flag>
-  </use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <longdescription lang="en">
+               Cheese uses your webcam to take photos and videos, applies 
fancy special
+               effects, and lets you share the fun with others.
+       </longdescription>
 </pkgmetadata>

diff --git a/media-video/totem/metadata.xml b/media-video/totem/metadata.xml
index ef889ba..317e469 100644
--- a/media-video/totem/metadata.xml
+++ b/media-video/totem/metadata.xml
@@ -1,18 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <herd>video</herd>
-  <herd>gstreamer</herd>
-  <longdescription>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Video project</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>GStreamer package maintainers</name>
+       </maintainer>
+       <longdescription>
 Totem is movie player for the GNOME desktop. It features a playlist, 
fullscreen mode, seek and volume controls, as well as a pretty complete 
keyboard navigation. It comes with added functionality such as a video 
thumbnailer for Nautilus, Nautilus properties tab and a webcam utility.
-  </longdescription>
-  <use>
-    <flag name="lirc">Enable support for controlling Totem with a remote 
control
-               using <pkg>app-misc/lirc</pkg></flag>
-    <flag name="nautilus">Enable the nautilus extension</flag>
-    <flag name="python">Build support for <pkg>dev-lang/python</pkg> 
plugins</flag>
-    <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
-    <flag name="zeitgeist">Build the plugin to inject events to 
<pkg>gnome-extra/zeitgeist</pkg></flag>
-  </use>
+       </longdescription>
+       <use>
+               <flag name="lirc">Enable support for controlling Totem with a 
remote control
+                       using <pkg>app-misc/lirc</pkg></flag>
+               <flag name="nautilus">Enable the nautilus extension</flag>
+               <flag name="python">Build support for 
<pkg>dev-lang/python</pkg> plugins</flag>
+               <flag name="zeitgeist">Build the plugin to inject events to 
<pkg>gnome-extra/zeitgeist</pkg></flag>
+       </use>
 </pkgmetadata>

diff --git a/net-analyzer/gnome-nettool/metadata.xml 
b/net-analyzer/gnome-nettool/metadata.xml
index 6e0e2ec..3998080 100644
--- a/net-analyzer/gnome-nettool/metadata.xml
+++ b/net-analyzer/gnome-nettool/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/net-im/empathy/metadata.xml b/net-im/empathy/metadata.xml
index 2df8531..2ed4da5 100644
--- a/net-im/empathy/metadata.xml
+++ b/net-im/empathy/metadata.xml
@@ -1,21 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>net-im</herd>
-  <herd>gnome</herd>
-  <use>
-    <flag name="geoloc">Enable geolocation support through
+<maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="geoloc">Enable geolocation support through
                        <pkg>app-misc/geoclue</pkg></flag>
-    <flag name="gnome-online-accounts">Enable using
+               <flag name="gnome-online-accounts">Enable using
                        <pkg>net-libs/gnome-online-accounts</pkg> for 
authorization (e.g.
                        for Google Talk)</flag>
-    <flag name="map">Enable world map support through
+               <flag name="map">Enable world map support through
                        <pkg>media-libs/libchamplain</pkg></flag>
-  </use>
-  <longdescription>
+       </use>
+       <longdescription>
                Empathy consists of a rich set of reusable instant messaging 
widgets,
                and a GNOME client using those widgets. It uses Telepathy and 
Nokia's
-               Mission Control. The main goal is to permit desktop integration 
by
+               Mission Control. The main goal is to permit desktop integration 
by 
                providing libempathy and libempathy-gtk libraries. 
libempathy-gtk is a
                set of powerful widgets that can be embeded into any GNOME 
application.
                A client application is provided.

diff --git a/net-libs/gnome-online-accounts/metadata.xml 
b/net-libs/gnome-online-accounts/metadata.xml
index a93b05f..0096044 100644
--- a/net-libs/gnome-online-accounts/metadata.xml
+++ b/net-libs/gnome-online-accounts/metadata.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="gnome">Use <pkg>gnome-base/gnome-control-center</pkg>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="gnome">Use <pkg>gnome-base/gnome-control-center</pkg>
                to set GNOME online accounts preferences</flag>
-  </use>
+       <!-- <flag name="telepathy">Provide widget to configure the telepathy
+               frawework</flag> -->
+</use>
 </pkgmetadata>

diff --git a/net-libs/gtk-vnc/metadata.xml b/net-libs/gtk-vnc/metadata.xml
index 4cb5547..c977e3a 100644
--- a/net-libs/gtk-vnc/metadata.xml
+++ b/net-libs/gtk-vnc/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>gnome</herd>
-  <herd>virtualization</herd>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
   <use>
     <flag name="gtk3">Build the gtk3 gtk-vnc library and other gtk3 
assets</flag>
-    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-               for introspection</flag>
-    <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/net-libs/libsoup/metadata.xml b/net-libs/libsoup/metadata.xml
index 5e2dfbb..a4047ee 100644
--- a/net-libs/libsoup/metadata.xml
+++ b/net-libs/libsoup/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>gnome</herd>
-  <use>
-    <flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="samba">Use <pkg>net-fs/samba</pkg> for NTLM Single
                        Sign-On</flag>
-  </use>
+       </use>
 </pkgmetadata>

diff --git a/net-libs/libzapojit/metadata.xml b/net-libs/libzapojit/metadata.xml
index 6e0e2ec..3998080 100644
--- a/net-libs/libzapojit/metadata.xml
+++ b/net-libs/libzapojit/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/net-libs/rest/metadata.xml b/net-libs/rest/metadata.xml
index 49d7ac9..7631446 100644
--- a/net-libs/rest/metadata.xml
+++ b/net-libs/rest/metadata.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 type="project">
+    <email>[email protected]</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="gnome">Extract proxy information using
       <pkg>net-libs/libsoup-gnome</pkg></flag>

diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index 6d0d973..4f972ad 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-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>virtualization</herd>
-  <maintainer>
+  <maintainer type="person">
     <email>[email protected]</email>
     <name>Tiziano Müller</name>
   </maintainer>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Gentoo Virtualization Project</name>
+  </maintainer>
   <use>
     <flag name="gtk2">Build <pkg>x11-libs/gtk+:2</pkg> based library</flag>
        <flag name="gtk3">Build <pkg>x11-libs/gtk+:3</pkg> based library</flag>

diff --git a/net-misc/vinagre/metadata.xml b/net-misc/vinagre/metadata.xml
index 4708913..07231fe 100644
--- a/net-misc/vinagre/metadata.xml
+++ b/net-misc/vinagre/metadata.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 type="project">
+    <email>[email protected]</email>
+    <name>Gentoo GNOME Desktop</name>
+  </maintainer>
   <use>
     <flag name="rdp">Enable access to Windows RDP protocol using
                        <pkg>net-misc/rdesktop</pkg></flag>

diff --git a/net-misc/vino/metadata.xml b/net-misc/vino/metadata.xml
index 96eedc9..a35da3e 100644
--- a/net-misc/vino/metadata.xml
+++ b/net-misc/vino/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>gnome</herd>
-  <use>
-    <flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to 
store login credentials.</flag>
-    <flag name="telepathy">Enable desktop sharing through a telepathy 
client</flag>
-  </use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="libsecret">Enable <pkg>app-crypt/libsecret</pkg> support to 
store login credentials.</flag>
+       <flag name="telepathy">Enable desktop sharing through a telepathy 
client</flag>
+</use>
 </pkgmetadata>

diff --git a/net-wireless/gnome-bluetooth/metadata.xml 
b/net-wireless/gnome-bluetooth/metadata.xml
index 4150212..3998080 100644
--- a/net-wireless/gnome-bluetooth/metadata.xml
+++ b/net-wireless/gnome-bluetooth/metadata.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="nautilus">Build the <pkg>gnome-extra/nautilus-sendto</pkg>
-               plugin</flag>
-    <flag name="sendto">Build the <pkg>gnome-extra/nautilus-sendto</pkg>
-               plugin</flag>
-  </use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/baobab/metadata.xml b/sys-apps/baobab/metadata.xml
index 6e0e2ec..3998080 100644
--- a/sys-apps/baobab/metadata.xml
+++ b/sys-apps/baobab/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/gnome-disk-utility/metadata.xml 
b/sys-apps/gnome-disk-utility/metadata.xml
index c8e82b3..72800be 100644
--- a/sys-apps/gnome-disk-utility/metadata.xml
+++ b/sys-apps/gnome-disk-utility/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>gnome</herd>
-  <use>
-    <flag name="fat">Include FAT16/FAT32 support
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="fat">Include FAT16/FAT32 support
                (<pkg>sys-fs/dosfstools</pkg>)</flag>
-  </use>
+</use>
 </pkgmetadata>

diff --git a/sys-libs/libosinfo/metadata.xml b/sys-libs/libosinfo/metadata.xml
index c83b672..3998080 100644
--- a/sys-libs/libosinfo/metadata.xml
+++ b/sys-libs/libosinfo/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>gnome</herd>
-<use>
-       <flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
-</use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/www-client/epiphany/metadata.xml b/www-client/epiphany/metadata.xml
index 3833156..bdde018 100644
--- a/www-client/epiphany/metadata.xml
+++ b/www-client/epiphany/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>gnome</herd>
-  <use>
-    <flag name="nss">Import passwords from older gecko based 
<pkg>www-client/epiphany</pkg> keyring.</flag>
-  </use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="nss">Import passwords from older gecko based 
<pkg>www-client/epiphany</pkg> keyring.</flag>
+</use>
 </pkgmetadata>

diff --git a/x11-libs/colord-gtk/metadata.xml b/x11-libs/colord-gtk/metadata.xml
index 67201d3..3998080 100644
--- a/x11-libs/colord-gtk/metadata.xml
+++ b/x11-libs/colord-gtk/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
-  <use>
-    <flag name="vala">Generate bindings for <pkg>dev-lang/vala</pkg></flag>
-  </use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
index 6e0e2ec..3998080 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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
index f5d67e7..efa1eda 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 type="project">
+    <email>[email protected]</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/gtksourceview/metadata.xml 
b/x11-libs/gtksourceview/metadata.xml
index 18f584b..7bcd75b 100644
--- a/x11-libs/gtksourceview/metadata.xml
+++ b/x11-libs/gtksourceview/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>gnome</herd>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <use>
        <flag name="glade">Install a glade catalog file</flag>
-    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-               for introspection</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-libs/libcryptui/metadata.xml b/x11-libs/libcryptui/metadata.xml
index 6e0e2ec..3998080 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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/x11-libs/libwnck/metadata.xml b/x11-libs/libwnck/metadata.xml
index 8e1b6e5..edf87c6 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 type="project">
+               <email>[email protected]</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/pango/metadata.xml b/x11-libs/pango/metadata.xml
index 6e0e2ec..c183bcf 100644
--- a/x11-libs/pango/metadata.xml
+++ b/x11-libs/pango/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>gnome</herd>
+<maintainer type="project">
+  <email>[email protected]</email>
+  <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<upstream>
+  <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
+</upstream>
 </pkgmetadata>

diff --git a/x11-libs/pangox-compat/metadata.xml 
b/x11-libs/pangox-compat/metadata.xml
index da6fd63..3998080 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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
index c47f754..e72feac 100644
--- a/x11-libs/vte/metadata.xml
+++ b/x11-libs/vte/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>gnome</herd>
-  <use>
-    <flag name='glade'>Provide integration with 
<pkg>dev-util/glade</pkg>.</flag>
-  </use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <use>
+               <flag name="glade">Provide integration with 
<pkg>dev-util/glade</pkg>.</flag>
+       </use>
 </pkgmetadata>

diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml
index 5954305..2ca10f4 100644
--- a/x11-misc/colord/metadata.xml
+++ b/x11-misc/colord/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>gnome</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
        <use>
+               <flag name="argyllcms">Enable ArgyllCMS sensor</flag>
                <flag name="extra-print-profiles">Generate extra print profiles.
                        Warning: significant build time and memory 
requirements.</flag>
                <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support, 
needed for
                        colorimeter drivers</flag>
-               <flag name="vala">Generate bindings for 
<pkg>dev-lang/vala</pkg></flag>
        </use>
 </pkgmetadata>

diff --git a/x11-terms/gnome-terminal/metadata.xml 
b/x11-terms/gnome-terminal/metadata.xml
index 926bc07..84390e6 100644
--- a/x11-terms/gnome-terminal/metadata.xml
+++ b/x11-terms/gnome-terminal/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>gnome</herd>
-  <use>
-    <flag name="gnome-shell">Integrate with <pkg>gnome-base/gnome-shell</pkg> 
search</flag>
-    <flag name="nautilus">Build gnome-base/nautilus extension</flag>
-  </use>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
+<use>
+       <flag name="gnome-shell">Integrate with 
<pkg>gnome-base/gnome-shell</pkg> search</flag>
+       <flag name="nautilus">Build gnome-base/nautilus extension</flag>
+</use>
 </pkgmetadata>

diff --git a/x11-themes/adwaita-icon-theme/metadata.xml 
b/x11-themes/adwaita-icon-theme/metadata.xml
index da6fd63..3998080 100644
--- a/x11-themes/adwaita-icon-theme/metadata.xml
+++ b/x11-themes/adwaita-icon-theme/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/x11-themes/gnome-backgrounds/metadata.xml 
b/x11-themes/gnome-backgrounds/metadata.xml
index 6e0e2ec..3998080 100644
--- a/x11-themes/gnome-backgrounds/metadata.xml
+++ b/x11-themes/gnome-backgrounds/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/x11-themes/gnome-icon-theme-symbolic/metadata.xml 
b/x11-themes/gnome-icon-theme-symbolic/metadata.xml
index 6e0e2ec..3998080 100644
--- a/x11-themes/gnome-icon-theme-symbolic/metadata.xml
+++ b/x11-themes/gnome-icon-theme-symbolic/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/x11-themes/gnome-themes-standard/metadata.xml 
b/x11-themes/gnome-themes-standard/metadata.xml
index da6fd63..3998080 100644
--- a/x11-themes/gnome-themes-standard/metadata.xml
+++ b/x11-themes/gnome-themes-standard/metadata.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 type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 </pkgmetadata>

diff --git a/x11-themes/gtk-engines-unico/metadata.xml 
b/x11-themes/gtk-engines-unico/metadata.xml
index da6fd63..9da2451 100644
--- a/x11-themes/gtk-engines-unico/metadata.xml
+++ b/x11-themes/gtk-engines-unico/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>gnome</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
+       <upstream>
+               <remote-id type="launchpad">ubuntu</remote-id>
+       </upstream>
 </pkgmetadata>

diff --git a/x11-wm/mutter/metadata.xml b/x11-wm/mutter/metadata.xml
index 31e8de5..59b7f54 100644
--- a/x11-wm/mutter/metadata.xml
+++ b/x11-wm/mutter/metadata.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 type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
        <use>
                <flag name="kms">Enable KMS support.</flag>
        </use>

Reply via email to