commit:     aa2f2da2006650d40d43d982eb526f9809789e85
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 06:23:17 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 06:24:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa2f2da2

Multiple metadata.xml: reorder to make sure assignee goes first

Reorder all metadata.xml files with explicit descriptions requesting
particular bug assignment/CC to ensure that the requested assignee
always goes first, in order to match the bug wrangling policies.

 app-admin/equo/metadata.xml                       |  8 ++++----
 app-admin/matter/metadata.xml                     |  8 ++++----
 app-admin/packagekit-base/metadata.xml            |  8 ++++----
 app-admin/packagekit-gtk/metadata.xml             |  8 ++++----
 app-admin/packagekit-qt/metadata.xml              |  8 ++++----
 app-admin/packagekit/metadata.xml                 |  8 ++++----
 app-backup/amanda/metadata.xml                    | 10 +++++-----
 app-backup/vzdump/metadata.xml                    |  8 ++++----
 app-dicts/hunspell-kk/metadata.xml                |  8 ++++----
 app-editors/le/metadata.xml                       |  4 ++--
 app-emulation/aqemu/metadata.xml                  |  8 ++++----
 app-emulation/fuse-utils/metadata.xml             | 10 +++++-----
 app-emulation/libvirt-glib/metadata.xml           |  8 ++++----
 app-laptop/configure-trackpoint/metadata.xml      | 10 +++++-----
 app-misc/screenie/metadata.xml                    |  8 ++++----
 app-misc/utimer/metadata.xml                      | 10 +++++-----
 app-portage/kuroo4/metadata.xml                   | 10 +++++-----
 app-portage/porthole/metadata.xml                 |  8 ++++----
 app-text/antiword/metadata.xml                    |  8 ++++----
 app-vim/cream/metadata.xml                        |  8 ++++----
 app-vim/vim-latex/metadata.xml                    |  8 ++++----
 dev-db/firebird/metadata.xml                      |  8 ++++----
 dev-db/mongodb/metadata.xml                       |  8 ++++----
 dev-db/redis/metadata.xml                         | 10 +++++-----
 dev-embedded/openocd/metadata.xml                 |  8 ++++----
 dev-libs/libucl/metadata.xml                      |  8 ++++----
 dev-python/pymongo/metadata.xml                   |  8 ++++----
 dev-python/python-gudev/metadata.xml              |  8 ++++----
 dev-tex/biblatex-apa/metadata.xml                 |  8 ++++----
 dev-tex/biblatex/metadata.xml                     |  8 ++++----
 dev-util/btyacc/metadata.xml                      | 10 +++++-----
 dev-util/molecule-core/metadata.xml               |  8 ++++----
 dev-util/molecule-plugins/metadata.xml            |  8 ++++----
 dev-util/molecule/metadata.xml                    |  8 ++++----
 dev-util/ninja-ide/metadata.xml                   |  8 ++++----
 dev-util/rebar/metadata.xml                       |  8 ++++----
 games-action/minetest/metadata.xml                |  8 ++++----
 games-action/minetest_game/metadata.xml           |  8 ++++----
 games-engines/odamex/metadata.xml                 |  8 ++++----
 games-engines/renpy/metadata.xml                  |  8 ++++----
 games-misc/katawa-shoujo/metadata.xml             | 10 +++++-----
 games-rpg/arx-fatalis-data/metadata.xml           |  8 ++++----
 games-rpg/arx-fatalis-demo/metadata.xml           |  8 ++++----
 games-rpg/sumwars/metadata.xml                    |  8 ++++----
 mail-filter/postfwd/metadata.xml                  |  8 ++++----
 mail-filter/razor/metadata.xml                    | 16 ++++++++--------
 media-fonts/infinality-ultimate-meta/metadata.xml | 10 +++++-----
 media-gfx/colorhug-client/metadata.xml            |  8 ++++----
 media-libs/fontconfig-ultimate/metadata.xml       | 10 +++++-----
 media-libs/lastfmlib/metadata.xml                 | 10 +++++-----
 media-libs/libiec61883/metadata.xml               |  8 ++++----
 media-sound/audacity/metadata.xml                 |  8 ++++----
 media-sound/fluid-soundfont/metadata.xml          | 10 +++++-----
 media-sound/lmms/metadata.xml                     | 10 +++++-----
 media-video/ffdiaporama/metadata.xml              |  8 ++++----
 net-im/qtox/metadata.xml                          |  8 ++++----
 net-libs/tox/metadata.xml                         |  8 ++++----
 net-misc/keychain/metadata.xml                    | 10 +++++-----
 net-misc/s3cmd/metadata.xml                       | 10 +++++-----
 net-misc/youtube-viewer/metadata.xml              |  8 ++++----
 sys-apps/entropy-server/metadata.xml              |  8 ++++----
 sys-apps/entropy/metadata.xml                     |  8 ++++----
 sys-fs/progsreiserfs/metadata.xml                 |  8 ++++----
 sys-kernel/genkernel-next/metadata.xml            |  8 ++++----
 x11-apps/python-whiteboard/metadata.xml           |  8 ++++----
 x11-apps/spotlighter/metadata.xml                 |  8 ++++----
 x11-apps/whyteboard/metadata.xml                  |  8 ++++----
 x11-misc/ardesia/metadata.xml                     |  8 ++++----
 x11-misc/sunflower/metadata.xml                   |  8 ++++----
 x11-misc/x11vnc/metadata.xml                      |  8 ++++----
 x11-wm/fluxbox/metadata.xml                       |  8 ++++----
 71 files changed, 301 insertions(+), 301 deletions(-)

diff --git a/app-admin/equo/metadata.xml b/app-admin/equo/metadata.xml
index e9fe522..d072d39 100644
--- a/app-admin/equo/metadata.xml
+++ b/app-admin/equo/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/app-admin/matter/metadata.xml b/app-admin/matter/metadata.xml
index c638d5e..4613929 100644
--- a/app-admin/matter/metadata.xml
+++ b/app-admin/matter/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/app-admin/packagekit-base/metadata.xml 
b/app-admin/packagekit-base/metadata.xml
index d3bf83b..46e303d 100644
--- a/app-admin/packagekit-base/metadata.xml
+++ b/app-admin/packagekit-base/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/app-admin/packagekit-gtk/metadata.xml 
b/app-admin/packagekit-gtk/metadata.xml
index 1c8f84a..ae74d29 100644
--- a/app-admin/packagekit-gtk/metadata.xml
+++ b/app-admin/packagekit-gtk/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/app-admin/packagekit-qt/metadata.xml 
b/app-admin/packagekit-qt/metadata.xml
index a6ca81b..9ce5194 100644
--- a/app-admin/packagekit-qt/metadata.xml
+++ b/app-admin/packagekit-qt/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/app-admin/packagekit/metadata.xml 
b/app-admin/packagekit/metadata.xml
index 1c8f84a..ae74d29 100644
--- a/app-admin/packagekit/metadata.xml
+++ b/app-admin/packagekit/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/app-backup/amanda/metadata.xml b/app-backup/amanda/metadata.xml
index 110b169..e191fc9 100644
--- a/app-backup/amanda/metadata.xml
+++ b/app-backup/amanda/metadata.xml
@@ -9,17 +9,17 @@
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Stefan G. Weichinger</name>
-               <description>Proxied developer; set to assignee in all 
bugs</description>
+               <description>Proxied developer</description>
+       </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
        </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <description>Upstream. Please CC on bugs.</description>
                <name>Dustin J. Mitchell</name>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <use>
                <flag name="xfs">Support for backing up raw XFS filesystems 
using xfsdump</flag>
                <flag name="s3">Support for backing up to the Amazon S3 
system</flag>

diff --git a/app-backup/vzdump/metadata.xml b/app-backup/vzdump/metadata.xml
index 2f0236f..f1d95ea 100644
--- a/app-backup/vzdump/metadata.xml
+++ b/app-backup/vzdump/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
 <maintainer type="person">
-  <email>[email protected]</email>
-  <name>Peter Volkov</name>
-</maintainer>
-<maintainer type="person">
   <email>[email protected]</email>
   <name>Andreis Vinogradovs</name>
   <description>Primary maintainer, assign bugs to him</description>
 </maintainer>
+<maintainer type="person">
+  <email>[email protected]</email>
+  <name>Peter Volkov</name>
+</maintainer>
 <longdescription lang="en">
 vzdump is a utility to make consistent snapshots of running OpenVZ VEs. It 
basically creates a tar archive of the VE private area, which also includes the 
VE configuration files.
 There are several ways to provide consistency:

diff --git a/app-dicts/hunspell-kk/metadata.xml 
b/app-dicts/hunspell-kk/metadata.xml
index dd7243e..b58b211 100644
--- a/app-dicts/hunspell-kk/metadata.xml
+++ b/app-dicts/hunspell-kk/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<maintainer type="project">
-                <email>[email protected]</email>
-                <name>Proxy Maintainers</name>
-</maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Galym Kerimbekov</name>
                <description>Proxy maintainer, assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <upstream>
                <remote-id type="github">kergalym/hunspell-kk</remote-id>
                <remote-id type="sourceforge">hunspell</remote-id>

diff --git a/app-editors/le/metadata.xml b/app-editors/le/metadata.xml
index 5f22208..98d7f56 100644
--- a/app-editors/le/metadata.xml
+++ b/app-editors/le/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<maintainer type="person">
+       <maintainer type="person">
                <email>[email protected]</email>
                <name>Gerold Schellstede</name>
                <description>Proxy maintainer - assign bugs to him</description>
        </maintainer>
-<maintainer type="project">
+       <maintainer type="project">
                <email>[email protected]</email>
                <name>Proxy Maintainers</name>
        </maintainer>

diff --git a/app-emulation/aqemu/metadata.xml b/app-emulation/aqemu/metadata.xml
index c9c487d..31eb8cd 100644
--- a/app-emulation/aqemu/metadata.xml
+++ b/app-emulation/aqemu/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
        <maintainer type="person">
-               <email>[email protected]</email>
-               <description>Proxy maintainer (CC on bugs)</description>
-       </maintainer>
-       <maintainer type="person">
                <email>[email protected]</email>
                <description>Proxied maintainer (assign bugs)</description>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <description>Proxy maintainer (CC on bugs)</description>
+       </maintainer>
        <maintainer type="project">
                <email>[email protected]</email>
                <name>Proxy Maintainers</name>

diff --git a/app-emulation/fuse-utils/metadata.xml 
b/app-emulation/fuse-utils/metadata.xml
index 374a83a..e4b1b97 100644
--- a/app-emulation/fuse-utils/metadata.xml
+++ b/app-emulation/fuse-utils/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
        <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Jesus Rivero</name>
-               <description>Proxy Maintainer. Please CC on bugs.</description>
-       </maintainer>
-       <maintainer type="person">
                <email>[email protected]</email>
                <name>José Manuel Ferrer Ortiz</name>
                <description>Proxied Maintainer. Please assign on 
bugs.</description>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Jesus Rivero</name>
+               <description>Proxy Maintainer. Please CC on bugs.</description>
+       </maintainer>
        <maintainer type="project">
                <email>[email protected]</email>
                <name>Proxy Maintainers Project</name>

diff --git a/app-emulation/libvirt-glib/metadata.xml 
b/app-emulation/libvirt-glib/metadata.xml
index 3d9b69d..f329d3b 100644
--- a/app-emulation/libvirt-glib/metadata.xml
+++ b/app-emulation/libvirt-glib/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo GNOME Desktop</name>
+</maintainer>
 <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-laptop/configure-trackpoint/metadata.xml 
b/app-laptop/configure-trackpoint/metadata.xml
index 9640af1..7438fa2 100644
--- a/app-laptop/configure-trackpoint/metadata.xml
+++ b/app-laptop/configure-trackpoint/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
        <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Markos Chandras</name>
-               <description>Proxy maintainer. CC him on bugs</description>
-       </maintainer>
-       <maintainer type="person">
                <email>[email protected]</email>
                <name>Markellos Orfanos</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Markos Chandras</name>
+               <description>Proxy maintainer. CC him on bugs</description>
+       </maintainer>
        <maintainer type="project">
                <email>[email protected]</email>
                <name>Proxy Maintainers</name>

diff --git a/app-misc/screenie/metadata.xml b/app-misc/screenie/metadata.xml
index 447bf70..e7b2676 100644
--- a/app-misc/screenie/metadata.xml
+++ b/app-misc/screenie/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="person">
     <email>[email protected]</email>
     <name>Robert Kowalski</name>
     <description>Proxy Maintainer. CC on bugs</description>
   </maintainer>
-  <maintainer type="project">
-    <email>[email protected]</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <longdescription lang="en">
     Screenie is a small and lightweight GNU screen(1) frontend that is
     designed to be a session handler that simplifies the process of

diff --git a/app-misc/utimer/metadata.xml b/app-misc/utimer/metadata.xml
index 2a49cd5..b67a73c 100644
--- a/app-misc/utimer/metadata.xml
+++ b/app-misc/utimer/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
 <maintainer type="person">
-<email>[email protected]</email>
-<name>Markos Chandras</name>
-<description>Proxy maintainer. CC him on bugs</description>
-</maintainer>
-<maintainer type="person">
 <email>[email protected]</email>
 <name>Kfir Lavi</name>
 <description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer type="person">
+<email>[email protected]</email>
+<name>Markos Chandras</name>
+<description>Proxy maintainer. CC him on bugs</description>
+</maintainer>
 <maintainer type="project">
 <email>[email protected]</email>
 <name>Proxy Maintainers</name>

diff --git a/app-portage/kuroo4/metadata.xml b/app-portage/kuroo4/metadata.xml
index 144acfe..22f510c 100644
--- a/app-portage/kuroo4/metadata.xml
+++ b/app-portage/kuroo4/metadata.xml
@@ -2,11 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
        <longdescription lang="en">Graphical Portage frontend based on 
KDE4/Qt4</longdescription>
-       <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Andrew Schenck</name>
-               <description>Upstream Maintainer (please CC on 
bugs)</description>
-       </maintainer>
        <maintainer type="project">
                <email>[email protected]</email>
                <name>Gentoo Portage tools team</name>
@@ -19,6 +14,11 @@
                <email>[email protected]</email>
                <name>Gentoo KDE Project</name>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Andrew Schenck</name>
+               <description>Upstream Maintainer (please CC on 
bugs)</description>
+       </maintainer>
        <upstream>
                <remote-id type="sourceforge">kuroo</remote-id>
        </upstream>

diff --git a/app-portage/porthole/metadata.xml 
b/app-portage/porthole/metadata.xml
index 8a5683c..860c6eb 100644
--- a/app-portage/porthole/metadata.xml
+++ b/app-portage/porthole/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Portage tools team</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Brian Dolbec</name>
                <description>Upstream Maintainer (please CC on 
bugs)</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Gentoo Portage tools team</name>
-       </maintainer>
        <upstream>
                <remote-id type="sourceforge">porthole</remote-id>
        </upstream>

diff --git a/app-text/antiword/metadata.xml b/app-text/antiword/metadata.xml
index eee5194..cc6b77e 100644
--- a/app-text/antiword/metadata.xml
+++ b/app-text/antiword/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
        <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Fabian Groffen</name>
-       </maintainer>
-       <maintainer type="person">
                <email>[email protected]</email>
                <name>LABBE Corentin (Montjoie)</name>
                <description>Maintainer. Assign bugs to him</description>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Fabian Groffen</name>
+       </maintainer>
        <maintainer type="project">
                <email>[email protected]</email>
                <name>Proxy Maintainers</name>

diff --git a/app-vim/cream/metadata.xml b/app-vim/cream/metadata.xml
index 7c9634f..429038d 100644
--- a/app-vim/cream/metadata.xml
+++ b/app-vim/cream/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Vim Project</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <description>Please Cc: Thomas de Grenier de Latour (not a 
Gentoo
                        developer) on any bugs, as he knows lots about the 
package and I'd
                        like his opinion before I make any big 
changes.</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Gentoo Vim Project</name>
-       </maintainer>
        <upstream>
                <remote-id type="sourceforge">cream</remote-id>
        </upstream>

diff --git a/app-vim/vim-latex/metadata.xml b/app-vim/vim-latex/metadata.xml
index b302f9a..22fa098 100644
--- a/app-vim/vim-latex/metadata.xml
+++ b/app-vim/vim-latex/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo Vim Project</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <description>Please Cc: James Noble (ferret on IRC, not a Gentoo
                        developer) on any bugs related to this package as he 
knows more
                        about it than me.</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Gentoo Vim Project</name>
-       </maintainer>
        <use>
                <flag name="html">Install HTML documentation</flag>
                <flag name="python">Enable python support which can help speed 
up some functionality</flag>

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index c10e79b..6cc5246 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -16,13 +16,13 @@
        <upstream>
                <remote-id type="sourceforge">firebird</remote-id>
        </upstream>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Andrey Matrosov</name>
                <description>Proxied maintainer, assign bugs to 
him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
 </pkgmetadata>

diff --git a/dev-db/mongodb/metadata.xml b/dev-db/mongodb/metadata.xml
index 5fbf570..2a2cf6a 100644
--- a/dev-db/mongodb/metadata.xml
+++ b/dev-db/mongodb/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Alexys Jacob</name>
-       </maintainer>
     <maintainer type="person">
         <email>[email protected]</email>
         <name>Lujeni</name>
         <description>Proxy-Maintainer, assign bugs</description>
     </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Alexys Jacob</name>
+       </maintainer>
        <maintainer type="project">
         <email>[email protected]</email>
         <name>Proxy Maintainers</name>

diff --git a/dev-db/redis/metadata.xml b/dev-db/redis/metadata.xml
index 593ce5c..4f794b0 100644
--- a/dev-db/redis/metadata.xml
+++ b/dev-db/redis/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
   <maintainer type="person">
-    <email>[email protected]</email>
+    <email>[email protected]</email>
+    <name>Johan Bergström</name>
+    <description>Proxy-Maintainer, assign bugs</description>
   </maintainer>
   <maintainer type="person">
-    <email>[email protected]</email>
+    <email>[email protected]</email>
   </maintainer>
   <maintainer type="person">
-    <email>[email protected]</email>
-    <name>Johan Bergström</name>
-    <description>Proxy-Maintainer, assign bugs</description>
+    <email>[email protected]</email>
   </maintainer>
   <maintainer type="project">
     <email>[email protected]</email>

diff --git a/dev-embedded/openocd/metadata.xml 
b/dev-embedded/openocd/metadata.xml
index 581f3f4..305f9c4 100644
--- a/dev-embedded/openocd/metadata.xml
+++ b/dev-embedded/openocd/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Embedded Gentoo</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Paul Fertser</name>
                <description>Upstream contact. CC him on bugs</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Embedded Gentoo</name>
-       </maintainer>
        <use>
                <flag name="blaster">Enable support for Altera 
USE-Blaster</flag>
                <flag name="cmsis-dap">Support for CMSIS-DAP compliant 
adapters</flag>

diff --git a/dev-libs/libucl/metadata.xml b/dev-libs/libucl/metadata.xml
index 4f528bc..70179d0 100644
--- a/dev-libs/libucl/metadata.xml
+++ b/dev-libs/libucl/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="person">
     <email>[email protected]</email>
     <name>Johan Bergström</name>
     <description>Co-maintainer, CC on bugs.</description>
   </maintainer>
 
-  <maintainer type="project">
-    <email>[email protected]</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <longdescription>UCL is heavily infused by nginx configuration as the example
     of a convenient configuration system. However, UCL is fully compatible with
     JSON format and is able to parse json files. It can also emit UCL objects

diff --git a/dev-python/pymongo/metadata.xml b/dev-python/pymongo/metadata.xml
index 2b13263..0d71a40 100644
--- a/dev-python/pymongo/metadata.xml
+++ b/dev-python/pymongo/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
        <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Alexys Jacob</name>
-       </maintainer>
-       <maintainer type="person">
                <email>[email protected]</email>
                <name>Lujeni</name>
                <description>Proxy-Maintainer, assign bugs</description>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Alexys Jacob</name>
+       </maintainer>
        <maintainer type="project">
                <email>[email protected]</email>
                <name>Python</name>

diff --git a/dev-python/python-gudev/metadata.xml 
b/dev-python/python-gudev/metadata.xml
index 081b9a9..a6170ed 100644
--- a/dev-python/python-gudev/metadata.xml
+++ b/dev-python/python-gudev/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <maintainer type="person">
-    <email>[email protected]</email>
-    <description>Proxy Maintainer (please CC on bugs)</description>
-  </maintainer>
   <maintainer type="project">
     <email>[email protected]</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="person">
+    <email>[email protected]</email>
+    <description>Proxy Maintainer (please CC on bugs)</description>
+  </maintainer>
   <upstream>
     <remote-id type="github">nzjrs/python-gudev</remote-id>
   </upstream>

diff --git a/dev-tex/biblatex-apa/metadata.xml 
b/dev-tex/biblatex-apa/metadata.xml
index d8536af..fded803 100644
--- a/dev-tex/biblatex-apa/metadata.xml
+++ b/dev-tex/biblatex-apa/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo TeX Project</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Manuel Rüger</name>
                <description>CC me on bugs. Assign to herd</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Gentoo TeX Project</name>
-       </maintainer>
        <upstream>
                <remote-id type="github">plk/biblatex-apa</remote-id>
        </upstream>

diff --git a/dev-tex/biblatex/metadata.xml b/dev-tex/biblatex/metadata.xml
index d9e9569..df0d4b9 100644
--- a/dev-tex/biblatex/metadata.xml
+++ b/dev-tex/biblatex/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo TeX Project</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Manuel Rüger</name>
                <description>CC me on bugs. Assign to herd</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Gentoo TeX Project</name>
-       </maintainer>
        <upstream>
                <remote-id type="github">plk/biblatex</remote-id>
                <remote-id type="sourceforge">biblatex</remote-id>

diff --git a/dev-util/btyacc/metadata.xml b/dev-util/btyacc/metadata.xml
index adc9e63..fa6a94b 100644
--- a/dev-util/btyacc/metadata.xml
+++ b/dev-util/btyacc/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
 <maintainer type="person">
-<email>[email protected]</email>
-<name>Patrick Lauer</name>
-<description>Proxy maintainer. CC him on bugs</description>
-</maintainer>
-<maintainer type="person">
 <email>[email protected]</email>
 <name>William L. Thomson Jr.</name>
 <description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer type="person">
+<email>[email protected]</email>
+<name>Patrick Lauer</name>
+<description>Proxy maintainer. CC him on bugs</description>
+</maintainer>
 <maintainer type="project">
 <email>[email protected]</email>
 <name>Proxy Maintainers</name>

diff --git a/dev-util/molecule-core/metadata.xml 
b/dev-util/molecule-core/metadata.xml
index 8aa512b..a5de739 100644
--- a/dev-util/molecule-core/metadata.xml
+++ b/dev-util/molecule-core/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/dev-util/molecule-plugins/metadata.xml 
b/dev-util/molecule-plugins/metadata.xml
index 1c8f84a..ae74d29 100644
--- a/dev-util/molecule-plugins/metadata.xml
+++ b/dev-util/molecule-plugins/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/dev-util/molecule/metadata.xml b/dev-util/molecule/metadata.xml
index e24d807..1633200 100644
--- a/dev-util/molecule/metadata.xml
+++ b/dev-util/molecule/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/dev-util/ninja-ide/metadata.xml b/dev-util/ninja-ide/metadata.xml
index 0336b18..2b02efb 100644
--- a/dev-util/ninja-ide/metadata.xml
+++ b/dev-util/ninja-ide/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Aaron Burnett</name>
                <description>Proxy maintainer. CC him on bugs</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <upstream>
                
<changelog>https://github.com/ninja-ide/ninja-ide/commits/master</changelog>
                <doc lang="en">https://github.com/ninja-ide/ninja-ide/wiki</doc>

diff --git a/dev-util/rebar/metadata.xml b/dev-util/rebar/metadata.xml
index 8ba22a2..c2edb57 100644
--- a/dev-util/rebar/metadata.xml
+++ b/dev-util/rebar/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
   <maintainer type="person">
-    <email>[email protected]</email>
-    <name>Dirkjan Ochtman</name>
-  </maintainer>
-  <maintainer type="person">
     <email>[email protected]</email>
     <name>Luis Ressel</name>
     <description>Proxy-maintainer, assign bugs</description>
   </maintainer>
+  <maintainer type="person">
+    <email>[email protected]</email>
+    <name>Dirkjan Ochtman</name>
+  </maintainer>
   <maintainer type="project">
     <email>[email protected]</email>
     <name>Proxy Maintainers</name>

diff --git a/games-action/minetest/metadata.xml 
b/games-action/minetest/metadata.xml
index 941d81e..68f3b1d 100644
--- a/games-action/minetest/metadata.xml
+++ b/games-action/minetest/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Martin-Kevin Neumann</name>
                <description>Proxy maintainer, CC him on bugs</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <longdescription lang="en">
                Minetest is an infinite-world block sandbox game and a game
                engine, inspired by InfiniMiner, Minecraft and the like. It has

diff --git a/games-action/minetest_game/metadata.xml 
b/games-action/minetest_game/metadata.xml
index b278863..8ec83ec 100644
--- a/games-action/minetest_game/metadata.xml
+++ b/games-action/minetest_game/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Martin-Kevin Neumann</name>
                <description>Proxy maintainer, CC him on bugs</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <upstream>
                
<bugs-to>https://github.com/minetest/minetest_game/issues</bugs-to>
                <remote-id type="github">minetest/minetest_game</remote-id>

diff --git a/games-engines/odamex/metadata.xml 
b/games-engines/odamex/metadata.xml
index 730aaeb..fa5e66c 100644
--- a/games-engines/odamex/metadata.xml
+++ b/games-engines/odamex/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Mike Wood</name>
@@ -10,10 +14,6 @@
                <email>[email protected]</email>
                <name>Gentoo Games Project</name>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <use>
                <flag name="odalaunch">Build the wxwidgets based 
launcher.</flag>
                <flag name="master">Build master server target (advertises 
odamex server list)</flag>

diff --git a/games-engines/renpy/metadata.xml b/games-engines/renpy/metadata.xml
index fd8cc63..763130a 100644
--- a/games-engines/renpy/metadata.xml
+++ b/games-engines/renpy/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Maks Verver</name>
@@ -10,10 +14,6 @@
                <email>[email protected]</email>
                <name>Gentoo Games Project</name>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <longdescription>
                Ren'Py is a free and cross-platform visual novel engine that
                helps you use words,

diff --git a/games-misc/katawa-shoujo/metadata.xml 
b/games-misc/katawa-shoujo/metadata.xml
index 538f8f0..32c88c5 100644
--- a/games-misc/katawa-shoujo/metadata.xml
+++ b/games-misc/katawa-shoujo/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
        <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Maks Verver</name>
-               <description>Proxy maintainer. CC him on bugs</description>
-       </maintainer>
-       <maintainer type="person">
                <email>[email protected]</email>
                <name>Alex Xu</name>
                <description>Proxied maintainer</description>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Maks Verver</name>
+               <description>Proxy maintainer. CC him on bugs</description>
+       </maintainer>
        <maintainer type="project">
                <email>[email protected]</email>
                <name>Gentoo Games Project</name>

diff --git a/games-rpg/arx-fatalis-data/metadata.xml 
b/games-rpg/arx-fatalis-data/metadata.xml
index 986ccaa..3293455 100644
--- a/games-rpg/arx-fatalis-data/metadata.xml
+++ b/games-rpg/arx-fatalis-data/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Daniel Scharrer</name>
@@ -10,10 +14,6 @@
                <email>[email protected]</email>
                <name>Gentoo Games Project</name>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <use>
                <flag name="gog">Extract the data from the GOG.com 
installer.</flag>
        </use>

diff --git a/games-rpg/arx-fatalis-demo/metadata.xml 
b/games-rpg/arx-fatalis-demo/metadata.xml
index 20cae65..7a7c278 100644
--- a/games-rpg/arx-fatalis-demo/metadata.xml
+++ b/games-rpg/arx-fatalis-demo/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Daniel Scharrer</name>
@@ -10,8 +14,4 @@
                <email>[email protected]</email>
                <name>Gentoo Games Project</name>
        </maintainer>
-<maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
 </pkgmetadata>

diff --git a/games-rpg/sumwars/metadata.xml b/games-rpg/sumwars/metadata.xml
index 59934bb..e880076 100644
--- a/games-rpg/sumwars/metadata.xml
+++ b/games-rpg/sumwars/metadata.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Michael Kunz</name>
@@ -10,10 +14,6 @@
                <email>[email protected]</email>
                <name>Gentoo Games Project</name>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <longdescription lang="en">
        </longdescription>
        <upstream>

diff --git a/mail-filter/postfwd/metadata.xml b/mail-filter/postfwd/metadata.xml
index f9a03f2..a68d695d 100644
--- a/mail-filter/postfwd/metadata.xml
+++ b/mail-filter/postfwd/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
        <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Marc Schiffbauer</name>
-       </maintainer>
-       <maintainer type="person">
                <email>[email protected]</email>
                <name>Christian Roessner</name>
                <description>Proxy-Maintainer. Assign bugs to him</description>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Marc Schiffbauer</name>
+       </maintainer>
        <maintainer type="project">
            <email>[email protected]</email>
            <name>Proxy Maintainers</name>

diff --git a/mail-filter/razor/metadata.xml b/mail-filter/razor/metadata.xml
index b0f3056..db02698 100644
--- a/mail-filter/razor/metadata.xml
+++ b/mail-filter/razor/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="person">
-               <email>[email protected]</email>
-               <description>
-                       A contact designated by upstream developers. This email 
address
-                       should always be added to CC list of any Razor bug that 
needs
-                       upstream care.
-               </description>
-       </maintainer>
        <maintainer type="project">
                <email>[email protected]</email>
                <name>Proxy Maintainers</name>
@@ -17,6 +9,14 @@
                <email>[email protected]</email>
                <name>Net-Mail</name>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <description>
+                       A contact designated by upstream developers. This email 
address
+                       should always be added to CC list of any Razor bug that 
needs
+                       upstream care.
+               </description>
+       </maintainer>
        <upstream>
                <remote-id type="sourceforge">razor</remote-id>
        </upstream>

diff --git a/media-fonts/infinality-ultimate-meta/metadata.xml 
b/media-fonts/infinality-ultimate-meta/metadata.xml
index bca2645..ea92543 100644
--- a/media-fonts/infinality-ultimate-meta/metadata.xml
+++ b/media-fonts/infinality-ultimate-meta/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <maintainer type="person">
-    <email>[email protected]</email>
-    <name>Witold Piłat</name>
-    <description>Proxied/co-maintainer. CC on bugs.</description>
-  </maintainer>
   <maintainer type="project">
     <email>[email protected]</email>
     <name>Fonts</name>
@@ -14,6 +9,11 @@
     <email>[email protected]</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="person">
+    <email>[email protected]</email>
+    <name>Witold Piłat</name>
+    <description>Proxied/co-maintainer. CC on bugs.</description>
+  </maintainer>
   <use>
     <flag name="free">Install fonts for the "free" preset</flag>
     <flag name="latin">Install additional latin fonts</flag>

diff --git a/media-gfx/colorhug-client/metadata.xml 
b/media-gfx/colorhug-client/metadata.xml
index d4d3304..2763136 100644
--- a/media-gfx/colorhug-client/metadata.xml
+++ b/media-gfx/colorhug-client/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Gentoo GNOME Desktop</name>
+       </maintainer>
 <maintainer type="person">
                <email>[email protected]</email>
                <name>Greg Kroah-Hartman</name>
                <description>Please CC him on bugs and assign to 
herd</description>
        </maintainer>
-<maintainer type="project">
-               <email>[email protected]</email>
-               <name>Gentoo GNOME Desktop</name>
-       </maintainer>
 </pkgmetadata>

diff --git a/media-libs/fontconfig-ultimate/metadata.xml 
b/media-libs/fontconfig-ultimate/metadata.xml
index 2a0bd48..cfbeebe 100644
--- a/media-libs/fontconfig-ultimate/metadata.xml
+++ b/media-libs/fontconfig-ultimate/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-  <maintainer type="person">
-    <email>[email protected]</email>
-    <name>Witold Piłat</name>
-    <description>Proxied/co-maintainer. CC on bugs.</description>
-  </maintainer>
   <maintainer type="project">
     <email>[email protected]</email>
     <name>Fonts</name>
@@ -14,6 +9,11 @@
     <email>[email protected]</email>
     <name>Proxy Maintainers</name>
   </maintainer>
+  <maintainer type="person">
+    <email>[email protected]</email>
+    <name>Witold Piłat</name>
+    <description>Proxied/co-maintainer. CC on bugs.</description>
+  </maintainer>
   <upstream>
     <remote-id type="github">bohoomil/fontconfig-ultimate</remote-id>
   </upstream>

diff --git a/media-libs/lastfmlib/metadata.xml 
b/media-libs/lastfmlib/metadata.xml
index fe592f7..39e0464 100644
--- a/media-libs/lastfmlib/metadata.xml
+++ b/media-libs/lastfmlib/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Dirk Vanden Boer</name>
-               <description>Proxy maintainer and upstream developer. Please CC 
him on bugs</description>
-       </maintainer>
        <maintainer type="project">
                <email>[email protected]</email>
                <name>Gentoo Sound project</name>
@@ -14,6 +9,11 @@
                <email>[email protected]</email>
                <name>Proxy Maintainers</name>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Dirk Vanden Boer</name>
+               <description>Proxy maintainer and upstream developer. Please CC 
him on bugs</description>
+       </maintainer>
        <longdescription lang="en">
        </longdescription>
        <upstream>

diff --git a/media-libs/libiec61883/metadata.xml 
b/media-libs/libiec61883/metadata.xml
index d4d83a2..79b6e93 100644
--- a/media-libs/libiec61883/metadata.xml
+++ b/media-libs/libiec61883/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Gentoo Video project</name>
+</maintainer>
 <maintainer type="person">
        <email>[email protected]</email>
        <name>Denis Dupeyron</name>
        <description>Main maintainer for this is the herd, please CC on
        bugs.</description>
 </maintainer>
-<maintainer type="project">
-       <email>[email protected]</email>
-       <name>Gentoo Video project</name>
-</maintainer>
 <longdescription lang="en">
 This library provides third generation media reception and transmission for DV,
 MPEG2-TS, and AMDTP (audio and music) using only raw1394 and not the 
complicated

diff --git a/media-sound/audacity/metadata.xml 
b/media-sound/audacity/metadata.xml
index 5884800..bb0dddb 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Gentoo ProAudio Project</name>
+  </maintainer>
   <maintainer type="person">
     <email>[email protected]</email>
     <name>Richard Ash</name>
     <description>Upstream - please CC on bugs that concerns 
upstream</description>
   </maintainer>
-  <maintainer type="project">
-    <email>[email protected]</email>
-    <name>Gentoo ProAudio Project</name>
-  </maintainer>
   <use>
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
     <flag name="libsoxr">

diff --git a/media-sound/fluid-soundfont/metadata.xml 
b/media-sound/fluid-soundfont/metadata.xml
index 02aae86..ccb7baf 100644
--- a/media-sound/fluid-soundfont/metadata.xml
+++ b/media-sound/fluid-soundfont/metadata.xml
@@ -2,15 +2,15 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
 <maintainer type="person">
-<email>[email protected]</email>
-<name>Markos Chandras</name>
-<description>Proxy maintainer. CC him on bugs</description>
-</maintainer>
-<maintainer type="person">
 <email>[email protected]</email>
 <name>Nikoli</name>
 <description>Maintainer. Assign bugs to him</description>
 </maintainer>
+<maintainer type="person">
+<email>[email protected]</email>
+<name>Markos Chandras</name>
+<description>Proxy maintainer. CC him on bugs</description>
+</maintainer>
 <maintainer type="project">
 <email>[email protected]</email>
 <name>Proxy Maintainers</name>

diff --git a/media-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
index 4edf309..2cf8cf6 100644
--- a/media-sound/lmms/metadata.xml
+++ b/media-sound/lmms/metadata.xml
@@ -2,6 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
   <maintainer type="person">
+    <email>[email protected]</email>
+    <name>Jonathan Aquilina</name>
+    <description>Please assign bugs</description>
+  </maintainer>
+  <maintainer type="person">
     <email>[email protected]</email>
     <name>Alexis Ballier</name>
   </maintainer>
@@ -14,11 +19,6 @@
     <email>[email protected]</email>
     <name>Thomas Kuther</name>
   </maintainer>
-  <maintainer type="person">
-    <email>[email protected]</email>
-    <name>Jonathan Aquilina</name>
-    <description>Please assign bugs</description>
-  </maintainer>
   <maintainer type="project">
     <email>[email protected]</email>
     <name>Gentoo ProAudio Project</name>

diff --git a/media-video/ffdiaporama/metadata.xml 
b/media-video/ffdiaporama/metadata.xml
index 44ea272..c0df23b 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+        <email>[email protected]</email>
+        <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Olivier Laurantin</name>
                <description>Proxy maintainer. CC him on bugs</description>
        </maintainer>
-       <maintainer type="project">
-        <email>[email protected]</email>
-        <name>Proxy Maintainers</name>
-       </maintainer>
        <upstream>
         
<changelog>http://ffdiaporama.tuxfamily.org/?page_id=7266&amp;lang=en</changelog>
         <doc lang="en">http://ffdiaporama.tuxfamily.org/?page_id=6268</doc>

diff --git a/net-im/qtox/metadata.xml b/net-im/qtox/metadata.xml
index 16bfca3..22f0538 100644
--- a/net-im/qtox/metadata.xml
+++ b/net-im/qtox/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Zetok Zalbavar</name>
                <description>Proxy maintainers. CC him on bugs</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <use>
                <flag name="gtk">Adds support for GTK and Status Notifier tray 
backends</flag>
                <flag name="X">Adds support for X11</flag>

diff --git a/net-libs/tox/metadata.xml b/net-libs/tox/metadata.xml
index f75d824..8a12710 100644
--- a/net-libs/tox/metadata.xml
+++ b/net-libs/tox/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Zetok Zalbavar</name>
                <description>Proxy maintainers. CC him on bugs</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <use>
                <flag name="av">Adds support for audio and video.</flag>
                <flag name="no-log">Log level: 0 (no debug info logged)</flag>

diff --git a/net-misc/keychain/metadata.xml b/net-misc/keychain/metadata.xml
index 1ef6792..464d4e0 100644
--- a/net-misc/keychain/metadata.xml
+++ b/net-misc/keychain/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Daniel Robbins</name>
-               <description>Upstream contact, please CC on bugs</description>
-       </maintainer>
        <maintainer type="project">
                <email>[email protected]</email>
                <name>Gentoo Base System</name>
@@ -14,6 +9,11 @@
                <email>[email protected]</email>
                <name>Proxy Maintainers</name>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Daniel Robbins</name>
+               <description>Upstream contact, please CC on bugs</description>
+       </maintainer>
        <upstream>
                <remote-id type="github">funtoo/keychain</remote-id>
        </upstream>

diff --git a/net-misc/s3cmd/metadata.xml b/net-misc/s3cmd/metadata.xml
index b10b920..4f40646 100644
--- a/net-misc/s3cmd/metadata.xml
+++ b/net-misc/s3cmd/metadata.xml
@@ -2,6 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
   <maintainer type="person">
+    <email>[email protected]</email>
+    <name>Brendan Horan</name>
+    <description>Proxy maintainer, assign bugs</description>
+  </maintainer>
+  <maintainer type="person">
     <email>[email protected]</email>
     <name>Igor Testen</name>
   </maintainer>
@@ -9,11 +14,6 @@
     <email>[email protected]</email>
     <name>Aaron W. Swenson</name>
   </maintainer>
-  <maintainer type="person">
-    <email>[email protected]</email>
-    <name>Brendan Horan</name>
-    <description>Proxy maintainer, assign bugs</description>
-  </maintainer>
   <maintainer type="project">
     <email>[email protected]</email>
     <name>Proxy Maintainers</name>

diff --git a/net-misc/youtube-viewer/metadata.xml 
b/net-misc/youtube-viewer/metadata.xml
index 1d4c692..a06da39 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Zoltan Puskas</name>
                <description>Proxied maintainer, CC him on bugs.</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <upstream>
                <maintainer status="active">
                        <email>[email protected]</email>

diff --git a/sys-apps/entropy-server/metadata.xml 
b/sys-apps/entropy-server/metadata.xml
index a37f9da..b72be9c 100644
--- a/sys-apps/entropy-server/metadata.xml
+++ b/sys-apps/entropy-server/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/sys-apps/entropy/metadata.xml b/sys-apps/entropy/metadata.xml
index 1c8f84a..ae74d29 100644
--- a/sys-apps/entropy/metadata.xml
+++ b/sys-apps/entropy/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/sys-fs/progsreiserfs/metadata.xml 
b/sys-fs/progsreiserfs/metadata.xml
index a2bdd5c..4dea6b2 100644
--- a/sys-fs/progsreiserfs/metadata.xml
+++ b/sys-fs/progsreiserfs/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-<maintainer type="person">
-       <email>[email protected]</email>
-       <description>Maintainer as part of base-system work. Assign bugs to 
base-system.</description>
-</maintainer>
 <maintainer type="project">
        <email>[email protected]</email>
        <name>Gentoo Base System</name>
 </maintainer>
+<maintainer type="person">
+       <email>[email protected]</email>
+       <description>Maintainer as part of base-system work. Assign bugs to 
base-system.</description>
+</maintainer>
 </pkgmetadata>

diff --git a/sys-kernel/genkernel-next/metadata.xml 
b/sys-kernel/genkernel-next/metadata.xml
index 5d40634..d6ebedf 100644
--- a/sys-kernel/genkernel-next/metadata.xml
+++ b/sys-kernel/genkernel-next/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Ettore Di Giacinto</name>
                <description>Assign bugs to him</description>
        </maintainer>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Pacho Ramos</name>

diff --git a/x11-apps/python-whiteboard/metadata.xml 
b/x11-apps/python-whiteboard/metadata.xml
index fc70639..f50f923 100644
--- a/x11-apps/python-whiteboard/metadata.xml
+++ b/x11-apps/python-whiteboard/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Marco Clocchiatti</name>
                <description>Proxy maintainer. CC him on bugs</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <longdescription lang="en">
        Build and operate an electronic whiteboard using gnu/linux, a wiimote 
and an IR pen.
        </longdescription>

diff --git a/x11-apps/spotlighter/metadata.xml 
b/x11-apps/spotlighter/metadata.xml
index f5b73d3..b2a876d 100644
--- a/x11-apps/spotlighter/metadata.xml
+++ b/x11-apps/spotlighter/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Marco Clocchiatti</name>
                <description>Proxy maintainer. CC him on bugs</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <longdescription lang="en">Spotlighter is a tool that show a movable 
and resizable spotlight
                on the desktop screen.
                You can use this to hide and show objects on the desktop.

diff --git a/x11-apps/whyteboard/metadata.xml b/x11-apps/whyteboard/metadata.xml
index 0d11bb0..952d2af 100644
--- a/x11-apps/whyteboard/metadata.xml
+++ b/x11-apps/whyteboard/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+  <maintainer type="project">
+    <email>[email protected]</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <maintainer type="person">
     <email>[email protected]</email>
     <name>Marco Clocchiatti</name>
     <description>Proxy maintainer. CC him on bugs</description>
   </maintainer>
-  <maintainer type="project">
-    <email>[email protected]</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <longdescription lang="en">A simple image, PDF and postscript file 
annotator.</longdescription>
   <upstream>
     <maintainer status="active">

diff --git a/x11-misc/ardesia/metadata.xml b/x11-misc/ardesia/metadata.xml
index 1fdfe8e..cb7b69f 100644
--- a/x11-misc/ardesia/metadata.xml
+++ b/x11-misc/ardesia/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+<maintainer type="project">
+       <email>[email protected]</email>
+       <name>Proxy Maintainers</name>
+</maintainer>
 <maintainer type="person">
        <email>[email protected]</email>
        <name>Marco Clocchiatti</name>
        <description>Proxy maintainer. CC him on bugs</description>
 </maintainer>
-<maintainer type="project">
-       <email>[email protected]</email>
-       <name>Proxy Maintainers</name>
-</maintainer>
 <longdescription lang="en">
 Ardesia enables you to make colored free-hand annotations on your computer 
screen, 
 record it and share on the network.

diff --git a/x11-misc/sunflower/metadata.xml b/x11-misc/sunflower/metadata.xml
index a847b79..f583c66 100644
--- a/x11-misc/sunflower/metadata.xml
+++ b/x11-misc/sunflower/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Henrique Dias</name>
                <description>Proxy maintainer. CC him on bugs</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <upstream>
                <remote-id type="github">MeanEYE/Sunflower</remote-id>
        </upstream>

diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index a2e0553..6cc5ce8 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
+       <maintainer type="project">
+               <email>[email protected]</email>
+               <name>Proxy Maintainers</name>
+       </maintainer>
        <maintainer type="person">
                <email>[email protected]</email>
                <name>Alex Xu</name>
                <description>Proxy maintainer. CC him on bugs</description>
        </maintainer>
-       <maintainer type="project">
-               <email>[email protected]</email>
-               <name>Proxy Maintainers</name>
-       </maintainer>
        <longdescription>
                The primary goal of this program is to create a portable and
                simple command-line server utility that allows a VNC viewer

diff --git a/x11-wm/fluxbox/metadata.xml b/x11-wm/fluxbox/metadata.xml
index 90e2312..2bb00c0 100644
--- a/x11-wm/fluxbox/metadata.xml
+++ b/x11-wm/fluxbox/metadata.xml
@@ -2,14 +2,14 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
 <pkgmetadata>
        <maintainer type="person">
-               <email>[email protected]</email>
-               <name>Panagiotis Christopoulos</name>
-       </maintainer>
-       <maintainer type="person">
                <email>[email protected]</email>
                <name>Daniel Campbell</name>
                <description>Maintainer. Assign bugs to him</description>
        </maintainer>
+       <maintainer type="person">
+               <email>[email protected]</email>
+               <name>Panagiotis Christopoulos</name>
+       </maintainer>
        <longdescription>
                Fluxbox is yet another windowmanager for X. Originally based 
upon the
                Blackbox 0.61.1 code, Fluxbox has been extended to include a 
new tabbed

Reply via email to