summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app-admin/emacs-updater/metadata.xml5
-rw-r--r--app-doc/casting-spels-emacs/metadata.xml5
-rw-r--r--app-doc/elisp-manual/metadata.xml5
-rw-r--r--app-editors/e3/metadata.xml5
-rw-r--r--app-editors/emacs-vcs/metadata.xml5
-rw-r--r--app-editors/emacs/metadata.xml5
-rw-r--r--app-editors/emact/metadata.xml5
-rw-r--r--app-editors/ersatz-emacs/metadata.xml5
-rw-r--r--app-editors/fe/metadata.xml5
-rw-r--r--app-editors/jasspa-microemacs/metadata.xml5
-rw-r--r--app-editors/jed/metadata.xml5
-rw-r--r--app-editors/jove/metadata.xml5
-rw-r--r--app-editors/mg/metadata.xml5
-rw-r--r--app-editors/qemacs/metadata.xml5
-rw-r--r--app-editors/uemacs-pk/metadata.xml5
-rw-r--r--app-editors/zile/metadata.xml5
-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
-rw-r--r--app-eselect/eselect-ctags/metadata.xml5
-rw-r--r--app-eselect/eselect-emacs/metadata.xml5
-rw-r--r--virtual/editor/metadata.xml6
-rw-r--r--virtual/emacs-flim/metadata.xml5
-rw-r--r--virtual/emacs/metadata.xml5
210 files changed, 1004 insertions, 375 deletions
diff --git a/app-admin/emacs-updater/metadata.xml b/app-admin/emacs-updater/metadata.xml
index bc306fe5822..9daa11a4ea2 100644
--- a/app-admin/emacs-updater/metadata.xml
+++ b/app-admin/emacs-updater/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-doc/casting-spels-emacs/metadata.xml b/app-doc/casting-spels-emacs/metadata.xml
index b81c3b2a076..39488bbc3dc 100644
--- a/app-doc/casting-spels-emacs/metadata.xml
+++ b/app-doc/casting-spels-emacs/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>
Ever wonder what makes Lisp so powerful? Now you can find out for yourself -
And you can do it right inside your GNU Emacs text editor! If you've spent
diff --git a/app-doc/elisp-manual/metadata.xml b/app-doc/elisp-manual/metadata.xml
index b47e13bb88a..fe3660e451d 100644
--- a/app-doc/elisp-manual/metadata.xml
+++ b/app-doc/elisp-manual/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>
Most of the GNU Emacs text editor is written in the programming language
called Emacs Lisp. You can write new code in Emacs Lisp and install it as an
diff --git a/app-editors/e3/metadata.xml b/app-editors/e3/metadata.xml
index ddec4ff80d9..52ffbf8545d 100644
--- a/app-editors/e3/metadata.xml
+++ b/app-editors/e3/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
e3 is a full-screen, user-friendly text editor with an interface similar to
that of either WordStar, Emacs, Pico, Nedit, or vi. It's heavily optimized
diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index 88ecff51f01..c5e623f1989 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/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>
GNU Emacs is an extensible, customizable text editor - and more. At its core
is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index 88ecff51f01..c5e623f1989 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/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>
GNU Emacs is an extensible, customizable text editor - and more. At its core
is an interpreter for Emacs Lisp, a dialect of the Lisp programming language
diff --git a/app-editors/emact/metadata.xml b/app-editors/emact/metadata.xml
index f0b7b2b3c64..1bb638a7aa0 100644
--- a/app-editors/emact/metadata.xml
+++ b/app-editors/emact/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
This product is an original development made to provide an emacs-like editor
on the PC for the purpose of writing Lisp code with the same features found
diff --git a/app-editors/ersatz-emacs/metadata.xml b/app-editors/ersatz-emacs/metadata.xml
index 21a5d93d303..28debfc5137 100644
--- a/app-editors/ersatz-emacs/metadata.xml
+++ b/app-editors/ersatz-emacs/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
Ersatz Emacs is a very minimal imitation of the famous GNU Emacs editor.
Unlike most popular Emacs derivatives, Ersatz strives to use as little
diff --git a/app-editors/fe/metadata.xml b/app-editors/fe/metadata.xml
index f2371402a16..d9eb40b9481 100644
--- a/app-editors/fe/metadata.xml
+++ b/app-editors/fe/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
Fe is a small and easy to use folding editor.
diff --git a/app-editors/jasspa-microemacs/metadata.xml b/app-editors/jasspa-microemacs/metadata.xml
index 4f5375ba458..35a586253db 100644
--- a/app-editors/jasspa-microemacs/metadata.xml
+++ b/app-editors/jasspa-microemacs/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
* An Emacs editor biased towards UNIX users, working across platforms by
providing a consistent interface under UNIX, Microsoft Windows '95/'98/NT
diff --git a/app-editors/jed/metadata.xml b/app-editors/jed/metadata.xml
index 36be58a2be0..47f4effcefc 100644
--- a/app-editors/jed/metadata.xml
+++ b/app-editors/jed/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
Jed is a powerful editor, terminal and X11 interface. Color syntax
highlighting is one of its strong suits, along with emulation of GNU Emacs,
diff --git a/app-editors/jove/metadata.xml b/app-editors/jove/metadata.xml
index 5c7a37a88b6..2821cca37db 100644
--- a/app-editors/jove/metadata.xml
+++ b/app-editors/jove/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
Jove is a compact, powerful, Emacs-style text-editor. It provides the common
emacs keyboard bindings, together with a reasonable assortment of the most
diff --git a/app-editors/mg/metadata.xml b/app-editors/mg/metadata.xml
index 41e5f9b7b11..a86fa59f0b1 100644
--- a/app-editors/mg/metadata.xml
+++ b/app-editors/mg/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
mg is Micro GNU/emacs, this is a portable version of the mg maintained by
the OpenBSD team.
diff --git a/app-editors/qemacs/metadata.xml b/app-editors/qemacs/metadata.xml
index c0162f066ce..6ba8754897f 100644
--- a/app-editors/qemacs/metadata.xml
+++ b/app-editors/qemacs/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
QEmacs (for Quick Emacs) is a very small but powerful text editor. It has
the following features:
diff --git a/app-editors/uemacs-pk/metadata.xml b/app-editors/uemacs-pk/metadata.xml
index 62e65fab292..86800a9b522 100644
--- a/app-editors/uemacs-pk/metadata.xml
+++ b/app-editors/uemacs-pk/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
WHAT IS uEmacs/PK?
diff --git a/app-editors/zile/metadata.xml b/app-editors/zile/metadata.xml
index 077afb68594..8a7000bae25 100644
--- a/app-editors/zile/metadata.xml
+++ b/app-editors/zile/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<longdescription>
Zile is a small, fast, and powerful Emacs clone. It is useful for small
footprint installations (e.g. on floppy disk), machines with little memory,
diff --git a/app-emacs/actionscript-mode/metadata.xml b/app-emacs/actionscript-mode/metadata.xml
index e6ac0b24adb..2e0acac81fb 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 a055ee9b776..7d01ef42903 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 1574e79ead4..5abd82fad5c 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 f36206c9357..5376b5c3875 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 8ad6abfbb6e..46c40b7e866 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 bc306fe5822..9daa11a4ea2 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 a71dd9eb2fa..551404c7fd2 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 bc306fe5822..9daa11a4ea2 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 485301c7a4a..56ca2ca5439 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 152470076db..9cc274f6b23 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 0587eac4d91..6a0b3ee13e4 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 a65893303f9..d4c63ed4521 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 b71e9e1351c..e4b5613ae14 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 883209f9d13..f4e37eb671b 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 bc306fe5822..9daa11a4ea2 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 bd25ab175ab..3a7d30c6a66 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 d1df4e744e0..03bb20e536e 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 5c42e1ba76b..d634a41cebd 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 23f59bff4a6..13c0f1e7ba3 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 955ea9e4689..bfd3609ad42 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 dfbc8002225..6e35c7ee62a 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 91bd7f73751..b620c664ec4 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 bc306fe5822..9daa11a4ea2 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 b7412c27c41..47f27bbc943 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 dc4cb40bfcb..e7e16aa2502 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 b70add88d4a..03f15560737 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 df397ea3014..7fb92b25f5a 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 0eb0d94a3b4..a32234bc7a6 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 2178ad6af50..2c86c967630 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 a9e1348325d..6d4554a0c05 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 bc306fe5822..9daa11a4ea2 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 b6aad8082c1..77c5ff22b4a 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 bc306fe5822..9daa11a4ea2 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 40e4a67ca08..5e18c480d78 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 bc306fe5822..9daa11a4ea2 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 4b4a912af00..4e1cc89c5d9 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 bcc2d5e5f17..0f7852c582d 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 105523fef1a..cf4f2e881ac 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 dce59205114..0df1cf6f4da 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 bc306fe5822..9daa11a4ea2 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 2efe4fd9d4b..d79a82a8a93 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 03ffb61f731..8951337df52 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 fd8b7e6425e..51376d5af1c 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 99a40a1ed9d..a2114ce5c30 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 bff8c8626d3..4316be3a5d7 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 bc306fe5822..9daa11a4ea2 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 b2c96c69ba4..400f45cc2bf 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 bc306fe5822..9daa11a4ea2 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 4182a42c03c..9daa11a4ea2 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 d66f0dd32b1..1c29e297870 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 f86749b31da..d999aca2da6 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 536405d4b31..d263fd9cd27 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 bc306fe5822..9daa11a4ea2 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 f662d74d64b..c4a025804ec 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 c94cb834097..00a2be873be 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 1dc47cec2e8..a4aa5f2412a 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 730939bd552..b28b15c5cbe 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 b2c87461ee6..dff6ceb4b94 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 875419a23c9..e096066bd2e 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 bc306fe5822..9daa11a4ea2 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 72d70ada470..ba9dba3feeb 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 92d4e62095d..20226552912 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 cca32e07cd8..a2b3921954b 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 bc306fe5822..9daa11a4ea2 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 b9582600984..90c8a318e33 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 d6d654a5d70..e1b80dff9e3 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 dea4fc9df66..e8f3b49b5d7 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 ebcd4a8456a..a4c0fe525ef 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 bc306fe5822..9daa11a4ea2 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 c6470844bc5..e1f3c3570ad 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 bc306fe5822..9daa11a4ea2 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 7afdcc0fc87..a1dd52c28c8 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 bc306fe5822..9daa11a4ea2 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 d4be75b5e35..22031cb5d67 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 bc306fe5822..9daa11a4ea2 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 fd0567d9ae8..88f968e5fe5 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 bc306fe5822..9daa11a4ea2 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 92d4e62095d..20226552912 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 df4301f0f4a..006dd03698a 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 3a7d30f6e61..3c1551c445c 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 135da40f247..d70dd6cbd1a 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 bc306fe5822..9daa11a4ea2 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 7751814d02a..4e09ad0e30f 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 d0e321d9a75..b0f74dbff2b 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 bc306fe5822..9daa11a4ea2 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 a178e33b29d..9078b5ed03d 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 d0e321d9a75..b0f74dbff2b 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 d3eb2339e1f..987ffbd1b68 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 191bd8718bc..841e9895518 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 0e07ff7b6d4..71c6993f4c3 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 bc306fe5822..9daa11a4ea2 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 f7f0dd4460a..c874778b42f 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 27000b3f07e..323c4d2bc02 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 bc306fe5822..9daa11a4ea2 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 62aa791f244..6178f5c36c6 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 4182a42c03c..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 7d4e87f6679..87c00028986 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 4f7be8f8a82..25d3fe951b7 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 4c84d631ad4..81c665a3f06 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 bc306fe5822..9daa11a4ea2 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 dc70d2e97d2..e8fef63a5b4 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 97e784644cc..68505ec6808 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 f4406812d32..187bc899595 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 bc306fe5822..9daa11a4ea2 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 9cc80b349a6..fbb92e6910c 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 bc306fe5822..9daa11a4ea2 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 417d155c0e4..39589e3df8b 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 bc306fe5822..9daa11a4ea2 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 76fede0181f..f3cbec8ebc2 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 b1bfa491b81..8901c22a753 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 bc306fe5822..9daa11a4ea2 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 51ab1920de6..43a0838f703 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 a3dc6093203..e4bdcb750b3 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 86027b0987d..51de88f313b 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 bc306fe5822..9daa11a4ea2 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 1839c43c667..9edf7895555 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 bc306fe5822..9daa11a4ea2 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 907cce48a95..1cf8ad40d03 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 e6afb9ae720..a4059ed3801 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 ccebeb74e56..0672c881559 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 62541310d2d..fc40138f3df 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 0899764535c..53adc5aad66 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 3da2601fe3c..4e34b67ba89 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 dbcd421d2b1..49088e772b0 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 bc306fe5822..9daa11a4ea2 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 b0fb5c47692..427c9f4ff22 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 4b82c017958..615a647ffe1 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 affa9b85b29..bed0dff059f 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 3fab274a410..3e2504b4bb2 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 4be47a3f1ad..23b119c5563 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 ce96f79d40d..ff0a5a3fc26 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 526fe57e893..1ab9e7415d5 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 bc306fe5822..9daa11a4ea2 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 fb51ee8b64e..600ffcb21c8 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 abe61475903..f5b58ef0c90 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 dfc7f88ca6d..884f5ed8cd3 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 be75e8ba45a..d32e0a543a3 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 ca038952bd6..51d2849fce1 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 df397ea3014..7fb92b25f5a 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 47a77903d55..801c33d8cf9 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 f4514376b4e..4de747e5684 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
diff --git a/app-eselect/eselect-ctags/metadata.xml b/app-eselect/eselect-ctags/metadata.xml
index bc306fe5822..385932e856a 100644
--- a/app-eselect/eselect-ctags/metadata.xml
+++ b/app-eselect/eselect-ctags/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/app-eselect/eselect-emacs/metadata.xml b/app-eselect/eselect-emacs/metadata.xml
index bc306fe5822..385932e856a 100644
--- a/app-eselect/eselect-emacs/metadata.xml
+++ b/app-eselect/eselect-emacs/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>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
</pkgmetadata>
diff --git a/virtual/editor/metadata.xml b/virtual/editor/metadata.xml
index 472bbacc8c4..d3514926a04 100644
--- a/virtual/editor/metadata.xml
+++ b/virtual/editor/metadata.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>emacs</herd>
-<herd>xemacs</herd>
+<maintainer>
+ <email>emacs@gentoo.org</email>
+ <name>Gentoo Emacs project</name>
+</maintainer>
<herd>vim</herd>
<herd>base-system</herd>
</pkgmetadata>
diff --git a/virtual/emacs-flim/metadata.xml b/virtual/emacs-flim/metadata.xml
index bc306fe5822..9daa11a4ea2 100644
--- a/virtual/emacs-flim/metadata.xml
+++ b/virtual/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/virtual/emacs/metadata.xml b/virtual/emacs/metadata.xml
index bc306fe5822..9daa11a4ea2 100644
--- a/virtual/emacs/metadata.xml
+++ b/virtual/emacs/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>