commit:     b52f2c1d63ed04991b0a8aa80ccf1334b2ec3d65
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 12:11:57 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 12:30:24 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=b52f2c1d

Migrate metadata for GLEP 67 and perform general cleanup.

 app-admin/keepassx/metadata.xml             |  5 ++-
 app-crypt/qca/metadata.xml                  | 37 ++++++++++++-------
 app-editors/vim-qt/metadata.xml             | 13 ++++---
 app-emulation/q4wine/metadata.xml           | 21 ++++++-----
 app-text/coolreader3/metadata.xml           |  5 ++-
 app-text/goldendict/metadata.xml            |  5 ++-
 dev-games/tiled/metadata.xml                |  5 ++-
 dev-libs/libqtxdg/metadata.xml              | 10 ++++-
 dev-libs/libsystemd-qt/metadata.xml         |  7 +++-
 dev-libs/qjson/metadata.xml                 |  5 ++-
 dev-libs/qjsonrpc/metadata.xml              |  5 ++-
 dev-libs/qoauth/metadata.xml                |  5 ++-
 dev-libs/quazip/metadata.xml                |  7 ++--
 dev-python/pyside/metadata.xml              |  5 ++-
 dev-python/shiboken/metadata.xml            |  5 ++-
 dev-qt/assistant/metadata.xml               |  5 ++-
 dev-qt/designer/metadata.xml                |  5 ++-
 dev-qt/linguist-tools/metadata.xml          |  5 ++-
 dev-qt/linguist/metadata.xml                |  5 ++-
 dev-qt/pixeltool/metadata.xml               |  5 ++-
 dev-qt/qdbus/metadata.xml                   |  5 ++-
 dev-qt/qdbusviewer/metadata.xml             |  5 ++-
 dev-qt/qdoc/metadata.xml                    |  5 ++-
 dev-qt/qt-creator/metadata.xml              | 57 +++++++++++++++--------------
 dev-qt/qt3d/metadata.xml                    |  5 ++-
 dev-qt/qtbluetooth/metadata.xml             |  5 ++-
 dev-qt/qtchooser/metadata.xml               |  5 ++-
 dev-qt/qtconcurrent/metadata.xml            |  5 ++-
 dev-qt/qtcore/metadata.xml                  |  5 ++-
 dev-qt/qtdbus/metadata.xml                  |  5 ++-
 dev-qt/qtdeclarative/metadata.xml           |  5 ++-
 dev-qt/qtdiag/metadata.xml                  |  5 ++-
 dev-qt/qtgraphicaleffects/metadata.xml      |  5 ++-
 dev-qt/qtgui/metadata.xml                   |  5 ++-
 dev-qt/qthelp/metadata.xml                  |  5 ++-
 dev-qt/qtimageformats/metadata.xml          |  5 ++-
 dev-qt/qtlocation/metadata.xml              |  5 ++-
 dev-qt/qtmultimedia/metadata.xml            |  5 ++-
 dev-qt/qtnetwork/metadata.xml               |  5 ++-
 dev-qt/qtopengl/metadata.xml                |  5 ++-
 dev-qt/qtpaths/metadata.xml                 |  5 ++-
 dev-qt/qtpositioning/metadata.xml           |  5 ++-
 dev-qt/qtprintsupport/metadata.xml          |  5 ++-
 dev-qt/qtquickcontrols/metadata.xml         |  5 ++-
 dev-qt/qtscript/metadata.xml                |  5 ++-
 dev-qt/qtsensors/metadata.xml               |  5 ++-
 dev-qt/qtserialport/metadata.xml            |  5 ++-
 dev-qt/qtspeech/metadata.xml                |  5 ++-
 dev-qt/qtsql/metadata.xml                   |  5 ++-
 dev-qt/qtsvg/metadata.xml                   |  5 ++-
 dev-qt/qttest/metadata.xml                  |  5 ++-
 dev-qt/qttranslations/metadata.xml          |  5 ++-
 dev-qt/qtwayland/metadata.xml               |  5 ++-
 dev-qt/qtwebchannel/metadata.xml            |  5 ++-
 dev-qt/qtwebengine/metadata.xml             |  5 ++-
 dev-qt/qtwebkit/metadata.xml                |  5 ++-
 dev-qt/qtwebsockets/metadata.xml            |  5 ++-
 dev-qt/qtwidgets/metadata.xml               |  5 ++-
 dev-qt/qtx11extras/metadata.xml             |  5 ++-
 dev-qt/qtxml/metadata.xml                   |  5 ++-
 dev-qt/qtxmlpatterns/metadata.xml           |  5 ++-
 dev-vcs/qgit/metadata.xml                   |  8 ++--
 lxde-base/lxmenu-data/metadata.xml          | 10 ++++-
 lxde-base/menu-cache/metadata.xml           | 10 ++++-
 lxqt-base/liblxqt-mount/metadata.xml        |  5 ++-
 lxqt-base/liblxqt/metadata.xml              |  5 ++-
 lxqt-base/libsysstat/metadata.xml           |  5 ++-
 lxqt-base/lxqt-about/metadata.xml           |  5 ++-
 lxqt-base/lxqt-admin/metadata.xml           |  5 ++-
 lxqt-base/lxqt-appswitcher/metadata.xml     |  5 ++-
 lxqt-base/lxqt-common/metadata.xml          |  5 ++-
 lxqt-base/lxqt-config-randr/metadata.xml    |  5 ++-
 lxqt-base/lxqt-config/metadata.xml          |  5 ++-
 lxqt-base/lxqt-globalkeys/metadata.xml      |  5 ++-
 lxqt-base/lxqt-meta/metadata.xml            | 43 ++++++++++++----------
 lxqt-base/lxqt-notificationd/metadata.xml   |  5 ++-
 lxqt-base/lxqt-openssh-askpass/metadata.xml |  5 ++-
 lxqt-base/lxqt-panel/metadata.xml           | 45 ++++++++++++-----------
 lxqt-base/lxqt-policykit/metadata.xml       |  5 ++-
 lxqt-base/lxqt-power/metadata.xml           |  5 ++-
 lxqt-base/lxqt-powermanagement/metadata.xml |  5 ++-
 lxqt-base/lxqt-qtplugin/metadata.xml        |  5 ++-
 lxqt-base/lxqt-runner/metadata.xml          |  5 ++-
 lxqt-base/lxqt-session/metadata.xml         |  5 ++-
 mail-client/imapquickcheck/metadata.xml     | 10 ++---
 media-gfx/lximage-qt/metadata.xml           |  5 ++-
 media-gfx/phototonic/metadata.xml           | 13 ++++---
 media-sound/kajammer/metadata.xml           |  5 ++-
 media-sound/mp3diags/metadata.xml           |  5 ++-
 media-sound/qpitch/metadata.xml             | 16 ++++----
 media-sound/qtmpc/metadata.xml              |  5 ++-
 media-video/elltube/metadata.xml            |  5 ++-
 media-video/minitube/metadata.xml           | 24 +++++++-----
 media-video/prismatik/metadata.xml          | 13 ++++---
 media-video/xvideoservicethief/metadata.xml | 10 ++++-
 net-im/qtwitter/metadata.xml                |  5 ++-
 net-libs/telepathy-qt/metadata.xml          | 12 ++++--
 net-misc/kontrolpack/metadata.xml           | 10 ++---
 net-misc/mediadownloader/metadata.xml       |  5 ++-
 net-misc/networkled/metadata.xml            | 16 ++++----
 net-misc/qconnman/metadata.xml              |  5 ++-
 sys-auth/qauth/metadata.xml                 | 10 ++++-
 www-client/qupzilla/metadata.xml            | 17 +++++----
 x11-libs/libqxt/metadata.xml                | 17 +++++----
 x11-libs/qtermwidget/metadata.xml           | 11 ++++--
 x11-misc/compton-conf/metadata.xml          | 10 ++++-
 x11-misc/obconf-qt/metadata.xml             | 10 ++++-
 x11-misc/pcmanfm-qt/metadata.xml            |  8 ++--
 x11-misc/sddm/metadata.xml                  | 31 +++++++++-------
 x11-terms/qterminal/metadata.xml            |  5 ++-
 x11-themes/qt-gtk-engine/metadata.xml       | 10 ++++-
 x11-themes/qtcurve/metadata.xml             | 15 +++++---
 x11-themes/quantumstyle/metadata.xml        |  5 ++-
 113 files changed, 647 insertions(+), 294 deletions(-)

diff --git a/app-admin/keepassx/metadata.xml b/app-admin/keepassx/metadata.xml
index ab02f99..1723768 100644
--- a/app-admin/keepassx/metadata.xml
+++ b/app-admin/keepassx/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/app-crypt/qca/metadata.xml b/app-crypt/qca/metadata.xml
index 71e6485..85f20ae 100644
--- a/app-crypt/qca/metadata.xml
+++ b/app-crypt/qca/metadata.xml
@@ -1,18 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>crypto</herd>
-<herd>qt</herd>
-<herd>kde</herd>
-<use>
-       <flag name="botan">Enable botan plugin</flag>
-       <flag name="gcrypt">Enable gcrypt plugin</flag>
-       <flag name="gpg">Enable GnuPG plugin</flag>
-       <flag name="logger">Enable logger plugin</flag>
-       <flag name="nss">Enable NSS plugin</flag>
-       <flag name="openssl">Enable OpenSSL plugin</flag>
-       <flag name="pkcs11">Enable PKCS#11 plugin</flag>
-       <flag name="sasl">Enable SASL plugin</flag>
-       <flag name="softstore">Enable softstore plugin</flag>
-</use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Crypto</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo KDE Project</name>
+       </maintainer>
+       <use>
+               <flag name="botan">Enable botan plugin</flag>
+               <flag name="gcrypt">Enable gcrypt plugin</flag>
+               <flag name="gpg">Enable GnuPG plugin</flag>
+               <flag name="logger">Enable logger plugin</flag>
+               <flag name="nss">Enable NSS plugin</flag>
+               <flag name="openssl">Enable OpenSSL plugin</flag>
+               <flag name="pkcs11">Enable PKCS#11 plugin</flag>
+               <flag name="sasl">Enable SASL plugin</flag>
+               <flag name="softstore">Enable softstore plugin</flag>
+       </use>
 </pkgmetadata>

diff --git a/app-editors/vim-qt/metadata.xml b/app-editors/vim-qt/metadata.xml
index f9d6c82..48b7e44 100644
--- a/app-editors/vim-qt/metadata.xml
+++ b/app-editors/vim-qt/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>qt</herd>
-  <use>
-    <flag name='luajit'>Use <pkg>dev-lang/luajit</pkg> instead of 
<pkg>dev-lang/lua</pkg></flag>
-    <flag name='racket'>Enable support for Scheme using 
<pkg>dev-lang/racket</pkg></flag>
-  </use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
+       <use>
+               <flag name="luajit">Use <pkg>dev-lang/luajit</pkg> instead of 
<pkg>dev-lang/lua</pkg></flag>
+               <flag name="racket">Enable support for Scheme using 
<pkg>dev-lang/racket</pkg></flag>
+       </use>
 </pkgmetadata>

diff --git a/app-emulation/q4wine/metadata.xml 
b/app-emulation/q4wine/metadata.xml
index cf3b7f4..9dc3239 100644
--- a/app-emulation/q4wine/metadata.xml
+++ b/app-emulation/q4wine/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>qt</herd>
-<maintainer>
-       <email>[email protected]</email>
-       <name>Markos Chandras</name>
-</maintainer>
-<use>
-       <flag name="icoutils">Enable icoutils support</flag>
-       <flag name="wineappdb">Enable Win AppDB browser subsystem</flag>
-</use>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Markos Chandras</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
+       <use>
+               <flag name="icoutils">Enable icoutils support</flag>
+               <flag name="wineappdb">Enable Win AppDB browser subsystem</flag>
+       </use>
 </pkgmetadata>

diff --git a/app-text/coolreader3/metadata.xml 
b/app-text/coolreader3/metadata.xml
index 3cbebd8..1723768 100644
--- a/app-text/coolreader3/metadata.xml
+++ b/app-text/coolreader3/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/app-text/goldendict/metadata.xml b/app-text/goldendict/metadata.xml
index 3cbebd8..1723768 100644
--- a/app-text/goldendict/metadata.xml
+++ b/app-text/goldendict/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/dev-games/tiled/metadata.xml b/dev-games/tiled/metadata.xml
index 4731b41..3415062 100644
--- a/dev-games/tiled/metadata.xml
+++ b/dev-games/tiled/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <remote-id type="sourceforge">tiled</remote-id>
        </upstream>

diff --git a/dev-libs/libqtxdg/metadata.xml b/dev-libs/libqtxdg/metadata.xml
index 2b2f838..b41f7b5 100644
--- a/dev-libs/libqtxdg/metadata.xml
+++ b/dev-libs/libqtxdg/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>lxqt</herd>
-  <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/dev-libs/libsystemd-qt/metadata.xml 
b/dev-libs/libsystemd-qt/metadata.xml
index 3eb0f7c..a568b56 100644
--- a/dev-libs/libsystemd-qt/metadata.xml
+++ b/dev-libs/libsystemd-qt/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>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
-               <flag name='qml'>Build the QML plugin</flag>
+               <flag name="qml">Build the QML plugin</flag>
        </use>
 </pkgmetadata>

diff --git a/dev-libs/qjson/metadata.xml b/dev-libs/qjson/metadata.xml
index dc439f7..1723768 100644
--- a/dev-libs/qjson/metadata.xml
+++ b/dev-libs/qjson/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/dev-libs/qjsonrpc/metadata.xml b/dev-libs/qjsonrpc/metadata.xml
index dc439f7..1723768 100644
--- a/dev-libs/qjsonrpc/metadata.xml
+++ b/dev-libs/qjsonrpc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/dev-libs/qoauth/metadata.xml b/dev-libs/qoauth/metadata.xml
index dc439f7..1723768 100644
--- a/dev-libs/qoauth/metadata.xml
+++ b/dev-libs/qoauth/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/dev-libs/quazip/metadata.xml b/dev-libs/quazip/metadata.xml
index 4bf6dbc..5ce8fdb 100644
--- a/dev-libs/quazip/metadata.xml
+++ b/dev-libs/quazip/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>sci</herd>
-  <maintainer>
-    <email>[email protected]</email>
-  </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+       </maintainer>
 </pkgmetadata>

diff --git a/dev-python/pyside/metadata.xml b/dev-python/pyside/metadata.xml
index 186ae3f..fafc401 100644
--- a/dev-python/pyside/metadata.xml
+++ b/dev-python/pyside/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="X">Build QtGui and QtTest modules</flag>
                <flag name="declarative">Build QtDeclarative module</flag>

diff --git a/dev-python/shiboken/metadata.xml b/dev-python/shiboken/metadata.xml
index dc439f7..1723768 100644
--- a/dev-python/shiboken/metadata.xml
+++ b/dev-python/shiboken/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/dev-qt/assistant/metadata.xml b/dev-qt/assistant/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/assistant/metadata.xml
+++ b/dev-qt/assistant/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/designer/metadata.xml b/dev-qt/designer/metadata.xml
index a2c89f2..ef1074c 100644
--- a/dev-qt/designer/metadata.xml
+++ b/dev-qt/designer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="declarative">Build the qdeclarativeview 
plugin</flag>
                <flag name="webkit">Build the qwebview plugin</flag>

diff --git a/dev-qt/linguist-tools/metadata.xml 
b/dev-qt/linguist-tools/metadata.xml
index 7fd11f8..e81ba60 100644
--- a/dev-qt/linguist-tools/metadata.xml
+++ b/dev-qt/linguist-tools/metadata.xml
@@ -4,7 +4,10 @@
        <use>
                <flag name="qml">Enable QML support in lupdate</flag>
        </use>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/linguist/metadata.xml b/dev-qt/linguist/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/linguist/metadata.xml
+++ b/dev-qt/linguist/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/pixeltool/metadata.xml b/dev-qt/pixeltool/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/pixeltool/metadata.xml
+++ b/dev-qt/pixeltool/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qdbus/metadata.xml b/dev-qt/qdbus/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qdbus/metadata.xml
+++ b/dev-qt/qdbus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qdbusviewer/metadata.xml b/dev-qt/qdbusviewer/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qdbusviewer/metadata.xml
+++ b/dev-qt/qdbusviewer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qdoc/metadata.xml b/dev-qt/qdoc/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qdoc/metadata.xml
+++ b/dev-qt/qdoc/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qt-creator/metadata.xml b/dev-qt/qt-creator/metadata.xml
index e836684..1e2c4f3 100644
--- a/dev-qt/qt-creator/metadata.xml
+++ b/dev-qt/qt-creator/metadata.xml
@@ -1,31 +1,34 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<maintainer>
-       <email>[email protected]</email>
-       <name>Davide Pesavento</name>
-</maintainer>
-<herd>qt</herd>
-<use>
-       <flag name="android">Build plugin for Android devices</flag>
-       <flag name="autotools">Enable autotools project manager plugin</flag>
-       <flag name="baremetal">Build plugin for bare metal devices</flag>
-       <flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> version 
control system</flag>
-       <flag name="clang">Build clang-based code model plugin</flag>
-       <flag name="clearcase">Add support for IBM ClearCase version control 
system (requires manual installation of ClearCase client)</flag>
-       <flag name="cmake">Enable cmake project manager plugin</flag>
-       <flag name="ios">Build plugin for Apple iOS devices</flag>
-       <flag name="mercurial">Add support for <pkg>dev-vcs/mercurial</pkg> 
version control system</flag>
-       <flag name="perforce">Add support for Perforce version control system 
(requires manual installation of Perforce client)</flag>
-       <flag name="python">Enable Python source code editor</flag>
-       <flag name="qbs">Enable QBS project manager plugin</flag>
-       <flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
-       <flag name="systemd">Add support for retrieving application output from 
journald</flag>
-       <flag name="valgrind">Add support for memory debugging using 
<pkg>dev-util/valgrind</pkg></flag>
-       <flag name="winrt">Build plugin for WinRT devices</flag>
-</use>
-<upstream>
-       <bugs-to>https://bugreports.qt.io/</bugs-to>
-       <doc>http://doc.qt.io/qtcreator/</doc>
-</upstream>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Davide Pesavento</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
+       <use>
+               <flag name="android">Build plugin for Android devices</flag>
+               <flag name="autotools">Enable autotools project manager 
plugin</flag>
+               <flag name="baremetal">Build plugin for bare metal 
devices</flag>
+               <flag name="bazaar">Add support for <pkg>dev-vcs/bzr</pkg> 
version control system</flag>
+               <flag name="clang">Build clang-based code model plugin</flag>
+               <flag name="clearcase">Add support for IBM ClearCase version 
control system (requires manual installation of ClearCase client)</flag>
+               <flag name="cmake">Enable cmake project manager plugin</flag>
+               <flag name="ios">Build plugin for Apple iOS devices</flag>
+               <flag name="mercurial">Add support for 
<pkg>dev-vcs/mercurial</pkg> version control system</flag>
+               <flag name="perforce">Add support for Perforce version control 
system (requires manual installation of Perforce client)</flag>
+               <flag name="python">Enable Python source code editor</flag>
+               <flag name="qbs">Enable QBS project manager plugin</flag>
+               <flag name="qnx">Build plugin for QNX/Blackberry devices</flag>
+               <flag name="systemd">Add support for retrieving application 
output from journald</flag>
+               <flag name="valgrind">Add support for memory debugging using 
<pkg>dev-util/valgrind</pkg></flag>
+               <flag name="winrt">Build plugin for WinRT devices</flag>
+       </use>
+       <upstream>
+               <bugs-to>https://bugreports.qt.io/</bugs-to>
+               <doc>http://doc.qt.io/qtcreator/</doc>
+       </upstream>
 </pkgmetadata>

diff --git a/dev-qt/qt3d/metadata.xml b/dev-qt/qt3d/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qt3d/metadata.xml
+++ b/dev-qt/qt3d/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtbluetooth/metadata.xml b/dev-qt/qtbluetooth/metadata.xml
index ddad9f7..59adb5e 100644
--- a/dev-qt/qtbluetooth/metadata.xml
+++ b/dev-qt/qtbluetooth/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="qml">Build QML/QtQuick bindings and imports</flag>
        </use>

diff --git a/dev-qt/qtchooser/metadata.xml b/dev-qt/qtchooser/metadata.xml
index dc439f7..1723768 100644
--- a/dev-qt/qtchooser/metadata.xml
+++ b/dev-qt/qtchooser/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/dev-qt/qtconcurrent/metadata.xml b/dev-qt/qtconcurrent/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtconcurrent/metadata.xml
+++ b/dev-qt/qtconcurrent/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtcore/metadata.xml b/dev-qt/qtcore/metadata.xml
index c5da8ea..b0c74b6 100644
--- a/dev-qt/qtcore/metadata.xml
+++ b/dev-qt/qtcore/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="systemd">Enable native journald logging 
support</flag>
        </use>

diff --git a/dev-qt/qtdbus/metadata.xml b/dev-qt/qtdbus/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtdbus/metadata.xml
+++ b/dev-qt/qtdbus/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtdeclarative/metadata.xml 
b/dev-qt/qtdeclarative/metadata.xml
index adda384..dca769d 100644
--- a/dev-qt/qtdeclarative/metadata.xml
+++ b/dev-qt/qtdeclarative/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="gles2">Use GLES 2.0 or later instead of full 
OpenGL</flag>
                <flag name="localstorage">Build the LocalStorage import for 
QtQuick (requires QtSql)</flag>

diff --git a/dev-qt/qtdiag/metadata.xml b/dev-qt/qtdiag/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtdiag/metadata.xml
+++ b/dev-qt/qtdiag/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtgraphicaleffects/metadata.xml 
b/dev-qt/qtgraphicaleffects/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtgraphicaleffects/metadata.xml
+++ b/dev-qt/qtgraphicaleffects/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtgui/metadata.xml b/dev-qt/qtgui/metadata.xml
index 0f044d7..4c2070c 100644
--- a/dev-qt/qtgui/metadata.xml
+++ b/dev-qt/qtgui/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="egl">Enable EGL integration</flag>
                <flag name="eglfs">Build the EGL Full Screen/Single Surface 
platform plugin</flag>

diff --git a/dev-qt/qthelp/metadata.xml b/dev-qt/qthelp/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qthelp/metadata.xml
+++ b/dev-qt/qthelp/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtimageformats/metadata.xml 
b/dev-qt/qtimageformats/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtimageformats/metadata.xml
+++ b/dev-qt/qtimageformats/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtlocation/metadata.xml b/dev-qt/qtlocation/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtlocation/metadata.xml
+++ b/dev-qt/qtlocation/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtmultimedia/metadata.xml b/dev-qt/qtmultimedia/metadata.xml
index ecffad4..6e9a474 100644
--- a/dev-qt/qtmultimedia/metadata.xml
+++ b/dev-qt/qtmultimedia/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="gles2">Enable EGL/GLES2 integration</flag>
                <flag name="gstreamer">Enable audio support via 
<pkg>media-libs/gstreamer:1.0</pkg></flag>

diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml
index 651a7c8..b36ecbc 100644
--- a/dev-qt/qtnetwork/metadata.xml
+++ b/dev-qt/qtnetwork/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="bindist">Disable EC support via 
<pkg>dev-libs/openssl</pkg></flag>
                <flag name="connman">Enable <pkg>net-misc/connman</pkg>-based 
bearer plugin</flag>

diff --git a/dev-qt/qtopengl/metadata.xml b/dev-qt/qtopengl/metadata.xml
index 8090c86..331ba5a 100644
--- a/dev-qt/qtopengl/metadata.xml
+++ b/dev-qt/qtopengl/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="gles2">Use GLES 2.0 or later instead of full 
OpenGL</flag>
        </use>

diff --git a/dev-qt/qtpaths/metadata.xml b/dev-qt/qtpaths/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtpaths/metadata.xml
+++ b/dev-qt/qtpaths/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtpositioning/metadata.xml 
b/dev-qt/qtpositioning/metadata.xml
index 0d64dfd..b982e63 100644
--- a/dev-qt/qtpositioning/metadata.xml
+++ b/dev-qt/qtpositioning/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="geoclue">Use enhanced location information from 
<pkg>app-misc/geoclue</pkg></flag>
                <flag name="qml">Build QML bindings</flag>

diff --git a/dev-qt/qtprintsupport/metadata.xml 
b/dev-qt/qtprintsupport/metadata.xml
index 8090c86..331ba5a 100644
--- a/dev-qt/qtprintsupport/metadata.xml
+++ b/dev-qt/qtprintsupport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="gles2">Use GLES 2.0 or later instead of full 
OpenGL</flag>
        </use>

diff --git a/dev-qt/qtquickcontrols/metadata.xml 
b/dev-qt/qtquickcontrols/metadata.xml
index 728463d..d1b58d2 100644
--- a/dev-qt/qtquickcontrols/metadata.xml
+++ b/dev-qt/qtquickcontrols/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="widgets">Enable QtWidgets support</flag>
        </use>

diff --git a/dev-qt/qtscript/metadata.xml b/dev-qt/qtscript/metadata.xml
index 6257f64..210676d 100644
--- a/dev-qt/qtscript/metadata.xml
+++ b/dev-qt/qtscript/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="scripttools">Build the QtScriptTools module 
(requires QtWidgets)</flag>
        </use>

diff --git a/dev-qt/qtsensors/metadata.xml b/dev-qt/qtsensors/metadata.xml
index bee66c8..25e91b2 100644
--- a/dev-qt/qtsensors/metadata.xml
+++ b/dev-qt/qtsensors/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="qml">Build QML bindings</flag>
        </use>

diff --git a/dev-qt/qtserialport/metadata.xml b/dev-qt/qtserialport/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtserialport/metadata.xml
+++ b/dev-qt/qtserialport/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtspeech/metadata.xml b/dev-qt/qtspeech/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtspeech/metadata.xml
+++ b/dev-qt/qtspeech/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtsql/metadata.xml b/dev-qt/qtsql/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtsql/metadata.xml
+++ b/dev-qt/qtsql/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtsvg/metadata.xml b/dev-qt/qtsvg/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtsvg/metadata.xml
+++ b/dev-qt/qtsvg/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qttest/metadata.xml b/dev-qt/qttest/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qttest/metadata.xml
+++ b/dev-qt/qttest/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qttranslations/metadata.xml 
b/dev-qt/qttranslations/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qttranslations/metadata.xml
+++ b/dev-qt/qttranslations/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtwayland/metadata.xml b/dev-qt/qtwayland/metadata.xml
index 0f135c2..b6af447 100644
--- a/dev-qt/qtwayland/metadata.xml
+++ b/dev-qt/qtwayland/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="egl">Use EGL instead of GLX to manage OpenGL 
contexts</flag>
                <flag name="qml">Build QML/QtQuick bindings</flag>

diff --git a/dev-qt/qtwebchannel/metadata.xml b/dev-qt/qtwebchannel/metadata.xml
index ddad9f7..59adb5e 100644
--- a/dev-qt/qtwebchannel/metadata.xml
+++ b/dev-qt/qtwebchannel/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="qml">Build QML/QtQuick bindings and imports</flag>
        </use>

diff --git a/dev-qt/qtwebengine/metadata.xml b/dev-qt/qtwebengine/metadata.xml
index 6f49a4c..da9658e 100644
--- a/dev-qt/qtwebengine/metadata.xml
+++ b/dev-qt/qtwebengine/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="geolocation">Enable physical position determination
                        via <pkg>dev-qt/qtpositioning</pkg></flag>

diff --git a/dev-qt/qtwebkit/metadata.xml b/dev-qt/qtwebkit/metadata.xml
index 1a1231f..2bbeeab 100644
--- a/dev-qt/qtwebkit/metadata.xml
+++ b/dev-qt/qtwebkit/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="geolocation">Enable physical position determination 
via <pkg>dev-qt/qtpositioning</pkg></flag>
                <flag name="gstreamer">Enable HTML5 audio/video support via 
<pkg>media-libs/gstreamer:1.0</pkg></flag>

diff --git a/dev-qt/qtwebsockets/metadata.xml b/dev-qt/qtwebsockets/metadata.xml
index bee66c8..25e91b2 100644
--- a/dev-qt/qtwebsockets/metadata.xml
+++ b/dev-qt/qtwebsockets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="qml">Build QML bindings</flag>
        </use>

diff --git a/dev-qt/qtwidgets/metadata.xml b/dev-qt/qtwidgets/metadata.xml
index 4727795..9672aa4 100644
--- a/dev-qt/qtwidgets/metadata.xml
+++ b/dev-qt/qtwidgets/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="gles2">Use GLES 2.0 or later instead of full 
OpenGL</flag>
                <flag name="gtkstyle">Build a Qt style called GTK+ that mimics 
the active

diff --git a/dev-qt/qtx11extras/metadata.xml b/dev-qt/qtx11extras/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtx11extras/metadata.xml
+++ b/dev-qt/qtx11extras/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtxml/metadata.xml b/dev-qt/qtxml/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtxml/metadata.xml
+++ b/dev-qt/qtxml/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-qt/qtxmlpatterns/metadata.xml 
b/dev-qt/qtxmlpatterns/metadata.xml
index afb3b43..e8fe3ba 100644
--- a/dev-qt/qtxmlpatterns/metadata.xml
+++ b/dev-qt/qtxmlpatterns/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <upstream>
                <bugs-to>https://bugreports.qt.io/</bugs-to>
                <doc>http://doc.qt.io/</doc>

diff --git a/dev-vcs/qgit/metadata.xml b/dev-vcs/qgit/metadata.xml
index 3c06801..d472e56 100644
--- a/dev-vcs/qgit/metadata.xml
+++ b/dev-vcs/qgit/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <maintainer>
-    <email>[email protected]</email>
-    <name>Davide Pesavento</name>
-  </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Davide Pesavento</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxde-base/lxmenu-data/metadata.xml 
b/lxde-base/lxmenu-data/metadata.xml
index c141026..d21eb25 100644
--- a/lxde-base/lxmenu-data/metadata.xml
+++ b/lxde-base/lxmenu-data/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>lxde</herd>
-  <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo LXDE Project</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxde-base/menu-cache/metadata.xml 
b/lxde-base/menu-cache/metadata.xml
index c141026..d21eb25 100644
--- a/lxde-base/menu-cache/metadata.xml
+++ b/lxde-base/menu-cache/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>lxde</herd>
-  <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo LXDE Project</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/liblxqt-mount/metadata.xml 
b/lxqt-base/liblxqt-mount/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/liblxqt-mount/metadata.xml
+++ b/lxqt-base/liblxqt-mount/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/liblxqt/metadata.xml b/lxqt-base/liblxqt/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/liblxqt/metadata.xml
+++ b/lxqt-base/liblxqt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/libsysstat/metadata.xml 
b/lxqt-base/libsysstat/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/libsysstat/metadata.xml
+++ b/lxqt-base/libsysstat/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-about/metadata.xml 
b/lxqt-base/lxqt-about/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-about/metadata.xml
+++ b/lxqt-base/lxqt-about/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-admin/metadata.xml 
b/lxqt-base/lxqt-admin/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-admin/metadata.xml
+++ b/lxqt-base/lxqt-admin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-appswitcher/metadata.xml 
b/lxqt-base/lxqt-appswitcher/metadata.xml
index 34a2901..cd9f905 100644
--- a/lxqt-base/lxqt-appswitcher/metadata.xml
+++ b/lxqt-base/lxqt-appswitcher/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxde</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo LXDE Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-common/metadata.xml 
b/lxqt-base/lxqt-common/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-common/metadata.xml
+++ b/lxqt-base/lxqt-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>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-config-randr/metadata.xml 
b/lxqt-base/lxqt-config-randr/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-config-randr/metadata.xml
+++ b/lxqt-base/lxqt-config-randr/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-config/metadata.xml 
b/lxqt-base/lxqt-config/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-config/metadata.xml
+++ b/lxqt-base/lxqt-config/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-globalkeys/metadata.xml 
b/lxqt-base/lxqt-globalkeys/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-globalkeys/metadata.xml
+++ b/lxqt-base/lxqt-globalkeys/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-meta/metadata.xml b/lxqt-base/lxqt-meta/metadata.xml
index 997bb1f..0d64ff3 100644
--- a/lxqt-base/lxqt-meta/metadata.xml
+++ b/lxqt-base/lxqt-meta/metadata.xml
@@ -1,24 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
-  <use>
-    <flag name="admin">Install <pkg>app-admin/lxqt-admin</pkg></flag>
-    <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg>
-    file manager</flag>
-    <flag name="icons">Install <pkg>lxde-base/lxde-icon-theme</pkg>
-    icon theme (pulls in <pkg>x11-libs/gtk+</pkg>)</flag>
-    <flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg>
-    display manager</flag>
-    <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg>
-    image viewer</flag>
-    <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>
-    window manager</flag>
-    <flag name="powermanagement">Install
-    <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
-    <flag name="sddm">Install <pkg>x11-misc/sddm</pkg>
-    display manager</flag>
-    <flag name="ssh-askpass">Install <pkg>net-misc/lxqt-openssh-askpass</pkg>
-    user password prompt tool</flag>
-  </use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
+       <use>
+               <flag name="admin">Install 
<pkg>app-admin/lxqt-admin</pkg></flag>
+               <flag name="filemanager">Install <pkg>x11-misc/pcmanfm-qt</pkg>
+                       file manager</flag>
+               <flag name="icons">Install <pkg>lxde-base/lxde-icon-theme</pkg>
+                       icon theme (pulls in <pkg>x11-libs/gtk+</pkg>)</flag>
+               <flag name="lightdm">Install <pkg>x11-misc/lightdm</pkg>
+                       display manager</flag>
+               <flag name="lximage">Install <pkg>media-gfx/lximage-qt</pkg>
+                       image viewer</flag>
+               <flag name="minimal">Do not install <pkg>x11-wm/openbox</pkg>
+                       window manager</flag>
+               <flag name="powermanagement">Install
+                       <pkg>lxqt-base/lxqt-powermanagement</pkg> package</flag>
+               <flag name="sddm">Install <pkg>x11-misc/sddm</pkg>
+                       display manager</flag>
+               <flag name="ssh-askpass">Install 
<pkg>net-misc/lxqt-openssh-askpass</pkg>
+                       user password prompt tool</flag>
+       </use>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-notificationd/metadata.xml 
b/lxqt-base/lxqt-notificationd/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-notificationd/metadata.xml
+++ b/lxqt-base/lxqt-notificationd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-openssh-askpass/metadata.xml 
b/lxqt-base/lxqt-openssh-askpass/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-openssh-askpass/metadata.xml
+++ b/lxqt-base/lxqt-openssh-askpass/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-panel/metadata.xml 
b/lxqt-base/lxqt-panel/metadata.xml
index 54bfea0..7afc11f 100644
--- a/lxqt-base/lxqt-panel/metadata.xml
+++ b/lxqt-base/lxqt-panel/metadata.xml
@@ -1,25 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
-  <use>
-    <flag name="clock">Build clock plugin</flag>
-    <flag name="colorpicker">Build colorpicker plugin</flag>
-    <flag name="cpuload">Build cpuload plugin</flag>
-    <flag name="desktopswitch">Build desktopswitch plugin</flag>
-    <flag name="dom">Build dom plugin</flag>
-    <flag name="kbindicator">Build kbindicator plugin</flag>
-    <flag name="mainmenu">Build mainmenu plugin</flag>
-    <flag name="mount">Build mount plugin</flag>
-    <flag name="networkmonitor">Build networkmonitor plugin</flag>
-    <flag name="quicklaunch">Build quicklaunch plugin</flag>
-    <flag name="screensaver">Build screensaver plugin</flag>
-    <flag name="sensors">Build sensors plugin</flag>
-    <flag name="showdesktop">Build showdesktop plugin</flag>
-    <flag name="sysstat">Build sysstat plugin</flag>
-    <flag name="taskbar">Build taskbar plugin</flag>
-    <flag name="tray">Build tray plugin</flag>
-    <flag name="volume">Build volume plugin</flag>
-    <flag name="worldclock">Build worldclock plugin</flag>
-  </use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
+       <use>
+               <flag name="clock">Build clock plugin</flag>
+               <flag name="colorpicker">Build colorpicker plugin</flag>
+               <flag name="cpuload">Build cpuload plugin</flag>
+               <flag name="desktopswitch">Build desktopswitch plugin</flag>
+               <flag name="dom">Build dom plugin</flag>
+               <flag name="kbindicator">Build kbindicator plugin</flag>
+               <flag name="mainmenu">Build mainmenu plugin</flag>
+               <flag name="mount">Build mount plugin</flag>
+               <flag name="networkmonitor">Build networkmonitor plugin</flag>
+               <flag name="quicklaunch">Build quicklaunch plugin</flag>
+               <flag name="screensaver">Build screensaver plugin</flag>
+               <flag name="sensors">Build sensors plugin</flag>
+               <flag name="showdesktop">Build showdesktop plugin</flag>
+               <flag name="sysstat">Build sysstat plugin</flag>
+               <flag name="taskbar">Build taskbar plugin</flag>
+               <flag name="tray">Build tray plugin</flag>
+               <flag name="volume">Build volume plugin</flag>
+               <flag name="worldclock">Build worldclock plugin</flag>
+       </use>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-policykit/metadata.xml 
b/lxqt-base/lxqt-policykit/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-policykit/metadata.xml
+++ b/lxqt-base/lxqt-policykit/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-power/metadata.xml 
b/lxqt-base/lxqt-power/metadata.xml
index 34a2901..cd9f905 100644
--- a/lxqt-base/lxqt-power/metadata.xml
+++ b/lxqt-base/lxqt-power/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxde</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo LXDE Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-powermanagement/metadata.xml 
b/lxqt-base/lxqt-powermanagement/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-powermanagement/metadata.xml
+++ b/lxqt-base/lxqt-powermanagement/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-qtplugin/metadata.xml 
b/lxqt-base/lxqt-qtplugin/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-qtplugin/metadata.xml
+++ b/lxqt-base/lxqt-qtplugin/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-runner/metadata.xml 
b/lxqt-base/lxqt-runner/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-runner/metadata.xml
+++ b/lxqt-base/lxqt-runner/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/lxqt-base/lxqt-session/metadata.xml 
b/lxqt-base/lxqt-session/metadata.xml
index f988383..54b92bf 100644
--- a/lxqt-base/lxqt-session/metadata.xml
+++ b/lxqt-base/lxqt-session/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/mail-client/imapquickcheck/metadata.xml 
b/mail-client/imapquickcheck/metadata.xml
index 156086b..708cd3e 100644
--- a/mail-client/imapquickcheck/metadata.xml
+++ b/mail-client/imapquickcheck/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
-       <maintainer>
+       <maintainer type="person">
                <email>[email protected]</email>
                <name>Dominik Kapusta</name>
        </maintainer>
-       <longdescription lang="en">
-       </longdescription>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>
-

diff --git a/media-gfx/lximage-qt/metadata.xml 
b/media-gfx/lximage-qt/metadata.xml
index f988383..54b92bf 100644
--- a/media-gfx/lximage-qt/metadata.xml
+++ b/media-gfx/lximage-qt/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/media-gfx/phototonic/metadata.xml 
b/media-gfx/phototonic/metadata.xml
index fb3e6ca..70a93c6 100644
--- a/media-gfx/phototonic/metadata.xml
+++ b/media-gfx/phototonic/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>qt</herd>
-  <maintainer>
-    <email>[email protected]</email>
-    <name>Ben de Groot</name>
-  </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Ben de Groot</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/media-sound/kajammer/metadata.xml 
b/media-sound/kajammer/metadata.xml
index a2f7a00..826d2a5 100644
--- a/media-sound/kajammer/metadata.xml
+++ b/media-sound/kajammer/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <use>
                <flag name="lastfm">Enable Last.fm streaming services support 
through <pkg>media-libs/liblastfm</pkg></flag>
        </use>

diff --git a/media-sound/mp3diags/metadata.xml 
b/media-sound/mp3diags/metadata.xml
index dc439f7..1723768 100644
--- a/media-sound/mp3diags/metadata.xml
+++ b/media-sound/mp3diags/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/media-sound/qpitch/metadata.xml b/media-sound/qpitch/metadata.xml
index 3d43c69..ffeb219 100644
--- a/media-sound/qpitch/metadata.xml
+++ b/media-sound/qpitch/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd></herd>
-<maintainer>
-<email>[email protected]</email>
-<name>Markos Chandras</name>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Sound project</name>
+       </maintainer>
 </pkgmetadata>
-

diff --git a/media-sound/qtmpc/metadata.xml b/media-sound/qtmpc/metadata.xml
index dc439f7..1723768 100644
--- a/media-sound/qtmpc/metadata.xml
+++ b/media-sound/qtmpc/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/media-video/elltube/metadata.xml b/media-video/elltube/metadata.xml
index dc439f7..1723768 100644
--- a/media-video/elltube/metadata.xml
+++ b/media-video/elltube/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/media-video/minitube/metadata.xml 
b/media-video/minitube/metadata.xml
index 0a5b314..ff20181 100644
--- a/media-video/minitube/metadata.xml
+++ b/media-video/minitube/metadata.xml
@@ -1,13 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
-<herd>video</herd>
-<maintainer>
-<email>[email protected]</email>
-<name>Markos Chandras</name>
-</maintainer>
-<use>
-<flag name='download'>Enable support for downloading YouTube videos</flag>
-</use>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Markos Chandras</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Video project</name>
+       </maintainer>
+       <use>
+               <flag name="download">Enable support for downloading YouTube 
videos</flag>
+       </use>
 </pkgmetadata>

diff --git a/media-video/prismatik/metadata.xml 
b/media-video/prismatik/metadata.xml
index 92517d7..7bb44ab 100644
--- a/media-video/prismatik/metadata.xml
+++ b/media-video/prismatik/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>qt</herd>
-  <maintainer>
-    <email>[email protected]</email>
-    <name>Timo Gurr</name>
-  </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Timo Gurr</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/media-video/xvideoservicethief/metadata.xml 
b/media-video/xvideoservicethief/metadata.xml
index 60ff892..21193fe 100644
--- a/media-video/xvideoservicethief/metadata.xml
+++ b/media-video/xvideoservicethief/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>video</herd>
-  <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Video project</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/net-im/qtwitter/metadata.xml b/net-im/qtwitter/metadata.xml
index ab02f99..1723768 100644
--- a/net-im/qtwitter/metadata.xml
+++ b/net-im/qtwitter/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/net-libs/telepathy-qt/metadata.xml 
b/net-libs/telepathy-qt/metadata.xml
index 1e6e071..d62898a 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -1,9 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
-       <herd>kde</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo KDE Project</name>
+       </maintainer>
        <use>
-               <flag name='farstream'>Enable support for audio/video calls via 
farstream</flag>
+               <flag name="farstream">Enable support for audio/video calls via 
farstream</flag>
        </use>
 </pkgmetadata>

diff --git a/net-misc/kontrolpack/metadata.xml 
b/net-misc/kontrolpack/metadata.xml
index 156086b..708cd3e 100644
--- a/net-misc/kontrolpack/metadata.xml
+++ b/net-misc/kontrolpack/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
-       <maintainer>
+       <maintainer type="person">
                <email>[email protected]</email>
                <name>Dominik Kapusta</name>
        </maintainer>
-       <longdescription lang="en">
-       </longdescription>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>
-

diff --git a/net-misc/mediadownloader/metadata.xml 
b/net-misc/mediadownloader/metadata.xml
index dc439f7..1723768 100644
--- a/net-misc/mediadownloader/metadata.xml
+++ b/net-misc/mediadownloader/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/net-misc/networkled/metadata.xml b/net-misc/networkled/metadata.xml
index d5f9562..93cc9ef 100644
--- a/net-misc/networkled/metadata.xml
+++ b/net-misc/networkled/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
-<maintainer>
-<email>[email protected]</email>
-<name>Markos Chandras</name>
-</maintainer>
-<longdescription lang="en">
-</longdescription>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Markos Chandras</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>
-

diff --git a/net-misc/qconnman/metadata.xml b/net-misc/qconnman/metadata.xml
index ab02f99..1723768 100644
--- a/net-misc/qconnman/metadata.xml
+++ b/net-misc/qconnman/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/sys-auth/qauth/metadata.xml b/sys-auth/qauth/metadata.xml
index 70af9db..58c0754 100644
--- a/sys-auth/qauth/metadata.xml
+++ b/sys-auth/qauth/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
-       <herd>lxqt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/www-client/qupzilla/metadata.xml b/www-client/qupzilla/metadata.xml
index b38ad16..e7eae86 100644
--- a/www-client/qupzilla/metadata.xml
+++ b/www-client/qupzilla/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>qt</herd>
-  <use>
-    <flag name='nonblockdialogs'>Enable fancy non-blocking JavaScript dialogs
-      shown inside the page, not blocking the application window. When closing
-      browser windows with open dialogs, this can crash the application.
-    </flag>
-  </use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
+       <use>
+               <flag name="nonblockdialogs">Enable fancy non-blocking 
JavaScript dialogs
+                       shown inside the page, not blocking the application 
window. When closing
+                       browser windows with open dialogs, this can crash the 
application.
+               </flag>
+       </use>
 </pkgmetadata>

diff --git a/x11-libs/libqxt/metadata.xml b/x11-libs/libqxt/metadata.xml
index 32c24a4..deeb1de 100644
--- a/x11-libs/libqxt/metadata.xml
+++ b/x11-libs/libqxt/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
-<use>
-       <flag name="berkdb">Build the QxtBerkeley module</flag>
-       <flag name="sql">Build the QxtSql module</flag>
-       <flag name="web">Build the QxtWeb module</flag>
-       <flag name="zeroconf">Build the QxtZeroconf module</flag>
-</use>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
+       <use>
+               <flag name="berkdb">Build the QxtBerkeley module</flag>
+               <flag name="sql">Build the QxtSql module</flag>
+               <flag name="web">Build the QxtWeb module</flag>
+               <flag name="zeroconf">Build the QxtZeroconf module</flag>
+       </use>
 </pkgmetadata>

diff --git a/x11-libs/qtermwidget/metadata.xml 
b/x11-libs/qtermwidget/metadata.xml
index a6b07f6..eaa5d4e 100644
--- a/x11-libs/qtermwidget/metadata.xml
+++ b/x11-libs/qtermwidget/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>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
        <longdescription lang="en">
-       QTermWidget is an opensource project based on KDE4 Konsole application.
-       The main goal of this project is to provide unicode-enabled, embeddable
-       Qt widget for using as a built-in console or terminal emulation widget.
+               QTermWidget is an opensource project based on KDE4 Konsole 
application.
+               The main goal of this project is to provide unicode-enabled, 
embeddable
+               Qt widget for using as a built-in console or terminal emulation 
widget.
        </longdescription>
 </pkgmetadata>

diff --git a/x11-misc/compton-conf/metadata.xml 
b/x11-misc/compton-conf/metadata.xml
index c141026..d21eb25 100644
--- a/x11-misc/compton-conf/metadata.xml
+++ b/x11-misc/compton-conf/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>lxde</herd>
-  <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo LXDE Project</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/x11-misc/obconf-qt/metadata.xml b/x11-misc/obconf-qt/metadata.xml
index 2b2f838..b41f7b5 100644
--- a/x11-misc/obconf-qt/metadata.xml
+++ b/x11-misc/obconf-qt/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>lxqt</herd>
-  <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml
index d87441e..54b92bf 100644
--- a/x11-misc/pcmanfm-qt/metadata.xml
+++ b/x11-misc/pcmanfm-qt/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>lxqt</herd>
-<longdescription lang="en">
-</longdescription>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
 </pkgmetadata>
-

diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml
index d867da7..f676861 100644
--- a/x11-misc/sddm/metadata.xml
+++ b/x11-misc/sddm/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>lxqt</herd>
-  <maintainer>
-    <email>[email protected]</email>
-    <name>Jauhien Piatlicki</name>
-  </maintainer>
-  <use>
-    <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit by 
default in Xsession (no native support)</flag>
-  </use>
-  <longdescription lang="en">
-    SDDM is a modern display manager for X11 aiming to be fast, simple
-    and beatiful. It uses modern technologies like QtQuick, which in
-    turn gives the designer the ability to create smooth, animated
-    user interfaces.
-  </longdescription>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Jauhien Piatlicki</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>LXQt</name>
+       </maintainer>
+       <use>
+               <flag name="consolekit">Use ck-launch-session from 
sys-auth/consolekit by default in Xsession (no native support)</flag>
+       </use>
+       <longdescription lang="en">
+               SDDM is a modern display manager for X11 aiming to be fast, 
simple
+               and beatiful. It uses modern technologies like QtQuick, which in
+               turn gives the designer the ability to create smooth, animated
+               user interfaces.
+        </longdescription>
 </pkgmetadata>

diff --git a/x11-terms/qterminal/metadata.xml b/x11-terms/qterminal/metadata.xml
index dc439f7..1723768 100644
--- a/x11-terms/qterminal/metadata.xml
+++ b/x11-terms/qterminal/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/x11-themes/qt-gtk-engine/metadata.xml 
b/x11-themes/qt-gtk-engine/metadata.xml
index c141026..d21eb25 100644
--- a/x11-themes/qt-gtk-engine/metadata.xml
+++ b/x11-themes/qt-gtk-engine/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>lxde</herd>
-  <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo LXDE Project</name>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/x11-themes/qtcurve/metadata.xml b/x11-themes/qtcurve/metadata.xml
index e27905e..2992ac6 100644
--- a/x11-themes/qtcurve/metadata.xml
+++ b/x11-themes/qtcurve/metadata.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <herd>qt</herd>
-  <use>
-    <flag name="kde">Enable KDE4 support. This adds a QtCurve configuration
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
+       <use>
+               <flag name="kde">Enable KDE4 support. This adds a QtCurve 
configuration
       module to KDE's SystemSettings</flag>
-    <flag name="kf5">Enable KDE Frameworks 5 support</flag>
-    <flag name="windeco">Enable window decoration for KWin</flag>
-  </use>
+               <flag name="kf5">Enable KDE Frameworks 5 support</flag>
+               <flag name="windeco">Enable window decoration for KWin</flag>
+       </use>
 </pkgmetadata>

diff --git a/x11-themes/quantumstyle/metadata.xml 
b/x11-themes/quantumstyle/metadata.xml
index ab02f99..1723768 100644
--- a/x11-themes/quantumstyle/metadata.xml
+++ b/x11-themes/quantumstyle/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <herd>qt</herd>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Qt Project</name>
+       </maintainer>
 </pkgmetadata>

Reply via email to