public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/ipsvd/, media-gfx/quat/, x11-wm/oroborus/, net-misc/liveice/, ...
@ 2016-01-24 23:08 Michał Górny
  0 siblings, 0 replies; only message in thread
From: Michał Górny @ 2016-01-24 23:08 UTC (permalink / raw
  To: gentoo-commits

commit:     54abd8ef454d94e71828d9841d045b8c58a58987
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 22:22:16 2016 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 22:58:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54abd8ef

Remove explicit notion of maintainer-needed, for GLEP 67

GLEP 67 removes the explicit notion of maintainer-needed <AT> g.o being used
for packages lacking maintainers, in favor of assuming maintainer-needed
whenever the package has no maintainers.

 app-accessibility/perlbox-voice/metadata.xml            | 3 ---
 app-admin/389-admin-console/metadata.xml                | 3 ---
 app-admin/389-console/metadata.xml                      | 3 ---
 app-admin/389-ds-console/metadata.xml                   | 3 ---
 app-admin/amazon-ec2-init/metadata.xml                  | 3 ---
 app-admin/analog/metadata.xml                           | 4 ----
 app-admin/chroot_safe/metadata.xml                      | 3 ---
 app-admin/clustershell/metadata.xml                     | 3 ---
 app-admin/cronolog/metadata.xml                         | 3 ---
 app-admin/durep/metadata.xml                            | 3 ---
 app-admin/ec2-ami-tools/metadata.xml                    | 3 ---
 app-admin/ec2-api-tools/metadata.xml                    | 3 ---
 app-admin/fetchlog/metadata.xml                         | 3 ---
 app-admin/filewatcher/metadata.xml                      | 4 ----
 app-admin/fsvs/metadata.xml                             | 3 ---
 app-admin/genromfs/metadata.xml                         | 3 ---
 app-admin/hardinfo/metadata.xml                         | 3 ---
 app-admin/ide-smart/metadata.xml                        | 4 ----
 app-admin/jinit/metadata.xml                            | 3 ---
 app-admin/kedpm/metadata.xml                            | 3 ---
 app-admin/logsentry/metadata.xml                        | 4 ----
 app-admin/logsurfer+/metadata.xml                       | 3 ---
 app-admin/longrun/metadata.xml                          | 3 ---
 app-admin/lsat/metadata.xml                             | 4 ----
 app-admin/lsyncd/metadata.xml                           | 3 ---
 app-admin/multilog-watch/metadata.xml                   | 3 ---
 app-admin/newsyslog/metadata.xml                        | 4 ----
 app-admin/passook/metadata.xml                          | 3 ---
 app-admin/petrovich/metadata.xml                        | 4 ----
 app-admin/pprocm/metadata.xml                           | 3 ---
 app-admin/procinfo/metadata.xml                         | 3 ---
 app-admin/psmon/metadata.xml                            | 4 ----
 app-admin/quickswitch/metadata.xml                      | 3 ---
 app-admin/recursos/metadata.xml                         | 3 ---
 app-admin/reportmagic/metadata.xml                      | 6 +-----
 app-admin/sxid/metadata.xml                             | 4 ----
 app-admin/syslogread/metadata.xml                       | 3 ---
 app-admin/usermin/metadata.xml                          | 3 ---
 app-admin/watchfolder/metadata.xml                      | 3 ---
 app-admin/yaala/metadata.xml                            | 3 ---
 app-arch/afio/metadata.xml                              | 3 ---
 app-arch/arc/metadata.xml                               | 3 ---
 app-arch/arj/metadata.xml                               | 3 ---
 app-arch/cfv/metadata.xml                               | 3 ---
 app-arch/deltarpm/metadata.xml                          | 3 ---
 app-arch/freeze/metadata.xml                            | 4 ----
 app-arch/gtk-splitter/metadata.xml                      | 4 ----
 app-arch/ipkg-utils/metadata.xml                        | 3 ---
 app-arch/lzma/metadata.xml                              | 3 ---
 app-arch/makeself/metadata.xml                          | 3 ---
 app-arch/mscompress/metadata.xml                        | 4 ----
 app-arch/par/metadata.xml                               | 3 ---
 app-arch/pax/metadata.xml                               | 3 ---
 app-arch/pdv/metadata.xml                               | 3 ---
 app-arch/pure-sfv/metadata.xml                          | 4 ----
 app-arch/rzip/metadata.xml                              | 4 ----
 app-arch/stuffit/metadata.xml                           | 3 ---
 app-arch/tardy/metadata.xml                             | 3 ---
 app-arch/tarsync/metadata.xml                           | 3 ---
 app-arch/threadzip/metadata.xml                         | 3 ---
 app-arch/undms/metadata.xml                             | 3 ---
 app-arch/unlzx/metadata.xml                             | 4 ----
 app-arch/upx-bin/metadata.xml                           | 3 ---
 app-arch/upx-ucl/metadata.xml                           | 3 ---
 app-arch/xdms/metadata.xml                              | 3 ---
 app-arch/zoo/metadata.xml                               | 4 ----
 app-backup/furball/metadata.xml                         | 4 ----
 app-backup/hdup/metadata.xml                            | 3 ---
 app-backup/qt4-fsarchiver/metadata.xml                  | 3 ---
 app-backup/reoback/metadata.xml                         | 4 ----
 app-backup/tob/metadata.xml                             | 4 ----
 app-benchmarks/contest/metadata.xml                     | 4 ----
 app-benchmarks/volanomark/metadata.xml                  | 3 ---
 app-cdr/mkcdtoc/metadata.xml                            | 3 ---
 app-crypt/gifshuffle/metadata.xml                       | 3 ---
 app-crypt/keylookup/metadata.xml                        | 4 ----
 app-crypt/keynote/metadata.xml                          | 3 ---
 app-crypt/nistp224/metadata.xml                         | 3 ---
 app-crypt/rotix/metadata.xml                            | 4 ----
 app-crypt/xor-analyze/metadata.xml                      | 1 -
 app-dicts/aspell-af/metadata.xml                        | 1 -
 app-dicts/aspell-be/metadata.xml                        | 1 -
 app-dicts/aspell-bg/metadata.xml                        | 1 -
 app-dicts/aspell-br/metadata.xml                        | 1 -
 app-dicts/aspell-ca/metadata.xml                        | 1 -
 app-dicts/aspell-cs/metadata.xml                        | 1 -
 app-dicts/aspell-cy/metadata.xml                        | 1 -
 app-dicts/aspell-da/metadata.xml                        | 1 -
 app-dicts/aspell-de/metadata.xml                        | 1 -
 app-dicts/aspell-el/metadata.xml                        | 1 -
 app-dicts/aspell-en/metadata.xml                        | 1 -
 app-dicts/aspell-eo/metadata.xml                        | 1 -
 app-dicts/aspell-es/metadata.xml                        | 1 -
 app-dicts/aspell-et/metadata.xml                        | 1 -
 app-dicts/aspell-fi/metadata.xml                        | 1 -
 app-dicts/aspell-fo/metadata.xml                        | 1 -
 app-dicts/aspell-fr/metadata.xml                        | 1 -
 app-dicts/aspell-ga/metadata.xml                        | 1 -
 app-dicts/aspell-gl/metadata.xml                        | 1 -
 app-dicts/aspell-he/metadata.xml                        | 1 -
 app-dicts/aspell-hr/metadata.xml                        | 1 -
 app-dicts/aspell-hu/metadata.xml                        | 1 -
 app-dicts/aspell-hy/metadata.xml                        | 1 -
 app-dicts/aspell-is/metadata.xml                        | 1 -
 app-dicts/aspell-it/metadata.xml                        | 3 ---
 app-dicts/aspell-la/metadata.xml                        | 1 -
 app-dicts/aspell-lt/metadata.xml                        | 1 -
 app-dicts/aspell-nl/metadata.xml                        | 1 -
 app-dicts/aspell-no/metadata.xml                        | 1 -
 app-dicts/aspell-pl/metadata.xml                        | 1 -
 app-dicts/aspell-pt-br/metadata.xml                     | 1 -
 app-dicts/aspell-pt/metadata.xml                        | 1 -
 app-dicts/aspell-ro/metadata.xml                        | 3 ---
 app-dicts/aspell-ru/metadata.xml                        | 1 -
 app-dicts/aspell-sk/metadata.xml                        | 1 -
 app-dicts/aspell-sl/metadata.xml                        | 1 -
 app-dicts/aspell-sr/metadata.xml                        | 1 -
 app-dicts/aspell-sv/metadata.xml                        | 1 -
 app-dicts/aspell-uk/metadata.xml                        | 1 -
 app-dicts/aspell-vi/metadata.xml                        | 1 -
 app-dicts/dictd-devils/metadata.xml                     | 1 -
 app-dicts/dictd-dicts/metadata.xml                      | 1 -
 app-dicts/dictd-elements/metadata.xml                   | 1 -
 app-dicts/dictd-foldoc/metadata.xml                     | 1 -
 app-dicts/dictd-gazetteer/metadata.xml                  | 1 -
 app-dicts/dictd-jargon/metadata.xml                     | 1 -
 app-dicts/dictd-misc/metadata.xml                       | 1 -
 app-dicts/dictd-vera/metadata.xml                       | 1 -
 app-dicts/dictd-web1913/metadata.xml                    | 1 -
 app-dicts/dictd-wn/metadata.xml                         | 1 -
 app-dicts/duali-data/metadata.xml                       | 3 ---
 app-dicts/eblook/metadata.xml                           | 3 ---
 app-dicts/edictionary/metadata.xml                      | 3 ---
 app-dicts/freedict-deu-eng/metadata.xml                 | 3 ---
 app-dicts/freedict-eng-fra/metadata.xml                 | 3 ---
 app-dicts/freedict-eng-ita/metadata.xml                 | 3 ---
 app-dicts/freedict-eng-swe/metadata.xml                 | 3 ---
 app-dicts/freedict-fra-eng/metadata.xml                 | 3 ---
 app-dicts/freedict-ita-eng/metadata.xml                 | 3 ---
 app-dicts/libydpdict/metadata.xml                       | 3 ---
 app-dicts/myspell-af/metadata.xml                       | 3 ---
 app-dicts/myspell-bg/metadata.xml                       | 3 ---
 app-dicts/myspell-ca/metadata.xml                       | 1 -
 app-dicts/myspell-cs/metadata.xml                       | 1 -
 app-dicts/myspell-cy/metadata.xml                       | 1 -
 app-dicts/myspell-da/metadata.xml                       | 1 -
 app-dicts/myspell-de/metadata.xml                       | 1 -
 app-dicts/myspell-eo/metadata.xml                       | 3 ---
 app-dicts/myspell-es/metadata.xml                       | 1 -
 app-dicts/myspell-et/metadata.xml                       | 1 -
 app-dicts/myspell-fo/metadata.xml                       | 1 -
 app-dicts/myspell-fr/metadata.xml                       | 1 -
 app-dicts/myspell-ga/metadata.xml                       | 1 -
 app-dicts/myspell-gl/metadata.xml                       | 1 -
 app-dicts/myspell-he/metadata.xml                       | 1 -
 app-dicts/myspell-hr/metadata.xml                       | 1 -
 app-dicts/myspell-hu/metadata.xml                       | 3 ---
 app-dicts/myspell-ia/metadata.xml                       | 1 -
 app-dicts/myspell-id/metadata.xml                       | 1 -
 app-dicts/myspell-is/metadata.xml                       | 1 -
 app-dicts/myspell-it/metadata.xml                       | 3 ---
 app-dicts/myspell-km/metadata.xml                       | 1 -
 app-dicts/myspell-ku/metadata.xml                       | 3 ---
 app-dicts/myspell-lt/metadata.xml                       | 1 -
 app-dicts/myspell-mi/metadata.xml                       | 1 -
 app-dicts/myspell-mk/metadata.xml                       | 1 -
 app-dicts/myspell-ms/metadata.xml                       | 1 -
 app-dicts/myspell-nb/metadata.xml                       | 1 -
 app-dicts/myspell-nl/metadata.xml                       | 1 -
 app-dicts/myspell-nn/metadata.xml                       | 1 -
 app-dicts/myspell-pl/metadata.xml                       | 3 ---
 app-dicts/myspell-pt-br/metadata.xml                    | 1 -
 app-dicts/myspell-pt/metadata.xml                       | 1 -
 app-dicts/myspell-ro/metadata.xml                       | 3 ---
 app-dicts/myspell-sk/metadata.xml                       | 1 -
 app-dicts/myspell-sl/metadata.xml                       | 1 -
 app-dicts/myspell-sq/metadata.xml                       | 1 -
 app-dicts/myspell-sv/metadata.xml                       | 1 -
 app-dicts/myspell-sw/metadata.xml                       | 1 -
 app-dicts/myspell-tn/metadata.xml                       | 1 -
 app-dicts/myspell-uk/metadata.xml                       | 1 -
 app-dicts/myspell-zu/metadata.xml                       | 3 ---
 app-dicts/qvortaro/metadata.xml                         | 3 ---
 app-dicts/stardict-dictd-devils/metadata.xml            | 3 ---
 app-dicts/stardict-freedict-eng-deu/metadata.xml        | 3 ---
 app-dicts/stardict-freedict-eng-fra/metadata.xml        | 3 ---
 app-dicts/stardict-freedict-eng-ita/metadata.xml        | 3 ---
 app-dicts/stardict-freedict-eng-lat/metadata.xml        | 3 ---
 app-dicts/stardict-freedict-eng-rus/metadata.xml        | 3 ---
 app-dicts/stardict-freedict-eng-spa/metadata.xml        | 3 ---
 app-dicts/stardict-freedict-eng-swe/metadata.xml        | 3 ---
 app-dicts/stardict-freedict-eng-tur/metadata.xml        | 3 ---
 app-dicts/stardict-freedict-tur-deu/metadata.xml        | 3 ---
 app-dicts/stardict-freedict-tur-eng/metadata.xml        | 3 ---
 app-dicts/stardict-hnd-de-vi/metadata.xml               | 3 ---
 app-dicts/stardict-hnd-en-vi/metadata.xml               | 3 ---
 app-dicts/stardict-hnd-fr-vi/metadata.xml               | 3 ---
 app-dicts/stardict-hnd-ru-vi/metadata.xml               | 3 ---
 app-dicts/stardict-hnd-vi-de/metadata.xml               | 3 ---
 app-dicts/stardict-hnd-vi-en/metadata.xml               | 3 ---
 app-dicts/stardict-hnd-vi-fr/metadata.xml               | 3 ---
 app-dicts/stardict-hnd-vi-vi/metadata.xml               | 3 ---
 app-dicts/stardict-mova-smiley/metadata.xml             | 3 ---
 app-dicts/stardict-quick-eng-fra/metadata.xml           | 3 ---
 app-dicts/stardict-quick-ru-en/metadata.xml             | 3 ---
 app-dicts/stardict-xdict-zh-en-gb/metadata.xml          | 3 ---
 app-dicts/wordnet/metadata.xml                          | 3 ---
 app-dicts/ydpdict/metadata.xml                          | 3 ---
 app-doc/gimp-help/metadata.xml                          | 3 ---
 app-doc/linux-gazette-base/metadata.xml                 | 3 ---
 app-doc/mkdoxy/metadata.xml                             | 3 ---
 app-doc/psmark/metadata.xml                             | 3 ---
 app-doc/selfhtml/metadata.xml                           | 4 ----
 app-doc/selflinux/metadata.xml                          | 3 ---
 app-doc/xmltoman/metadata.xml                           | 3 ---
 app-editors/XML-XSH2/metadata.xml                       | 3 ---
 app-editors/cooledit/metadata.xml                       | 3 ---
 app-editors/dav/metadata.xml                            | 4 ----
 app-editors/dhex/metadata.xml                           | 3 ---
 app-editors/efte/metadata.xml                           | 3 ---
 app-editors/fte/metadata.xml                            | 3 ---
 app-editors/le/metadata.xml                             | 3 ---
 app-editors/levee/metadata.xml                          | 3 ---
 app-editors/lfhex/metadata.xml                          | 3 ---
 app-editors/lpe/metadata.xml                            | 3 ---
 app-editors/mp/metadata.xml                             | 4 ----
 app-editors/ne/metadata.xml                             | 3 ---
 app-editors/ted/metadata.xml                            | 3 ---
 app-editors/wily/metadata.xml                           | 3 ---
 app-editors/yudit/metadata.xml                          | 3 ---
 app-editors/zoinks/metadata.xml                         | 3 ---
 app-emulation/aranym/metadata.xml                       | 3 ---
 app-emulation/dinero/metadata.xml                       | 3 ---
 app-emulation/dlx/metadata.xml                          | 4 ----
 app-emulation/domi/metadata.xml                         | 3 ---
 app-emulation/e-uae/metadata.xml                        | 3 ---
 app-emulation/ganeti-instance-debian-etch/metadata.xml  | 3 ---
 app-emulation/ganeti-instance-image/metadata.xml        | 3 ---
 app-emulation/gxemul/metadata.xml                       | 3 ---
 app-emulation/qtemu/metadata.xml                        | 3 ---
 app-emulation/rex-client/metadata.xml                   | 3 ---
 app-emulation/spectemu/metadata.xml                     | 3 ---
 app-emulation/spim/metadata.xml                         | 3 ---
 app-emulation/uae/metadata.xml                          | 3 ---
 app-emulation/vboxgtk/metadata.xml                      | 3 ---
 app-emulation/vmips-cross-bin/metadata.xml              | 3 ---
 app-emulation/vmips/metadata.xml                        | 3 ---
 app-eselect/eselect-audicle/metadata.xml                | 3 ---
 app-eselect/eselect-chuck/metadata.xml                  | 3 ---
 app-eselect/eselect-miniaudicle/metadata.xml            | 3 ---
 app-eselect/eselect-sndpeek/metadata.xml                | 3 ---
 app-forensics/zzuf/metadata.xml                         | 4 ----
 app-i18n/cstools/metadata.xml                           | 5 +----
 app-i18n/man-pages-da/metadata.xml                      | 3 ---
 app-i18n/man-pages-fr/metadata.xml                      | 4 ----
 app-i18n/man-pages-nl/metadata.xml                      | 3 ---
 app-i18n/man-pages-ro/metadata.xml                      | 4 ----
 app-i18n/man-pages-zh_CN/metadata.xml                   | 3 ---
 app-laptop/easy-slow-down-manager/metadata.xml          | 3 ---
 app-laptop/hdaps-gl/metadata.xml                        | 3 ---
 app-laptop/ibam/metadata.xml                            | 3 ---
 app-laptop/lphdisk/metadata.xml                         | 4 ----
 app-laptop/prey/metadata.xml                            | 3 ---
 app-laptop/radeontool/metadata.xml                      | 1 -
 app-laptop/spicctrl/metadata.xml                        | 1 -
 app-laptop/tp_smapi/metadata.xml                        | 3 ---
 app-laptop/tpb/metadata.xml                             | 1 -
 app-misc/acdctl/metadata.xml                            | 4 ----
 app-misc/actkbd/metadata.xml                            | 3 ---
 app-misc/aldo/metadata.xml                              | 4 ----
 app-misc/asciinema/metadata.xml                         | 3 ---
 app-misc/away/metadata.xml                              | 3 ---
 app-misc/basenji/metadata.xml                           | 3 ---
 app-misc/beancounter/metadata.xml                       | 3 ---
 app-misc/bottlerocket/metadata.xml                      | 3 ---
 app-misc/btail/metadata.xml                             | 3 ---
 app-misc/cadubi/metadata.xml                            | 3 ---
 app-misc/cbview/metadata.xml                            | 3 ---
 app-misc/cdcat/metadata.xml                             | 4 ----
 app-misc/cdctl/metadata.xml                             | 3 ---
 app-misc/cdircmp/metadata.xml                           | 4 ----
 app-misc/cdspeed/metadata.xml                           | 3 ---
 app-misc/cmatrix/metadata.xml                           | 3 ---
 app-misc/cstream/metadata.xml                           | 3 ---
 app-misc/dailystrips/metadata.xml                       | 3 ---
 app-misc/ddccontrol-db/metadata.xml                     | 3 ---
 app-misc/ddccontrol/metadata.xml                        | 3 ---
 app-misc/dvorak7min/metadata.xml                        | 4 ----
 app-misc/dvorakng/metadata.xml                          | 3 ---
 app-misc/esekeyd/metadata.xml                           | 3 ---
 app-misc/flasm/metadata.xml                             | 3 ---
 app-misc/fslint/metadata.xml                            | 3 ---
 app-misc/fujiplay/metadata.xml                          | 4 ----
 app-misc/g15mpd/metadata.xml                            | 3 ---
 app-misc/glastree/metadata.xml                          | 3 ---
 app-misc/glcdprocdriver/metadata.xml                    | 3 ---
 app-misc/glimpse/metadata.xml                           | 3 ---
 app-misc/gnomecatalog/metadata.xml                      | 4 ----
 app-misc/gnutu/metadata.xml                             | 3 ---
 app-misc/grabcartoons/metadata.xml                      | 1 -
 app-misc/hachoir-metadata/metadata.xml                  | 3 ---
 app-misc/hachoir-subfile/metadata.xml                   | 3 ---
 app-misc/hachoir-urwid/metadata.xml                     | 3 ---
 app-misc/ignuit/metadata.xml                            | 3 ---
 app-misc/joy2key/metadata.xml                           | 3 ---
 app-misc/klavaro/metadata.xml                           | 3 ---
 app-misc/lcd4linux/metadata.xml                         | 3 ---
 app-misc/lfm/metadata.xml                               | 3 ---
 app-misc/linuxspa/metadata.xml                          | 3 ---
 app-misc/lsx/metadata.xml                               | 3 ---
 app-misc/mencal/metadata.xml                            | 4 ----
 app-misc/mepl/metadata.xml                              | 3 ---
 app-misc/misterhouse/metadata.xml                       | 3 ---
 app-misc/mouseremote/metadata.xml                       | 3 ---
 app-misc/multimon/metadata.xml                          | 3 ---
 app-misc/mvcase/metadata.xml                            | 3 ---
 app-misc/note/metadata.xml                              | 4 ----
 app-misc/nut/metadata.xml                               | 3 ---
 app-misc/pal/metadata.xml                               | 3 ---
 app-misc/perltrash/metadata.xml                         | 4 ----
 app-misc/physlock/metadata.xml                          | 3 ---
 app-misc/pipeworks/metadata.xml                         | 3 ---
 app-misc/plod/metadata.xml                              | 3 ---
 app-misc/recoll/metadata.xml                            | 3 ---
 app-misc/regex-markup/metadata.xml                      | 4 ----
 app-misc/relevation/metadata.xml                        | 3 ---
 app-misc/rioutil/metadata.xml                           | 4 ----
 app-misc/run-mailcap/metadata.xml                       | 3 ---
 app-misc/slmon/metadata.xml                             | 3 ---
 app-misc/smtm/metadata.xml                              | 3 ---
 app-misc/solaar/metadata.xml                            | 3 ---
 app-misc/sonypid/metadata.xml                           | 3 ---
 app-misc/tablix/metadata.xml                            | 1 -
 app-misc/tkpasman/metadata.xml                          | 3 ---
 app-misc/towitoko/metadata.xml                          | 3 ---
 app-misc/tpconfig/metadata.xml                          | 3 ---
 app-misc/tprint/metadata.xml                            | 3 ---
 app-misc/ttyrec/metadata.xml                            | 3 ---
 app-misc/vittk/metadata.xml                             | 3 ---
 app-misc/webcomics-collector/metadata.xml               | 3 ---
 app-misc/worker/metadata.xml                            | 3 ---
 app-misc/yagtd/metadata.xml                             | 3 ---
 app-misc/ytree/metadata.xml                             | 3 ---
 app-mobilephone/anyremote/metadata.xml                  | 3 ---
 app-mobilephone/bitpim/metadata.xml                     | 1 -
 app-mobilephone/dfu-util/metadata.xml                   | 1 -
 app-mobilephone/esms/metadata.xml                       | 3 ---
 app-mobilephone/gammu/metadata.xml                      | 1 -
 app-mobilephone/ganyremote/metadata.xml                 | 3 ---
 app-mobilephone/gnocky/metadata.xml                     | 1 -
 app-mobilephone/gnokii/metadata.xml                     | 1 -
 app-mobilephone/gsmlib/metadata.xml                     | 1 -
 app-mobilephone/kannel-sqlbox/metadata.xml              | 1 -
 app-mobilephone/kannel/metadata.xml                     | 1 -
 app-mobilephone/linuxsms/metadata.xml                   | 3 ---
 app-mobilephone/obex-data-server/metadata.xml           | 1 -
 app-mobilephone/obexftp/metadata.xml                    | 3 ---
 app-mobilephone/past/metadata.xml                       | 3 ---
 app-mobilephone/pysms/metadata.xml                      | 3 ---
 app-mobilephone/ringtonetools/metadata.xml              | 1 -
 app-mobilephone/scmxx/metadata.xml                      | 3 ---
 app-mobilephone/sms/metadata.xml                        | 1 -
 app-mobilephone/smsclient/metadata.xml                  | 1 -
 app-mobilephone/smssend/metadata.xml                    | 1 -
 app-mobilephone/vmoconv/metadata.xml                    | 1 -
 app-mobilephone/wammu/metadata.xml                      | 1 -
 app-mobilephone/yaps/metadata.xml                       | 1 -
 app-office/ical/metadata.xml                            | 3 ---
 app-office/multitalk/metadata.xml                       | 3 ---
 app-office/passepartout/metadata.xml                    | 1 -
 app-office/plan/metadata.xml                            | 4 ----
 app-office/sc/metadata.xml                              | 3 ---
 app-office/tedia2sql/metadata.xml                       | 3 ---
 app-pda/iripdb/metadata.xml                             | 4 ----
 app-portage/demerge/metadata.xml                        | 3 ---
 app-portage/maintainer-helper/metadata.xml              | 3 ---
 app-portage/splat/metadata.xml                          | 3 ---
 app-shells/esh/metadata.xml                             | 3 ---
 app-shells/psh/metadata.xml                             | 3 ---
 app-shells/sash/metadata.xml                            | 3 ---
 app-shells/shish/metadata.xml                           | 3 ---
 app-shells/soapbox/metadata.xml                         | 3 ---
 app-text/7plus/metadata.xml                             | 3 ---
 app-text/adiff/metadata.xml                             | 3 ---
 app-text/antixls/metadata.xml                           | 3 ---
 app-text/apvlv/metadata.xml                             | 3 ---
 app-text/bact/metadata.xml                              | 3 ---
 app-text/build-docbook-catalog/metadata.xml             | 1 -
 app-text/clara/metadata.xml                             | 3 ---
 app-text/code2html/metadata.xml                         | 3 ---
 app-text/convertlit/metadata.xml                        | 1 -
 app-text/cook/metadata.xml                              | 3 ---
 app-text/ddir/metadata.xml                              | 3 ---
 app-text/dictd/metadata.xml                             | 3 ---
 app-text/ding/metadata.xml                              | 3 ---
 app-text/docbook-dsssl-stylesheets/metadata.xml         | 3 ---
 app-text/docbook-sgml-dtd/metadata.xml                  | 1 -
 app-text/docbook-sgml-utils/metadata.xml                | 3 +--
 app-text/docbook-sgml/metadata.xml                      | 1 -
 app-text/docbook-xml-dtd/metadata.xml                   | 1 -
 app-text/docbook-xml-simple-dtd/metadata.xml            | 1 -
 app-text/docbook-xsl-stylesheets/metadata.xml           | 3 ---
 app-text/docbook2X/metadata.xml                         | 3 ---
 app-text/duali/metadata.xml                             | 4 ----
 app-text/epstool/metadata.xml                           | 3 ---
 app-text/expander/metadata.xml                          | 4 ----
 app-text/freepwing/metadata.xml                         | 3 ---
 app-text/gentoo-guide-xml-dtd/metadata.xml              | 1 -
 app-text/gnopaster/metadata.xml                         | 3 ---
 app-text/grutatxt/metadata.xml                          | 1 -
 app-text/hnb/metadata.xml                               | 3 ---
 app-text/html401/metadata.xml                           | 1 -
 app-text/htmldoc/metadata.xml                           | 3 ---
 app-text/htmlinc/metadata.xml                           | 3 ---
 app-text/htmlrecode/metadata.xml                        | 1 -
 app-text/htmltidy/metadata.xml                          | 3 ---
 app-text/keepnote/metadata.xml                          | 3 ---
 app-text/libxmlpatch/metadata.xml                       | 3 ---
 app-text/logmerge/metadata.xml                          | 3 ---
 app-text/lout/metadata.xml                              | 3 ---
 app-text/mbtpdfasm/metadata.xml                         | 3 ---
 app-text/mht-rip/metadata.xml                           | 3 ---
 app-text/mpage/metadata.xml                             | 3 ---
 app-text/notecase/metadata.xml                          | 3 ---
 app-text/o3read/metadata.xml                            | 3 ---
 app-text/openjade/metadata.xml                          | 3 ---
 app-text/ots/metadata.xml                               | 3 ---
 app-text/par/metadata.xml                               | 3 ---
 app-text/pdf2oo/metadata.xml                            | 3 ---
 app-text/pep/metadata.xml                               | 3 ---
 app-text/psiconv/metadata.xml                           | 4 ----
 app-text/pspresent/metadata.xml                         | 3 ---
 app-text/reed/metadata.xml                              | 3 ---
 app-text/rfcutil/metadata.xml                           | 3 ---
 app-text/rhyme/metadata.xml                             | 3 ---
 app-text/robodoc/metadata.xml                           | 1 -
 app-text/sablotron/metadata.xml                         | 1 -
 app-text/sdcv/metadata.xml                              | 3 ---
 app-text/searchmonkey/metadata.xml                      | 3 ---
 app-text/sgml-common/metadata.xml                       | 1 -
 app-text/sgmltools-lite/metadata.xml                    | 3 ---
 app-text/sgrep/metadata.xml                             | 1 -
 app-text/spellutils/metadata.xml                        | 3 ---
 app-text/stardict/metadata.xml                          | 3 ---
 app-text/tabler/metadata.xml                            | 3 ---
 app-text/tkinfo/metadata.xml                            | 3 ---
 app-text/tkman/metadata.xml                             | 3 ---
 app-text/tuxcards/metadata.xml                          | 4 ----
 app-text/txt2pdbdoc/metadata.xml                        | 3 ---
 app-text/uudeview/metadata.xml                          | 4 ----
 app-text/webgen/metadata.xml                            | 1 -
 app-text/xhtml1/metadata.xml                            | 1 -
 app-text/xlhtml/metadata.xml                            | 3 ---
 app-text/xml2/metadata.xml                              | 1 -
 app-text/xml2doc/metadata.xml                           | 3 ---
 app-text/xmlformat/metadata.xml                         | 1 -
 app-text/xmlto/metadata.xml                             | 1 -
 app-text/zpspell/metadata.xml                           | 3 ---
 dev-cpp/tclap/metadata.xml                              | 3 ---
 dev-db/cdb/metadata.xml                                 | 3 ---
 dev-db/firebird/metadata.xml                            | 3 ---
 dev-db/flamerobin/metadata.xml                          | 3 ---
 dev-db/gigabase/metadata.xml                            | 3 ---
 dev-db/lib_mysqludf_fPROJ4/metadata.xml                 | 3 ---
 dev-db/lib_mysqludf_json/metadata.xml                   | 3 ---
 dev-db/lib_mysqludf_log/metadata.xml                    | 3 ---
 dev-db/lib_mysqludf_preg/metadata.xml                   | 3 ---
 dev-db/lib_mysqludf_stat/metadata.xml                   | 3 ---
 dev-db/lib_mysqludf_stem/metadata.xml                   | 3 ---
 dev-db/lib_mysqludf_str/metadata.xml                    | 3 ---
 dev-db/lib_mysqludf_sys/metadata.xml                    | 3 ---
 dev-db/lib_mysqludf_ta/metadata.xml                     | 3 ---
 dev-db/lib_mysqludf_udf/metadata.xml                    | 3 ---
 dev-db/lib_mysqludf_xql/metadata.xml                    | 3 ---
 dev-db/metakit/metadata.xml                             | 3 ---
 dev-db/mysql-udf-base64/metadata.xml                    | 3 ---
 dev-db/mysql-udf-http/metadata.xml                      | 3 ---
 dev-db/mysql-udf-infusion/metadata.xml                  | 3 ---
 dev-db/mysql-udf-ipv6/metadata.xml                      | 3 ---
 dev-db/mysqltuner/metadata.xml                          | 3 ---
 dev-db/odbtp/metadata.xml                               | 3 ---
 dev-db/recutils/metadata.xml                            | 3 ---
 dev-db/sqliteodbc/metadata.xml                          | 4 ----
 dev-db/vbisam/metadata.xml                              | 3 ---
 dev-db/xbase/metadata.xml                               | 3 ---
 dev-db/xbsql/metadata.xml                               | 3 ---
 dev-embedded/gnap-dev/metadata.xml                      | 3 ---
 dev-embedded/gnap-ext/metadata.xml                      | 3 ---
 dev-embedded/gnap/metadata.xml                          | 3 ---
 dev-embedded/powersoftplus-libftdi/metadata.xml         | 3 ---
 dev-games/aseprite/metadata.xml                         | 3 ---
 dev-java/idm-console-framework/metadata.xml             | 5 +----
 dev-lang/bas/metadata.xml                               | 3 ---
 dev-lang/bff/metadata.xml                               | 3 ---
 dev-lang/cll1h/metadata.xml                             | 3 ---
 dev-lang/ferite/metadata.xml                            | 3 ---
 dev-lang/gwydion-dylan-bin/metadata.xml                 | 3 ---
 dev-lang/lisaac/metadata.xml                            | 3 ---
 dev-lang/nqc/metadata.xml                               | 4 ----
 dev-lang/pasm/metadata.xml                              | 3 ---
 dev-lang/regina-rexx/metadata.xml                       | 4 ----
 dev-lang/tinycobol/metadata.xml                         | 3 ---
 dev-libs/389-adminutil/metadata.xml                     | 3 ---
 dev-libs/9libs/metadata.xml                             | 3 ---
 dev-libs/antlr-c/metadata.xml                           | 3 ---
 dev-libs/beecrypt/metadata.xml                          | 3 ---
 dev-libs/cdk/metadata.xml                               | 3 ---
 dev-libs/cpl-stratego/metadata.xml                      | 3 ---
 dev-libs/dbus-c++/metadata.xml                          | 3 ---
 dev-libs/dclog/metadata.xml                             | 3 ---
 dev-libs/dietlibc/metadata.xml                          | 3 ---
 dev-libs/djb/metadata.xml                               | 3 ---
 dev-libs/eb/metadata.xml                                | 3 ---
 dev-libs/elfio/metadata.xml                             | 3 ---
 dev-libs/ffcall/metadata.xml                            | 3 ---
 dev-libs/fstrm/metadata.xml                             | 3 ---
 dev-libs/gecode/metadata.xml                            | 3 ---
 dev-libs/guiloader-c++/metadata.xml                     | 3 ---
 dev-libs/guiloader/metadata.xml                         | 3 ---
 dev-libs/hashit/metadata.xml                            | 3 ---
 dev-libs/http-fetcher/metadata.xml                      | 3 ---
 dev-libs/igraph/metadata.xml                            | 3 ---
 dev-libs/legousbtower/metadata.xml                      | 4 ----
 dev-libs/libRocket/metadata.xml                         | 3 ---
 dev-libs/libcaldav/metadata.xml                         | 3 ---
 dev-libs/libezV24/metadata.xml                          | 3 ---
 dev-libs/libhid/metadata.xml                            | 3 ---
 dev-libs/libhome/metadata.xml                           | 3 ---
 dev-libs/libhtmlparse/metadata.xml                      | 3 ---
 dev-libs/libical/metadata.xml                           | 3 ---
 dev-libs/libidmef/metadata.xml                          | 4 ----
 dev-libs/liblazy/metadata.xml                           | 3 ---
 dev-libs/liblinebreak/metadata.xml                      | 3 ---
 dev-libs/libmaa/metadata.xml                            | 3 ---
 dev-libs/libmail/metadata.xml                           | 3 ---
 dev-libs/libmba/metadata.xml                            | 3 ---
 dev-libs/libmix/metadata.xml                            | 3 ---
 dev-libs/libofx/metadata.xml                            | 3 ---
 dev-libs/liboop/metadata.xml                            | 3 ---
 dev-libs/libproccpuinfo/metadata.xml                    | 3 ---
 dev-libs/librep/metadata.xml                            | 3 ---
 dev-libs/libsqlora8/metadata.xml                        | 3 ---
 dev-libs/libtomfloat/metadata.xml                       | 3 ---
 dev-libs/libtommath/metadata.xml                        | 3 ---
 dev-libs/libtompoly/metadata.xml                        | 3 ---
 dev-libs/libtrain/metadata.xml                          | 3 ---
 dev-libs/libunicode/metadata.xml                        | 3 ---
 dev-libs/libvformat/metadata.xml                        | 3 ---
 dev-libs/libwbxml/metadata.xml                          | 3 ---
 dev-libs/libx86emu/metadata.xml                         | 3 ---
 dev-libs/libxdg-basedir/metadata.xml                    | 3 ---
 dev-libs/libxls/metadata.xml                            | 3 ---
 dev-libs/log4c/metadata.xml                             | 3 ---
 dev-libs/log4shib/metadata.xml                          | 3 ---
 dev-libs/ltxml/metadata.xml                             | 3 ---
 dev-libs/luise-bin/metadata.xml                         | 3 ---
 dev-libs/mapm/metadata.xml                              | 3 ---
 dev-libs/mdsplib/metadata.xml                           | 3 ---
 dev-libs/mm/metadata.xml                                | 4 ----
 dev-libs/openobex/metadata.xml                          | 3 ---
 dev-libs/polylib/metadata.xml                           | 1 -
 dev-libs/protobuf-c/metadata.xml                        | 3 ---
 dev-libs/protobuf/metadata.xml                          | 3 ---
 dev-libs/qcodeedit/metadata.xml                         | 3 ---
 dev-libs/safestr/metadata.xml                           | 3 ---
 dev-libs/serdisplib/metadata.xml                        | 3 ---
 dev-libs/shhopt/metadata.xml                            | 3 ---
 dev-libs/skyutils/metadata.xml                          | 1 -
 dev-libs/syck/metadata.xml                              | 3 ---
 dev-libs/syncdir/metadata.xml                           | 3 ---
 dev-libs/tvision/metadata.xml                           | 3 ---
 dev-libs/ucl/metadata.xml                               | 3 ---
 dev-libs/uulib/metadata.xml                             | 3 ---
 dev-libs/vrb/metadata.xml                               | 3 ---
 dev-libs/xmlrpc-epi/metadata.xml                        | 3 ---
 dev-libs/xxl/metadata.xml                               | 3 ---
 dev-lua/lpeg/metadata.xml                               | 3 ---
 dev-lua/lua-cjson/metadata.xml                          | 3 ---
 dev-lua/luacrypto/metadata.xml                          | 3 ---
 dev-lua/luajson/metadata.xml                            | 3 ---
 dev-python/Djblets/metadata.xml                         | 3 ---
 dev-python/audioread/metadata.xml                       | 3 ---
 dev-python/bluelet/metadata.xml                         | 3 ---
 dev-python/fuse-python/metadata.xml                     | 3 ---
 dev-python/pyacoustid/metadata.xml                      | 3 ---
 dev-python/pyechonest/metadata.xml                      | 3 ---
 dev-python/pysyck/metadata.xml                          | 3 ---
 dev-python/python-dsv/metadata.xml                      | 3 ---
 dev-python/pyutil/metadata.xml                          | 3 ---
 dev-python/remoteobjects/metadata.xml                   | 3 ---
 dev-python/rtf2xml/metadata.xml                         | 3 ---
 dev-python/simplegui/metadata.xml                       | 3 ---
 dev-python/skype4py/metadata.xml                        | 3 ---
 dev-python/xmpppy/metadata.xml                          | 3 ---
 dev-python/zbase32/metadata.xml                         | 3 ---
 dev-python/zfec/metadata.xml                            | 3 ---
 dev-util/a8/metadata.xml                                | 3 ---
 dev-util/alleyoop/metadata.xml                          | 3 ---
 dev-util/as11/metadata.xml                              | 3 ---
 dev-util/autodia/metadata.xml                           | 3 ---
 dev-util/bam/metadata.xml                               | 3 ---
 dev-util/bcpp/metadata.xml                              | 4 ----
 dev-util/beediff/metadata.xml                           | 4 ----
 dev-util/bluej/metadata.xml                             | 3 ---
 dev-util/byacc/metadata.xml                             | 3 ---
 dev-util/cccc/metadata.xml                              | 4 ----
 dev-util/ccmalloc/metadata.xml                          | 3 ---
 dev-util/cdecl/metadata.xml                             | 3 ---
 dev-util/cocom/metadata.xml                             | 3 ---
 dev-util/cproto/metadata.xml                            | 3 ---
 dev-util/crow-designer/metadata.xml                     | 3 ---
 dev-util/cutils/metadata.xml                            | 3 ---
 dev-util/dirdiff/metadata.xml                           | 3 ---
 dev-util/dissembler/metadata.xml                        | 3 ---
 dev-util/dwarves/metadata.xml                           | 3 ---
 dev-util/eggy/metadata.xml                              | 3 ---
 dev-util/egypt/metadata.xml                             | 4 ----
 dev-util/filepp/metadata.xml                            | 3 ---
 dev-util/flawfinder/metadata.xml                        | 4 ----
 dev-util/ftnchek/metadata.xml                           | 3 ---
 dev-util/gengetopt/metadata.xml                         | 3 ---
 dev-util/ghh/metadata.xml                               | 3 ---
 dev-util/httpup/metadata.xml                            | 3 ---
 dev-util/huc/metadata.xml                               | 3 ---
 dev-util/hxd/metadata.xml                               | 3 ---
 dev-util/injectso/metadata.xml                          | 3 ---
 dev-util/intel2gas/metadata.xml                         | 3 ---
 dev-util/jif/metadata.xml                               | 3 ---
 dev-util/kdoc/metadata.xml                              | 4 ----
 dev-util/linklint/metadata.xml                          | 3 ---
 dev-util/lockrun/metadata.xml                           | 3 ---
 dev-util/lsuio/metadata.xml                             | 1 -
 dev-util/memprof/metadata.xml                           | 3 ---
 dev-util/metro/metadata.xml                             | 3 ---
 dev-util/min-cscope/metadata.xml                        | 3 ---
 dev-util/mock/metadata.xml                              | 3 ---
 dev-util/mutrace/metadata.xml                           | 3 ---
 dev-util/nsis/metadata.xml                              | 3 ---
 dev-util/osdt/metadata.xml                              | 3 ---
 dev-util/par/metadata.xml                               | 3 ---
 dev-util/piklab/metadata.xml                            | 3 ---
 dev-util/pmk/metadata.xml                               | 3 ---
 dev-util/pretrace/metadata.xml                          | 3 ---
 dev-util/qdevelop/metadata.xml                          | 3 ---
 dev-util/qmtest/metadata.xml                            | 1 -
 dev-util/rec/metadata.xml                               | 3 ---
 dev-util/redet/metadata.xml                             | 3 ---
 dev-util/rootstrap/metadata.xml                         | 4 ----
 dev-util/scanmem/metadata.xml                           | 3 ---
 dev-util/skelgen/metadata.xml                           | 3 ---
 dev-util/synopsis/metadata.xml                          | 3 ---
 dev-util/tinlink/metadata.xml                           | 3 ---
 dev-util/tmake/metadata.xml                             | 3 ---
 dev-util/trinity/metadata.xml                           | 3 ---
 dev-util/umockdev/metadata.xml                          | 3 ---
 dev-util/usb-robot/metadata.xml                         | 3 ---
 dev-util/webcpp/metadata.xml                            | 3 ---
 dev-util/weblint/metadata.xml                           | 3 ---
 dev-util/xesam-tools/metadata.xml                       | 3 ---
 dev-util/yacc/metadata.xml                              | 3 ---
 dev-vcs/archway/metadata.xml                            | 4 ----
 dev-vcs/cvsspam/metadata.xml                            | 3 ---
 dev-vcs/easygit/metadata.xml                            | 3 ---
 dev-vcs/guilt/metadata.xml                              | 3 ---
 dev-vcs/hgsvn/metadata.xml                              | 3 ---
 dev-vcs/svnmailer/metadata.xml                          | 3 ---
 gnome-extra/connman-gnome/metadata.xml                  | 3 ---
 gnome-extra/gdesklets-core/metadata.xml                 | 3 +--
 gnome-extra/gnome-color-chooser/metadata.xml            | 4 ----
 gnome-extra/gnome-do-plugins/metadata.xml               | 3 ---
 gnome-extra/gpointing-device-settings/metadata.xml      | 3 ---
 gnome-extra/nautilus-dropbox/metadata.xml               | 3 ---
 mail-client/mail-notification/metadata.xml              | 3 ---
 mail-filter/anomy-sanitizer/metadata.xml                | 3 ---
 mail-filter/libsieve/metadata.xml                       | 3 ---
 mail-filter/popfile/metadata.xml                        | 4 ----
 mail-filter/sieve-connect/metadata.xml                  | 3 ---
 mail-filter/spamassassin/metadata.xml                   | 5 +----
 media-gfx/DFBPoint/metadata.xml                         | 4 ----
 media-gfx/arss/metadata.xml                             | 3 ---
 media-gfx/aview/metadata.xml                            | 3 ---
 media-gfx/bootsplash-themes/metadata.xml                | 3 ---
 media-gfx/crwinfo/metadata.xml                          | 4 ----
 media-gfx/cthumb/metadata.xml                           | 3 ---
 media-gfx/fblogo/metadata.xml                           | 3 ---
 media-gfx/fbv/metadata.xml                              | 3 ---
 media-gfx/figurine/metadata.xml                         | 3 ---
 media-gfx/gozer/metadata.xml                            | 3 ---
 media-gfx/mkgallery/metadata.xml                        | 3 ---
 media-gfx/nvidia-texture-tools/metadata.xml             | 3 ---
 media-gfx/pencil/metadata.xml                           | 3 ---
 media-gfx/peps/metadata.xml                             | 3 ---
 media-gfx/photopc/metadata.xml                          | 3 ---
 media-gfx/pictureflow/metadata.xml                      | 3 ---
 media-gfx/picturewall/metadata.xml                      | 3 ---
 media-gfx/pngnq/metadata.xml                            | 3 ---
 media-gfx/propaganda/metadata.xml                       | 3 ---
 media-gfx/qingy-themes/metadata.xml                     | 3 ---
 media-gfx/quat/metadata.xml                             | 3 ---
 media-gfx/sane-backends/metadata.xml                    | 3 ---
 media-gfx/sane-frontends/metadata.xml                   | 3 ---
 media-gfx/smile/metadata.xml                            | 3 ---
 media-gfx/splash-themes-gentoo/metadata.xml             | 3 ---
 media-gfx/tgif/metadata.xml                             | 3 ---
 media-gfx/videorbits/metadata.xml                       | 4 ----
 media-gfx/viewer/metadata.xml                           | 4 ----
 media-gfx/w3mimgfb/metadata.xml                         | 3 ---
 media-gfx/xpaint/metadata.xml                           | 3 ---
 media-gfx/xv/metadata.xml                               | 3 ---
 media-gfx/zgv/metadata.xml                              | 4 ----
 media-libs/csfml/metadata.xml                           | 3 ---
 media-libs/fnlib/metadata.xml                           | 3 ---
 media-libs/iulib/metadata.xml                           | 3 ---
 media-libs/libdlna/metadata.xml                         | 3 ---
 media-libs/libemf/metadata.xml                          | 3 ---
 media-libs/libipod/metadata.xml                         | 4 ----
 media-libs/libirman/metadata.xml                        | 3 ---
 media-libs/libmimic/metadata.xml                        | 3 ---
 media-libs/libmkv/metadata.xml                          | 3 ---
 media-libs/libmnote/metadata.xml                        | 3 ---
 media-libs/libptp2/metadata.xml                         | 3 ---
 media-libs/libwmf/metadata.xml                          | 3 ---
 media-libs/sampleicc/metadata.xml                       | 3 ---
 media-libs/sdlmm/metadata.xml                           | 3 ---
 media-libs/webrtc-audio-processing/metadata.xml         | 3 ---
 media-plugins/gimp-resynthesizer/metadata.xml           | 3 ---
 media-sound/alac_decoder/metadata.xml                   | 3 ---
 media-sound/audicle/metadata.xml                        | 3 ---
 media-sound/dbmeasure/metadata.xml                      | 3 ---
 media-sound/declick/metadata.xml                        | 3 ---
 media-sound/lilycomp/metadata.xml                       | 3 ---
 media-sound/miniaudicle/metadata.xml                    | 3 ---
 media-sound/neroaac/metadata.xml                        | 3 ---
 media-sound/nted/metadata.xml                           | 3 ---
 media-sound/podracer/metadata.xml                       | 3 ---
 media-sound/rgain/metadata.xml                          | 3 ---
 media-sound/shnflacverify/metadata.xml                  | 3 ---
 media-sound/tapestrea/metadata.xml                      | 3 ---
 media-sound/vbrfixc/metadata.xml                        | 3 ---
 media-video/arista/metadata.xml                         | 3 ---
 media-video/bombono-dvd/metadata.xml                    | 3 ---
 media-video/coriander/metadata.xml                      | 3 ---
 media-video/openshot/metadata.xml                       | 3 ---
 media-video/pgcedit/metadata.xml                        | 3 ---
 media-video/rovclock/metadata.xml                       | 3 ---
 media-video/stk11xx/metadata.xml                        | 3 ---
 net-analyzer/authforce/metadata.xml                     | 3 ---
 net-analyzer/bwm-ng/metadata.xml                        | 3 ---
 net-analyzer/gspoof/metadata.xml                        | 3 ---
 net-analyzer/mk-livestatus/metadata.xml                 | 3 ---
 net-analyzer/nagtrap/metadata.xml                       | 3 ---
 net-analyzer/nagvis/metadata.xml                        | 3 ---
 net-analyzer/nikto/metadata.xml                         | 3 ---
 net-analyzer/nmbscan/metadata.xml                       | 3 ---
 net-analyzer/portbunny/metadata.xml                     | 3 ---
 net-analyzer/prelude-nessus/metadata.xml                | 3 ---
 net-analyzer/rtpbreak/metadata.xml                      | 3 ---
 net-analyzer/squidview/metadata.xml                     | 1 -
 net-dns/bind-dns-keygen/metadata.xml                    | 4 ----
 net-dns/dnshijacker/metadata.xml                        | 4 ----
 net-dns/dnswalk/metadata.xml                            | 3 ---
 net-dns/ez-ipupdate/metadata.xml                        | 3 ---
 net-dns/fpdns/metadata.xml                              | 3 ---
 net-dns/hesinfo/metadata.xml                            | 3 ---
 net-dns/hesiod/metadata.xml                             | 3 ---
 net-dns/maradns/metadata.xml                            | 3 ---
 net-dns/mydns/metadata.xml                              | 3 ---
 net-dns/odsclient/metadata.xml                          | 3 ---
 net-dns/sheerdns/metadata.xml                           | 1 -
 net-dns/tinystats/metadata.xml                          | 3 ---
 net-dns/updatedd/metadata.xml                           | 3 ---
 net-dns/valtz/metadata.xml                              | 3 ---
 net-firewall/dshieldpy/metadata.xml                     | 3 ---
 net-firewall/ferm/metadata.xml                          | 3 ---
 net-firewall/fwanalog/metadata.xml                      | 4 ----
 net-firewall/fwbuilder/metadata.xml                     | 3 ---
 net-firewall/fwipsec/metadata.xml                       | 3 ---
 net-firewall/ipkungfu/metadata.xml                      | 4 ----
 net-firewall/quicktables/metadata.xml                   | 3 ---
 net-firewall/sanewall/metadata.xml                      | 3 ---
 net-firewall/shapecfg/metadata.xml                      | 3 ---
 net-fs/tahoe-lafs/metadata.xml                          | 3 ---
 net-ftp/axyftp/metadata.xml                             | 3 ---
 net-ftp/ftpbase/metadata.xml                            | 3 ---
 net-ftp/gproftpd/metadata.xml                           | 3 ---
 net-ftp/profxp/metadata.xml                             | 3 ---
 net-ftp/pureadmin/metadata.xml                          | 3 ---
 net-ftp/weex/metadata.xml                               | 3 ---
 net-im/coccinella/metadata.xml                          | 3 ---
 net-im/dianara/metadata.xml                             | 3 ---
 net-im/librvp/metadata.xml                              | 3 ---
 net-im/minbif/metadata.xml                              | 3 ---
 net-im/pork/metadata.xml                                | 3 ---
 net-irc/bip/metadata.xml                                | 3 ---
 net-irc/irssi-xmpp/metadata.xml                         | 3 ---
 net-libs/adns/metadata.xml                              | 4 ----
 net-libs/ccrtp/metadata.xml                             | 1 -
 net-libs/dhcpcd-dbus/metadata.xml                       | 3 ---
 net-libs/h323plus/metadata.xml                          | 3 ---
 net-libs/libasyncns/metadata.xml                        | 3 ---
 net-libs/libdexter/metadata.xml                         | 3 ---
 net-libs/libeXosip/metadata.xml                         | 1 -
 net-libs/libgcal/metadata.xml                           | 3 ---
 net-libs/libident/metadata.xml                          | 4 ----
 net-libs/libmapi/metadata.xml                           | 3 ---
 net-libs/libmrss/metadata.xml                           | 3 ---
 net-libs/libnxml/metadata.xml                           | 3 ---
 net-libs/liboauth/metadata.xml                          | 3 ---
 net-libs/libopkele/metadata.xml                         | 1 -
 net-libs/libosip/metadata.xml                           | 1 -
 net-libs/libs3/metadata.xml                             | 3 ---
 net-libs/libzrtpcpp/metadata.xml                        | 1 -
 net-libs/meanwhile/metadata.xml                         | 4 ----
 net-libs/opal/metadata.xml                              | 3 ---
 net-libs/ptlib/metadata.xml                             | 3 ---
 net-libs/roadrunner/metadata.xml                        | 3 ---
 net-libs/txtorcon/metadata.xml                          | 3 ---
 net-libs/udns/metadata.xml                              | 3 ---
 net-libs/vanessa-mcast/metadata.xml                     | 3 ---
 net-mail/checkpw/metadata.xml                           | 3 ---
 net-mail/libdbx/metadata.xml                            | 3 ---
 net-mail/renattach/metadata.xml                         | 3 ---
 net-mail/vacation/metadata.xml                          | 3 ---
 net-misc/6tunnel/metadata.xml                           | 3 ---
 net-misc/apt-proxy/metadata.xml                         | 3 ---
 net-misc/blinkperl/metadata.xml                         | 3 ---
 net-misc/capi4hylafax/metadata.xml                      | 3 ---
 net-misc/cbqinit/metadata.xml                           | 3 ---
 net-misc/cgterm/metadata.xml                            | 4 ----
 net-misc/clockspeed-conf/metadata.xml                   | 3 ---
 net-misc/clockspeed/metadata.xml                        | 3 ---
 net-misc/datapipe/metadata.xml                          | 3 ---
 net-misc/efax/metadata.xml                              | 3 ---
 net-misc/fakeidentd/metadata.xml                        | 3 ---
 net-misc/fmirror/metadata.xml                           | 3 ---
 net-misc/gcap/metadata.xml                              | 3 ---
 net-misc/getdate/metadata.xml                           | 4 ----
 net-misc/gip/metadata.xml                               | 3 ---
 net-misc/goog-sitemapgen/metadata.xml                   | 3 ---
 net-misc/hashcash/metadata.xml                          | 4 ----
 net-misc/hlfl/metadata.xml                              | 3 ---
 net-misc/htbinit/metadata.xml                           | 3 ---
 net-misc/httptunnel/metadata.xml                        | 3 ---
 net-misc/htun/metadata.xml                              | 4 ----
 net-misc/identicurse/metadata.xml                       | 3 ---
 net-misc/igmpproxy/metadata.xml                         | 3 ---
 net-misc/ipsorcery/metadata.xml                         | 3 ---
 net-misc/ipsvd/metadata.xml                             | 3 ---
 net-misc/ipx-utils/metadata.xml                         | 3 ---
 net-misc/italc/metadata.xml                             | 3 ---
 net-misc/jigdo/metadata.xml                             | 3 ---
 net-misc/jlj/metadata.xml                               | 4 ----
 net-misc/jumpgate/metadata.xml                          | 3 ---
 net-misc/kumofs/metadata.xml                            | 3 ---
 net-misc/lambdamoo/metadata.xml                         | 3 ---
 net-misc/linux-identd/metadata.xml                      | 4 ----
 net-misc/liveice/metadata.xml                           | 3 ---
 net-misc/midentd/metadata.xml                           | 3 ---
 net-misc/mknbi/metadata.xml                             | 3 ---
 net-misc/monmotha/metadata.xml                          | 4 ----
 net-misc/mrouted/metadata.xml                           | 3 ---
 net-misc/netkit-routed/metadata.xml                     | 3 ---
 net-misc/netkit-rusers/metadata.xml                     | 4 ----
 net-misc/netkit-rwall/metadata.xml                      | 4 ----
 net-misc/netkit-talk/metadata.xml                       | 3 ---
 net-misc/netkit-telnetd/metadata.xml                    | 3 ---
 net-misc/netkit-timed/metadata.xml                      | 4 ----
 net-misc/netpipe/metadata.xml                           | 3 ---
 net-misc/netprofiles-ims/metadata.xml                   | 3 ---
 net-misc/netsed/metadata.xml                            | 3 ---
 net-misc/ng-utils/metadata.xml                          | 3 ---
 net-misc/nut-monitor/metadata.xml                       | 3 ---
 net-misc/orbited/metadata.xml                           | 3 ---
 net-misc/pen/metadata.xml                               | 3 ---
 net-misc/pimpd/metadata.xml                             | 3 ---
 net-misc/portfwd/metadata.xml                           | 4 ----
 net-misc/proxyper/metadata.xml                          | 3 ---
 net-misc/puf/metadata.xml                               | 3 ---
 net-misc/pump/metadata.xml                              | 3 ---
 net-misc/pytvshows/metadata.xml                         | 3 ---
 net-misc/raccess/metadata.xml                           | 4 ----
 net-misc/rinetd/metadata.xml                            | 3 ---
 net-misc/rwbs/metadata.xml                              | 3 ---
 net-misc/rwhoisd/metadata.xml                           | 3 ---
 net-misc/scponly/metadata.xml                           | 3 ---
 net-misc/selfdhcp/metadata.xml                          | 4 ----
 net-misc/sendfile/metadata.xml                          | 3 ---
 net-misc/ser/metadata.xml                               | 1 -
 net-misc/shigofumi/metadata.xml                         | 3 ---
 net-misc/sipcalc/metadata.xml                           | 3 ---
 net-misc/siproxd/metadata.xml                           | 3 ---
 net-misc/sjphone/metadata.xml                           | 1 -
 net-misc/snarf/metadata.xml                             | 3 ---
 net-misc/sock/metadata.xml                              | 3 ---
 net-misc/sparkleshare/metadata.xml                      | 3 +--
 net-misc/spread/metadata.xml                            | 3 ---
 net-misc/sslwrap/metadata.xml                           | 3 ---
 net-misc/stone/metadata.xml                             | 3 ---
 net-misc/taptap/metadata.xml                            | 3 ---
 net-misc/taylor-uucp/metadata.xml                       | 3 ---
 net-misc/udpxy/metadata.xml                             | 3 ---
 net-misc/unix2tcp/metadata.xml                          | 3 ---
 net-misc/utelnetd/metadata.xml                          | 3 ---
 net-misc/vncrec/metadata.xml                            | 3 ---
 net-misc/vncsnapshot/metadata.xml                       | 4 ----
 net-misc/yaydl/metadata.xml                             | 3 ---
 net-nds/389-admin/metadata.xml                          | 3 ---
 net-nds/389-ds-base/metadata.xml                        | 3 ---
 net-nds/adtool/metadata.xml                             | 3 ---
 net-nds/lat/metadata.xml                                | 3 ---
 net-nds/yp-tools/metadata.xml                           | 3 ---
 net-nds/ypbind/metadata.xml                             | 3 ---
 net-nds/ypserv/metadata.xml                             | 3 ---
 net-news/amphetadesk/metadata.xml                       | 3 ---
 net-news/snownews/metadata.xml                          | 3 ---
 net-nntp/ubh/metadata.xml                               | 3 ---
 net-print/adobeps/metadata.xml                          | 3 ---
 net-print/lm1100/metadata.xml                           | 3 ---
 net-print/xerox-drivers/metadata.xml                    | 3 ---
 net-proxy/3proxy/metadata.xml                           | 1 -
 net-proxy/adzapper/metadata.xml                         | 3 ---
 net-proxy/bfilter/metadata.xml                          | 3 ---
 net-proxy/c-icap-modules/metadata.xml                   | 3 ---
 net-proxy/cntlm/metadata.xml                            | 3 ---
 net-proxy/dansguardian/metadata.xml                     | 3 ---
 net-proxy/dnsproxy/metadata.xml                         | 1 -
 net-proxy/havp/metadata.xml                             | 1 -
 net-proxy/http-replicator/metadata.xml                  | 3 ---
 net-proxy/httpush/metadata.xml                          | 3 ---
 net-proxy/ntlmaps/metadata.xml                          | 3 ---
 net-proxy/nylon/metadata.xml                            | 1 -
 net-proxy/oops/metadata.xml                             | 1 -
 net-proxy/ratproxy/metadata.xml                         | 3 +--
 net-proxy/squirm/metadata.xml                           | 1 -
 net-proxy/sshproxy/metadata.xml                         | 3 +--
 net-proxy/tinyproxy/metadata.xml                        | 1 -
 net-proxy/wwwoffle/metadata.xml                         | 1 -
 net-proxy/ziproxy/metadata.xml                          | 3 ---
 net-voip/ekiga/metadata.xml                             | 3 ---
 net-voip/gnugk/metadata.xml                             | 3 ---
 net-voip/openmcu/metadata.xml                           | 3 ---
 net-wireless/adm8211/metadata.xml                       | 1 -
 net-wireless/airsnort/metadata.xml                      | 3 ---
 net-wireless/ap-utils/metadata.xml                      | 3 ---
 net-wireless/chillispot/metadata.xml                    | 4 ----
 net-wireless/hostap-utils/metadata.xml                  | 1 -
 net-wireless/irda-utils/metadata.xml                    | 3 ---
 net-wireless/madwimax/metadata.xml                      | 3 ---
 net-wireless/mfoc/metadata.xml                          | 3 ---
 net-wireless/orinoco-usb/metadata.xml                   | 1 -
 net-wireless/rfswitch/metadata.xml                      | 3 ---
 net-wireless/wifi-radar/metadata.xml                    | 3 ---
 sci-astronomy/skychart/metadata.xml                     | 3 ---
 sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml | 3 ---
 sci-geosciences/harmonics-dwf-free/metadata.xml         | 3 ---
 sci-geosciences/libtcd/metadata.xml                     | 3 ---
 sci-geosciences/osgearth/metadata.xml                   | 3 ---
 sci-geosciences/seawater/metadata.xml                   | 3 ---
 sci-geosciences/swmm/metadata.xml                       | 3 ---
 sci-geosciences/tappy/metadata.xml                      | 3 ---
 sci-geosciences/xtide/metadata.xml                      | 3 ---
 sci-libs/fplll/metadata.xml                             | 3 ---
 sci-libs/plotmm/metadata.xml                            | 3 ---
 sci-libs/ta-lib/metadata.xml                            | 3 ---
 sci-misc/pythoncad/metadata.xml                         | 3 ---
 sys-apps/apmd/metadata.xml                              | 1 -
 sys-apps/ccs-tools/metadata.xml                         | 3 ---
 sys-apps/checkservice/metadata.xml                      | 3 ---
 sys-apps/chname/metadata.xml                            | 3 ---
 sys-apps/cinit/metadata.xml                             | 3 ---
 sys-apps/cobalt-panel-utils/metadata.xml                | 4 ----
 sys-apps/conspy/metadata.xml                            | 3 ---
 sys-apps/dchroot/metadata.xml                           | 3 ---
 sys-apps/fwts/metadata.xml                              | 3 ---
 sys-apps/fxload/metadata.xml                            | 3 ---
 sys-apps/hexdump-esr/metadata.xml                       | 3 ---
 sys-apps/hwdata-redhat/metadata.xml                     | 4 ----
 sys-apps/i2c-tools/metadata.xml                         | 1 -
 sys-apps/idle3-tools/metadata.xml                       | 3 ---
 sys-apps/more/metadata.xml                              | 3 ---
 sys-apps/nca/metadata.xml                               | 3 ---
 sys-apps/newrelic-sysmond/metadata.xml                  | 3 ---
 sys-apps/noexec/metadata.xml                            | 3 ---
 sys-apps/pcmciautils/metadata.xml                       | 1 -
 sys-apps/raidutils/metadata.xml                         | 3 ---
 sys-apps/restartd/metadata.xml                          | 3 ---
 sys-apps/ultracopier/metadata.xml                       | 3 ---
 sys-apps/usermode-utilities/metadata.xml                | 3 ---
 sys-apps/v86d/metadata.xml                              | 3 ---
 sys-apps/yum/metadata.xml                               | 3 ---
 sys-auth/nss-mdns/metadata.xml                          | 5 +----
 sys-auth/pam-csync/metadata.xml                         | 3 ---
 sys-auth/pam_require/metadata.xml                       | 3 ---
 sys-auth/rtkit/metadata.xml                             | 3 ---
 sys-block/afacli/metadata.xml                           | 3 ---
 sys-block/cec/metadata.xml                              | 3 ---
 sys-block/dellmgr/metadata.xml                          | 3 ---
 sys-block/mpt-status/metadata.xml                       | 3 ---
 sys-block/ms-sys/metadata.xml                           | 3 ---
 sys-block/scsiadd/metadata.xml                          | 3 ---
 sys-block/spindown/metadata.xml                         | 3 ---
 sys-boot/mbr/metadata.xml                               | 3 ---
 sys-boot/netboot/metadata.xml                           | 3 ---
 sys-boot/plymouth-openrc-plugin/metadata.xml            | 4 ----
 sys-boot/psoload/metadata.xml                           | 3 ---
 sys-cluster/polysh/metadata.xml                         | 3 ---
 sys-cluster/util-vserver/metadata.xml                   | 3 +--
 sys-cluster/wulfware/metadata.xml                       | 4 ----
 sys-devel/dev86/metadata.xml                            | 3 ---
 sys-firmware/atmel-firmware/metadata.xml                | 1 -
 sys-firmware/bluez-firmware/metadata.xml                | 3 ---
 sys-firmware/ipw2100-firmware/metadata.xml              | 3 ---
 sys-firmware/ipw2200-firmware/metadata.xml              | 3 ---
 sys-firmware/zd1201-firmware/metadata.xml               | 3 ---
 sys-firmware/zd1211-firmware/metadata.xml               | 3 ---
 sys-fs/bashmount/metadata.xml                           | 3 ---
 sys-fs/clamfs/metadata.xml                              | 3 ---
 sys-fs/copyfs/metadata.xml                              | 4 ----
 sys-fs/fuse-convmvfs/metadata.xml                       | 3 ---
 sys-fs/ldapfuse/metadata.xml                            | 3 ---
 sys-fs/obexfs/metadata.xml                              | 3 ---
 sys-fs/owfs/metadata.xml                                | 3 ---
 sys-fs/s3backer/metadata.xml                            | 3 ---
 sys-fs/s3fs/metadata.xml                                | 3 ---
 sys-fs/udisks-glue/metadata.xml                         | 3 ---
 sys-kernel/vserver-sources/metadata.xml                 | 3 +--
 sys-libs/libfaketime/metadata.xml                       | 3 ---
 sys-libs/libixp/metadata.xml                            | 1 -
 sys-libs/libstatgrab/metadata.xml                       | 3 ---
 sys-libs/libtrash/metadata.xml                          | 3 ---
 sys-libs/system-config-base/metadata.xml                | 4 ----
 sys-power/acpitool/metadata.xml                         | 1 -
 sys-power/cpudyn/metadata.xml                           | 1 -
 sys-power/cpuspeedy/metadata.xml                        | 3 ---
 sys-power/ncpufreqd/metadata.xml                        | 3 ---
 sys-power/powerman/metadata.xml                         | 3 ---
 sys-power/powermgmt-base/metadata.xml                   | 3 +--
 sys-process/nmon/metadata.xml                           | 3 ---
 www-apache/libapreq2/metadata.xml                       | 1 -
 www-apache/mod_access_dnsbl/metadata.xml                | 1 -
 www-apache/mod_anonymize_ip/metadata.xml                | 3 ---
 www-apache/mod_auth_cookie_mysql2/metadata.xml          | 3 ---
 www-apache/mod_auth_imap2/metadata.xml                  | 1 -
 www-apache/mod_auth_kerb/metadata.xml                   | 3 ---
 www-apache/mod_auth_nufw/metadata.xml                   | 3 ---
 www-apache/mod_auth_openid/metadata.xml                 | 3 ---
 www-apache/mod_auth_tkt/metadata.xml                    | 1 -
 www-apache/mod_authn_sasl/metadata.xml                  | 3 ---
 www-apache/mod_authnz_external/metadata.xml             | 3 ---
 www-apache/mod_backtrace/metadata.xml                   | 1 -
 www-apache/mod_bw/metadata.xml                          | 1 -
 www-apache/mod_cband/metadata.xml                       | 3 ---
 www-apache/mod_common_redirect/metadata.xml             | 3 ---
 www-apache/mod_depends/metadata.xml                     | 1 -
 www-apache/mod_diagnostics/metadata.xml                 | 1 -
 www-apache/mod_dnsbl_lookup/metadata.xml                | 1 -
 www-apache/mod_dnssd/metadata.xml                       | 1 -
 www-apache/mod_evasive/metadata.xml                     | 1 -
 www-apache/mod_extract_forwarded/metadata.xml           | 3 +--
 www-apache/mod_fcgid/metadata.xml                       | 3 ---
 www-apache/mod_flvx/metadata.xml                        | 1 -
 www-apache/mod_ftpd/metadata.xml                        | 1 -
 www-apache/mod_geoip2/metadata.xml                      | 1 -
 www-apache/mod_layout/metadata.xml                      | 1 -
 www-apache/mod_ldap_userdir/metadata.xml                | 1 -
 www-apache/mod_loadavg/metadata.xml                     | 1 -
 www-apache/mod_log_rotate/metadata.xml                  | 3 ---
 www-apache/mod_log_sql/metadata.xml                     | 1 -
 www-apache/mod_macro/metadata.xml                       | 1 -
 www-apache/mod_musicindex/metadata.xml                  | 3 +--
 www-apache/mod_pcgi2/metadata.xml                       | 1 -
 www-apache/mod_proxy_fcgi/metadata.xml                  | 1 -
 www-apache/mod_proxy_html/metadata.xml                  | 1 -
 www-apache/mod_qos/metadata.xml                         | 3 ---
 www-apache/mod_rpaf/metadata.xml                        | 1 -
 www-apache/mod_scgi/metadata.xml                        | 1 -
 www-apache/mod_tcl/metadata.xml                         | 1 -
 www-apache/mod_tidy/metadata.xml                        | 3 ---
 www-apache/mod_umask/metadata.xml                       | 1 -
 www-apache/mod_vdbh/metadata.xml                        | 1 -
 www-apache/mod_vhost_ldap/metadata.xml                  | 1 -
 www-apache/mod_whatkilledus/metadata.xml                | 1 -
 www-apache/mod_xml2enc/metadata.xml                     | 3 ---
 www-apache/pwauth/metadata.xml                          | 3 ---
 www-apps/389-dsgw/metadata.xml                          | 3 ---
 www-apps/browser-config/metadata.xml                    | 4 ----
 www-apps/mirmon/metadata.xml                            | 5 +----
 www-apps/rutorrent/metadata.xml                         | 3 ---
 www-apps/scgi/metadata.xml                              | 1 -
 www-client/ck4up/metadata.xml                           | 3 ---
 www-client/dwb/metadata.xml                             | 3 ---
 www-client/luakit/metadata.xml                          | 3 ---
 www-client/netrik/metadata.xml                          | 4 ----
 www-client/phantomjs/metadata.xml                       | 3 ---
 www-client/w3mir/metadata.xml                           | 4 ----
 www-misc/bookmarksync/metadata.xml                      | 3 ---
 www-misc/gurlchecker/metadata.xml                       | 3 ---
 www-misc/log-toolkit/metadata.xml                       | 3 ---
 www-misc/mergelog/metadata.xml                          | 3 ---
 www-misc/monitorix/metadata.xml                         | 3 ---
 www-misc/multisort/metadata.xml                         | 3 ---
 www-misc/profile-sync-daemon/metadata.xml               | 3 ---
 www-misc/visitors/metadata.xml                          | 3 ---
 www-misc/wsmake/metadata.xml                            | 4 ----
 www-servers/bozohttpd/metadata.xml                      | 3 ---
 www-servers/fnord/metadata.xml                          | 5 +----
 www-servers/webfs/metadata.xml                          | 3 ---
 x11-apps/copyq/metadata.xml                             | 3 ---
 x11-apps/xwarppointer/metadata.xml                      | 3 ---
 x11-libs/dnd/metadata.xml                               | 4 ----
 x11-libs/gtkhotkey/metadata.xml                         | 3 ---
 x11-libs/hippo-canvas/metadata.xml                      | 3 ---
 x11-libs/libXaw3dXft/metadata.xml                       | 3 ---
 x11-libs/libaosd/metadata.xml                           | 3 ---
 x11-libs/libproplist/metadata.xml                       | 3 ---
 x11-libs/libsvg-cairo/metadata.xml                      | 3 ---
 x11-libs/neXtaw/metadata.xml                            | 3 ---
 x11-libs/rep-gtk/metadata.xml                           | 1 -
 x11-libs/scw/metadata.xml                               | 4 ----
 x11-libs/xforms/metadata.xml                            | 3 ---
 x11-misc/alltray/metadata.xml                           | 3 ---
 x11-misc/bbappconf/metadata.xml                         | 3 ---
 x11-misc/bbcd/metadata.xml                              | 3 +--
 x11-misc/bbdate/metadata.xml                            | 3 ---
 x11-misc/bbkeys/metadata.xml                            | 3 ---
 x11-misc/bblaunch/metadata.xml                          | 3 ---
 x11-misc/bbmail/metadata.xml                            | 3 ---
 x11-misc/bbpager/metadata.xml                           | 3 ---
 x11-misc/bbppp/metadata.xml                             | 3 ---
 x11-misc/bbrun/metadata.xml                             | 1 -
 x11-misc/bbsload/metadata.xml                           | 3 ---
 x11-misc/bbtime/metadata.xml                            | 3 ---
 x11-misc/bbweather/metadata.xml                         | 3 +--
 x11-misc/blockdpy/metadata.xml                          | 3 ---
 x11-misc/bmpanel/metadata.xml                           | 3 ---
 x11-misc/denu/metadata.xml                              | 3 ---
 x11-misc/dragbox/metadata.xml                           | 3 ---
 x11-misc/electricsheep/metadata.xml                     | 3 ---
 x11-misc/etm/metadata.xml                               | 3 ---
 x11-misc/fbdesk/metadata.xml                            | 3 ---
 x11-misc/fbpager/metadata.xml                           | 3 +--
 x11-misc/ftmenu/metadata.xml                            | 3 ---
 x11-misc/genmenu/metadata.xml                           | 4 ----
 x11-misc/growl-for-linux/metadata.xml                   | 3 ---
 x11-misc/idesk-extras/metadata.xml                      | 3 ---
 x11-misc/ipager/metadata.xml                            | 3 ---
 x11-misc/netwmpager/metadata.xml                        | 3 ---
 x11-misc/nts/metadata.xml                               | 3 ---
 x11-misc/obmenu-generator/metadata.xml                  | 3 ---
 x11-misc/obmenu/metadata.xml                            | 3 ---
 x11-misc/oroborus-desklaunch/metadata.xml               | 3 +--
 x11-misc/oroborus-deskmenu/metadata.xml                 | 3 +--
 x11-misc/oroborus-keylaunch/metadata.xml                | 3 +--
 x11-misc/peksystray/metadata.xml                        | 3 ---
 x11-misc/superswitcher/metadata.xml                     | 3 ---
 x11-misc/tintwizard/metadata.xml                        | 3 ---
 x11-misc/touchcal/metadata.xml                          | 3 ---
 x11-misc/wmctrl/metadata.xml                            | 3 +--
 x11-misc/x2vnc/metadata.xml                             | 3 ---
 x11-misc/xcalib/metadata.xml                            | 3 ---
 x11-misc/xfractint/metadata.xml                         | 3 ---
 x11-plugins/asapm/metadata.xml                          | 1 -
 x11-plugins/asclock/metadata.xml                        | 1 -
 x11-plugins/ascpu/metadata.xml                          | 1 -
 x11-plugins/asmem/metadata.xml                          | 1 -
 x11-plugins/asmon/metadata.xml                          | 1 -
 x11-plugins/astime/metadata.xml                         | 1 -
 x11-plugins/desklet-Genesis/metadata.xml                | 1 -
 x11-plugins/desklet-ImageSlideShow/metadata.xml         | 3 +--
 x11-plugins/desklet-Mouse/metadata.xml                  | 1 -
 x11-plugins/desklet-SlideShow/metadata.xml              | 3 +--
 x11-plugins/desklet-WeeklyCalendar/metadata.xml         | 1 -
 x11-plugins/desklet-ftb/metadata.xml                    | 1 -
 x11-plugins/desklet-iCalendarEvent/metadata.xml         | 1 -
 x11-plugins/desklet-justanicon/metadata.xml             | 1 -
 x11-plugins/pidgin-indicator/metadata.xml               | 3 ---
 x11-plugins/wmstickynotes/metadata.xml                  | 3 ---
 x11-terms/aterm/metadata.xml                            | 3 ---
 x11-terms/multi-aterm/metadata.xml                      | 3 ---
 x11-terms/root-tail/metadata.xml                        | 3 ---
 x11-terms/rxvt/metadata.xml                             | 3 ---
 x11-terms/xvt/metadata.xml                              | 3 ---
 x11-themes/fvwm-themes/metadata.xml                     | 3 ---
 x11-themes/fvwm_icons/metadata.xml                      | 1 -
 x11-themes/fvwm_sounds/metadata.xml                     | 1 -
 x11-themes/gentoo-artwork/metadata.xml                  | 3 ---
 x11-themes/gkrellm-themes/metadata.xml                  | 3 ---
 x11-themes/gtk-engines-murrine/metadata.xml             | 3 ---
 x11-themes/gtk-engines-nodoka/metadata.xml              | 3 ---
 x11-themes/iceicons/metadata.xml                        | 1 -
 x11-themes/murrine-themes/metadata.xml                  | 3 ---
 x11-themes/nuvox/metadata.xml                           | 1 -
 x11-themes/pidgin-penguins-smileys/metadata.xml         | 3 ---
 x11-themes/psi-themes/metadata.xml                      | 5 +----
 x11-themes/pulse-glass/metadata.xml                     | 3 ---
 x11-themes/wm-icons/metadata.xml                        | 3 ---
 x11-themes/xcursor-neutral/metadata.xml                 | 3 ---
 x11-wm/aewm++/metadata.xml                              | 3 ---
 x11-wm/amiwm/metadata.xml                               | 3 +--
 x11-wm/blackbox/metadata.xml                            | 3 ---
 x11-wm/ctwm/metadata.xml                                | 1 -
 x11-wm/larswm/metadata.xml                              | 3 +--
 x11-wm/lwm/metadata.xml                                 | 3 +--
 x11-wm/matwm2/metadata.xml                              | 1 -
 x11-wm/oroborus/metadata.xml                            | 3 +--
 x11-wm/sawfish/metadata.xml                             | 4 ----
 x11-wm/selectwm/metadata.xml                            | 1 -
 x11-wm/vtwm/metadata.xml                                | 3 +--
 x11-wm/windowlab/metadata.xml                           | 3 +--
 x11-wm/wm2/metadata.xml                                 | 1 -
 x11-wm/wmii/metadata.xml                                | 3 +--
 1211 files changed, 34 insertions(+), 3311 deletions(-)

diff --git a/app-accessibility/perlbox-voice/metadata.xml b/app-accessibility/perlbox-voice/metadata.xml
index 32f1581..c561012 100644
--- a/app-accessibility/perlbox-voice/metadata.xml
+++ b/app-accessibility/perlbox-voice/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">perlbox</remote-id>
 	</upstream>

diff --git a/app-admin/389-admin-console/metadata.xml b/app-admin/389-admin-console/metadata.xml
index f941fa3..838c00a 100644
--- a/app-admin/389-admin-console/metadata.xml
+++ b/app-admin/389-admin-console/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>java</herd>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-admin/389-console/metadata.xml b/app-admin/389-console/metadata.xml
index 2061856..838c00a 100644
--- a/app-admin/389-console/metadata.xml
+++ b/app-admin/389-console/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>java</herd>
-<maintainer>
-        <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-admin/389-ds-console/metadata.xml b/app-admin/389-ds-console/metadata.xml
index 2061856..838c00a 100644
--- a/app-admin/389-ds-console/metadata.xml
+++ b/app-admin/389-ds-console/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>java</herd>
-<maintainer>
-        <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-admin/amazon-ec2-init/metadata.xml b/app-admin/amazon-ec2-init/metadata.xml
index 1470e03..097975e 100644
--- a/app-admin/amazon-ec2-init/metadata.xml
+++ b/app-admin/amazon-ec2-init/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-admin/analog/metadata.xml b/app-admin/analog/metadata.xml
index f9d50da..097975e 100644
--- a/app-admin/analog/metadata.xml
+++ b/app-admin/analog/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-admin/chroot_safe/metadata.xml b/app-admin/chroot_safe/metadata.xml
index 4145ddd..ae4d575 100644
--- a/app-admin/chroot_safe/metadata.xml
+++ b/app-admin/chroot_safe/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">chrootsafe</remote-id>
 	</upstream>

diff --git a/app-admin/clustershell/metadata.xml b/app-admin/clustershell/metadata.xml
index 21e59a0..28b857c 100644
--- a/app-admin/clustershell/metadata.xml
+++ b/app-admin/clustershell/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">cea-hpc/clustershell</remote-id>
   </upstream>

diff --git a/app-admin/cronolog/metadata.xml b/app-admin/cronolog/metadata.xml
index 24847b0..564b071 100644
--- a/app-admin/cronolog/metadata.xml
+++ b/app-admin/cronolog/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Cronolog is a simple filter program that reads log file entries from
 		standard input and writes each entry to the output file specified by a

diff --git a/app-admin/durep/metadata.xml b/app-admin/durep/metadata.xml
index 06fca6f..ef9e210 100644
--- a/app-admin/durep/metadata.xml
+++ b/app-admin/durep/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A perl script designed for monitoring disk usage. Similar to du</longdescription>
 </pkgmetadata>

diff --git a/app-admin/ec2-ami-tools/metadata.xml b/app-admin/ec2-ami-tools/metadata.xml
index daccbac..278bcb6 100644
--- a/app-admin/ec2-ami-tools/metadata.xml
+++ b/app-admin/ec2-ami-tools/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     These command-line tools serve as the client interface to the Amazon EC2 web service.
   </longdescription>

diff --git a/app-admin/ec2-api-tools/metadata.xml b/app-admin/ec2-api-tools/metadata.xml
index daccbac..278bcb6 100644
--- a/app-admin/ec2-api-tools/metadata.xml
+++ b/app-admin/ec2-api-tools/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     These command-line tools serve as the client interface to the Amazon EC2 web service.
   </longdescription>

diff --git a/app-admin/fetchlog/metadata.xml b/app-admin/fetchlog/metadata.xml
index a12c82d..957ba21 100644
--- a/app-admin/fetchlog/metadata.xml
+++ b/app-admin/fetchlog/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">fetchlog</remote-id>
   </upstream>

diff --git a/app-admin/filewatcher/metadata.xml b/app-admin/filewatcher/metadata.xml
index bd3257d..5eac973 100644
--- a/app-admin/filewatcher/metadata.xml
+++ b/app-admin/filewatcher/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">filewatcher</remote-id>
 	</upstream>

diff --git a/app-admin/fsvs/metadata.xml b/app-admin/fsvs/metadata.xml
index ff62877..097975e 100644
--- a/app-admin/fsvs/metadata.xml
+++ b/app-admin/fsvs/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-admin/genromfs/metadata.xml b/app-admin/genromfs/metadata.xml
index eedb2fb..cf2f038 100644
--- a/app-admin/genromfs/metadata.xml
+++ b/app-admin/genromfs/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A readonly filesystem designed to be small and very space
 	efficent</longdescription>
 	<upstream>

diff --git a/app-admin/hardinfo/metadata.xml b/app-admin/hardinfo/metadata.xml
index 91f4e72..097975e 100644
--- a/app-admin/hardinfo/metadata.xml
+++ b/app-admin/hardinfo/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-admin/ide-smart/metadata.xml b/app-admin/ide-smart/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-admin/ide-smart/metadata.xml
+++ b/app-admin/ide-smart/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-admin/jinit/metadata.xml b/app-admin/jinit/metadata.xml
index ff62877..097975e 100644
--- a/app-admin/jinit/metadata.xml
+++ b/app-admin/jinit/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-admin/kedpm/metadata.xml b/app-admin/kedpm/metadata.xml
index a4448f8..99fbdc4 100644
--- a/app-admin/kedpm/metadata.xml
+++ b/app-admin/kedpm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>key storing program</longdescription>
   <upstream>
     <remote-id type="sourceforge">kedpm</remote-id>

diff --git a/app-admin/logsentry/metadata.xml b/app-admin/logsentry/metadata.xml
index 60d78d3..2a61753 100644
--- a/app-admin/logsentry/metadata.xml
+++ b/app-admin/logsentry/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sentrytools</remote-id>
 	</upstream>

diff --git a/app-admin/logsurfer+/metadata.xml b/app-admin/logsurfer+/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-admin/logsurfer+/metadata.xml
+++ b/app-admin/logsurfer+/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-admin/longrun/metadata.xml b/app-admin/longrun/metadata.xml
index caa1059..01147b1 100644
--- a/app-admin/longrun/metadata.xml
+++ b/app-admin/longrun/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 Longrun is a user space utility program for controlling the Longrun
 thermal and power save functionalities found in the processors made

diff --git a/app-admin/lsat/metadata.xml b/app-admin/lsat/metadata.xml
index 4e8f7c8..340856e 100644
--- a/app-admin/lsat/metadata.xml
+++ b/app-admin/lsat/metadata.xml
@@ -8,10 +8,6 @@
 		expanded to work with Linux distributions other than Red Hat, and checks
 		for kernel versions.
 	</longdescription>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">usat</remote-id>
 	</upstream>

diff --git a/app-admin/lsyncd/metadata.xml b/app-admin/lsyncd/metadata.xml
index 8716f56..0fba30b 100644
--- a/app-admin/lsyncd/metadata.xml
+++ b/app-admin/lsyncd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">lsyncd</remote-id>
 		<remote-id type="github">axkibe/lsyncd</remote-id>

diff --git a/app-admin/multilog-watch/metadata.xml b/app-admin/multilog-watch/metadata.xml
index 474ccaa..0a03f5d 100644
--- a/app-admin/multilog-watch/metadata.xml
+++ b/app-admin/multilog-watch/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">This program reads logs written by multilog (part of the
 daemontools package by Dan Bernstein), discards any lines matching regular
 expressions in its configuration file, and mails the rest to a configured e-mail

diff --git a/app-admin/newsyslog/metadata.xml b/app-admin/newsyslog/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-admin/newsyslog/metadata.xml
+++ b/app-admin/newsyslog/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-admin/passook/metadata.xml b/app-admin/passook/metadata.xml
index 4dbf560..4b62a71 100644
--- a/app-admin/passook/metadata.xml
+++ b/app-admin/passook/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>Passook is a perl script that generates passwords. You can
 	customize the security of the password generated.</longdescription>
 </pkgmetadata>

diff --git a/app-admin/petrovich/metadata.xml b/app-admin/petrovich/metadata.xml
index a62bf05..2bba2bc 100644
--- a/app-admin/petrovich/metadata.xml
+++ b/app-admin/petrovich/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">petrovich</remote-id>
 	</upstream>

diff --git a/app-admin/pprocm/metadata.xml b/app-admin/pprocm/metadata.xml
index 91f4e72..097975e 100644
--- a/app-admin/pprocm/metadata.xml
+++ b/app-admin/pprocm/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-admin/procinfo/metadata.xml b/app-admin/procinfo/metadata.xml
index 91f4e72..097975e 100644
--- a/app-admin/procinfo/metadata.xml
+++ b/app-admin/procinfo/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-admin/psmon/metadata.xml b/app-admin/psmon/metadata.xml
index 81ada3d..1595855 100644
--- a/app-admin/psmon/metadata.xml
+++ b/app-admin/psmon/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<longdescription lang="en">
 		A perl script that monitors processes to make sure they are running as
 		the user has intended. Will respawn dead processes and/or kill illegal

diff --git a/app-admin/quickswitch/metadata.xml b/app-admin/quickswitch/metadata.xml
index 3c6ff9f..48bacf3 100644
--- a/app-admin/quickswitch/metadata.xml
+++ b/app-admin/quickswitch/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A utility for linux laptop users to use multiple network
 	profiles, and switch effortlessly.</longdescription>
 	<upstream>

diff --git a/app-admin/recursos/metadata.xml b/app-admin/recursos/metadata.xml
index 73490c4..11b1866 100644
--- a/app-admin/recursos/metadata.xml
+++ b/app-admin/recursos/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		A set of script to extrac usefull info about your system and report it
 		in plain text or html. It can generate Grpahs using rrdtools.

diff --git a/app-admin/reportmagic/metadata.xml b/app-admin/reportmagic/metadata.xml
index 89915e6..55b2a0f 100644
--- a/app-admin/reportmagic/metadata.xml
+++ b/app-admin/reportmagic/metadata.xml
@@ -4,8 +4,4 @@
 	<longdescription lang="en">
 		A report generating applicaton from web site log files.
 	</longdescription>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
-</pkgmetadata>
+	</pkgmetadata>

diff --git a/app-admin/sxid/metadata.xml b/app-admin/sxid/metadata.xml
index 66bdcb0..70648c2 100644
--- a/app-admin/sxid/metadata.xml
+++ b/app-admin/sxid/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">sxid</remote-id>
 	</upstream>

diff --git a/app-admin/syslogread/metadata.xml b/app-admin/syslogread/metadata.xml
index bbae4d9..db2c90d 100644
--- a/app-admin/syslogread/metadata.xml
+++ b/app-admin/syslogread/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 	This package is a set of tools that are useful in receiving, analyzing,
 	or producing syslog messages.

diff --git a/app-admin/usermin/metadata.xml b/app-admin/usermin/metadata.xml
index 3317d0c..c5ff7ce 100644
--- a/app-admin/usermin/metadata.xml
+++ b/app-admin/usermin/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     A web-based user administration interface.
   </longdescription>

diff --git a/app-admin/watchfolder/metadata.xml b/app-admin/watchfolder/metadata.xml
index 67a0ac7..696b1c7 100644
--- a/app-admin/watchfolder/metadata.xml
+++ b/app-admin/watchfolder/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">watchd</remote-id>
 	</upstream>

diff --git a/app-admin/yaala/metadata.xml b/app-admin/yaala/metadata.xml
index b169a5e..2b0fede 100644
--- a/app-admin/yaala/metadata.xml
+++ b/app-admin/yaala/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     Yet Another Log Analyzer
   </longdescription>

diff --git a/app-arch/afio/metadata.xml b/app-arch/afio/metadata.xml
index 9dc4304..0b12b6a 100644
--- a/app-arch/afio/metadata.xml
+++ b/app-arch/afio/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 Afio makes cpio-format archives. It deals somewhat gracefully
 with input data corruption, supports multi-volume archives during interactive

diff --git a/app-arch/arc/metadata.xml b/app-arch/arc/metadata.xml
index 0e81bff..7a6deba 100644
--- a/app-arch/arc/metadata.xml
+++ b/app-arch/arc/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>A program that is able to create and extract files form the DOS .ARC file</longdescription>
   <upstream>
     <remote-id type="sourceforge">arc</remote-id>

diff --git a/app-arch/arj/metadata.xml b/app-arch/arj/metadata.xml
index a4aea1b..9988634 100644
--- a/app-arch/arj/metadata.xml
+++ b/app-arch/arj/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">arj</remote-id>
 	</upstream>

diff --git a/app-arch/cfv/metadata.xml b/app-arch/cfv/metadata.xml
index 9a061aa..a250c15 100644
--- a/app-arch/cfv/metadata.xml
+++ b/app-arch/cfv/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		cfv is a utility to both test and create .sfv, .csv, .crc,
 		.md5(sfv-like), md5sum, bsd md5, sha1sum, and .torrent files. These

diff --git a/app-arch/deltarpm/metadata.xml b/app-arch/deltarpm/metadata.xml
index 9aa1e30..efa7094 100644
--- a/app-arch/deltarpm/metadata.xml
+++ b/app-arch/deltarpm/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A tool to create and apply deltarpms.</longdescription>
 </pkgmetadata>

diff --git a/app-arch/freeze/metadata.xml b/app-arch/freeze/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-arch/freeze/metadata.xml
+++ b/app-arch/freeze/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-arch/gtk-splitter/metadata.xml b/app-arch/gtk-splitter/metadata.xml
index 664da02..19eb667 100644
--- a/app-arch/gtk-splitter/metadata.xml
+++ b/app-arch/gtk-splitter/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer</description>
-	</maintainer>
 	<longdescription>A program to split files into smaller pieces and the put them back together.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">gtk-splitter</remote-id>

diff --git a/app-arch/ipkg-utils/metadata.xml b/app-arch/ipkg-utils/metadata.xml
index ab1d676..b1dfdc5 100644
--- a/app-arch/ipkg-utils/metadata.xml
+++ b/app-arch/ipkg-utils/metadata.xml
@@ -3,9 +3,6 @@
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<maintainer>
 		<email>jnrowe@gmail.com</email>
 		<name>James Rowe</name>
 	</maintainer>

diff --git a/app-arch/lzma/metadata.xml b/app-arch/lzma/metadata.xml
index 8fbc72c..e9f3159 100644
--- a/app-arch/lzma/metadata.xml
+++ b/app-arch/lzma/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">sevenzip</remote-id>
   </upstream>

diff --git a/app-arch/makeself/metadata.xml b/app-arch/makeself/metadata.xml
index 8e10bd7..315b0de 100644
--- a/app-arch/makeself/metadata.xml
+++ b/app-arch/makeself/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">megastep/makeself</remote-id>
   </upstream>

diff --git a/app-arch/mscompress/metadata.xml b/app-arch/mscompress/metadata.xml
index ced8c11..7651cf6 100644
--- a/app-arch/mscompress/metadata.xml
+++ b/app-arch/mscompress/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<longdescription lang="en">
 		A (de)compressor for microsoft's compress.exe and expand.exe functions.
 	</longdescription>

diff --git a/app-arch/par/metadata.xml b/app-arch/par/metadata.xml
index fcb2ecb..5d16472 100644
--- a/app-arch/par/metadata.xml
+++ b/app-arch/par/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">parchive</remote-id>
 	</upstream>

diff --git a/app-arch/pax/metadata.xml b/app-arch/pax/metadata.xml
index 91f4e72..097975e 100644
--- a/app-arch/pax/metadata.xml
+++ b/app-arch/pax/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-arch/pdv/metadata.xml b/app-arch/pdv/metadata.xml
index ed5703f..9894924 100644
--- a/app-arch/pdv/metadata.xml
+++ b/app-arch/pdv/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A payload Delivery vehicle that contains a complete package and
 the commands to install it.</longdescription>
 	<upstream>

diff --git a/app-arch/pure-sfv/metadata.xml b/app-arch/pure-sfv/metadata.xml
index 174e615..4ddc22d 100644
--- a/app-arch/pure-sfv/metadata.xml
+++ b/app-arch/pure-sfv/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pure-sfv</remote-id>
 	</upstream>

diff --git a/app-arch/rzip/metadata.xml b/app-arch/rzip/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-arch/rzip/metadata.xml
+++ b/app-arch/rzip/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-arch/stuffit/metadata.xml b/app-arch/stuffit/metadata.xml
index 676bee0..f3ed47b 100644
--- a/app-arch/stuffit/metadata.xml
+++ b/app-arch/stuffit/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>Stuffit is a archive creating application, supporting .sit, .sitx .zip, and self-extracting archives</longdescription>
 </pkgmetadata>

diff --git a/app-arch/tardy/metadata.xml b/app-arch/tardy/metadata.xml
index 4bc0f72..2a6b71a 100644
--- a/app-arch/tardy/metadata.xml
+++ b/app-arch/tardy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>Tardy is a tar post-processor for manipulating the file headers.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">tardy</remote-id>

diff --git a/app-arch/tarsync/metadata.xml b/app-arch/tarsync/metadata.xml
index a40624f..097975e 100644
--- a/app-arch/tarsync/metadata.xml
+++ b/app-arch/tarsync/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-arch/threadzip/metadata.xml b/app-arch/threadzip/metadata.xml
index a40624f..097975e 100644
--- a/app-arch/threadzip/metadata.xml
+++ b/app-arch/threadzip/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-arch/undms/metadata.xml b/app-arch/undms/metadata.xml
index 91f4e72..097975e 100644
--- a/app-arch/undms/metadata.xml
+++ b/app-arch/undms/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-arch/unlzx/metadata.xml b/app-arch/unlzx/metadata.xml
index f9d50da..097975e 100644
--- a/app-arch/unlzx/metadata.xml
+++ b/app-arch/unlzx/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-arch/upx-bin/metadata.xml b/app-arch/upx-bin/metadata.xml
index 5f21286..1fd36c0 100644
--- a/app-arch/upx-bin/metadata.xml
+++ b/app-arch/upx-bin/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>UPX is a versatile executable packer with a excellent
 	compression ratio.</longdescription>
 	<upstream>

diff --git a/app-arch/upx-ucl/metadata.xml b/app-arch/upx-ucl/metadata.xml
index 0fc231e..ed45780 100644
--- a/app-arch/upx-ucl/metadata.xml
+++ b/app-arch/upx-ucl/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>UPX is a versatile executable packer with a excellent compression ratio</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">sevenzip</remote-id>

diff --git a/app-arch/xdms/metadata.xml b/app-arch/xdms/metadata.xml
index 123069e..25430d5 100644
--- a/app-arch/xdms/metadata.xml
+++ b/app-arch/xdms/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		Supports decompression of files compressed using all known DMS compression modes, including old and obsolete ones, and also encrypted files, for 100% compatibility.
 		Can test DMS files integrity, view file informations and show attached Banners and FILEID.DIZ .

diff --git a/app-arch/zoo/metadata.xml b/app-arch/zoo/metadata.xml
index f9d50da..097975e 100644
--- a/app-arch/zoo/metadata.xml
+++ b/app-arch/zoo/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-backup/furball/metadata.xml b/app-backup/furball/metadata.xml
index f9d50da..097975e 100644
--- a/app-backup/furball/metadata.xml
+++ b/app-backup/furball/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-backup/hdup/metadata.xml b/app-backup/hdup/metadata.xml
index a40624f..097975e 100644
--- a/app-backup/hdup/metadata.xml
+++ b/app-backup/hdup/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-backup/qt4-fsarchiver/metadata.xml b/app-backup/qt4-fsarchiver/metadata.xml
index bd20383..d53b56d 100644
--- a/app-backup/qt4-fsarchiver/metadata.xml
+++ b/app-backup/qt4-fsarchiver/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qt4-fsarchiver</remote-id>
 	</upstream>

diff --git a/app-backup/reoback/metadata.xml b/app-backup/reoback/metadata.xml
index 0259030..ce53041 100644
--- a/app-backup/reoback/metadata.xml
+++ b/app-backup/reoback/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-    <name>Default assignee for orphaned packages</name>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">reoback</remote-id>
   </upstream>

diff --git a/app-backup/tob/metadata.xml b/app-backup/tob/metadata.xml
index 9df351b..097975e 100644
--- a/app-backup/tob/metadata.xml
+++ b/app-backup/tob/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-    <name>Default assignee for orphaned packages</name>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-benchmarks/contest/metadata.xml b/app-benchmarks/contest/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-benchmarks/contest/metadata.xml
+++ b/app-benchmarks/contest/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-benchmarks/volanomark/metadata.xml b/app-benchmarks/volanomark/metadata.xml
index 6cd4902..7faeb95 100644
--- a/app-benchmarks/volanomark/metadata.xml
+++ b/app-benchmarks/volanomark/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>Java Benchmark test</longdescription>
 </pkgmetadata>

diff --git a/app-cdr/mkcdtoc/metadata.xml b/app-cdr/mkcdtoc/metadata.xml
index 46d5724..f59b459 100644
--- a/app-cdr/mkcdtoc/metadata.xml
+++ b/app-cdr/mkcdtoc/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		mkcdtoc is a command-line utility to create toc-files for cdrdao. It
 		reads a list of audio files in simple text or M3U format. The program

diff --git a/app-crypt/gifshuffle/metadata.xml b/app-crypt/gifshuffle/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-crypt/gifshuffle/metadata.xml
+++ b/app-crypt/gifshuffle/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-crypt/keylookup/metadata.xml b/app-crypt/keylookup/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-crypt/keylookup/metadata.xml
+++ b/app-crypt/keylookup/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-crypt/keynote/metadata.xml b/app-crypt/keynote/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-crypt/keynote/metadata.xml
+++ b/app-crypt/keynote/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-crypt/nistp224/metadata.xml b/app-crypt/nistp224/metadata.xml
index 8252e95..20138f6 100644
--- a/app-crypt/nistp224/metadata.xml
+++ b/app-crypt/nistp224/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 nistp224 performs compressed Diffie-Hellman key exchange on the NIST P-224
 elliptic curve at record-setting speeds. It includes an easy-to-use C library

diff --git a/app-crypt/rotix/metadata.xml b/app-crypt/rotix/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-crypt/rotix/metadata.xml
+++ b/app-crypt/rotix/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-crypt/xor-analyze/metadata.xml b/app-crypt/xor-analyze/metadata.xml
index effbbf3..097975e 100644
--- a/app-crypt/xor-analyze/metadata.xml
+++ b/app-crypt/xor-analyze/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-af/metadata.xml b/app-dicts/aspell-af/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-af/metadata.xml
+++ b/app-dicts/aspell-af/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-be/metadata.xml b/app-dicts/aspell-be/metadata.xml
index a93dd08..99e6b41 100644
--- a/app-dicts/aspell-be/metadata.xml
+++ b/app-dicts/aspell-be/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
 	<flag name="classic">Support classic spelling by default</flag>
 </use>

diff --git a/app-dicts/aspell-bg/metadata.xml b/app-dicts/aspell-bg/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-bg/metadata.xml
+++ b/app-dicts/aspell-bg/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-br/metadata.xml b/app-dicts/aspell-br/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-br/metadata.xml
+++ b/app-dicts/aspell-br/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-ca/metadata.xml b/app-dicts/aspell-ca/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-ca/metadata.xml
+++ b/app-dicts/aspell-ca/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-cs/metadata.xml b/app-dicts/aspell-cs/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-cs/metadata.xml
+++ b/app-dicts/aspell-cs/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-cy/metadata.xml b/app-dicts/aspell-cy/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-cy/metadata.xml
+++ b/app-dicts/aspell-cy/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-da/metadata.xml b/app-dicts/aspell-da/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-da/metadata.xml
+++ b/app-dicts/aspell-da/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-de/metadata.xml b/app-dicts/aspell-de/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-de/metadata.xml
+++ b/app-dicts/aspell-de/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-el/metadata.xml b/app-dicts/aspell-el/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-el/metadata.xml
+++ b/app-dicts/aspell-el/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-en/metadata.xml b/app-dicts/aspell-en/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-en/metadata.xml
+++ b/app-dicts/aspell-en/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-eo/metadata.xml b/app-dicts/aspell-eo/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-eo/metadata.xml
+++ b/app-dicts/aspell-eo/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-es/metadata.xml b/app-dicts/aspell-es/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-es/metadata.xml
+++ b/app-dicts/aspell-es/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-et/metadata.xml b/app-dicts/aspell-et/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-et/metadata.xml
+++ b/app-dicts/aspell-et/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-fi/metadata.xml b/app-dicts/aspell-fi/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-fi/metadata.xml
+++ b/app-dicts/aspell-fi/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-fo/metadata.xml b/app-dicts/aspell-fo/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-fo/metadata.xml
+++ b/app-dicts/aspell-fo/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-fr/metadata.xml b/app-dicts/aspell-fr/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-fr/metadata.xml
+++ b/app-dicts/aspell-fr/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-ga/metadata.xml b/app-dicts/aspell-ga/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-ga/metadata.xml
+++ b/app-dicts/aspell-ga/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-gl/metadata.xml b/app-dicts/aspell-gl/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-gl/metadata.xml
+++ b/app-dicts/aspell-gl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-he/metadata.xml b/app-dicts/aspell-he/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-he/metadata.xml
+++ b/app-dicts/aspell-he/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-hr/metadata.xml b/app-dicts/aspell-hr/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-hr/metadata.xml
+++ b/app-dicts/aspell-hr/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-hu/metadata.xml b/app-dicts/aspell-hu/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-hu/metadata.xml
+++ b/app-dicts/aspell-hu/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-hy/metadata.xml b/app-dicts/aspell-hy/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-hy/metadata.xml
+++ b/app-dicts/aspell-hy/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-is/metadata.xml b/app-dicts/aspell-is/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-is/metadata.xml
+++ b/app-dicts/aspell-is/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-it/metadata.xml b/app-dicts/aspell-it/metadata.xml
index 3d025e0..c397948 100644
--- a/app-dicts/aspell-it/metadata.xml
+++ b/app-dicts/aspell-it/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">linguistico</remote-id>
 	</upstream>

diff --git a/app-dicts/aspell-la/metadata.xml b/app-dicts/aspell-la/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-la/metadata.xml
+++ b/app-dicts/aspell-la/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-lt/metadata.xml b/app-dicts/aspell-lt/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-lt/metadata.xml
+++ b/app-dicts/aspell-lt/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-nl/metadata.xml b/app-dicts/aspell-nl/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-nl/metadata.xml
+++ b/app-dicts/aspell-nl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-no/metadata.xml b/app-dicts/aspell-no/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-no/metadata.xml
+++ b/app-dicts/aspell-no/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-pl/metadata.xml b/app-dicts/aspell-pl/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-pl/metadata.xml
+++ b/app-dicts/aspell-pl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-pt-br/metadata.xml b/app-dicts/aspell-pt-br/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-pt-br/metadata.xml
+++ b/app-dicts/aspell-pt-br/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-pt/metadata.xml b/app-dicts/aspell-pt/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-pt/metadata.xml
+++ b/app-dicts/aspell-pt/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-ro/metadata.xml b/app-dicts/aspell-ro/metadata.xml
index 4971142..c4e0ea4 100644
--- a/app-dicts/aspell-ro/metadata.xml
+++ b/app-dicts/aspell-ro/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rospell</remote-id>
 	</upstream>

diff --git a/app-dicts/aspell-ru/metadata.xml b/app-dicts/aspell-ru/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-ru/metadata.xml
+++ b/app-dicts/aspell-ru/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-sk/metadata.xml b/app-dicts/aspell-sk/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-sk/metadata.xml
+++ b/app-dicts/aspell-sk/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-sl/metadata.xml b/app-dicts/aspell-sl/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-sl/metadata.xml
+++ b/app-dicts/aspell-sl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-sr/metadata.xml b/app-dicts/aspell-sr/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-sr/metadata.xml
+++ b/app-dicts/aspell-sr/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-sv/metadata.xml b/app-dicts/aspell-sv/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-sv/metadata.xml
+++ b/app-dicts/aspell-sv/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-uk/metadata.xml b/app-dicts/aspell-uk/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-uk/metadata.xml
+++ b/app-dicts/aspell-uk/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/aspell-vi/metadata.xml b/app-dicts/aspell-vi/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/aspell-vi/metadata.xml
+++ b/app-dicts/aspell-vi/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/dictd-devils/metadata.xml b/app-dicts/dictd-devils/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/dictd-devils/metadata.xml
+++ b/app-dicts/dictd-devils/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/dictd-dicts/metadata.xml b/app-dicts/dictd-dicts/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/dictd-dicts/metadata.xml
+++ b/app-dicts/dictd-dicts/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/dictd-elements/metadata.xml b/app-dicts/dictd-elements/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/dictd-elements/metadata.xml
+++ b/app-dicts/dictd-elements/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/dictd-foldoc/metadata.xml b/app-dicts/dictd-foldoc/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/dictd-foldoc/metadata.xml
+++ b/app-dicts/dictd-foldoc/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/dictd-gazetteer/metadata.xml b/app-dicts/dictd-gazetteer/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/dictd-gazetteer/metadata.xml
+++ b/app-dicts/dictd-gazetteer/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/dictd-jargon/metadata.xml b/app-dicts/dictd-jargon/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/dictd-jargon/metadata.xml
+++ b/app-dicts/dictd-jargon/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/dictd-misc/metadata.xml b/app-dicts/dictd-misc/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/dictd-misc/metadata.xml
+++ b/app-dicts/dictd-misc/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/dictd-vera/metadata.xml b/app-dicts/dictd-vera/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/dictd-vera/metadata.xml
+++ b/app-dicts/dictd-vera/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/dictd-web1913/metadata.xml b/app-dicts/dictd-web1913/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/dictd-web1913/metadata.xml
+++ b/app-dicts/dictd-web1913/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/dictd-wn/metadata.xml b/app-dicts/dictd-wn/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/dictd-wn/metadata.xml
+++ b/app-dicts/dictd-wn/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/duali-data/metadata.xml b/app-dicts/duali-data/metadata.xml
index 02e3b1a..b857a14 100644
--- a/app-dicts/duali-data/metadata.xml
+++ b/app-dicts/duali-data/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">arabeyes</remote-id>
 	</upstream>

diff --git a/app-dicts/eblook/metadata.xml b/app-dicts/eblook/metadata.xml
index 91f4e72..097975e 100644
--- a/app-dicts/eblook/metadata.xml
+++ b/app-dicts/eblook/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-dicts/edictionary/metadata.xml b/app-dicts/edictionary/metadata.xml
index 688aff0..6834757 100644
--- a/app-dicts/edictionary/metadata.xml
+++ b/app-dicts/edictionary/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">edictionary</remote-id>
 	</upstream>

diff --git a/app-dicts/freedict-deu-eng/metadata.xml b/app-dicts/freedict-deu-eng/metadata.xml
index 6f75dd0..f9a6d27 100644
--- a/app-dicts/freedict-deu-eng/metadata.xml
+++ b/app-dicts/freedict-deu-eng/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
 	</upstream>

diff --git a/app-dicts/freedict-eng-fra/metadata.xml b/app-dicts/freedict-eng-fra/metadata.xml
index 6f75dd0..f9a6d27 100644
--- a/app-dicts/freedict-eng-fra/metadata.xml
+++ b/app-dicts/freedict-eng-fra/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
 	</upstream>

diff --git a/app-dicts/freedict-eng-ita/metadata.xml b/app-dicts/freedict-eng-ita/metadata.xml
index 6f75dd0..f9a6d27 100644
--- a/app-dicts/freedict-eng-ita/metadata.xml
+++ b/app-dicts/freedict-eng-ita/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
 	</upstream>

diff --git a/app-dicts/freedict-eng-swe/metadata.xml b/app-dicts/freedict-eng-swe/metadata.xml
index 6f75dd0..f9a6d27 100644
--- a/app-dicts/freedict-eng-swe/metadata.xml
+++ b/app-dicts/freedict-eng-swe/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
 	</upstream>

diff --git a/app-dicts/freedict-fra-eng/metadata.xml b/app-dicts/freedict-fra-eng/metadata.xml
index 6f75dd0..f9a6d27 100644
--- a/app-dicts/freedict-fra-eng/metadata.xml
+++ b/app-dicts/freedict-fra-eng/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
 	</upstream>

diff --git a/app-dicts/freedict-ita-eng/metadata.xml b/app-dicts/freedict-ita-eng/metadata.xml
index 6f75dd0..f9a6d27 100644
--- a/app-dicts/freedict-ita-eng/metadata.xml
+++ b/app-dicts/freedict-ita-eng/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">freedict</remote-id>
 	</upstream>

diff --git a/app-dicts/libydpdict/metadata.xml b/app-dicts/libydpdict/metadata.xml
index 91f4e72..097975e 100644
--- a/app-dicts/libydpdict/metadata.xml
+++ b/app-dicts/libydpdict/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-af/metadata.xml b/app-dicts/myspell-af/metadata.xml
index 2f8d8d6..44d469e 100644
--- a/app-dicts/myspell-af/metadata.xml
+++ b/app-dicts/myspell-af/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">aoo-extensions</remote-id>
 	</upstream>

diff --git a/app-dicts/myspell-bg/metadata.xml b/app-dicts/myspell-bg/metadata.xml
index 54627db..35cb373 100644
--- a/app-dicts/myspell-bg/metadata.xml
+++ b/app-dicts/myspell-bg/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bgoffice</remote-id>
 	</upstream>

diff --git a/app-dicts/myspell-ca/metadata.xml b/app-dicts/myspell-ca/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-ca/metadata.xml
+++ b/app-dicts/myspell-ca/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-cs/metadata.xml b/app-dicts/myspell-cs/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-cs/metadata.xml
+++ b/app-dicts/myspell-cs/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-cy/metadata.xml b/app-dicts/myspell-cy/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-cy/metadata.xml
+++ b/app-dicts/myspell-cy/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-da/metadata.xml b/app-dicts/myspell-da/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-da/metadata.xml
+++ b/app-dicts/myspell-da/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-de/metadata.xml b/app-dicts/myspell-de/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-de/metadata.xml
+++ b/app-dicts/myspell-de/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-eo/metadata.xml b/app-dicts/myspell-eo/metadata.xml
index 2f8d8d6..44d469e 100644
--- a/app-dicts/myspell-eo/metadata.xml
+++ b/app-dicts/myspell-eo/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">aoo-extensions</remote-id>
 	</upstream>

diff --git a/app-dicts/myspell-es/metadata.xml b/app-dicts/myspell-es/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-es/metadata.xml
+++ b/app-dicts/myspell-es/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-et/metadata.xml b/app-dicts/myspell-et/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-et/metadata.xml
+++ b/app-dicts/myspell-et/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-fo/metadata.xml b/app-dicts/myspell-fo/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-fo/metadata.xml
+++ b/app-dicts/myspell-fo/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-fr/metadata.xml b/app-dicts/myspell-fr/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-fr/metadata.xml
+++ b/app-dicts/myspell-fr/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-ga/metadata.xml b/app-dicts/myspell-ga/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-ga/metadata.xml
+++ b/app-dicts/myspell-ga/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-gl/metadata.xml b/app-dicts/myspell-gl/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-gl/metadata.xml
+++ b/app-dicts/myspell-gl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-he/metadata.xml b/app-dicts/myspell-he/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-he/metadata.xml
+++ b/app-dicts/myspell-he/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-hr/metadata.xml b/app-dicts/myspell-hr/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-hr/metadata.xml
+++ b/app-dicts/myspell-hr/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-hu/metadata.xml b/app-dicts/myspell-hu/metadata.xml
index f0ec33d..fc402b5 100644
--- a/app-dicts/myspell-hu/metadata.xml
+++ b/app-dicts/myspell-hu/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">magyarispell</remote-id>
 	</upstream>

diff --git a/app-dicts/myspell-ia/metadata.xml b/app-dicts/myspell-ia/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-ia/metadata.xml
+++ b/app-dicts/myspell-ia/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-id/metadata.xml b/app-dicts/myspell-id/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-id/metadata.xml
+++ b/app-dicts/myspell-id/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-is/metadata.xml b/app-dicts/myspell-is/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-is/metadata.xml
+++ b/app-dicts/myspell-is/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-it/metadata.xml b/app-dicts/myspell-it/metadata.xml
index 3d025e0..c397948 100644
--- a/app-dicts/myspell-it/metadata.xml
+++ b/app-dicts/myspell-it/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">linguistico</remote-id>
 	</upstream>

diff --git a/app-dicts/myspell-km/metadata.xml b/app-dicts/myspell-km/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-km/metadata.xml
+++ b/app-dicts/myspell-km/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-ku/metadata.xml b/app-dicts/myspell-ku/metadata.xml
index 7d12baf..cf120ac 100644
--- a/app-dicts/myspell-ku/metadata.xml
+++ b/app-dicts/myspell-ku/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">myspellkurdish</remote-id>
 	</upstream>

diff --git a/app-dicts/myspell-lt/metadata.xml b/app-dicts/myspell-lt/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-lt/metadata.xml
+++ b/app-dicts/myspell-lt/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-mi/metadata.xml b/app-dicts/myspell-mi/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-mi/metadata.xml
+++ b/app-dicts/myspell-mi/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-mk/metadata.xml b/app-dicts/myspell-mk/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-mk/metadata.xml
+++ b/app-dicts/myspell-mk/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-ms/metadata.xml b/app-dicts/myspell-ms/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-ms/metadata.xml
+++ b/app-dicts/myspell-ms/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-nb/metadata.xml b/app-dicts/myspell-nb/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-nb/metadata.xml
+++ b/app-dicts/myspell-nb/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-nl/metadata.xml b/app-dicts/myspell-nl/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-nl/metadata.xml
+++ b/app-dicts/myspell-nl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-nn/metadata.xml b/app-dicts/myspell-nn/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-nn/metadata.xml
+++ b/app-dicts/myspell-nn/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-pl/metadata.xml b/app-dicts/myspell-pl/metadata.xml
index 3a45595..1f7dc9c 100644
--- a/app-dicts/myspell-pl/metadata.xml
+++ b/app-dicts/myspell-pl/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">synonimy</remote-id>
 	</upstream>

diff --git a/app-dicts/myspell-pt-br/metadata.xml b/app-dicts/myspell-pt-br/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-pt-br/metadata.xml
+++ b/app-dicts/myspell-pt-br/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-pt/metadata.xml b/app-dicts/myspell-pt/metadata.xml
index b9827b8..2bdf2dd 100644
--- a/app-dicts/myspell-pt/metadata.xml
+++ b/app-dicts/myspell-pt/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
 	<flag name="preao">Use the pre ortographic agreement version of the dictionary</flag>
 </use>

diff --git a/app-dicts/myspell-ro/metadata.xml b/app-dicts/myspell-ro/metadata.xml
index 4971142..c4e0ea4 100644
--- a/app-dicts/myspell-ro/metadata.xml
+++ b/app-dicts/myspell-ro/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rospell</remote-id>
 	</upstream>

diff --git a/app-dicts/myspell-sk/metadata.xml b/app-dicts/myspell-sk/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-sk/metadata.xml
+++ b/app-dicts/myspell-sk/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-sl/metadata.xml b/app-dicts/myspell-sl/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-sl/metadata.xml
+++ b/app-dicts/myspell-sl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-sq/metadata.xml b/app-dicts/myspell-sq/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-sq/metadata.xml
+++ b/app-dicts/myspell-sq/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-sv/metadata.xml b/app-dicts/myspell-sv/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-sv/metadata.xml
+++ b/app-dicts/myspell-sv/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-sw/metadata.xml b/app-dicts/myspell-sw/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-sw/metadata.xml
+++ b/app-dicts/myspell-sw/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-tn/metadata.xml b/app-dicts/myspell-tn/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-tn/metadata.xml
+++ b/app-dicts/myspell-tn/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-uk/metadata.xml b/app-dicts/myspell-uk/metadata.xml
index 4538a68..097975e 100644
--- a/app-dicts/myspell-uk/metadata.xml
+++ b/app-dicts/myspell-uk/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-dicts/myspell-zu/metadata.xml b/app-dicts/myspell-zu/metadata.xml
index c65550c..74570f8 100644
--- a/app-dicts/myspell-zu/metadata.xml
+++ b/app-dicts/myspell-zu/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">translate</remote-id>
 	</upstream>

diff --git a/app-dicts/qvortaro/metadata.xml b/app-dicts/qvortaro/metadata.xml
index 1470e03..097975e 100644
--- a/app-dicts/qvortaro/metadata.xml
+++ b/app-dicts/qvortaro/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-dicts/stardict-dictd-devils/metadata.xml b/app-dicts/stardict-dictd-devils/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-dictd-devils/metadata.xml
+++ b/app-dicts/stardict-dictd-devils/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-freedict-eng-deu/metadata.xml b/app-dicts/stardict-freedict-eng-deu/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-freedict-eng-deu/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-deu/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-freedict-eng-fra/metadata.xml b/app-dicts/stardict-freedict-eng-fra/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-freedict-eng-fra/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-fra/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-freedict-eng-ita/metadata.xml b/app-dicts/stardict-freedict-eng-ita/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-freedict-eng-ita/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-ita/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-freedict-eng-lat/metadata.xml b/app-dicts/stardict-freedict-eng-lat/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-freedict-eng-lat/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-lat/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-freedict-eng-rus/metadata.xml b/app-dicts/stardict-freedict-eng-rus/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-freedict-eng-rus/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-rus/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-freedict-eng-spa/metadata.xml b/app-dicts/stardict-freedict-eng-spa/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-freedict-eng-spa/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-spa/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-freedict-eng-swe/metadata.xml b/app-dicts/stardict-freedict-eng-swe/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-freedict-eng-swe/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-swe/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-freedict-eng-tur/metadata.xml b/app-dicts/stardict-freedict-eng-tur/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-freedict-eng-tur/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-tur/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-freedict-tur-deu/metadata.xml b/app-dicts/stardict-freedict-tur-deu/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-freedict-tur-deu/metadata.xml
+++ b/app-dicts/stardict-freedict-tur-deu/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-freedict-tur-eng/metadata.xml b/app-dicts/stardict-freedict-tur-eng/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-freedict-tur-eng/metadata.xml
+++ b/app-dicts/stardict-freedict-tur-eng/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-hnd-de-vi/metadata.xml b/app-dicts/stardict-hnd-de-vi/metadata.xml
index 1470e03..097975e 100644
--- a/app-dicts/stardict-hnd-de-vi/metadata.xml
+++ b/app-dicts/stardict-hnd-de-vi/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-dicts/stardict-hnd-en-vi/metadata.xml b/app-dicts/stardict-hnd-en-vi/metadata.xml
index 1470e03..097975e 100644
--- a/app-dicts/stardict-hnd-en-vi/metadata.xml
+++ b/app-dicts/stardict-hnd-en-vi/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-dicts/stardict-hnd-fr-vi/metadata.xml b/app-dicts/stardict-hnd-fr-vi/metadata.xml
index 1470e03..097975e 100644
--- a/app-dicts/stardict-hnd-fr-vi/metadata.xml
+++ b/app-dicts/stardict-hnd-fr-vi/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-dicts/stardict-hnd-ru-vi/metadata.xml b/app-dicts/stardict-hnd-ru-vi/metadata.xml
index 1470e03..097975e 100644
--- a/app-dicts/stardict-hnd-ru-vi/metadata.xml
+++ b/app-dicts/stardict-hnd-ru-vi/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-dicts/stardict-hnd-vi-de/metadata.xml b/app-dicts/stardict-hnd-vi-de/metadata.xml
index 1470e03..097975e 100644
--- a/app-dicts/stardict-hnd-vi-de/metadata.xml
+++ b/app-dicts/stardict-hnd-vi-de/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-dicts/stardict-hnd-vi-en/metadata.xml b/app-dicts/stardict-hnd-vi-en/metadata.xml
index 1470e03..097975e 100644
--- a/app-dicts/stardict-hnd-vi-en/metadata.xml
+++ b/app-dicts/stardict-hnd-vi-en/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-dicts/stardict-hnd-vi-fr/metadata.xml b/app-dicts/stardict-hnd-vi-fr/metadata.xml
index 1470e03..097975e 100644
--- a/app-dicts/stardict-hnd-vi-fr/metadata.xml
+++ b/app-dicts/stardict-hnd-vi-fr/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-dicts/stardict-hnd-vi-vi/metadata.xml b/app-dicts/stardict-hnd-vi-vi/metadata.xml
index 1470e03..097975e 100644
--- a/app-dicts/stardict-hnd-vi-vi/metadata.xml
+++ b/app-dicts/stardict-hnd-vi-vi/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-dicts/stardict-mova-smiley/metadata.xml b/app-dicts/stardict-mova-smiley/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-mova-smiley/metadata.xml
+++ b/app-dicts/stardict-mova-smiley/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-quick-eng-fra/metadata.xml b/app-dicts/stardict-quick-eng-fra/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-quick-eng-fra/metadata.xml
+++ b/app-dicts/stardict-quick-eng-fra/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-quick-ru-en/metadata.xml b/app-dicts/stardict-quick-ru-en/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-quick-ru-en/metadata.xml
+++ b/app-dicts/stardict-quick-ru-en/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/stardict-xdict-zh-en-gb/metadata.xml b/app-dicts/stardict-xdict-zh-en-gb/metadata.xml
index f6dbf24..cf77342 100644
--- a/app-dicts/stardict-xdict-zh-en-gb/metadata.xml
+++ b/app-dicts/stardict-xdict-zh-en-gb/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">stardict</remote-id>
 	</upstream>

diff --git a/app-dicts/wordnet/metadata.xml b/app-dicts/wordnet/metadata.xml
index 1470e03..097975e 100644
--- a/app-dicts/wordnet/metadata.xml
+++ b/app-dicts/wordnet/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-dicts/ydpdict/metadata.xml b/app-dicts/ydpdict/metadata.xml
index 91f4e72..097975e 100644
--- a/app-dicts/ydpdict/metadata.xml
+++ b/app-dicts/ydpdict/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-doc/gimp-help/metadata.xml b/app-doc/gimp-help/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-doc/gimp-help/metadata.xml
+++ b/app-doc/gimp-help/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-doc/linux-gazette-base/metadata.xml b/app-doc/linux-gazette-base/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-doc/linux-gazette-base/metadata.xml
+++ b/app-doc/linux-gazette-base/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-doc/mkdoxy/metadata.xml b/app-doc/mkdoxy/metadata.xml
index 1ed7d90..fb18e09 100644
--- a/app-doc/mkdoxy/metadata.xml
+++ b/app-doc/mkdoxy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		A doxygen-style documentation tool for makefiles (requires doxygen).
 	</longdescription>

diff --git a/app-doc/psmark/metadata.xml b/app-doc/psmark/metadata.xml
index 125dad9..c31b05b 100644
--- a/app-doc/psmark/metadata.xml
+++ b/app-doc/psmark/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>Command-line Postscript watermark tool; simple, but useful 
 for things like adding a watermark to outgoing or incoming faxes (eg, use 
 with the sendfax command from net-misc/hylafax).

diff --git a/app-doc/selfhtml/metadata.xml b/app-doc/selfhtml/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-doc/selfhtml/metadata.xml
+++ b/app-doc/selfhtml/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-doc/selflinux/metadata.xml b/app-doc/selflinux/metadata.xml
index 5f112f7..9ac9508 100644
--- a/app-doc/selflinux/metadata.xml
+++ b/app-doc/selflinux/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">selflinux</remote-id>
 	</upstream>

diff --git a/app-doc/xmltoman/metadata.xml b/app-doc/xmltoman/metadata.xml
index 6431fe9..1d41a74 100644
--- a/app-doc/xmltoman/metadata.xml
+++ b/app-doc/xmltoman/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xmltoman</remote-id>
 	</upstream>

diff --git a/app-editors/XML-XSH2/metadata.xml b/app-editors/XML-XSH2/metadata.xml
index 6d38c0c..debcd62 100644
--- a/app-editors/XML-XSH2/metadata.xml
+++ b/app-editors/XML-XSH2/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
-        <email>maintainer-needed@gentoo.org</email>
-    </maintainer>
     <upstream>
         <remote-id type="cpan">XML-XSH2</remote-id>
         <remote-id type="cpan-module">Parse::RecDescent::XML::XSH2::Parser</remote-id>

diff --git a/app-editors/cooledit/metadata.xml b/app-editors/cooledit/metadata.xml
index 492f7b6..87b74ef 100644
--- a/app-editors/cooledit/metadata.xml
+++ b/app-editors/cooledit/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">cooledit</remote-id>
 	</upstream>

diff --git a/app-editors/dav/metadata.xml b/app-editors/dav/metadata.xml
index 6a605bf..4084db2 100644
--- a/app-editors/dav/metadata.xml
+++ b/app-editors/dav/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dav-text</remote-id>
 	</upstream>

diff --git a/app-editors/dhex/metadata.xml b/app-editors/dhex/metadata.xml
index 91f4e72..097975e 100644
--- a/app-editors/dhex/metadata.xml
+++ b/app-editors/dhex/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-editors/efte/metadata.xml b/app-editors/efte/metadata.xml
index 1b5c6ec..7458e0b 100644
--- a/app-editors/efte/metadata.xml
+++ b/app-editors/efte/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">efte</remote-id>
 	</upstream>

diff --git a/app-editors/fte/metadata.xml b/app-editors/fte/metadata.xml
index fc3f5cf..8373921 100644
--- a/app-editors/fte/metadata.xml
+++ b/app-editors/fte/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>Lightweight text-mode editor.</longdescription>
   <upstream>
     <remote-id type="sourceforge">fte</remote-id>

diff --git a/app-editors/le/metadata.xml b/app-editors/le/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-editors/le/metadata.xml
+++ b/app-editors/le/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-editors/levee/metadata.xml b/app-editors/levee/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-editors/levee/metadata.xml
+++ b/app-editors/levee/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-editors/lfhex/metadata.xml b/app-editors/lfhex/metadata.xml
index a40624f..097975e 100644
--- a/app-editors/lfhex/metadata.xml
+++ b/app-editors/lfhex/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-editors/lpe/metadata.xml b/app-editors/lpe/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-editors/lpe/metadata.xml
+++ b/app-editors/lpe/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-editors/mp/metadata.xml b/app-editors/mp/metadata.xml
index f9d50da..097975e 100644
--- a/app-editors/mp/metadata.xml
+++ b/app-editors/mp/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-editors/ne/metadata.xml b/app-editors/ne/metadata.xml
index 02a230f..8448688 100644
--- a/app-editors/ne/metadata.xml
+++ b/app-editors/ne/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
 <flag name="tinfo">Link against libtinfo from sys-libs/ncurses</flag>
 </use>

diff --git a/app-editors/ted/metadata.xml b/app-editors/ted/metadata.xml
index 91f4e72..097975e 100644
--- a/app-editors/ted/metadata.xml
+++ b/app-editors/ted/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-editors/wily/metadata.xml b/app-editors/wily/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-editors/wily/metadata.xml
+++ b/app-editors/wily/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-editors/yudit/metadata.xml b/app-editors/yudit/metadata.xml
index ff62877..097975e 100644
--- a/app-editors/yudit/metadata.xml
+++ b/app-editors/yudit/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-editors/zoinks/metadata.xml b/app-editors/zoinks/metadata.xml
index ff62877..097975e 100644
--- a/app-editors/zoinks/metadata.xml
+++ b/app-editors/zoinks/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-emulation/aranym/metadata.xml b/app-emulation/aranym/metadata.xml
index d60a279..8ace45a 100644
--- a/app-emulation/aranym/metadata.xml
+++ b/app-emulation/aranym/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		ARAnyM is an acronym: Atari Running on Any Machine. It is a virtual
 		machine software for running the Atari ST/TT/Falcon operating systems

diff --git a/app-emulation/dinero/metadata.xml b/app-emulation/dinero/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-emulation/dinero/metadata.xml
+++ b/app-emulation/dinero/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-emulation/dlx/metadata.xml b/app-emulation/dlx/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-emulation/dlx/metadata.xml
+++ b/app-emulation/dlx/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-emulation/domi/metadata.xml b/app-emulation/domi/metadata.xml
index 0016510..0af225b 100644
--- a/app-emulation/domi/metadata.xml
+++ b/app-emulation/domi/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-          <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>Scripts for building Xen domains</longdescription>
 </pkgmetadata>

diff --git a/app-emulation/e-uae/metadata.xml b/app-emulation/e-uae/metadata.xml
index 0a61e43..0b22e90 100644
--- a/app-emulation/e-uae/metadata.xml
+++ b/app-emulation/e-uae/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		E-UAE is a fork of UAE which intends to merge all the new features of
 		WinUAE with UAE.

diff --git a/app-emulation/ganeti-instance-debian-etch/metadata.xml b/app-emulation/ganeti-instance-debian-etch/metadata.xml
index a49a834..3328791 100644
--- a/app-emulation/ganeti-instance-debian-etch/metadata.xml
+++ b/app-emulation/ganeti-instance-debian-etch/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">ganeti</remote-id>
 	</upstream>

diff --git a/app-emulation/ganeti-instance-image/metadata.xml b/app-emulation/ganeti-instance-image/metadata.xml
index a6efca6..2577434 100644
--- a/app-emulation/ganeti-instance-image/metadata.xml
+++ b/app-emulation/ganeti-instance-image/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>

diff --git a/app-emulation/gxemul/metadata.xml b/app-emulation/gxemul/metadata.xml
index f7b826f..943208f 100644
--- a/app-emulation/gxemul/metadata.xml
+++ b/app-emulation/gxemul/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>Machine Emulator.  Supports emulation across several architectures.  Primarily for MIPS support, but other platform support coming soon.</longdescription>
   <upstream>
     <remote-id type="sourceforge">gxemul</remote-id>

diff --git a/app-emulation/qtemu/metadata.xml b/app-emulation/qtemu/metadata.xml
index 6f617db..ca6ad88 100644
--- a/app-emulation/qtemu/metadata.xml
+++ b/app-emulation/qtemu/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">qtemu</remote-id>
 	</upstream>

diff --git a/app-emulation/rex-client/metadata.xml b/app-emulation/rex-client/metadata.xml
index a40624f..097975e 100644
--- a/app-emulation/rex-client/metadata.xml
+++ b/app-emulation/rex-client/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-emulation/spectemu/metadata.xml b/app-emulation/spectemu/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-emulation/spectemu/metadata.xml
+++ b/app-emulation/spectemu/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-emulation/spim/metadata.xml b/app-emulation/spim/metadata.xml
index 8260022..29d31ab 100644
--- a/app-emulation/spim/metadata.xml
+++ b/app-emulation/spim/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		A self-contained simulator that will run MIPS32 assembly language
 		programs.  It also provides a simple debugger and a minimal set of

diff --git a/app-emulation/uae/metadata.xml b/app-emulation/uae/metadata.xml
index e4f768b..0a4b82d 100644
--- a/app-emulation/uae/metadata.xml
+++ b/app-emulation/uae/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		UAE is a mostly complete software emulation of the hardware of the
 		Commodore Amiga 500/1000/2000. A Commodore Amiga is a 16/32 bit computer

diff --git a/app-emulation/vboxgtk/metadata.xml b/app-emulation/vboxgtk/metadata.xml
index 91f4e72..097975e 100644
--- a/app-emulation/vboxgtk/metadata.xml
+++ b/app-emulation/vboxgtk/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-emulation/vmips-cross-bin/metadata.xml b/app-emulation/vmips-cross-bin/metadata.xml
index 54b2351..16f5903 100644
--- a/app-emulation/vmips-cross-bin/metadata.xml
+++ b/app-emulation/vmips-cross-bin/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vmips</remote-id>
 	</upstream>

diff --git a/app-emulation/vmips/metadata.xml b/app-emulation/vmips/metadata.xml
index 54b2351..16f5903 100644
--- a/app-emulation/vmips/metadata.xml
+++ b/app-emulation/vmips/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vmips</remote-id>
 	</upstream>

diff --git a/app-eselect/eselect-audicle/metadata.xml b/app-eselect/eselect-audicle/metadata.xml
index 91f4e72..097975e 100644
--- a/app-eselect/eselect-audicle/metadata.xml
+++ b/app-eselect/eselect-audicle/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-eselect/eselect-chuck/metadata.xml b/app-eselect/eselect-chuck/metadata.xml
index 91f4e72..097975e 100644
--- a/app-eselect/eselect-chuck/metadata.xml
+++ b/app-eselect/eselect-chuck/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-eselect/eselect-miniaudicle/metadata.xml b/app-eselect/eselect-miniaudicle/metadata.xml
index 91f4e72..097975e 100644
--- a/app-eselect/eselect-miniaudicle/metadata.xml
+++ b/app-eselect/eselect-miniaudicle/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-eselect/eselect-sndpeek/metadata.xml b/app-eselect/eselect-sndpeek/metadata.xml
index 91f4e72..097975e 100644
--- a/app-eselect/eselect-sndpeek/metadata.xml
+++ b/app-eselect/eselect-sndpeek/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-forensics/zzuf/metadata.xml b/app-forensics/zzuf/metadata.xml
index f9d50da..097975e 100644
--- a/app-forensics/zzuf/metadata.xml
+++ b/app-forensics/zzuf/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-i18n/cstools/metadata.xml b/app-i18n/cstools/metadata.xml
index c1358c6..e73ce9f 100644
--- a/app-i18n/cstools/metadata.xml
+++ b/app-i18n/cstools/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer>
-                <email>maintainer-needed@gentoo.org</email>
-        </maintainer>
-	<longdescription lang="en">
+        <longdescription lang="en">
 		Distribution Cstools contains well-known character set conversion
 		program cstocs, and module Cz::Cstocs that makes it easy to do charset
 		conversions directly in Perl scripts, without spawning external process.

diff --git a/app-i18n/man-pages-da/metadata.xml b/app-i18n/man-pages-da/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-i18n/man-pages-da/metadata.xml
+++ b/app-i18n/man-pages-da/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-i18n/man-pages-fr/metadata.xml b/app-i18n/man-pages-fr/metadata.xml
index f9d50da..097975e 100644
--- a/app-i18n/man-pages-fr/metadata.xml
+++ b/app-i18n/man-pages-fr/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-i18n/man-pages-nl/metadata.xml b/app-i18n/man-pages-nl/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-i18n/man-pages-nl/metadata.xml
+++ b/app-i18n/man-pages-nl/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-i18n/man-pages-ro/metadata.xml b/app-i18n/man-pages-ro/metadata.xml
index f9d50da..097975e 100644
--- a/app-i18n/man-pages-ro/metadata.xml
+++ b/app-i18n/man-pages-ro/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-i18n/man-pages-zh_CN/metadata.xml b/app-i18n/man-pages-zh_CN/metadata.xml
index 1470e03..097975e 100644
--- a/app-i18n/man-pages-zh_CN/metadata.xml
+++ b/app-i18n/man-pages-zh_CN/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-laptop/easy-slow-down-manager/metadata.xml b/app-laptop/easy-slow-down-manager/metadata.xml
index b3ced0e..0a5a6ab 100644
--- a/app-laptop/easy-slow-down-manager/metadata.xml
+++ b/app-laptop/easy-slow-down-manager/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">easy-slow-down-manager</remote-id>
 	</upstream>

diff --git a/app-laptop/hdaps-gl/metadata.xml b/app-laptop/hdaps-gl/metadata.xml
index 1f206e8..17a10a5 100644
--- a/app-laptop/hdaps-gl/metadata.xml
+++ b/app-laptop/hdaps-gl/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">hdaps</remote-id>
 	</upstream>

diff --git a/app-laptop/ibam/metadata.xml b/app-laptop/ibam/metadata.xml
index 2e236dc..59db4b8 100644
--- a/app-laptop/ibam/metadata.xml
+++ b/app-laptop/ibam/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="gkrellm">Enable building of app-admin/gkrellm module</flag>
 	</use>

diff --git a/app-laptop/lphdisk/metadata.xml b/app-laptop/lphdisk/metadata.xml
index f9d50da..097975e 100644
--- a/app-laptop/lphdisk/metadata.xml
+++ b/app-laptop/lphdisk/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-laptop/prey/metadata.xml b/app-laptop/prey/metadata.xml
index 9b7ee45..1621c52 100644
--- a/app-laptop/prey/metadata.xml
+++ b/app-laptop/prey/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
 	<flag name="alarm">Module for playing an audio file</flag>
 	<flag name="alert">Display a warning message when the computer seems to be stolen"</flag>

diff --git a/app-laptop/radeontool/metadata.xml b/app-laptop/radeontool/metadata.xml
index 4538a68..097975e 100644
--- a/app-laptop/radeontool/metadata.xml
+++ b/app-laptop/radeontool/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-laptop/spicctrl/metadata.xml b/app-laptop/spicctrl/metadata.xml
index 4538a68..097975e 100644
--- a/app-laptop/spicctrl/metadata.xml
+++ b/app-laptop/spicctrl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-laptop/tp_smapi/metadata.xml b/app-laptop/tp_smapi/metadata.xml
index 5d98121..92b8ba4 100644
--- a/app-laptop/tp_smapi/metadata.xml
+++ b/app-laptop/tp_smapi/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="hdaps">Install a compatible HDAPS module</flag>
   </use>

diff --git a/app-laptop/tpb/metadata.xml b/app-laptop/tpb/metadata.xml
index 4538a68..097975e 100644
--- a/app-laptop/tpb/metadata.xml
+++ b/app-laptop/tpb/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-misc/acdctl/metadata.xml b/app-misc/acdctl/metadata.xml
index 3ccf546..529eebb 100644
--- a/app-misc/acdctl/metadata.xml
+++ b/app-misc/acdctl/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<longdescription lang="en">
 		acdctl is a command-line utility to control the otherwise inaccessible
 		brightness levels of an Apple Cinema Display on any system with libusb

diff --git a/app-misc/actkbd/metadata.xml b/app-misc/actkbd/metadata.xml
index cbfedbb..9eee209 100644
--- a/app-misc/actkbd/metadata.xml
+++ b/app-misc/actkbd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 actkbd is a simple daemon that binds actions to keyboard events. It recognises
 key combinations and can handle press, repeat and release events.

diff --git a/app-misc/aldo/metadata.xml b/app-misc/aldo/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-misc/aldo/metadata.xml
+++ b/app-misc/aldo/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/asciinema/metadata.xml b/app-misc/asciinema/metadata.xml
index 7debdb1..6a0532c 100644
--- a/app-misc/asciinema/metadata.xml
+++ b/app-misc/asciinema/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">asciinema</remote-id>
 	</upstream>

diff --git a/app-misc/away/metadata.xml b/app-misc/away/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/away/metadata.xml
+++ b/app-misc/away/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/basenji/metadata.xml b/app-misc/basenji/metadata.xml
index 8a8a867..218dda4 100644
--- a/app-misc/basenji/metadata.xml
+++ b/app-misc/basenji/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		Basenji is a volume indexing tool designed for easy and fast indexing of volume collections. It currently supports indexing of removable media such as CDs and USB sticks and stores them as volume objects in a database. After being stored in this database, volumes can be browsed and searched trough for specific files very quickly.
 	</longdescription>

diff --git a/app-misc/beancounter/metadata.xml b/app-misc/beancounter/metadata.xml
index 5ff3359..d996c75 100644
--- a/app-misc/beancounter/metadata.xml
+++ b/app-misc/beancounter/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Finance performance calculation engine with data acquisition (Yahoo! Finance)
 		and SQL backend support.

diff --git a/app-misc/bottlerocket/metadata.xml b/app-misc/bottlerocket/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-misc/bottlerocket/metadata.xml
+++ b/app-misc/bottlerocket/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-misc/btail/metadata.xml b/app-misc/btail/metadata.xml
index ff62877..097975e 100644
--- a/app-misc/btail/metadata.xml
+++ b/app-misc/btail/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-misc/cadubi/metadata.xml b/app-misc/cadubi/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/cadubi/metadata.xml
+++ b/app-misc/cadubi/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/cbview/metadata.xml b/app-misc/cbview/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-misc/cbview/metadata.xml
+++ b/app-misc/cbview/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-misc/cdcat/metadata.xml b/app-misc/cdcat/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-misc/cdcat/metadata.xml
+++ b/app-misc/cdcat/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/cdctl/metadata.xml b/app-misc/cdctl/metadata.xml
index 65e05e4..0f824a9 100644
--- a/app-misc/cdctl/metadata.xml
+++ b/app-misc/cdctl/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cdctl</remote-id>
 	</upstream>

diff --git a/app-misc/cdircmp/metadata.xml b/app-misc/cdircmp/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-misc/cdircmp/metadata.xml
+++ b/app-misc/cdircmp/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/cdspeed/metadata.xml b/app-misc/cdspeed/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-misc/cdspeed/metadata.xml
+++ b/app-misc/cdspeed/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-misc/cmatrix/metadata.xml b/app-misc/cmatrix/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/cmatrix/metadata.xml
+++ b/app-misc/cmatrix/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/cstream/metadata.xml b/app-misc/cstream/metadata.xml
index f83940a..963e75d 100644
--- a/app-misc/cstream/metadata.xml
+++ b/app-misc/cstream/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 cstream is a general-purpose stream-handling tool like UNIX dd, usually used in commandline-constructed pipes. 
 Features: 

diff --git a/app-misc/dailystrips/metadata.xml b/app-misc/dailystrips/metadata.xml
index e880926..4a3ab00 100644
--- a/app-misc/dailystrips/metadata.xml
+++ b/app-misc/dailystrips/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dailystrips</remote-id>
 	</upstream>

diff --git a/app-misc/ddccontrol-db/metadata.xml b/app-misc/ddccontrol-db/metadata.xml
index e977a34..1559300 100644
--- a/app-misc/ddccontrol-db/metadata.xml
+++ b/app-misc/ddccontrol-db/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">ddccontrol/ddccontrol-db</remote-id>
     <remote-id type="sourceforge">ddccontrol</remote-id>

diff --git a/app-misc/ddccontrol/metadata.xml b/app-misc/ddccontrol/metadata.xml
index 1598de6..f2bc85b 100644
--- a/app-misc/ddccontrol/metadata.xml
+++ b/app-misc/ddccontrol/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="pci">enable direct PCI memory access (the setuid ddcpci util)</flag>
   </use>

diff --git a/app-misc/dvorak7min/metadata.xml b/app-misc/dvorak7min/metadata.xml
index f9d50da..097975e 100644
--- a/app-misc/dvorak7min/metadata.xml
+++ b/app-misc/dvorak7min/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/dvorakng/metadata.xml b/app-misc/dvorakng/metadata.xml
index ce75af8..b2e21a5 100644
--- a/app-misc/dvorakng/metadata.xml
+++ b/app-misc/dvorakng/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">dvorakng</remote-id>
 	</upstream>

diff --git a/app-misc/esekeyd/metadata.xml b/app-misc/esekeyd/metadata.xml
index e8270e1..cb02820 100644
--- a/app-misc/esekeyd/metadata.xml
+++ b/app-misc/esekeyd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">esekeyd</remote-id>
 	</upstream>

diff --git a/app-misc/flasm/metadata.xml b/app-misc/flasm/metadata.xml
index 8362375..2f69337 100644
--- a/app-misc/flasm/metadata.xml
+++ b/app-misc/flasm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>Flasm disassembles your entire SWF including all the
       timelines and events.  Looking at disassembly, you learn how the Flash
       compiler works, which improves your ActionScript skills. You can also do

diff --git a/app-misc/fslint/metadata.xml b/app-misc/fslint/metadata.xml
index 1470e03..097975e 100644
--- a/app-misc/fslint/metadata.xml
+++ b/app-misc/fslint/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-misc/fujiplay/metadata.xml b/app-misc/fujiplay/metadata.xml
index 333a655..097975e 100644
--- a/app-misc/fujiplay/metadata.xml
+++ b/app-misc/fujiplay/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-  <description>This package lacks a primary herd or maintainer.</description>
-</maintainer>
 </pkgmetadata>

diff --git a/app-misc/g15mpd/metadata.xml b/app-misc/g15mpd/metadata.xml
index 966a40b..d6f286d 100644
--- a/app-misc/g15mpd/metadata.xml
+++ b/app-misc/g15mpd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">g15daemon</remote-id>
 	</upstream>

diff --git a/app-misc/glastree/metadata.xml b/app-misc/glastree/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-misc/glastree/metadata.xml
+++ b/app-misc/glastree/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-misc/glcdprocdriver/metadata.xml b/app-misc/glcdprocdriver/metadata.xml
index a5ec2f6..5a1cd20 100644
--- a/app-misc/glcdprocdriver/metadata.xml
+++ b/app-misc/glcdprocdriver/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		GLCDprocDriver is the glue between the app-misc/graphlcd-base
 		library, which is written in C++, and app-misc/lcdproc's

diff --git a/app-misc/glimpse/metadata.xml b/app-misc/glimpse/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/glimpse/metadata.xml
+++ b/app-misc/glimpse/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/gnomecatalog/metadata.xml b/app-misc/gnomecatalog/metadata.xml
index ef92f51..2be6aad 100644
--- a/app-misc/gnomecatalog/metadata.xml
+++ b/app-misc/gnomecatalog/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>Cataloging software for CDs and DVDs.</description>
-	</maintainer>
 	<longdescription>
 	Generate thumbnails of the video files and image files via nautilus (gnome
 	file manager), and saves it in the database files.

diff --git a/app-misc/gnutu/metadata.xml b/app-misc/gnutu/metadata.xml
index b1c2d90..0981e1f 100644
--- a/app-misc/gnutu/metadata.xml
+++ b/app-misc/gnutu/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		GNUTU is a polish program. It is designed for students from primary and
 		secondary schools – using it, you can note various information (like marks,

diff --git a/app-misc/grabcartoons/metadata.xml b/app-misc/grabcartoons/metadata.xml
index effbbf3..097975e 100644
--- a/app-misc/grabcartoons/metadata.xml
+++ b/app-misc/grabcartoons/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-misc/hachoir-metadata/metadata.xml b/app-misc/hachoir-metadata/metadata.xml
index aedfa7d..c52e1ad 100644
--- a/app-misc/hachoir-metadata/metadata.xml
+++ b/app-misc/hachoir-metadata/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">tool to extract metadata from multimedia files (sound, video, archives,
 		etc.)</longdescription>
 	<upstream>

diff --git a/app-misc/hachoir-subfile/metadata.xml b/app-misc/hachoir-subfile/metadata.xml
index f1abda7..6214fb3 100644
--- a/app-misc/hachoir-subfile/metadata.xml
+++ b/app-misc/hachoir-subfile/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">a tool based on hachoir-parser to find subfiles in any binary stream.</longdescription>
   <upstream>
     <remote-id type="pypi">hachoir-subfile</remote-id>

diff --git a/app-misc/hachoir-urwid/metadata.xml b/app-misc/hachoir-urwid/metadata.xml
index 5a26c18..06baade 100644
--- a/app-misc/hachoir-urwid/metadata.xml
+++ b/app-misc/hachoir-urwid/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">user interface based on hachoir-parser to explore a binary file.</longdescription>
   <upstream>
     <remote-id type="pypi">hachoir-urwid</remote-id>

diff --git a/app-misc/ignuit/metadata.xml b/app-misc/ignuit/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/ignuit/metadata.xml
+++ b/app-misc/ignuit/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/joy2key/metadata.xml b/app-misc/joy2key/metadata.xml
index 80d21cf..d9328db 100644
--- a/app-misc/joy2key/metadata.xml
+++ b/app-misc/joy2key/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">joy2key</remote-id>
 	</upstream>

diff --git a/app-misc/klavaro/metadata.xml b/app-misc/klavaro/metadata.xml
index 4f23a8c..71dbfeb 100644
--- a/app-misc/klavaro/metadata.xml
+++ b/app-misc/klavaro/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">klavaro</remote-id>
 	</upstream>

diff --git a/app-misc/lcd4linux/metadata.xml b/app-misc/lcd4linux/metadata.xml
index 7c63416..2670e98 100644
--- a/app-misc/lcd4linux/metadata.xml
+++ b/app-misc/lcd4linux/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
   LCD4Linux is a small program that grabs information from the kernel and some
   subsystems and displays it on an external liquid crystal display. It is

diff --git a/app-misc/lfm/metadata.xml b/app-misc/lfm/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/lfm/metadata.xml
+++ b/app-misc/lfm/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/linuxspa/metadata.xml b/app-misc/linuxspa/metadata.xml
index 10bb7f1..ae8f274 100644
--- a/app-misc/linuxspa/metadata.xml
+++ b/app-misc/linuxspa/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>Linux Serial Protocol Analyser</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">serialsniffer</remote-id>

diff --git a/app-misc/lsx/metadata.xml b/app-misc/lsx/metadata.xml
index c4cfedc..ed46c79 100644
--- a/app-misc/lsx/metadata.xml
+++ b/app-misc/lsx/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>Prints all executable file names of given absolute paths to standard output</longdescription>
 </pkgmetadata>

diff --git a/app-misc/mencal/metadata.xml b/app-misc/mencal/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-misc/mencal/metadata.xml
+++ b/app-misc/mencal/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/mepl/metadata.xml b/app-misc/mepl/metadata.xml
index ff62877..097975e 100644
--- a/app-misc/mepl/metadata.xml
+++ b/app-misc/mepl/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-misc/misterhouse/metadata.xml b/app-misc/misterhouse/metadata.xml
index dd245b1..64ca44e 100644
--- a/app-misc/misterhouse/metadata.xml
+++ b/app-misc/misterhouse/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">misterhouse</remote-id>
 	</upstream>

diff --git a/app-misc/mouseremote/metadata.xml b/app-misc/mouseremote/metadata.xml
index a40624f..097975e 100644
--- a/app-misc/mouseremote/metadata.xml
+++ b/app-misc/mouseremote/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-misc/multimon/metadata.xml b/app-misc/multimon/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/multimon/metadata.xml
+++ b/app-misc/multimon/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/mvcase/metadata.xml b/app-misc/mvcase/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/mvcase/metadata.xml
+++ b/app-misc/mvcase/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/note/metadata.xml b/app-misc/note/metadata.xml
index 9f74f81..99fed3a 100644
--- a/app-misc/note/metadata.xml
+++ b/app-misc/note/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-  <name>Default assignee for orphaned packages</name>
-</maintainer>
 <use>
   <flag name="general">Add support for ascii flatfile backend</flag>
   <flag name="text">Add support for text backend</flag>

diff --git a/app-misc/nut/metadata.xml b/app-misc/nut/metadata.xml
index 77c9c4e..3a748bd 100644
--- a/app-misc/nut/metadata.xml
+++ b/app-misc/nut/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nut</remote-id>
 	</upstream>

diff --git a/app-misc/pal/metadata.xml b/app-misc/pal/metadata.xml
index 4bcaedf..ff0cdd6 100644
--- a/app-misc/pal/metadata.xml
+++ b/app-misc/pal/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
   pal is a command-line calendar program for Unix/Linux systems that can keep
   track of events. It has similarities with the Unix cal command, the more

diff --git a/app-misc/perltrash/metadata.xml b/app-misc/perltrash/metadata.xml
index 120e2cd..097975e 100644
--- a/app-misc/perltrash/metadata.xml
+++ b/app-misc/perltrash/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>maintainer-needed</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/physlock/metadata.xml b/app-misc/physlock/metadata.xml
index e18ad00..6435e24 100644
--- a/app-misc/physlock/metadata.xml
+++ b/app-misc/physlock/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
 	Control physical access to a linux computer by locking all of its virtual
 	terminals / consoles.

diff --git a/app-misc/pipeworks/metadata.xml b/app-misc/pipeworks/metadata.xml
index 05d609b..6222ef5 100644
--- a/app-misc/pipeworks/metadata.xml
+++ b/app-misc/pipeworks/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 pipeworks is a benchmarking tool for pipelines that is very similar to pipemeter. It writes its stdin to its 
 stdout, while reporting the data flow rate to stderr. It features adjustable block size and bandwidth limiting 

diff --git a/app-misc/plod/metadata.xml b/app-misc/plod/metadata.xml
index 7d16b62..097975e 100644
--- a/app-misc/plod/metadata.xml
+++ b/app-misc/plod/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
-        <email>maintainer-needed@gentoo.org</email>
-    </maintainer>
 </pkgmetadata>

diff --git a/app-misc/recoll/metadata.xml b/app-misc/recoll/metadata.xml
index 816ec7e..6dea6c3 100644
--- a/app-misc/recoll/metadata.xml
+++ b/app-misc/recoll/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
 	<flag name="camelcase">Enable indexing for camelCase sentences and words</flag>
 	<flag name="chm">Index chm files</flag>

diff --git a/app-misc/regex-markup/metadata.xml b/app-misc/regex-markup/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-misc/regex-markup/metadata.xml
+++ b/app-misc/regex-markup/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/relevation/metadata.xml b/app-misc/relevation/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/relevation/metadata.xml
+++ b/app-misc/relevation/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/rioutil/metadata.xml b/app-misc/rioutil/metadata.xml
index 855f76f..3efbda8 100644
--- a/app-misc/rioutil/metadata.xml
+++ b/app-misc/rioutil/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rioutil</remote-id>
 	</upstream>

diff --git a/app-misc/run-mailcap/metadata.xml b/app-misc/run-mailcap/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/run-mailcap/metadata.xml
+++ b/app-misc/run-mailcap/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/slmon/metadata.xml b/app-misc/slmon/metadata.xml
index 076e04f..f9d77e1 100644
--- a/app-misc/slmon/metadata.xml
+++ b/app-misc/slmon/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">slmon</remote-id>
 	</upstream>

diff --git a/app-misc/smtm/metadata.xml b/app-misc/smtm/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/smtm/metadata.xml
+++ b/app-misc/smtm/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-misc/solaar/metadata.xml b/app-misc/solaar/metadata.xml
index 6d5e710..3d69f75 100644
--- a/app-misc/solaar/metadata.xml
+++ b/app-misc/solaar/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">pwr/Solaar</remote-id>
   </upstream>

diff --git a/app-misc/sonypid/metadata.xml b/app-misc/sonypid/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-misc/sonypid/metadata.xml
+++ b/app-misc/sonypid/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-misc/tablix/metadata.xml b/app-misc/tablix/metadata.xml
index e6219b1..652fb54 100644
--- a/app-misc/tablix/metadata.xml
+++ b/app-misc/tablix/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
   <flag name="pvm">Add support for parallel virtual machine
     (<pkg>sys-cluster/pvm</pkg>)</flag>

diff --git a/app-misc/tkpasman/metadata.xml b/app-misc/tkpasman/metadata.xml
index 1470e03..097975e 100644
--- a/app-misc/tkpasman/metadata.xml
+++ b/app-misc/tkpasman/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-misc/towitoko/metadata.xml b/app-misc/towitoko/metadata.xml
index e31b648..6a98e0d 100644
--- a/app-misc/towitoko/metadata.xml
+++ b/app-misc/towitoko/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
   <flag name="moneyplex">Makes libtowitoko work for the moneyplex home banking
     software</flag>

diff --git a/app-misc/tpconfig/metadata.xml b/app-misc/tpconfig/metadata.xml
index a40624f..097975e 100644
--- a/app-misc/tpconfig/metadata.xml
+++ b/app-misc/tpconfig/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-misc/tprint/metadata.xml b/app-misc/tprint/metadata.xml
index f3fda2e..b686423 100644
--- a/app-misc/tprint/metadata.xml
+++ b/app-misc/tprint/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>The Transparent Print utility program for Linux. Provides an easy way to transparently print to serial terminals that have printers attached.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">tprint</remote-id>

diff --git a/app-misc/ttyrec/metadata.xml b/app-misc/ttyrec/metadata.xml
index 9d75d42..f4ceb77 100644
--- a/app-misc/ttyrec/metadata.xml
+++ b/app-misc/ttyrec/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>
 ttyrec is a tty recorder. Recorded data can be played back with the
 included ttyplay command. ttyrec is just a derivative of script

diff --git a/app-misc/vittk/metadata.xml b/app-misc/vittk/metadata.xml
index 9879b30..c7f743d 100644
--- a/app-misc/vittk/metadata.xml
+++ b/app-misc/vittk/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 	A comprehensive front end for Taskwarrior (<pkg>app-misc/task</pkg>) that
 	provides a fullscreen emulated terminal window with modes and commands

diff --git a/app-misc/webcomics-collector/metadata.xml b/app-misc/webcomics-collector/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-misc/webcomics-collector/metadata.xml
+++ b/app-misc/webcomics-collector/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-misc/worker/metadata.xml b/app-misc/worker/metadata.xml
index 34e6298..8a8e4f9 100644
--- a/app-misc/worker/metadata.xml
+++ b/app-misc/worker/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>
   Worker is a filemanager for X-Window on UNIX.
   It's a clone of the filemanager "Directory Opus 4", a very famous program

diff --git a/app-misc/yagtd/metadata.xml b/app-misc/yagtd/metadata.xml
index 2590654..bbd6217 100644
--- a/app-misc/yagtd/metadata.xml
+++ b/app-misc/yagtd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 yaGTD incorporates major features from Allen's 'Getting Things Done' philosophy and 
 notion of urgency and importance preached by Stephen Covey 

diff --git a/app-misc/ytree/metadata.xml b/app-misc/ytree/metadata.xml
index 91f4e72..097975e 100644
--- a/app-misc/ytree/metadata.xml
+++ b/app-misc/ytree/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-mobilephone/anyremote/metadata.xml b/app-mobilephone/anyremote/metadata.xml
index 5ee3c69..f79f12d 100644
--- a/app-mobilephone/anyremote/metadata.xml
+++ b/app-mobilephone/anyremote/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">anyremote</remote-id>
 	</upstream>

diff --git a/app-mobilephone/bitpim/metadata.xml b/app-mobilephone/bitpim/metadata.xml
index f498f27..208d9c0 100644
--- a/app-mobilephone/bitpim/metadata.xml
+++ b/app-mobilephone/bitpim/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 	<longdescription>
 		BitPim is a program that allows you to view and manipulate data on LG
 		VX4400/VX6000 and many Sanyo Sprint cell phones. This includes the

diff --git a/app-mobilephone/dfu-util/metadata.xml b/app-mobilephone/dfu-util/metadata.xml
index 4538a68..097975e 100644
--- a/app-mobilephone/dfu-util/metadata.xml
+++ b/app-mobilephone/dfu-util/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-mobilephone/esms/metadata.xml b/app-mobilephone/esms/metadata.xml
index 5d7f401..4197673 100644
--- a/app-mobilephone/esms/metadata.xml
+++ b/app-mobilephone/esms/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A small console program to send SMS messages to Spanish cellular phones.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">esms</remote-id>

diff --git a/app-mobilephone/gammu/metadata.xml b/app-mobilephone/gammu/metadata.xml
index 71834d0..33356c6 100644
--- a/app-mobilephone/gammu/metadata.xml
+++ b/app-mobilephone/gammu/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
   <flag name="irda">Enables infrared support</flag>
 </use>

diff --git a/app-mobilephone/ganyremote/metadata.xml b/app-mobilephone/ganyremote/metadata.xml
index 5ee3c69..f79f12d 100644
--- a/app-mobilephone/ganyremote/metadata.xml
+++ b/app-mobilephone/ganyremote/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">anyremote</remote-id>
 	</upstream>

diff --git a/app-mobilephone/gnocky/metadata.xml b/app-mobilephone/gnocky/metadata.xml
index 4538a68..097975e 100644
--- a/app-mobilephone/gnocky/metadata.xml
+++ b/app-mobilephone/gnocky/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-mobilephone/gnokii/metadata.xml b/app-mobilephone/gnokii/metadata.xml
index eded902..91b80b9 100644
--- a/app-mobilephone/gnokii/metadata.xml
+++ b/app-mobilephone/gnokii/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>
 gnokii provides tools and a user space driver for use with mobile phones.
 With gnokii you can do such things as make data calls, update your address book, 

diff --git a/app-mobilephone/gsmlib/metadata.xml b/app-mobilephone/gsmlib/metadata.xml
index 715fd7f..d4e9942 100644
--- a/app-mobilephone/gsmlib/metadata.xml
+++ b/app-mobilephone/gsmlib/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>Library and applications to access GSM mobile phones.</longdescription>
 </pkgmetadata>

diff --git a/app-mobilephone/kannel-sqlbox/metadata.xml b/app-mobilephone/kannel-sqlbox/metadata.xml
index 3ac63f5..1101d33 100644
--- a/app-mobilephone/kannel-sqlbox/metadata.xml
+++ b/app-mobilephone/kannel-sqlbox/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>Sqlbox is a special Kannel box that sits between bearerbox and
 smsbox and uses a database queue to store and forward messages.</longdescription>
 </pkgmetadata>

diff --git a/app-mobilephone/kannel/metadata.xml b/app-mobilephone/kannel/metadata.xml
index be92667..cd5539c 100644
--- a/app-mobilephone/kannel/metadata.xml
+++ b/app-mobilephone/kannel/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>Kannel is a compact and very powerful open source WAP and SMS gateway, 
 used widely across the globe both for serving millions of short messages (SMS) 
 and pushing WAP service indications.</longdescription>

diff --git a/app-mobilephone/linuxsms/metadata.xml b/app-mobilephone/linuxsms/metadata.xml
index 86231b1..3aaf243 100644
--- a/app-mobilephone/linuxsms/metadata.xml
+++ b/app-mobilephone/linuxsms/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>Linuxsms is a cool script in Perl for send SMS messages to mobile phones through a SMS gateway.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">linuxsms</remote-id>

diff --git a/app-mobilephone/obex-data-server/metadata.xml b/app-mobilephone/obex-data-server/metadata.xml
index 0bb2917..9df9e58 100644
--- a/app-mobilephone/obex-data-server/metadata.xml
+++ b/app-mobilephone/obex-data-server/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 	<longdescription>
 		A DBus service providing easy to use API for using OBEX protocol
 		(both client and server wise). Current implementation supports OPP

diff --git a/app-mobilephone/obexftp/metadata.xml b/app-mobilephone/obexftp/metadata.xml
index caf389b..e665fb0 100644
--- a/app-mobilephone/obexftp/metadata.xml
+++ b/app-mobilephone/obexftp/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openobex</remote-id>
 	</upstream>

diff --git a/app-mobilephone/past/metadata.xml b/app-mobilephone/past/metadata.xml
index a40624f..097975e 100644
--- a/app-mobilephone/past/metadata.xml
+++ b/app-mobilephone/past/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-mobilephone/pysms/metadata.xml b/app-mobilephone/pysms/metadata.xml
index b5fc49d..9eaace6 100644
--- a/app-mobilephone/pysms/metadata.xml
+++ b/app-mobilephone/pysms/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>Tool for sending text messages for various Swiss providers</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">pysms</remote-id>

diff --git a/app-mobilephone/ringtonetools/metadata.xml b/app-mobilephone/ringtonetools/metadata.xml
index e7e7977..582871f 100644
--- a/app-mobilephone/ringtonetools/metadata.xml
+++ b/app-mobilephone/ringtonetools/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
   <longdescription>Ringtone Tools is a program for creating custom ringtones and graphical logos for mobile phones.</longdescription>
 </pkgmetadata>

diff --git a/app-mobilephone/scmxx/metadata.xml b/app-mobilephone/scmxx/metadata.xml
index 34a8f0f..1dcb532 100644
--- a/app-mobilephone/scmxx/metadata.xml
+++ b/app-mobilephone/scmxx/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">scmxx</remote-id>
 	</upstream>

diff --git a/app-mobilephone/sms/metadata.xml b/app-mobilephone/sms/metadata.xml
index cc73e4a..df3b253 100644
--- a/app-mobilephone/sms/metadata.xml
+++ b/app-mobilephone/sms/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>Command line program for sending SMS to Polish GSM mobile phone users.
 
 Ma?a reorganizacja. Z racji licznych downloadw ww. programu postanowi?em zrobi? 

diff --git a/app-mobilephone/smsclient/metadata.xml b/app-mobilephone/smsclient/metadata.xml
index 9f862b6..6a1ecb2 100644
--- a/app-mobilephone/smsclient/metadata.xml
+++ b/app-mobilephone/smsclient/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 	<longdescription>SMS Client is a UNIX command line based utility which allows you to send SMS messages to mobile phones and pagers.</longdescription>
 </pkgmetadata>

diff --git a/app-mobilephone/smssend/metadata.xml b/app-mobilephone/smssend/metadata.xml
index effbbf3..097975e 100644
--- a/app-mobilephone/smssend/metadata.xml
+++ b/app-mobilephone/smssend/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-mobilephone/vmoconv/metadata.xml b/app-mobilephone/vmoconv/metadata.xml
index 1bb2b00..e963769 100644
--- a/app-mobilephone/vmoconv/metadata.xml
+++ b/app-mobilephone/vmoconv/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 	<longdescription lang="en">
 		A tool that converts Siemens phones VMO and VMI audio files to gsm and
 		wav.

diff --git a/app-mobilephone/wammu/metadata.xml b/app-mobilephone/wammu/metadata.xml
index 4538a68..097975e 100644
--- a/app-mobilephone/wammu/metadata.xml
+++ b/app-mobilephone/wammu/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-mobilephone/yaps/metadata.xml b/app-mobilephone/yaps/metadata.xml
index 9361027..68d7f5f 100644
--- a/app-mobilephone/yaps/metadata.xml
+++ b/app-mobilephone/yaps/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription lang="en">
   Yet Another Pager Software (optional with CAPI support).
 </longdescription>

diff --git a/app-office/ical/metadata.xml b/app-office/ical/metadata.xml
index 9a42d30..0142b76 100644
--- a/app-office/ical/metadata.xml
+++ b/app-office/ical/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">ical-tcl</remote-id>
 	</upstream>

diff --git a/app-office/multitalk/metadata.xml b/app-office/multitalk/metadata.xml
index aba833e..097975e 100644
--- a/app-office/multitalk/metadata.xml
+++ b/app-office/multitalk/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-office/passepartout/metadata.xml b/app-office/passepartout/metadata.xml
index 4538a68..097975e 100644
--- a/app-office/passepartout/metadata.xml
+++ b/app-office/passepartout/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-office/plan/metadata.xml b/app-office/plan/metadata.xml
index c1381d9..2ed3abf 100644
--- a/app-office/plan/metadata.xml
+++ b/app-office/plan/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<longdescription lang="en">
 		Plan is a Motif based schedule planner.
 	</longdescription>

diff --git a/app-office/sc/metadata.xml b/app-office/sc/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-office/sc/metadata.xml
+++ b/app-office/sc/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-office/tedia2sql/metadata.xml b/app-office/tedia2sql/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-office/tedia2sql/metadata.xml
+++ b/app-office/tedia2sql/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-pda/iripdb/metadata.xml b/app-pda/iripdb/metadata.xml
index 15c9404..bdaa381 100644
--- a/app-pda/iripdb/metadata.xml
+++ b/app-pda/iripdb/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<longdescription lang="en">
 		iRipDB allows generating the DB files necessary for the iRiver iHP-1xx
 		series of MP3/Ogg HD Player on Linux and Windows. That will allow you

diff --git a/app-portage/demerge/metadata.xml b/app-portage/demerge/metadata.xml
index 4add8de..1bc5f72 100644
--- a/app-portage/demerge/metadata.xml
+++ b/app-portage/demerge/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 demerge makes it easy to revert to previous installation states.
 </longdescription>

diff --git a/app-portage/maintainer-helper/metadata.xml b/app-portage/maintainer-helper/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-portage/maintainer-helper/metadata.xml
+++ b/app-portage/maintainer-helper/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-portage/splat/metadata.xml b/app-portage/splat/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-portage/splat/metadata.xml
+++ b/app-portage/splat/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-shells/esh/metadata.xml b/app-shells/esh/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-shells/esh/metadata.xml
+++ b/app-shells/esh/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-shells/psh/metadata.xml b/app-shells/psh/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-shells/psh/metadata.xml
+++ b/app-shells/psh/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-shells/sash/metadata.xml b/app-shells/sash/metadata.xml
index 91f4e72..097975e 100644
--- a/app-shells/sash/metadata.xml
+++ b/app-shells/sash/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-shells/shish/metadata.xml b/app-shells/shish/metadata.xml
index 8205b2a..3660901 100644
--- a/app-shells/shish/metadata.xml
+++ b/app-shells/shish/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
   <flag name="diet">Use <pkg>dev-libs/dietlibc</pkg></flag>
 </use>

diff --git a/app-shells/soapbox/metadata.xml b/app-shells/soapbox/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-shells/soapbox/metadata.xml
+++ b/app-shells/soapbox/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/7plus/metadata.xml b/app-text/7plus/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-text/7plus/metadata.xml
+++ b/app-text/7plus/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/adiff/metadata.xml b/app-text/adiff/metadata.xml
index 91f4e72..097975e 100644
--- a/app-text/adiff/metadata.xml
+++ b/app-text/adiff/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/antixls/metadata.xml b/app-text/antixls/metadata.xml
index 1470e03..097975e 100644
--- a/app-text/antixls/metadata.xml
+++ b/app-text/antixls/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/app-text/apvlv/metadata.xml b/app-text/apvlv/metadata.xml
index d130526..e4278c7 100644
--- a/app-text/apvlv/metadata.xml
+++ b/app-text/apvlv/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="html">Build binary with html format support</flag>
   </use>

diff --git a/app-text/bact/metadata.xml b/app-text/bact/metadata.xml
index 0bc4464..c81bbf1 100644
--- a/app-text/bact/metadata.xml
+++ b/app-text/bact/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		BACT is an implementation of [Kudo &amp; Matsumoto 2004], and is
 		designed to handle the tree classification problem. The important

diff --git a/app-text/build-docbook-catalog/metadata.xml b/app-text/build-docbook-catalog/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/build-docbook-catalog/metadata.xml
+++ b/app-text/build-docbook-catalog/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/clara/metadata.xml b/app-text/clara/metadata.xml
index ff62877..097975e 100644
--- a/app-text/clara/metadata.xml
+++ b/app-text/clara/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/code2html/metadata.xml b/app-text/code2html/metadata.xml
index 4a9d1f7..eed4e0c 100644
--- a/app-text/code2html/metadata.xml
+++ b/app-text/code2html/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>
   Code2HTML converts a program source code to syntax highlighted
   HTML. It may be called as a CGI script. It can also handle include

diff --git a/app-text/convertlit/metadata.xml b/app-text/convertlit/metadata.xml
index 47df9aa..ce48ce1 100644
--- a/app-text/convertlit/metadata.xml
+++ b/app-text/convertlit/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 	<longdescription lang="en">
 	Convert Lit is a simple program to use .lit or Microsoft ebook files on
 	Linux. It's able to "explode" the ebook into Open Ebook Specification

diff --git a/app-text/cook/metadata.xml b/app-text/cook/metadata.xml
index 7f98a9b..3292b86 100644
--- a/app-text/cook/metadata.xml
+++ b/app-text/cook/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cook</remote-id>
 	</upstream>

diff --git a/app-text/ddir/metadata.xml b/app-text/ddir/metadata.xml
index 6c3740b..4b69d6b 100644
--- a/app-text/ddir/metadata.xml
+++ b/app-text/ddir/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="freshmeat">ddir</remote-id>
 	</upstream>

diff --git a/app-text/dictd/metadata.xml b/app-text/dictd/metadata.xml
index 3884dbf..7bbfdc0 100644
--- a/app-text/dictd/metadata.xml
+++ b/app-text/dictd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="judy">Build Judy-based (<pkg>dev-libs/judy</pkg>) plugin implementing fast "exact" and especially "lev" strategies</flag>
 		<flag name="minimal">Don't build server but dict client, dictzip and dictfmt only.</flag>

diff --git a/app-text/ding/metadata.xml b/app-text/ding/metadata.xml
index 91f4e72..097975e 100644
--- a/app-text/ding/metadata.xml
+++ b/app-text/ding/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/docbook-dsssl-stylesheets/metadata.xml b/app-text/docbook-dsssl-stylesheets/metadata.xml
index 62f87ab..bbb7333 100644
--- a/app-text/docbook-dsssl-stylesheets/metadata.xml
+++ b/app-text/docbook-dsssl-stylesheets/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">docbook</remote-id>
 	</upstream>

diff --git a/app-text/docbook-sgml-dtd/metadata.xml b/app-text/docbook-sgml-dtd/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/docbook-sgml-dtd/metadata.xml
+++ b/app-text/docbook-sgml-dtd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/docbook-sgml-utils/metadata.xml b/app-text/docbook-sgml-utils/metadata.xml
index 9c72760..4b294bf 100644
--- a/app-text/docbook-sgml-utils/metadata.xml
+++ b/app-text/docbook-sgml-utils/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-  <use>
+<use>
     <flag name="jadetex">Add support for <pkg>app-text/jadetex</pkg>
     (for processing tex files produced by the TeX backend of
     Jade)</flag>

diff --git a/app-text/docbook-sgml/metadata.xml b/app-text/docbook-sgml/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/docbook-sgml/metadata.xml
+++ b/app-text/docbook-sgml/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/docbook-xml-dtd/metadata.xml b/app-text/docbook-xml-dtd/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/docbook-xml-dtd/metadata.xml
+++ b/app-text/docbook-xml-dtd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/docbook-xml-simple-dtd/metadata.xml b/app-text/docbook-xml-simple-dtd/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/docbook-xml-simple-dtd/metadata.xml
+++ b/app-text/docbook-xml-simple-dtd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/docbook-xsl-stylesheets/metadata.xml b/app-text/docbook-xsl-stylesheets/metadata.xml
index 3d86387..2994e86 100644
--- a/app-text/docbook-xsl-stylesheets/metadata.xml
+++ b/app-text/docbook-xsl-stylesheets/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="ruby">
       Install the Ruby-based dbtoepub script; requires an interpreter

diff --git a/app-text/docbook2X/metadata.xml b/app-text/docbook2X/metadata.xml
index 2c3cc43..7e9eb59 100644
--- a/app-text/docbook2X/metadata.xml
+++ b/app-text/docbook2X/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">docbook2x</remote-id>
 	</upstream>

diff --git a/app-text/duali/metadata.xml b/app-text/duali/metadata.xml
index d493cf9..b857a14 100644
--- a/app-text/duali/metadata.xml
+++ b/app-text/duali/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">arabeyes</remote-id>
 	</upstream>

diff --git a/app-text/epstool/metadata.xml b/app-text/epstool/metadata.xml
index ff62877..097975e 100644
--- a/app-text/epstool/metadata.xml
+++ b/app-text/epstool/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/expander/metadata.xml b/app-text/expander/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-text/expander/metadata.xml
+++ b/app-text/expander/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/freepwing/metadata.xml b/app-text/freepwing/metadata.xml
index 91f4e72..097975e 100644
--- a/app-text/freepwing/metadata.xml
+++ b/app-text/freepwing/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/gentoo-guide-xml-dtd/metadata.xml b/app-text/gentoo-guide-xml-dtd/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/gentoo-guide-xml-dtd/metadata.xml
+++ b/app-text/gentoo-guide-xml-dtd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/gnopaster/metadata.xml b/app-text/gnopaster/metadata.xml
index 9f624f2..bbf392f 100644
--- a/app-text/gnopaster/metadata.xml
+++ b/app-text/gnopaster/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnopaste</remote-id>
 	</upstream>

diff --git a/app-text/grutatxt/metadata.xml b/app-text/grutatxt/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/grutatxt/metadata.xml
+++ b/app-text/grutatxt/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/hnb/metadata.xml b/app-text/hnb/metadata.xml
index 9bd50e3..59664d6 100644
--- a/app-text/hnb/metadata.xml
+++ b/app-text/hnb/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		hnb is a program to organize many kinds of data in one place, including
 		addresses, TODO lists, ideas, book reviews, brainstorming, speech

diff --git a/app-text/html401/metadata.xml b/app-text/html401/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/html401/metadata.xml
+++ b/app-text/html401/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/htmldoc/metadata.xml b/app-text/htmldoc/metadata.xml
index ff62877..097975e 100644
--- a/app-text/htmldoc/metadata.xml
+++ b/app-text/htmldoc/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/htmlinc/metadata.xml b/app-text/htmlinc/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-text/htmlinc/metadata.xml
+++ b/app-text/htmlinc/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/htmlrecode/metadata.xml b/app-text/htmlrecode/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/htmlrecode/metadata.xml
+++ b/app-text/htmlrecode/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
index c651ea7..d9cf657 100644
--- a/app-text/htmltidy/metadata.xml
+++ b/app-text/htmltidy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tidy</remote-id>
 	</upstream>

diff --git a/app-text/keepnote/metadata.xml b/app-text/keepnote/metadata.xml
index 514cf72..e455a4e 100644
--- a/app-text/keepnote/metadata.xml
+++ b/app-text/keepnote/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<maintainer status="active">
                 <email>rasmus@alum.mit.edu</email>

diff --git a/app-text/libxmlpatch/metadata.xml b/app-text/libxmlpatch/metadata.xml
index d0848ff..df54573 100644
--- a/app-text/libxmlpatch/metadata.xml
+++ b/app-text/libxmlpatch/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xmlpatch</remote-id>
 	</upstream>

diff --git a/app-text/logmerge/metadata.xml b/app-text/logmerge/metadata.xml
index d5d6737..dcb4c22 100644
--- a/app-text/logmerge/metadata.xml
+++ b/app-text/logmerge/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     Merge multiple logs such that multilined entries appear in chronological order without breaks.
   </longdescription>

diff --git a/app-text/lout/metadata.xml b/app-text/lout/metadata.xml
index ae08f33..07ae12c 100644
--- a/app-text/lout/metadata.xml
+++ b/app-text/lout/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lout</remote-id>
 	</upstream>

diff --git a/app-text/mbtpdfasm/metadata.xml b/app-text/mbtpdfasm/metadata.xml
index 9319730..68a711f 100644
--- a/app-text/mbtpdfasm/metadata.xml
+++ b/app-text/mbtpdfasm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		This program can be used to assemble/merge PDF files, extract
 		information from PDF files, and update the metadata in PDF files.

diff --git a/app-text/mht-rip/metadata.xml b/app-text/mht-rip/metadata.xml
index 91f4e72..097975e 100644
--- a/app-text/mht-rip/metadata.xml
+++ b/app-text/mht-rip/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/mpage/metadata.xml b/app-text/mpage/metadata.xml
index 91f4e72..097975e 100644
--- a/app-text/mpage/metadata.xml
+++ b/app-text/mpage/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/notecase/metadata.xml b/app-text/notecase/metadata.xml
index 99d267f..39ef5bd 100644
--- a/app-text/notecase/metadata.xml
+++ b/app-text/notecase/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">notecase</remote-id>
 	</upstream>

diff --git a/app-text/o3read/metadata.xml b/app-text/o3read/metadata.xml
index 91f4e72..097975e 100644
--- a/app-text/o3read/metadata.xml
+++ b/app-text/o3read/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/openjade/metadata.xml b/app-text/openjade/metadata.xml
index f6bbba8..39d617b 100644
--- a/app-text/openjade/metadata.xml
+++ b/app-text/openjade/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">openjade</remote-id>
 	</upstream>

diff --git a/app-text/ots/metadata.xml b/app-text/ots/metadata.xml
index 571d4e4..473f134 100644
--- a/app-text/ots/metadata.xml
+++ b/app-text/ots/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libots</remote-id>
 	</upstream>

diff --git a/app-text/par/metadata.xml b/app-text/par/metadata.xml
index 91f4e72..097975e 100644
--- a/app-text/par/metadata.xml
+++ b/app-text/par/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/pdf2oo/metadata.xml b/app-text/pdf2oo/metadata.xml
index d71993e..6ce3564 100644
--- a/app-text/pdf2oo/metadata.xml
+++ b/app-text/pdf2oo/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pdf2oo</remote-id>
 	</upstream>

diff --git a/app-text/pep/metadata.xml b/app-text/pep/metadata.xml
index 91f4e72..097975e 100644
--- a/app-text/pep/metadata.xml
+++ b/app-text/pep/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/psiconv/metadata.xml b/app-text/psiconv/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-text/psiconv/metadata.xml
+++ b/app-text/psiconv/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/pspresent/metadata.xml b/app-text/pspresent/metadata.xml
index ff62877..097975e 100644
--- a/app-text/pspresent/metadata.xml
+++ b/app-text/pspresent/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/reed/metadata.xml b/app-text/reed/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-text/reed/metadata.xml
+++ b/app-text/reed/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/rfcutil/metadata.xml b/app-text/rfcutil/metadata.xml
index ff62877..097975e 100644
--- a/app-text/rfcutil/metadata.xml
+++ b/app-text/rfcutil/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/rhyme/metadata.xml b/app-text/rhyme/metadata.xml
index 432aed6..9541b36 100644
--- a/app-text/rhyme/metadata.xml
+++ b/app-text/rhyme/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		What is this thing? Why it's a rhyming dictionary, of course! But more
 		specifically, it's a command-line program that takes a word and returns

diff --git a/app-text/robodoc/metadata.xml b/app-text/robodoc/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/robodoc/metadata.xml
+++ b/app-text/robodoc/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/sablotron/metadata.xml b/app-text/sablotron/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/sablotron/metadata.xml
+++ b/app-text/sablotron/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/sdcv/metadata.xml b/app-text/sdcv/metadata.xml
index 26d6704..d606264 100644
--- a/app-text/sdcv/metadata.xml
+++ b/app-text/sdcv/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>sdcv - console version of StarDict program.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">sdcv</remote-id>

diff --git a/app-text/searchmonkey/metadata.xml b/app-text/searchmonkey/metadata.xml
index 97f46cb..9857da3 100644
--- a/app-text/searchmonkey/metadata.xml
+++ b/app-text/searchmonkey/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">searchmonkey</remote-id>
 	</upstream>

diff --git a/app-text/sgml-common/metadata.xml b/app-text/sgml-common/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/sgml-common/metadata.xml
+++ b/app-text/sgml-common/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/sgmltools-lite/metadata.xml b/app-text/sgmltools-lite/metadata.xml
index 0d6cac1..fb8f206 100644
--- a/app-text/sgmltools-lite/metadata.xml
+++ b/app-text/sgmltools-lite/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="jadetex">Add support for <pkg>app-text/jadetex</pkg>
     (for processing tex files produced by the TeX backend of

diff --git a/app-text/sgrep/metadata.xml b/app-text/sgrep/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/sgrep/metadata.xml
+++ b/app-text/sgrep/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/spellutils/metadata.xml b/app-text/spellutils/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-text/spellutils/metadata.xml
+++ b/app-text/spellutils/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/stardict/metadata.xml b/app-text/stardict/metadata.xml
index 14dea7b..e67a4c7 100644
--- a/app-text/stardict/metadata.xml
+++ b/app-text/stardict/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 	 StarDict is an international dictionary Software. It has powerful features
 	 such as "Glob-style pattern matching", "Scan selection word," "Fuzzy

diff --git a/app-text/tabler/metadata.xml b/app-text/tabler/metadata.xml
index 6995d7e..ee03ced 100644
--- a/app-text/tabler/metadata.xml
+++ b/app-text/tabler/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tabler</remote-id>
 	</upstream>

diff --git a/app-text/tkinfo/metadata.xml b/app-text/tkinfo/metadata.xml
index d9cd2ca..097975e 100644
--- a/app-text/tkinfo/metadata.xml
+++ b/app-text/tkinfo/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/tkman/metadata.xml b/app-text/tkman/metadata.xml
index 9e61f2c..cceffee 100644
--- a/app-text/tkman/metadata.xml
+++ b/app-text/tkman/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tkman</remote-id>
 	</upstream>

diff --git a/app-text/tuxcards/metadata.xml b/app-text/tuxcards/metadata.xml
index 59e2b8f..097975e 100644
--- a/app-text/tuxcards/metadata.xml
+++ b/app-text/tuxcards/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/txt2pdbdoc/metadata.xml b/app-text/txt2pdbdoc/metadata.xml
index a40624f..097975e 100644
--- a/app-text/txt2pdbdoc/metadata.xml
+++ b/app-text/txt2pdbdoc/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/app-text/uudeview/metadata.xml b/app-text/uudeview/metadata.xml
index f9d50da..097975e 100644
--- a/app-text/uudeview/metadata.xml
+++ b/app-text/uudeview/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/app-text/webgen/metadata.xml b/app-text/webgen/metadata.xml
index afcfd85..c205405 100644
--- a/app-text/webgen/metadata.xml
+++ b/app-text/webgen/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
   <herd>ruby</herd>
   <use>
     <flag name="builder">Enable programmatic HTML/XML generation</flag>

diff --git a/app-text/xhtml1/metadata.xml b/app-text/xhtml1/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/xhtml1/metadata.xml
+++ b/app-text/xhtml1/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/xlhtml/metadata.xml b/app-text/xlhtml/metadata.xml
index 2f41320..a504b55 100644
--- a/app-text/xlhtml/metadata.xml
+++ b/app-text/xlhtml/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">chicago</remote-id>
   </upstream>

diff --git a/app-text/xml2/metadata.xml b/app-text/xml2/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/xml2/metadata.xml
+++ b/app-text/xml2/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/xml2doc/metadata.xml b/app-text/xml2doc/metadata.xml
index c24d382..d22b66b 100644
--- a/app-text/xml2doc/metadata.xml
+++ b/app-text/xml2doc/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xml2doc</remote-id>
 	</upstream>

diff --git a/app-text/xmlformat/metadata.xml b/app-text/xmlformat/metadata.xml
index 4538a68..097975e 100644
--- a/app-text/xmlformat/metadata.xml
+++ b/app-text/xmlformat/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/app-text/xmlto/metadata.xml b/app-text/xmlto/metadata.xml
index e8b6b46..704d446 100644
--- a/app-text/xmlto/metadata.xml
+++ b/app-text/xmlto/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
 	<flag name="text">Support conversion from XML to plain text</flag>
 </use>

diff --git a/app-text/zpspell/metadata.xml b/app-text/zpspell/metadata.xml
index 91f4e72..097975e 100644
--- a/app-text/zpspell/metadata.xml
+++ b/app-text/zpspell/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-cpp/tclap/metadata.xml b/dev-cpp/tclap/metadata.xml
index 72f6184..a414ac6 100644
--- a/dev-cpp/tclap/metadata.xml
+++ b/dev-cpp/tclap/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tclap</remote-id>
 	</upstream>

diff --git a/dev-db/cdb/metadata.xml b/dev-db/cdb/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/cdb/metadata.xml
+++ b/dev-db/cdb/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/firebird/metadata.xml b/dev-db/firebird/metadata.xml
index 118ac1e..e66d5d1 100644
--- a/dev-db/firebird/metadata.xml
+++ b/dev-db/firebird/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 	Firebird is a relational database offering many ANSI SQL standard 
 	features that runs on Linux, Windows, and a variety of Unix platforms.

diff --git a/dev-db/flamerobin/metadata.xml b/dev-db/flamerobin/metadata.xml
index 676780a..6b8b207 100644
--- a/dev-db/flamerobin/metadata.xml
+++ b/dev-db/flamerobin/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 	FlameRobin is a database administration tool for Firebird DBMS.
 	FlameRobin is lightweight (small footprint, fast execution) and

diff --git a/dev-db/gigabase/metadata.xml b/dev-db/gigabase/metadata.xml
index 54fa7cc..4c365f2 100644
--- a/dev-db/gigabase/metadata.xml
+++ b/dev-db/gigabase/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 	Object-Relational Database Management System GigaBASE inherits most of the
 	features of FastDB, but uses page pool instead of direct mapping of file on

diff --git a/dev-db/lib_mysqludf_fPROJ4/metadata.xml b/dev-db/lib_mysqludf_fPROJ4/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/lib_mysqludf_fPROJ4/metadata.xml
+++ b/dev-db/lib_mysqludf_fPROJ4/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/lib_mysqludf_json/metadata.xml b/dev-db/lib_mysqludf_json/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/lib_mysqludf_json/metadata.xml
+++ b/dev-db/lib_mysqludf_json/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/lib_mysqludf_log/metadata.xml b/dev-db/lib_mysqludf_log/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/lib_mysqludf_log/metadata.xml
+++ b/dev-db/lib_mysqludf_log/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/lib_mysqludf_preg/metadata.xml b/dev-db/lib_mysqludf_preg/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/lib_mysqludf_preg/metadata.xml
+++ b/dev-db/lib_mysqludf_preg/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/lib_mysqludf_stat/metadata.xml b/dev-db/lib_mysqludf_stat/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/lib_mysqludf_stat/metadata.xml
+++ b/dev-db/lib_mysqludf_stat/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/lib_mysqludf_stem/metadata.xml b/dev-db/lib_mysqludf_stem/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/lib_mysqludf_stem/metadata.xml
+++ b/dev-db/lib_mysqludf_stem/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/lib_mysqludf_str/metadata.xml b/dev-db/lib_mysqludf_str/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/lib_mysqludf_str/metadata.xml
+++ b/dev-db/lib_mysqludf_str/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/lib_mysqludf_sys/metadata.xml b/dev-db/lib_mysqludf_sys/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/lib_mysqludf_sys/metadata.xml
+++ b/dev-db/lib_mysqludf_sys/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/lib_mysqludf_ta/metadata.xml b/dev-db/lib_mysqludf_ta/metadata.xml
index 4ac18c3..be6e75c 100644
--- a/dev-db/lib_mysqludf_ta/metadata.xml
+++ b/dev-db/lib_mysqludf_ta/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">joaocosta/lib_mysqludf_ta</remote-id>
   </upstream>

diff --git a/dev-db/lib_mysqludf_udf/metadata.xml b/dev-db/lib_mysqludf_udf/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/lib_mysqludf_udf/metadata.xml
+++ b/dev-db/lib_mysqludf_udf/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/lib_mysqludf_xql/metadata.xml b/dev-db/lib_mysqludf_xql/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/lib_mysqludf_xql/metadata.xml
+++ b/dev-db/lib_mysqludf_xql/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/metakit/metadata.xml b/dev-db/metakit/metadata.xml
index 1470e03..097975e 100644
--- a/dev-db/metakit/metadata.xml
+++ b/dev-db/metakit/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/dev-db/mysql-udf-base64/metadata.xml b/dev-db/mysql-udf-base64/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/mysql-udf-base64/metadata.xml
+++ b/dev-db/mysql-udf-base64/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/mysql-udf-http/metadata.xml b/dev-db/mysql-udf-http/metadata.xml
index 02da99f..2f278b0 100644
--- a/dev-db/mysql-udf-http/metadata.xml
+++ b/dev-db/mysql-udf-http/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">mysql-udf-http</remote-id>
 	</upstream>

diff --git a/dev-db/mysql-udf-infusion/metadata.xml b/dev-db/mysql-udf-infusion/metadata.xml
index 0b109bb..047ffca 100644
--- a/dev-db/mysql-udf-infusion/metadata.xml
+++ b/dev-db/mysql-udf-infusion/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">infusion/udf_infusion</remote-id>
   </upstream>

diff --git a/dev-db/mysql-udf-ipv6/metadata.xml b/dev-db/mysql-udf-ipv6/metadata.xml
index 81dc07a..61e9cc4 100644
--- a/dev-db/mysql-udf-ipv6/metadata.xml
+++ b/dev-db/mysql-udf-ipv6/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">watchmouse/mysql-udf-ipv6</remote-id>
 	</upstream>

diff --git a/dev-db/mysqltuner/metadata.xml b/dev-db/mysqltuner/metadata.xml
index ad3f836..72bdad4 100644
--- a/dev-db/mysqltuner/metadata.xml
+++ b/dev-db/mysqltuner/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">rackerhacker/MySQLTuner-perl</remote-id>
   </upstream>

diff --git a/dev-db/odbtp/metadata.xml b/dev-db/odbtp/metadata.xml
index 63c0c25..430d9e9 100644
--- a/dev-db/odbtp/metadata.xml
+++ b/dev-db/odbtp/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">odbtp</remote-id>
 	</upstream>

diff --git a/dev-db/recutils/metadata.xml b/dev-db/recutils/metadata.xml
index 7f10f4c..6641bc2 100644
--- a/dev-db/recutils/metadata.xml
+++ b/dev-db/recutils/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="curl">Enable support for remote descriptors using libcurl</flag>
 		<flag name="mdb">Build the mdb2rec utility</flag>

diff --git a/dev-db/sqliteodbc/metadata.xml b/dev-db/sqliteodbc/metadata.xml
index 59e2b8f..097975e 100644
--- a/dev-db/sqliteodbc/metadata.xml
+++ b/dev-db/sqliteodbc/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-db/vbisam/metadata.xml b/dev-db/vbisam/metadata.xml
index 2b77202..4f79fd9 100644
--- a/dev-db/vbisam/metadata.xml
+++ b/dev-db/vbisam/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tiny-cobol</remote-id>
 	</upstream>

diff --git a/dev-db/xbase/metadata.xml b/dev-db/xbase/metadata.xml
index e27df14..44eb107 100644
--- a/dev-db/xbase/metadata.xml
+++ b/dev-db/xbase/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xdb</remote-id>
 	</upstream>

diff --git a/dev-db/xbsql/metadata.xml b/dev-db/xbsql/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-db/xbsql/metadata.xml
+++ b/dev-db/xbsql/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-embedded/gnap-dev/metadata.xml b/dev-embedded/gnap-dev/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-embedded/gnap-dev/metadata.xml
+++ b/dev-embedded/gnap-dev/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-embedded/gnap-ext/metadata.xml b/dev-embedded/gnap-ext/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-embedded/gnap-ext/metadata.xml
+++ b/dev-embedded/gnap-ext/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-embedded/gnap/metadata.xml b/dev-embedded/gnap/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-embedded/gnap/metadata.xml
+++ b/dev-embedded/gnap/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-embedded/powersoftplus-libftdi/metadata.xml b/dev-embedded/powersoftplus-libftdi/metadata.xml
index ff62877..097975e 100644
--- a/dev-embedded/powersoftplus-libftdi/metadata.xml
+++ b/dev-embedded/powersoftplus-libftdi/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index d48b678..52919be 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     Animated sprite editor and pixel art tool
   </longdescription>

diff --git a/dev-java/idm-console-framework/metadata.xml b/dev-java/idm-console-framework/metadata.xml
index a60d90d..5472d9c 100644
--- a/dev-java/idm-console-framework/metadata.xml
+++ b/dev-java/idm-console-framework/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
-	<longdescription>A Java Management Console framework used for remote server
+<longdescription>A Java Management Console framework used for remote server
 	management.</longdescription> 
 </pkgmetadata>

diff --git a/dev-lang/bas/metadata.xml b/dev-lang/bas/metadata.xml
index 6bc2642..7d08c87 100644
--- a/dev-lang/bas/metadata.xml
+++ b/dev-lang/bas/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="lr0">Use the LR0 parser instead of the recursive descending parser</flag>
   </use>

diff --git a/dev-lang/bff/metadata.xml b/dev-lang/bff/metadata.xml
index 4f4825a..d7e7ae4 100644
--- a/dev-lang/bff/metadata.xml
+++ b/dev-lang/bff/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 bff is a slightly optimized interpreter for brainfuck, a turing-complete
 programming language.

diff --git a/dev-lang/cll1h/metadata.xml b/dev-lang/cll1h/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-lang/cll1h/metadata.xml
+++ b/dev-lang/cll1h/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-lang/ferite/metadata.xml b/dev-lang/ferite/metadata.xml
index c5d9211..8e054ed 100644
--- a/dev-lang/ferite/metadata.xml
+++ b/dev-lang/ferite/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ferite</remote-id>
 	</upstream>

diff --git a/dev-lang/gwydion-dylan-bin/metadata.xml b/dev-lang/gwydion-dylan-bin/metadata.xml
index 9979a50..ba6abef 100644
--- a/dev-lang/gwydion-dylan-bin/metadata.xml
+++ b/dev-lang/gwydion-dylan-bin/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 Dylan is an advanced, object-oriented, dynamic language which supports the rapid
 development of programs. When needed, the programmer can later optimize [his or

diff --git a/dev-lang/lisaac/metadata.xml b/dev-lang/lisaac/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-lang/lisaac/metadata.xml
+++ b/dev-lang/lisaac/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-lang/nqc/metadata.xml b/dev-lang/nqc/metadata.xml
index 7a31448..9380ee4 100644
--- a/dev-lang/nqc/metadata.xml
+++ b/dev-lang/nqc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bricxcc</remote-id>
 	</upstream>

diff --git a/dev-lang/pasm/metadata.xml b/dev-lang/pasm/metadata.xml
index 4dbb423..2fd15c7 100644
--- a/dev-lang/pasm/metadata.xml
+++ b/dev-lang/pasm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		pasm is a portable assembler for processors of the PowerPC family,
 		written completely in ANSI-C. All PPC standard instructions, AltiVec

diff --git a/dev-lang/regina-rexx/metadata.xml b/dev-lang/regina-rexx/metadata.xml
index d79e10a..359c26d 100644
--- a/dev-lang/regina-rexx/metadata.xml
+++ b/dev-lang/regina-rexx/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<longdescription lang="en">
 		Regina is a Rexx interpreter. Rexx is a programming language that was
 		designed to be easy to use for inexperienced programmers yet powerful

diff --git a/dev-lang/tinycobol/metadata.xml b/dev-lang/tinycobol/metadata.xml
index 2b77202..4f79fd9 100644
--- a/dev-lang/tinycobol/metadata.xml
+++ b/dev-lang/tinycobol/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tiny-cobol</remote-id>
 	</upstream>

diff --git a/dev-libs/389-adminutil/metadata.xml b/dev-libs/389-adminutil/metadata.xml
index a40624f..097975e 100644
--- a/dev-libs/389-adminutil/metadata.xml
+++ b/dev-libs/389-adminutil/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/9libs/metadata.xml b/dev-libs/9libs/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-libs/9libs/metadata.xml
+++ b/dev-libs/9libs/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/antlr-c/metadata.xml b/dev-libs/antlr-c/metadata.xml
index de8439d..0ffcdb5 100644
--- a/dev-libs/antlr-c/metadata.xml
+++ b/dev-libs/antlr-c/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="debugger">Compiles debug info into the library</flag>
   </use>

diff --git a/dev-libs/beecrypt/metadata.xml b/dev-libs/beecrypt/metadata.xml
index a8d32ea..4f8711c 100644
--- a/dev-libs/beecrypt/metadata.xml
+++ b/dev-libs/beecrypt/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">beecrypt</remote-id>
 	</upstream>

diff --git a/dev-libs/cdk/metadata.xml b/dev-libs/cdk/metadata.xml
index 1470e03..097975e 100644
--- a/dev-libs/cdk/metadata.xml
+++ b/dev-libs/cdk/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/dev-libs/cpl-stratego/metadata.xml b/dev-libs/cpl-stratego/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-libs/cpl-stratego/metadata.xml
+++ b/dev-libs/cpl-stratego/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/dbus-c++/metadata.xml b/dev-libs/dbus-c++/metadata.xml
index 783d17f..9daecc1 100644
--- a/dev-libs/dbus-c++/metadata.xml
+++ b/dev-libs/dbus-c++/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		dbus-c++ attempts to provide a C++ API for D-BUS.
 	</longdescription>

diff --git a/dev-libs/dclog/metadata.xml b/dev-libs/dclog/metadata.xml
index 5fd3ffb..f512ba0 100644
--- a/dev-libs/dclog/metadata.xml
+++ b/dev-libs/dclog/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		dclog is a C logging library. It supports the concept of log levels,
 		configurable logfile timestamps, and a configurable prefix to log

diff --git a/dev-libs/dietlibc/metadata.xml b/dev-libs/dietlibc/metadata.xml
index 9650144..86fe185 100644
--- a/dev-libs/dietlibc/metadata.xml
+++ b/dev-libs/dietlibc/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		The diet libc is a libc that is optimized for small size.  It can be
 		used to create small statically linked binaries for Linux on alpha, arm,

diff --git a/dev-libs/djb/metadata.xml b/dev-libs/djb/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-libs/djb/metadata.xml
+++ b/dev-libs/djb/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/eb/metadata.xml b/dev-libs/eb/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-libs/eb/metadata.xml
+++ b/dev-libs/eb/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/elfio/metadata.xml b/dev-libs/elfio/metadata.xml
index ff3b504..3e012f7 100644
--- a/dev-libs/elfio/metadata.xml
+++ b/dev-libs/elfio/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">elfio</remote-id>
 	</upstream>

diff --git a/dev-libs/ffcall/metadata.xml b/dev-libs/ffcall/metadata.xml
index 74075a2..4593cb7 100644
--- a/dev-libs/ffcall/metadata.xml
+++ b/dev-libs/ffcall/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 ffcall - foreign function call libraries
 This is a collection of four libraries which can be used to build foreign

diff --git a/dev-libs/fstrm/metadata.xml b/dev-libs/fstrm/metadata.xml
index 6381ce8..944febc 100644
--- a/dev-libs/fstrm/metadata.xml
+++ b/dev-libs/fstrm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">farsightsec/fstrm</remote-id>
 	</upstream>

diff --git a/dev-libs/gecode/metadata.xml b/dev-libs/gecode/metadata.xml
index 96477e7..8c3b778 100644
--- a/dev-libs/gecode/metadata.xml
+++ b/dev-libs/gecode/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="gist">
 			Enable Gist, the Gecode Interactive Search Tool

diff --git a/dev-libs/guiloader-c++/metadata.xml b/dev-libs/guiloader-c++/metadata.xml
index 08f29d5..c24d9a3 100644
--- a/dev-libs/guiloader-c++/metadata.xml
+++ b/dev-libs/guiloader-c++/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">GuiLoader/C++ is a C++ binding to GuiLoader library. It is a convenience
 		layer that simplifies development of GuiLoader based applications
 		written in C++ language by introducing exception safety, binding GTK+

diff --git a/dev-libs/guiloader/metadata.xml b/dev-libs/guiloader/metadata.xml
index dc110b3..139f1f9 100644
--- a/dev-libs/guiloader/metadata.xml
+++ b/dev-libs/guiloader/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">GuiLoader is a high-performance and compact GuiXml loader library. This
 		library allows GTK+ applications to c reate GUI widgets and objects at
 		run-time from GuiXml resource files. GuiLoader is written in C language

diff --git a/dev-libs/hashit/metadata.xml b/dev-libs/hashit/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-libs/hashit/metadata.xml
+++ b/dev-libs/hashit/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/http-fetcher/metadata.xml b/dev-libs/http-fetcher/metadata.xml
index d2f6452..7cd3080 100644
--- a/dev-libs/http-fetcher/metadata.xml
+++ b/dev-libs/http-fetcher/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">http-fetcher</remote-id>
 	</upstream>

diff --git a/dev-libs/igraph/metadata.xml b/dev-libs/igraph/metadata.xml
index 6979260..ae22300 100644
--- a/dev-libs/igraph/metadata.xml
+++ b/dev-libs/igraph/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 igraph is a free software package for creating and manipulating undirected and 
 directed graphs. It includes implementations for classic graph theory problems 

diff --git a/dev-libs/legousbtower/metadata.xml b/dev-libs/legousbtower/metadata.xml
index 9356552..e52f4cf 100644
--- a/dev-libs/legousbtower/metadata.xml
+++ b/dev-libs/legousbtower/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">legousb</remote-id>
 	</upstream>

diff --git a/dev-libs/libRocket/metadata.xml b/dev-libs/libRocket/metadata.xml
index 15d7980..1ebb0be 100644
--- a/dev-libs/libRocket/metadata.xml
+++ b/dev-libs/libRocket/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="samples">Build samples</flag>
 	</use>

diff --git a/dev-libs/libcaldav/metadata.xml b/dev-libs/libcaldav/metadata.xml
index 09de2a8..6fb9e65 100644
--- a/dev-libs/libcaldav/metadata.xml
+++ b/dev-libs/libcaldav/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libcaldav</remote-id>
 	</upstream>

diff --git a/dev-libs/libezV24/metadata.xml b/dev-libs/libezV24/metadata.xml
index ec886f4..7c2051e 100644
--- a/dev-libs/libezV24/metadata.xml
+++ b/dev-libs/libezV24/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 	The goal of this library is to provide an easy to use programming interface to
 	the serial ports of the Linux system. This release comes with some support for

diff --git a/dev-libs/libhid/metadata.xml b/dev-libs/libhid/metadata.xml
index 56f1b4a..27160fd 100644
--- a/dev-libs/libhid/metadata.xml
+++ b/dev-libs/libhid/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 libhid provides a generic and flexible way to access and interact with USB
 HID devices, much like libusb does for plain USB devices. It is based on

diff --git a/dev-libs/libhome/metadata.xml b/dev-libs/libhome/metadata.xml
index 312dcb0..38015ba 100644
--- a/dev-libs/libhome/metadata.xml
+++ b/dev-libs/libhome/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pll</remote-id>
 	</upstream>

diff --git a/dev-libs/libhtmlparse/metadata.xml b/dev-libs/libhtmlparse/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-libs/libhtmlparse/metadata.xml
+++ b/dev-libs/libhtmlparse/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/libical/metadata.xml b/dev-libs/libical/metadata.xml
index ef10b94..80fd55a 100644
--- a/dev-libs/libical/metadata.xml
+++ b/dev-libs/libical/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">libical/libical</remote-id>
   </upstream>

diff --git a/dev-libs/libidmef/metadata.xml b/dev-libs/libidmef/metadata.xml
index 2205e19..e14d13a 100644
--- a/dev-libs/libidmef/metadata.xml
+++ b/dev-libs/libidmef/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libidmef</remote-id>
 	</upstream>

diff --git a/dev-libs/liblazy/metadata.xml b/dev-libs/liblazy/metadata.xml
index a40624f..097975e 100644
--- a/dev-libs/liblazy/metadata.xml
+++ b/dev-libs/liblazy/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/liblinebreak/metadata.xml b/dev-libs/liblinebreak/metadata.xml
index 2baeb46..e80b859 100644
--- a/dev-libs/liblinebreak/metadata.xml
+++ b/dev-libs/liblinebreak/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
   Liblinebreak is an implementation of the line breaking algorithm as described
   in Unicode 5.1.0 Standard Annex 14, Revision 22. It breaks lines that contain

diff --git a/dev-libs/libmaa/metadata.xml b/dev-libs/libmaa/metadata.xml
index b95bde3..e30bc74 100644
--- a/dev-libs/libmaa/metadata.xml
+++ b/dev-libs/libmaa/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
   The <pkg>libmaa</pkg> library provides many low-level data structures which
   are helpful for writing compilers, including hash tables, sets, lists,

diff --git a/dev-libs/libmail/metadata.xml b/dev-libs/libmail/metadata.xml
index 74ca616..955bcef 100644
--- a/dev-libs/libmail/metadata.xml
+++ b/dev-libs/libmail/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="apop">Enables the APOP authentication method</flag>
 	</use>

diff --git a/dev-libs/libmba/metadata.xml b/dev-libs/libmba/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-libs/libmba/metadata.xml
+++ b/dev-libs/libmba/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/libmix/metadata.xml b/dev-libs/libmix/metadata.xml
index ff62877..097975e 100644
--- a/dev-libs/libmix/metadata.xml
+++ b/dev-libs/libmix/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/libofx/metadata.xml b/dev-libs/libofx/metadata.xml
index 6533c91..a93ad86 100644
--- a/dev-libs/libofx/metadata.xml
+++ b/dev-libs/libofx/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libofx</remote-id>
 	</upstream>

diff --git a/dev-libs/liboop/metadata.xml b/dev-libs/liboop/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-libs/liboop/metadata.xml
+++ b/dev-libs/liboop/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/libproccpuinfo/metadata.xml b/dev-libs/libproccpuinfo/metadata.xml
index ff62877..097975e 100644
--- a/dev-libs/libproccpuinfo/metadata.xml
+++ b/dev-libs/libproccpuinfo/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/librep/metadata.xml b/dev-libs/librep/metadata.xml
index d2bdcef..24351f8 100644
--- a/dev-libs/librep/metadata.xml
+++ b/dev-libs/librep/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">librep</remote-id>
 	</upstream>

diff --git a/dev-libs/libsqlora8/metadata.xml b/dev-libs/libsqlora8/metadata.xml
index 36bb67f..73460ad 100644
--- a/dev-libs/libsqlora8/metadata.xml
+++ b/dev-libs/libsqlora8/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>
   libsqlora8 is simple C-library to access Oracle databases via the OCI
   interface. Makes simple programming tasks much easier than with plain OCI.

diff --git a/dev-libs/libtomfloat/metadata.xml b/dev-libs/libtomfloat/metadata.xml
index 1470e03..097975e 100644
--- a/dev-libs/libtomfloat/metadata.xml
+++ b/dev-libs/libtomfloat/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/dev-libs/libtommath/metadata.xml b/dev-libs/libtommath/metadata.xml
index 8de78c5..f92ba6a 100644
--- a/dev-libs/libtommath/metadata.xml
+++ b/dev-libs/libtommath/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     LibTomMath is a free open source portable number theoretic multiple-precision 
     integer library written entirely in C. (phew!). The library is designed to 

diff --git a/dev-libs/libtompoly/metadata.xml b/dev-libs/libtompoly/metadata.xml
index 5a6046e..101e080 100644
--- a/dev-libs/libtompoly/metadata.xml
+++ b/dev-libs/libtompoly/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     LibTomPoly has the following features.
 

diff --git a/dev-libs/libtrain/metadata.xml b/dev-libs/libtrain/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-libs/libtrain/metadata.xml
+++ b/dev-libs/libtrain/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/libunicode/metadata.xml b/dev-libs/libunicode/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-libs/libunicode/metadata.xml
+++ b/dev-libs/libunicode/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/libvformat/metadata.xml b/dev-libs/libvformat/metadata.xml
index 7a70fdc..f7e985a 100644
--- a/dev-libs/libvformat/metadata.xml
+++ b/dev-libs/libvformat/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vformat</remote-id>
 	</upstream>

diff --git a/dev-libs/libwbxml/metadata.xml b/dev-libs/libwbxml/metadata.xml
index ebef0b4..2bcb2de 100644
--- a/dev-libs/libwbxml/metadata.xml
+++ b/dev-libs/libwbxml/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libwbxml</remote-id>
 	</upstream>

diff --git a/dev-libs/libx86emu/metadata.xml b/dev-libs/libx86emu/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-libs/libx86emu/metadata.xml
+++ b/dev-libs/libx86emu/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/libxdg-basedir/metadata.xml b/dev-libs/libxdg-basedir/metadata.xml
index ff4e8ba..8a94d48 100644
--- a/dev-libs/libxdg-basedir/metadata.xml
+++ b/dev-libs/libxdg-basedir/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">devnev/libxdg-basedir</remote-id>
   </upstream>

diff --git a/dev-libs/libxls/metadata.xml b/dev-libs/libxls/metadata.xml
index a210978..4de0f66 100644
--- a/dev-libs/libxls/metadata.xml
+++ b/dev-libs/libxls/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">libxls</remote-id>
   </upstream>

diff --git a/dev-libs/log4c/metadata.xml b/dev-libs/log4c/metadata.xml
index 8a00054..aaceee0 100644
--- a/dev-libs/log4c/metadata.xml
+++ b/dev-libs/log4c/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		Log4c is a library of C for flexible logging to files, syslog and other destinations. It is modeled after the Log for Java library (http://jakarta.apache.org/log4j/), staying as close to their API as is reasonable.
 	</longdescription>

diff --git a/dev-libs/log4shib/metadata.xml b/dev-libs/log4shib/metadata.xml
index 51d36d7..0098938 100644
--- a/dev-libs/log4shib/metadata.xml
+++ b/dev-libs/log4shib/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>log4shib is a library of C++ classes for flexible logging
 		to files, syslog, IDSA and other destinations. It is a forked version
 		of log4cpp especially adapted for the shibboleth framework

diff --git a/dev-libs/ltxml/metadata.xml b/dev-libs/ltxml/metadata.xml
index 542bd44..95a7787 100644
--- a/dev-libs/ltxml/metadata.xml
+++ b/dev-libs/ltxml/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>
 Integrated set of XML tools and a developers tool-kit with C API
 </longdescription>

diff --git a/dev-libs/luise-bin/metadata.xml b/dev-libs/luise-bin/metadata.xml
index aba833e..097975e 100644
--- a/dev-libs/luise-bin/metadata.xml
+++ b/dev-libs/luise-bin/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/mapm/metadata.xml b/dev-libs/mapm/metadata.xml
index ff62877..097975e 100644
--- a/dev-libs/mapm/metadata.xml
+++ b/dev-libs/mapm/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/mdsplib/metadata.xml b/dev-libs/mdsplib/metadata.xml
index ff62877..097975e 100644
--- a/dev-libs/mdsplib/metadata.xml
+++ b/dev-libs/mdsplib/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/mm/metadata.xml b/dev-libs/mm/metadata.xml
index 59e2b8f..097975e 100644
--- a/dev-libs/mm/metadata.xml
+++ b/dev-libs/mm/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/openobex/metadata.xml b/dev-libs/openobex/metadata.xml
index 63e47fd..c871df3 100644
--- a/dev-libs/openobex/metadata.xml
+++ b/dev-libs/openobex/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>Free open source implementation of the Object Exchange (OBEX) protocol, 
 used for transferring data to/from mobile devices.</longdescription>
 	<use>

diff --git a/dev-libs/polylib/metadata.xml b/dev-libs/polylib/metadata.xml
index effbbf3..097975e 100644
--- a/dev-libs/polylib/metadata.xml
+++ b/dev-libs/polylib/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/dev-libs/protobuf-c/metadata.xml b/dev-libs/protobuf-c/metadata.xml
index 8d8d652..44fc563 100644
--- a/dev-libs/protobuf-c/metadata.xml
+++ b/dev-libs/protobuf-c/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">protobuf-c/protobuf-c</remote-id>
   </upstream>

diff --git a/dev-libs/protobuf/metadata.xml b/dev-libs/protobuf/metadata.xml
index b890438..27c7a05 100644
--- a/dev-libs/protobuf/metadata.xml
+++ b/dev-libs/protobuf/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">google/protobuf</remote-id>
 	</upstream>

diff --git a/dev-libs/qcodeedit/metadata.xml b/dev-libs/qcodeedit/metadata.xml
index 5bdd93c..9d285e5 100644
--- a/dev-libs/qcodeedit/metadata.xml
+++ b/dev-libs/qcodeedit/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">edyuk</remote-id>
 	</upstream>

diff --git a/dev-libs/safestr/metadata.xml b/dev-libs/safestr/metadata.xml
index 4f6f6bd..9abe028 100644
--- a/dev-libs/safestr/metadata.xml
+++ b/dev-libs/safestr/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 The goal of the SafeStr library is to provide a rich string-handling library
 for C that has safe semantics yet interoperates with legacy library code in a

diff --git a/dev-libs/serdisplib/metadata.xml b/dev-libs/serdisplib/metadata.xml
index 52b25a0..5eb5938 100644
--- a/dev-libs/serdisplib/metadata.xml
+++ b/dev-libs/serdisplib/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Library to drive displays with built-in controllers connected to
 		a parallel port (and serial port for i2c-displays).

diff --git a/dev-libs/shhopt/metadata.xml b/dev-libs/shhopt/metadata.xml
index eeaffa9..3b06079 100644
--- a/dev-libs/shhopt/metadata.xml
+++ b/dev-libs/shhopt/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
     C-functions for parsing command line options, both traditional
     one-character options, and GNU'ish --long-options.

diff --git a/dev-libs/skyutils/metadata.xml b/dev-libs/skyutils/metadata.xml
index 127b839..57f7197 100644
--- a/dev-libs/skyutils/metadata.xml
+++ b/dev-libs/skyutils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 	<longdescription>This library contains many useful functions such as
 chained lists, string manipulation, socket, and the HTTP protocol.</longdescription>
 </pkgmetadata>

diff --git a/dev-libs/syck/metadata.xml b/dev-libs/syck/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-libs/syck/metadata.xml
+++ b/dev-libs/syck/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/syncdir/metadata.xml b/dev-libs/syncdir/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-libs/syncdir/metadata.xml
+++ b/dev-libs/syncdir/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/tvision/metadata.xml b/dev-libs/tvision/metadata.xml
index 4cde498..95af27d 100644
--- a/dev-libs/tvision/metadata.xml
+++ b/dev-libs/tvision/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tvision</remote-id>
 	</upstream>

diff --git a/dev-libs/ucl/metadata.xml b/dev-libs/ucl/metadata.xml
index ff62877..097975e 100644
--- a/dev-libs/ucl/metadata.xml
+++ b/dev-libs/ucl/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/uulib/metadata.xml b/dev-libs/uulib/metadata.xml
index cc074c6..f047fbd 100644
--- a/dev-libs/uulib/metadata.xml
+++ b/dev-libs/uulib/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>library that supports Base64 (MIME), uuencode, xxencode and binhex coding</longdescription>
 </pkgmetadata>

diff --git a/dev-libs/vrb/metadata.xml b/dev-libs/vrb/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-libs/vrb/metadata.xml
+++ b/dev-libs/vrb/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-libs/xmlrpc-epi/metadata.xml b/dev-libs/xmlrpc-epi/metadata.xml
index 09b78dc..ba7886b 100644
--- a/dev-libs/xmlrpc-epi/metadata.xml
+++ b/dev-libs/xmlrpc-epi/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">xmlrpc-epi</remote-id>
 	</upstream>

diff --git a/dev-libs/xxl/metadata.xml b/dev-libs/xxl/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-libs/xxl/metadata.xml
+++ b/dev-libs/xxl/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-lua/lpeg/metadata.xml b/dev-lua/lpeg/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-lua/lpeg/metadata.xml
+++ b/dev-lua/lpeg/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-lua/lua-cjson/metadata.xml b/dev-lua/lua-cjson/metadata.xml
index d8703cb..ecdba55 100644
--- a/dev-lua/lua-cjson/metadata.xml
+++ b/dev-lua/lua-cjson/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">mpx/lua-cjson</remote-id>
   </upstream>

diff --git a/dev-lua/luacrypto/metadata.xml b/dev-lua/luacrypto/metadata.xml
index 48756ac..7ade565 100644
--- a/dev-lua/luacrypto/metadata.xml
+++ b/dev-lua/luacrypto/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">mkottman/luacrypto</remote-id>
   </upstream>

diff --git a/dev-lua/luajson/metadata.xml b/dev-lua/luajson/metadata.xml
index 4d2a88e..494107c 100644
--- a/dev-lua/luajson/metadata.xml
+++ b/dev-lua/luajson/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">harningt/luajson</remote-id>
   </upstream>

diff --git a/dev-python/Djblets/metadata.xml b/dev-python/Djblets/metadata.xml
index ef11b59..983dd19 100644
--- a/dev-python/Djblets/metadata.xml
+++ b/dev-python/Djblets/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">djblets/djblets</remote-id>
   </upstream>

diff --git a/dev-python/audioread/metadata.xml b/dev-python/audioread/metadata.xml
index 9977a55..288dab6 100644
--- a/dev-python/audioread/metadata.xml
+++ b/dev-python/audioread/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
 Decode audio files using whichever backend is available. The library currently supports:
  * Gstreamer via gst-python.

diff --git a/dev-python/bluelet/metadata.xml b/dev-python/bluelet/metadata.xml
index fdb746f..a1ddbee 100644
--- a/dev-python/bluelet/metadata.xml
+++ b/dev-python/bluelet/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 Bluelet is a simple, pure-Python solution for writing intelligible asynchronous socket applications. It uses PEP 342 coroutines to make concurrent I/O look and act like sequential programming.
 

diff --git a/dev-python/fuse-python/metadata.xml b/dev-python/fuse-python/metadata.xml
index 9daaf4d..52d3142 100644
--- a/dev-python/fuse-python/metadata.xml
+++ b/dev-python/fuse-python/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fuse</remote-id>
 	</upstream>

diff --git a/dev-python/pyacoustid/metadata.xml b/dev-python/pyacoustid/metadata.xml
index dabddb7..9c7b4bd 100644
--- a/dev-python/pyacoustid/metadata.xml
+++ b/dev-python/pyacoustid/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
 Chromaprint and its associated Acoustid Web service make up a high-quality, open-source acoustic fingerprinting system. This package provides Python bindings for both the fingerprinting algorithm library, which is written in C but portable, and the Web service, which provides fingerprint lookups.
 	</longdescription>

diff --git a/dev-python/pyechonest/metadata.xml b/dev-python/pyechonest/metadata.xml
index 77ada57..f244e0f 100644
--- a/dev-python/pyechonest/metadata.xml
+++ b/dev-python/pyechonest/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		 Tap into The Echo Nest's Musical Brain for the best music search,
 		 information, recommendations and remix tools on the web.

diff --git a/dev-python/pysyck/metadata.xml b/dev-python/pysyck/metadata.xml
index a55e575..2c517cc 100644
--- a/dev-python/pysyck/metadata.xml
+++ b/dev-python/pysyck/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		PySyck is aimed to update the current Python bindings for Syck. The new
 		bindings provide a wrapper for the Syck emitter and give access to YAML

diff --git a/dev-python/python-dsv/metadata.xml b/dev-python/python-dsv/metadata.xml
index 43dfa17..bfbe701 100644
--- a/dev-python/python-dsv/metadata.xml
+++ b/dev-python/python-dsv/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>Python module for importing and exporting DSV (delimiter separated values) files.
 DSV is a generalization of CSV (comma separated values) and it is a common file
 format used by many programs to import and export data.</longdescription>

diff --git a/dev-python/pyutil/metadata.xml b/dev-python/pyutil/metadata.xml
index d1ce02e..cf4b37a 100644
--- a/dev-python/pyutil/metadata.xml
+++ b/dev-python/pyutil/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		pyutil -- a library of useful Python functions and classes
 		==========================================================

diff --git a/dev-python/remoteobjects/metadata.xml b/dev-python/remoteobjects/metadata.xml
index 94cf84d..b658c1b 100644
--- a/dev-python/remoteobjects/metadata.xml
+++ b/dev-python/remoteobjects/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">LegNeato/remoteobjects</remote-id>
   </upstream>

diff --git a/dev-python/rtf2xml/metadata.xml b/dev-python/rtf2xml/metadata.xml
index 9e010f3..32c764a 100644
--- a/dev-python/rtf2xml/metadata.xml
+++ b/dev-python/rtf2xml/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rtf2xml</remote-id>
 	</upstream>

diff --git a/dev-python/simplegui/metadata.xml b/dev-python/simplegui/metadata.xml
index 2ccc747..40663e5 100644
--- a/dev-python/simplegui/metadata.xml
+++ b/dev-python/simplegui/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">simplegui</remote-id>
 	</upstream>

diff --git a/dev-python/skype4py/metadata.xml b/dev-python/skype4py/metadata.xml
index 75a0c40..6c3218b 100644
--- a/dev-python/skype4py/metadata.xml
+++ b/dev-python/skype4py/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="pypi">Skype4Py</remote-id>
     <remote-id type="github">awahlig/skype4py</remote-id>

diff --git a/dev-python/xmpppy/metadata.xml b/dev-python/xmpppy/metadata.xml
index c91ec54..e736e08 100644
--- a/dev-python/xmpppy/metadata.xml
+++ b/dev-python/xmpppy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		xmpppy is a Python library that is targeted to provide easy scripting with
 		Jabber. Similar projects are Twisted Words and jabber.py. This library was

diff --git a/dev-python/zbase32/metadata.xml b/dev-python/zbase32/metadata.xml
index 7dd1453..83396c5 100644
--- a/dev-python/zbase32/metadata.xml
+++ b/dev-python/zbase32/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">zbase32</remote-id>
 	</upstream>

diff --git a/dev-python/zfec/metadata.xml b/dev-python/zfec/metadata.xml
index 0924b9d..0e65a7b 100644
--- a/dev-python/zfec/metadata.xml
+++ b/dev-python/zfec/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Generate redundant blocks of information such that if some of
 		the blocks are lost then the original data can be recovered from

diff --git a/dev-util/a8/metadata.xml b/dev-util/a8/metadata.xml
index 3daaf12..60b70cf 100644
--- a/dev-util/a8/metadata.xml
+++ b/dev-util/a8/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">a8</remote-id>
 		<remote-id type="github">aliafshar/a8</remote-id>

diff --git a/dev-util/alleyoop/metadata.xml b/dev-util/alleyoop/metadata.xml
index bff4db9..3eecfea 100644
--- a/dev-util/alleyoop/metadata.xml
+++ b/dev-util/alleyoop/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription/>
   <upstream>
     <remote-id type="sourceforge">alleyoop</remote-id>

diff --git a/dev-util/as11/metadata.xml b/dev-util/as11/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-util/as11/metadata.xml
+++ b/dev-util/as11/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/autodia/metadata.xml b/dev-util/autodia/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/autodia/metadata.xml
+++ b/dev-util/autodia/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/bam/metadata.xml b/dev-util/bam/metadata.xml
index 89a3497..515217b 100644
--- a/dev-util/bam/metadata.xml
+++ b/dev-util/bam/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">downloads/matricks</remote-id>
 	</upstream>

diff --git a/dev-util/bcpp/metadata.xml b/dev-util/bcpp/metadata.xml
index 59e2b8f..097975e 100644
--- a/dev-util/bcpp/metadata.xml
+++ b/dev-util/bcpp/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/beediff/metadata.xml b/dev-util/beediff/metadata.xml
index 59e2b8f..097975e 100644
--- a/dev-util/beediff/metadata.xml
+++ b/dev-util/beediff/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/bluej/metadata.xml b/dev-util/bluej/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/bluej/metadata.xml
+++ b/dev-util/bluej/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/byacc/metadata.xml b/dev-util/byacc/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/byacc/metadata.xml
+++ b/dev-util/byacc/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/cccc/metadata.xml b/dev-util/cccc/metadata.xml
index b2c5f53..095797b 100644
--- a/dev-util/cccc/metadata.xml
+++ b/dev-util/cccc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cccc</remote-id>
 		<bugs-to>http://sourceforge.net/tracker/?group_id=7763</bugs-to>

diff --git a/dev-util/ccmalloc/metadata.xml b/dev-util/ccmalloc/metadata.xml
index 4514939..a56d5cf 100644
--- a/dev-util/ccmalloc/metadata.xml
+++ b/dev-util/ccmalloc/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
     If you want to remove memory leaks from your C or C++ programs or you
     experience strange bugs, probably due to pointer access to freed data,

diff --git a/dev-util/cdecl/metadata.xml b/dev-util/cdecl/metadata.xml
index ff62877..097975e 100644
--- a/dev-util/cdecl/metadata.xml
+++ b/dev-util/cdecl/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/cocom/metadata.xml b/dev-util/cocom/metadata.xml
index a097d2f..0101a3e 100644
--- a/dev-util/cocom/metadata.xml
+++ b/dev-util/cocom/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		COCOM tool set is oriented towards the creation of compilers,
 		cross-compilers, interpreters, and other language processors.

diff --git a/dev-util/cproto/metadata.xml b/dev-util/cproto/metadata.xml
index a40624f..097975e 100644
--- a/dev-util/cproto/metadata.xml
+++ b/dev-util/cproto/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/crow-designer/metadata.xml b/dev-util/crow-designer/metadata.xml
index 7c9e19f..35f1dc9 100644
--- a/dev-util/crow-designer/metadata.xml
+++ b/dev-util/crow-designer/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">Gideon is a modern GUI builder for GTK+ toolkit. It is an advanced
 		IDE-embeddable RAD tool designed to fulfil l the needs of desktop
 		programmers who want to create multi-platform GTK+ based applications

diff --git a/dev-util/cutils/metadata.xml b/dev-util/cutils/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/cutils/metadata.xml
+++ b/dev-util/cutils/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/dirdiff/metadata.xml b/dev-util/dirdiff/metadata.xml
index 1470e03..097975e 100644
--- a/dev-util/dirdiff/metadata.xml
+++ b/dev-util/dirdiff/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/dev-util/dissembler/metadata.xml b/dev-util/dissembler/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-util/dissembler/metadata.xml
+++ b/dev-util/dissembler/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/dwarves/metadata.xml b/dev-util/dwarves/metadata.xml
index 36b552b..c841532 100644
--- a/dev-util/dwarves/metadata.xml
+++ b/dev-util/dwarves/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
     The more-than-seven dwarves is a collection of tools that allows
     to inspect and query the DWARF2 information present in ELF files

diff --git a/dev-util/eggy/metadata.xml b/dev-util/eggy/metadata.xml
index 32ab455..ad2561a 100644
--- a/dev-util/eggy/metadata.xml
+++ b/dev-util/eggy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">eggy</remote-id>
 	</upstream>

diff --git a/dev-util/egypt/metadata.xml b/dev-util/egypt/metadata.xml
index 59e2b8f..097975e 100644
--- a/dev-util/egypt/metadata.xml
+++ b/dev-util/egypt/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/filepp/metadata.xml b/dev-util/filepp/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/filepp/metadata.xml
+++ b/dev-util/filepp/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/flawfinder/metadata.xml b/dev-util/flawfinder/metadata.xml
index 59e2b8f..097975e 100644
--- a/dev-util/flawfinder/metadata.xml
+++ b/dev-util/flawfinder/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/ftnchek/metadata.xml b/dev-util/ftnchek/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-util/ftnchek/metadata.xml
+++ b/dev-util/ftnchek/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/gengetopt/metadata.xml b/dev-util/gengetopt/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/gengetopt/metadata.xml
+++ b/dev-util/gengetopt/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/ghh/metadata.xml b/dev-util/ghh/metadata.xml
index a40624f..097975e 100644
--- a/dev-util/ghh/metadata.xml
+++ b/dev-util/ghh/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/httpup/metadata.xml b/dev-util/httpup/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/httpup/metadata.xml
+++ b/dev-util/httpup/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/huc/metadata.xml b/dev-util/huc/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-util/huc/metadata.xml
+++ b/dev-util/huc/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/hxd/metadata.xml b/dev-util/hxd/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/hxd/metadata.xml
+++ b/dev-util/hxd/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/injectso/metadata.xml b/dev-util/injectso/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-util/injectso/metadata.xml
+++ b/dev-util/injectso/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/intel2gas/metadata.xml b/dev-util/intel2gas/metadata.xml
index 4d1a7b0..ad26b5d 100644
--- a/dev-util/intel2gas/metadata.xml
+++ b/dev-util/intel2gas/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>Intel2GAS is a converter that will convert assembler source files written for 
 NASM to files that can be assembled using the GNU Assembler (GAS), on the i386 platform. It 
 provides support for basic MMX instructions as well.</longdescription>

diff --git a/dev-util/jif/metadata.xml b/dev-util/jif/metadata.xml
index 3f214a6..fd1976e 100644
--- a/dev-util/jif/metadata.xml
+++ b/dev-util/jif/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>
 JIF is an Integrated Development Environment (IDE), written entirely in Java,
 for the creation of text adventures based on Graham Nelson's Inform standard.

diff --git a/dev-util/kdoc/metadata.xml b/dev-util/kdoc/metadata.xml
index 9df351b..097975e 100644
--- a/dev-util/kdoc/metadata.xml
+++ b/dev-util/kdoc/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-    <name>Default assignee for orphaned packages</name>
-  </maintainer>
 </pkgmetadata>

diff --git a/dev-util/linklint/metadata.xml b/dev-util/linklint/metadata.xml
index 1470e03..097975e 100644
--- a/dev-util/linklint/metadata.xml
+++ b/dev-util/linklint/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/dev-util/lockrun/metadata.xml b/dev-util/lockrun/metadata.xml
index a40624f..097975e 100644
--- a/dev-util/lockrun/metadata.xml
+++ b/dev-util/lockrun/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/lsuio/metadata.xml b/dev-util/lsuio/metadata.xml
index effbbf3..097975e 100644
--- a/dev-util/lsuio/metadata.xml
+++ b/dev-util/lsuio/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/dev-util/memprof/metadata.xml b/dev-util/memprof/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-util/memprof/metadata.xml
+++ b/dev-util/memprof/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/metro/metadata.xml b/dev-util/metro/metadata.xml
index 0640a09..a685015 100644
--- a/dev-util/metro/metadata.xml
+++ b/dev-util/metro/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Metro is a build tool that can build Gentoo Linux OS releases and OpenVZ
 		templates. It’s designed to interface with a package manager such as

diff --git a/dev-util/min-cscope/metadata.xml b/dev-util/min-cscope/metadata.xml
index 35840fc..4105fb8 100644
--- a/dev-util/min-cscope/metadata.xml
+++ b/dev-util/min-cscope/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">kscope</remote-id>
   </upstream>

diff --git a/dev-util/mock/metadata.xml b/dev-util/mock/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-util/mock/metadata.xml
+++ b/dev-util/mock/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/mutrace/metadata.xml b/dev-util/mutrace/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/mutrace/metadata.xml
+++ b/dev-util/mutrace/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/nsis/metadata.xml b/dev-util/nsis/metadata.xml
index b0b6ada..cb58a5b 100644
--- a/dev-util/nsis/metadata.xml
+++ b/dev-util/nsis/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
 NSIS (Nullsoft Scriptable Install System) is a professional open source
 system to create Windows installers. It is designed to be as small and

diff --git a/dev-util/osdt/metadata.xml b/dev-util/osdt/metadata.xml
index 759dee1..8bcb755 100644
--- a/dev-util/osdt/metadata.xml
+++ b/dev-util/osdt/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		OSDT (Open Source Development Toolkit), is a set of tools that help
 		lower the "friction cost" of Open Source software development.

diff --git a/dev-util/par/metadata.xml b/dev-util/par/metadata.xml
index ff62877..097975e 100644
--- a/dev-util/par/metadata.xml
+++ b/dev-util/par/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/piklab/metadata.xml b/dev-util/piklab/metadata.xml
index b930de0..1283ddd 100644
--- a/dev-util/piklab/metadata.xml
+++ b/dev-util/piklab/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">piklab</remote-id>
 		<bugs-to>http://sourceforge.net/tracker/?group_id=138852</bugs-to>

diff --git a/dev-util/pmk/metadata.xml b/dev-util/pmk/metadata.xml
index 7ec158b..c8bb6c0 100644
--- a/dev-util/pmk/metadata.xml
+++ b/dev-util/pmk/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     The meaning of pmk is "Pre Make Kit", a dependency configuring tool. It
     aims to be considered as an alternative to GNU autoconf, GNU libtool

diff --git a/dev-util/pretrace/metadata.xml b/dev-util/pretrace/metadata.xml
index 1470e03..097975e 100644
--- a/dev-util/pretrace/metadata.xml
+++ b/dev-util/pretrace/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/dev-util/qdevelop/metadata.xml b/dev-util/qdevelop/metadata.xml
index e4dec25..cd578d4 100644
--- a/dev-util/qdevelop/metadata.xml
+++ b/dev-util/qdevelop/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
 	<flag name="plugins">Build and install additional plugins</flag>
 </use>

diff --git a/dev-util/qmtest/metadata.xml b/dev-util/qmtest/metadata.xml
index effbbf3..097975e 100644
--- a/dev-util/qmtest/metadata.xml
+++ b/dev-util/qmtest/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/dev-util/rec/metadata.xml b/dev-util/rec/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/rec/metadata.xml
+++ b/dev-util/rec/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/redet/metadata.xml b/dev-util/redet/metadata.xml
index f8ff719..fc22f07 100644
--- a/dev-util/redet/metadata.xml
+++ b/dev-util/redet/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		A regular expression development and execution tool.
 	</longdescription>

diff --git a/dev-util/rootstrap/metadata.xml b/dev-util/rootstrap/metadata.xml
index 59e2b8f..097975e 100644
--- a/dev-util/rootstrap/metadata.xml
+++ b/dev-util/rootstrap/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/scanmem/metadata.xml b/dev-util/scanmem/metadata.xml
index 04f8ecc..8e484fb 100644
--- a/dev-util/scanmem/metadata.xml
+++ b/dev-util/scanmem/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="gui">Enable the GameConqueror GUI</flag>
 	</use>

diff --git a/dev-util/skelgen/metadata.xml b/dev-util/skelgen/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/skelgen/metadata.xml
+++ b/dev-util/skelgen/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/synopsis/metadata.xml b/dev-util/synopsis/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/synopsis/metadata.xml
+++ b/dev-util/synopsis/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/tinlink/metadata.xml b/dev-util/tinlink/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-util/tinlink/metadata.xml
+++ b/dev-util/tinlink/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-util/tmake/metadata.xml b/dev-util/tmake/metadata.xml
index 3f32930..ca91bac 100644
--- a/dev-util/tmake/metadata.xml
+++ b/dev-util/tmake/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tmake</remote-id>
 	</upstream>

diff --git a/dev-util/trinity/metadata.xml b/dev-util/trinity/metadata.xml
index 7a8b776..a2bf49c 100644
--- a/dev-util/trinity/metadata.xml
+++ b/dev-util/trinity/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">kernelslacker/trinity</remote-id>
 	</upstream>

diff --git a/dev-util/umockdev/metadata.xml b/dev-util/umockdev/metadata.xml
index 7b97b02..13b46c7 100644
--- a/dev-util/umockdev/metadata.xml
+++ b/dev-util/umockdev/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">umockdev</remote-id>
 		<remote-id type="github">martinpitt/umockdev</remote-id>

diff --git a/dev-util/usb-robot/metadata.xml b/dev-util/usb-robot/metadata.xml
index 32d8075..0ea9b6d 100644
--- a/dev-util/usb-robot/metadata.xml
+++ b/dev-util/usb-robot/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">usb-robot</remote-id>
 	</upstream>

diff --git a/dev-util/webcpp/metadata.xml b/dev-util/webcpp/metadata.xml
index 9951648..e48f43e 100644
--- a/dev-util/webcpp/metadata.xml
+++ b/dev-util/webcpp/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">webcpp</remote-id>
 	</upstream>

diff --git a/dev-util/weblint/metadata.xml b/dev-util/weblint/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-util/weblint/metadata.xml
+++ b/dev-util/weblint/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-util/xesam-tools/metadata.xml b/dev-util/xesam-tools/metadata.xml
index 5db1e61..fcd7e79 100644
--- a/dev-util/xesam-tools/metadata.xml
+++ b/dev-util/xesam-tools/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
     xesam-tools provides a set of tools and examples to help developers
     who are working on servers or clients which implement the Xesam desktop

diff --git a/dev-util/yacc/metadata.xml b/dev-util/yacc/metadata.xml
index d9cd2ca..097975e 100644
--- a/dev-util/yacc/metadata.xml
+++ b/dev-util/yacc/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-vcs/archway/metadata.xml b/dev-vcs/archway/metadata.xml
index 59e2b8f..097975e 100644
--- a/dev-vcs/archway/metadata.xml
+++ b/dev-vcs/archway/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/dev-vcs/cvsspam/metadata.xml b/dev-vcs/cvsspam/metadata.xml
index ff62877..097975e 100644
--- a/dev-vcs/cvsspam/metadata.xml
+++ b/dev-vcs/cvsspam/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-vcs/easygit/metadata.xml b/dev-vcs/easygit/metadata.xml
index ff62877..097975e 100644
--- a/dev-vcs/easygit/metadata.xml
+++ b/dev-vcs/easygit/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-vcs/guilt/metadata.xml b/dev-vcs/guilt/metadata.xml
index ff62877..097975e 100644
--- a/dev-vcs/guilt/metadata.xml
+++ b/dev-vcs/guilt/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/dev-vcs/hgsvn/metadata.xml b/dev-vcs/hgsvn/metadata.xml
index e2a0f12..2b75d68 100644
--- a/dev-vcs/hgsvn/metadata.xml
+++ b/dev-vcs/hgsvn/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A set of scripts to work locally on Subversion checkouts using Mercurial</longdescription>
 	<upstream>
 		<remote-id type="pypi">hgsvn</remote-id>

diff --git a/dev-vcs/svnmailer/metadata.xml b/dev-vcs/svnmailer/metadata.xml
index 91f4e72..097975e 100644
--- a/dev-vcs/svnmailer/metadata.xml
+++ b/dev-vcs/svnmailer/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/gnome-extra/connman-gnome/metadata.xml b/gnome-extra/connman-gnome/metadata.xml
index 6780ebb..3e5960e 100644
--- a/gnome-extra/connman-gnome/metadata.xml
+++ b/gnome-extra/connman-gnome/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="github">connectivity/connman-gnome</remote-id>
   </upstream>

diff --git a/gnome-extra/gdesklets-core/metadata.xml b/gnome-extra/gdesklets-core/metadata.xml
index 98395b2..e8e04b6 100644
--- a/gnome-extra/gdesklets-core/metadata.xml
+++ b/gnome-extra/gdesklets-core/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<upstream>
+<upstream>
 		<bugs-to>https://bugs.launchpad.net/gdesklets</bugs-to>
 	</upstream>
 	<use>

diff --git a/gnome-extra/gnome-color-chooser/metadata.xml b/gnome-extra/gnome-color-chooser/metadata.xml
index 0bed7b3..3a52670 100644
--- a/gnome-extra/gnome-color-chooser/metadata.xml
+++ b/gnome-extra/gnome-color-chooser/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">gnomecc</remote-id>
 	</upstream>

diff --git a/gnome-extra/gnome-do-plugins/metadata.xml b/gnome-extra/gnome-do-plugins/metadata.xml
index 767c826..c142b5c 100644
--- a/gnome-extra/gnome-do-plugins/metadata.xml
+++ b/gnome-extra/gnome-do-plugins/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="banshee">Enables the Banshee (<pkg>media-sound/banshee</pkg>) plugin</flag>
 	</use>

diff --git a/gnome-extra/gpointing-device-settings/metadata.xml b/gnome-extra/gpointing-device-settings/metadata.xml
index 25e94b2..45aa987 100644
--- a/gnome-extra/gpointing-device-settings/metadata.xml
+++ b/gnome-extra/gpointing-device-settings/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">gsynaptics</remote-id>
 	</upstream>

diff --git a/gnome-extra/nautilus-dropbox/metadata.xml b/gnome-extra/nautilus-dropbox/metadata.xml
index 7db3cda..17ccc3b 100644
--- a/gnome-extra/nautilus-dropbox/metadata.xml
+++ b/gnome-extra/nautilus-dropbox/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
 </longdescription>
 </pkgmetadata>

diff --git a/mail-client/mail-notification/metadata.xml b/mail-client/mail-notification/metadata.xml
index 6706026..0ae61ad 100644
--- a/mail-client/mail-notification/metadata.xml
+++ b/mail-client/mail-notification/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 A GNOME trayicon which checks for email. Supports mbox, MH,
 Maildir, IMAP, Sylpheed, POP3, Gmail and Evolution.  Authenticates via

diff --git a/mail-filter/anomy-sanitizer/metadata.xml b/mail-filter/anomy-sanitizer/metadata.xml
index 91f4e72..097975e 100644
--- a/mail-filter/anomy-sanitizer/metadata.xml
+++ b/mail-filter/anomy-sanitizer/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/mail-filter/libsieve/metadata.xml b/mail-filter/libsieve/metadata.xml
index 5b379a1..2118447 100644
--- a/mail-filter/libsieve/metadata.xml
+++ b/mail-filter/libsieve/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
 libSieve provides a library to interpret Sieve scripts, and to execute those
 scripts over a given set of messages. The return codes from the libSieve

diff --git a/mail-filter/popfile/metadata.xml b/mail-filter/popfile/metadata.xml
index 1534479..097975e 100644
--- a/mail-filter/popfile/metadata.xml
+++ b/mail-filter/popfile/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-  <description>This package lacks a primary herd or maintainer.</description> 
-</maintainer>
 </pkgmetadata>

diff --git a/mail-filter/sieve-connect/metadata.xml b/mail-filter/sieve-connect/metadata.xml
index 416bc4d..df36ed4 100644
--- a/mail-filter/sieve-connect/metadata.xml
+++ b/mail-filter/sieve-connect/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		This is sieve-connect. A client for the ManageSieve protocol,
 		as specifed in RFC 5804. Historically, this was MANAGESIEVE as

diff --git a/mail-filter/spamassassin/metadata.xml b/mail-filter/spamassassin/metadata.xml
index cd32402..f5be184 100644
--- a/mail-filter/spamassassin/metadata.xml
+++ b/mail-filter/spamassassin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
-<use>
+  <use>
   <flag name="qmail">Build qmail functionality and docs</flag>
   <flag name="bayes">
     Require a database (MySQL, SQLite, Postgres, or BerkDB) backend to

diff --git a/media-gfx/DFBPoint/metadata.xml b/media-gfx/DFBPoint/metadata.xml
index 59e2b8f..097975e 100644
--- a/media-gfx/DFBPoint/metadata.xml
+++ b/media-gfx/DFBPoint/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/arss/metadata.xml b/media-gfx/arss/metadata.xml
index 5d3191b..50d2ab0 100644
--- a/media-gfx/arss/metadata.xml
+++ b/media-gfx/arss/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">arss</remote-id>
 	</upstream>

diff --git a/media-gfx/aview/metadata.xml b/media-gfx/aview/metadata.xml
index 98a05a1..9facb4d 100644
--- a/media-gfx/aview/metadata.xml
+++ b/media-gfx/aview/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">aa-project</remote-id>
   </upstream>

diff --git a/media-gfx/bootsplash-themes/metadata.xml b/media-gfx/bootsplash-themes/metadata.xml
index d9cd2ca..097975e 100644
--- a/media-gfx/bootsplash-themes/metadata.xml
+++ b/media-gfx/bootsplash-themes/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/crwinfo/metadata.xml b/media-gfx/crwinfo/metadata.xml
index 63d3482..4b78b84 100644
--- a/media-gfx/crwinfo/metadata.xml
+++ b/media-gfx/crwinfo/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<longdescription lang="en">
 		Utility to extract thumbnails and information from Canon raw (CRW)
 		files.

diff --git a/media-gfx/cthumb/metadata.xml b/media-gfx/cthumb/metadata.xml
index 152d41c..25ca9d7 100644
--- a/media-gfx/cthumb/metadata.xml
+++ b/media-gfx/cthumb/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cthumb</remote-id>
 	</upstream>

diff --git a/media-gfx/fblogo/metadata.xml b/media-gfx/fblogo/metadata.xml
index d9cd2ca..097975e 100644
--- a/media-gfx/fblogo/metadata.xml
+++ b/media-gfx/fblogo/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/fbv/metadata.xml b/media-gfx/fbv/metadata.xml
index c3e2245..285a1cc 100644
--- a/media-gfx/fbv/metadata.xml
+++ b/media-gfx/fbv/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription/>
   <upstream>
     <remote-id type="freshmeat">fbv</remote-id>

diff --git a/media-gfx/figurine/metadata.xml b/media-gfx/figurine/metadata.xml
index 970db4d..a88e22b 100644
--- a/media-gfx/figurine/metadata.xml
+++ b/media-gfx/figurine/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">figurine</remote-id>
 	</upstream>

diff --git a/media-gfx/gozer/metadata.xml b/media-gfx/gozer/metadata.xml
index d9cd2ca..097975e 100644
--- a/media-gfx/gozer/metadata.xml
+++ b/media-gfx/gozer/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/mkgallery/metadata.xml b/media-gfx/mkgallery/metadata.xml
index 92d92ff..79016e4 100644
--- a/media-gfx/mkgallery/metadata.xml
+++ b/media-gfx/mkgallery/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mkgallery</remote-id>
 	</upstream>

diff --git a/media-gfx/nvidia-texture-tools/metadata.xml b/media-gfx/nvidia-texture-tools/metadata.xml
index 848f698..5a53f18 100644
--- a/media-gfx/nvidia-texture-tools/metadata.xml
+++ b/media-gfx/nvidia-texture-tools/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="cg">Enable NVIDIA C graphics compiler toolkit plug-in</flag>
 		<flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>

diff --git a/media-gfx/pencil/metadata.xml b/media-gfx/pencil/metadata.xml
index c769907..70e86fa 100644
--- a/media-gfx/pencil/metadata.xml
+++ b/media-gfx/pencil/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pencil-planner</remote-id>
 	</upstream>

diff --git a/media-gfx/peps/metadata.xml b/media-gfx/peps/metadata.xml
index 3442601..e51cece 100644
--- a/media-gfx/peps/metadata.xml
+++ b/media-gfx/peps/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		peps will preprocess encapsulated Postscript files and allow you to
 		convert them into bitmaps. Note the word allow: peps does not do the

diff --git a/media-gfx/photopc/metadata.xml b/media-gfx/photopc/metadata.xml
index 62f407f..1ef6f48 100644
--- a/media-gfx/photopc/metadata.xml
+++ b/media-gfx/photopc/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">photopc</remote-id>
 	</upstream>

diff --git a/media-gfx/pictureflow/metadata.xml b/media-gfx/pictureflow/metadata.xml
index 383b938..4eac160 100644
--- a/media-gfx/pictureflow/metadata.xml
+++ b/media-gfx/pictureflow/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">pictureflow</remote-id>
 	</upstream>

diff --git a/media-gfx/picturewall/metadata.xml b/media-gfx/picturewall/metadata.xml
index 04609cf..2b017c1 100644
--- a/media-gfx/picturewall/metadata.xml
+++ b/media-gfx/picturewall/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">picturewall</remote-id>
 	</upstream>

diff --git a/media-gfx/pngnq/metadata.xml b/media-gfx/pngnq/metadata.xml
index cb1ed53..1846948 100644
--- a/media-gfx/pngnq/metadata.xml
+++ b/media-gfx/pngnq/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pngnq</remote-id>
 	</upstream>

diff --git a/media-gfx/propaganda/metadata.xml b/media-gfx/propaganda/metadata.xml
index d9cd2ca..097975e 100644
--- a/media-gfx/propaganda/metadata.xml
+++ b/media-gfx/propaganda/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/qingy-themes/metadata.xml b/media-gfx/qingy-themes/metadata.xml
index d9cd2ca..097975e 100644
--- a/media-gfx/qingy-themes/metadata.xml
+++ b/media-gfx/qingy-themes/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/quat/metadata.xml b/media-gfx/quat/metadata.xml
index d9cd2ca..097975e 100644
--- a/media-gfx/quat/metadata.xml
+++ b/media-gfx/quat/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml
index ff62877..097975e 100644
--- a/media-gfx/sane-backends/metadata.xml
+++ b/media-gfx/sane-backends/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/sane-frontends/metadata.xml b/media-gfx/sane-frontends/metadata.xml
index ff62877..097975e 100644
--- a/media-gfx/sane-frontends/metadata.xml
+++ b/media-gfx/sane-frontends/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/smile/metadata.xml b/media-gfx/smile/metadata.xml
index a40624f..097975e 100644
--- a/media-gfx/smile/metadata.xml
+++ b/media-gfx/smile/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/splash-themes-gentoo/metadata.xml b/media-gfx/splash-themes-gentoo/metadata.xml
index d9cd2ca..097975e 100644
--- a/media-gfx/splash-themes-gentoo/metadata.xml
+++ b/media-gfx/splash-themes-gentoo/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/tgif/metadata.xml b/media-gfx/tgif/metadata.xml
index d9cd2ca..097975e 100644
--- a/media-gfx/tgif/metadata.xml
+++ b/media-gfx/tgif/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/videorbits/metadata.xml b/media-gfx/videorbits/metadata.xml
index 126edb4..6ac96b5 100644
--- a/media-gfx/videorbits/metadata.xml
+++ b/media-gfx/videorbits/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">comparametric</remote-id>
 	</upstream>

diff --git a/media-gfx/viewer/metadata.xml b/media-gfx/viewer/metadata.xml
index 59e2b8f..097975e 100644
--- a/media-gfx/viewer/metadata.xml
+++ b/media-gfx/viewer/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/w3mimgfb/metadata.xml b/media-gfx/w3mimgfb/metadata.xml
index 91f4e72..097975e 100644
--- a/media-gfx/w3mimgfb/metadata.xml
+++ b/media-gfx/w3mimgfb/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/media-gfx/xpaint/metadata.xml b/media-gfx/xpaint/metadata.xml
index d62666a..819de7f 100644
--- a/media-gfx/xpaint/metadata.xml
+++ b/media-gfx/xpaint/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		XPaint is an X Window System color image bitmap editing program.
 		It also supports advanced features, such as image processing

diff --git a/media-gfx/xv/metadata.xml b/media-gfx/xv/metadata.xml
index ca01873..db1b506 100644
--- a/media-gfx/xv/metadata.xml
+++ b/media-gfx/xv/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">png-mng</remote-id>
   </upstream>

diff --git a/media-gfx/zgv/metadata.xml b/media-gfx/zgv/metadata.xml
index 59e2b8f..097975e 100644
--- a/media-gfx/zgv/metadata.xml
+++ b/media-gfx/zgv/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/media-libs/csfml/metadata.xml b/media-libs/csfml/metadata.xml
index 1e60370..d0577a5 100644
--- a/media-libs/csfml/metadata.xml
+++ b/media-libs/csfml/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sfml</remote-id>
 	</upstream>

diff --git a/media-libs/fnlib/metadata.xml b/media-libs/fnlib/metadata.xml
index ce1b87e..4491056 100644
--- a/media-libs/fnlib/metadata.xml
+++ b/media-libs/fnlib/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <upstream>
 	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>

diff --git a/media-libs/iulib/metadata.xml b/media-libs/iulib/metadata.xml
index da2a1b9..135a517 100644
--- a/media-libs/iulib/metadata.xml
+++ b/media-libs/iulib/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">iulib</remote-id>
 		<remote-id type="github">tmbdev/iulib</remote-id>

diff --git a/media-libs/libdlna/metadata.xml b/media-libs/libdlna/metadata.xml
index 1470e03..097975e 100644
--- a/media-libs/libdlna/metadata.xml
+++ b/media-libs/libdlna/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/media-libs/libemf/metadata.xml b/media-libs/libemf/metadata.xml
index 9dc9ef9..35d8a92 100644
--- a/media-libs/libemf/metadata.xml
+++ b/media-libs/libemf/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">libemf</remote-id>
   </upstream>

diff --git a/media-libs/libipod/metadata.xml b/media-libs/libipod/metadata.xml
index e2ffbc2..9ab3302 100644
--- a/media-libs/libipod/metadata.xml
+++ b/media-libs/libipod/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libipod</remote-id>
 	</upstream>

diff --git a/media-libs/libirman/metadata.xml b/media-libs/libirman/metadata.xml
index 91f4e72..097975e 100644
--- a/media-libs/libirman/metadata.xml
+++ b/media-libs/libirman/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/media-libs/libmimic/metadata.xml b/media-libs/libmimic/metadata.xml
index 08a886b..5acffc2 100644
--- a/media-libs/libmimic/metadata.xml
+++ b/media-libs/libmimic/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">farsight</remote-id>
 	</upstream>

diff --git a/media-libs/libmkv/metadata.xml b/media-libs/libmkv/metadata.xml
index 5814958..5540354 100644
--- a/media-libs/libmkv/metadata.xml
+++ b/media-libs/libmkv/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     Lightweight Matroska muxer written for HandBrake.
   </longdescription>

diff --git a/media-libs/libmnote/metadata.xml b/media-libs/libmnote/metadata.xml
index 744e3f7..b1dd3bc 100644
--- a/media-libs/libmnote/metadata.xml
+++ b/media-libs/libmnote/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libexif</remote-id>
 	</upstream>

diff --git a/media-libs/libptp2/metadata.xml b/media-libs/libptp2/metadata.xml
index 5747aa4..9f5a760 100644
--- a/media-libs/libptp2/metadata.xml
+++ b/media-libs/libptp2/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription/>
   <upstream>
     <remote-id type="sourceforge">libptp</remote-id>

diff --git a/media-libs/libwmf/metadata.xml b/media-libs/libwmf/metadata.xml
index 2e50829..93895ee 100644
--- a/media-libs/libwmf/metadata.xml
+++ b/media-libs/libwmf/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">wvware</remote-id>
   </upstream>

diff --git a/media-libs/sampleicc/metadata.xml b/media-libs/sampleicc/metadata.xml
index 8cc14b8..c7e1883 100644
--- a/media-libs/sampleicc/metadata.xml
+++ b/media-libs/sampleicc/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sampleicc</remote-id>
 	</upstream>

diff --git a/media-libs/sdlmm/metadata.xml b/media-libs/sdlmm/metadata.xml
index c3c7fac..ebdda0e 100644
--- a/media-libs/sdlmm/metadata.xml
+++ b/media-libs/sdlmm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">sdlmm</remote-id>
   </upstream>

diff --git a/media-libs/webrtc-audio-processing/metadata.xml b/media-libs/webrtc-audio-processing/metadata.xml
index 1470e03..097975e 100644
--- a/media-libs/webrtc-audio-processing/metadata.xml
+++ b/media-libs/webrtc-audio-processing/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/media-plugins/gimp-resynthesizer/metadata.xml b/media-plugins/gimp-resynthesizer/metadata.xml
index 91f4e72..097975e 100644
--- a/media-plugins/gimp-resynthesizer/metadata.xml
+++ b/media-plugins/gimp-resynthesizer/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/media-sound/alac_decoder/metadata.xml b/media-sound/alac_decoder/metadata.xml
index c733e85..86e1155 100644
--- a/media-sound/alac_decoder/metadata.xml
+++ b/media-sound/alac_decoder/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Basic decoder for Apple Lossless Audio Codec files (ALAC). ALAC is a
 		proprietary lossless audio compression scheme. Apple never released any

diff --git a/media-sound/audicle/metadata.xml b/media-sound/audicle/metadata.xml
index 1da582d..4462559 100644
--- a/media-sound/audicle/metadata.xml
+++ b/media-sound/audicle/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		a potentially new type of audio programming environment that integrates
 		the programmability of the development environment with elements of the

diff --git a/media-sound/dbmeasure/metadata.xml b/media-sound/dbmeasure/metadata.xml
index d9cd2ca..097975e 100644
--- a/media-sound/dbmeasure/metadata.xml
+++ b/media-sound/dbmeasure/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-sound/declick/metadata.xml b/media-sound/declick/metadata.xml
index 9ee4d57..8e45d6e 100644
--- a/media-sound/declick/metadata.xml
+++ b/media-sound/declick/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		The main purpose of declick is the removal of digital clicks in the
 		input material. It is intended for the automatic removal of clicks

diff --git a/media-sound/lilycomp/metadata.xml b/media-sound/lilycomp/metadata.xml
index ddedef7..51915e9 100644
--- a/media-sound/lilycomp/metadata.xml
+++ b/media-sound/lilycomp/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">lilycomp</remote-id>
   </upstream>

diff --git a/media-sound/miniaudicle/metadata.xml b/media-sound/miniaudicle/metadata.xml
index 90d20a8..9655fb8 100644
--- a/media-sound/miniaudicle/metadata.xml
+++ b/media-sound/miniaudicle/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		a light-weight integrated development environment for the ChucK digital
 		audio programming language

diff --git a/media-sound/neroaac/metadata.xml b/media-sound/neroaac/metadata.xml
index 90c8025..ac040a9 100644
--- a/media-sound/neroaac/metadata.xml
+++ b/media-sound/neroaac/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Nero AAC reference quality MPEG-4 and 3GPP audio codec.
 	</longdescription>

diff --git a/media-sound/nted/metadata.xml b/media-sound/nted/metadata.xml
index a40624f..097975e 100644
--- a/media-sound/nted/metadata.xml
+++ b/media-sound/nted/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-sound/podracer/metadata.xml b/media-sound/podracer/metadata.xml
index 591d2d1..73d04bd 100644
--- a/media-sound/podracer/metadata.xml
+++ b/media-sound/podracer/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">podracer</remote-id>
 	</upstream>

diff --git a/media-sound/rgain/metadata.xml b/media-sound/rgain/metadata.xml
index 37ee884..ed88575 100644
--- a/media-sound/rgain/metadata.xml
+++ b/media-sound/rgain/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
 A set of Python modules and utility programmes to deal with Replay Gain information -- calculate it (with GStreamer), read and write it (with Mutagen). It has support for Ogg Vorbis (or probably anything stored in an Ogg container), Flac, WavPack (oddly enough) and MP3 (in different incarnations). There‘s also a command-line programme, replaygain, that works very similar to its like- named cousins, most prominently vorbisgain and mp3gain -- only that it works for all those supported formats alike. collectiongain on the other hand is a kind of fire-and-forget tool for big amounts of music files.
 	</longdescription>

diff --git a/media-sound/shnflacverify/metadata.xml b/media-sound/shnflacverify/metadata.xml
index 7589313..b1e1378 100644
--- a/media-sound/shnflacverify/metadata.xml
+++ b/media-sound/shnflacverify/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		This program helps manage the verification of checksums related to
 		Shorten (SHN) and FLAC audio files. This script provides a convenient

diff --git a/media-sound/tapestrea/metadata.xml b/media-sound/tapestrea/metadata.xml
index bf57f87..8fda7ae 100644
--- a/media-sound/tapestrea/metadata.xml
+++ b/media-sound/tapestrea/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		A set of new tools and techniques for sound design
 	</longdescription>

diff --git a/media-sound/vbrfixc/metadata.xml b/media-sound/vbrfixc/metadata.xml
index 63e33ea..a420376 100644
--- a/media-sound/vbrfixc/metadata.xml
+++ b/media-sound/vbrfixc/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Reconstructs MP3 files removing unwanted data, recreates VBR Tag with
 		seek information if it is VBR, can remove ID3v1/ID3v2/FHG/VBRI tags, can

diff --git a/media-video/arista/metadata.xml b/media-video/arista/metadata.xml
index 19b380c..5988138 100644
--- a/media-video/arista/metadata.xml
+++ b/media-video/arista/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <use>
 	<flag name="faac">Use external faac library for AAC encoding</flag>
 	<flag name="nautilus">Add an entry in the Nautilus context menu to transcode

diff --git a/media-video/bombono-dvd/metadata.xml b/media-video/bombono-dvd/metadata.xml
index 87ec310..80185d1 100644
--- a/media-video/bombono-dvd/metadata.xml
+++ b/media-video/bombono-dvd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="gnome">Use GVFS for desktop integration</flag>
 	</use>

diff --git a/media-video/coriander/metadata.xml b/media-video/coriander/metadata.xml
index 4b89161..e25999f 100644
--- a/media-video/coriander/metadata.xml
+++ b/media-video/coriander/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">coriander</remote-id>
 	</upstream>

diff --git a/media-video/openshot/metadata.xml b/media-video/openshot/metadata.xml
index 9076361..37dcdc7 100644
--- a/media-video/openshot/metadata.xml
+++ b/media-video/openshot/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>Free, open-source, non-linear video editor to create and edit videos and movies</longdescription>
 	<upstream>
 		<remote-id type="launchpad">openshot</remote-id>

diff --git a/media-video/pgcedit/metadata.xml b/media-video/pgcedit/metadata.xml
index 0b5dc87..0588040 100644
--- a/media-video/pgcedit/metadata.xml
+++ b/media-video/pgcedit/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="video">Add support for video preview</flag>
 	</use>

diff --git a/media-video/rovclock/metadata.xml b/media-video/rovclock/metadata.xml
index e2f79fa..303b5a0 100644
--- a/media-video/rovclock/metadata.xml
+++ b/media-video/rovclock/metadata.xml
@@ -6,7 +6,4 @@
   <email>se.witt@gmx.net</email>
   <name>Sebastian Witt</name>
 </maintainer>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/media-video/stk11xx/metadata.xml b/media-video/stk11xx/metadata.xml
index 7f4ff83..5103606 100644
--- a/media-video/stk11xx/metadata.xml
+++ b/media-video/stk11xx/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">syntekdriver</remote-id>
 	</upstream>

diff --git a/net-analyzer/authforce/metadata.xml b/net-analyzer/authforce/metadata.xml
index 91f4e72..097975e 100644
--- a/net-analyzer/authforce/metadata.xml
+++ b/net-analyzer/authforce/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-analyzer/bwm-ng/metadata.xml b/net-analyzer/bwm-ng/metadata.xml
index dabf967..78c4228 100644
--- a/net-analyzer/bwm-ng/metadata.xml
+++ b/net-analyzer/bwm-ng/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
 <flag name="csv">Enable csv output</flag>
 <flag name="html">Enable html output</flag>

diff --git a/net-analyzer/gspoof/metadata.xml b/net-analyzer/gspoof/metadata.xml
index 4ce3449..d108cf8 100644
--- a/net-analyzer/gspoof/metadata.xml
+++ b/net-analyzer/gspoof/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">gspoof</remote-id>
   </upstream>

diff --git a/net-analyzer/mk-livestatus/metadata.xml b/net-analyzer/mk-livestatus/metadata.xml
index 91f4e72..097975e 100644
--- a/net-analyzer/mk-livestatus/metadata.xml
+++ b/net-analyzer/mk-livestatus/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-analyzer/nagtrap/metadata.xml b/net-analyzer/nagtrap/metadata.xml
index ff62877..097975e 100644
--- a/net-analyzer/nagtrap/metadata.xml
+++ b/net-analyzer/nagtrap/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-analyzer/nagvis/metadata.xml b/net-analyzer/nagvis/metadata.xml
index 1379462..ed85ea4 100644
--- a/net-analyzer/nagvis/metadata.xml
+++ b/net-analyzer/nagvis/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="automap">Enable automated map generation using <pkg>media-gfx/graphviz</pkg></flag>
   </use>

diff --git a/net-analyzer/nikto/metadata.xml b/net-analyzer/nikto/metadata.xml
index 1470e03..097975e 100644
--- a/net-analyzer/nikto/metadata.xml
+++ b/net-analyzer/nikto/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/net-analyzer/nmbscan/metadata.xml b/net-analyzer/nmbscan/metadata.xml
index 1cd1c6c..5169cd7 100644
--- a/net-analyzer/nmbscan/metadata.xml
+++ b/net-analyzer/nmbscan/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>
 nmbscan scans the shares of a SMB network, using the NMB and SMB protocols.
 It is useful for acquiring information on a local area network for such purposes as security auditing.

diff --git a/net-analyzer/portbunny/metadata.xml b/net-analyzer/portbunny/metadata.xml
index a40624f..097975e 100644
--- a/net-analyzer/portbunny/metadata.xml
+++ b/net-analyzer/portbunny/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-analyzer/prelude-nessus/metadata.xml b/net-analyzer/prelude-nessus/metadata.xml
index ff62877..097975e 100644
--- a/net-analyzer/prelude-nessus/metadata.xml
+++ b/net-analyzer/prelude-nessus/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-analyzer/rtpbreak/metadata.xml b/net-analyzer/rtpbreak/metadata.xml
index ff62877..097975e 100644
--- a/net-analyzer/rtpbreak/metadata.xml
+++ b/net-analyzer/rtpbreak/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-analyzer/squidview/metadata.xml b/net-analyzer/squidview/metadata.xml
index 4538a68..097975e 100644
--- a/net-analyzer/squidview/metadata.xml
+++ b/net-analyzer/squidview/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/net-dns/bind-dns-keygen/metadata.xml b/net-dns/bind-dns-keygen/metadata.xml
index 59e2b8f..097975e 100644
--- a/net-dns/bind-dns-keygen/metadata.xml
+++ b/net-dns/bind-dns-keygen/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-dns/dnshijacker/metadata.xml b/net-dns/dnshijacker/metadata.xml
index f9d50da..097975e 100644
--- a/net-dns/dnshijacker/metadata.xml
+++ b/net-dns/dnshijacker/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-dns/dnswalk/metadata.xml b/net-dns/dnswalk/metadata.xml
index f02292e..c9b16c2 100644
--- a/net-dns/dnswalk/metadata.xml
+++ b/net-dns/dnswalk/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dnswalk</remote-id>
 	</upstream>

diff --git a/net-dns/ez-ipupdate/metadata.xml b/net-dns/ez-ipupdate/metadata.xml
index b63524a..6a37e5f 100644
--- a/net-dns/ez-ipupdate/metadata.xml
+++ b/net-dns/ez-ipupdate/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Ez-ipupdate is a client for the dynamic IP service offered by
 		http://www.ez-ip.net. It has several options and is quite complete.

diff --git a/net-dns/fpdns/metadata.xml b/net-dns/fpdns/metadata.xml
index dab638c..b60fcaa 100644
--- a/net-dns/fpdns/metadata.xml
+++ b/net-dns/fpdns/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 A nameserver basically responds to a query. Interoperability is an obvious
 requirement here. The standard protocol behaviour of different DNS

diff --git a/net-dns/hesinfo/metadata.xml b/net-dns/hesinfo/metadata.xml
index 0f4d275..f3b74e3 100644
--- a/net-dns/hesinfo/metadata.xml
+++ b/net-dns/hesinfo/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>

diff --git a/net-dns/hesiod/metadata.xml b/net-dns/hesiod/metadata.xml
index 91f4e72..097975e 100644
--- a/net-dns/hesiod/metadata.xml
+++ b/net-dns/hesiod/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-dns/maradns/metadata.xml b/net-dns/maradns/metadata.xml
index 41687fa..ae67a45 100644
--- a/net-dns/maradns/metadata.xml
+++ b/net-dns/maradns/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
   <flag name="authonly">Allows one to build only authoritative DNS server</flag>
 </use>

diff --git a/net-dns/mydns/metadata.xml b/net-dns/mydns/metadata.xml
index 4413a51..f71f201 100644
--- a/net-dns/mydns/metadata.xml
+++ b/net-dns/mydns/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="alias">Enable David Phillips aliasing</flag>
 		<flag name="status">Enable the STATUS opcode to check server status</flag>

diff --git a/net-dns/odsclient/metadata.xml b/net-dns/odsclient/metadata.xml
index 91f4e72..097975e 100644
--- a/net-dns/odsclient/metadata.xml
+++ b/net-dns/odsclient/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-dns/sheerdns/metadata.xml b/net-dns/sheerdns/metadata.xml
index 319bf47..61e96df 100644
--- a/net-dns/sheerdns/metadata.xml
+++ b/net-dns/sheerdns/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
   <longdescription>
     SheerDNS was written to be a simple replacement master DNS server that can
     be used where atomic updates are required. Because it stores each record in

diff --git a/net-dns/tinystats/metadata.xml b/net-dns/tinystats/metadata.xml
index 04f6440..bf3f3c1 100644
--- a/net-dns/tinystats/metadata.xml
+++ b/net-dns/tinystats/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">tinystats is a filter that reads tinydns logs and stores stats
 about query types and errors of your authoritative dns.</longdescription>
 </pkgmetadata>

diff --git a/net-dns/updatedd/metadata.xml b/net-dns/updatedd/metadata.xml
index bb187b4..3d84bfb 100644
--- a/net-dns/updatedd/metadata.xml
+++ b/net-dns/updatedd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription/>
 </pkgmetadata>

diff --git a/net-dns/valtz/metadata.xml b/net-dns/valtz/metadata.xml
index 9cc4bae..47512ca 100644
--- a/net-dns/valtz/metadata.xml
+++ b/net-dns/valtz/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>Simple validation tool for tinydns-data zonefiles. Also able to
 filter file(s) from errors, not allowed zones and not allowed record types.</longdescription>
 </pkgmetadata>

diff --git a/net-firewall/dshieldpy/metadata.xml b/net-firewall/dshieldpy/metadata.xml
index 798fd62..f9236ad 100644
--- a/net-firewall/dshieldpy/metadata.xml
+++ b/net-firewall/dshieldpy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">dshieldpy</remote-id>
 	</upstream>

diff --git a/net-firewall/ferm/metadata.xml b/net-firewall/ferm/metadata.xml
index 91f4e72..097975e 100644
--- a/net-firewall/ferm/metadata.xml
+++ b/net-firewall/ferm/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-firewall/fwanalog/metadata.xml b/net-firewall/fwanalog/metadata.xml
index f9d50da..097975e 100644
--- a/net-firewall/fwanalog/metadata.xml
+++ b/net-firewall/fwanalog/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-firewall/fwbuilder/metadata.xml b/net-firewall/fwbuilder/metadata.xml
index bfd104c..7ecef9c 100644
--- a/net-firewall/fwbuilder/metadata.xml
+++ b/net-firewall/fwbuilder/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fwbuilder</remote-id>
 	</upstream>

diff --git a/net-firewall/fwipsec/metadata.xml b/net-firewall/fwipsec/metadata.xml
index 5de94b6..45df662 100644
--- a/net-firewall/fwipsec/metadata.xml
+++ b/net-firewall/fwipsec/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fwipsec</remote-id>
 	</upstream>

diff --git a/net-firewall/ipkungfu/metadata.xml b/net-firewall/ipkungfu/metadata.xml
index 1b0f1b3..aa2ddc1 100644
--- a/net-firewall/ipkungfu/metadata.xml
+++ b/net-firewall/ipkungfu/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<longdescription lang="en">
 		ipkungfu is a nice iptables firewall script
 	</longdescription>

diff --git a/net-firewall/quicktables/metadata.xml b/net-firewall/quicktables/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-firewall/quicktables/metadata.xml
+++ b/net-firewall/quicktables/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-firewall/sanewall/metadata.xml b/net-firewall/sanewall/metadata.xml
index 91f4e72..097975e 100644
--- a/net-firewall/sanewall/metadata.xml
+++ b/net-firewall/sanewall/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-firewall/shapecfg/metadata.xml b/net-firewall/shapecfg/metadata.xml
index 7793538..b70d254 100644
--- a/net-firewall/shapecfg/metadata.xml
+++ b/net-firewall/shapecfg/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cbqinit</remote-id>
 	</upstream>

diff --git a/net-fs/tahoe-lafs/metadata.xml b/net-fs/tahoe-lafs/metadata.xml
index 967e7e6..b1dda2e 100644
--- a/net-fs/tahoe-lafs/metadata.xml
+++ b/net-fs/tahoe-lafs/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Tahoe-LAFS is a Free and Open cloud storage system. It
 		distributes your data across multiple servers. Even if some

diff --git a/net-ftp/axyftp/metadata.xml b/net-ftp/axyftp/metadata.xml
index 0b8e916..7b9b9d4 100644
--- a/net-ftp/axyftp/metadata.xml
+++ b/net-ftp/axyftp/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="freecode">axyftp</remote-id>
 	</upstream>

diff --git a/net-ftp/ftpbase/metadata.xml b/net-ftp/ftpbase/metadata.xml
index f417ba2..f72ecd1 100644
--- a/net-ftp/ftpbase/metadata.xml
+++ b/net-ftp/ftpbase/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		FTP base package
 	</longdescription>

diff --git a/net-ftp/gproftpd/metadata.xml b/net-ftp/gproftpd/metadata.xml
index 91f4e72..097975e 100644
--- a/net-ftp/gproftpd/metadata.xml
+++ b/net-ftp/gproftpd/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-ftp/profxp/metadata.xml b/net-ftp/profxp/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-ftp/profxp/metadata.xml
+++ b/net-ftp/profxp/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-ftp/pureadmin/metadata.xml b/net-ftp/pureadmin/metadata.xml
index 34c9a32..2d95caf 100644
--- a/net-ftp/pureadmin/metadata.xml
+++ b/net-ftp/pureadmin/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>Graphical tool used to make the management of PureFTPd a little easier.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">purify</remote-id>

diff --git a/net-ftp/weex/metadata.xml b/net-ftp/weex/metadata.xml
index ca1c1c5..05b9aef 100644
--- a/net-ftp/weex/metadata.xml
+++ b/net-ftp/weex/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">weex</remote-id>
   </upstream>

diff --git a/net-im/coccinella/metadata.xml b/net-im/coccinella/metadata.xml
index df957ab..7e0a1dc 100644
--- a/net-im/coccinella/metadata.xml
+++ b/net-im/coccinella/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
 Coccinella is a Jabber client with a whiteboard. The whiteboard is a shared
 desktop which supports text, drawings, images, and multimedia in a number of

diff --git a/net-im/dianara/metadata.xml b/net-im/dianara/metadata.xml
index 49dad4e..89f6c1f 100644
--- a/net-im/dianara/metadata.xml
+++ b/net-im/dianara/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<bugs-to>https://savannah.nongnu.org/bugs/?group=dianara</bugs-to>
 	</upstream>

diff --git a/net-im/librvp/metadata.xml b/net-im/librvp/metadata.xml
index 282b340..d678d50 100644
--- a/net-im/librvp/metadata.xml
+++ b/net-im/librvp/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		This is an RVP (Microsoft Exchange Instant Messaging) plugin for
 		Gaim 1.x and Pidgin. It's based on some work done at Lucent and

diff --git a/net-im/minbif/metadata.xml b/net-im/minbif/metadata.xml
index 91f4e72..097975e 100644
--- a/net-im/minbif/metadata.xml
+++ b/net-im/minbif/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-im/pork/metadata.xml b/net-im/pork/metadata.xml
index 759bb26..7a9234d 100644
--- a/net-im/pork/metadata.xml
+++ b/net-im/pork/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 	Pork is an AIM client based on the GAIM libraries with an interface similar to IRCII.
 </longdescription>

diff --git a/net-irc/bip/metadata.xml b/net-irc/bip/metadata.xml
index 29b526c..fe4030b 100644
--- a/net-irc/bip/metadata.xml
+++ b/net-irc/bip/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Bip is an IRC proxy, which means it keeps connected to your preferred
 		IRC servers, can store the logs for you, and even send them back to your IRC

diff --git a/net-irc/irssi-xmpp/metadata.xml b/net-irc/irssi-xmpp/metadata.xml
index 3d31a69..097975e 100644
--- a/net-irc/irssi-xmpp/metadata.xml
+++ b/net-irc/irssi-xmpp/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-   <maintainer>
-	  <email>maintainer-needed@gentoo.org</email>
-   </maintainer>
 </pkgmetadata>

diff --git a/net-libs/adns/metadata.xml b/net-libs/adns/metadata.xml
index 59e2b8f..097975e 100644
--- a/net-libs/adns/metadata.xml
+++ b/net-libs/adns/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-libs/ccrtp/metadata.xml b/net-libs/ccrtp/metadata.xml
index 4538a68..097975e 100644
--- a/net-libs/ccrtp/metadata.xml
+++ b/net-libs/ccrtp/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/net-libs/dhcpcd-dbus/metadata.xml b/net-libs/dhcpcd-dbus/metadata.xml
index 91f4e72..097975e 100644
--- a/net-libs/dhcpcd-dbus/metadata.xml
+++ b/net-libs/dhcpcd-dbus/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-libs/h323plus/metadata.xml b/net-libs/h323plus/metadata.xml
index f34428b..0164217 100644
--- a/net-libs/h323plus/metadata.xml
+++ b/net-libs/h323plus/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="aec">Enable acoustic echo cancellation</flag>
     <flag name="sound">Enable audio codecs</flag>

diff --git a/net-libs/libasyncns/metadata.xml b/net-libs/libasyncns/metadata.xml
index ff62877..097975e 100644
--- a/net-libs/libasyncns/metadata.xml
+++ b/net-libs/libasyncns/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-libs/libdexter/metadata.xml b/net-libs/libdexter/metadata.xml
index f7d5ca7..8f78286 100644
--- a/net-libs/libdexter/metadata.xml
+++ b/net-libs/libdexter/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">libdexter</remote-id>
 	</upstream>

diff --git a/net-libs/libeXosip/metadata.xml b/net-libs/libeXosip/metadata.xml
index aed8a34..30c7dd7 100644
--- a/net-libs/libeXosip/metadata.xml
+++ b/net-libs/libeXosip/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
   <flag name="srv">enable support for SRV records DNS queries</flag>
 </use>

diff --git a/net-libs/libgcal/metadata.xml b/net-libs/libgcal/metadata.xml
index f4bf8ee..6f53587 100644
--- a/net-libs/libgcal/metadata.xml
+++ b/net-libs/libgcal/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">libgcal</remote-id>
 	</upstream>

diff --git a/net-libs/libident/metadata.xml b/net-libs/libident/metadata.xml
index 59e2b8f..097975e 100644
--- a/net-libs/libident/metadata.xml
+++ b/net-libs/libident/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-libs/libmapi/metadata.xml b/net-libs/libmapi/metadata.xml
index 91f4e72..097975e 100644
--- a/net-libs/libmapi/metadata.xml
+++ b/net-libs/libmapi/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-libs/libmrss/metadata.xml b/net-libs/libmrss/metadata.xml
index 91f4e72..097975e 100644
--- a/net-libs/libmrss/metadata.xml
+++ b/net-libs/libmrss/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-libs/libnxml/metadata.xml b/net-libs/libnxml/metadata.xml
index 91f4e72..097975e 100644
--- a/net-libs/libnxml/metadata.xml
+++ b/net-libs/libnxml/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-libs/liboauth/metadata.xml b/net-libs/liboauth/metadata.xml
index 6b3cdb6..699b6f6 100644
--- a/net-libs/liboauth/metadata.xml
+++ b/net-libs/liboauth/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="nss">
       Use Mozilla NSS (<pkg>dev-libs/nss</pkg>) as hash library; if

diff --git a/net-libs/libopkele/metadata.xml b/net-libs/libopkele/metadata.xml
index 4538a68..097975e 100644
--- a/net-libs/libopkele/metadata.xml
+++ b/net-libs/libopkele/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/net-libs/libosip/metadata.xml b/net-libs/libosip/metadata.xml
index 4538a68..097975e 100644
--- a/net-libs/libosip/metadata.xml
+++ b/net-libs/libosip/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/net-libs/libs3/metadata.xml b/net-libs/libs3/metadata.xml
index 91f4e72..097975e 100644
--- a/net-libs/libs3/metadata.xml
+++ b/net-libs/libs3/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-libs/libzrtpcpp/metadata.xml b/net-libs/libzrtpcpp/metadata.xml
index 4538a68..097975e 100644
--- a/net-libs/libzrtpcpp/metadata.xml
+++ b/net-libs/libzrtpcpp/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/net-libs/meanwhile/metadata.xml b/net-libs/meanwhile/metadata.xml
index 1985a40..5e624ad 100644
--- a/net-libs/meanwhile/metadata.xml
+++ b/net-libs/meanwhile/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">meanwhile</remote-id>
 	</upstream>

diff --git a/net-libs/opal/metadata.xml b/net-libs/opal/metadata.xml
index 8704acb..bd893fa 100644
--- a/net-libs/opal/metadata.xml
+++ b/net-libs/opal/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="capi">Enable CAPI support</flag>
     <flag name="celt">Enable CELT ultra-low delay audio codec</flag>

diff --git a/net-libs/ptlib/metadata.xml b/net-libs/ptlib/metadata.xml
index 3340729..9938f4f 100644
--- a/net-libs/ptlib/metadata.xml
+++ b/net-libs/ptlib/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="asn">Enable ASN decoding/encoding support</flag>
 		<flag name="dtmf">Enable DTMF encoding/decoding support</flag>

diff --git a/net-libs/roadrunner/metadata.xml b/net-libs/roadrunner/metadata.xml
index ff62877..097975e 100644
--- a/net-libs/roadrunner/metadata.xml
+++ b/net-libs/roadrunner/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-libs/txtorcon/metadata.xml b/net-libs/txtorcon/metadata.xml
index a79a9c4..8eb7b63 100644
--- a/net-libs/txtorcon/metadata.xml
+++ b/net-libs/txtorcon/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="pypi">txtorcon</remote-id>
     <remote-id type="github">meejah/txtorcon</remote-id>

diff --git a/net-libs/udns/metadata.xml b/net-libs/udns/metadata.xml
index 93d64bd..2b27d0a 100644
--- a/net-libs/udns/metadata.xml
+++ b/net-libs/udns/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
 	<flag name="tools">Build and install dnsget, ex-rdns and rblcheck tools</flag>
 </use>

diff --git a/net-libs/vanessa-mcast/metadata.xml b/net-libs/vanessa-mcast/metadata.xml
index 46db27f..097975e 100644
--- a/net-libs/vanessa-mcast/metadata.xml
+++ b/net-libs/vanessa-mcast/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer>
-                <email>maintainer-needed@gentoo.org</email>
-        </maintainer>
 </pkgmetadata>

diff --git a/net-mail/checkpw/metadata.xml b/net-mail/checkpw/metadata.xml
index fdf0b60..aec0843 100644
--- a/net-mail/checkpw/metadata.xml
+++ b/net-mail/checkpw/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>checkpw checks password which is stored in a file in the Maildir directory.
 The file has read and write permissions to the user only.
 checkpw checks real user's password. For virtual users, vucheckpw is available

diff --git a/net-mail/libdbx/metadata.xml b/net-mail/libdbx/metadata.xml
index 0d3d6f9..f1d05ea 100644
--- a/net-mail/libdbx/metadata.xml
+++ b/net-mail/libdbx/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">ol2mbox</remote-id>
   </upstream>

diff --git a/net-mail/renattach/metadata.xml b/net-mail/renattach/metadata.xml
index 46db27f..097975e 100644
--- a/net-mail/renattach/metadata.xml
+++ b/net-mail/renattach/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-        <maintainer>
-                <email>maintainer-needed@gentoo.org</email>
-        </maintainer>
 </pkgmetadata>

diff --git a/net-mail/vacation/metadata.xml b/net-mail/vacation/metadata.xml
index f37776b..6aa73fd 100644
--- a/net-mail/vacation/metadata.xml
+++ b/net-mail/vacation/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">vacation</remote-id>
   </upstream>

diff --git a/net-misc/6tunnel/metadata.xml b/net-misc/6tunnel/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/6tunnel/metadata.xml
+++ b/net-misc/6tunnel/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/apt-proxy/metadata.xml b/net-misc/apt-proxy/metadata.xml
index f270708..231a2bb 100644
--- a/net-misc/apt-proxy/metadata.xml
+++ b/net-misc/apt-proxy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">apt-proxy</remote-id>
 	</upstream>

diff --git a/net-misc/blinkperl/metadata.xml b/net-misc/blinkperl/metadata.xml
index 2f6c640..8b81977 100644
--- a/net-misc/blinkperl/metadata.xml
+++ b/net-misc/blinkperl/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">blinkserv</remote-id>
 	</upstream>

diff --git a/net-misc/capi4hylafax/metadata.xml b/net-misc/capi4hylafax/metadata.xml
index ed4bdf3..a377b0d 100644
--- a/net-misc/capi4hylafax/metadata.xml
+++ b/net-misc/capi4hylafax/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		capi4hylafax adds a faxcapi modem to the hylafax enviroment. So you can
 		send and receive FAX documents with CAPI 2.0 fax controllers via a

diff --git a/net-misc/cbqinit/metadata.xml b/net-misc/cbqinit/metadata.xml
index 7793538..b70d254 100644
--- a/net-misc/cbqinit/metadata.xml
+++ b/net-misc/cbqinit/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">cbqinit</remote-id>
 	</upstream>

diff --git a/net-misc/cgterm/metadata.xml b/net-misc/cgterm/metadata.xml
index 59e2b8f..097975e 100644
--- a/net-misc/cgterm/metadata.xml
+++ b/net-misc/cgterm/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/clockspeed-conf/metadata.xml b/net-misc/clockspeed-conf/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/clockspeed-conf/metadata.xml
+++ b/net-misc/clockspeed-conf/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/clockspeed/metadata.xml b/net-misc/clockspeed/metadata.xml
index 36fe923..4e19930 100644
--- a/net-misc/clockspeed/metadata.xml
+++ b/net-misc/clockspeed/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 clockspeed uses a hardware tick counter to compensate for a persistently fast or
 slow system clock. Given a few time measurements from a reliable source, it

diff --git a/net-misc/datapipe/metadata.xml b/net-misc/datapipe/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/datapipe/metadata.xml
+++ b/net-misc/datapipe/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/efax/metadata.xml b/net-misc/efax/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/efax/metadata.xml
+++ b/net-misc/efax/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/fakeidentd/metadata.xml b/net-misc/fakeidentd/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/fakeidentd/metadata.xml
+++ b/net-misc/fakeidentd/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/fmirror/metadata.xml b/net-misc/fmirror/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/fmirror/metadata.xml
+++ b/net-misc/fmirror/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/gcap/metadata.xml b/net-misc/gcap/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/gcap/metadata.xml
+++ b/net-misc/gcap/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/getdate/metadata.xml b/net-misc/getdate/metadata.xml
index 59e2b8f..097975e 100644
--- a/net-misc/getdate/metadata.xml
+++ b/net-misc/getdate/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/gip/metadata.xml b/net-misc/gip/metadata.xml
index 6037f68..bd94cd0 100644
--- a/net-misc/gip/metadata.xml
+++ b/net-misc/gip/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Gip is a nice GNOME GUI for making IP address based calculations. For
 		example, it can display IP addresses in binary format. Also, it is

diff --git a/net-misc/goog-sitemapgen/metadata.xml b/net-misc/goog-sitemapgen/metadata.xml
index 0e811a4..c60d05b 100644
--- a/net-misc/goog-sitemapgen/metadata.xml
+++ b/net-misc/goog-sitemapgen/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>Sitemap Gen is a python script which will generate an xml Sitemap for
 		your web site.
 		The sitemap_gen.py script analyzes your web server and generates one or

diff --git a/net-misc/hashcash/metadata.xml b/net-misc/hashcash/metadata.xml
index 59e2b8f..097975e 100644
--- a/net-misc/hashcash/metadata.xml
+++ b/net-misc/hashcash/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/hlfl/metadata.xml b/net-misc/hlfl/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/hlfl/metadata.xml
+++ b/net-misc/hlfl/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/htbinit/metadata.xml b/net-misc/htbinit/metadata.xml
index dda213e..0321551 100644
--- a/net-misc/htbinit/metadata.xml
+++ b/net-misc/htbinit/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
 HTB.init is a shell script derived from CBQ.init that allows for easy setup of HTB-based traffic control on Linux. HTB (Hierachical Token Bucket) is a new queueing discipline which attempts to address the weaknesses of current CBQ implementation.
 </longdescription>

diff --git a/net-misc/httptunnel/metadata.xml b/net-misc/httptunnel/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/httptunnel/metadata.xml
+++ b/net-misc/httptunnel/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/htun/metadata.xml b/net-misc/htun/metadata.xml
index 59e2b8f..097975e 100644
--- a/net-misc/htun/metadata.xml
+++ b/net-misc/htun/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/identicurse/metadata.xml b/net-misc/identicurse/metadata.xml
index 6062d6b..1f8ab10 100644
--- a/net-misc/identicurse/metadata.xml
+++ b/net-misc/identicurse/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A simple Identi.ca client with a curses-based UI.</longdescription>
 </pkgmetadata>

diff --git a/net-misc/igmpproxy/metadata.xml b/net-misc/igmpproxy/metadata.xml
index a05381e..8b03eb2 100644
--- a/net-misc/igmpproxy/metadata.xml
+++ b/net-misc/igmpproxy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		IGMPproxy is a simple dynamic Multicast Routing Daemon using only IGMP signalling.
 		It's intended for simple forwarding of Multicast traffic between networks.

diff --git a/net-misc/ipsorcery/metadata.xml b/net-misc/ipsorcery/metadata.xml
index bb187b4..3d84bfb 100644
--- a/net-misc/ipsorcery/metadata.xml
+++ b/net-misc/ipsorcery/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription/>
 </pkgmetadata>

diff --git a/net-misc/ipsvd/metadata.xml b/net-misc/ipsvd/metadata.xml
index 7af589e..2970538 100644
--- a/net-misc/ipsvd/metadata.xml
+++ b/net-misc/ipsvd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>
 ipsvd is a set of internet protocol service daemons for Unix. It currently
 includes a TCP/IP service daemon, an SSLv3 TCP/IP service daemon (Linux and

diff --git a/net-misc/ipx-utils/metadata.xml b/net-misc/ipx-utils/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/ipx-utils/metadata.xml
+++ b/net-misc/ipx-utils/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/italc/metadata.xml b/net-misc/italc/metadata.xml
index f8f1905..7bd1b5c 100644
--- a/net-misc/italc/metadata.xml
+++ b/net-misc/italc/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">italc</remote-id>
 	</upstream>

diff --git a/net-misc/jigdo/metadata.xml b/net-misc/jigdo/metadata.xml
index 72dbea8..5d8328b 100644
--- a/net-misc/jigdo/metadata.xml
+++ b/net-misc/jigdo/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		Jigsaw Download, or jigdo for short, is a tool designed to ease the
 		distribution of very large files over the internet, for example CD or

diff --git a/net-misc/jlj/metadata.xml b/net-misc/jlj/metadata.xml
index c75a312..097975e 100644
--- a/net-misc/jlj/metadata.xml
+++ b/net-misc/jlj/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default Assignee for Orphaned Packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/jumpgate/metadata.xml b/net-misc/jumpgate/metadata.xml
index 3cc3c26..9f0f7c8 100644
--- a/net-misc/jumpgate/metadata.xml
+++ b/net-misc/jumpgate/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">jumpgate</remote-id>
   </upstream>

diff --git a/net-misc/kumofs/metadata.xml b/net-misc/kumofs/metadata.xml
index 7221ae7..77fd3a5 100644
--- a/net-misc/kumofs/metadata.xml
+++ b/net-misc/kumofs/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">etolabo/kumofs</remote-id>
 	</upstream>

diff --git a/net-misc/lambdamoo/metadata.xml b/net-misc/lambdamoo/metadata.xml
index 602d453..cdfe259 100644
--- a/net-misc/lambdamoo/metadata.xml
+++ b/net-misc/lambdamoo/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">lambdamoo</remote-id>
 	</upstream>

diff --git a/net-misc/linux-identd/metadata.xml b/net-misc/linux-identd/metadata.xml
index f9d50da..097975e 100644
--- a/net-misc/linux-identd/metadata.xml
+++ b/net-misc/linux-identd/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/liveice/metadata.xml b/net-misc/liveice/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/liveice/metadata.xml
+++ b/net-misc/liveice/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/midentd/metadata.xml b/net-misc/midentd/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/midentd/metadata.xml
+++ b/net-misc/midentd/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/mknbi/metadata.xml b/net-misc/mknbi/metadata.xml
index adc9ebf..dc9728a 100644
--- a/net-misc/mknbi/metadata.xml
+++ b/net-misc/mknbi/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">etherboot</remote-id>
 	</upstream>

diff --git a/net-misc/monmotha/metadata.xml b/net-misc/monmotha/metadata.xml
index 59e2b8f..097975e 100644
--- a/net-misc/monmotha/metadata.xml
+++ b/net-misc/monmotha/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/mrouted/metadata.xml b/net-misc/mrouted/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/mrouted/metadata.xml
+++ b/net-misc/mrouted/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/netkit-routed/metadata.xml b/net-misc/netkit-routed/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/netkit-routed/metadata.xml
+++ b/net-misc/netkit-routed/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/netkit-rusers/metadata.xml b/net-misc/netkit-rusers/metadata.xml
index 59e2b8f..097975e 100644
--- a/net-misc/netkit-rusers/metadata.xml
+++ b/net-misc/netkit-rusers/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/netkit-rwall/metadata.xml b/net-misc/netkit-rwall/metadata.xml
index 59e2b8f..097975e 100644
--- a/net-misc/netkit-rwall/metadata.xml
+++ b/net-misc/netkit-rwall/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/netkit-talk/metadata.xml b/net-misc/netkit-talk/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/netkit-talk/metadata.xml
+++ b/net-misc/netkit-talk/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/netkit-telnetd/metadata.xml b/net-misc/netkit-telnetd/metadata.xml
index 2df7436..668d8df 100644
--- a/net-misc/netkit-telnetd/metadata.xml
+++ b/net-misc/netkit-telnetd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>The telnetd program is a server which supports the DARPA telnet interactive communication protocol.</longdescription>
 	<upstream>
 		<remote-id type="launchpad">netkit-telnet</remote-id>

diff --git a/net-misc/netkit-timed/metadata.xml b/net-misc/netkit-timed/metadata.xml
index f9d50da..097975e 100644
--- a/net-misc/netkit-timed/metadata.xml
+++ b/net-misc/netkit-timed/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/netpipe/metadata.xml b/net-misc/netpipe/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/netpipe/metadata.xml
+++ b/net-misc/netpipe/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/netprofiles-ims/metadata.xml b/net-misc/netprofiles-ims/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/netprofiles-ims/metadata.xml
+++ b/net-misc/netprofiles-ims/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/netsed/metadata.xml b/net-misc/netsed/metadata.xml
index 62d3535..f137a73 100644
--- a/net-misc/netsed/metadata.xml
+++ b/net-misc/netsed/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="freshmeat">netsed</remote-id>
   </upstream>

diff --git a/net-misc/ng-utils/metadata.xml b/net-misc/ng-utils/metadata.xml
index a40624f..097975e 100644
--- a/net-misc/ng-utils/metadata.xml
+++ b/net-misc/ng-utils/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/nut-monitor/metadata.xml b/net-misc/nut-monitor/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/nut-monitor/metadata.xml
+++ b/net-misc/nut-monitor/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/orbited/metadata.xml b/net-misc/orbited/metadata.xml
index 45dda01..2660ddd 100644
--- a/net-misc/orbited/metadata.xml
+++ b/net-misc/orbited/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">orbited</remote-id>
 	</upstream>

diff --git a/net-misc/pen/metadata.xml b/net-misc/pen/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/pen/metadata.xml
+++ b/net-misc/pen/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/pimpd/metadata.xml b/net-misc/pimpd/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/pimpd/metadata.xml
+++ b/net-misc/pimpd/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/portfwd/metadata.xml b/net-misc/portfwd/metadata.xml
index ff96ba5..6a78eda 100644
--- a/net-misc/portfwd/metadata.xml
+++ b/net-misc/portfwd/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<longdescription lang="en">
 		Portfwd stands for port forwarding daemon. It's a small C++ utility
 		which forwards incoming TCP connections and/or UDP packets to remote

diff --git a/net-misc/proxyper/metadata.xml b/net-misc/proxyper/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/proxyper/metadata.xml
+++ b/net-misc/proxyper/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/puf/metadata.xml b/net-misc/puf/metadata.xml
index 2862fda..abdc70e 100644
--- a/net-misc/puf/metadata.xml
+++ b/net-misc/puf/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">puf</remote-id>
 	</upstream>

diff --git a/net-misc/pump/metadata.xml b/net-misc/pump/metadata.xml
index b1f88f3..71ed018 100644
--- a/net-misc/pump/metadata.xml
+++ b/net-misc/pump/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		A DHCP/BOOTP client
 	</longdescription>

diff --git a/net-misc/pytvshows/metadata.xml b/net-misc/pytvshows/metadata.xml
index 67f1fb4..def8d93 100644
--- a/net-misc/pytvshows/metadata.xml
+++ b/net-misc/pytvshows/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">pytvshows</remote-id>
 	</upstream>

diff --git a/net-misc/raccess/metadata.xml b/net-misc/raccess/metadata.xml
index f9d50da..097975e 100644
--- a/net-misc/raccess/metadata.xml
+++ b/net-misc/raccess/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/rinetd/metadata.xml b/net-misc/rinetd/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/rinetd/metadata.xml
+++ b/net-misc/rinetd/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/rwbs/metadata.xml b/net-misc/rwbs/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/rwbs/metadata.xml
+++ b/net-misc/rwbs/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/rwhoisd/metadata.xml b/net-misc/rwhoisd/metadata.xml
index 4ef3569..671195e 100644
--- a/net-misc/rwhoisd/metadata.xml
+++ b/net-misc/rwhoisd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>rwhois server from ARIN</longdescription>
 </pkgmetadata>

diff --git a/net-misc/scponly/metadata.xml b/net-misc/scponly/metadata.xml
index 0237ba9..9bc88a3 100644
--- a/net-misc/scponly/metadata.xml
+++ b/net-misc/scponly/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		scponly is an alternative 'shell' (of sorts) for system administrators
 		who would like to provide access to remote users to both read and write

diff --git a/net-misc/selfdhcp/metadata.xml b/net-misc/selfdhcp/metadata.xml
index e36ea64..1ebe30a 100644
--- a/net-misc/selfdhcp/metadata.xml
+++ b/net-misc/selfdhcp/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<description>This package lacks a primary herd or maintainer.</description>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">selfdhcp</remote-id>
 	</upstream>

diff --git a/net-misc/sendfile/metadata.xml b/net-misc/sendfile/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/sendfile/metadata.xml
+++ b/net-misc/sendfile/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/ser/metadata.xml b/net-misc/ser/metadata.xml
index 4538a68..097975e 100644
--- a/net-misc/ser/metadata.xml
+++ b/net-misc/ser/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/net-misc/shigofumi/metadata.xml b/net-misc/shigofumi/metadata.xml
index b1eba2b..355f949 100644
--- a/net-misc/shigofumi/metadata.xml
+++ b/net-misc/shigofumi/metadata.xml
@@ -5,7 +5,4 @@
 	This is command line oriented client for ISDS (Informační systém datových
 	schránek / Data Box Information System) based on libisds library.
 </longdescription>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/sipcalc/metadata.xml b/net-misc/sipcalc/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/sipcalc/metadata.xml
+++ b/net-misc/sipcalc/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/siproxd/metadata.xml b/net-misc/siproxd/metadata.xml
index d2e9ec4..4b2806c 100644
--- a/net-misc/siproxd/metadata.xml
+++ b/net-misc/siproxd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">siproxd</remote-id>
 	</upstream>

diff --git a/net-misc/sjphone/metadata.xml b/net-misc/sjphone/metadata.xml
index 4538a68..097975e 100644
--- a/net-misc/sjphone/metadata.xml
+++ b/net-misc/sjphone/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/net-misc/snarf/metadata.xml b/net-misc/snarf/metadata.xml
index 5b3bf5b..0911086 100644
--- a/net-misc/snarf/metadata.xml
+++ b/net-misc/snarf/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		snarf is a command line resource grabber. It can transfer files through
 		the http, gopher, finger, and ftp protocols without user interaction.

diff --git a/net-misc/sock/metadata.xml b/net-misc/sock/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/sock/metadata.xml
+++ b/net-misc/sock/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/sparkleshare/metadata.xml b/net-misc/sparkleshare/metadata.xml
index ac65bf7..9dfec61 100644
--- a/net-misc/sparkleshare/metadata.xml
+++ b/net-misc/sparkleshare/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<upstream>
+<upstream>
 		<remote-id type="bitbucket">hbons/sparkleshare</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-misc/spread/metadata.xml b/net-misc/spread/metadata.xml
index a40624f..097975e 100644
--- a/net-misc/spread/metadata.xml
+++ b/net-misc/spread/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/sslwrap/metadata.xml b/net-misc/sslwrap/metadata.xml
index 1470e03..097975e 100644
--- a/net-misc/sslwrap/metadata.xml
+++ b/net-misc/sslwrap/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/net-misc/stone/metadata.xml b/net-misc/stone/metadata.xml
index a335687..d76626c 100644
--- a/net-misc/stone/metadata.xml
+++ b/net-misc/stone/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>Stone is a TCP/IP packet repeater in the application layer.  It repeats TCP and UDP packets from inside to outside of a firewall, or from outside to inside.</longdescription>
 </pkgmetadata>

diff --git a/net-misc/taptap/metadata.xml b/net-misc/taptap/metadata.xml
index 91f4e72..097975e 100644
--- a/net-misc/taptap/metadata.xml
+++ b/net-misc/taptap/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-misc/taylor-uucp/metadata.xml b/net-misc/taylor-uucp/metadata.xml
index 4e9d22d..206a542 100644
--- a/net-misc/taylor-uucp/metadata.xml
+++ b/net-misc/taylor-uucp/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>The standard UUCP package of the Free Software Foundation.
 It provides everything you need to make a UUCP connection.</longdescription>
 </pkgmetadata>

diff --git a/net-misc/udpxy/metadata.xml b/net-misc/udpxy/metadata.xml
index 59e410f..cf9e395 100644
--- a/net-misc/udpxy/metadata.xml
+++ b/net-misc/udpxy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">udpxy</remote-id>
   </upstream>

diff --git a/net-misc/unix2tcp/metadata.xml b/net-misc/unix2tcp/metadata.xml
index 1470e03..097975e 100644
--- a/net-misc/unix2tcp/metadata.xml
+++ b/net-misc/unix2tcp/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/net-misc/utelnetd/metadata.xml b/net-misc/utelnetd/metadata.xml
index 6c73073..764694b 100644
--- a/net-misc/utelnetd/metadata.xml
+++ b/net-misc/utelnetd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>This is a small telnet daemon for standalone use, mostly on embedded systems.</longdescription>
 </pkgmetadata>

diff --git a/net-misc/vncrec/metadata.xml b/net-misc/vncrec/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-misc/vncrec/metadata.xml
+++ b/net-misc/vncrec/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-misc/vncsnapshot/metadata.xml b/net-misc/vncsnapshot/metadata.xml
index 09b86bb..af2db1e 100644
--- a/net-misc/vncsnapshot/metadata.xml
+++ b/net-misc/vncsnapshot/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">vncsnapshot</remote-id>
 	</upstream>

diff --git a/net-misc/yaydl/metadata.xml b/net-misc/yaydl/metadata.xml
index 051c9f7..ad9f6a2 100644
--- a/net-misc/yaydl/metadata.xml
+++ b/net-misc/yaydl/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="soundextract">Extract the soundtracks of the downloaded videos</flag>
 	</use>

diff --git a/net-nds/389-admin/metadata.xml b/net-nds/389-admin/metadata.xml
index 2379d9d..dbec795 100644
--- a/net-nds/389-admin/metadata.xml
+++ b/net-nds/389-admin/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>
 389 Administration Server is an HTTP agent that provides management features
 for 389 Directory Server.  It provides some management web apps that can

diff --git a/net-nds/389-ds-base/metadata.xml b/net-nds/389-ds-base/metadata.xml
index 1b75600..b918bd1 100644
--- a/net-nds/389-ds-base/metadata.xml
+++ b/net-nds/389-ds-base/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>The enterprise-class Open Source LDAP server for Linux</longdescription> 
 <use>
 	<flag name="pam-passthru">Enable pam-passthru plugin - for simple and fast system services used in ldap</flag>

diff --git a/net-nds/adtool/metadata.xml b/net-nds/adtool/metadata.xml
index 25e348a..e62593f 100644
--- a/net-nds/adtool/metadata.xml
+++ b/net-nds/adtool/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 adtool is a unix command line utility for Active Directory administration, through ldap repository management.
 </longdescription>

diff --git a/net-nds/lat/metadata.xml b/net-nds/lat/metadata.xml
index d626440..79ec15a 100644
--- a/net-nds/lat/metadata.xml
+++ b/net-nds/lat/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		LAT stands for LDAP Administration Tool. The tool allows you to browse LDAP-based directories and add/edit/delete entries contained within. It can store profiles for quick access to different servers. There are also different views available such as Users, Groups and Hosts which allow you to easily manage objects without having to deal with the intricacies of LDAP.
 	</longdescription>

diff --git a/net-nds/yp-tools/metadata.xml b/net-nds/yp-tools/metadata.xml
index 9dc32b2..097975e 100644
--- a/net-nds/yp-tools/metadata.xml
+++ b/net-nds/yp-tools/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>                       
-</maintainer>
 </pkgmetadata>

diff --git a/net-nds/ypbind/metadata.xml b/net-nds/ypbind/metadata.xml
index ff62877..097975e 100644
--- a/net-nds/ypbind/metadata.xml
+++ b/net-nds/ypbind/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-nds/ypserv/metadata.xml b/net-nds/ypserv/metadata.xml
index ff62877..097975e 100644
--- a/net-nds/ypserv/metadata.xml
+++ b/net-nds/ypserv/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-news/amphetadesk/metadata.xml b/net-news/amphetadesk/metadata.xml
index 8847182..26db58d 100644
--- a/net-news/amphetadesk/metadata.xml
+++ b/net-news/amphetadesk/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sourceforge</remote-id>
 	</upstream>

diff --git a/net-news/snownews/metadata.xml b/net-news/snownews/metadata.xml
index a40624f..097975e 100644
--- a/net-news/snownews/metadata.xml
+++ b/net-news/snownews/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/net-nntp/ubh/metadata.xml b/net-nntp/ubh/metadata.xml
index fd9005c..01ac446 100644
--- a/net-nntp/ubh/metadata.xml
+++ b/net-nntp/ubh/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription/>
 	<upstream>
 		<remote-id type="sourceforge">ubh</remote-id>

diff --git a/net-print/adobeps/metadata.xml b/net-print/adobeps/metadata.xml
index 91f4e72..097975e 100644
--- a/net-print/adobeps/metadata.xml
+++ b/net-print/adobeps/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/net-print/lm1100/metadata.xml b/net-print/lm1100/metadata.xml
index ba6569f..e8c7f3b 100644
--- a/net-print/lm1100/metadata.xml
+++ b/net-print/lm1100/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>The Tim Engler's Lexmark 1100 driver</longdescription>
 </pkgmetadata>

diff --git a/net-print/xerox-drivers/metadata.xml b/net-print/xerox-drivers/metadata.xml
index c9ba1c5..f8e7c23 100644
--- a/net-print/xerox-drivers/metadata.xml
+++ b/net-print/xerox-drivers/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>PPD files of XEROX printers (CopyCentre, DocuPrint, Phaser, WorkCentre) for CUPS printing
 system</longdescription>
 </pkgmetadata>

diff --git a/net-proxy/3proxy/metadata.xml b/net-proxy/3proxy/metadata.xml
index da729ce..8f3dc31 100644
--- a/net-proxy/3proxy/metadata.xml
+++ b/net-proxy/3proxy/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>3Proxy is really tiny cross-platform proxy servers set. It includes HTTP proxy with HTTPS and FTP support, 
 SOCKSv4/SOCKSv4.5/SOCKSv5 proxy, POP3 proxy, FTP proxy, TCP and UDP portmappers. You can use every proxy as a standalone program 
 (socks, proxy, tcppm, udppm, pop3p) or use combined program (3proxy). Combined proxy additionally supports features like 

diff --git a/net-proxy/adzapper/metadata.xml b/net-proxy/adzapper/metadata.xml
index 79c3065..6e2d784 100644
--- a/net-proxy/adzapper/metadata.xml
+++ b/net-proxy/adzapper/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>Redirector for squid that intercepts advertising, page counters and some web bugs</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">adzapper</remote-id>

diff --git a/net-proxy/bfilter/metadata.xml b/net-proxy/bfilter/metadata.xml
index b1cc85f..451d6d1 100644
--- a/net-proxy/bfilter/metadata.xml
+++ b/net-proxy/bfilter/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>BFilter is a filtering web proxy. It was originally intended for removing banner ads only, but at some point 
 it has been extended to remove popups and webbugs. It can't be used as a general purpose filtering proxy 
 because it was never intended this way. 

diff --git a/net-proxy/c-icap-modules/metadata.xml b/net-proxy/c-icap-modules/metadata.xml
index d962f7d..30e39f9 100644
--- a/net-proxy/c-icap-modules/metadata.xml
+++ b/net-proxy/c-icap-modules/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>URL blocklist and virus scanner for the C-ICAP server</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">c-icap</remote-id>

diff --git a/net-proxy/cntlm/metadata.xml b/net-proxy/cntlm/metadata.xml
index ca30a2e..acc829f 100644
--- a/net-proxy/cntlm/metadata.xml
+++ b/net-proxy/cntlm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		NTLM authorizing proxy. Upstream seems dead, but this is still a good
 		alternative to ntlmaps.

diff --git a/net-proxy/dansguardian/metadata.xml b/net-proxy/dansguardian/metadata.xml
index b8eb205..dee1ece 100644
--- a/net-proxy/dansguardian/metadata.xml
+++ b/net-proxy/dansguardian/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>DansGuardian is an award winning Open Source web content filter which currently runs on Linux, FreeBSD, OpenBSD, NetBSD, Mac OS X, HP-UX, and Solaris. It filters the actual content of pages based on many methods including phrase matching, PICS filtering and URL filtering. It does not purely filter based on a banned list of sites like lesser totally commercial filters.</longdescription>
 	<use>
 		<flag name="avast">Enable support for the AvastD content scanner.</flag>

diff --git a/net-proxy/dnsproxy/metadata.xml b/net-proxy/dnsproxy/metadata.xml
index 621ca73..bafada6 100644
--- a/net-proxy/dnsproxy/metadata.xml
+++ b/net-proxy/dnsproxy/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>The dnsproxy daemon is a proxy for DNS queries. It forwards these queries to
 two previously configured nameservers: one for authoritative queries and another
 for recursive queries. The received answers are sent back to the client unchanged.

diff --git a/net-proxy/havp/metadata.xml b/net-proxy/havp/metadata.xml
index 3648287..a12e708 100644
--- a/net-proxy/havp/metadata.xml
+++ b/net-proxy/havp/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>HAVP (HTTP AntiVirus proxy) is a proxy with an anti-virus 
 filter. It does not cache or filter content.</longdescription>
 </pkgmetadata>

diff --git a/net-proxy/http-replicator/metadata.xml b/net-proxy/http-replicator/metadata.xml
index c5d9e24..921e034 100644
--- a/net-proxy/http-replicator/metadata.xml
+++ b/net-proxy/http-replicator/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">http-replicator</remote-id>
 	</upstream>

diff --git a/net-proxy/httpush/metadata.xml b/net-proxy/httpush/metadata.xml
index af81e3a..b74e1f3 100644
--- a/net-proxy/httpush/metadata.xml
+++ b/net-proxy/httpush/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>HTTPush aims at providing an easy way to audit HTTP and HTTPS application/server security. It supports on-the-fly request modification, automated decision making and vulnerability detection through the use of plugins.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">httpush</remote-id>

diff --git a/net-proxy/ntlmaps/metadata.xml b/net-proxy/ntlmaps/metadata.xml
index c40105f..27562f7 100644
--- a/net-proxy/ntlmaps/metadata.xml
+++ b/net-proxy/ntlmaps/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
 		ntlmaps is a http/ftp/socks proxy server written in python that
 		implements samba-like ntlm authentication against a Microsoft Proxy

diff --git a/net-proxy/nylon/metadata.xml b/net-proxy/nylon/metadata.xml
index ee6d311..a0c6821 100644
--- a/net-proxy/nylon/metadata.xml
+++ b/net-proxy/nylon/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>nylon is a proxy server, developed on OpenBSD. It supports SOCKS version 4 and 5,
 as well as a mirror mode so that services can be mirrored directly.</longdescription>
 </pkgmetadata>

diff --git a/net-proxy/oops/metadata.xml b/net-proxy/oops/metadata.xml
index 3a91542..cd03896 100644
--- a/net-proxy/oops/metadata.xml
+++ b/net-proxy/oops/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>An advanced multithreaded caching web proxy</longdescription>
 </pkgmetadata>

diff --git a/net-proxy/ratproxy/metadata.xml b/net-proxy/ratproxy/metadata.xml
index f99494e..c978cd2 100644
--- a/net-proxy/ratproxy/metadata.xml
+++ b/net-proxy/ratproxy/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription lang="en">A semi-automated, largely passive web application security audit tool,
+<longdescription lang="en">A semi-automated, largely passive web application security audit tool,
 		optimized for an accurate and sensitive detection, and automatic
 		annotation, of potential problems and security-relevant design patterns
 		based on the observation of existing, user-initiated traffic in complex

diff --git a/net-proxy/squirm/metadata.xml b/net-proxy/squirm/metadata.xml
index 09a762b..a8e20ca 100644
--- a/net-proxy/squirm/metadata.xml
+++ b/net-proxy/squirm/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>A redirector for Squid</longdescription>
 </pkgmetadata>

diff --git a/net-proxy/sshproxy/metadata.xml b/net-proxy/sshproxy/metadata.xml
index 95ecbb5..563dd78 100644
--- a/net-proxy/sshproxy/metadata.xml
+++ b/net-proxy/sshproxy/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-  <longdescription>
+<longdescription>
 sshproxy is a pure python implementation of an ssh proxy. It allows users to connect to remote sites without having to remember
 or even know the password or key of the remote sites. There are 2 possible scenarios which could possibly interest you.
 

diff --git a/net-proxy/tinyproxy/metadata.xml b/net-proxy/tinyproxy/metadata.xml
index c16fce9..1ec8cc6 100644
--- a/net-proxy/tinyproxy/metadata.xml
+++ b/net-proxy/tinyproxy/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>A lightweight HTTP/SSL proxy</longdescription>
 <use>
 	<flag name="filter-proxy">Enable filtering of domains/URLS</flag>

diff --git a/net-proxy/wwwoffle/metadata.xml b/net-proxy/wwwoffle/metadata.xml
index a4e7c21..f2b97f6 100644
--- a/net-proxy/wwwoffle/metadata.xml
+++ b/net-proxy/wwwoffle/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>The wwwoffled program is a simple proxy server with special features for use 
 with dial-up internet links. This means that it is possible to browse web pages and read them 
 without having to remain connected.

diff --git a/net-proxy/ziproxy/metadata.xml b/net-proxy/ziproxy/metadata.xml
index 5f2f128..36c9c5e 100644
--- a/net-proxy/ziproxy/metadata.xml
+++ b/net-proxy/ziproxy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Ziproxy is a http compression and optimizer, non-caching, fully configurable
 		proxy. Ziproxy features JPEG, GIF, PNG, JPEG2k and GZIP recompression for

diff --git a/net-voip/ekiga/metadata.xml b/net-voip/ekiga/metadata.xml
index c10fb43..8b20821 100644
--- a/net-voip/ekiga/metadata.xml
+++ b/net-voip/ekiga/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="gconf">Enable GConf support</flag>
 		<flag name="h323">Enable H.323 protocol</flag>

diff --git a/net-voip/gnugk/metadata.xml b/net-voip/gnugk/metadata.xml
index 319bbe0..657f66a 100644
--- a/net-voip/gnugk/metadata.xml
+++ b/net-voip/gnugk/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <use>
     <flag name="ssh">Enable support for SSH port forwarding using <pkg>net-libs/libssh</pkg></flag>
   </use>

diff --git a/net-voip/openmcu/metadata.xml b/net-voip/openmcu/metadata.xml
index 375a3ff..706f53d 100644
--- a/net-voip/openmcu/metadata.xml
+++ b/net-voip/openmcu/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">h323plus</remote-id>
 	</upstream>

diff --git a/net-wireless/adm8211/metadata.xml b/net-wireless/adm8211/metadata.xml
index 4538a68..097975e 100644
--- a/net-wireless/adm8211/metadata.xml
+++ b/net-wireless/adm8211/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/net-wireless/airsnort/metadata.xml b/net-wireless/airsnort/metadata.xml
index fc15de0..a679e94 100644
--- a/net-wireless/airsnort/metadata.xml
+++ b/net-wireless/airsnort/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">airsnort</remote-id>
 	</upstream>

diff --git a/net-wireless/ap-utils/metadata.xml b/net-wireless/ap-utils/metadata.xml
index 0200143..ba712d7 100644
--- a/net-wireless/ap-utils/metadata.xml
+++ b/net-wireless/ap-utils/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ap-utils</remote-id>
 	</upstream>

diff --git a/net-wireless/chillispot/metadata.xml b/net-wireless/chillispot/metadata.xml
index 8160ef2..13da922 100644
--- a/net-wireless/chillispot/metadata.xml
+++ b/net-wireless/chillispot/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
-
 <longdescription>ChilliSpot is an open source captive portal or wireless
 LAN access point controller. It is used for authenticating users of a
 wireless LAN. It supports web based login which is today's standard for

diff --git a/net-wireless/hostap-utils/metadata.xml b/net-wireless/hostap-utils/metadata.xml
index c078bde..9fcf6ef 100644
--- a/net-wireless/hostap-utils/metadata.xml
+++ b/net-wireless/hostap-utils/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <longdescription>Utility programs for hostap-driver</longdescription>
 </pkgmetadata>

diff --git a/net-wireless/irda-utils/metadata.xml b/net-wireless/irda-utils/metadata.xml
index 86b764a..5eb94e9 100644
--- a/net-wireless/irda-utils/metadata.xml
+++ b/net-wireless/irda-utils/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">irda</remote-id>
 	</upstream>

diff --git a/net-wireless/madwimax/metadata.xml b/net-wireless/madwimax/metadata.xml
index 8baa280..5c9568c 100644
--- a/net-wireless/madwimax/metadata.xml
+++ b/net-wireless/madwimax/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">madwimax</remote-id>
 	</upstream>

diff --git a/net-wireless/mfoc/metadata.xml b/net-wireless/mfoc/metadata.xml
index 73575a3..905f4ff 100644
--- a/net-wireless/mfoc/metadata.xml
+++ b/net-wireless/mfoc/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">nfc-tools/mfoc</remote-id>
 	</upstream>

diff --git a/net-wireless/orinoco-usb/metadata.xml b/net-wireless/orinoco-usb/metadata.xml
index 4538a68..097975e 100644
--- a/net-wireless/orinoco-usb/metadata.xml
+++ b/net-wireless/orinoco-usb/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/net-wireless/rfswitch/metadata.xml b/net-wireless/rfswitch/metadata.xml
index bbdd5f1..ffb99b2 100644
--- a/net-wireless/rfswitch/metadata.xml
+++ b/net-wireless/rfswitch/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rfswitch</remote-id>
 	</upstream>

diff --git a/net-wireless/wifi-radar/metadata.xml b/net-wireless/wifi-radar/metadata.xml
index d9cd2ca..097975e 100644
--- a/net-wireless/wifi-radar/metadata.xml
+++ b/net-wireless/wifi-radar/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/sci-astronomy/skychart/metadata.xml b/sci-astronomy/skychart/metadata.xml
index 19d4dc6..f2fd269 100644
--- a/sci-astronomy/skychart/metadata.xml
+++ b/sci-astronomy/skychart/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">skychart</remote-id>
 	</upstream>

diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml b/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
index 91f4e72..097975e 100644
--- a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
+++ b/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/sci-geosciences/harmonics-dwf-free/metadata.xml b/sci-geosciences/harmonics-dwf-free/metadata.xml
index 91f4e72..097975e 100644
--- a/sci-geosciences/harmonics-dwf-free/metadata.xml
+++ b/sci-geosciences/harmonics-dwf-free/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/sci-geosciences/libtcd/metadata.xml b/sci-geosciences/libtcd/metadata.xml
index 91f4e72..097975e 100644
--- a/sci-geosciences/libtcd/metadata.xml
+++ b/sci-geosciences/libtcd/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/sci-geosciences/osgearth/metadata.xml b/sci-geosciences/osgearth/metadata.xml
index f1a2be1..5144251 100644
--- a/sci-geosciences/osgearth/metadata.xml
+++ b/sci-geosciences/osgearth/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		osgEarth is a C++ terrain rendering toolkit. Just create a
 		simple XML file, point it at your imagery, elevation, and

diff --git a/sci-geosciences/seawater/metadata.xml b/sci-geosciences/seawater/metadata.xml
index 9877da1..b1585c6 100644
--- a/sci-geosciences/seawater/metadata.xml
+++ b/sci-geosciences/seawater/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="pypi">seawater</remote-id>
   </upstream>

diff --git a/sci-geosciences/swmm/metadata.xml b/sci-geosciences/swmm/metadata.xml
index 91f4e72..097975e 100644
--- a/sci-geosciences/swmm/metadata.xml
+++ b/sci-geosciences/swmm/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/sci-geosciences/tappy/metadata.xml b/sci-geosciences/tappy/metadata.xml
index 2de7900..84c78ee 100644
--- a/sci-geosciences/tappy/metadata.xml
+++ b/sci-geosciences/tappy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">tappy</remote-id>
 	</upstream>

diff --git a/sci-geosciences/xtide/metadata.xml b/sci-geosciences/xtide/metadata.xml
index 32bef51..09612e6 100644
--- a/sci-geosciences/xtide/metadata.xml
+++ b/sci-geosciences/xtide/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="gps">Use <pkg>sci-geosciences/gpsd</pkg></flag>
 	</use>

diff --git a/sci-libs/fplll/metadata.xml b/sci-libs/fplll/metadata.xml
index 91f4e72..097975e 100644
--- a/sci-libs/fplll/metadata.xml
+++ b/sci-libs/fplll/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/sci-libs/plotmm/metadata.xml b/sci-libs/plotmm/metadata.xml
index 77d8685..6933a82 100644
--- a/sci-libs/plotmm/metadata.xml
+++ b/sci-libs/plotmm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">plotmm</remote-id>
 	</upstream>

diff --git a/sci-libs/ta-lib/metadata.xml b/sci-libs/ta-lib/metadata.xml
index b9f2309..7d82a92 100644
--- a/sci-libs/ta-lib/metadata.xml
+++ b/sci-libs/ta-lib/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ta-lib</remote-id>
 	</upstream>

diff --git a/sci-misc/pythoncad/metadata.xml b/sci-misc/pythoncad/metadata.xml
index 45e643c..b3ad011 100644
--- a/sci-misc/pythoncad/metadata.xml
+++ b/sci-misc/pythoncad/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>a scriptable, open-source, easy to use CAD</longdescription>
   <upstream>
     <remote-id type="sourceforge">pythoncad</remote-id>

diff --git a/sys-apps/apmd/metadata.xml b/sys-apps/apmd/metadata.xml
index 4538a68..097975e 100644
--- a/sys-apps/apmd/metadata.xml
+++ b/sys-apps/apmd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/sys-apps/ccs-tools/metadata.xml b/sys-apps/ccs-tools/metadata.xml
index 01cfb2c..8055289 100644
--- a/sys-apps/ccs-tools/metadata.xml
+++ b/sys-apps/ccs-tools/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge-jp">tomoyo</remote-id>
 	</upstream>

diff --git a/sys-apps/checkservice/metadata.xml b/sys-apps/checkservice/metadata.xml
index d9cd2ca..097975e 100644
--- a/sys-apps/checkservice/metadata.xml
+++ b/sys-apps/checkservice/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/chname/metadata.xml b/sys-apps/chname/metadata.xml
index a756d54..425519a 100644
--- a/sys-apps/chname/metadata.xml
+++ b/sys-apps/chname/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">Run a command with a new system hostname. Requires utsname namespaces.</longdescription>
 	<upstream>
 		<remote-id type="google-code">chname</remote-id>

diff --git a/sys-apps/cinit/metadata.xml b/sys-apps/cinit/metadata.xml
index 91f4e72..097975e 100644
--- a/sys-apps/cinit/metadata.xml
+++ b/sys-apps/cinit/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/cobalt-panel-utils/metadata.xml b/sys-apps/cobalt-panel-utils/metadata.xml
index d7b1942..95f2efa 100644
--- a/sys-apps/cobalt-panel-utils/metadata.xml
+++ b/sys-apps/cobalt-panel-utils/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
-
   <longdescription>
     LCD and LED panel utilities for the Sun Cobalts. Based on panel-utils-pacifica released by Sun.
   </longdescription>

diff --git a/sys-apps/conspy/metadata.xml b/sys-apps/conspy/metadata.xml
index 920fb23..870a6df 100644
--- a/sys-apps/conspy/metadata.xml
+++ b/sys-apps/conspy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">conspy</remote-id>
 	</upstream>

diff --git a/sys-apps/dchroot/metadata.xml b/sys-apps/dchroot/metadata.xml
index d9cd2ca..097975e 100644
--- a/sys-apps/dchroot/metadata.xml
+++ b/sys-apps/dchroot/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/fwts/metadata.xml b/sys-apps/fwts/metadata.xml
index 760f41d..2a42105 100644
--- a/sys-apps/fwts/metadata.xml
+++ b/sys-apps/fwts/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">ubuntu</remote-id>
 	</upstream>

diff --git a/sys-apps/fxload/metadata.xml b/sys-apps/fxload/metadata.xml
index a4278ff..619a6fa 100644
--- a/sys-apps/fxload/metadata.xml
+++ b/sys-apps/fxload/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">linux-hotplug</remote-id>
 	</upstream>

diff --git a/sys-apps/hexdump-esr/metadata.xml b/sys-apps/hexdump-esr/metadata.xml
index 91f4e72..097975e 100644
--- a/sys-apps/hexdump-esr/metadata.xml
+++ b/sys-apps/hexdump-esr/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/hwdata-redhat/metadata.xml b/sys-apps/hwdata-redhat/metadata.xml
index 59e2b8f..097975e 100644
--- a/sys-apps/hwdata-redhat/metadata.xml
+++ b/sys-apps/hwdata-redhat/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/i2c-tools/metadata.xml b/sys-apps/i2c-tools/metadata.xml
index 4538a68..097975e 100644
--- a/sys-apps/i2c-tools/metadata.xml
+++ b/sys-apps/i2c-tools/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/sys-apps/idle3-tools/metadata.xml b/sys-apps/idle3-tools/metadata.xml
index 01061b4..cfaaad1 100644
--- a/sys-apps/idle3-tools/metadata.xml
+++ b/sys-apps/idle3-tools/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Idle3-tools provides a linux/unix utility that can disable, get and set the value
 		of the infamous idle3 timer found on recent Western Digital Hard Disk Drives. It

diff --git a/sys-apps/more/metadata.xml b/sys-apps/more/metadata.xml
index d9cd2ca..097975e 100644
--- a/sys-apps/more/metadata.xml
+++ b/sys-apps/more/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/nca/metadata.xml b/sys-apps/nca/metadata.xml
index b09d87b..6c8a4bb 100644
--- a/sys-apps/nca/metadata.xml
+++ b/sys-apps/nca/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		nca connects a pseudo terminal to the console's virtual terminals
 		(/dev/tty0...n) that are normally only accessible to someone with

diff --git a/sys-apps/newrelic-sysmond/metadata.xml b/sys-apps/newrelic-sysmond/metadata.xml
index 4b139df..1eaadf2 100644
--- a/sys-apps/newrelic-sysmond/metadata.xml
+++ b/sys-apps/newrelic-sysmond/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>NewRelic System Monitor</longdescription>
 </pkgmetadata>

diff --git a/sys-apps/noexec/metadata.xml b/sys-apps/noexec/metadata.xml
index 3c9f4a4..12ee692 100644
--- a/sys-apps/noexec/metadata.xml
+++ b/sys-apps/noexec/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">noexec</remote-id>
 	</upstream>

diff --git a/sys-apps/pcmciautils/metadata.xml b/sys-apps/pcmciautils/metadata.xml
index 8d780b7..a4d2f4f 100644
--- a/sys-apps/pcmciautils/metadata.xml
+++ b/sys-apps/pcmciautils/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
 	<flag name="staticsocket">Add support for static sockets</flag>
 </use>

diff --git a/sys-apps/raidutils/metadata.xml b/sys-apps/raidutils/metadata.xml
index 95b12ff..8d81458 100644
--- a/sys-apps/raidutils/metadata.xml
+++ b/sys-apps/raidutils/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     Suite of programs to manage some I2O-compliant RAID controllers; in
     particular some Adaptec hardware; to be very specific those using the

diff --git a/sys-apps/restartd/metadata.xml b/sys-apps/restartd/metadata.xml
index d9cd2ca..097975e 100644
--- a/sys-apps/restartd/metadata.xml
+++ b/sys-apps/restartd/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/sys-apps/ultracopier/metadata.xml b/sys-apps/ultracopier/metadata.xml
index 0f4d275..f3b74e3 100644
--- a/sys-apps/ultracopier/metadata.xml
+++ b/sys-apps/ultracopier/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>

diff --git a/sys-apps/usermode-utilities/metadata.xml b/sys-apps/usermode-utilities/metadata.xml
index 94b9a43..1d77042 100644
--- a/sys-apps/usermode-utilities/metadata.xml
+++ b/sys-apps/usermode-utilities/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="fuse">Build tools (currently umlmount) needing fuse</flag>
 	</use>

diff --git a/sys-apps/v86d/metadata.xml b/sys-apps/v86d/metadata.xml
index 12b8ec3..922ff7d 100644
--- a/sys-apps/v86d/metadata.xml
+++ b/sys-apps/v86d/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
 	<flag name="x86emu">Use x86emu for Video BIOS calls</flag>
 </use>

diff --git a/sys-apps/yum/metadata.xml b/sys-apps/yum/metadata.xml
index 6b82901..62b988d 100644
--- a/sys-apps/yum/metadata.xml
+++ b/sys-apps/yum/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     Automatic updater and package installer/remover for rpm
     systems

diff --git a/sys-auth/nss-mdns/metadata.xml b/sys-auth/nss-mdns/metadata.xml
index 8a58253..0e8687c 100644
--- a/sys-auth/nss-mdns/metadata.xml
+++ b/sys-auth/nss-mdns/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-<use>
+	<use>
 	<flag name="search-domains">Honour search domains from
 		/etc/resolv.conf (see bug #201948 for possible side effects)</flag>
 </use>

diff --git a/sys-auth/pam-csync/metadata.xml b/sys-auth/pam-csync/metadata.xml
index 91f4e72..097975e 100644
--- a/sys-auth/pam-csync/metadata.xml
+++ b/sys-auth/pam-csync/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/sys-auth/pam_require/metadata.xml b/sys-auth/pam_require/metadata.xml
index fc75c07..097975e 100644
--- a/sys-auth/pam_require/metadata.xml
+++ b/sys-auth/pam_require/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/sys-auth/rtkit/metadata.xml b/sys-auth/rtkit/metadata.xml
index ec4b7a1..834caf9 100644
--- a/sys-auth/rtkit/metadata.xml
+++ b/sys-auth/rtkit/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
 	  RealtimeKit is a DBus service that provides applications with an interface
 	  to escalate their priority to realtime, without any special setup in

diff --git a/sys-block/afacli/metadata.xml b/sys-block/afacli/metadata.xml
index a40624f..097975e 100644
--- a/sys-block/afacli/metadata.xml
+++ b/sys-block/afacli/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/sys-block/cec/metadata.xml b/sys-block/cec/metadata.xml
index ea792b8..871bce2 100644
--- a/sys-block/cec/metadata.xml
+++ b/sys-block/cec/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">aoetools</remote-id>
 	</upstream>

diff --git a/sys-block/dellmgr/metadata.xml b/sys-block/dellmgr/metadata.xml
index a40624f..097975e 100644
--- a/sys-block/dellmgr/metadata.xml
+++ b/sys-block/dellmgr/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/sys-block/mpt-status/metadata.xml b/sys-block/mpt-status/metadata.xml
index aba833e..097975e 100644
--- a/sys-block/mpt-status/metadata.xml
+++ b/sys-block/mpt-status/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/sys-block/ms-sys/metadata.xml b/sys-block/ms-sys/metadata.xml
index 0c1cdd4..953bea6 100644
--- a/sys-block/ms-sys/metadata.xml
+++ b/sys-block/ms-sys/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ms-sys</remote-id>
 		<bugs-to>http://sourceforge.net/tracker/?group_id=59200</bugs-to>

diff --git a/sys-block/scsiadd/metadata.xml b/sys-block/scsiadd/metadata.xml
index e9e2664..e39b44f 100644
--- a/sys-block/scsiadd/metadata.xml
+++ b/sys-block/scsiadd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		Add and remove SCSI devices from your Linux system during runtime.
 		No need to reboot your system, just because you have switched on

diff --git a/sys-block/spindown/metadata.xml b/sys-block/spindown/metadata.xml
index 8a38b8e..4379c9f 100644
--- a/sys-block/spindown/metadata.xml
+++ b/sys-block/spindown/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">spindown</remote-id>
 	</upstream>

diff --git a/sys-boot/mbr/metadata.xml b/sys-boot/mbr/metadata.xml
index ff62877..097975e 100644
--- a/sys-boot/mbr/metadata.xml
+++ b/sys-boot/mbr/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/sys-boot/netboot/metadata.xml b/sys-boot/netboot/metadata.xml
index bf29e8f..9daf2dd 100644
--- a/sys-boot/netboot/metadata.xml
+++ b/sys-boot/netboot/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">netboot</remote-id>
 	</upstream>

diff --git a/sys-boot/plymouth-openrc-plugin/metadata.xml b/sys-boot/plymouth-openrc-plugin/metadata.xml
index 546f269..0ba4b22 100644
--- a/sys-boot/plymouth-openrc-plugin/metadata.xml
+++ b/sys-boot/plymouth-openrc-plugin/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default maintainer for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">aidecoe/plymouth-openrc-plugin</remote-id>
 	</upstream>

diff --git a/sys-boot/psoload/metadata.xml b/sys-boot/psoload/metadata.xml
index a40624f..097975e 100644
--- a/sys-boot/psoload/metadata.xml
+++ b/sys-boot/psoload/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/sys-cluster/polysh/metadata.xml b/sys-cluster/polysh/metadata.xml
index 584de01..9e230b7 100644
--- a/sys-cluster/polysh/metadata.xml
+++ b/sys-cluster/polysh/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		Polysh is a tool to aggregate several remote shells into one. It is used to
 		launch an interactive remote shell on many machines at once.

diff --git a/sys-cluster/util-vserver/metadata.xml b/sys-cluster/util-vserver/metadata.xml
index 54abb52..42f1c54 100644
--- a/sys-cluster/util-vserver/metadata.xml
+++ b/sys-cluster/util-vserver/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 		util-vserver is a Linux virtual server utility framework,
 		allowing an administrator to set up multiple, isolated
 		virtual servers. It can be used to run various services

diff --git a/sys-cluster/wulfware/metadata.xml b/sys-cluster/wulfware/metadata.xml
index 59e2b8f..097975e 100644
--- a/sys-cluster/wulfware/metadata.xml
+++ b/sys-cluster/wulfware/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/sys-devel/dev86/metadata.xml b/sys-devel/dev86/metadata.xml
index 756af1a..512dbbb 100644
--- a/sys-devel/dev86/metadata.xml
+++ b/sys-devel/dev86/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		Bruce's C compiler - Simple C compiler to generate 8086 code
 	</longdescription>

diff --git a/sys-firmware/atmel-firmware/metadata.xml b/sys-firmware/atmel-firmware/metadata.xml
index 4538a68..097975e 100644
--- a/sys-firmware/atmel-firmware/metadata.xml
+++ b/sys-firmware/atmel-firmware/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/sys-firmware/bluez-firmware/metadata.xml b/sys-firmware/bluez-firmware/metadata.xml
index b385da8..2e78e46 100644
--- a/sys-firmware/bluez-firmware/metadata.xml
+++ b/sys-firmware/bluez-firmware/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bluez</remote-id>
 	</upstream>

diff --git a/sys-firmware/ipw2100-firmware/metadata.xml b/sys-firmware/ipw2100-firmware/metadata.xml
index 0bb0e15..997f236 100644
--- a/sys-firmware/ipw2100-firmware/metadata.xml
+++ b/sys-firmware/ipw2100-firmware/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ipw2100</remote-id>
 	</upstream>

diff --git a/sys-firmware/ipw2200-firmware/metadata.xml b/sys-firmware/ipw2200-firmware/metadata.xml
index 76add1e..d4be2d7 100644
--- a/sys-firmware/ipw2200-firmware/metadata.xml
+++ b/sys-firmware/ipw2200-firmware/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ipw2200</remote-id>
 	</upstream>

diff --git a/sys-firmware/zd1201-firmware/metadata.xml b/sys-firmware/zd1201-firmware/metadata.xml
index 26724dc..0aa5bb9 100644
--- a/sys-firmware/zd1201-firmware/metadata.xml
+++ b/sys-firmware/zd1201-firmware/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">linux-lc100020</remote-id>
 	</upstream>

diff --git a/sys-firmware/zd1211-firmware/metadata.xml b/sys-firmware/zd1211-firmware/metadata.xml
index 291fcac..56f5d1d 100644
--- a/sys-firmware/zd1211-firmware/metadata.xml
+++ b/sys-firmware/zd1211-firmware/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">zd1211</remote-id>
 	</upstream>

diff --git a/sys-fs/bashmount/metadata.xml b/sys-fs/bashmount/metadata.xml
index 2e162ed..3383def 100644
--- a/sys-fs/bashmount/metadata.xml
+++ b/sys-fs/bashmount/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bashmount</remote-id>
 	</upstream>

diff --git a/sys-fs/clamfs/metadata.xml b/sys-fs/clamfs/metadata.xml
index 5b7eab1..67a374e 100644
--- a/sys-fs/clamfs/metadata.xml
+++ b/sys-fs/clamfs/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
   ClamFS is a FUSE-based user-space file system for Linux with on-access
   anti-virus file scanning through clamd daemon (a file scanning service

diff --git a/sys-fs/copyfs/metadata.xml b/sys-fs/copyfs/metadata.xml
index 333a655..097975e 100644
--- a/sys-fs/copyfs/metadata.xml
+++ b/sys-fs/copyfs/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-  <description>This package lacks a primary herd or maintainer.</description>
-</maintainer>
 </pkgmetadata>

diff --git a/sys-fs/fuse-convmvfs/metadata.xml b/sys-fs/fuse-convmvfs/metadata.xml
index c955c26..f543e18 100644
--- a/sys-fs/fuse-convmvfs/metadata.xml
+++ b/sys-fs/fuse-convmvfs/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fuse-convmvfs</remote-id>
 	</upstream>

diff --git a/sys-fs/ldapfuse/metadata.xml b/sys-fs/ldapfuse/metadata.xml
index a4b9a45..547224a 100644
--- a/sys-fs/ldapfuse/metadata.xml
+++ b/sys-fs/ldapfuse/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ldapfuse</remote-id>
 	</upstream>

diff --git a/sys-fs/obexfs/metadata.xml b/sys-fs/obexfs/metadata.xml
index 64ba309..cc7d2da 100644
--- a/sys-fs/obexfs/metadata.xml
+++ b/sys-fs/obexfs/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>Userspace filesystem used for accessing files on
 OBEX-capable mobile phones.</longdescription>
   <upstream>

diff --git a/sys-fs/owfs/metadata.xml b/sys-fs/owfs/metadata.xml
index f7c7df4..abb9646 100644
--- a/sys-fs/owfs/metadata.xml
+++ b/sys-fs/owfs/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 OWFS (One Wire File System) is an easy way to use the powerful 1-wire system
 of Dallas/Maxim. A simple and flexible program to monitor and control the

diff --git a/sys-fs/s3backer/metadata.xml b/sys-fs/s3backer/metadata.xml
index 368e18c..f66fc22 100644
--- a/sys-fs/s3backer/metadata.xml
+++ b/sys-fs/s3backer/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">s3backer</remote-id>
 		<remote-id type="github">archiecobbs/s3backer</remote-id>

diff --git a/sys-fs/s3fs/metadata.xml b/sys-fs/s3fs/metadata.xml
index e903c6d..29143c9 100644
--- a/sys-fs/s3fs/metadata.xml
+++ b/sys-fs/s3fs/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">s3fs is a utility to mount Amazon S3 as a filesystem over FUSE</longdescription>
 	<upstream>
 		<remote-id type="google-code">s3fs</remote-id>

diff --git a/sys-fs/udisks-glue/metadata.xml b/sys-fs/udisks-glue/metadata.xml
index 17d23ba..92f869f 100644
--- a/sys-fs/udisks-glue/metadata.xml
+++ b/sys-fs/udisks-glue/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">fernandotcl/udisks-glue</remote-id>
 	</upstream>

diff --git a/sys-kernel/vserver-sources/metadata.xml b/sys-kernel/vserver-sources/metadata.xml
index 05cda02..c12617b 100644
--- a/sys-kernel/vserver-sources/metadata.xml
+++ b/sys-kernel/vserver-sources/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 		The basic concept of the Linux-VServer solution is to separate the
 		user-space environment into distinct units (sometimes called Virtual Private
 		Server) in such way that each VPS looks and feels like a real server to the

diff --git a/sys-libs/libfaketime/metadata.xml b/sys-libs/libfaketime/metadata.xml
index ec80453..71d90a6 100644
--- a/sys-libs/libfaketime/metadata.xml
+++ b/sys-libs/libfaketime/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		The Fake Time Preload Library (FTPL, a.k.a. libfaketime) intercepts
 		various system calls which programs use to retrieve the current date and time.

diff --git a/sys-libs/libixp/metadata.xml b/sys-libs/libixp/metadata.xml
index 4538a68..097975e 100644
--- a/sys-libs/libixp/metadata.xml
+++ b/sys-libs/libixp/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/sys-libs/libstatgrab/metadata.xml b/sys-libs/libstatgrab/metadata.xml
index 91f4e72..097975e 100644
--- a/sys-libs/libstatgrab/metadata.xml
+++ b/sys-libs/libstatgrab/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/sys-libs/libtrash/metadata.xml b/sys-libs/libtrash/metadata.xml
index d9cd2ca..097975e 100644
--- a/sys-libs/libtrash/metadata.xml
+++ b/sys-libs/libtrash/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/sys-libs/system-config-base/metadata.xml b/sys-libs/system-config-base/metadata.xml
index 59e2b8f..097975e 100644
--- a/sys-libs/system-config-base/metadata.xml
+++ b/sys-libs/system-config-base/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/sys-power/acpitool/metadata.xml b/sys-power/acpitool/metadata.xml
index 4538a68..097975e 100644
--- a/sys-power/acpitool/metadata.xml
+++ b/sys-power/acpitool/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/sys-power/cpudyn/metadata.xml b/sys-power/cpudyn/metadata.xml
index 4538a68..097975e 100644
--- a/sys-power/cpudyn/metadata.xml
+++ b/sys-power/cpudyn/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/sys-power/cpuspeedy/metadata.xml b/sys-power/cpuspeedy/metadata.xml
index 3bf8fc4..40ab2c4 100644
--- a/sys-power/cpuspeedy/metadata.xml
+++ b/sys-power/cpuspeedy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 Cpuspeedy is a simple tool written in Python which allows you to change the clock speed and voltage of the CPUs 
 using the Linux's CPUFreq driver

diff --git a/sys-power/ncpufreqd/metadata.xml b/sys-power/ncpufreqd/metadata.xml
index b32295f..8ed92ab 100644
--- a/sys-power/ncpufreqd/metadata.xml
+++ b/sys-power/ncpufreqd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="bitbucket">nelchael/ncpufreqd</remote-id>
 	</upstream>

diff --git a/sys-power/powerman/metadata.xml b/sys-power/powerman/metadata.xml
index 04d640e..808b5d9 100644
--- a/sys-power/powerman/metadata.xml
+++ b/sys-power/powerman/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">Powerman provides power management in a data center or compute cluster
 	  environment.  It performs operations such as power on, power off, and
 	  power cycle via remote power controller (RPC) devices.</longdescription>

diff --git a/sys-power/powermgmt-base/metadata.xml b/sys-power/powermgmt-base/metadata.xml
index bc3ce87..0dbb3f3 100644
--- a/sys-power/powermgmt-base/metadata.xml
+++ b/sys-power/powermgmt-base/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-  <use>
+<use>
     <flag name="pm-utils">Adds support for on_ac_power through <pkg>sys-power/pm-utils</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/sys-process/nmon/metadata.xml b/sys-process/nmon/metadata.xml
index 143ec9f..3fdfcf6 100644
--- a/sys-process/nmon/metadata.xml
+++ b/sys-process/nmon/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">nmon</remote-id>
 	</upstream>

diff --git a/www-apache/libapreq2/metadata.xml b/www-apache/libapreq2/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/libapreq2/metadata.xml
+++ b/www-apache/libapreq2/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_access_dnsbl/metadata.xml b/www-apache/mod_access_dnsbl/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_access_dnsbl/metadata.xml
+++ b/www-apache/mod_access_dnsbl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_anonymize_ip/metadata.xml b/www-apache/mod_anonymize_ip/metadata.xml
index 0302f76..f257f4d 100644
--- a/www-apache/mod_anonymize_ip/metadata.xml
+++ b/www-apache/mod_anonymize_ip/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">hollow/mod_anonymize_ip</remote-id>
 	</upstream>

diff --git a/www-apache/mod_auth_cookie_mysql2/metadata.xml b/www-apache/mod_auth_cookie_mysql2/metadata.xml
index 1289a22..097975e 100644
--- a/www-apache/mod_auth_cookie_mysql2/metadata.xml
+++ b/www-apache/mod_auth_cookie_mysql2/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-  		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_auth_imap2/metadata.xml b/www-apache/mod_auth_imap2/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_auth_imap2/metadata.xml
+++ b/www-apache/mod_auth_imap2/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_auth_kerb/metadata.xml b/www-apache/mod_auth_kerb/metadata.xml
index b60e598..7f61ad5 100644
--- a/www-apache/mod_auth_kerb/metadata.xml
+++ b/www-apache/mod_auth_kerb/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">modauthkerb</remote-id>
 	</upstream>

diff --git a/www-apache/mod_auth_nufw/metadata.xml b/www-apache/mod_auth_nufw/metadata.xml
index fb401b5..9bc01e7 100644
--- a/www-apache/mod_auth_nufw/metadata.xml
+++ b/www-apache/mod_auth_nufw/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A NuFW authentication module for apache</longdescription>
 </pkgmetadata>

diff --git a/www-apache/mod_auth_openid/metadata.xml b/www-apache/mod_auth_openid/metadata.xml
index 42650fd..0a9650c 100644
--- a/www-apache/mod_auth_openid/metadata.xml
+++ b/www-apache/mod_auth_openid/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">bmuller/mod_auth_openid</remote-id>
 	</upstream>

diff --git a/www-apache/mod_auth_tkt/metadata.xml b/www-apache/mod_auth_tkt/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_auth_tkt/metadata.xml
+++ b/www-apache/mod_auth_tkt/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_authn_sasl/metadata.xml b/www-apache/mod_authn_sasl/metadata.xml
index a384843..99a76ef 100644
--- a/www-apache/mod_authn_sasl/metadata.xml
+++ b/www-apache/mod_authn_sasl/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mod-authn-sasl</remote-id>
 	</upstream>

diff --git a/www-apache/mod_authnz_external/metadata.xml b/www-apache/mod_authnz_external/metadata.xml
index e0670f8..64144cf 100644
--- a/www-apache/mod_authnz_external/metadata.xml
+++ b/www-apache/mod_authnz_external/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">mod-auth-external</remote-id>
 		<remote-id type="github">phokz/mod-auth-external</remote-id>

diff --git a/www-apache/mod_backtrace/metadata.xml b/www-apache/mod_backtrace/metadata.xml
index e4ed96a..2fd25d8 100644
--- a/www-apache/mod_backtrace/metadata.xml
+++ b/www-apache/mod_backtrace/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
   <flag name="unwind">
     Use <pkg>sys-libs/libunwind</pkg> to provide better resolution of

diff --git a/www-apache/mod_bw/metadata.xml b/www-apache/mod_bw/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_bw/metadata.xml
+++ b/www-apache/mod_bw/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_cband/metadata.xml b/www-apache/mod_cband/metadata.xml
index aba833e..097975e 100644
--- a/www-apache/mod_cband/metadata.xml
+++ b/www-apache/mod_cband/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_common_redirect/metadata.xml b/www-apache/mod_common_redirect/metadata.xml
index 7966e6e..47b6476 100644
--- a/www-apache/mod_common_redirect/metadata.xml
+++ b/www-apache/mod_common_redirect/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">hollow/mod_common_redirect</remote-id>
 	</upstream>

diff --git a/www-apache/mod_depends/metadata.xml b/www-apache/mod_depends/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_depends/metadata.xml
+++ b/www-apache/mod_depends/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_diagnostics/metadata.xml b/www-apache/mod_diagnostics/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_diagnostics/metadata.xml
+++ b/www-apache/mod_diagnostics/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_dnsbl_lookup/metadata.xml b/www-apache/mod_dnsbl_lookup/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_dnsbl_lookup/metadata.xml
+++ b/www-apache/mod_dnsbl_lookup/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_dnssd/metadata.xml b/www-apache/mod_dnssd/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_dnssd/metadata.xml
+++ b/www-apache/mod_dnssd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_evasive/metadata.xml b/www-apache/mod_evasive/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_evasive/metadata.xml
+++ b/www-apache/mod_evasive/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_extract_forwarded/metadata.xml b/www-apache/mod_extract_forwarded/metadata.xml
index f900469..4d00160 100644
--- a/www-apache/mod_extract_forwarded/metadata.xml
+++ b/www-apache/mod_extract_forwarded/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<use>
+<use>
 		<flag name="mod_proxy">Enable support for Apache's internal proxy</flag>
 	</use>
 </pkgmetadata>

diff --git a/www-apache/mod_fcgid/metadata.xml b/www-apache/mod_fcgid/metadata.xml
index 43da068..a414bc2 100644
--- a/www-apache/mod_fcgid/metadata.xml
+++ b/www-apache/mod_fcgid/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		mod_fcgid has a new process management strategy, which concentrates on
 		reducing the number of fastcgi server, and kick out the corrupt fastcgi

diff --git a/www-apache/mod_flvx/metadata.xml b/www-apache/mod_flvx/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_flvx/metadata.xml
+++ b/www-apache/mod_flvx/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_ftpd/metadata.xml b/www-apache/mod_ftpd/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_ftpd/metadata.xml
+++ b/www-apache/mod_ftpd/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_geoip2/metadata.xml b/www-apache/mod_geoip2/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_geoip2/metadata.xml
+++ b/www-apache/mod_geoip2/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_layout/metadata.xml b/www-apache/mod_layout/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_layout/metadata.xml
+++ b/www-apache/mod_layout/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_ldap_userdir/metadata.xml b/www-apache/mod_ldap_userdir/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_ldap_userdir/metadata.xml
+++ b/www-apache/mod_ldap_userdir/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_loadavg/metadata.xml b/www-apache/mod_loadavg/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_loadavg/metadata.xml
+++ b/www-apache/mod_loadavg/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_log_rotate/metadata.xml b/www-apache/mod_log_rotate/metadata.xml
index 5c72380..92940b3 100644
--- a/www-apache/mod_log_rotate/metadata.xml
+++ b/www-apache/mod_log_rotate/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">JBlond/mod_log_rotate</remote-id>
 	</upstream>

diff --git a/www-apache/mod_log_sql/metadata.xml b/www-apache/mod_log_sql/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_log_sql/metadata.xml
+++ b/www-apache/mod_log_sql/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_macro/metadata.xml b/www-apache/mod_macro/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_macro/metadata.xml
+++ b/www-apache/mod_macro/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_musicindex/metadata.xml b/www-apache/mod_musicindex/metadata.xml
index e4c6a0b..bd57810 100644
--- a/www-apache/mod_musicindex/metadata.xml
+++ b/www-apache/mod_musicindex/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<use>
+<use>
 		<flag name="cache">Add File cache support</flag>
 		<flag name="mysql">Add MySQL cache support</flag>
 		<flag name="archive">Add archive support</flag>

diff --git a/www-apache/mod_pcgi2/metadata.xml b/www-apache/mod_pcgi2/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_pcgi2/metadata.xml
+++ b/www-apache/mod_pcgi2/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_proxy_fcgi/metadata.xml b/www-apache/mod_proxy_fcgi/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_proxy_fcgi/metadata.xml
+++ b/www-apache/mod_proxy_fcgi/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_proxy_html/metadata.xml b/www-apache/mod_proxy_html/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_proxy_html/metadata.xml
+++ b/www-apache/mod_proxy_html/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_qos/metadata.xml b/www-apache/mod_qos/metadata.xml
index e2ea7e6..ae22364 100644
--- a/www-apache/mod_qos/metadata.xml
+++ b/www-apache/mod_qos/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mod-qos</remote-id>
 	</upstream>

diff --git a/www-apache/mod_rpaf/metadata.xml b/www-apache/mod_rpaf/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_rpaf/metadata.xml
+++ b/www-apache/mod_rpaf/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_scgi/metadata.xml b/www-apache/mod_scgi/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_scgi/metadata.xml
+++ b/www-apache/mod_scgi/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_tcl/metadata.xml b/www-apache/mod_tcl/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_tcl/metadata.xml
+++ b/www-apache/mod_tcl/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_tidy/metadata.xml b/www-apache/mod_tidy/metadata.xml
index d9410da..ba55b89 100644
--- a/www-apache/mod_tidy/metadata.xml
+++ b/www-apache/mod_tidy/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">mod-tidy</remote-id>
 	</upstream>

diff --git a/www-apache/mod_umask/metadata.xml b/www-apache/mod_umask/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_umask/metadata.xml
+++ b/www-apache/mod_umask/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_vdbh/metadata.xml b/www-apache/mod_vdbh/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_vdbh/metadata.xml
+++ b/www-apache/mod_vdbh/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_vhost_ldap/metadata.xml b/www-apache/mod_vhost_ldap/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_vhost_ldap/metadata.xml
+++ b/www-apache/mod_vhost_ldap/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_whatkilledus/metadata.xml b/www-apache/mod_whatkilledus/metadata.xml
index 4538a68..097975e 100644
--- a/www-apache/mod_whatkilledus/metadata.xml
+++ b/www-apache/mod_whatkilledus/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-apache/mod_xml2enc/metadata.xml b/www-apache/mod_xml2enc/metadata.xml
index 91f4e72..097975e 100644
--- a/www-apache/mod_xml2enc/metadata.xml
+++ b/www-apache/mod_xml2enc/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/www-apache/pwauth/metadata.xml b/www-apache/pwauth/metadata.xml
index a185bd7..d646f05 100644
--- a/www-apache/pwauth/metadata.xml
+++ b/www-apache/pwauth/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="domain-aware">Ignore leading domain names in username
 			(Windows compat)</flag>

diff --git a/www-apps/389-dsgw/metadata.xml b/www-apps/389-dsgw/metadata.xml
index f0da01e..a2c412a 100644
--- a/www-apps/389-dsgw/metadata.xml
+++ b/www-apps/389-dsgw/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
 	<flag name="adminserver">Install DSGW with Admin Server</flag>
 </use>

diff --git a/www-apps/browser-config/metadata.xml b/www-apps/browser-config/metadata.xml
index 59e2b8f..097975e 100644
--- a/www-apps/browser-config/metadata.xml
+++ b/www-apps/browser-config/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/www-apps/mirmon/metadata.xml b/www-apps/mirmon/metadata.xml
index c9288a48..08e8190 100644
--- a/www-apps/mirmon/metadata.xml
+++ b/www-apps/mirmon/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
-<longdescription>Simple graphical mirror monitor with html output to analyze whether data is being kept in sync.</longdescription>
+  <longdescription>Simple graphical mirror monitor with html output to analyze whether data is being kept in sync.</longdescription>
 </pkgmetadata>

diff --git a/www-apps/rutorrent/metadata.xml b/www-apps/rutorrent/metadata.xml
index 53065a2..9dfa622 100644
--- a/www-apps/rutorrent/metadata.xml
+++ b/www-apps/rutorrent/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>web-apps</herd>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">rutorrent</remote-id>
 		<remote-id type="github">Novik/ruTorrent</remote-id>

diff --git a/www-apps/scgi/metadata.xml b/www-apps/scgi/metadata.xml
index 4538a68..097975e 100644
--- a/www-apps/scgi/metadata.xml
+++ b/www-apps/scgi/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/www-client/ck4up/metadata.xml b/www-client/ck4up/metadata.xml
index 9aa04d5..41eb1fd 100644
--- a/www-client/ck4up/metadata.xml
+++ b/www-client/ck4up/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 ck4up is a small command-line utility, writen in ruby, to watch http and ftp 
 sites for updates. ck4up scans through a configuration file, fetches the 

diff --git a/www-client/dwb/metadata.xml b/www-client/dwb/metadata.xml
index 23e1ccd..448559c 100644
--- a/www-client/dwb/metadata.xml
+++ b/www-client/dwb/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="gtk3">Link against <pkg>x11-libs/gtk+:3</pkg> instead of
 			<pkg>x11-libs/gtk+:2</pkg></flag>

diff --git a/www-client/luakit/metadata.xml b/www-client/luakit/metadata.xml
index 9156b89..6abe855 100644
--- a/www-client/luakit/metadata.xml
+++ b/www-client/luakit/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="luajit">Use the lua just-in-time compiler
 		<pkg>dev-lang/luajit</pkg> instead of <pkg>dev-lang/lua</pkg>, which

diff --git a/www-client/netrik/metadata.xml b/www-client/netrik/metadata.xml
index a56e3ca..7994d36 100644
--- a/www-client/netrik/metadata.xml
+++ b/www-client/netrik/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">netrik</remote-id>
 		<bugs-to>http://sourceforge.net/tracker/?group_id=23183</bugs-to>

diff --git a/www-client/phantomjs/metadata.xml b/www-client/phantomjs/metadata.xml
index 9a71161..327a802 100644
--- a/www-client/phantomjs/metadata.xml
+++ b/www-client/phantomjs/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="google-code">phantomjs</remote-id>
 		<remote-id type="bitbucket">ariya/phantomjs</remote-id>

diff --git a/www-client/w3mir/metadata.xml b/www-client/w3mir/metadata.xml
index 59e2b8f..097975e 100644
--- a/www-client/w3mir/metadata.xml
+++ b/www-client/w3mir/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/www-misc/bookmarksync/metadata.xml b/www-misc/bookmarksync/metadata.xml
index 3076f2d..043a884 100644
--- a/www-misc/bookmarksync/metadata.xml
+++ b/www-misc/bookmarksync/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		bookmarksync is a tool used for synchronizing different bookmark files
 		and types. It preserves current bookmark structures and sorts in new

diff --git a/www-misc/gurlchecker/metadata.xml b/www-misc/gurlchecker/metadata.xml
index 771f836..73c5604 100644
--- a/www-misc/gurlchecker/metadata.xml
+++ b/www-misc/gurlchecker/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
 	<flag name="json">Enable support for parsing Google Chrome and derivatives bookmarks.</flag>
 	<flag name="sqlite">Enable support for parsing Firefox and derivatives bookmarks.</flag>

diff --git a/www-misc/log-toolkit/metadata.xml b/www-misc/log-toolkit/metadata.xml
index 91d9973..b113b4b 100644
--- a/www-misc/log-toolkit/metadata.xml
+++ b/www-misc/log-toolkit/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">log-toolkit</remote-id>
 	</upstream>

diff --git a/www-misc/mergelog/metadata.xml b/www-misc/mergelog/metadata.xml
index 1958abb..1679c62 100644
--- a/www-misc/mergelog/metadata.xml
+++ b/www-misc/mergelog/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
 </longdescription>

diff --git a/www-misc/monitorix/metadata.xml b/www-misc/monitorix/metadata.xml
index 19095cb..589e813 100644
--- a/www-misc/monitorix/metadata.xml
+++ b/www-misc/monitorix/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
     A lightweight system monitoring tool.
   </longdescription>

diff --git a/www-misc/multisort/metadata.xml b/www-misc/multisort/metadata.xml
index a40624f..097975e 100644
--- a/www-misc/multisort/metadata.xml
+++ b/www-misc/multisort/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/www-misc/profile-sync-daemon/metadata.xml b/www-misc/profile-sync-daemon/metadata.xml
index 5182ce9..6815845 100644
--- a/www-misc/profile-sync-daemon/metadata.xml
+++ b/www-misc/profile-sync-daemon/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">graysky2/profile-sync-daemon</remote-id>
 	</upstream>

diff --git a/www-misc/visitors/metadata.xml b/www-misc/visitors/metadata.xml
index e590d62..3367c96 100644
--- a/www-misc/visitors/metadata.xml
+++ b/www-misc/visitors/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		Visitors is a very fast web log analyzer for Linux, Windows, and other
 		Unix-like operating systems. It takes as input a web server log file, and

diff --git a/www-misc/wsmake/metadata.xml b/www-misc/wsmake/metadata.xml
index 59e2b8f..097975e 100644
--- a/www-misc/wsmake/metadata.xml
+++ b/www-misc/wsmake/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/www-servers/bozohttpd/metadata.xml b/www-servers/bozohttpd/metadata.xml
index 66bebd4..5b2eefb 100644
--- a/www-servers/bozohttpd/metadata.xml
+++ b/www-servers/bozohttpd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>
   bozohttpd is designed to be small, simple and relatively
   featureless, hopefully increasing its security.

diff --git a/www-servers/fnord/metadata.xml b/www-servers/fnord/metadata.xml
index ddfa03c..7a0fc0a 100644
--- a/www-servers/fnord/metadata.xml
+++ b/www-servers/fnord/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
-	<use>
+<use>
 		<flag name="auth">Enable HTTP authentication support</flag>
 	</use>
 </pkgmetadata>

diff --git a/www-servers/webfs/metadata.xml b/www-servers/webfs/metadata.xml
index a40624f..097975e 100644
--- a/www-servers/webfs/metadata.xml
+++ b/www-servers/webfs/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/x11-apps/copyq/metadata.xml b/x11-apps/copyq/metadata.xml
index 2a98a21..89c2577 100644
--- a/x11-apps/copyq/metadata.xml
+++ b/x11-apps/copyq/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="webkit">
 	enables the application to use advanced HTML rendering and fetching 

diff --git a/x11-apps/xwarppointer/metadata.xml b/x11-apps/xwarppointer/metadata.xml
index a40624f..097975e 100644
--- a/x11-apps/xwarppointer/metadata.xml
+++ b/x11-apps/xwarppointer/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/x11-libs/dnd/metadata.xml b/x11-libs/dnd/metadata.xml
index 59e2b8f..097975e 100644
--- a/x11-libs/dnd/metadata.xml
+++ b/x11-libs/dnd/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/x11-libs/gtkhotkey/metadata.xml b/x11-libs/gtkhotkey/metadata.xml
index 3a0f048..9cde3e0 100644
--- a/x11-libs/gtkhotkey/metadata.xml
+++ b/x11-libs/gtkhotkey/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="launchpad">gtkhotkey</remote-id>
 	</upstream>

diff --git a/x11-libs/hippo-canvas/metadata.xml b/x11-libs/hippo-canvas/metadata.xml
index b0b69c2..7ac82ad 100644
--- a/x11-libs/hippo-canvas/metadata.xml
+++ b/x11-libs/hippo-canvas/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 	HippoCanvas is a generic user interface element that can draw Cairo graphics, respond to key and mouse events,
 	and lay out other widgets. It is currently used to implement a number of Sugar's custom widgets (toolbars,

diff --git a/x11-libs/libXaw3dXft/metadata.xml b/x11-libs/libXaw3dXft/metadata.xml
index 402a82e..e653735 100644
--- a/x11-libs/libXaw3dXft/metadata.xml
+++ b/x11-libs/libXaw3dXft/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sf-xpaint</remote-id>
 	</upstream>

diff --git a/x11-libs/libaosd/metadata.xml b/x11-libs/libaosd/metadata.xml
index ea0d54e..b16decd 100644
--- a/x11-libs/libaosd/metadata.xml
+++ b/x11-libs/libaosd/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="pango">Enable the textual helpers (requires pangocairo).</flag>
 		<flag name="tools">Install the aosd_cat tool (requires glib-2.0).</flag>

diff --git a/x11-libs/libproplist/metadata.xml b/x11-libs/libproplist/metadata.xml
index 91f4e72..097975e 100644
--- a/x11-libs/libproplist/metadata.xml
+++ b/x11-libs/libproplist/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/x11-libs/libsvg-cairo/metadata.xml b/x11-libs/libsvg-cairo/metadata.xml
index 91f4e72..097975e 100644
--- a/x11-libs/libsvg-cairo/metadata.xml
+++ b/x11-libs/libsvg-cairo/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/x11-libs/neXtaw/metadata.xml b/x11-libs/neXtaw/metadata.xml
index ff62877..097975e 100644
--- a/x11-libs/neXtaw/metadata.xml
+++ b/x11-libs/neXtaw/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/x11-libs/rep-gtk/metadata.xml b/x11-libs/rep-gtk/metadata.xml
index 4538a68..097975e 100644
--- a/x11-libs/rep-gtk/metadata.xml
+++ b/x11-libs/rep-gtk/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-libs/scw/metadata.xml b/x11-libs/scw/metadata.xml
index 77bc185..62246d2 100644
--- a/x11-libs/scw/metadata.xml
+++ b/x11-libs/scw/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 	<longdescription lang="en">
 		Scw is a widget set specifically designed for chat programs. It extends
 		the Gtk+ widget set.

diff --git a/x11-libs/xforms/metadata.xml b/x11-libs/xforms/metadata.xml
index a40624f..097975e 100644
--- a/x11-libs/xforms/metadata.xml
+++ b/x11-libs/xforms/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/x11-misc/alltray/metadata.xml b/x11-misc/alltray/metadata.xml
index 2e4a29d..3434e8e 100644
--- a/x11-misc/alltray/metadata.xml
+++ b/x11-misc/alltray/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 With AllTray you can dock any application into the system tray/notification
 area. A high-light feature is that a click on the "close" button will minimize

diff --git a/x11-misc/bbappconf/metadata.xml b/x11-misc/bbappconf/metadata.xml
index 651c7b4..4c27bfc 100644
--- a/x11-misc/bbappconf/metadata.xml
+++ b/x11-misc/bbappconf/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
   bbappconf is a utility that allows you to specify window properties 
   in Blackbox.

diff --git a/x11-misc/bbcd/metadata.xml b/x11-misc/bbcd/metadata.xml
index 3676263..dee7bfa 100644
--- a/x11-misc/bbcd/metadata.xml
+++ b/x11-misc/bbcd/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-  <longdescription>
+<longdescription>
   Basic CD Player app for Blackbox.
   </longdescription>
 </pkgmetadata>

diff --git a/x11-misc/bbdate/metadata.xml b/x11-misc/bbdate/metadata.xml
index 7771645..32f64d6 100644
--- a/x11-misc/bbdate/metadata.xml
+++ b/x11-misc/bbdate/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A data display for Blackbox.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">bbtools</remote-id>

diff --git a/x11-misc/bbkeys/metadata.xml b/x11-misc/bbkeys/metadata.xml
index 82f8fca..7143f6e 100644
--- a/x11-misc/bbkeys/metadata.xml
+++ b/x11-misc/bbkeys/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
   A keygrabber for Blackbox.
   </longdescription>

diff --git a/x11-misc/bblaunch/metadata.xml b/x11-misc/bblaunch/metadata.xml
index 1ea7ce4..b50055c 100644
--- a/x11-misc/bblaunch/metadata.xml
+++ b/x11-misc/bblaunch/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
   An application launcher for Blackbox.
   </longdescription>

diff --git a/x11-misc/bbmail/metadata.xml b/x11-misc/bbmail/metadata.xml
index 670d4c7..ddfad80 100644
--- a/x11-misc/bbmail/metadata.xml
+++ b/x11-misc/bbmail/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
   Mail notification for Blackbox.
   </longdescription>

diff --git a/x11-misc/bbpager/metadata.xml b/x11-misc/bbpager/metadata.xml
index 93d6fc9..98f7dc7 100644
--- a/x11-misc/bbpager/metadata.xml
+++ b/x11-misc/bbpager/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
   An understated pager for Blackbox.
   </longdescription>

diff --git a/x11-misc/bbppp/metadata.xml b/x11-misc/bbppp/metadata.xml
index 5527b7f..fc5be6a 100644
--- a/x11-misc/bbppp/metadata.xml
+++ b/x11-misc/bbppp/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription>
   A PPP frontend/monitor for Blackbox.
   </longdescription>

diff --git a/x11-misc/bbrun/metadata.xml b/x11-misc/bbrun/metadata.xml
index 4538a68..097975e 100644
--- a/x11-misc/bbrun/metadata.xml
+++ b/x11-misc/bbrun/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-misc/bbsload/metadata.xml b/x11-misc/bbsload/metadata.xml
index 5da1df5..da72061 100644
--- a/x11-misc/bbsload/metadata.xml
+++ b/x11-misc/bbsload/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>Load monitor for Blackbox.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">bbtools</remote-id>

diff --git a/x11-misc/bbtime/metadata.xml b/x11-misc/bbtime/metadata.xml
index 22b8da1..5f00fc9 100644
--- a/x11-misc/bbtime/metadata.xml
+++ b/x11-misc/bbtime/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>A time monitor for Blackbox.</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">bbtools</remote-id>

diff --git a/x11-misc/bbweather/metadata.xml b/x11-misc/bbweather/metadata.xml
index 2391229..a71efb3 100644
--- a/x11-misc/bbweather/metadata.xml
+++ b/x11-misc/bbweather/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 	Weather monitor for Blackbox.
 	</longdescription>
 </pkgmetadata>

diff --git a/x11-misc/blockdpy/metadata.xml b/x11-misc/blockdpy/metadata.xml
index a40624f..097975e 100644
--- a/x11-misc/blockdpy/metadata.xml
+++ b/x11-misc/blockdpy/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/x11-misc/bmpanel/metadata.xml b/x11-misc/bmpanel/metadata.xml
index 039e038..48c7b00 100644
--- a/x11-misc/bmpanel/metadata.xml
+++ b/x11-misc/bmpanel/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="libev">Use the libev event loop interface</flag>
 		<flag name="libevent">Use the libevent event loop interface</flag>

diff --git a/x11-misc/denu/metadata.xml b/x11-misc/denu/metadata.xml
index ef92521..f1e4c97 100644
--- a/x11-misc/denu/metadata.xml
+++ b/x11-misc/denu/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <upstream>
     <remote-id type="sourceforge">denu</remote-id>
   </upstream>

diff --git a/x11-misc/dragbox/metadata.xml b/x11-misc/dragbox/metadata.xml
index 92b3109..f3b74e3 100644
--- a/x11-misc/dragbox/metadata.xml
+++ b/x11-misc/dragbox/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>

diff --git a/x11-misc/electricsheep/metadata.xml b/x11-misc/electricsheep/metadata.xml
index 91f4e72..097975e 100644
--- a/x11-misc/electricsheep/metadata.xml
+++ b/x11-misc/electricsheep/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/x11-misc/etm/metadata.xml b/x11-misc/etm/metadata.xml
index 1b2855b..ab21ea8 100644
--- a/x11-misc/etm/metadata.xml
+++ b/x11-misc/etm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		etm is an acronym for Event and Task Manager. It provides a simple,
 		intuitive format for using plain text files to store data, a command

diff --git a/x11-misc/fbdesk/metadata.xml b/x11-misc/fbdesk/metadata.xml
index a9a6a2b..624d2ee 100644
--- a/x11-misc/fbdesk/metadata.xml
+++ b/x11-misc/fbdesk/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fluxbox</remote-id>
 	</upstream>

diff --git a/x11-misc/fbpager/metadata.xml b/x11-misc/fbpager/metadata.xml
index c1e80b6..32262af 100644
--- a/x11-misc/fbpager/metadata.xml
+++ b/x11-misc/fbpager/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<use>
+<use>
 		<flag name="xrender">Enable transparency support via
 			<pkg>x11-libs/libXrender</pkg></flag>
 	</use>

diff --git a/x11-misc/ftmenu/metadata.xml b/x11-misc/ftmenu/metadata.xml
index 577eb66..47aa20c 100644
--- a/x11-misc/ftmenu/metadata.xml
+++ b/x11-misc/ftmenu/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">ftmenu</remote-id>
 	</upstream>

diff --git a/x11-misc/genmenu/metadata.xml b/x11-misc/genmenu/metadata.xml
index 59e2b8f..097975e 100644
--- a/x11-misc/genmenu/metadata.xml
+++ b/x11-misc/genmenu/metadata.xml
@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-		<name>Default assignee for orphaned packages</name>
-	</maintainer>
 </pkgmetadata>

diff --git a/x11-misc/growl-for-linux/metadata.xml b/x11-misc/growl-for-linux/metadata.xml
index a32d58e..ed3c10d 100644
--- a/x11-misc/growl-for-linux/metadata.xml
+++ b/x11-misc/growl-for-linux/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
   <longdescription lang="en">
     Growl For Linux is Linux-compatible of Growl. Growl is a notification system for Mac OS X.
   </longdescription>

diff --git a/x11-misc/idesk-extras/metadata.xml b/x11-misc/idesk-extras/metadata.xml
index 91f4e72..097975e 100644
--- a/x11-misc/idesk-extras/metadata.xml
+++ b/x11-misc/idesk-extras/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/x11-misc/ipager/metadata.xml b/x11-misc/ipager/metadata.xml
index 3e5005e..b564246 100644
--- a/x11-misc/ipager/metadata.xml
+++ b/x11-misc/ipager/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		A themeable desktop pager for fluxbox and other window managers.
 	</longdescription>

diff --git a/x11-misc/netwmpager/metadata.xml b/x11-misc/netwmpager/metadata.xml
index 402a82e..e653735 100644
--- a/x11-misc/netwmpager/metadata.xml
+++ b/x11-misc/netwmpager/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">sf-xpaint</remote-id>
 	</upstream>

diff --git a/x11-misc/nts/metadata.xml b/x11-misc/nts/metadata.xml
index 67c744f..ff796b8 100644
--- a/x11-misc/nts/metadata.xml
+++ b/x11-misc/nts/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		nts is an acronym for Note Taking Simplified. It provides a simple,
 		intuitive format for using plain text files to store notes, a command

diff --git a/x11-misc/obmenu-generator/metadata.xml b/x11-misc/obmenu-generator/metadata.xml
index f28aa89..6ddc51a 100644
--- a/x11-misc/obmenu-generator/metadata.xml
+++ b/x11-misc/obmenu-generator/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<maintainer status="active">
 			<email>trizenx@gmail.com</email>

diff --git a/x11-misc/obmenu/metadata.xml b/x11-misc/obmenu/metadata.xml
index 7b6a9e3..759cf17 100644
--- a/x11-misc/obmenu/metadata.xml
+++ b/x11-misc/obmenu/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">obmenu</remote-id>
 	</upstream>

diff --git a/x11-misc/oroborus-desklaunch/metadata.xml b/x11-misc/oroborus-desklaunch/metadata.xml
index 1c8c129..4256b02 100644
--- a/x11-misc/oroborus-desklaunch/metadata.xml
+++ b/x11-misc/oroborus-desklaunch/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 		DeskLaunch is a small utility for creating desktop icons using pixmaps. 
 		A simple click will launch the desired application.
 	</longdescription>

diff --git a/x11-misc/oroborus-deskmenu/metadata.xml b/x11-misc/oroborus-deskmenu/metadata.xml
index 0315d8a..f5eb5a5 100644
--- a/x11-misc/oroborus-deskmenu/metadata.xml
+++ b/x11-misc/oroborus-deskmenu/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 		DeskMenu is a root menu program which is activated by clicking the root window. 
 		It is configured from a .deskmenurc file in your home directory. DeskMenu is 
 		useful for window managers which do not provide a menu such as Oroborus.

diff --git a/x11-misc/oroborus-keylaunch/metadata.xml b/x11-misc/oroborus-keylaunch/metadata.xml
index 47fa4b0..9f4ea13 100644
--- a/x11-misc/oroborus-keylaunch/metadata.xml
+++ b/x11-misc/oroborus-keylaunch/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 		KeyLaunch is a small utility for binding commands to a hot key. It reads a configuration 
 		file in ~/.keylaunchrc. KeyLaunch uses Ctrl, Alt and Shift as modifier keys, 
 		the hotkey is up to the user.

diff --git a/x11-misc/peksystray/metadata.xml b/x11-misc/peksystray/metadata.xml
index a7d80a1..a0460c0 100644
--- a/x11-misc/peksystray/metadata.xml
+++ b/x11-misc/peksystray/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">peksystray</remote-id>
 		<remote-id type="freshmeat">peksystray</remote-id>

diff --git a/x11-misc/superswitcher/metadata.xml b/x11-misc/superswitcher/metadata.xml
index 39234cc..a2833a9 100644
--- a/x11-misc/superswitcher/metadata.xml
+++ b/x11-misc/superswitcher/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">SuperSwitcher is a (more feature-ful) replacement for the Alt-Tab window
 switching behavior and Ctrl-Alt-Left/Right/Up/Down workspace switching behavior
 that is currently provided by Metacity.</longdescription>

diff --git a/x11-misc/tintwizard/metadata.xml b/x11-misc/tintwizard/metadata.xml
index 6f6d944..827ecc5 100644
--- a/x11-misc/tintwizard/metadata.xml
+++ b/x11-misc/tintwizard/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">This project aims to provide an easy way to change the appearance of
 		tint2. Through an easy-to-use graphical user interface, you can generate
 		configs and apply to them tint2.</longdescription>

diff --git a/x11-misc/touchcal/metadata.xml b/x11-misc/touchcal/metadata.xml
index e4c3af1..86b62df 100644
--- a/x11-misc/touchcal/metadata.xml
+++ b/x11-misc/touchcal/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">touchcal</remote-id>
 	</upstream>

diff --git a/x11-misc/wmctrl/metadata.xml b/x11-misc/wmctrl/metadata.xml
index a0142a4..54dbefb 100644
--- a/x11-misc/wmctrl/metadata.xml
+++ b/x11-misc/wmctrl/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 		 The wmctrl program is a command line tool to interact with an 
 		 EWMH/NetWM compatible X Window Manager. It provides command line 
 		 access to almost all the features defined in the EWMH specification.

diff --git a/x11-misc/x2vnc/metadata.xml b/x11-misc/x2vnc/metadata.xml
index 497c310..40838bc 100644
--- a/x11-misc/x2vnc/metadata.xml
+++ b/x11-misc/x2vnc/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>desktop-misc</herd>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/x11-misc/xcalib/metadata.xml b/x11-misc/xcalib/metadata.xml
index c99ec37..91687fd 100644
--- a/x11-misc/xcalib/metadata.xml
+++ b/x11-misc/xcalib/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
-        <email>maintainer-needed@gentoo.org</email>
-    </maintainer>
     <upstream>
         <remote-id type="sourceforge">xcalib</remote-id>
     </upstream>

diff --git a/x11-misc/xfractint/metadata.xml b/x11-misc/xfractint/metadata.xml
index ff62877..097975e 100644
--- a/x11-misc/xfractint/metadata.xml
+++ b/x11-misc/xfractint/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/asapm/metadata.xml b/x11-plugins/asapm/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/asapm/metadata.xml
+++ b/x11-plugins/asapm/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/asclock/metadata.xml b/x11-plugins/asclock/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/asclock/metadata.xml
+++ b/x11-plugins/asclock/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/ascpu/metadata.xml b/x11-plugins/ascpu/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/ascpu/metadata.xml
+++ b/x11-plugins/ascpu/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/asmem/metadata.xml b/x11-plugins/asmem/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/asmem/metadata.xml
+++ b/x11-plugins/asmem/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/asmon/metadata.xml b/x11-plugins/asmon/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/asmon/metadata.xml
+++ b/x11-plugins/asmon/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/astime/metadata.xml b/x11-plugins/astime/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/astime/metadata.xml
+++ b/x11-plugins/astime/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/desklet-Genesis/metadata.xml b/x11-plugins/desklet-Genesis/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/desklet-Genesis/metadata.xml
+++ b/x11-plugins/desklet-Genesis/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/desklet-ImageSlideShow/metadata.xml b/x11-plugins/desklet-ImageSlideShow/metadata.xml
index 1420c98..8c9d3e7 100644
--- a/x11-plugins/desklet-ImageSlideShow/metadata.xml
+++ b/x11-plugins/desklet-ImageSlideShow/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription lang="en">
+<longdescription lang="en">
 		A Control for gDesklets (gnome-extra/gdesklets-core).  Provides
 		functions to control an image slideshow and read select image
 		meta-data.  Requires the Python Imaging Library.

diff --git a/x11-plugins/desklet-Mouse/metadata.xml b/x11-plugins/desklet-Mouse/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/desklet-Mouse/metadata.xml
+++ b/x11-plugins/desklet-Mouse/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/desklet-SlideShow/metadata.xml b/x11-plugins/desklet-SlideShow/metadata.xml
index 2d7f97b..58ff1ab 100644
--- a/x11-plugins/desklet-SlideShow/metadata.xml
+++ b/x11-plugins/desklet-SlideShow/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription lang="en">
+<longdescription lang="en">
 		A desklet for gDesklets (gnome-extra/gdesklets-core) that
 		cycles through a collection of pictures.  Will display image
 		captions (IPTC,JPEG Comment, EXIF) if available.

diff --git a/x11-plugins/desklet-WeeklyCalendar/metadata.xml b/x11-plugins/desklet-WeeklyCalendar/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/desklet-WeeklyCalendar/metadata.xml
+++ b/x11-plugins/desklet-WeeklyCalendar/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/desklet-ftb/metadata.xml b/x11-plugins/desklet-ftb/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/desklet-ftb/metadata.xml
+++ b/x11-plugins/desklet-ftb/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/desklet-iCalendarEvent/metadata.xml b/x11-plugins/desklet-iCalendarEvent/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/desklet-iCalendarEvent/metadata.xml
+++ b/x11-plugins/desklet-iCalendarEvent/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/desklet-justanicon/metadata.xml b/x11-plugins/desklet-justanicon/metadata.xml
index 4538a68..097975e 100644
--- a/x11-plugins/desklet-justanicon/metadata.xml
+++ b/x11-plugins/desklet-justanicon/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-plugins/pidgin-indicator/metadata.xml b/x11-plugins/pidgin-indicator/metadata.xml
index bc186e2..e0dfa1a 100644
--- a/x11-plugins/pidgin-indicator/metadata.xml
+++ b/x11-plugins/pidgin-indicator/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">philipl/pidgin-indicator</remote-id>
 	</upstream>

diff --git a/x11-plugins/wmstickynotes/metadata.xml b/x11-plugins/wmstickynotes/metadata.xml
index d6e04f2..112279e 100644
--- a/x11-plugins/wmstickynotes/metadata.xml
+++ b/x11-plugins/wmstickynotes/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">wmstickynotes</remote-id>
 	</upstream>

diff --git a/x11-terms/aterm/metadata.xml b/x11-terms/aterm/metadata.xml
index 8fc8c26..714525a 100644
--- a/x11-terms/aterm/metadata.xml
+++ b/x11-terms/aterm/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="background">Enable background image support via
 			<pkg>media-libs/libafterimage</pkg></flag>

diff --git a/x11-terms/multi-aterm/metadata.xml b/x11-terms/multi-aterm/metadata.xml
index ff62877..097975e 100644
--- a/x11-terms/multi-aterm/metadata.xml
+++ b/x11-terms/multi-aterm/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 </pkgmetadata>

diff --git a/x11-terms/root-tail/metadata.xml b/x11-terms/root-tail/metadata.xml
index 91f4e72..097975e 100644
--- a/x11-terms/root-tail/metadata.xml
+++ b/x11-terms/root-tail/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/x11-terms/rxvt/metadata.xml b/x11-terms/rxvt/metadata.xml
index 0d1ab3f..6610f5f 100644
--- a/x11-terms/rxvt/metadata.xml
+++ b/x11-terms/rxvt/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		rxvt is a color vt102 terminal emulator intended as an xterm(1)
 		replacement for users who do not require features such as Tektronix

diff --git a/x11-terms/xvt/metadata.xml b/x11-terms/xvt/metadata.xml
index a0c8ba6..34bc249 100644
--- a/x11-terms/xvt/metadata.xml
+++ b/x11-terms/xvt/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription lang="en">
 		A tiny vt100 terminal emulator for X.
 	</longdescription>

diff --git a/x11-themes/fvwm-themes/metadata.xml b/x11-themes/fvwm-themes/metadata.xml
index 6cdc485..277cf70 100644
--- a/x11-themes/fvwm-themes/metadata.xml
+++ b/x11-themes/fvwm-themes/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">fvwm-themes</remote-id>
 	</upstream>

diff --git a/x11-themes/fvwm_icons/metadata.xml b/x11-themes/fvwm_icons/metadata.xml
index 4538a68..097975e 100644
--- a/x11-themes/fvwm_icons/metadata.xml
+++ b/x11-themes/fvwm_icons/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-themes/fvwm_sounds/metadata.xml b/x11-themes/fvwm_sounds/metadata.xml
index 4538a68..097975e 100644
--- a/x11-themes/fvwm_sounds/metadata.xml
+++ b/x11-themes/fvwm_sounds/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-themes/gentoo-artwork/metadata.xml b/x11-themes/gentoo-artwork/metadata.xml
index 9becedd..2c0d0dc 100644
--- a/x11-themes/gentoo-artwork/metadata.xml
+++ b/x11-themes/gentoo-artwork/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <use>
 	<flag name="grub">Install extra <pkg>sys-boot/grub</pkg> themes</flag>
 	<flag name="icons">Install icons</flag>

diff --git a/x11-themes/gkrellm-themes/metadata.xml b/x11-themes/gkrellm-themes/metadata.xml
index eb8a401..3bcc031 100644
--- a/x11-themes/gkrellm-themes/metadata.xml
+++ b/x11-themes/gkrellm-themes/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
 <longdescription>This package installs all the gkrellm2 themes available at http://www.muhri.net/gkrellm</longdescription>
 </pkgmetadata>

diff --git a/x11-themes/gtk-engines-murrine/metadata.xml b/x11-themes/gtk-engines-murrine/metadata.xml
index fa0bbad..e1a3cf4 100644
--- a/x11-themes/gtk-engines-murrine/metadata.xml
+++ b/x11-themes/gtk-engines-murrine/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 "Murrine" is an Italian word meaning the glass artworks done by Venicians glass
 blowers. They're absolutely wonderful and colorful.

diff --git a/x11-themes/gtk-engines-nodoka/metadata.xml b/x11-themes/gtk-engines-nodoka/metadata.xml
index a5d9ea2..4b9a31d 100644
--- a/x11-themes/gtk-engines-nodoka/metadata.xml
+++ b/x11-themes/gtk-engines-nodoka/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<use>
 		<flag name="animation-rtl">Progressbar animation from right to left</flag>
 	</use>

diff --git a/x11-themes/iceicons/metadata.xml b/x11-themes/iceicons/metadata.xml
index 4538a68..097975e 100644
--- a/x11-themes/iceicons/metadata.xml
+++ b/x11-themes/iceicons/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-themes/murrine-themes/metadata.xml b/x11-themes/murrine-themes/metadata.xml
index aba833e..097975e 100644
--- a/x11-themes/murrine-themes/metadata.xml
+++ b/x11-themes/murrine-themes/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/x11-themes/nuvox/metadata.xml b/x11-themes/nuvox/metadata.xml
index effbbf3..097975e 100644
--- a/x11-themes/nuvox/metadata.xml
+++ b/x11-themes/nuvox/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-themes/pidgin-penguins-smileys/metadata.xml b/x11-themes/pidgin-penguins-smileys/metadata.xml
index 91f4e72..097975e 100644
--- a/x11-themes/pidgin-penguins-smileys/metadata.xml
+++ b/x11-themes/pidgin-penguins-smileys/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/x11-themes/psi-themes/metadata.xml b/x11-themes/psi-themes/metadata.xml
index f6aff5d..5ad7d2f 100644
--- a/x11-themes/psi-themes/metadata.xml
+++ b/x11-themes/psi-themes/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-</maintainer>
- <longdescription>Lots of emoticons and rooster icons for the Psi jabber client.</longdescription>
+<longdescription>Lots of emoticons and rooster icons for the Psi jabber client.</longdescription>
 </pkgmetadata>

diff --git a/x11-themes/pulse-glass/metadata.xml b/x11-themes/pulse-glass/metadata.xml
index 91f4e72..097975e 100644
--- a/x11-themes/pulse-glass/metadata.xml
+++ b/x11-themes/pulse-glass/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 </pkgmetadata>

diff --git a/x11-themes/wm-icons/metadata.xml b/x11-themes/wm-icons/metadata.xml
index ff5adc5..a07be69 100644
--- a/x11-themes/wm-icons/metadata.xml
+++ b/x11-themes/wm-icons/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <maintainer>
-        <email>maintainer-needed@gentoo.org</email>
-    </maintainer>
     <longdescription>
 	A hugely varied assortment of themed icons for use in X, created with FVWM in mind but works well in lots of other things too!
     </longdescription>

diff --git a/x11-themes/xcursor-neutral/metadata.xml b/x11-themes/xcursor-neutral/metadata.xml
index 1470e03..097975e 100644
--- a/x11-themes/xcursor-neutral/metadata.xml
+++ b/x11-themes/xcursor-neutral/metadata.xml
@@ -1,7 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer>
-    <email>maintainer-needed@gentoo.org</email>
-  </maintainer>
 </pkgmetadata>

diff --git a/x11-wm/aewm++/metadata.xml b/x11-wm/aewm++/metadata.xml
index dda5ad3..8a3409d 100644
--- a/x11-wm/aewm++/metadata.xml
+++ b/x11-wm/aewm++/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 	The aewm++ window manager is a fork of the popular minimal window manager 
 	aewm for the X Windows System. What makes it different is its codebase, 

diff --git a/x11-wm/amiwm/metadata.xml b/x11-wm/amiwm/metadata.xml
index 03b9f2f..8baee16 100644
--- a/x11-wm/amiwm/metadata.xml
+++ b/x11-wm/amiwm/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 	amiwm is an X window manager that tries to make your display look and 
 	feel like an Amiga Workbench screen. It is fully functional and can do 
 	all the usual window manager stuff, like moving and resizing windows.

diff --git a/x11-wm/blackbox/metadata.xml b/x11-wm/blackbox/metadata.xml
index 0deb53a..3db1be5 100644
--- a/x11-wm/blackbox/metadata.xml
+++ b/x11-wm/blackbox/metadata.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 	 Blackbox is that fast, light window manager you have been looking for 
 	 without all those annoying library dependencies. If you have a C++ 

diff --git a/x11-wm/ctwm/metadata.xml b/x11-wm/ctwm/metadata.xml
index 4538a68..097975e 100644
--- a/x11-wm/ctwm/metadata.xml
+++ b/x11-wm/ctwm/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-wm/larswm/metadata.xml b/x11-wm/larswm/metadata.xml
index 4ac6c58..86fe99a 100644
--- a/x11-wm/larswm/metadata.xml
+++ b/x11-wm/larswm/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 	larswm is a modified version of the 9wm window manager that adds virtual 
 	desktops, automatic window tiling, and many other features designed to 
 	make it a highly efficient user environment. One of the design goals is 

diff --git a/x11-wm/lwm/metadata.xml b/x11-wm/lwm/metadata.xml
index 7475916..8d73ffb 100644
--- a/x11-wm/lwm/metadata.xml
+++ b/x11-wm/lwm/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 	lwm is a window manager for X that tries to keep out of your face. 
 	There are no icons, no button bars, no icon docks, no root menus, 
 	no nothing.

diff --git a/x11-wm/matwm2/metadata.xml b/x11-wm/matwm2/metadata.xml
index 4538a68..097975e 100644
--- a/x11-wm/matwm2/metadata.xml
+++ b/x11-wm/matwm2/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-wm/oroborus/metadata.xml b/x11-wm/oroborus/metadata.xml
index 70fd2c6..ac8d68b 100644
--- a/x11-wm/oroborus/metadata.xml
+++ b/x11-wm/oroborus/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 		Oroborus is a small and simple but configurable and themeable window 
 		manager. There is no fancy dock, clip, wharf, or root menu - these 
 		utilities can be provided by other programs. It has support for GNOME 

diff --git a/x11-wm/sawfish/metadata.xml b/x11-wm/sawfish/metadata.xml
index cd6c593..80d83cd 100644
--- a/x11-wm/sawfish/metadata.xml
+++ b/x11-wm/sawfish/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer>
-  <email>maintainer-needed@gentoo.org</email>
-  <description>This package lacks a primary herd or maintainer.</description>
-</maintainer>
-<maintainer>
   <email>emacs@gentoo.org</email>
   <description>Components installed with USE=emacs.
     Do not assign for anything else.</description>

diff --git a/x11-wm/selectwm/metadata.xml b/x11-wm/selectwm/metadata.xml
index 4538a68..097975e 100644
--- a/x11-wm/selectwm/metadata.xml
+++ b/x11-wm/selectwm/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-wm/vtwm/metadata.xml b/x11-wm/vtwm/metadata.xml
index 3d8990d..4673cd2 100644
--- a/x11-wm/vtwm/metadata.xml
+++ b/x11-wm/vtwm/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-  <longdescription>VTWM, one of many TWM descendants, implements a Virtual
+<longdescription>VTWM, one of many TWM descendants, implements a Virtual
   Desktop, meaning that what is currently on screen is just a portion of a
   larger workspace. What portion of the virtual desktop that is displayed,
   and whatever windows might be visible within it, are simple

diff --git a/x11-wm/windowlab/metadata.xml b/x11-wm/windowlab/metadata.xml
index 8579926..2bb151a 100644
--- a/x11-wm/windowlab/metadata.xml
+++ b/x11-wm/windowlab/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-	<longdescription>
+<longdescription>
 	WindowLab is a small and simple window manager of novel design.
 
 	It has a click-to-focus but not raise-on-focus policy, a

diff --git a/x11-wm/wm2/metadata.xml b/x11-wm/wm2/metadata.xml
index 4538a68..097975e 100644
--- a/x11-wm/wm2/metadata.xml
+++ b/x11-wm/wm2/metadata.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 </pkgmetadata>

diff --git a/x11-wm/wmii/metadata.xml b/x11-wm/wmii/metadata.xml
index 2740a4d..25650eb 100644
--- a/x11-wm/wmii/metadata.xml
+++ b/x11-wm/wmii/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
-  <longdescription lang="en">
+<longdescription lang="en">
     wmii is a dynamic window manager for X11. It is highly customizable and
     usable with keyboard and mouse. It supports conventional, tabbed and
     tiled window management and has a small memory footprint. It is highly


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2016-01-24 23:08 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-24 23:08 [gentoo-commits] repo/gentoo:master commit in: net-misc/ipsvd/, media-gfx/quat/, x11-wm/oroborus/, net-misc/liveice/, Michał Górny

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox