summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app-emacs')
-rw-r--r--app-emacs/actionscript-mode/metadata.xml5
-rw-r--r--app-emacs/analog/metadata.xml5
-rw-r--r--app-emacs/anything/metadata.xml5
-rw-r--r--app-emacs/apache-mode/metadata.xml5
-rw-r--r--app-emacs/apel/metadata.xml5
-rw-r--r--app-emacs/auctex/metadata.xml5
-rw-r--r--app-emacs/auto-complete/metadata.xml5
-rw-r--r--app-emacs/autoconf-mode/metadata.xml5
-rw-r--r--app-emacs/bbdb/metadata.xml25
-rw-r--r--app-emacs/binclock/metadata.xml5
-rw-r--r--app-emacs/bison-mode/metadata.xml5
-rw-r--r--app-emacs/blogmax/metadata.xml7
-rw-r--r--app-emacs/bm/metadata.xml5
-rw-r--r--app-emacs/bongo/metadata.xml5
-rw-r--r--app-emacs/boxquote/metadata.xml5
-rw-r--r--app-emacs/browse-kill-ring/metadata.xml7
-rw-r--r--app-emacs/bubblet/metadata.xml5
-rw-r--r--app-emacs/calfw/metadata.xml5
-rw-r--r--app-emacs/chess/metadata.xml5
-rw-r--r--app-emacs/circe/metadata.xml5
-rw-r--r--app-emacs/cldoc/metadata.xml17
-rw-r--r--app-emacs/cmail/metadata.xml5
-rw-r--r--app-emacs/color-browser/metadata.xml5
-rw-r--r--app-emacs/color-moccur/metadata.xml5
-rw-r--r--app-emacs/color-theme/metadata.xml5
-rw-r--r--app-emacs/company-mode/metadata.xml5
-rw-r--r--app-emacs/crontab-mode/metadata.xml5
-rw-r--r--app-emacs/crypt++/metadata.xml5
-rw-r--r--app-emacs/csharp-mode/metadata.xml5
-rw-r--r--app-emacs/css-mode/metadata.xml5
-rw-r--r--app-emacs/csv-mode/metadata.xml5
-rw-r--r--app-emacs/d-mode/metadata.xml5
-rw-r--r--app-emacs/dash/metadata.xml13
-rw-r--r--app-emacs/ddskk/metadata.xml5
-rw-r--r--app-emacs/develock/metadata.xml5
-rw-r--r--app-emacs/df-mode/metadata.xml5
-rw-r--r--app-emacs/dictionary/metadata.xml5
-rw-r--r--app-emacs/dircolors/metadata.xml5
-rw-r--r--app-emacs/dired-sort-menu/metadata.xml5
-rw-r--r--app-emacs/distel/metadata.xml5
-rw-r--r--app-emacs/doctest-mode/metadata.xml13
-rw-r--r--app-emacs/doxymacs/metadata.xml5
-rw-r--r--app-emacs/dropdown-list/metadata.xml5
-rw-r--r--app-emacs/dts-mode/metadata.xml5
-rw-r--r--app-emacs/ebuild-mode/metadata.xml5
-rw-r--r--app-emacs/ecb/metadata.xml17
-rw-r--r--app-emacs/edb/metadata.xml5
-rw-r--r--app-emacs/edit-list/metadata.xml5
-rw-r--r--app-emacs/elib/metadata.xml13
-rw-r--r--app-emacs/elscreen/metadata.xml5
-rw-r--r--app-emacs/emacs-common-gentoo/metadata.xml5
-rw-r--r--app-emacs/emacs-daemon/metadata.xml5
-rw-r--r--app-emacs/emacs-jabber/metadata.xml5
-rw-r--r--app-emacs/emacs-w3m/metadata.xml5
-rw-r--r--app-emacs/emacs-wget/metadata.xml5
-rw-r--r--app-emacs/emacs-wiki-blog/metadata.xml5
-rw-r--r--app-emacs/emacs-wiki/metadata.xml27
-rw-r--r--app-emacs/emhacks/metadata.xml23
-rw-r--r--app-emacs/emms/metadata.xml5
-rw-r--r--app-emacs/erobot/metadata.xml5
-rw-r--r--app-emacs/eselect-mode/metadata.xml5
-rw-r--r--app-emacs/ess/metadata.xml5
-rw-r--r--app-emacs/evil/metadata.xml7
-rw-r--r--app-emacs/fff/metadata.xml5
-rw-r--r--app-emacs/filladapt/metadata.xml5
-rw-r--r--app-emacs/flashcard/metadata.xml5
-rw-r--r--app-emacs/flim/metadata.xml5
-rw-r--r--app-emacs/folding/metadata.xml5
-rw-r--r--app-emacs/ghc-mod/metadata.xml24
-rw-r--r--app-emacs/gnuplot-mode/metadata.xml5
-rw-r--r--app-emacs/gnuserv/metadata.xml5
-rw-r--r--app-emacs/google-c-style/metadata.xml13
-rw-r--r--app-emacs/graphviz-dot-mode/metadata.xml5
-rw-r--r--app-emacs/h4x0r/metadata.xml5
-rw-r--r--app-emacs/haskell-mode/metadata.xml5
-rw-r--r--app-emacs/hexrgb/metadata.xml5
-rw-r--r--app-emacs/highline/metadata.xml5
-rw-r--r--app-emacs/howm/metadata.xml13
-rw-r--r--app-emacs/htmlize/metadata.xml5
-rw-r--r--app-emacs/httpd/metadata.xml5
-rw-r--r--app-emacs/icicles/metadata.xml5
-rw-r--r--app-emacs/identica-mode/metadata.xml5
-rw-r--r--app-emacs/igrep/metadata.xml5
-rw-r--r--app-emacs/imaxima/metadata.xml5
-rw-r--r--app-emacs/inform-mode/metadata.xml5
-rw-r--r--app-emacs/initsplit/metadata.xml5
-rw-r--r--app-emacs/jam-mode/metadata.xml5
-rw-r--r--app-emacs/jasmin/metadata.xml13
-rw-r--r--app-emacs/javascript/metadata.xml5
-rw-r--r--app-emacs/jde/metadata.xml29
-rw-r--r--app-emacs/keywiz/metadata.xml5
-rw-r--r--app-emacs/limit/metadata.xml5
-rw-r--r--app-emacs/lookup/metadata.xml5
-rw-r--r--app-emacs/lua-mode/metadata.xml5
-rw-r--r--app-emacs/lyskom-elisp-client/metadata.xml5
-rw-r--r--app-emacs/magit/metadata.xml5
-rw-r--r--app-emacs/mailcrypt/metadata.xml5
-rw-r--r--app-emacs/markdown-mode/metadata.xml5
-rw-r--r--app-emacs/matlab/metadata.xml13
-rw-r--r--app-emacs/mcomplete/metadata.xml5
-rw-r--r--app-emacs/mediawiki/metadata.xml5
-rw-r--r--app-emacs/mew/metadata.xml5
-rw-r--r--app-emacs/mic-paren/metadata.xml5
-rw-r--r--app-emacs/mldonkey/metadata.xml5
-rw-r--r--app-emacs/mmm-mode/metadata.xml15
-rw-r--r--app-emacs/moccur-edit/metadata.xml5
-rw-r--r--app-emacs/mode-compile/metadata.xml5
-rw-r--r--app-emacs/mpg123-el/metadata.xml5
-rw-r--r--app-emacs/mu-cite/metadata.xml5
-rw-r--r--app-emacs/multi-term/metadata.xml7
-rw-r--r--app-emacs/multiple-cursors/metadata.xml5
-rw-r--r--app-emacs/muse/metadata.xml45
-rw-r--r--app-emacs/nagios-mode/metadata.xml5
-rw-r--r--app-emacs/navi2ch/metadata.xml5
-rw-r--r--app-emacs/nxml-docbook5-schemas/metadata.xml5
-rw-r--r--app-emacs/nxml-gentoo-schemas/metadata.xml5
-rw-r--r--app-emacs/nxml-libvirt-schemas/metadata.xml7
-rw-r--r--app-emacs/nxml-svg-schemas/metadata.xml5
-rw-r--r--app-emacs/ocaml-mode/metadata.xml7
-rw-r--r--app-emacs/org-mode/metadata.xml5
-rw-r--r--app-emacs/outline-magic/metadata.xml5
-rw-r--r--app-emacs/paredit/metadata.xml5
-rw-r--r--app-emacs/php-mode/metadata.xml5
-rw-r--r--app-emacs/planner/metadata.xml13
-rw-r--r--app-emacs/po-mode/metadata.xml5
-rw-r--r--app-emacs/popwin/metadata.xml5
-rw-r--r--app-emacs/pov-mode/metadata.xml7
-rw-r--r--app-emacs/prom-wl/metadata.xml5
-rw-r--r--app-emacs/proofgeneral/metadata.xml5
-rw-r--r--app-emacs/protbuf/metadata.xml5
-rw-r--r--app-emacs/psgml/metadata.xml13
-rw-r--r--app-emacs/pymacs/metadata.xml13
-rw-r--r--app-emacs/python-mode/metadata.xml5
-rw-r--r--app-emacs/quack/metadata.xml5
-rw-r--r--app-emacs/quilt-el/metadata.xml5
-rw-r--r--app-emacs/qwerty/metadata.xml5
-rw-r--r--app-emacs/redo+/metadata.xml5
-rw-r--r--app-emacs/regress/metadata.xml9
-rw-r--r--app-emacs/remember/metadata.xml5
-rw-r--r--app-emacs/rfcview/metadata.xml5
-rw-r--r--app-emacs/riece/metadata.xml7
-rw-r--r--app-emacs/rnc-mode/metadata.xml5
-rw-r--r--app-emacs/rpm-spec-mode/metadata.xml5
-rw-r--r--app-emacs/ruby-mode/metadata.xml5
-rw-r--r--app-emacs/rudel/metadata.xml17
-rw-r--r--app-emacs/rust-mode/metadata.xml13
-rw-r--r--app-emacs/scala-mode/metadata.xml5
-rw-r--r--app-emacs/scheme-complete/metadata.xml5
-rw-r--r--app-emacs/scim-bridge-el/metadata.xml5
-rw-r--r--app-emacs/scss-mode/metadata.xml5
-rw-r--r--app-emacs/semi/metadata.xml5
-rw-r--r--app-emacs/session/metadata.xml5
-rw-r--r--app-emacs/setnu/metadata.xml5
-rw-r--r--app-emacs/slime/metadata.xml5
-rw-r--r--app-emacs/sml-mode/metadata.xml5
-rw-r--r--app-emacs/sokoban/metadata.xml5
-rw-r--r--app-emacs/ssh/metadata.xml5
-rw-r--r--app-emacs/stripes/metadata.xml11
-rw-r--r--app-emacs/sumibi/metadata.xml5
-rw-r--r--app-emacs/tdtd/metadata.xml5
-rw-r--r--app-emacs/teco/metadata.xml5
-rw-r--r--app-emacs/template/metadata.xml5
-rw-r--r--app-emacs/tempo-snippets/metadata.xml5
-rw-r--r--app-emacs/thinks/metadata.xml5
-rw-r--r--app-emacs/thumbs/metadata.xml5
-rw-r--r--app-emacs/tuareg-mode/metadata.xml5
-rw-r--r--app-emacs/twittering-mode/metadata.xml5
-rw-r--r--app-emacs/typing/metadata.xml5
-rw-r--r--app-emacs/uboat/metadata.xml5
-rw-r--r--app-emacs/undo-tree/metadata.xml5
-rw-r--r--app-emacs/uptimes/metadata.xml5
-rw-r--r--app-emacs/vhdl-mode/metadata.xml5
-rw-r--r--app-emacs/visual-basic-mode/metadata.xml5
-rw-r--r--app-emacs/vm/metadata.xml5
-rw-r--r--app-emacs/volume/metadata.xml5
-rw-r--r--app-emacs/w3mnav/metadata.xml16
-rw-r--r--app-emacs/wanderlust/metadata.xml5
-rw-r--r--app-emacs/wgrep/metadata.xml5
-rw-r--r--app-emacs/whine/metadata.xml5
-rw-r--r--app-emacs/wikipedia-mode/metadata.xml5
-rw-r--r--app-emacs/xclip/metadata.xml5
-rw-r--r--app-emacs/xrdb-mode/metadata.xml5
-rw-r--r--app-emacs/xslide/metadata.xml5
-rw-r--r--app-emacs/yaml-mode/metadata.xml5
-rw-r--r--app-emacs/yasnippet/metadata.xml19
-rw-r--r--app-emacs/yatex/metadata.xml5
-rw-r--r--app-emacs/yc/metadata.xml5
-rw-r--r--app-emacs/zenburn/metadata.xml5
-rw-r--r--app-emacs/zenirc/metadata.xml5
189 files changed, 920 insertions, 353 deletions
diff --git a/app-emacs/actionscript-mode/metadata.xml b/app-emacs/actionscript-mode/metadata.xml
index e6ac0b24adb7..2e0acac81fbd 100644
--- a/app-emacs/actionscript-mode/metadata.xml
+++ b/app-emacs/actionscript-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">austinhaas/actionscript-mode</remote-id>
</upstream>
diff --git a/app-emacs/analog/metadata.xml b/app-emacs/analog/metadata.xml
index a055ee9b776d..7d01ef42903e 100644
--- a/app-emacs/analog/metadata.xml
+++ b/app-emacs/analog/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Emacs mode to monitor lists of files or command output.
diff --git a/app-emacs/anything/metadata.xml b/app-emacs/anything/metadata.xml
index 1574e79ead43..5abd82fad5cb 100644
--- a/app-emacs/anything/metadata.xml
+++ b/app-emacs/anything/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<use>
<flag name='extensions'>Install optional extensions</flag>
</use>
diff --git a/app-emacs/apache-mode/metadata.xml b/app-emacs/apache-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/apache-mode/metadata.xml
+++ b/app-emacs/apache-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/apel/metadata.xml b/app-emacs/apel/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/apel/metadata.xml
+++ b/app-emacs/apel/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/auctex/metadata.xml b/app-emacs/auctex/metadata.xml
index f36206c93577..5376b5c38754 100644
--- a/app-emacs/auctex/metadata.xml
+++ b/app-emacs/auctex/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>tex</herd>
<longdescription>
AUCTeX is an extensible package for writing and formatting TeX files
diff --git a/app-emacs/auto-complete/metadata.xml b/app-emacs/auto-complete/metadata.xml
index 8ad6abfbb6ee..46c40b7e8661 100644
--- a/app-emacs/auto-complete/metadata.xml
+++ b/app-emacs/auto-complete/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">m2ym/auto-complete</remote-id>
</upstream>
diff --git a/app-emacs/autoconf-mode/metadata.xml b/app-emacs/autoconf-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/autoconf-mode/metadata.xml
+++ b/app-emacs/autoconf-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/bbdb/metadata.xml b/app-emacs/bbdb/metadata.xml
index a71dd9eb2fad..551404c7fd2d 100644
--- a/app-emacs/bbdb/metadata.xml
+++ b/app-emacs/bbdb/metadata.xml
@@ -1,17 +1,20 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <longdescription>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
The Insidious Big Brother Database (BBDB) is a contact management utility
for use with GNU Emacs and XEmacs. It can hook into Emacs-based mail- and
news-readers and automatically collect information on messages therein.
- </longdescription>
- <use>
- <flag name="tex">Install plain TeX support files</flag>
- <flag name="vm">Add support for <pkg>app-emacs/vm</pkg></flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">bbdb</remote-id>
- </upstream>
+</longdescription>
+<use>
+ <flag name="tex">Install plain TeX support files</flag>
+ <flag name="vm">Add support for <pkg>app-emacs/vm</pkg></flag>
+</use>
+<upstream>
+ <remote-id type="sourceforge">bbdb</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/binclock/metadata.xml b/app-emacs/binclock/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/binclock/metadata.xml
+++ b/app-emacs/binclock/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/bison-mode/metadata.xml b/app-emacs/bison-mode/metadata.xml
index 485301c7a4ab..56ca2ca54395 100644
--- a/app-emacs/bison-mode/metadata.xml
+++ b/app-emacs/bison-mode/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>nicolasbock@gentoo.org</email>
<name>Nicolas Bock</name>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">Wilfred/bison-mode</remote-id>
</upstream>
diff --git a/app-emacs/blogmax/metadata.xml b/app-emacs/blogmax/metadata.xml
index 152470076db1..9cc274f6b23a 100644
--- a/app-emacs/blogmax/metadata.xml
+++ b/app-emacs/blogmax/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-BlogMax is an Emacs package that aids in the creation of a weblog.
+ BlogMax is an Emacs package that aids in the creation of a weblog.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/bm/metadata.xml b/app-emacs/bm/metadata.xml
index 0587eac4d913..6a0b3ee13e4f 100644
--- a/app-emacs/bm/metadata.xml
+++ b/app-emacs/bm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
This package provides visible, buffer local, bookmarks and the ability to
jump forward and backward to the next bookmark.
diff --git a/app-emacs/bongo/metadata.xml b/app-emacs/bongo/metadata.xml
index a65893303f93..d4c63ed45218 100644
--- a/app-emacs/bongo/metadata.xml
+++ b/app-emacs/bongo/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Bongo is a buffer-oriented media player for Emacs, contemporary with and
comparable to <pkg>app-emacs/emms</pkg>.
diff --git a/app-emacs/boxquote/metadata.xml b/app-emacs/boxquote/metadata.xml
index b71e9e1351cd..e4b5613ae141 100644
--- a/app-emacs/boxquote/metadata.xml
+++ b/app-emacs/boxquote/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Boxquote provides a set of functions for using a text quoting style that
partially boxes in the left hand side of an area of text, such a marking
diff --git a/app-emacs/browse-kill-ring/metadata.xml b/app-emacs/browse-kill-ring/metadata.xml
index 883209f9d133..f4e37eb671bd 100644
--- a/app-emacs/browse-kill-ring/metadata.xml
+++ b/app-emacs/browse-kill-ring/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
- <longdescription>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
Are you tired of using the endless keystrokes of 'C-y M-y M-y M-y ...' to
get at that bit of text you killed thirty-seven kills ago? Ever wish you
could just look through everything you've killed recently to find out if you
diff --git a/app-emacs/bubblet/metadata.xml b/app-emacs/bubblet/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/bubblet/metadata.xml
+++ b/app-emacs/bubblet/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/calfw/metadata.xml b/app-emacs/calfw/metadata.xml
index bd25ab175ab2..3a7d30c6a667 100644
--- a/app-emacs/calfw/metadata.xml
+++ b/app-emacs/calfw/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>naota@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<use>
<flag name="howm">Add support for the <pkg>app-emacs/howm</pkg>
note-taking tool</flag>
diff --git a/app-emacs/chess/metadata.xml b/app-emacs/chess/metadata.xml
index d1df4e744e0e..03bb20e536e1 100644
--- a/app-emacs/chess/metadata.xml
+++ b/app-emacs/chess/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
chess.el is an Emacs Lisp library and several clients on top of the
underlying library functionality for performing various activities related
diff --git a/app-emacs/circe/metadata.xml b/app-emacs/circe/metadata.xml
index 5c42e1ba76b0..d634a41cebd9 100644
--- a/app-emacs/circe/metadata.xml
+++ b/app-emacs/circe/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">jorgenschaefer/circe</remote-id>
</upstream>
diff --git a/app-emacs/cldoc/metadata.xml b/app-emacs/cldoc/metadata.xml
index 23f59bff4a62..13c0f1e7ba37 100644
--- a/app-emacs/cldoc/metadata.xml
+++ b/app-emacs/cldoc/metadata.xml
@@ -1,14 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>common-lisp</herd>
<longdescription>
-Show Common Lisp operators and variables information in echo area.
-cldoc.el has a database of parameters and results of Common Lisp's
-standard functions, and syntax rules of standard macros and special
-operators. cldoc.el automatically uses SLIME's autodoc facility if
-available to display parameters of user defined functions and macros,
-and the values of global variables.
+ Show Common Lisp operators and variables information in echo area.
+ cldoc.el has a database of parameters and results of Common Lisp's
+ standard functions, and syntax rules of standard macros and special
+ operators. cldoc.el automatically uses SLIME's autodoc facility if
+ available to display parameters of user defined functions and macros,
+ and the values of global variables.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/cmail/metadata.xml b/app-emacs/cmail/metadata.xml
index 955ea9e4689e..bfd3609ad424 100644
--- a/app-emacs/cmail/metadata.xml
+++ b/app-emacs/cmail/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge-jp">cmail</remote-id>
</upstream>
diff --git a/app-emacs/color-browser/metadata.xml b/app-emacs/color-browser/metadata.xml
index dfbc80022259..6e35c7ee62a8 100644
--- a/app-emacs/color-browser/metadata.xml
+++ b/app-emacs/color-browser/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
This package provides a tool that can (hopefully) aid in the production of
quality color themes. Basically it allows the user to
diff --git a/app-emacs/color-moccur/metadata.xml b/app-emacs/color-moccur/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/color-moccur/metadata.xml
+++ b/app-emacs/color-moccur/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/color-theme/metadata.xml b/app-emacs/color-theme/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/color-theme/metadata.xml
+++ b/app-emacs/color-theme/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/company-mode/metadata.xml b/app-emacs/company-mode/metadata.xml
index 91bd7f737518..b620c664ec4b 100644
--- a/app-emacs/company-mode/metadata.xml
+++ b/app-emacs/company-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<use>
<flag name="ropemacs">Install backend for
<pkg>dev-python/ropemacs</pkg></flag>
diff --git a/app-emacs/crontab-mode/metadata.xml b/app-emacs/crontab-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/crontab-mode/metadata.xml
+++ b/app-emacs/crontab-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/crypt++/metadata.xml b/app-emacs/crypt++/metadata.xml
index b7412c27c419..47f27bbc9430 100644
--- a/app-emacs/crypt++/metadata.xml
+++ b/app-emacs/crypt++/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
crypt++.el is a package of Lisp functions that recognize automatically
encrypted and encoded (i.e., compressed) files when they are first visited
diff --git a/app-emacs/csharp-mode/metadata.xml b/app-emacs/csharp-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/csharp-mode/metadata.xml
+++ b/app-emacs/csharp-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/css-mode/metadata.xml b/app-emacs/css-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/css-mode/metadata.xml
+++ b/app-emacs/css-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/csv-mode/metadata.xml b/app-emacs/csv-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/csv-mode/metadata.xml
+++ b/app-emacs/csv-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/d-mode/metadata.xml b/app-emacs/d-mode/metadata.xml
index dc4cb40bfcb1..e7e16aa2502a 100644
--- a/app-emacs/d-mode/metadata.xml
+++ b/app-emacs/d-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">Emacs-D-Mode-Maintainers/Emacs-D-Mode</remote-id>
</upstream>
diff --git a/app-emacs/dash/metadata.xml b/app-emacs/dash/metadata.xml
index b70add88d4a1..03f155607371 100644
--- a/app-emacs/dash/metadata.xml
+++ b/app-emacs/dash/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="github">magnars/dash.el</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="github">magnars/dash.el</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/ddskk/metadata.xml b/app-emacs/ddskk/metadata.xml
index df397ea3014c..7fb92b25f5a4 100644
--- a/app-emacs/ddskk/metadata.xml
+++ b/app-emacs/ddskk/metadata.xml
@@ -2,5 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/develock/metadata.xml b/app-emacs/develock/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/develock/metadata.xml
+++ b/app-emacs/develock/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/df-mode/metadata.xml b/app-emacs/df-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/df-mode/metadata.xml
+++ b/app-emacs/df-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/dictionary/metadata.xml b/app-emacs/dictionary/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/dictionary/metadata.xml
+++ b/app-emacs/dictionary/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/dircolors/metadata.xml b/app-emacs/dircolors/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/dircolors/metadata.xml
+++ b/app-emacs/dircolors/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/dired-sort-menu/metadata.xml b/app-emacs/dired-sort-menu/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/dired-sort-menu/metadata.xml
+++ b/app-emacs/dired-sort-menu/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/distel/metadata.xml b/app-emacs/distel/metadata.xml
index 0eb0d94a3b42..a32234bc7a6c 100644
--- a/app-emacs/distel/metadata.xml
+++ b/app-emacs/distel/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="google-code">distel</remote-id>
<remote-id type="github">massemanet/distel</remote-id>
diff --git a/app-emacs/doctest-mode/metadata.xml b/app-emacs/doctest-mode/metadata.xml
index 2178ad6af507..2c86c967630b 100644
--- a/app-emacs/doctest-mode/metadata.xml
+++ b/app-emacs/doctest-mode/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge">python-mode.svn</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge">python-mode.svn</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/doxymacs/metadata.xml b/app-emacs/doxymacs/metadata.xml
index a9e1348325d5..6d4554a0c050 100644
--- a/app-emacs/doxymacs/metadata.xml
+++ b/app-emacs/doxymacs/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">doxymacs</remote-id>
</upstream>
diff --git a/app-emacs/dropdown-list/metadata.xml b/app-emacs/dropdown-list/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/dropdown-list/metadata.xml
+++ b/app-emacs/dropdown-list/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/dts-mode/metadata.xml b/app-emacs/dts-mode/metadata.xml
index b6aad8082c11..77c5ff22b4ae 100644
--- a/app-emacs/dts-mode/metadata.xml
+++ b/app-emacs/dts-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">bgamari/dts-mode</remote-id>
</upstream>
diff --git a/app-emacs/ebuild-mode/metadata.xml b/app-emacs/ebuild-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/ebuild-mode/metadata.xml
+++ b/app-emacs/ebuild-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/ecb/metadata.xml b/app-emacs/ecb/metadata.xml
index 40e4a67ca089..5e18c480d78d 100644
--- a/app-emacs/ecb/metadata.xml
+++ b/app-emacs/ecb/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <longdescription>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
ECB stands for "Emacs Code Browser". While Emacs already has good editing
support for many modes, its browsing support is somewhat lacking. That's
where ECB comes in: it displays a number of informational windows that allow
@@ -28,8 +31,8 @@
It goes without saying that you can configure the layout, ie. which
informational windows should be displayed where. ECB comes with a number of
ready-made window layouts to choose from.
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">ecb</remote-id>
- </upstream>
+</longdescription>
+<upstream>
+ <remote-id type="sourceforge">ecb</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/edb/metadata.xml b/app-emacs/edb/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/edb/metadata.xml
+++ b/app-emacs/edb/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/edit-list/metadata.xml b/app-emacs/edit-list/metadata.xml
index 4b4a912af00d..4e1cc89c5d92 100644
--- a/app-emacs/edit-list/metadata.xml
+++ b/app-emacs/edit-list/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
So you've just added an incorrect entry to auto-mode-alist and want to fix
it quickly. `M-x edit-list RET auto-mode-alist RET' to the rescue. Make your
diff --git a/app-emacs/elib/metadata.xml b/app-emacs/elib/metadata.xml
index bcc2d5e5f170..0f7852c582d2 100644
--- a/app-emacs/elib/metadata.xml
+++ b/app-emacs/elib/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge">jdee</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge">jdee</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/elscreen/metadata.xml b/app-emacs/elscreen/metadata.xml
index 105523fef1a2..cf4f2e881ac6 100644
--- a/app-emacs/elscreen/metadata.xml
+++ b/app-emacs/elscreen/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Emacs is more of an "environment" than just an editor, since it has the
strong configuration language, emacs-lisp. There are a lot of applications
diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common-gentoo/metadata.xml
index dce592051146..0df1cf6f4daa 100644
--- a/app-emacs/emacs-common-gentoo/metadata.xml
+++ b/app-emacs/emacs-common-gentoo/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<use>
<flag name='games'>Support shared score files for games</flag>
</use>
diff --git a/app-emacs/emacs-daemon/metadata.xml b/app-emacs/emacs-daemon/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/emacs-daemon/metadata.xml
+++ b/app-emacs/emacs-daemon/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/emacs-jabber/metadata.xml b/app-emacs/emacs-jabber/metadata.xml
index 2efe4fd9d4b2..d79a82a8a93d 100644
--- a/app-emacs/emacs-jabber/metadata.xml
+++ b/app-emacs/emacs-jabber/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">emacs-jabber</remote-id>
</upstream>
diff --git a/app-emacs/emacs-w3m/metadata.xml b/app-emacs/emacs-w3m/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/emacs-w3m/metadata.xml
+++ b/app-emacs/emacs-w3m/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/emacs-wget/metadata.xml b/app-emacs/emacs-wget/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/emacs-wget/metadata.xml
+++ b/app-emacs/emacs-wget/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/emacs-wiki-blog/metadata.xml b/app-emacs/emacs-wiki-blog/metadata.xml
index 03ffb61f731b..8951337df522 100644
--- a/app-emacs/emacs-wiki-blog/metadata.xml
+++ b/app-emacs/emacs-wiki-blog/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Emacs-wiki-blog is an Emacs Lisp package to maintain online journals,
like the way blogger or livejournal does, but much more powerful.
diff --git a/app-emacs/emacs-wiki/metadata.xml b/app-emacs/emacs-wiki/metadata.xml
index fd8b7e6425eb..51376d5af1c6 100644
--- a/app-emacs/emacs-wiki/metadata.xml
+++ b/app-emacs/emacs-wiki/metadata.xml
@@ -1,21 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-Emacs-wiki allows you to create a wiki on your local system and export
-HTML pages.
+ Emacs-wiki allows you to create a wiki on your local system and
+ export HTML pages.
-Emacs-wiki has many uses. It has been used to organize links. It can
-make web page maintenance and design a lot easier. It is used as the
-back-end of Planner. You can store and link together various bits of
-information in a coherent manner. A weblog of sorts can be made with
-it, but RSS syndication is not supported.
+ Emacs-wiki has many uses. It has been used to organize links. It can
+ make web page maintenance and design a lot easier. It is used as the
+ back-end of Planner. You can store and link together various bits of
+ information in a coherent manner. A weblog of sorts can be made with
+ it, but RSS syndication is not supported.
-Emacs-wiki is not a real wiki in its basic configuration, because
-users from the web cannot edit the pages unless you use
-emacs-wiki-httpd.el .
+ Emacs-wiki is not a real wiki in its basic configuration, because
+ users from the web cannot edit the pages unless you use
+ emacs-wiki-httpd.el.
-Emacs-wiki does not allow you to edit the pages of TheEmacsWiki.
+ Emacs-wiki does not allow you to edit the pages of TheEmacsWiki.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/emhacks/metadata.xml b/app-emacs/emhacks/metadata.xml
index 99a40a1ed9dc..a2114ce5c303 100644
--- a/app-emacs/emhacks/metadata.xml
+++ b/app-emacs/emhacks/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <longdescription>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
The EMHACKS project goal is to provide a set of useful libraries to help
using Emacs or XEmacs.
@@ -12,11 +15,11 @@
jmaker, Java Makefile generator;
swbuff, Quick switch between Emacs buffers;
tabbar, Display a tab bar in the header line.
- </longdescription>
- <use>
- <flag name="jde">Enable support for Java Development Environment</flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">emhacks</remote-id>
- </upstream>
+</longdescription>
+<use>
+ <flag name="jde">Enable support for Java Development Environment</flag>
+</use>
+<upstream>
+ <remote-id type="sourceforge">emhacks</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/emms/metadata.xml b/app-emacs/emms/metadata.xml
index bff8c8626d37..4316be3a5d77 100644
--- a/app-emacs/emms/metadata.xml
+++ b/app-emacs/emms/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
EMMS, the Emacs Multimedia System, is an extensible, light-weight
multimedia player system for Emacs. It includes support for audio
diff --git a/app-emacs/erobot/metadata.xml b/app-emacs/erobot/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/erobot/metadata.xml
+++ b/app-emacs/erobot/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/eselect-mode/metadata.xml b/app-emacs/eselect-mode/metadata.xml
index b2c96c69ba47..400f45cc2bf2 100644
--- a/app-emacs/eselect-mode/metadata.xml
+++ b/app-emacs/eselect-mode/metadata.xml
@@ -2,5 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>eselect</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/ess/metadata.xml b/app-emacs/ess/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/ess/metadata.xml
+++ b/app-emacs/ess/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/evil/metadata.xml b/app-emacs/evil/metadata.xml
index 4182a42c03c0..9daa11a4ea20 100644
--- a/app-emacs/evil/metadata.xml
+++ b/app-emacs/evil/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/fff/metadata.xml b/app-emacs/fff/metadata.xml
index d66f0dd32b1e..1c29e2978704 100644
--- a/app-emacs/fff/metadata.xml
+++ b/app-emacs/fff/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
This package provides several shortcut commands for visiting or
inserting files without having to specify them by their complete name.
diff --git a/app-emacs/filladapt/metadata.xml b/app-emacs/filladapt/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/filladapt/metadata.xml
+++ b/app-emacs/filladapt/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/flashcard/metadata.xml b/app-emacs/flashcard/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/flashcard/metadata.xml
+++ b/app-emacs/flashcard/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/flim/metadata.xml b/app-emacs/flim/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/flim/metadata.xml
+++ b/app-emacs/flim/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/folding/metadata.xml b/app-emacs/folding/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/folding/metadata.xml
+++ b/app-emacs/folding/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/ghc-mod/metadata.xml b/app-emacs/ghc-mod/metadata.xml
index f86749b31dae..d999aca2da6e 100644
--- a/app-emacs/ghc-mod/metadata.xml
+++ b/app-emacs/ghc-mod/metadata.xml
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>haskell</herd>
- <longdescription>
- This packages includes Elisp files
- and a Haskell command, &quot;ghc-mod&quot;.
- &quot;ghc*.el&quot; enable completion of
- Haskell symbols on Emacs.
- Flymake is also integrated.
- &quot;ghc-mod&quot; is a backend of &quot;ghc*.el&quot;.
- It lists up all installed modules
- or extracts names of functions, classes,
- and data declarations.
- </longdescription>
+<herd>haskell</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ This packages includes Elisp files and a Haskell command, "ghc-mod".
+ "ghc*.el" enable completion of Haskell symbols on Emacs. Flymake is
+ also integrated. "ghc-mod" is a backend of "ghc*.el". It lists up
+ all installed modules or extracts names of functions, classes, and
+ data declarations.
+</longdescription>
</pkgmetadata>
diff --git a/app-emacs/gnuplot-mode/metadata.xml b/app-emacs/gnuplot-mode/metadata.xml
index 536405d4b31c..d263fd9cd27e 100644
--- a/app-emacs/gnuplot-mode/metadata.xml
+++ b/app-emacs/gnuplot-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">bruceravel/gnuplot-mode</remote-id>
</upstream>
diff --git a/app-emacs/gnuserv/metadata.xml b/app-emacs/gnuserv/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/gnuserv/metadata.xml
+++ b/app-emacs/gnuserv/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/google-c-style/metadata.xml b/app-emacs/google-c-style/metadata.xml
index f662d74d64b6..c4a025804ec8 100644
--- a/app-emacs/google-c-style/metadata.xml
+++ b/app-emacs/google-c-style/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>chromium</herd>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="github">google/styleguide</remote-id>
- </upstream>
+<herd>chromium</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="github">google/styleguide</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/graphviz-dot-mode/metadata.xml b/app-emacs/graphviz-dot-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/graphviz-dot-mode/metadata.xml
+++ b/app-emacs/graphviz-dot-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/h4x0r/metadata.xml b/app-emacs/h4x0r/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/h4x0r/metadata.xml
+++ b/app-emacs/h4x0r/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/haskell-mode/metadata.xml b/app-emacs/haskell-mode/metadata.xml
index c94cb834097f..00a2be873bec 100644
--- a/app-emacs/haskell-mode/metadata.xml
+++ b/app-emacs/haskell-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">haskell/haskell-mode</remote-id>
</upstream>
diff --git a/app-emacs/hexrgb/metadata.xml b/app-emacs/hexrgb/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/hexrgb/metadata.xml
+++ b/app-emacs/hexrgb/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/highline/metadata.xml b/app-emacs/highline/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/highline/metadata.xml
+++ b/app-emacs/highline/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/howm/metadata.xml b/app-emacs/howm/metadata.xml
index 1dc47cec2e87..a4aa5f2412a2 100644
--- a/app-emacs/howm/metadata.xml
+++ b/app-emacs/howm/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge-jp">howm</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge-jp">howm</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/htmlize/metadata.xml b/app-emacs/htmlize/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/htmlize/metadata.xml
+++ b/app-emacs/htmlize/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/httpd/metadata.xml b/app-emacs/httpd/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/httpd/metadata.xml
+++ b/app-emacs/httpd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/icicles/metadata.xml b/app-emacs/icicles/metadata.xml
index 730939bd5524..b28b15c5cbe8 100644
--- a/app-emacs/icicles/metadata.xml
+++ b/app-emacs/icicles/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">emacsmirror/icicles</remote-id>
</upstream>
diff --git a/app-emacs/identica-mode/metadata.xml b/app-emacs/identica-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/identica-mode/metadata.xml
+++ b/app-emacs/identica-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/igrep/metadata.xml b/app-emacs/igrep/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/igrep/metadata.xml
+++ b/app-emacs/igrep/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/imaxima/metadata.xml b/app-emacs/imaxima/metadata.xml
index b2c87461ee65..dff6ceb4b947 100644
--- a/app-emacs/imaxima/metadata.xml
+++ b/app-emacs/imaxima/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sci-mathematics</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription lang="en">
Imaxima provides support for interacting with the computer algebra system
Maxima in an Emacs buffer. Imaxima processes the output from Maxima with TeX
diff --git a/app-emacs/inform-mode/metadata.xml b/app-emacs/inform-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/inform-mode/metadata.xml
+++ b/app-emacs/inform-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/initsplit/metadata.xml b/app-emacs/initsplit/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/initsplit/metadata.xml
+++ b/app-emacs/initsplit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/jam-mode/metadata.xml b/app-emacs/jam-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/jam-mode/metadata.xml
+++ b/app-emacs/jam-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/jasmin/metadata.xml b/app-emacs/jasmin/metadata.xml
index 875419a23c9c..e096066bd2e6 100644
--- a/app-emacs/jasmin/metadata.xml
+++ b/app-emacs/jasmin/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-jasmin.el is an Emacs major mode for editing Jasmin Java bytecode
-assembler files. It provides automatic formatting, customizable
-fontifying, and quick-reference syntax help. Font-lock specifications
-are derived from an encoded grammar, for detailed syntax coloring.
+ jasmin.el is an Emacs major mode for editing Jasmin Java bytecode
+ assembler files. It provides automatic formatting, customizable
+ fontifying, and quick-reference syntax help. Font-lock specifications
+ are derived from an encoded grammar, for detailed syntax coloring.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/javascript/metadata.xml b/app-emacs/javascript/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/javascript/metadata.xml
+++ b/app-emacs/javascript/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/jde/metadata.xml b/app-emacs/jde/metadata.xml
index 72d70ada4707..ba9dba3feeb2 100644
--- a/app-emacs/jde/metadata.xml
+++ b/app-emacs/jde/metadata.xml
@@ -1,15 +1,18 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <herd>java</herd>
- <longdescription>
- The Java Development Environment for Emacs is a software package that
- interfaces Emacs to command-line Java development tools (for example,
- JavaSoft's JDK). JDEE features include:
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<herd>java</herd>
+<longdescription>
+ The Java Development Environment for Emacs is a software package
+ that interfaces Emacs to command-line Java development tools (for
+ example, JavaSoft's JDK). JDEE features include:
- * JDEE menu with compile, run, debug, build, browse, project, and help
- commands
+ * JDEE menu with compile, run, debug, build, browse, project, and
+ help commands
* syntax coloring
* auto indentation
* compile error to source links
@@ -18,8 +21,8 @@
* make file support
* automatic code generation
* Java source interpreter (Pat Neimeyer's BeanShell)
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">jdee</remote-id>
- </upstream>
+</longdescription>
+<upstream>
+ <remote-id type="sourceforge">jdee</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/keywiz/metadata.xml b/app-emacs/keywiz/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/keywiz/metadata.xml
+++ b/app-emacs/keywiz/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/limit/metadata.xml b/app-emacs/limit/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/limit/metadata.xml
+++ b/app-emacs/limit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/lookup/metadata.xml b/app-emacs/lookup/metadata.xml
index 92d4e62095de..202265529129 100644
--- a/app-emacs/lookup/metadata.xml
+++ b/app-emacs/lookup/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>cjk</herd>
</pkgmetadata>
diff --git a/app-emacs/lua-mode/metadata.xml b/app-emacs/lua-mode/metadata.xml
index cca32e07cd8f..a2b3921954b7 100644
--- a/app-emacs/lua-mode/metadata.xml
+++ b/app-emacs/lua-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">immerrr/lua-mode</remote-id>
</upstream>
diff --git a/app-emacs/lyskom-elisp-client/metadata.xml b/app-emacs/lyskom-elisp-client/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/lyskom-elisp-client/metadata.xml
+++ b/app-emacs/lyskom-elisp-client/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/magit/metadata.xml b/app-emacs/magit/metadata.xml
index b95826009842..90c8a318e33c 100644
--- a/app-emacs/magit/metadata.xml
+++ b/app-emacs/magit/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Magit is an interface to the version control system Git, implemented as an
extension to Emacs.
diff --git a/app-emacs/mailcrypt/metadata.xml b/app-emacs/mailcrypt/metadata.xml
index d6d654a5d70b..e1b80dff9e38 100644
--- a/app-emacs/mailcrypt/metadata.xml
+++ b/app-emacs/mailcrypt/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">mailcrypt</remote-id>
</upstream>
diff --git a/app-emacs/markdown-mode/metadata.xml b/app-emacs/markdown-mode/metadata.xml
index dea4fc9df66e..e8f3b49b5d72 100644
--- a/app-emacs/markdown-mode/metadata.xml
+++ b/app-emacs/markdown-mode/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>naota@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/matlab/metadata.xml b/app-emacs/matlab/metadata.xml
index ebcd4a8456ab..a4c0fe525efc 100644
--- a/app-emacs/matlab/metadata.xml
+++ b/app-emacs/matlab/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge">matlab-emacs</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge">matlab-emacs</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/mcomplete/metadata.xml b/app-emacs/mcomplete/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/mcomplete/metadata.xml
+++ b/app-emacs/mcomplete/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/mediawiki/metadata.xml b/app-emacs/mediawiki/metadata.xml
index c6470844bc55..e1f3c3570ad2 100644
--- a/app-emacs/mediawiki/metadata.xml
+++ b/app-emacs/mediawiki/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="launchpad">mediawiki-el</remote-id>
</upstream>
diff --git a/app-emacs/mew/metadata.xml b/app-emacs/mew/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/mew/metadata.xml
+++ b/app-emacs/mew/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/mic-paren/metadata.xml b/app-emacs/mic-paren/metadata.xml
index 7afdcc0fc87b..a1dd52c28c81 100644
--- a/app-emacs/mic-paren/metadata.xml
+++ b/app-emacs/mic-paren/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Load this file, activate it and Emacs will display highlighting on whatever
parenthesis (and paired delimiter if you like this) matches the one before
diff --git a/app-emacs/mldonkey/metadata.xml b/app-emacs/mldonkey/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/mldonkey/metadata.xml
+++ b/app-emacs/mldonkey/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/mmm-mode/metadata.xml b/app-emacs/mmm-mode/metadata.xml
index d4be75b5e357..22031cb5d67e 100644
--- a/app-emacs/mmm-mode/metadata.xml
+++ b/app-emacs/mmm-mode/metadata.xml
@@ -1,9 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge">mmm-mode</remote-id>
- <remote-id type="github">purcell/mmm-mode</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge">mmm-mode</remote-id>
+ <remote-id type="github">purcell/mmm-mode</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/moccur-edit/metadata.xml b/app-emacs/moccur-edit/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/moccur-edit/metadata.xml
+++ b/app-emacs/moccur-edit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/mode-compile/metadata.xml b/app-emacs/mode-compile/metadata.xml
index fd0567d9ae89..88f968e5fe53 100644
--- a/app-emacs/mode-compile/metadata.xml
+++ b/app-emacs/mode-compile/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">emacsmirror/mode-compile</remote-id>
</upstream>
diff --git a/app-emacs/mpg123-el/metadata.xml b/app-emacs/mpg123-el/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/mpg123-el/metadata.xml
+++ b/app-emacs/mpg123-el/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/mu-cite/metadata.xml b/app-emacs/mu-cite/metadata.xml
index 92d4e62095de..202265529129 100644
--- a/app-emacs/mu-cite/metadata.xml
+++ b/app-emacs/mu-cite/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>cjk</herd>
</pkgmetadata>
diff --git a/app-emacs/multi-term/metadata.xml b/app-emacs/multi-term/metadata.xml
index df4301f0f4a7..006dd03698ac 100644
--- a/app-emacs/multi-term/metadata.xml
+++ b/app-emacs/multi-term/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
-<maintainer>
+<maintainer>
<email>mjo@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/multiple-cursors/metadata.xml b/app-emacs/multiple-cursors/metadata.xml
index 3a7d30f6e618..3c1551c445cf 100644
--- a/app-emacs/multiple-cursors/metadata.xml
+++ b/app-emacs/multiple-cursors/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">magnars/multiple-cursors.el</remote-id>
</upstream>
diff --git a/app-emacs/muse/metadata.xml b/app-emacs/muse/metadata.xml
index 135da40f247e..d70dd6cbd1ab 100644
--- a/app-emacs/muse/metadata.xml
+++ b/app-emacs/muse/metadata.xml
@@ -1,30 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-Emacs Muse is an authoring and publishing environment for Emacs. It
-simplifies the process of writing documents and publishing them to
-various output formats.
+ Emacs Muse is an authoring and publishing environment for Emacs.
+ It simplifies the process of writing documents and publishing them
+ to various output formats.
-Muse consists of two main parts: an enhanced text-mode for authoring
-documents and navigating within Muse projects, and a set of publishing
-styles for generating different kinds of output.
+ Muse consists of two main parts: an enhanced text-mode for authoring
+ documents and navigating within Muse projects, and a set of
+ publishing styles for generating different kinds of output.
-This idea is not in any way new. Numerous systems exist - even one
-other for Emacs itself (Bhl Mode). What Muse adds to the picture is a
-more modular environment, with a rather simple core, in which "styles"
-are derived from to create new styles. Much of Muse's overall
-functionality is optional. For example, you can use the publisher
-without the major-mode, or the mode without doing any publishing; or
-if you don't load the Texinfo or LaTeX modules, those styles won't be
-available.
+ This idea is not in any way new. Numerous systems exist - even one
+ other for Emacs itself (Bhl Mode). What Muse adds to the picture is
+ a more modular environment, with a rather simple core, in which
+ "styles" are derived from to create new styles. Much of Muse's
+ overall functionality is optional. For example, you can use the
+ publisher without the major-mode, or the mode without doing any
+ publishing; or if you don't load the Texinfo or LaTeX modules, those
+ styles won't be available.
-The Muse codebase is a departure from emacs-wiki.el version 2.44. The
-code has been restructured and rewritten, especially its publishing
-functions. The focus in this revision is on the authoring and
-publishing aspects, and the "wikiness" has been removed as a default
-behavior (available as the optional module muse-wiki.el). CamelCase
-words are no longer special by default.
+ The Muse codebase is a departure from emacs-wiki.el version 2.44.
+ The code has been restructured and rewritten, especially its
+ publishing functions. The focus in this revision is on the authoring
+ and publishing aspects, and the "wikiness" has been removed as a
+ default behavior (available as the optional module muse-wiki.el).
+ CamelCase words are no longer special by default.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/nagios-mode/metadata.xml b/app-emacs/nagios-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/nagios-mode/metadata.xml
+++ b/app-emacs/nagios-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/navi2ch/metadata.xml b/app-emacs/navi2ch/metadata.xml
index 7751814d02a5..4e09ad0e30fd 100644
--- a/app-emacs/navi2ch/metadata.xml
+++ b/app-emacs/navi2ch/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">navi2ch</remote-id>
</upstream>
diff --git a/app-emacs/nxml-docbook5-schemas/metadata.xml b/app-emacs/nxml-docbook5-schemas/metadata.xml
index d0e321d9a75d..b0f74dbff2bd 100644
--- a/app-emacs/nxml-docbook5-schemas/metadata.xml
+++ b/app-emacs/nxml-docbook5-schemas/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/nxml-gentoo-schemas/metadata.xml b/app-emacs/nxml-gentoo-schemas/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/nxml-gentoo-schemas/metadata.xml
+++ b/app-emacs/nxml-gentoo-schemas/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/nxml-libvirt-schemas/metadata.xml b/app-emacs/nxml-libvirt-schemas/metadata.xml
index a178e33b29d2..9078b5ed03d6 100644
--- a/app-emacs/nxml-libvirt-schemas/metadata.xml
+++ b/app-emacs/nxml-libvirt-schemas/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
-<herd>virtualization</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<herd>virtualization</herd>
</pkgmetadata>
diff --git a/app-emacs/nxml-svg-schemas/metadata.xml b/app-emacs/nxml-svg-schemas/metadata.xml
index d0e321d9a75d..b0f74dbff2bd 100644
--- a/app-emacs/nxml-svg-schemas/metadata.xml
+++ b/app-emacs/nxml-svg-schemas/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/ocaml-mode/metadata.xml b/app-emacs/ocaml-mode/metadata.xml
index d3eb2339e1fa..987ffbd1b686 100644
--- a/app-emacs/ocaml-mode/metadata.xml
+++ b/app-emacs/ocaml-mode/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>ml</herd>
- <herd>emacs</herd>
+<herd>ml</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/org-mode/metadata.xml b/app-emacs/org-mode/metadata.xml
index 191bd8718bc9..841e9895518c 100644
--- a/app-emacs/org-mode/metadata.xml
+++ b/app-emacs/org-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Org-mode is a mode for keeping notes, maintaining ToDo lists, and doing
project planning with a fast and effective plain-text system.
diff --git a/app-emacs/outline-magic/metadata.xml b/app-emacs/outline-magic/metadata.xml
index 0e07ff7b6d4c..71c6993f4c38 100644
--- a/app-emacs/outline-magic/metadata.xml
+++ b/app-emacs/outline-magic/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">tj64/outline-magic</remote-id>
</upstream>
diff --git a/app-emacs/paredit/metadata.xml b/app-emacs/paredit/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/paredit/metadata.xml
+++ b/app-emacs/paredit/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/php-mode/metadata.xml b/app-emacs/php-mode/metadata.xml
index f7f0dd4460a2..c874778b42fd 100644
--- a/app-emacs/php-mode/metadata.xml
+++ b/app-emacs/php-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">php-mode</remote-id>
</upstream>
diff --git a/app-emacs/planner/metadata.xml b/app-emacs/planner/metadata.xml
index 27000b3f07e8..323c4d2bc024 100644
--- a/app-emacs/planner/metadata.xml
+++ b/app-emacs/planner/metadata.xml
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-Planner is a personal information manager (PIM) for Emacs. You can use
-it to manage your tasks, schedules, notes and anything else you want
-to store in a free-text richly-hyperlinked personal information
-manager integrated into Emacs.
+ Planner is a personal information manager (PIM) for Emacs. You can
+ use it to manage your tasks, schedules, notes and anything else you
+ want to store in a free-text richly-hyperlinked personal information
+ manager integrated into Emacs.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/po-mode/metadata.xml b/app-emacs/po-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/po-mode/metadata.xml
+++ b/app-emacs/po-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/popwin/metadata.xml b/app-emacs/popwin/metadata.xml
index 62aa791f2446..6178f5c36c6f 100644
--- a/app-emacs/popwin/metadata.xml
+++ b/app-emacs/popwin/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>naota@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">m2ym/popwin-el</remote-id>
</upstream>
diff --git a/app-emacs/pov-mode/metadata.xml b/app-emacs/pov-mode/metadata.xml
index 4182a42c03c0..9daa11a4ea20 100644
--- a/app-emacs/pov-mode/metadata.xml
+++ b/app-emacs/pov-mode/metadata.xml
@@ -1,5 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/prom-wl/metadata.xml b/app-emacs/prom-wl/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/prom-wl/metadata.xml
+++ b/app-emacs/prom-wl/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/proofgeneral/metadata.xml b/app-emacs/proofgeneral/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/proofgeneral/metadata.xml
+++ b/app-emacs/proofgeneral/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/protbuf/metadata.xml b/app-emacs/protbuf/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/protbuf/metadata.xml
+++ b/app-emacs/protbuf/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/psgml/metadata.xml b/app-emacs/psgml/metadata.xml
index 7d4e87f66790..87c000289863 100644
--- a/app-emacs/psgml/metadata.xml
+++ b/app-emacs/psgml/metadata.xml
@@ -1,8 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <upstream>
- <remote-id type="sourceforge">psgml</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<upstream>
+ <remote-id type="sourceforge">psgml</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/pymacs/metadata.xml b/app-emacs/pymacs/metadata.xml
index 4f7be8f8a824..25d3fe951b7e 100644
--- a/app-emacs/pymacs/metadata.xml
+++ b/app-emacs/pymacs/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <herd>python</herd>
- <upstream>
- <remote-id type="github">pinard/Pymacs</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<herd>python</herd>
+<upstream>
+ <remote-id type="github">pinard/Pymacs</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/python-mode/metadata.xml b/app-emacs/python-mode/metadata.xml
index 4c84d631ad42..81c665a3f069 100644
--- a/app-emacs/python-mode/metadata.xml
+++ b/app-emacs/python-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="launchpad">python-mode</remote-id>
</upstream>
diff --git a/app-emacs/quack/metadata.xml b/app-emacs/quack/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/quack/metadata.xml
+++ b/app-emacs/quack/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/quilt-el/metadata.xml b/app-emacs/quilt-el/metadata.xml
index dc70d2e97d27..e8fef63a5b4e 100644
--- a/app-emacs/quilt-el/metadata.xml
+++ b/app-emacs/quilt-el/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
quilt-el is an Emacs minor mode for quilt. By using this, it becomes easy to
edit files controlled by quilt. The main features are as follows:
diff --git a/app-emacs/qwerty/metadata.xml b/app-emacs/qwerty/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/qwerty/metadata.xml
+++ b/app-emacs/qwerty/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/redo+/metadata.xml b/app-emacs/redo+/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/redo+/metadata.xml
+++ b/app-emacs/redo+/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/regress/metadata.xml b/app-emacs/regress/metadata.xml
index 97e784644cc2..68505ec68086 100644
--- a/app-emacs/regress/metadata.xml
+++ b/app-emacs/regress/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-This module provides support for writing and executing regression
-tests for Emacs Lisp code.
+ This module provides support for writing and executing regression
+ tests for Emacs Lisp code.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/remember/metadata.xml b/app-emacs/remember/metadata.xml
index f4406812d32f..187bc899595d 100644
--- a/app-emacs/remember/metadata.xml
+++ b/app-emacs/remember/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
'Remember' is a mode for remembering data. It uses whatever back-end is
appropriate to record and correlate the data, but its main intention is to
diff --git a/app-emacs/rfcview/metadata.xml b/app-emacs/rfcview/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/rfcview/metadata.xml
+++ b/app-emacs/rfcview/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/riece/metadata.xml b/app-emacs/riece/metadata.xml
index 9cc80b349a64..fbb92e6910c1 100644
--- a/app-emacs/riece/metadata.xml
+++ b/app-emacs/riece/metadata.xml
@@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <herd>net-irc</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<herd>net-irc</herd>
</pkgmetadata>
diff --git a/app-emacs/rnc-mode/metadata.xml b/app-emacs/rnc-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/rnc-mode/metadata.xml
+++ b/app-emacs/rnc-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/rpm-spec-mode/metadata.xml b/app-emacs/rpm-spec-mode/metadata.xml
index 417d155c0e49..39589e3df8bc 100644
--- a/app-emacs/rpm-spec-mode/metadata.xml
+++ b/app-emacs/rpm-spec-mode/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>sochotnicky@gentoo.org</email>
<name>Stanislav Ochotnicky</name>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/ruby-mode/metadata.xml b/app-emacs/ruby-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/ruby-mode/metadata.xml
+++ b/app-emacs/ruby-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/rudel/metadata.xml b/app-emacs/rudel/metadata.xml
index 76fede0181fd..f3cbec8ebc29 100644
--- a/app-emacs/rudel/metadata.xml
+++ b/app-emacs/rudel/metadata.xml
@@ -1,16 +1,19 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <longdescription>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
Rudel is collaborative editing environment for GNU Emacs. Its purpose
is tod share buffers with other users in order to edit the contents
of those buffers collaboratively. Rudel supports multiple backends to
enable communication with other collaborative editors using different
protocols, though currently Obby (for use with the Gobby editor) is
the only fully-functional one.
- </longdescription>
- <upstream>
- <remote-id type="sourceforge">rudel</remote-id>
- </upstream>
+</longdescription>
+<upstream>
+ <remote-id type="sourceforge">rudel</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/rust-mode/metadata.xml b/app-emacs/rust-mode/metadata.xml
index b1bfa491b811..8901c22a753b 100644
--- a/app-emacs/rust-mode/metadata.xml
+++ b/app-emacs/rust-mode/metadata.xml
@@ -1,9 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <maintainer>
- <email>jauhien@gentoo.org</email>
- <name>Jauhien Piatlicki</name>
- </maintainer>
+<maintainer>
+ <email>jauhien@gentoo.org</email>
+ <name>Jauhien Piatlicki</name>
+</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/scala-mode/metadata.xml b/app-emacs/scala-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/scala-mode/metadata.xml
+++ b/app-emacs/scala-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/scheme-complete/metadata.xml b/app-emacs/scheme-complete/metadata.xml
index 51ab1920de63..43a0838f703d 100644
--- a/app-emacs/scheme-complete/metadata.xml
+++ b/app-emacs/scheme-complete/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Very smart tab-completion and autodoc for Scheme code in Emacs, complete
with type inferencing and lexical environment awareness.
diff --git a/app-emacs/scim-bridge-el/metadata.xml b/app-emacs/scim-bridge-el/metadata.xml
index a3dc60932031..e4bdcb750b3d 100644
--- a/app-emacs/scim-bridge-el/metadata.xml
+++ b/app-emacs/scim-bridge-el/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>heroxbd@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
A SCIM-Bridge client for Emacs.
</longdescription>
diff --git a/app-emacs/scss-mode/metadata.xml b/app-emacs/scss-mode/metadata.xml
index 86027b0987d0..51de88f313ba 100644
--- a/app-emacs/scss-mode/metadata.xml
+++ b/app-emacs/scss-mode/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">antonj/scss-mode</remote-id>
</upstream>
diff --git a/app-emacs/semi/metadata.xml b/app-emacs/semi/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/semi/metadata.xml
+++ b/app-emacs/semi/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/session/metadata.xml b/app-emacs/session/metadata.xml
index 1839c43c667a..9edf7895555e 100644
--- a/app-emacs/session/metadata.xml
+++ b/app-emacs/session/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">emacs-session</remote-id>
</upstream>
diff --git a/app-emacs/setnu/metadata.xml b/app-emacs/setnu/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/setnu/metadata.xml
+++ b/app-emacs/setnu/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/slime/metadata.xml b/app-emacs/slime/metadata.xml
index 907cce48a952..1cf8ad40d03d 100644
--- a/app-emacs/slime/metadata.xml
+++ b/app-emacs/slime/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>common-lisp</herd>
<longdescription>
SLIME: The Superior Lisp Interaction Mode for Emacs. SLIME is a
diff --git a/app-emacs/sml-mode/metadata.xml b/app-emacs/sml-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/sml-mode/metadata.xml
+++ b/app-emacs/sml-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/sokoban/metadata.xml b/app-emacs/sokoban/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/sokoban/metadata.xml
+++ b/app-emacs/sokoban/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/ssh/metadata.xml b/app-emacs/ssh/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/ssh/metadata.xml
+++ b/app-emacs/ssh/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/stripes/metadata.xml b/app-emacs/stripes/metadata.xml
index e6afb9ae7207..a4059ed3801e 100644
--- a/app-emacs/stripes/metadata.xml
+++ b/app-emacs/stripes/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-Highlights every even line with an alternative background
-color. Useful for buffers that display lists of any kind - as a guide
-for your eyes to follow these lines.
+ Highlights every even line with an alternative background color.
+ Useful for buffers that display lists of any kind - as a guide for
+ your eyes to follow these lines.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/sumibi/metadata.xml b/app-emacs/sumibi/metadata.xml
index ccebeb74e563..0672c8815592 100644
--- a/app-emacs/sumibi/metadata.xml
+++ b/app-emacs/sumibi/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge-jp">sumibi</remote-id>
</upstream>
diff --git a/app-emacs/tdtd/metadata.xml b/app-emacs/tdtd/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/tdtd/metadata.xml
+++ b/app-emacs/tdtd/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/teco/metadata.xml b/app-emacs/teco/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/teco/metadata.xml
+++ b/app-emacs/teco/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/template/metadata.xml b/app-emacs/template/metadata.xml
index 62541310d2d2..fc40138f3dff 100644
--- a/app-emacs/template/metadata.xml
+++ b/app-emacs/template/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">emacs-template</remote-id>
</upstream>
diff --git a/app-emacs/tempo-snippets/metadata.xml b/app-emacs/tempo-snippets/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/tempo-snippets/metadata.xml
+++ b/app-emacs/tempo-snippets/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/thinks/metadata.xml b/app-emacs/thinks/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/thinks/metadata.xml
+++ b/app-emacs/thinks/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/thumbs/metadata.xml b/app-emacs/thumbs/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/thumbs/metadata.xml
+++ b/app-emacs/thumbs/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/tuareg-mode/metadata.xml b/app-emacs/tuareg-mode/metadata.xml
index 0899764535c6..53adc5aad66b 100644
--- a/app-emacs/tuareg-mode/metadata.xml
+++ b/app-emacs/tuareg-mode/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>ml</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Tuareg is an Object Caml/Camllight mode for Emacs. It handles automatic
indentation and syntax highlighting of code. It also supports an interactive
diff --git a/app-emacs/twittering-mode/metadata.xml b/app-emacs/twittering-mode/metadata.xml
index 3da2601fe3c2..4e34b67ba897 100644
--- a/app-emacs/twittering-mode/metadata.xml
+++ b/app-emacs/twittering-mode/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>naota@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">twmode</remote-id>
</upstream>
diff --git a/app-emacs/typing/metadata.xml b/app-emacs/typing/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/typing/metadata.xml
+++ b/app-emacs/typing/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/uboat/metadata.xml b/app-emacs/uboat/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/uboat/metadata.xml
+++ b/app-emacs/uboat/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/undo-tree/metadata.xml b/app-emacs/undo-tree/metadata.xml
index dbcd421d2b18..49088e772b03 100644
--- a/app-emacs/undo-tree/metadata.xml
+++ b/app-emacs/undo-tree/metadata.xml
@@ -5,7 +5,10 @@
<email>tomka@gentoo.org</email>
<name>Thomas Kahle</name>
</maintainer>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription lang="en">
Emacs has a powerful undo system. Unlike the standard undo/redo system in
most software, it allows you to recover *any* past state of a buffer
diff --git a/app-emacs/uptimes/metadata.xml b/app-emacs/uptimes/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/uptimes/metadata.xml
+++ b/app-emacs/uptimes/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/vhdl-mode/metadata.xml b/app-emacs/vhdl-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/vhdl-mode/metadata.xml
+++ b/app-emacs/vhdl-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/visual-basic-mode/metadata.xml b/app-emacs/visual-basic-mode/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/visual-basic-mode/metadata.xml
+++ b/app-emacs/visual-basic-mode/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/vm/metadata.xml b/app-emacs/vm/metadata.xml
index b0fb5c476928..427c9f4ff22c 100644
--- a/app-emacs/vm/metadata.xml
+++ b/app-emacs/vm/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
VM is a mail reader that runs inside GNU Emacs and XEmacs. It was written as
an alternative to the Emacs RMAIL mail reader. VM is highly configurable and
diff --git a/app-emacs/volume/metadata.xml b/app-emacs/volume/metadata.xml
index 4b82c0179582..615a647ffe15 100644
--- a/app-emacs/volume/metadata.xml
+++ b/app-emacs/volume/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">dbrock/volume-el</remote-id>
</upstream>
diff --git a/app-emacs/w3mnav/metadata.xml b/app-emacs/w3mnav/metadata.xml
index affa9b85b291..bed0dff059fa 100644
--- a/app-emacs/w3mnav/metadata.xml
+++ b/app-emacs/w3mnav/metadata.xml
@@ -1,12 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
-w3mnav.el is an Emacs add-on that kludges some Info-like navigation keys to the
-w3m Web browser. This functionality was originally part of the Scheme support
-package Quack, and was intended to work with the numerous Scheme books that were
-converted to HTML from LaTeX format. It also works with some other HTML pages
-that have book-like &quot;next page&quot; and &quot;previous page&quot; links.
+ w3mnav.el is an Emacs add-on that kludges some Info-like navigation
+ keys to the w3m Web browser. This functionality was originally part
+ of the Scheme support package Quack, and was intended to work with
+ the numerous Scheme books that were converted to HTML from LaTeX
+ format. It also works with some other HTML pages that have book-like
+ "next page" and "previous page" links.
</longdescription>
</pkgmetadata>
diff --git a/app-emacs/wanderlust/metadata.xml b/app-emacs/wanderlust/metadata.xml
index 3fab274a410c..3e2504b4bb23 100644
--- a/app-emacs/wanderlust/metadata.xml
+++ b/app-emacs/wanderlust/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<herd>net-mail</herd>
<use>
<flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
diff --git a/app-emacs/wgrep/metadata.xml b/app-emacs/wgrep/metadata.xml
index 4be47a3f1ad3..23b119c5563b 100644
--- a/app-emacs/wgrep/metadata.xml
+++ b/app-emacs/wgrep/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
wgrep allows you to edit a grep buffer and apply those changes to
the file buffer.
diff --git a/app-emacs/whine/metadata.xml b/app-emacs/whine/metadata.xml
index ce96f79d40d0..ff0a5a3fc26a 100644
--- a/app-emacs/whine/metadata.xml
+++ b/app-emacs/whine/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Whine modifies a lot of the commands bound to the main Emacs keys, like SPC
and C-f and RET and C-x C-s. They still do the same things they did before,
diff --git a/app-emacs/wikipedia-mode/metadata.xml b/app-emacs/wikipedia-mode/metadata.xml
index 526fe57e8937..1ab9e7415d5e 100644
--- a/app-emacs/wikipedia-mode/metadata.xml
+++ b/app-emacs/wikipedia-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
An Emacs major mode for editing articles in Wikipedia and other wikis
running MediaWiki software offline. This mode tweaks Emacs's behavior in
diff --git a/app-emacs/xclip/metadata.xml b/app-emacs/xclip/metadata.xml
index bc306fe58224..9daa11a4ea20 100644
--- a/app-emacs/xclip/metadata.xml
+++ b/app-emacs/xclip/metadata.xml
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/xrdb-mode/metadata.xml b/app-emacs/xrdb-mode/metadata.xml
index fb51ee8b64e7..600ffcb21c88 100644
--- a/app-emacs/xrdb-mode/metadata.xml
+++ b/app-emacs/xrdb-mode/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="launchpad">xrdb-mode</remote-id>
</upstream>
diff --git a/app-emacs/xslide/metadata.xml b/app-emacs/xslide/metadata.xml
index abe614759038..f5b58ef0c901 100644
--- a/app-emacs/xslide/metadata.xml
+++ b/app-emacs/xslide/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="sourceforge">xslide</remote-id>
</upstream>
diff --git a/app-emacs/yaml-mode/metadata.xml b/app-emacs/yaml-mode/metadata.xml
index dfc7f88ca6dd..884f5ed8cd3c 100644
--- a/app-emacs/yaml-mode/metadata.xml
+++ b/app-emacs/yaml-mode/metadata.xml
@@ -1,10 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
<maintainer>
<email>flameeyes@gentoo.org</email>
</maintainer>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<upstream>
<remote-id type="github">yoshiki/yaml-mode</remote-id>
</upstream>
diff --git a/app-emacs/yasnippet/metadata.xml b/app-emacs/yasnippet/metadata.xml
index be75e8ba45aa..d32e0a543a32 100644
--- a/app-emacs/yasnippet/metadata.xml
+++ b/app-emacs/yasnippet/metadata.xml
@@ -1,11 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>emacs</herd>
- <longdescription>YASnippet is a re-design and re-write of smart-snippet. It is much cleaner
- and more powerful than smart-snippet.</longdescription>
- <upstream>
- <remote-id type="google-code">yasnippet</remote-id>
- <remote-id type="github">capitaomorte/yasnippet</remote-id>
- </upstream>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
+<longdescription>
+ YASnippet is a re-design and re-write of smart-snippet. It is much
+ cleaner and more powerful than smart-snippet.
+</longdescription>
+<upstream>
+ <remote-id type="google-code">yasnippet</remote-id>
+ <remote-id type="github">capitaomorte/yasnippet</remote-id>
+</upstream>
</pkgmetadata>
diff --git a/app-emacs/yatex/metadata.xml b/app-emacs/yatex/metadata.xml
index ca038952bd63..51d2849fce16 100644
--- a/app-emacs/yatex/metadata.xml
+++ b/app-emacs/yatex/metadata.xml
@@ -2,7 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription lang="en">
YaTeX is an intelligent, acquisitive and integrated package which reduces
your efforts of composing LaTeX source on Emacs. And yahtml is the honest
diff --git a/app-emacs/yc/metadata.xml b/app-emacs/yc/metadata.xml
index df397ea3014c..7fb92b25f5a4 100644
--- a/app-emacs/yc/metadata.xml
+++ b/app-emacs/yc/metadata.xml
@@ -2,5 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>cjk</herd>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-emacs/zenburn/metadata.xml b/app-emacs/zenburn/metadata.xml
index 47a77903d550..801c33d8cf94 100644
--- a/app-emacs/zenburn/metadata.xml
+++ b/app-emacs/zenburn/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
Zenburn is a low-contrast color theme. It's easy for your eyes and
designed to keep you in the zone for long programming sessions.
diff --git a/app-emacs/zenirc/metadata.xml b/app-emacs/zenirc/metadata.xml
index f4514376b4e9..4de747e56845 100644
--- a/app-emacs/zenirc/metadata.xml
+++ b/app-emacs/zenirc/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
+<maintainer>
+ <email>gnu-emacs@gentoo.org</email>
+ <name>Gentoo GNU Emacs project</name>
+</maintainer>
<longdescription>
ZenIRC is a full-featured scriptable IRC client for the EMACS text editor.
It runs on any OS where EMACS supports sockets. It is compatible with GNU