summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/actionscript-mode/metadata.xml2
-rw-r--r--app-emacs/analog/metadata.xml2
-rw-r--r--app-emacs/anything/metadata.xml2
-rw-r--r--app-emacs/apache-mode/metadata.xml2
-rw-r--r--app-emacs/apel/metadata.xml2
-rw-r--r--app-emacs/auctex/metadata.xml4
-rw-r--r--app-emacs/auto-complete/metadata.xml2
-rw-r--r--app-emacs/autoconf-mode/metadata.xml2
-rw-r--r--app-emacs/bbdb/metadata.xml2
-rw-r--r--app-emacs/binclock/metadata.xml2
-rw-r--r--app-emacs/bison-mode/metadata.xml4
-rw-r--r--app-emacs/blogmax/metadata.xml2
-rw-r--r--app-emacs/bm/metadata.xml2
-rw-r--r--app-emacs/bongo/metadata.xml2
-rw-r--r--app-emacs/boxquote/metadata.xml2
-rw-r--r--app-emacs/browse-kill-ring/metadata.xml2
-rw-r--r--app-emacs/bubblet/metadata.xml2
-rw-r--r--app-emacs/calfw/metadata.xml4
-rw-r--r--app-emacs/chess/metadata.xml2
-rw-r--r--app-emacs/circe/metadata.xml2
-rw-r--r--app-emacs/cldoc/metadata.xml4
-rw-r--r--app-emacs/cmail/metadata.xml2
-rw-r--r--app-emacs/color-browser/metadata.xml2
-rw-r--r--app-emacs/color-moccur/metadata.xml2
-rw-r--r--app-emacs/color-theme/metadata.xml2
-rw-r--r--app-emacs/company-mode/metadata.xml2
-rw-r--r--app-emacs/crontab-mode/metadata.xml2
-rw-r--r--app-emacs/crypt++/metadata.xml2
-rw-r--r--app-emacs/csharp-mode/metadata.xml2
-rw-r--r--app-emacs/css-mode/metadata.xml2
-rw-r--r--app-emacs/csv-mode/metadata.xml2
-rw-r--r--app-emacs/d-mode/metadata.xml2
-rw-r--r--app-emacs/dash/metadata.xml2
-rw-r--r--app-emacs/ddskk/metadata.xml4
-rw-r--r--app-emacs/develock/metadata.xml2
-rw-r--r--app-emacs/df-mode/metadata.xml2
-rw-r--r--app-emacs/dictionary/metadata.xml2
-rw-r--r--app-emacs/dircolors/metadata.xml2
-rw-r--r--app-emacs/dired-sort-menu/metadata.xml2
-rw-r--r--app-emacs/distel/metadata.xml2
-rw-r--r--app-emacs/doctest-mode/metadata.xml2
-rw-r--r--app-emacs/doxymacs/metadata.xml2
-rw-r--r--app-emacs/dropdown-list/metadata.xml2
-rw-r--r--app-emacs/dts-mode/metadata.xml2
-rw-r--r--app-emacs/ebuild-mode/metadata.xml2
-rw-r--r--app-emacs/ecb/metadata.xml2
-rw-r--r--app-emacs/edb/metadata.xml2
-rw-r--r--app-emacs/edit-list/metadata.xml2
-rw-r--r--app-emacs/elib/metadata.xml2
-rw-r--r--app-emacs/elscreen/metadata.xml2
-rw-r--r--app-emacs/emacs-common-gentoo/metadata.xml2
-rw-r--r--app-emacs/emacs-daemon/metadata.xml2
-rw-r--r--app-emacs/emacs-jabber/metadata.xml2
-rw-r--r--app-emacs/emacs-w3m/metadata.xml2
-rw-r--r--app-emacs/emacs-wget/metadata.xml2
-rw-r--r--app-emacs/emacs-wiki-blog/metadata.xml2
-rw-r--r--app-emacs/emacs-wiki/metadata.xml2
-rw-r--r--app-emacs/emhacks/metadata.xml2
-rw-r--r--app-emacs/emms/metadata.xml2
-rw-r--r--app-emacs/erobot/metadata.xml2
-rw-r--r--app-emacs/eselect-mode/metadata.xml4
-rw-r--r--app-emacs/ess/metadata.xml2
-rw-r--r--app-emacs/evil/metadata.xml2
-rw-r--r--app-emacs/fff/metadata.xml2
-rw-r--r--app-emacs/filladapt/metadata.xml2
-rw-r--r--app-emacs/flashcard/metadata.xml2
-rw-r--r--app-emacs/flim/metadata.xml2
-rw-r--r--app-emacs/folding/metadata.xml2
-rw-r--r--app-emacs/ghc-mod/metadata.xml4
-rw-r--r--app-emacs/gnuplot-mode/metadata.xml2
-rw-r--r--app-emacs/gnuserv/metadata.xml2
-rw-r--r--app-emacs/google-c-style/metadata.xml4
-rw-r--r--app-emacs/graphviz-dot-mode/metadata.xml2
-rw-r--r--app-emacs/h4x0r/metadata.xml2
-rw-r--r--app-emacs/haskell-mode/metadata.xml2
-rw-r--r--app-emacs/hexrgb/metadata.xml2
-rw-r--r--app-emacs/highline/metadata.xml2
-rw-r--r--app-emacs/howm/metadata.xml2
-rw-r--r--app-emacs/htmlize/metadata.xml2
-rw-r--r--app-emacs/httpd/metadata.xml2
-rw-r--r--app-emacs/icicles/metadata.xml2
-rw-r--r--app-emacs/identica-mode/metadata.xml2
-rw-r--r--app-emacs/igrep/metadata.xml2
-rw-r--r--app-emacs/imaxima/metadata.xml4
-rw-r--r--app-emacs/inform-mode/metadata.xml2
-rw-r--r--app-emacs/initsplit/metadata.xml2
-rw-r--r--app-emacs/jam-mode/metadata.xml2
-rw-r--r--app-emacs/jasmin/metadata.xml2
-rw-r--r--app-emacs/javascript/metadata.xml2
-rw-r--r--app-emacs/jde/metadata.xml4
-rw-r--r--app-emacs/keywiz/metadata.xml2
-rw-r--r--app-emacs/limit/metadata.xml2
-rw-r--r--app-emacs/lookup/metadata.xml4
-rw-r--r--app-emacs/lua-mode/metadata.xml2
-rw-r--r--app-emacs/lyskom-elisp-client/metadata.xml2
-rw-r--r--app-emacs/magit/metadata.xml2
-rw-r--r--app-emacs/mailcrypt/metadata.xml2
-rw-r--r--app-emacs/markdown-mode/metadata.xml4
-rw-r--r--app-emacs/matlab/metadata.xml2
-rw-r--r--app-emacs/mcomplete/metadata.xml2
-rw-r--r--app-emacs/mediawiki/metadata.xml2
-rw-r--r--app-emacs/mew/metadata.xml2
-rw-r--r--app-emacs/mic-paren/metadata.xml2
-rw-r--r--app-emacs/mldonkey/metadata.xml2
-rw-r--r--app-emacs/mmm-mode/metadata.xml2
-rw-r--r--app-emacs/moccur-edit/metadata.xml2
-rw-r--r--app-emacs/mode-compile/metadata.xml2
-rw-r--r--app-emacs/mpg123-el/metadata.xml2
-rw-r--r--app-emacs/mu-cite/metadata.xml4
-rw-r--r--app-emacs/multi-term/metadata.xml4
-rw-r--r--app-emacs/multiple-cursors/metadata.xml2
-rw-r--r--app-emacs/muse/metadata.xml2
-rw-r--r--app-emacs/nagios-mode/metadata.xml2
-rw-r--r--app-emacs/navi2ch/metadata.xml4
-rw-r--r--app-emacs/nxml-docbook5-schemas/metadata.xml4
-rw-r--r--app-emacs/nxml-gentoo-schemas/metadata.xml2
-rw-r--r--app-emacs/nxml-libvirt-schemas/metadata.xml6
-rw-r--r--app-emacs/nxml-svg-schemas/metadata.xml4
-rw-r--r--app-emacs/ocaml-mode/metadata.xml4
-rw-r--r--app-emacs/org-mode/metadata.xml2
-rw-r--r--app-emacs/outline-magic/metadata.xml2
-rw-r--r--app-emacs/paredit/metadata.xml2
-rw-r--r--app-emacs/php-mode/metadata.xml2
-rw-r--r--app-emacs/planner/metadata.xml2
-rw-r--r--app-emacs/po-mode/metadata.xml2
-rw-r--r--app-emacs/popwin/metadata.xml4
-rw-r--r--app-emacs/pov-mode/metadata.xml2
-rw-r--r--app-emacs/prom-wl/metadata.xml2
-rw-r--r--app-emacs/proofgeneral/metadata.xml2
-rw-r--r--app-emacs/protbuf/metadata.xml2
-rw-r--r--app-emacs/psgml/metadata.xml2
-rw-r--r--app-emacs/pymacs/metadata.xml4
-rw-r--r--app-emacs/python-mode/metadata.xml2
-rw-r--r--app-emacs/quack/metadata.xml2
-rw-r--r--app-emacs/quilt-el/metadata.xml2
-rw-r--r--app-emacs/qwerty/metadata.xml2
-rw-r--r--app-emacs/redo+/metadata.xml2
-rw-r--r--app-emacs/regress/metadata.xml2
-rw-r--r--app-emacs/remember/metadata.xml2
-rw-r--r--app-emacs/rfcview/metadata.xml2
-rw-r--r--app-emacs/riece/metadata.xml2
-rw-r--r--app-emacs/rnc-mode/metadata.xml2
-rw-r--r--app-emacs/rpm-spec-mode/metadata.xml4
-rw-r--r--app-emacs/ruby-mode/metadata.xml2
-rw-r--r--app-emacs/rudel/metadata.xml2
-rw-r--r--app-emacs/rust-mode/metadata.xml4
-rw-r--r--app-emacs/scala-mode/metadata.xml2
-rw-r--r--app-emacs/scheme-complete/metadata.xml2
-rw-r--r--app-emacs/scim-bridge-el/metadata.xml4
-rw-r--r--app-emacs/scss-mode/metadata.xml4
-rw-r--r--app-emacs/semi/metadata.xml2
-rw-r--r--app-emacs/session/metadata.xml2
-rw-r--r--app-emacs/setnu/metadata.xml2
-rw-r--r--app-emacs/slime/metadata.xml4
-rw-r--r--app-emacs/sml-mode/metadata.xml2
-rw-r--r--app-emacs/sokoban/metadata.xml2
-rw-r--r--app-emacs/ssh/metadata.xml2
-rw-r--r--app-emacs/stripes/metadata.xml2
-rw-r--r--app-emacs/sumibi/metadata.xml4
-rw-r--r--app-emacs/tdtd/metadata.xml2
-rw-r--r--app-emacs/teco/metadata.xml2
-rw-r--r--app-emacs/template/metadata.xml2
-rw-r--r--app-emacs/tempo-snippets/metadata.xml2
-rw-r--r--app-emacs/thinks/metadata.xml2
-rw-r--r--app-emacs/thumbs/metadata.xml2
-rw-r--r--app-emacs/tuareg-mode/metadata.xml4
-rw-r--r--app-emacs/twittering-mode/metadata.xml4
-rw-r--r--app-emacs/typing/metadata.xml2
-rw-r--r--app-emacs/uboat/metadata.xml2
-rw-r--r--app-emacs/undo-tree/metadata.xml4
-rw-r--r--app-emacs/uptimes/metadata.xml2
-rw-r--r--app-emacs/vhdl-mode/metadata.xml2
-rw-r--r--app-emacs/visual-basic-mode/metadata.xml2
-rw-r--r--app-emacs/vm/metadata.xml2
-rw-r--r--app-emacs/volume/metadata.xml2
-rw-r--r--app-emacs/w3mnav/metadata.xml2
-rw-r--r--app-emacs/wanderlust/metadata.xml4
-rw-r--r--app-emacs/wgrep/metadata.xml2
-rw-r--r--app-emacs/whine/metadata.xml2
-rw-r--r--app-emacs/wikipedia-mode/metadata.xml2
-rw-r--r--app-emacs/xclip/metadata.xml2
-rw-r--r--app-emacs/xrdb-mode/metadata.xml2
-rw-r--r--app-emacs/xslide/metadata.xml2
-rw-r--r--app-emacs/yaml-mode/metadata.xml4
-rw-r--r--app-emacs/yasnippet/metadata.xml2
-rw-r--r--app-emacs/yatex/metadata.xml4
-rw-r--r--app-emacs/yc/metadata.xml4
-rw-r--r--app-emacs/zenburn/metadata.xml2
-rw-r--r--app-emacs/zenirc/metadata.xml2
189 files changed, 224 insertions, 224 deletions
diff --git a/app-emacs/actionscript-mode/metadata.xml b/app-emacs/actionscript-mode/metadata.xml
index 2e0acac81fb..1dcd3a6b397 100644
--- a/app-emacs/actionscript-mode/metadata.xml
+++ b/app-emacs/actionscript-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/analog/metadata.xml b/app-emacs/analog/metadata.xml
index 7d01ef42903..75ff7ea2e8b 100644
--- a/app-emacs/analog/metadata.xml
+++ b/app-emacs/analog/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/anything/metadata.xml b/app-emacs/anything/metadata.xml
index 7f63d8b229e..6a8646e51cf 100644
--- a/app-emacs/anything/metadata.xml
+++ b/app-emacs/anything/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/apache-mode/metadata.xml b/app-emacs/apache-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/apache-mode/metadata.xml
+++ b/app-emacs/apache-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/apel/metadata.xml b/app-emacs/apel/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/apel/metadata.xml
+++ b/app-emacs/apel/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/auctex/metadata.xml b/app-emacs/auctex/metadata.xml
index 2456a4998cc..11bb9aa805d 100644
--- a/app-emacs/auctex/metadata.xml
+++ b/app-emacs/auctex/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>tex@gentoo.org</email>
<name>Gentoo TeX Project</name>
</maintainer>
diff --git a/app-emacs/auto-complete/metadata.xml b/app-emacs/auto-complete/metadata.xml
index 46c40b7e866..1862bcbf4af 100644
--- a/app-emacs/auto-complete/metadata.xml
+++ b/app-emacs/auto-complete/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/autoconf-mode/metadata.xml b/app-emacs/autoconf-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/autoconf-mode/metadata.xml
+++ b/app-emacs/autoconf-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/bbdb/metadata.xml b/app-emacs/bbdb/metadata.xml
index 551404c7fd2..708b8be2a97 100644
--- a/app-emacs/bbdb/metadata.xml
+++ b/app-emacs/bbdb/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/binclock/metadata.xml b/app-emacs/binclock/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/binclock/metadata.xml
+++ b/app-emacs/binclock/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/bison-mode/metadata.xml b/app-emacs/bison-mode/metadata.xml
index 56ca2ca5439..5a32e20459d 100644
--- a/app-emacs/bison-mode/metadata.xml
+++ b/app-emacs/bison-mode/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>nicolasbock@gentoo.org</email>
<name>Nicolas Bock</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/blogmax/metadata.xml b/app-emacs/blogmax/metadata.xml
index 9cc274f6b23..c720df709fe 100644
--- a/app-emacs/blogmax/metadata.xml
+++ b/app-emacs/blogmax/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/bm/metadata.xml b/app-emacs/bm/metadata.xml
index 6a0b3ee13e4..70b0cfc64fe 100644
--- a/app-emacs/bm/metadata.xml
+++ b/app-emacs/bm/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/bongo/metadata.xml b/app-emacs/bongo/metadata.xml
index d4c63ed4521..62d35a3e9b9 100644
--- a/app-emacs/bongo/metadata.xml
+++ b/app-emacs/bongo/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/boxquote/metadata.xml b/app-emacs/boxquote/metadata.xml
index e4b5613ae14..2aea8e67022 100644
--- a/app-emacs/boxquote/metadata.xml
+++ b/app-emacs/boxquote/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/browse-kill-ring/metadata.xml b/app-emacs/browse-kill-ring/metadata.xml
index f4e37eb671b..33981880d36 100644
--- a/app-emacs/browse-kill-ring/metadata.xml
+++ b/app-emacs/browse-kill-ring/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/bubblet/metadata.xml b/app-emacs/bubblet/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/bubblet/metadata.xml
+++ b/app-emacs/bubblet/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/calfw/metadata.xml b/app-emacs/calfw/metadata.xml
index 3a7d30c6a66..5983e29c405 100644
--- a/app-emacs/calfw/metadata.xml
+++ b/app-emacs/calfw/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>naota@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/chess/metadata.xml b/app-emacs/chess/metadata.xml
index 03bb20e536e..18cedb8d12a 100644
--- a/app-emacs/chess/metadata.xml
+++ b/app-emacs/chess/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/circe/metadata.xml b/app-emacs/circe/metadata.xml
index d634a41cebd..5d438077dbe 100644
--- a/app-emacs/circe/metadata.xml
+++ b/app-emacs/circe/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/cldoc/metadata.xml b/app-emacs/cldoc/metadata.xml
index bed1925dc6f..6279cb8db26 100644
--- a/app-emacs/cldoc/metadata.xml
+++ b/app-emacs/cldoc/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>common-lisp@gentoo.org</email>
<name>Gentoo Common Lisp Project</name>
</maintainer>
diff --git a/app-emacs/cmail/metadata.xml b/app-emacs/cmail/metadata.xml
index bfd3609ad42..e344fa5cb45 100644
--- a/app-emacs/cmail/metadata.xml
+++ b/app-emacs/cmail/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/color-browser/metadata.xml b/app-emacs/color-browser/metadata.xml
index 6e35c7ee62a..63412515459 100644
--- a/app-emacs/color-browser/metadata.xml
+++ b/app-emacs/color-browser/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/color-moccur/metadata.xml b/app-emacs/color-moccur/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/color-moccur/metadata.xml
+++ b/app-emacs/color-moccur/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/color-theme/metadata.xml b/app-emacs/color-theme/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/color-theme/metadata.xml
+++ b/app-emacs/color-theme/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/company-mode/metadata.xml b/app-emacs/company-mode/metadata.xml
index b620c664ec4..13ad0d40414 100644
--- a/app-emacs/company-mode/metadata.xml
+++ b/app-emacs/company-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/crontab-mode/metadata.xml b/app-emacs/crontab-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/crontab-mode/metadata.xml
+++ b/app-emacs/crontab-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/crypt++/metadata.xml b/app-emacs/crypt++/metadata.xml
index 47f27bbc943..7e53bb1e629 100644
--- a/app-emacs/crypt++/metadata.xml
+++ b/app-emacs/crypt++/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/csharp-mode/metadata.xml b/app-emacs/csharp-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/csharp-mode/metadata.xml
+++ b/app-emacs/csharp-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/css-mode/metadata.xml b/app-emacs/css-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/css-mode/metadata.xml
+++ b/app-emacs/css-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/csv-mode/metadata.xml b/app-emacs/csv-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/csv-mode/metadata.xml
+++ b/app-emacs/csv-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/d-mode/metadata.xml b/app-emacs/d-mode/metadata.xml
index e7e16aa2502..b7b2787c679 100644
--- a/app-emacs/d-mode/metadata.xml
+++ b/app-emacs/d-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/dash/metadata.xml b/app-emacs/dash/metadata.xml
index 03f15560737..a05934eb09a 100644
--- a/app-emacs/dash/metadata.xml
+++ b/app-emacs/dash/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/ddskk/metadata.xml b/app-emacs/ddskk/metadata.xml
index 5040a8886ce..02fb2539160 100644
--- a/app-emacs/ddskk/metadata.xml
+++ b/app-emacs/ddskk/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
diff --git a/app-emacs/develock/metadata.xml b/app-emacs/develock/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/develock/metadata.xml
+++ b/app-emacs/develock/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/df-mode/metadata.xml b/app-emacs/df-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/df-mode/metadata.xml
+++ b/app-emacs/df-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/dictionary/metadata.xml b/app-emacs/dictionary/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/dictionary/metadata.xml
+++ b/app-emacs/dictionary/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/dircolors/metadata.xml b/app-emacs/dircolors/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/dircolors/metadata.xml
+++ b/app-emacs/dircolors/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/dired-sort-menu/metadata.xml b/app-emacs/dired-sort-menu/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/dired-sort-menu/metadata.xml
+++ b/app-emacs/dired-sort-menu/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/distel/metadata.xml b/app-emacs/distel/metadata.xml
index a32234bc7a6..ee26b8d8175 100644
--- a/app-emacs/distel/metadata.xml
+++ b/app-emacs/distel/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/doctest-mode/metadata.xml b/app-emacs/doctest-mode/metadata.xml
index 2c86c967630..622b523408c 100644
--- a/app-emacs/doctest-mode/metadata.xml
+++ b/app-emacs/doctest-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/doxymacs/metadata.xml b/app-emacs/doxymacs/metadata.xml
index 6d4554a0c05..767053e01dc 100644
--- a/app-emacs/doxymacs/metadata.xml
+++ b/app-emacs/doxymacs/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/dropdown-list/metadata.xml b/app-emacs/dropdown-list/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/dropdown-list/metadata.xml
+++ b/app-emacs/dropdown-list/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/dts-mode/metadata.xml b/app-emacs/dts-mode/metadata.xml
index 77c5ff22b4a..412ea6125d6 100644
--- a/app-emacs/dts-mode/metadata.xml
+++ b/app-emacs/dts-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/ebuild-mode/metadata.xml b/app-emacs/ebuild-mode/metadata.xml
index 7a5743cd65e..6a9a188fef8 100644
--- a/app-emacs/ebuild-mode/metadata.xml
+++ b/app-emacs/ebuild-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/ecb/metadata.xml b/app-emacs/ecb/metadata.xml
index 5e18c480d78..10126549936 100644
--- a/app-emacs/ecb/metadata.xml
+++ b/app-emacs/ecb/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/edb/metadata.xml b/app-emacs/edb/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/edb/metadata.xml
+++ b/app-emacs/edb/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/edit-list/metadata.xml b/app-emacs/edit-list/metadata.xml
index 4e1cc89c5d9..22ae043ed5c 100644
--- a/app-emacs/edit-list/metadata.xml
+++ b/app-emacs/edit-list/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/elib/metadata.xml b/app-emacs/elib/metadata.xml
index 0f7852c582d..efe172ba755 100644
--- a/app-emacs/elib/metadata.xml
+++ b/app-emacs/elib/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/elscreen/metadata.xml b/app-emacs/elscreen/metadata.xml
index cf4f2e881ac..bd731925af2 100644
--- a/app-emacs/elscreen/metadata.xml
+++ b/app-emacs/elscreen/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common-gentoo/metadata.xml
index 3825759908c..bbfc19723ba 100644
--- a/app-emacs/emacs-common-gentoo/metadata.xml
+++ b/app-emacs/emacs-common-gentoo/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/emacs-daemon/metadata.xml b/app-emacs/emacs-daemon/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/emacs-daemon/metadata.xml
+++ b/app-emacs/emacs-daemon/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/emacs-jabber/metadata.xml b/app-emacs/emacs-jabber/metadata.xml
index d79a82a8a93..dd077cadaa6 100644
--- a/app-emacs/emacs-jabber/metadata.xml
+++ b/app-emacs/emacs-jabber/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/emacs-w3m/metadata.xml b/app-emacs/emacs-w3m/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/emacs-w3m/metadata.xml
+++ b/app-emacs/emacs-w3m/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/emacs-wget/metadata.xml b/app-emacs/emacs-wget/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/emacs-wget/metadata.xml
+++ b/app-emacs/emacs-wget/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/emacs-wiki-blog/metadata.xml b/app-emacs/emacs-wiki-blog/metadata.xml
index 8951337df52..d5834644a6a 100644
--- a/app-emacs/emacs-wiki-blog/metadata.xml
+++ b/app-emacs/emacs-wiki-blog/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/emacs-wiki/metadata.xml b/app-emacs/emacs-wiki/metadata.xml
index 51376d5af1c..14a7c3026b7 100644
--- a/app-emacs/emacs-wiki/metadata.xml
+++ b/app-emacs/emacs-wiki/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/emhacks/metadata.xml b/app-emacs/emhacks/metadata.xml
index a2114ce5c30..17d3c9cfeb7 100644
--- a/app-emacs/emhacks/metadata.xml
+++ b/app-emacs/emhacks/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/emms/metadata.xml b/app-emacs/emms/metadata.xml
index 4316be3a5d7..f03f5834c35 100644
--- a/app-emacs/emms/metadata.xml
+++ b/app-emacs/emms/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/erobot/metadata.xml b/app-emacs/erobot/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/erobot/metadata.xml
+++ b/app-emacs/erobot/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/eselect-mode/metadata.xml b/app-emacs/eselect-mode/metadata.xml
index b7e7a1eeef3..32f51ce8ad4 100644
--- a/app-emacs/eselect-mode/metadata.xml
+++ b/app-emacs/eselect-mode/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>eselect@gentoo.org</email>
<name>eselect configuration and management tool</name>
</maintainer>
diff --git a/app-emacs/ess/metadata.xml b/app-emacs/ess/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/ess/metadata.xml
+++ b/app-emacs/ess/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/evil/metadata.xml b/app-emacs/evil/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/evil/metadata.xml
+++ b/app-emacs/evil/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/fff/metadata.xml b/app-emacs/fff/metadata.xml
index 1c29e297870..0f49c98586f 100644
--- a/app-emacs/fff/metadata.xml
+++ b/app-emacs/fff/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/filladapt/metadata.xml b/app-emacs/filladapt/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/filladapt/metadata.xml
+++ b/app-emacs/filladapt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/flashcard/metadata.xml b/app-emacs/flashcard/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/flashcard/metadata.xml
+++ b/app-emacs/flashcard/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/flim/metadata.xml b/app-emacs/flim/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/flim/metadata.xml
+++ b/app-emacs/flim/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/folding/metadata.xml b/app-emacs/folding/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/folding/metadata.xml
+++ b/app-emacs/folding/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/ghc-mod/metadata.xml b/app-emacs/ghc-mod/metadata.xml
index 9d114c30acf..b58399b6f39 100644
--- a/app-emacs/ghc-mod/metadata.xml
+++ b/app-emacs/ghc-mod/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
diff --git a/app-emacs/gnuplot-mode/metadata.xml b/app-emacs/gnuplot-mode/metadata.xml
index d263fd9cd27..12fb9a03374 100644
--- a/app-emacs/gnuplot-mode/metadata.xml
+++ b/app-emacs/gnuplot-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/gnuserv/metadata.xml b/app-emacs/gnuserv/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/gnuserv/metadata.xml
+++ b/app-emacs/gnuserv/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/google-c-style/metadata.xml b/app-emacs/google-c-style/metadata.xml
index 493d6df30e6..19f717d2078 100644
--- a/app-emacs/google-c-style/metadata.xml
+++ b/app-emacs/google-c-style/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>chromium@gentoo.org</email>
<name>Chromium in Gentoo Project</name>
</maintainer>
diff --git a/app-emacs/graphviz-dot-mode/metadata.xml b/app-emacs/graphviz-dot-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/graphviz-dot-mode/metadata.xml
+++ b/app-emacs/graphviz-dot-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/h4x0r/metadata.xml b/app-emacs/h4x0r/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/h4x0r/metadata.xml
+++ b/app-emacs/h4x0r/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/haskell-mode/metadata.xml b/app-emacs/haskell-mode/metadata.xml
index 00a2be873be..d954242debd 100644
--- a/app-emacs/haskell-mode/metadata.xml
+++ b/app-emacs/haskell-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/hexrgb/metadata.xml b/app-emacs/hexrgb/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/hexrgb/metadata.xml
+++ b/app-emacs/hexrgb/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/highline/metadata.xml b/app-emacs/highline/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/highline/metadata.xml
+++ b/app-emacs/highline/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/howm/metadata.xml b/app-emacs/howm/metadata.xml
index a4aa5f2412a..59cc3d83abd 100644
--- a/app-emacs/howm/metadata.xml
+++ b/app-emacs/howm/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/htmlize/metadata.xml b/app-emacs/htmlize/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/htmlize/metadata.xml
+++ b/app-emacs/htmlize/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/httpd/metadata.xml b/app-emacs/httpd/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/httpd/metadata.xml
+++ b/app-emacs/httpd/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/icicles/metadata.xml b/app-emacs/icicles/metadata.xml
index b28b15c5cbe..1c04dacad5e 100644
--- a/app-emacs/icicles/metadata.xml
+++ b/app-emacs/icicles/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/identica-mode/metadata.xml b/app-emacs/identica-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/identica-mode/metadata.xml
+++ b/app-emacs/identica-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/igrep/metadata.xml b/app-emacs/igrep/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/igrep/metadata.xml
+++ b/app-emacs/igrep/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/imaxima/metadata.xml b/app-emacs/imaxima/metadata.xml
index 1a7ea110cb7..0bc20375a5b 100644
--- a/app-emacs/imaxima/metadata.xml
+++ b/app-emacs/imaxima/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>sci-mathematics@gentoo.org</email>
<name>Gentoo Mathematics Project</name>
</maintainer>
diff --git a/app-emacs/inform-mode/metadata.xml b/app-emacs/inform-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/inform-mode/metadata.xml
+++ b/app-emacs/inform-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/initsplit/metadata.xml b/app-emacs/initsplit/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/initsplit/metadata.xml
+++ b/app-emacs/initsplit/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/jam-mode/metadata.xml b/app-emacs/jam-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/jam-mode/metadata.xml
+++ b/app-emacs/jam-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/jasmin/metadata.xml b/app-emacs/jasmin/metadata.xml
index e096066bd2e..7be94e65912 100644
--- a/app-emacs/jasmin/metadata.xml
+++ b/app-emacs/jasmin/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/javascript/metadata.xml b/app-emacs/javascript/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/javascript/metadata.xml
+++ b/app-emacs/javascript/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/jde/metadata.xml b/app-emacs/jde/metadata.xml
index a0bf777ce7a..3c127a28363 100644
--- a/app-emacs/jde/metadata.xml
+++ b/app-emacs/jde/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
diff --git a/app-emacs/keywiz/metadata.xml b/app-emacs/keywiz/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/keywiz/metadata.xml
+++ b/app-emacs/keywiz/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/limit/metadata.xml b/app-emacs/limit/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/limit/metadata.xml
+++ b/app-emacs/limit/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/lookup/metadata.xml b/app-emacs/lookup/metadata.xml
index 5040a8886ce..02fb2539160 100644
--- a/app-emacs/lookup/metadata.xml
+++ b/app-emacs/lookup/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
diff --git a/app-emacs/lua-mode/metadata.xml b/app-emacs/lua-mode/metadata.xml
index a2b3921954b..b50eb25f1fc 100644
--- a/app-emacs/lua-mode/metadata.xml
+++ b/app-emacs/lua-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/lyskom-elisp-client/metadata.xml b/app-emacs/lyskom-elisp-client/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/lyskom-elisp-client/metadata.xml
+++ b/app-emacs/lyskom-elisp-client/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/magit/metadata.xml b/app-emacs/magit/metadata.xml
index 90c8a318e33..e7019045770 100644
--- a/app-emacs/magit/metadata.xml
+++ b/app-emacs/magit/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/mailcrypt/metadata.xml b/app-emacs/mailcrypt/metadata.xml
index e1b80dff9e3..7c22580284e 100644
--- a/app-emacs/mailcrypt/metadata.xml
+++ b/app-emacs/mailcrypt/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/markdown-mode/metadata.xml b/app-emacs/markdown-mode/metadata.xml
index e8f3b49b5d7..a1f8471ff70 100644
--- a/app-emacs/markdown-mode/metadata.xml
+++ b/app-emacs/markdown-mode/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>naota@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/matlab/metadata.xml b/app-emacs/matlab/metadata.xml
index a4c0fe525ef..4afb8bb3429 100644
--- a/app-emacs/matlab/metadata.xml
+++ b/app-emacs/matlab/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/mcomplete/metadata.xml b/app-emacs/mcomplete/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/mcomplete/metadata.xml
+++ b/app-emacs/mcomplete/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/mediawiki/metadata.xml b/app-emacs/mediawiki/metadata.xml
index e1f3c3570ad..4fbcf9cfa04 100644
--- a/app-emacs/mediawiki/metadata.xml
+++ b/app-emacs/mediawiki/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/mew/metadata.xml b/app-emacs/mew/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/mew/metadata.xml
+++ b/app-emacs/mew/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/mic-paren/metadata.xml b/app-emacs/mic-paren/metadata.xml
index a1dd52c28c8..7f619807c89 100644
--- a/app-emacs/mic-paren/metadata.xml
+++ b/app-emacs/mic-paren/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/mldonkey/metadata.xml b/app-emacs/mldonkey/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/mldonkey/metadata.xml
+++ b/app-emacs/mldonkey/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/mmm-mode/metadata.xml b/app-emacs/mmm-mode/metadata.xml
index 22031cb5d67..2e57a2dea1a 100644
--- a/app-emacs/mmm-mode/metadata.xml
+++ b/app-emacs/mmm-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/moccur-edit/metadata.xml b/app-emacs/moccur-edit/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/moccur-edit/metadata.xml
+++ b/app-emacs/moccur-edit/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/mode-compile/metadata.xml b/app-emacs/mode-compile/metadata.xml
index 88f968e5fe5..ee8fe455a3d 100644
--- a/app-emacs/mode-compile/metadata.xml
+++ b/app-emacs/mode-compile/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/mpg123-el/metadata.xml b/app-emacs/mpg123-el/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/mpg123-el/metadata.xml
+++ b/app-emacs/mpg123-el/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/mu-cite/metadata.xml b/app-emacs/mu-cite/metadata.xml
index 5040a8886ce..02fb2539160 100644
--- a/app-emacs/mu-cite/metadata.xml
+++ b/app-emacs/mu-cite/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
diff --git a/app-emacs/multi-term/metadata.xml b/app-emacs/multi-term/metadata.xml
index 006dd03698a..e492d3cccc2 100644
--- a/app-emacs/multi-term/metadata.xml
+++ b/app-emacs/multi-term/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>mjo@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/multiple-cursors/metadata.xml b/app-emacs/multiple-cursors/metadata.xml
index 3c1551c445c..cde5410234c 100644
--- a/app-emacs/multiple-cursors/metadata.xml
+++ b/app-emacs/multiple-cursors/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/muse/metadata.xml b/app-emacs/muse/metadata.xml
index d70dd6cbd1a..52d46b795be 100644
--- a/app-emacs/muse/metadata.xml
+++ b/app-emacs/muse/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/nagios-mode/metadata.xml b/app-emacs/nagios-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/nagios-mode/metadata.xml
+++ b/app-emacs/nagios-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/navi2ch/metadata.xml b/app-emacs/navi2ch/metadata.xml
index 78964ec687f..8a18acf7a88 100644
--- a/app-emacs/navi2ch/metadata.xml
+++ b/app-emacs/navi2ch/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
diff --git a/app-emacs/nxml-docbook5-schemas/metadata.xml b/app-emacs/nxml-docbook5-schemas/metadata.xml
index b0f74dbff2b..6c33d71056d 100644
--- a/app-emacs/nxml-docbook5-schemas/metadata.xml
+++ b/app-emacs/nxml-docbook5-schemas/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/nxml-gentoo-schemas/metadata.xml b/app-emacs/nxml-gentoo-schemas/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/nxml-gentoo-schemas/metadata.xml
+++ b/app-emacs/nxml-gentoo-schemas/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/nxml-libvirt-schemas/metadata.xml b/app-emacs/nxml-libvirt-schemas/metadata.xml
index 42f6ade928f..714ae1ccebc 100644
--- a/app-emacs/nxml-libvirt-schemas/metadata.xml
+++ b/app-emacs/nxml-libvirt-schemas/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>
+<maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>virtualization@gentoo.org</email>
<name>Gentoo Virtualization Project</name>
</maintainer>
diff --git a/app-emacs/nxml-svg-schemas/metadata.xml b/app-emacs/nxml-svg-schemas/metadata.xml
index b0f74dbff2b..6c33d71056d 100644
--- a/app-emacs/nxml-svg-schemas/metadata.xml
+++ b/app-emacs/nxml-svg-schemas/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/ocaml-mode/metadata.xml b/app-emacs/ocaml-mode/metadata.xml
index 4f645e55309..bceba643d16 100644
--- a/app-emacs/ocaml-mode/metadata.xml
+++ b/app-emacs/ocaml-mode/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>ml@gentoo.org</email>
<name>Gentoo ML Project</name>
</maintainer>
diff --git a/app-emacs/org-mode/metadata.xml b/app-emacs/org-mode/metadata.xml
index 4f10031057a..904f96ea69d 100644
--- a/app-emacs/org-mode/metadata.xml
+++ b/app-emacs/org-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/outline-magic/metadata.xml b/app-emacs/outline-magic/metadata.xml
index 71c6993f4c3..ec67b28b130 100644
--- a/app-emacs/outline-magic/metadata.xml
+++ b/app-emacs/outline-magic/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/paredit/metadata.xml b/app-emacs/paredit/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/paredit/metadata.xml
+++ b/app-emacs/paredit/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/php-mode/metadata.xml b/app-emacs/php-mode/metadata.xml
index c874778b42f..4dcb05622a8 100644
--- a/app-emacs/php-mode/metadata.xml
+++ b/app-emacs/php-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/planner/metadata.xml b/app-emacs/planner/metadata.xml
index 323c4d2bc02..838757fbbbe 100644
--- a/app-emacs/planner/metadata.xml
+++ b/app-emacs/planner/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/po-mode/metadata.xml b/app-emacs/po-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/po-mode/metadata.xml
+++ b/app-emacs/po-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/popwin/metadata.xml b/app-emacs/popwin/metadata.xml
index 6178f5c36c6..b25c3391ea6 100644
--- a/app-emacs/popwin/metadata.xml
+++ b/app-emacs/popwin/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>naota@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/pov-mode/metadata.xml b/app-emacs/pov-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/pov-mode/metadata.xml
+++ b/app-emacs/pov-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/prom-wl/metadata.xml b/app-emacs/prom-wl/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/prom-wl/metadata.xml
+++ b/app-emacs/prom-wl/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/proofgeneral/metadata.xml b/app-emacs/proofgeneral/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/proofgeneral/metadata.xml
+++ b/app-emacs/proofgeneral/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/protbuf/metadata.xml b/app-emacs/protbuf/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/protbuf/metadata.xml
+++ b/app-emacs/protbuf/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/psgml/metadata.xml b/app-emacs/psgml/metadata.xml
index 87c00028986..bbd4e3fe256 100644
--- a/app-emacs/psgml/metadata.xml
+++ b/app-emacs/psgml/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml
index 26e975a3a7c..f928f5ea6cd 100644
--- a/app-emacs/pymacs/metadata.xml
+++ b/app-emacs/pymacs/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>python@gentoo.org</email>
<name>Python</name>
</maintainer>
diff --git a/app-emacs/python-mode/metadata.xml b/app-emacs/python-mode/metadata.xml
index 81c665a3f06..083ead7fa21 100644
--- a/app-emacs/python-mode/metadata.xml
+++ b/app-emacs/python-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/quack/metadata.xml b/app-emacs/quack/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/quack/metadata.xml
+++ b/app-emacs/quack/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/quilt-el/metadata.xml b/app-emacs/quilt-el/metadata.xml
index e8fef63a5b4..6fbfa0c5b44 100644
--- a/app-emacs/quilt-el/metadata.xml
+++ b/app-emacs/quilt-el/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/qwerty/metadata.xml b/app-emacs/qwerty/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/qwerty/metadata.xml
+++ b/app-emacs/qwerty/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/redo+/metadata.xml b/app-emacs/redo+/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/redo+/metadata.xml
+++ b/app-emacs/redo+/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/regress/metadata.xml b/app-emacs/regress/metadata.xml
index 68505ec6808..1f0f9b74e5b 100644
--- a/app-emacs/regress/metadata.xml
+++ b/app-emacs/regress/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/remember/metadata.xml b/app-emacs/remember/metadata.xml
index dc970bbf267..84b2f845a8f 100644
--- a/app-emacs/remember/metadata.xml
+++ b/app-emacs/remember/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/rfcview/metadata.xml b/app-emacs/rfcview/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/rfcview/metadata.xml
+++ b/app-emacs/rfcview/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/riece/metadata.xml b/app-emacs/riece/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/riece/metadata.xml
+++ b/app-emacs/riece/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/rnc-mode/metadata.xml b/app-emacs/rnc-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/rnc-mode/metadata.xml
+++ b/app-emacs/rnc-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/rpm-spec-mode/metadata.xml b/app-emacs/rpm-spec-mode/metadata.xml
index 39589e3df8b..8564839a2d8 100644
--- a/app-emacs/rpm-spec-mode/metadata.xml
+++ b/app-emacs/rpm-spec-mode/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>sochotnicky@gentoo.org</email>
<name>Stanislav Ochotnicky</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/ruby-mode/metadata.xml b/app-emacs/ruby-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/ruby-mode/metadata.xml
+++ b/app-emacs/ruby-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/rudel/metadata.xml b/app-emacs/rudel/metadata.xml
index f3cbec8ebc2..8ce7af55dc2 100644
--- a/app-emacs/rudel/metadata.xml
+++ b/app-emacs/rudel/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/rust-mode/metadata.xml b/app-emacs/rust-mode/metadata.xml
index 8901c22a753..05304c240a3 100644
--- a/app-emacs/rust-mode/metadata.xml
+++ b/app-emacs/rust-mode/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>jauhien@gentoo.org</email>
<name>Jauhien Piatlicki</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/scala-mode/metadata.xml b/app-emacs/scala-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/scala-mode/metadata.xml
+++ b/app-emacs/scala-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/scheme-complete/metadata.xml b/app-emacs/scheme-complete/metadata.xml
index 43a0838f703..a98d102df2a 100644
--- a/app-emacs/scheme-complete/metadata.xml
+++ b/app-emacs/scheme-complete/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/scim-bridge-el/metadata.xml b/app-emacs/scim-bridge-el/metadata.xml
index e4bdcb750b3..181793e3c68 100644
--- a/app-emacs/scim-bridge-el/metadata.xml
+++ b/app-emacs/scim-bridge-el/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>heroxbd@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/scss-mode/metadata.xml b/app-emacs/scss-mode/metadata.xml
index 51de88f313b..3a41c1521c4 100644
--- a/app-emacs/scss-mode/metadata.xml
+++ b/app-emacs/scss-mode/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/semi/metadata.xml b/app-emacs/semi/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/semi/metadata.xml
+++ b/app-emacs/semi/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/session/metadata.xml b/app-emacs/session/metadata.xml
index 9edf7895555..a94e0e50d43 100644
--- a/app-emacs/session/metadata.xml
+++ b/app-emacs/session/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/setnu/metadata.xml b/app-emacs/setnu/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/setnu/metadata.xml
+++ b/app-emacs/setnu/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/slime/metadata.xml b/app-emacs/slime/metadata.xml
index 863b9973653..17cb00f777c 100644
--- a/app-emacs/slime/metadata.xml
+++ b/app-emacs/slime/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>common-lisp@gentoo.org</email>
<name>Gentoo Common Lisp Project</name>
</maintainer>
diff --git a/app-emacs/sml-mode/metadata.xml b/app-emacs/sml-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/sml-mode/metadata.xml
+++ b/app-emacs/sml-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/sokoban/metadata.xml b/app-emacs/sokoban/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/sokoban/metadata.xml
+++ b/app-emacs/sokoban/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/ssh/metadata.xml b/app-emacs/ssh/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/ssh/metadata.xml
+++ b/app-emacs/ssh/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/stripes/metadata.xml b/app-emacs/stripes/metadata.xml
index a4059ed3801..9c049f635b1 100644
--- a/app-emacs/stripes/metadata.xml
+++ b/app-emacs/stripes/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/sumibi/metadata.xml b/app-emacs/sumibi/metadata.xml
index b463054f76d..60035a3c641 100644
--- a/app-emacs/sumibi/metadata.xml
+++ b/app-emacs/sumibi/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
diff --git a/app-emacs/tdtd/metadata.xml b/app-emacs/tdtd/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/tdtd/metadata.xml
+++ b/app-emacs/tdtd/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/teco/metadata.xml b/app-emacs/teco/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/teco/metadata.xml
+++ b/app-emacs/teco/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/template/metadata.xml b/app-emacs/template/metadata.xml
index fc40138f3df..ab35afb4a69 100644
--- a/app-emacs/template/metadata.xml
+++ b/app-emacs/template/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/tempo-snippets/metadata.xml b/app-emacs/tempo-snippets/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/tempo-snippets/metadata.xml
+++ b/app-emacs/tempo-snippets/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/thinks/metadata.xml b/app-emacs/thinks/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/thinks/metadata.xml
+++ b/app-emacs/thinks/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/thumbs/metadata.xml b/app-emacs/thumbs/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/thumbs/metadata.xml
+++ b/app-emacs/thumbs/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/tuareg-mode/metadata.xml b/app-emacs/tuareg-mode/metadata.xml
index 1597a6098f5..94a035d240c 100644
--- a/app-emacs/tuareg-mode/metadata.xml
+++ b/app-emacs/tuareg-mode/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>ml@gentoo.org</email>
<name>Gentoo ML Project</name>
</maintainer>
diff --git a/app-emacs/twittering-mode/metadata.xml b/app-emacs/twittering-mode/metadata.xml
index 4e34b67ba89..a81a6bc51bb 100644
--- a/app-emacs/twittering-mode/metadata.xml
+++ b/app-emacs/twittering-mode/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>naota@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/typing/metadata.xml b/app-emacs/typing/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/typing/metadata.xml
+++ b/app-emacs/typing/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/uboat/metadata.xml b/app-emacs/uboat/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/uboat/metadata.xml
+++ b/app-emacs/uboat/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/undo-tree/metadata.xml b/app-emacs/undo-tree/metadata.xml
index 49088e772b0..00e0267703e 100644
--- a/app-emacs/undo-tree/metadata.xml
+++ b/app-emacs/undo-tree/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>tomka@gentoo.org</email>
<name>Thomas Kahle</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/uptimes/metadata.xml b/app-emacs/uptimes/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/uptimes/metadata.xml
+++ b/app-emacs/uptimes/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/vhdl-mode/metadata.xml b/app-emacs/vhdl-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/vhdl-mode/metadata.xml
+++ b/app-emacs/vhdl-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/visual-basic-mode/metadata.xml b/app-emacs/visual-basic-mode/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/visual-basic-mode/metadata.xml
+++ b/app-emacs/visual-basic-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/vm/metadata.xml b/app-emacs/vm/metadata.xml
index 427c9f4ff22..3fd3c5b75b2 100644
--- a/app-emacs/vm/metadata.xml
+++ b/app-emacs/vm/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/volume/metadata.xml b/app-emacs/volume/metadata.xml
index 615a647ffe1..615f9292795 100644
--- a/app-emacs/volume/metadata.xml
+++ b/app-emacs/volume/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/w3mnav/metadata.xml b/app-emacs/w3mnav/metadata.xml
index bed0dff059f..3d6712d0944 100644
--- a/app-emacs/w3mnav/metadata.xml
+++ b/app-emacs/w3mnav/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/wanderlust/metadata.xml b/app-emacs/wanderlust/metadata.xml
index adc3998abe7..cb0cc3c0537 100644
--- a/app-emacs/wanderlust/metadata.xml
+++ b/app-emacs/wanderlust/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>net-mail@gentoo.org</email>
<name>Net-Mail</name>
</maintainer>
diff --git a/app-emacs/wgrep/metadata.xml b/app-emacs/wgrep/metadata.xml
index 23b119c5563..e1b9fc648b3 100644
--- a/app-emacs/wgrep/metadata.xml
+++ b/app-emacs/wgrep/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/whine/metadata.xml b/app-emacs/whine/metadata.xml
index ff0a5a3fc26..f8acdd6d018 100644
--- a/app-emacs/whine/metadata.xml
+++ b/app-emacs/whine/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/wikipedia-mode/metadata.xml b/app-emacs/wikipedia-mode/metadata.xml
index 0c402df0ea8..ad4e752e4f1 100644
--- a/app-emacs/wikipedia-mode/metadata.xml
+++ b/app-emacs/wikipedia-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/xclip/metadata.xml b/app-emacs/xclip/metadata.xml
index 9daa11a4ea2..c438baf3b32 100644
--- a/app-emacs/xclip/metadata.xml
+++ b/app-emacs/xclip/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/xrdb-mode/metadata.xml b/app-emacs/xrdb-mode/metadata.xml
index 600ffcb21c8..875c4560c5c 100644
--- a/app-emacs/xrdb-mode/metadata.xml
+++ b/app-emacs/xrdb-mode/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/xslide/metadata.xml b/app-emacs/xslide/metadata.xml
index f5b58ef0c90..ce8cec5bf5e 100644
--- a/app-emacs/xslide/metadata.xml
+++ b/app-emacs/xslide/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/yaml-mode/metadata.xml b/app-emacs/yaml-mode/metadata.xml
index 884f5ed8cd3..06d8acdc946 100644
--- a/app-emacs/yaml-mode/metadata.xml
+++ b/app-emacs/yaml-mode/metadata.xml
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="person">
<email>flameeyes@gentoo.org</email>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/yasnippet/metadata.xml b/app-emacs/yasnippet/metadata.xml
index d32e0a543a3..3ae6c22024b 100644
--- a/app-emacs/yasnippet/metadata.xml
+++ b/app-emacs/yasnippet/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/yatex/metadata.xml b/app-emacs/yatex/metadata.xml
index 8dccdd3f7db..3e07a075145 100644
--- a/app-emacs/yatex/metadata.xml
+++ b/app-emacs/yatex/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
diff --git a/app-emacs/yc/metadata.xml b/app-emacs/yc/metadata.xml
index 5040a8886ce..02fb2539160 100644
--- a/app-emacs/yc/metadata.xml
+++ b/app-emacs/yc/metadata.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
-<maintainer>
+<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
diff --git a/app-emacs/zenburn/metadata.xml b/app-emacs/zenburn/metadata.xml
index 801c33d8cf9..474f44a915b 100644
--- a/app-emacs/zenburn/metadata.xml
+++ b/app-emacs/zenburn/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>
diff --git a/app-emacs/zenirc/metadata.xml b/app-emacs/zenirc/metadata.xml
index 4de747e5684..a2acb155d1a 100644
--- a/app-emacs/zenirc/metadata.xml
+++ b/app-emacs/zenirc/metadata.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer>
+<maintainer type="project">
<email>gnu-emacs@gentoo.org</email>
<name>Gentoo GNU Emacs project</name>
</maintainer>