public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-java/jboss-logging/, dev-libs/starpu/, sys-fs/dd-rescue/, dev-ros/rqt_topic/, ...
@ 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:     4412ca2c79a50481eff42550e9d63cba74c9ffc4
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 22:15:58 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=4412ca2c

Unify quoting in metadata.xml files for machine processing

Force unified quoting in all metadata.xml files since lxml does not
preserve original use of single and double quotes. Ensuring unified
quoting before the process allows distinguishing the GLEP 67-related
metadata.xml changes from unrelated quoting changes.

 app-accessibility/emacspeak/metadata.xml           |   2 +-
 app-accessibility/nfbtrans/metadata.xml            |   1 -
 app-accessibility/simon/metadata.xml               |   7 +-
 app-admin/bcfg2/metadata.xml                       |   6 +-
 app-admin/calamares/metadata.xml                   |   1 -
 app-admin/checksec/metadata.xml                    |   2 +-
 app-admin/collectd/metadata.xml                    | 234 +++++++++---------
 app-admin/conky/metadata.xml                       |   2 +-
 app-admin/cronolog/metadata.xml                    |   1 -
 app-admin/denyhosts/metadata.xml                   |   2 +-
 app-admin/diradm/metadata.xml                      |   4 +-
 app-admin/elektra/metadata.xml                     |   1 -
 app-admin/equo/metadata.xml                        |   1 -
 app-admin/gtkdiskfree/metadata.xml                 |   2 +-
 app-admin/hardening-check/metadata.xml             |   1 -
 app-admin/hddtemp/metadata.xml                     |   2 +-
 app-admin/keepassx/metadata.xml                    |   2 +-
 app-admin/kpcli/metadata.xml                       |   2 +-
 app-admin/logsentry/metadata.xml                   |   2 +-
 app-admin/logsurfer+/metadata.xml                  |   1 -
 app-admin/lsat/metadata.xml                        |   2 +-
 app-admin/matter/metadata.xml                      |   3 +-
 app-admin/mms-agent/metadata.xml                   |   1 -
 app-admin/packagekit-base/metadata.xml             |   1 -
 app-admin/packagekit-gtk/metadata.xml              |   1 -
 app-admin/packagekit-qt4/metadata.xml              |   1 -
 app-admin/packagekit/metadata.xml                  |   1 -
 app-admin/puppet-lint/metadata.xml                 |   3 +-
 app-admin/puppet/metadata.xml                      |   8 +-
 app-admin/qtpass/metadata.xml                      |   2 +-
 app-admin/r10k/metadata.xml                        |   2 +-
 app-admin/ranpwd/metadata.xml                      |   2 +-
 app-admin/rigo/metadata.xml                        |   1 -
 app-admin/sagan-rules/metadata.xml                 |   2 +-
 app-admin/sagan/metadata.xml                       |  10 +-
 app-admin/sudo/metadata.xml                        |   4 +-
 app-admin/sulfur/metadata.xml                      |   1 -
 app-admin/sysklogd/metadata.xml                    |   2 +-
 app-admin/testdisk/metadata.xml                    |   6 +-
 app-admin/ulogd/metadata.xml                       |  18 +-
 app-admin/webalizer/metadata.xml                   |   2 +-
 app-admin/webapp-config/metadata.xml               |   2 +-
 app-admin/whowatch/metadata.xml                    |   1 -
 app-admin/yaala/metadata.xml                       |   2 +-
 app-arch/arj/metadata.xml                          |   2 +-
 app-arch/defluff/metadata.xml                      |   2 +-
 app-arch/deltarpm/metadata.xml                     |   2 +-
 app-arch/file-roller/metadata.xml                  |   2 +-
 app-arch/gzip/metadata.xml                         |   2 +-
 app-arch/innoextract/metadata.xml                  |   2 +-
 app-arch/libarchive/metadata.xml                   |  10 +-
 app-arch/libzpaq/metadata.xml                      |   2 +-
 app-arch/lzop/metadata.xml                         |   2 +-
 app-arch/mscompress/metadata.xml                   |   2 +-
 app-arch/pxz/metadata.xml                          |   1 -
 app-arch/rar/metadata.xml                          |   2 +-
 app-arch/tar/metadata.xml                          |   2 +-
 app-arch/unshield/metadata.xml                     |   2 +-
 app-arch/upx-bin/metadata.xml                      |   2 +-
 app-backup/attic/metadata.xml                      |   2 +-
 app-backup/boxbackup/metadata.xml                  |   2 +-
 app-backup/snapper/metadata.xml                    |  10 +-
 app-backup/vzdump/metadata.xml                     |   1 -
 app-benchmarks/expedite/metadata.xml               |   4 +-
 app-benchmarks/iozone/metadata.xml                 |   2 +-
 app-benchmarks/jmeter/metadata.xml                 |   2 +-
 app-benchmarks/volanomark/metadata.xml             |   1 -
 app-cdr/cdrdao/metadata.xml                        |   2 +-
 app-cdr/cdrkit/metadata.xml                        |   3 +-
 app-cdr/cdw/metadata.xml                           |   2 +-
 app-cdr/cuetools/metadata.xml                      |   2 +-
 app-cdr/daa2iso/metadata.xml                       |   1 -
 app-cdr/disc-cover/metadata.xml                    |   2 +-
 app-cdr/dvdisaster/metadata.xml                    |   2 +-
 app-crypt/WiRouterKeyRec/metadata.xml              |   1 -
 app-crypt/acme/metadata.xml                        |   2 +-
 app-crypt/aespipe/metadata.xml                     |   2 +-
 app-crypt/af_alg/metadata.xml                      |   3 +-
 app-crypt/ccrypt/metadata.xml                      |   2 +-
 app-crypt/codecrypt/metadata.xml                   |   3 +-
 app-crypt/codegroup/metadata.xml                   |   1 -
 app-crypt/ekeyd/metadata.xml                       |   6 +-
 app-crypt/gnupg/metadata.xml                       |  12 +-
 app-crypt/hashcat-bin/metadata.xml                 |   1 -
 app-crypt/ima-evm-utils/metadata.xml               |   2 +-
 app-crypt/letsencrypt/metadata.xml                 |   2 +-
 app-crypt/loop-aes-losetup/metadata.xml            |   2 +-
 app-crypt/md5deep/metadata.xml                     |   2 +-
 app-crypt/oclhashcat-lite-bin/metadata.xml         |   1 -
 app-crypt/oclhashcat-plus-bin/metadata.xml         |   1 -
 app-crypt/pius/metadata.xml                        |   2 +-
 app-crypt/shishi/metadata.xml                      |   1 -
 app-dicts/aspell-be/metadata.xml                   |   2 +-
 app-dicts/aspell-ro/metadata.xml                   |   2 +-
 app-dicts/canna-2ch/metadata.xml                   |   2 +-
 app-dicts/freedict-deu-eng/metadata.xml            |   2 +-
 app-dicts/freedict-eng-fra/metadata.xml            |   2 +-
 app-dicts/freedict-eng-ita/metadata.xml            |   2 +-
 app-dicts/freedict-eng-swe/metadata.xml            |   2 +-
 app-dicts/freedict-fra-eng/metadata.xml            |   2 +-
 app-dicts/freedict-ita-eng/metadata.xml            |   2 +-
 app-dicts/gjiten/metadata.xml                      |   2 +-
 app-dicts/hunspell-kk/metadata.xml                 |   2 +-
 app-dicts/libydpdict/metadata.xml                  |   1 -
 app-dicts/myspell-pt/metadata.xml                  |   2 +-
 app-dicts/myspell-zu/metadata.xml                  |   2 +-
 app-dicts/opendict/metadata.xml                    |   2 +-
 app-dicts/prime-dict/metadata.xml                  |   2 +-
 app-dicts/stardict-cdict-en-zh-big5/metadata.xml   |   2 +-
 app-dicts/stardict-cdict-en-zh-gb/metadata.xml     |   2 +-
 app-dicts/stardict-cedict-zh-en-big5/metadata.xml  |   2 +-
 app-dicts/stardict-cedict-zh-en-gb/metadata.xml    |   2 +-
 app-dicts/stardict-dictd-devils/metadata.xml       |   2 +-
 app-dicts/stardict-freedict-eng-deu/metadata.xml   |   2 +-
 app-dicts/stardict-freedict-eng-fra/metadata.xml   |   2 +-
 app-dicts/stardict-freedict-eng-ita/metadata.xml   |   2 +-
 app-dicts/stardict-freedict-eng-lat/metadata.xml   |   2 +-
 app-dicts/stardict-freedict-eng-rus/metadata.xml   |   2 +-
 app-dicts/stardict-freedict-eng-spa/metadata.xml   |   2 +-
 app-dicts/stardict-freedict-eng-swe/metadata.xml   |   2 +-
 app-dicts/stardict-freedict-eng-tur/metadata.xml   |   2 +-
 app-dicts/stardict-freedict-tur-deu/metadata.xml   |   2 +-
 app-dicts/stardict-freedict-tur-eng/metadata.xml   |   2 +-
 app-dicts/stardict-langdao-en-zh-gb/metadata.xml   |   2 +-
 app-dicts/stardict-langdao-zh-en-gb/metadata.xml   |   2 +-
 app-dicts/stardict-mova-smiley/metadata.xml        |   2 +-
 app-dicts/stardict-oxford-en-zh-gb/metadata.xml    |   2 +-
 app-dicts/stardict-quick-eng-fra/metadata.xml      |   2 +-
 app-dicts/stardict-quick-eng-jpn/metadata.xml      |   2 +-
 app-dicts/stardict-quick-jpn-eng/metadata.xml      |   2 +-
 app-dicts/stardict-quick-ru-en/metadata.xml        |   2 +-
 app-dicts/stardict-xdict-en-zh-big5/metadata.xml   |   2 +-
 app-dicts/stardict-xdict-en-zh-gb/metadata.xml     |   2 +-
 app-dicts/stardict-xdict-zh-en-big5/metadata.xml   |   2 +-
 app-dicts/stardict-xdict-zh-en-gb/metadata.xml     |   2 +-
 app-dicts/ydpdict/metadata.xml                     |   1 -
 app-doc/devmanual/metadata.xml                     |   1 -
 app-doc/doxygen/metadata.xml                       |   6 +-
 app-doc/edox-data/metadata.xml                     |   6 +-
 app-doc/kicad-doc/metadata.xml                     |   2 +-
 app-doc/linuxfromscratch/metadata.xml              |   2 +-
 app-doc/tldp-howto/metadata.xml                    |   8 +-
 app-editors/XML-XSH2/metadata.xml                  |   2 +-
 app-editors/dav/metadata.xml                       |   2 +-
 app-editors/emacs-vcs/metadata.xml                 |  28 +--
 app-editors/emacs/metadata.xml                     |  28 +--
 app-editors/fe/metadata.xml                        |   2 +-
 app-editors/gedit-plugins/metadata.xml             |   2 +-
 app-editors/gummi/metadata.xml                     |   1 -
 app-editors/jasspa-microemacs/metadata.xml         |   2 +-
 app-editors/mousepad/metadata.xml                  |   2 +-
 app-editors/nano/metadata.xml                      |   8 +-
 app-editors/ne/metadata.xml                        |   2 +-
 app-editors/nedit/metadata.xml                     |   2 +-
 app-editors/neovim/metadata.xml                    |   2 +-
 app-editors/xemacs/metadata.xml                    |  12 +-
 app-editors/zile/metadata.xml                      |   2 +-
 app-emacs/anything/metadata.xml                    |   2 +-
 app-emacs/auctex/metadata.xml                      |   2 +-
 app-emacs/emacs-common-gentoo/metadata.xml         |   2 +-
 app-emacs/org-mode/metadata.xml                    |   4 +-
 app-emacs/remember/metadata.xml                    |   4 +-
 app-emacs/wikipedia-mode/metadata.xml              |   2 +-
 app-emulation/crossover-bin/metadata.xml           |   2 +-
 app-emulation/e-uae/metadata.xml                   |   4 +-
 app-emulation/ganeti-htools/metadata.xml           |   1 -
 app-emulation/ganeti-instance-image/metadata.xml   |   1 -
 app-emulation/ganeti/metadata.xml                  |  21 +-
 app-emulation/playonlinux/metadata.xml             |   1 -
 app-emulation/qemu-guest-agent/metadata.xml        |   1 -
 app-emulation/rex-client/metadata.xml              |   1 -
 app-emulation/uae/metadata.xml                     |   2 +-
 app-emulation/vagrant/metadata.xml                 |   2 +-
 app-emulation/vboxgtk/metadata.xml                 |   1 -
 app-emulation/virt-manager/metadata.xml            |   4 +-
 app-emulation/virt-viewer/metadata.xml             |   1 -
 app-emulation/virt-what/metadata.xml               |   3 +-
 app-emulation/virtualbox-bin/metadata.xml          |  12 +-
 app-emulation/virtualbox/metadata.xml              |  12 +-
 app-emulation/vmips-cross-bin/metadata.xml         |   2 +-
 app-emulation/vmware-player/metadata.xml           |   2 +-
 app-emulation/vov/metadata.xml                     |   2 +-
 app-emulation/xen-tools/metadata.xml               |  22 +-
 app-emulation/xen/metadata.xml                     |   6 +-
 app-emulation/xtrs/metadata.xml                    |   2 +-
 app-eselect/eselect-audicle/metadata.xml           |   1 -
 app-eselect/eselect-chuck/metadata.xml             |   1 -
 app-eselect/eselect-java/metadata.xml              |   1 -
 app-eselect/eselect-lua/metadata.xml               |   1 -
 app-eselect/eselect-miniaudicle/metadata.xml       |   1 -
 app-eselect/eselect-opencascade/metadata.xml       |   1 -
 app-eselect/eselect-php/metadata.xml               |   3 +-
 app-eselect/eselect-renpy/metadata.xml             |   1 -
 app-eselect/eselect-sndpeek/metadata.xml           |   1 -
 app-eselect/eselect-vi/metadata.xml                |   1 -
 app-forensics/foremost/metadata.xml                |   2 +-
 app-forensics/openscap/metadata.xml                |   1 -
 app-forensics/volatility/metadata.xml              |   1 -
 app-i18n/enca/metadata.xml                         |   2 +-
 app-i18n/fcitx-libpinyin/metadata.xml              |   2 +-
 app-i18n/fcitx/metadata.xml                        |  20 +-
 app-i18n/im-chooser/metadata.xml                   |   1 -
 app-i18n/im-ja/metadata.xml                        |   2 +-
 app-i18n/imsettings/metadata.xml                   |   2 +-
 app-i18n/libtomoe-gtk/metadata.xml                 |   2 +-
 app-i18n/man-pages-ja/metadata.xml                 |   2 +-
 app-i18n/man-pages-pl/metadata.xml                 |   2 +-
 app-i18n/poedit/metadata.xml                       |   2 +-
 app-i18n/scim-sayura/metadata.xml                  |   1 -
 app-i18n/scim-wijesekera/metadata.xml              |   2 +-
 app-i18n/tomoe/metadata.xml                        |   2 +-
 app-i18n/transifex-client/metadata.xml             |   2 +-
 app-i18n/xvnkb/metadata.xml                        |   2 +-
 app-laptop/hdapsd/metadata.xml                     |   2 +-
 app-laptop/i8kutils/metadata.xml                   |   2 +-
 app-laptop/laptop-mode-tools/metadata.xml          |   2 +-
 app-laptop/prey/metadata.xml                       |   1 -
 app-laptop/tp_smapi/metadata.xml                   |   2 +-
 app-leechcraft/lc-blasq/metadata.xml               |   2 +-
 app-leechcraft/lc-qrosp/metadata.xml               |   1 -
 app-leechcraft/liblaretz/metadata.xml              |   2 +-
 app-misc/abook/metadata.xml                        |   2 +-
 app-misc/ca-certificates/metadata.xml              |   2 +-
 app-misc/calendar/metadata.xml                     |   2 +-
 app-misc/cstream/metadata.xml                      |   3 +-
 app-misc/dateutils/metadata.xml                    |   2 +-
 app-misc/ddccontrol-db/metadata.xml                |   2 +-
 app-misc/ddccontrol/metadata.xml                   |   2 +-
 app-misc/digitemp/metadata.xml                     |   6 +-
 app-misc/dvtm/metadata.xml                         |   1 -
 app-misc/emelfm2/metadata.xml                      |   4 +-
 app-misc/evemu/metadata.xml                        |   2 +-
 app-misc/fslint/metadata.xml                       |   2 +-
 app-misc/geneweb/metadata.xml                      |   2 +-
 app-misc/graphlcd-base/metadata.xml                |   2 +-
 app-misc/hddled/metadata.xml                       |   1 -
 app-misc/hilite/metadata.xml                       |   2 +-
 app-misc/ignuit/metadata.xml                       |   1 -
 app-misc/iguanaIR/metadata.xml                     |   1 -
 app-misc/irtrans-irclient/metadata.xml             |   1 -
 app-misc/irtrans-irserver/metadata.xml             |   3 +-
 app-misc/jq/metadata.xml                           |   4 +-
 app-misc/lcd-stuff/metadata.xml                    |   2 +-
 app-misc/lcd4linux/metadata.xml                    |   2 +-
 app-misc/lfm/metadata.xml                          |   2 +-
 app-misc/ltunify/metadata.xml                      |   2 +-
 app-misc/magneto-loader/metadata.xml               |   1 -
 app-misc/note/metadata.xml                         |   4 +-
 app-misc/pax-utils/metadata.xml                    |   2 +-
 app-misc/pysmssend/metadata.xml                    |   1 -
 app-misc/pystopwatch/metadata.xml                  |   1 -
 app-misc/ranger/metadata.xml                       |   2 +-
 app-misc/recoll/metadata.xml                       |  34 +--
 app-misc/relevation/metadata.xml                   |   2 +-
 app-misc/slashtime/metadata.xml                    |   1 -
 app-misc/sleepyhead/metadata.xml                   |   2 +-
 app-misc/specto/metadata.xml                       |   2 +-
 app-misc/sphinx/metadata.xml                       |   6 +-
 app-misc/subsurface/metadata.xml                   |   2 +-
 app-misc/tablix/metadata.xml                       |   2 +-
 app-misc/tasque/metadata.xml                       |   4 +-
 app-misc/towitoko/metadata.xml                     |   2 +-
 app-misc/utimer/metadata.xml                       |   1 -
 app-misc/worker/metadata.xml                       |   4 +-
 app-misc/workrave/metadata.xml                     |   2 +-
 app-misc/yagtd/metadata.xml                        |   1 -
 app-misc/zygrib/metadata.xml                       |   3 +-
 app-mobilephone/bitpim/metadata.xml                |   2 +-
 app-mobilephone/dfu-util/metadata.xml              |   2 +-
 app-mobilephone/freesmee/metadata.xml              |   2 +-
 app-mobilephone/gammu/metadata.xml                 |   2 +-
 app-mobilephone/gnokii/metadata.xml                |   8 +-
 app-mobilephone/gnome-phone-manager/metadata.xml   |   2 +-
 app-mobilephone/obexd/metadata.xml                 |   5 +-
 app-mobilephone/ringtonetools/metadata.xml         |   2 +-
 app-mobilephone/smstools/metadata.xml              |   2 +-
 app-mobilephone/yaps/metadata.xml                  |   2 +-
 app-office/abiword/metadata.xml                    |  16 +-
 app-office/gnumeric/metadata.xml                   |   4 +-
 app-office/kmymoney/metadata.xml                   |   2 +-
 app-office/lyx/metadata.xml                        |  22 +-
 app-office/mdbtools/metadata.xml                   |   2 +-
 app-office/pinpoint/metadata.xml                   |   1 -
 app-office/unoconv/metadata.xml                    |   2 +-
 app-pda/dynamite/metadata.xml                      |   2 +-
 app-pda/ifuse/metadata.xml                         |   1 -
 app-portage/conf-update/metadata.xml               |   2 +-
 app-portage/deltup/metadata.xml                    |   2 +-
 app-portage/demerge/metadata.xml                   |   1 -
 app-portage/gpytage/metadata.xml                   |   1 -
 app-portage/layman/metadata.xml                    |   2 +-
 app-portage/pfl/metadata.xml                       |   2 +-
 app-shells/bash/metadata.xml                       |   8 +-
 app-shells/ccsh/metadata.xml                       |   2 +-
 app-shells/scsh-install-lib/metadata.xml           |   2 +-
 app-shells/shish/metadata.xml                      |   2 +-
 app-shells/z/metadata.xml                          |   2 +-
 app-text/an/metadata.xml                           |   1 -
 app-text/crf++/metadata.xml                        |   2 +-
 app-text/crm114/metadata.xml                       |   2 +-
 app-text/dblatex/metadata.xml                      |   2 +-
 app-text/docbook-sgml-utils/metadata.xml           |   2 +-
 app-text/dvipsk/metadata.xml                       |   1 -
 app-text/gocr/metadata.xml                         |   2 +-
 app-text/groonga-normalizer-mysql/metadata.xml     |   1 -
 app-text/groonga/metadata.xml                      |   1 -
 app-text/gtranslator/metadata.xml                  |   2 +-
 app-text/hnb/metadata.xml                          |   2 +-
 app-text/htmltidy/metadata.xml                     |   2 +-
 app-text/hyperestraier/metadata.xml                |   2 +-
 app-text/iso-codes/metadata.xml                    |   1 -
 app-text/keepnote/metadata.xml                     |   1 -
 app-text/lcdf-typetools/metadata.xml               |   2 +-
 app-text/liblangtag/metadata.xml                   |   2 +-
 app-text/llpp/metadata.xml                         |   1 -
 app-text/lodgeit/metadata.xml                      |   2 +-
 app-text/mathtex/metadata.xml                      |   2 +-
 app-text/mecab/metadata.xml                        |   2 +-
 app-text/mupdf/metadata.xml                        |   1 -
 app-text/odt2txt/metadata.xml                      |   1 -
 app-text/pdf2djvu/metadata.xml                     |   2 +-
 app-text/poppler/metadata.xml                      |   4 +-
 app-text/ps2eps/metadata.xml                       |   1 -
 app-text/ps2pkm/metadata.xml                       |   1 -
 app-text/sary/metadata.xml                         |   2 +-
 app-text/scrollkeeper-dtd/metadata.xml             |   2 +-
 app-text/skribe/metadata.xml                       |   1 -
 app-text/texlive/metadata.xml                      |  44 ++--
 app-text/tofrodos/metadata.xml                     |   2 +-
 app-text/wklej/metadata.xml                        |   2 +-
 app-text/wv/metadata.xml                           |   2 +-
 app-text/xlhtml/metadata.xml                       |   2 +-
 app-text/yagf/metadata.xml                         |   4 +-
 app-text/zathura-meta/metadata.xml                 |   2 +-
 app-text/zathura/metadata.xml                      |   4 +-
 app-vim/cctree/metadata.xml                        |   2 +-
 app-vim/colorv/metadata.xml                        |   2 +-
 app-vim/matrix/metadata.xml                        |   1 -
 app-vim/neocomplcache/metadata.xml                 |   2 +-
 app-vim/nerdcommenter/metadata.xml                 |   1 -
 app-vim/perl-support/metadata.xml                  |   2 +-
 app-vim/pyclewn/metadata.xml                       |   2 +-
 app-vim/ri-browser/metadata.xml                    |   1 -
 app-vim/salt-vim/metadata.xml                      |   2 +-
 app-vim/slimv/metadata.xml                         |   2 +-
 app-vim/splice/metadata.xml                        |   2 +-
 app-vim/taglist/metadata.xml                       |   2 +-
 app-vim/tt2-syntax/metadata.xml                    |   1 -
 app-vim/udev-syntax/metadata.xml                   |   1 -
 app-vim/vim-spell-cs/metadata.xml                  |   1 -
 app-vim/vim-spell-da/metadata.xml                  |   1 -
 app-vim/vim-spell-en/metadata.xml                  |   1 -
 app-vim/vim-spell-pl/metadata.xml                  |   1 -
 app-vim/vim-spell-ru/metadata.xml                  |   1 -
 app-vim/vimclojure/metadata.xml                    |   2 +-
 app-vim/vimpress/metadata.xml                      |   2 +-
 dev-ada/asis-gcc/metadata.xml                      |   2 +-
 dev-cpp/gstreamermm/metadata.xml                   |   1 -
 dev-cpp/gtkmm-utils/metadata.xml                   |   1 -
 dev-cpp/gtksourceviewmm/metadata.xml               |   2 +-
 dev-cpp/libxmlpp/metadata.xml                      |   2 +-
 dev-cpp/lucene++/metadata.xml                      |   1 -
 dev-cpp/mm-common/metadata.xml                     |   1 -
 dev-cpp/pangomm/metadata.xml                       |   1 -
 dev-cpp/rudiments/metadata.xml                     |   2 +-
 dev-cpp/websocketpp/metadata.xml                   |   1 -
 dev-db/apgdiff/metadata.xml                        |   2 +-
 dev-db/barman/metadata.xml                         |   2 +-
 dev-db/datadraw/metadata.xml                       |   1 -
 dev-db/db-je/metadata.xml                          |   1 -
 dev-db/hyperdex/metadata.xml                       |   1 -
 dev-db/m17n-contrib/metadata.xml                   |   1 -
 dev-db/mariadb-galera/metadata.xml                 |  32 +--
 dev-db/mariadb/metadata.xml                        |  52 ++--
 dev-db/mycli/metadata.xml                          |   2 +-
 dev-db/mysql-cluster/metadata.xml                  |  24 +-
 dev-db/mysql-connector-c++/metadata.xml            |   2 +-
 dev-db/mysql-udf-ipv6/metadata.xml                 |   2 +-
 dev-db/mysql/metadata.xml                          |  30 +--
 dev-db/percona-server/metadata.xml                 |  26 +-
 dev-db/pg_top/metadata.xml                         |   1 -
 dev-db/pgadmin3/metadata.xml                       |   2 +-
 dev-db/pgpool2/metadata.xml                        |   2 +-
 dev-db/phpmyadmin/metadata.xml                     |   2 +-
 dev-db/phppgadmin/metadata.xml                     |   2 +-
 dev-db/postgresql/metadata.xml                     |   6 +-
 dev-db/psqlodbc/metadata.xml                       |   2 +-
 dev-db/spatialite/metadata.xml                     |   6 +-
 dev-dotnet/nant/metadata.xml                       |   2 +-
 dev-embedded/avrdude/metadata.xml                  |   2 +-
 dev-embedded/libftdi/metadata.xml                  |   2 +-
 dev-embedded/pk2-la/metadata.xml                   |   2 +-
 dev-embedded/pk2cmd/metadata.xml                   |   1 -
 .../scratchbox-devkit-debian-squeeze/metadata.xml  |   1 -
 dev-embedded/scratchbox-devkit-svn/metadata.xml    |   1 -
 dev-embedded/scratchbox2/metadata.xml              |   1 -
 dev-embedded/sunxi-tools/metadata.xml              |   2 +-
 dev-games/aseprite/metadata.xml                    |   2 +-
 dev-games/etrophy/metadata.xml                     |   4 +-
 dev-games/guichan/metadata.xml                     |   2 +-
 dev-games/higan-ananke/metadata.xml                |   1 -
 dev-games/ogre/metadata.xml                        |   2 +-
 dev-games/t4k-common/metadata.xml                  |   1 -
 dev-go/go-colortext/metadata.xml                   |   2 +-
 dev-go/gom/metadata.xml                            |   2 +-
 dev-haskell/ansi-terminal/metadata.xml             |   2 +-
 dev-haskell/attoparsec-enumerator/metadata.xml     |   2 +-
 dev-haskell/biosff/metadata.xml                    |   2 +-
 dev-haskell/bits-atomic/metadata.xml               |   2 +-
 dev-haskell/bzlib/metadata.xml                     |   2 +-
 dev-haskell/cabal-helper/metadata.xml              |   8 +-
 dev-haskell/cabal-install/metadata.xml             |   2 +-
 dev-haskell/chasingbottoms/metadata.xml            |  20 +-
 dev-haskell/chell/metadata.xml                     |   6 +-
 dev-haskell/citeproc-hs/metadata.xml               |   2 +-
 dev-haskell/cmdargs/metadata.xml                   |   8 +-
 dev-haskell/cmdlib/metadata.xml                    |   2 +-
 dev-haskell/configfile/metadata.xml                |   6 +-
 dev-haskell/criterion/metadata.xml                 |   2 +-
 dev-haskell/dav/metadata.xml                       |   2 +-
 dev-haskell/dbus/metadata.xml                      |   6 +-
 dev-haskell/encoding/metadata.xml                  |   2 +-
 dev-haskell/errors/metadata.xml                    |   2 +-
 dev-haskell/executable-path/metadata.xml           |   6 +-
 dev-haskell/extra/metadata.xml                     |   2 +-
 dev-haskell/fclabels/metadata.xml                  |   2 +-
 dev-haskell/fgl/metadata.xml                       |   2 +-
 dev-haskell/filestore/metadata.xml                 |   2 +-
 dev-haskell/fingertree/metadata.xml                |   2 +-
 dev-haskell/generic-deriving/metadata.xml          |   2 +-
 dev-haskell/ghc-syb-utils/metadata.xml             |   2 +-
 dev-haskell/glib/metadata.xml                      |   2 +-
 dev-haskell/gluraw/metadata.xml                    |   4 +-
 dev-haskell/gnutls/metadata.xml                    |   2 +-
 dev-haskell/gtk2hs-buildtools/metadata.xml         |   2 +-
 dev-haskell/haddock-library/metadata.xml           |   2 +-
 dev-haskell/hamlet/metadata.xml                    |   2 +-
 dev-haskell/happstack-server/metadata.xml          |   4 +-
 dev-haskell/harp/metadata.xml                      |   2 +-
 dev-haskell/haskell-src-meta/metadata.xml          |   2 +-
 dev-haskell/hexpat/metadata.xml                    |  12 +-
 dev-haskell/hs3/metadata.xml                       |   4 +-
 dev-haskell/hslogger/metadata.xml                  |   2 +-
 dev-haskell/hspec-core/metadata.xml                |   2 +-
 dev-haskell/httpd-shed/metadata.xml                |   2 +-
 dev-haskell/hunit/metadata.xml                     |   2 +-
 dev-haskell/hxt-unicode/metadata.xml               |   2 +-
 dev-haskell/hxt/metadata.xml                       |   2 +-
 dev-haskell/lazysmallcheck/metadata.xml            |   2 +-
 dev-haskell/lcs/metadata.xml                       |   6 +-
 dev-haskell/logict/metadata.xml                    |   4 +-
 dev-haskell/lvmlib/metadata.xml                    |   2 +-
 dev-haskell/mersenne-random-pure64/metadata.xml    |   2 +-
 dev-haskell/monad-journal/metadata.xml             |   2 +-
 dev-haskell/monadcatchio-mtl/metadata.xml          |   2 +-
 dev-haskell/monadcatchio-transformers/metadata.xml |   2 +-
 dev-haskell/nanospec/metadata.xml                  |   2 +-
 dev-haskell/network-multicast/metadata.xml         |   2 +-
 dev-haskell/opengl/metadata.xml                    |   2 +-
 dev-haskell/openglraw/metadata.xml                 |   4 +-
 dev-haskell/options/metadata.xml                   |  14 +-
 dev-haskell/patience/metadata.xml                  |   2 +-
 dev-haskell/pcap/metadata.xml                      |   2 +-
 dev-haskell/pcre-light/metadata.xml                |   2 +-
 dev-haskell/pipes/metadata.xml                     |   8 +-
 dev-haskell/preprocessor-tools/metadata.xml        |   2 +-
 dev-haskell/pretty-show/metadata.xml               |   6 +-
 dev-haskell/psqueue/metadata.xml                   |   2 +-
 dev-haskell/psqueues/metadata.xml                  |   6 +-
 dev-haskell/regex-base/metadata.xml                |   2 +-
 dev-haskell/regex-compat-tdfa/metadata.xml         |   4 +-
 dev-haskell/regex-compat/metadata.xml              |   2 +-
 dev-haskell/regex-pcre-builtin/metadata.xml        |   2 +-
 dev-haskell/regex-posix/metadata.xml               |   2 +-
 dev-haskell/regex-tdfa-rc/metadata.xml             |   2 +-
 dev-haskell/regex-tdfa/metadata.xml                |   2 +-
 dev-haskell/rfc5051/metadata.xml                   |   4 +-
 dev-haskell/shakespeare-js/metadata.xml            |   6 +-
 dev-haskell/shakespeare-text/metadata.xml          |   2 +-
 dev-haskell/shakespeare/metadata.xml               |   6 +-
 dev-haskell/shellish/metadata.xml                  |   2 +-
 dev-haskell/shelly/metadata.xml                    |   2 +-
 dev-haskell/snap-core/metadata.xml                 |  10 +-
 dev-haskell/snap-server/metadata.xml               |   4 +-
 dev-haskell/stringable/metadata.xml                |   2 +-
 dev-haskell/stringprep/metadata.xml                |   2 +-
 dev-haskell/system-filepath/metadata.xml           |   2 +-
 dev-haskell/tagsoup/metadata.xml                   |   6 +-
 dev-haskell/tasty-quickcheck/metadata.xml          |   2 +-
 dev-haskell/temporary-rc/metadata.xml              |   4 +-
 dev-haskell/temporary/metadata.xml                 |   2 +-
 dev-haskell/text-icu/metadata.xml                  |   2 +-
 dev-haskell/tf-random/metadata.xml                 |   4 +-
 dev-haskell/th-orphans/metadata.xml                |   2 +-
 dev-haskell/time-compat/metadata.xml               |   2 +-
 dev-haskell/timezone-olson/metadata.xml            |   2 +-
 dev-haskell/tls/metadata.xml                       |   4 +-
 dev-haskell/transformers/metadata.xml              |   2 +-
 dev-haskell/uniplate/metadata.xml                  |  14 +-
 dev-haskell/uri/metadata.xml                       |   2 +-
 dev-haskell/uuagc/metadata.xml                     |   2 +-
 dev-haskell/vector-th-unbox/metadata.xml           |   2 +-
 dev-haskell/wai-app-static/metadata.xml            |   2 +-
 dev-haskell/wl-pprint/metadata.xml                 |   6 +-
 dev-haskell/yesod-auth/metadata.xml                |   2 +-
 dev-haskell/yesod-form/metadata.xml                |   2 +-
 dev-haskell/zlib/metadata.xml                      |   4 +-
 dev-java/absolutelayout/metadata.xml               |   1 -
 dev-java/annogen/metadata.xml                      |   2 +-
 dev-java/aopalliance/metadata.xml                  |   2 +-
 dev-java/appframework/metadata.xml                 |   1 -
 dev-java/asm/metadata.xml                          |   1 -
 dev-java/aspectj/metadata.xml                      |   1 -
 dev-java/bctsp/metadata.xml                        |   1 -
 dev-java/beansbinding/metadata.xml                 |   1 -
 dev-java/bsf/metadata.xml                          |   1 -
 dev-java/bytecode/metadata.xml                     |   1 -
 dev-java/cacao/metadata.xml                        |   1 -
 dev-java/cal10n/metadata.xml                       |   1 -
 dev-java/classmate/metadata.xml                    |   1 -
 dev-java/commons-codec/metadata.xml                |   1 -
 dev-java/commons-compress/metadata.xml             |   1 -
 dev-java/commons-primitives/metadata.xml           |   1 -
 dev-java/db4o-jdk11/metadata.xml                   |   1 -
 dev-java/db4o-jdk12/metadata.xml                   |   1 -
 dev-java/db4o-jdk5/metadata.xml                    |   1 -
 dev-java/dict4j/metadata.xml                       |   2 +-
 dev-java/dnsjava/metadata.xml                      |   1 -
 dev-java/dsiutils/metadata.xml                     |   1 -
 dev-java/fec/metadata.xml                          |   2 +-
 dev-java/fontbox/metadata.xml                      |   2 +-
 dev-java/forehead/metadata.xml                     |   1 -
 dev-java/gnu-classpath-inetlib/metadata.xml        |   1 -
 dev-java/gnu-classpath/metadata.xml                |   1 -
 dev-java/gnu-crypto/metadata.xml                   |   1 -
 dev-java/gnu-javamail/metadata.xml                 |   1 -
 dev-java/groovy/metadata.xml                       |   2 +-
 dev-java/hp-jdk-bin/metadata.xml                   |   1 -
 dev-java/ini4j/metadata.xml                        |   2 +-
 dev-java/iso-relax/metadata.xml                    |   2 +-
 dev-java/jal/metadata.xml                          |   1 -
 dev-java/jama/metadata.xml                         |   2 +-
 dev-java/janino/metadata.xml                       |   1 -
 dev-java/jansi/metadata.xml                        |   2 +-
 dev-java/jarbundler/metadata.xml                   |   2 +-
 dev-java/jarjar/metadata.xml                       |   2 +-
 dev-java/java-gnome/metadata.xml                   |   2 +-
 dev-java/java-service-wrapper/metadata.xml         |   1 -
 dev-java/javatoolkit/metadata.xml                  |   1 -
 dev-java/jboss-logging/metadata.xml                |   1 -
 dev-java/jboss-logmanager/metadata.xml             |   1 -
 dev-java/jboss-modules/metadata.xml                |   1 -
 dev-java/jcalendar/metadata.xml                    |   1 -
 dev-java/jcifs/metadata.xml                        |   1 -
 dev-java/jdom-jaxen/metadata.xml                   |   1 -
 dev-java/jebl/metadata.xml                         |   2 +-
 dev-java/jempbox/metadata.xml                      |   2 +-
 dev-java/jettison/metadata.xml                     |   2 +-
 dev-java/jgoodies-animation/metadata.xml           |   1 -
 dev-java/jgoodies-binding/metadata.xml             |   1 -
 dev-java/jgoodies-common/metadata.xml              |   1 -
 dev-java/jgoodies-forms/metadata.xml               |   1 -
 dev-java/jgoodies-looks/metadata.xml               |   1 -
 dev-java/jline/metadata.xml                        |   2 +-
 dev-java/joda-time/metadata.xml                    |   2 +-
 dev-java/jopt-simple/metadata.xml                  |   1 -
 dev-java/jsoup/metadata.xml                        |   1 -
 dev-java/jsr225/metadata.xml                       |   2 +-
 dev-java/jss/metadata.xml                          |   1 -
 dev-java/jssc/metadata.xml                         |   2 +-
 dev-java/junit/metadata.xml                        |   2 +-
 dev-java/jython/metadata.xml                       |   2 +-
 dev-java/kunststoff/metadata.xml                   |   1 -
 dev-java/ldapsdk/metadata.xml                      |   1 -
 dev-java/logback/metadata.xml                      |   1 -
 dev-java/lucene/metadata.xml                       |   2 +-
 dev-java/lzmajio/metadata.xml                      |   1 -
 dev-java/mersennetwister/metadata.xml              |   1 -
 dev-java/milton-api/metadata.xml                   |   1 -
 dev-java/milton-mail-api/metadata.xml              |   1 -
 dev-java/mimepull/metadata.xml                     |   1 -
 dev-java/minlog/metadata.xml                       |   3 +-
 dev-java/nanoxml/metadata.xml                      |   2 +-
 dev-java/objenesis/metadata.xml                    |   1 -
 dev-java/odfdom/metadata.xml                       |   1 -
 dev-java/osgi-core-api/metadata.xml                |   1 -
 dev-java/osgi-enterprise-api/metadata.xml          |   1 -
 dev-java/pdfbox/metadata.xml                       |   2 +-
 dev-java/plexus-classworlds/metadata.xml           |   1 -
 dev-java/radeox/metadata.xml                       |   1 -
 dev-java/sac/metadata.xml                          |   1 -
 dev-java/sat4j-core/metadata.xml                   |   1 -
 dev-java/sat4j-pseudo/metadata.xml                 |   1 -
 dev-java/sbt/metadata.xml                          |   4 +-
 dev-java/shared-objects/metadata.xml               |   1 -
 dev-java/skinlf/metadata.xml                       |   1 -
 dev-java/snappy/metadata.xml                       |   1 -
 dev-java/spring-aop/metadata.xml                   |   1 -
 dev-java/spring-beans/metadata.xml                 |   1 -
 dev-java/spring-core/metadata.xml                  |   1 -
 dev-java/spring-expression/metadata.xml            |   1 -
 dev-java/spring-instrument/metadata.xml            |   1 -
 dev-java/spymemcached/metadata.xml                 |   3 +-
 dev-java/stringtemplate/metadata.xml               |   2 +-
 dev-java/sux4j/metadata.xml                        |   1 -
 dev-java/swarmcache/metadata.xml                   |   2 +-
 dev-java/swidgets/metadata.xml                     |   1 -
 dev-java/swing-worker/metadata.xml                 |   1 -
 dev-java/swingx/metadata.xml                       |   1 -
 dev-java/tablelayout/metadata.xml                  |   1 -
 dev-java/tapestry/metadata.xml                     |   1 -
 dev-java/texhyphj/metadata.xml                     |   2 +-
 dev-java/toolbar/metadata.xml                      |   1 -
 dev-java/trident/metadata.xml                      |   1 -
 dev-java/unkrig-nullanalysis/metadata.xml          |   1 -
 dev-java/werken-xpath/metadata.xml                 |   2 +-
 dev-java/ws-commons-util/metadata.xml              |   1 -
 dev-java/wstx/metadata.xml                         |   2 +-
 dev-java/xerial-core/metadata.xml                  |   1 -
 dev-java/xml-commons/metadata.xml                  |   1 -
 dev-java/xml-xmlbeans/metadata.xml                 |   1 -
 dev-java/xz-java/metadata.xml                      |   1 -
 dev-java/yanfs/metadata.xml                        |   1 -
 dev-lang/ats/metadata.xml                          |   2 +-
 dev-lang/bas/metadata.xml                          |   2 +-
 dev-lang/bff/metadata.xml                          |   1 -
 dev-lang/crystal/metadata.xml                      |   2 +-
 dev-lang/elixir/metadata.xml                       |   4 +-
 dev-lang/ghc/metadata.xml                          |   8 +-
 dev-lang/go-bootstrap/metadata.xml                 |   2 +-
 dev-lang/gwydion-dylan-bin/metadata.xml            |   1 -
 dev-lang/icon/metadata.xml                         |   2 +-
 dev-lang/io/metadata.xml                           |   1 -
 dev-lang/lazarus/metadata.xml                      |   2 +-
 dev-lang/logtalk/metadata.xml                      |  14 +-
 dev-lang/lua/metadata.xml                          |   2 +-
 dev-lang/luajit/metadata.xml                       |   3 +-
 dev-lang/mono-basic/metadata.xml                   |   1 -
 dev-lang/mono/metadata.xml                         |   4 +-
 dev-lang/nasm/metadata.xml                         |   2 +-
 dev-lang/nqc/metadata.xml                          |   2 +-
 dev-lang/nwcc/metadata.xml                         |   2 +-
 dev-lang/perl/metadata.xml                         |   2 +-
 dev-lang/php/metadata.xml                          |  44 ++--
 dev-lang/rakudo/metadata.xml                       |   4 +-
 dev-lang/spidermonkey/metadata.xml                 |   7 +-
 dev-lang/srf/metadata.xml                          |   1 -
 dev-lang/swi-prolog/metadata.xml                   |   4 +-
 dev-lang/teyjus/metadata.xml                       |   2 +-
 dev-lang/tuprolog/metadata.xml                     |   2 +-
 dev-lang/whitespace/metadata.xml                   |   2 +-
 dev-lang/xsb/metadata.xml                          |   2 +-
 dev-lang/yap/metadata.xml                          |   2 +-
 dev-libs/MicroJSON/metadata.xml                    |   2 +-
 dev-libs/UTF8Strings/metadata.xml                  |   2 +-
 dev-libs/ace/metadata.xml                          |   4 +-
 dev-libs/angelscript/metadata.xml                  |   1 -
 dev-libs/bcm2835/metadata.xml                      |   1 -
 dev-libs/capnproto/metadata.xml                    |   2 +-
 dev-libs/cgicc/metadata.xml                        |   1 -
 dev-libs/collada-dom/metadata.xml                  |   2 +-
 dev-libs/crossguid/metadata.xml                    |   2 +-
 dev-libs/cxxtools/metadata.xml                     |   1 -
 dev-libs/cyrus-sasl/metadata.xml                   |  12 +-
 dev-libs/dotconf/metadata.xml                      |   1 -
 dev-libs/e_dbus/metadata.xml                       |  10 +-
 dev-libs/ecore/metadata.xml                        |  20 +-
 dev-libs/eet/metadata.xml                          |   4 +-
 dev-libs/eeze/metadata.xml                         |   6 +-
 dev-libs/efl/metadata.xml                          |  48 ++--
 dev-libs/efreet/metadata.xml                       |   4 +-
 dev-libs/eina/metadata.xml                         |  18 +-
 dev-libs/eio/metadata.xml                          |   4 +-
 dev-libs/embryo/metadata.xml                       |   4 +-
 dev-libs/fampp2/metadata.xml                       |   4 +-
 dev-libs/fcgi/metadata.xml                         |   2 +-
 dev-libs/fddl/metadata.xml                         |   2 +-
 dev-libs/ferrisloki/metadata.xml                   |   2 +-
 dev-libs/gecode/metadata.xml                       |   1 -
 dev-libs/gmime/metadata.xml                        |   2 +-
 dev-libs/gmp/metadata.xml                          |   4 +-
 dev-libs/jansson/metadata.xml                      |   1 -
 dev-libs/jemalloc/metadata.xml                     |   3 +-
 dev-libs/json-c/metadata.xml                       |   2 +-
 dev-libs/jsoncpp/metadata.xml                      |   2 +-
 dev-libs/keybinder/metadata.xml                    |   2 +-
 dev-libs/kpathsea/metadata.xml                     |   1 -
 dev-libs/libRocket/metadata.xml                    |   2 +-
 dev-libs/libaio/metadata.xml                       |   2 +-
 dev-libs/libb64/metadata.xml                       |   2 +-
 dev-libs/libcss/metadata.xml                       |   1 -
 dev-libs/libdbh/metadata.xml                       |   2 +-
 dev-libs/libestr/metadata.xml                      |   1 -
 dev-libs/libev/metadata.xml                        |   1 -
 dev-libs/libevent/metadata.xml                     |   2 +-
 dev-libs/libexecinfo/metadata.xml                  |   1 -
 dev-libs/libexplain/metadata.xml                   |   2 +-
 dev-libs/libffi/metadata.xml                       |   2 +-
 dev-libs/libgee/metadata.xml                       |   1 -
 dev-libs/libhid/metadata.xml                       |   1 -
 dev-libs/libhtmlparse/metadata.xml                 |   1 -
 dev-libs/libiconv/metadata.xml                     |   1 -
 dev-libs/libisoburn/metadata.xml                   |  10 +-
 dev-libs/libisofs/metadata.xml                     |   2 +-
 dev-libs/libjit/metadata.xml                       |   4 +-
 dev-libs/liblogging/metadata.xml                   |   2 +-
 dev-libs/libmaxminddb/metadata.xml                 |   2 +-
 dev-libs/libmcs/metadata.xml                       |   2 +-
 dev-libs/libmodbus/metadata.xml                    |   1 -
 dev-libs/libmowgli/metadata.xml                    |   2 +-
 dev-libs/libnfc/metadata.xml                       |   2 +-
 dev-libs/libnl/metadata.xml                        |   2 +-
 dev-libs/libnsfb/metadata.xml                      |   1 -
 dev-libs/libntru/metadata.xml                      |   2 +-
 dev-libs/liboobs/metadata.xml                      |   1 -
 dev-libs/libparserutils/metadata.xml               |   1 -
 dev-libs/librep/metadata.xml                       |   2 +-
 dev-libs/libserialport/metadata.xml                |   2 +-
 dev-libs/libsigc++/metadata.xml                    |   2 +-
 dev-libs/libsigsegv/metadata.xml                   |   2 +-
 dev-libs/libsqlora8/metadata.xml                   |   2 +-
 dev-libs/libtecla/metadata.xml                     |   2 +-
 dev-libs/libtermkey/metadata.xml                   |   2 +-
 dev-libs/libtubo/metadata.xml                      |   2 +-
 dev-libs/libvformat/metadata.xml                   |   2 +-
 dev-libs/libwapcaplet/metadata.xml                 |   1 -
 dev-libs/libxls/metadata.xml                       |   2 +-
 dev-libs/log4cxx/metadata.xml                      |   4 +-
 dev-libs/lzo/metadata.xml                          |   2 +-
 dev-libs/m17n-lib/metadata.xml                     |  12 +-
 dev-libs/nsgenbind/metadata.xml                    |   1 -
 dev-libs/nss/metadata.xml                          |   6 +-
 dev-libs/openssl/metadata.xml                      |  10 +-
 dev-libs/ppl/metadata.xml                          |   2 +-
 dev-libs/qjson/metadata.xml                        |   2 +-
 dev-libs/qqwing/metadata.xml                       |   2 +-
 dev-libs/safestr/metadata.xml                      |   1 -
 dev-libs/softhsm/metadata.xml                      |   1 -
 dev-libs/starpu/metadata.xml                       |   2 +-
 dev-libs/totem-pl-parser/metadata.xml              |   2 +-
 dev-libs/ucommon/metadata.xml                      |   2 +-
 dev-libs/userspace-rcu/metadata.xml                |   2 +-
 dev-libs/uthash/metadata.xml                       |   2 +-
 dev-libs/weston/metadata.xml                       |  32 +--
 dev-libs/xapian/metadata.xml                       |   6 +-
 dev-libs/xerces-c/metadata.xml                     |   4 +-
 dev-libs/xml-security-c/metadata.xml               |   4 +-
 dev-libs/xmlrpc-c/metadata.xml                     |   2 +-
 dev-libs/xmlwrapp/metadata.xml                     |   2 +-
 dev-libs/xxl/metadata.xml                          |   1 -
 dev-libs/yaz/metadata.xml                          |   2 +-
 dev-lisp/abcl/metadata.xml                         |   6 +-
 dev-lisp/cl-ppcre-unicode/metadata.xml             |   2 +-
 dev-lisp/cl-ppcre/metadata.xml                     |   2 +-
 dev-lisp/cl-unicode/metadata.xml                   |   2 +-
 dev-lisp/cmucl/metadata.xml                        |   2 +-
 dev-lisp/flexi-streams/metadata.xml                |   2 +-
 dev-lisp/gcl/metadata.xml                          |   4 +-
 dev-lisp/sbcl/metadata.xml                         |   2 +-
 dev-lua/LuaBitOp/metadata.xml                      |   1 -
 dev-lua/busted/metadata.xml                        |   2 +-
 dev-lua/lpeg/metadata.xml                          |   2 +-
 dev-lua/lua-term/metadata.xml                      |   2 +-
 dev-lua/lua_cliargs/metadata.xml                   |   2 +-
 dev-lua/luacov/metadata.xml                        |   2 +-
 dev-lua/luadoc/metadata.xml                        |   1 -
 dev-lua/luafilesystem/metadata.xml                 |   1 -
 dev-lua/lualdap/metadata.xml                       |   2 +-
 dev-lua/luarocks/metadata.xml                      |   4 +-
 dev-lua/luassert/metadata.xml                      |   2 +-
 dev-lua/luvit/metadata.xml                         |   3 +-
 dev-lua/mediator_lua/metadata.xml                  |   2 +-
 dev-lua/say/metadata.xml                           |   2 +-
 dev-ml/batteries/metadata.xml                      |   2 +-
 dev-ml/cairo-ocaml/metadata.xml                    |   4 +-
 dev-ml/camlimages/metadata.xml                     |   2 +-
 dev-ml/deriving-ocsigen/metadata.xml               |   2 +-
 dev-ml/io-page/metadata.xml                        |   2 +-
 dev-ml/lablgtk/metadata.xml                        |   6 +-
 dev-ml/mirage-profile/metadata.xml                 |   2 +-
 dev-ml/ocaml-augeas/metadata.xml                   |   1 -
 dev-ml/ocaml-cstruct/metadata.xml                  |   2 +-
 dev-ml/ocaml-dns/metadata.xml                      |   2 +-
 dev-ml/ocaml-pcap/metadata.xml                     |   2 +-
 dev-ml/ocaml-sqlite3/metadata.xml                  |   2 +-
 dev-ml/ocaml-uri/metadata.xml                      |   2 +-
 dev-ml/ocamldap/metadata.xml                       |   2 +-
 dev-ml/ocamlgsl/metadata.xml                       |   2 +-
 dev-ml/ocamlnet/metadata.xml                       |   6 +-
 dev-ml/ocplib-endian/metadata.xml                  |   2 +-
 dev-ml/pcre-ocaml/metadata.xml                     |   2 +-
 dev-ml/pgocaml/metadata.xml                        |   2 +-
 dev-ml/pomap/metadata.xml                          |   2 +-
 dev-ml/postgresql-ocaml/metadata.xml               |   2 +-
 dev-ml/qcheck/metadata.xml                         |   2 +-
 dev-ml/res/metadata.xml                            |   2 +-
 dev-ml/stringext/metadata.xml                      |   2 +-
 dev-perl/Data-Stag/metadata.xml                    |   2 +-
 dev-perl/File-RsyncP/metadata.xml                  |   2 +-
 dev-perl/Linux-DesktopFiles/metadata.xml           |   1 -
 dev-perl/Log-Log4perl/metadata.xml                 |   2 +-
 dev-perl/Mail-Mbox-MessageParser/metadata.xml      |   2 +-
 dev-perl/Net-Whois-IP/metadata.xml                 |   1 -
 dev-perl/XML-RSS/metadata.xml                      |   2 +-
 dev-perl/frontier-rpc/metadata.xml                 |   2 +-
 dev-perl/gnome2-perl/metadata.xml                  |   2 +-
 dev-perl/gnome2-wnck/metadata.xml                  |   2 +-
 dev-perl/mecab-perl/metadata.xml                   |   2 +-
 dev-perl/perltidy/metadata.xml                     |   2 +-
 dev-perl/wxperl/metadata.xml                       |   2 +-
 dev-php/PEAR-Archive_Tar/metadata.xml              |   2 +-
 dev-php/PEAR-Console_CommandLine/metadata.xml      |   1 -
 dev-php/PEAR-Console_Getopt/metadata.xml           |   2 +-
 dev-php/PEAR-HTTP_Request2/metadata.xml            |   9 +-
 dev-php/PEAR-PEAR/metadata.xml                     |   2 +-
 dev-php/PEAR-PHP_Shell/metadata.xml                |   2 +-
 dev-php/PEAR-Structures_Graph/metadata.xml         |   2 +-
 dev-php/PEAR-XML_Util/metadata.xml                 |   2 +-
 dev-php/PHPMailer/metadata.xml                     |   2 +-
 dev-php/YAML/metadata.xml                          |   1 -
 dev-php/ZendFramework/metadata.xml                 |   8 +-
 dev-php/pecl-amqp/metadata.xml                     |   1 -
 dev-php/pecl-cairo/metadata.xml                    |   1 -
 dev-php/pecl-haru/metadata.xml                     |   1 -
 dev-php/pecl-libevent/metadata.xml                 |   1 -
 dev-php/pecl-mongo/metadata.xml                    |   1 -
 dev-php/pecl-oauth/metadata.xml                    |   1 -
 dev-php/pecl-redis/metadata.xml                    |   1 -
 dev-php/pecl-rrd/metadata.xml                      |   1 -
 dev-php/pecl-sphinx/metadata.xml                   |   1 -
 dev-php/pecl-spl_types/metadata.xml                |   1 -
 dev-php/pecl-taint/metadata.xml                    |   1 -
 dev-php/pecl-uploadprogress/metadata.xml           |   1 -
 dev-php/pecl-xrange/metadata.xml                   |   1 -
 dev-php/pecl-yaml/metadata.xml                     |   1 -
 dev-php/pecl-zendopcache/metadata.xml              |   1 -
 dev-php/php-codebrowser/metadata.xml               |   1 -
 dev-php/phpdepend/metadata.xml                     |   1 -
 dev-php/phpmd/metadata.xml                         |   1 -
 dev-php/recaptcha/metadata.xml                     |   2 +-
 dev-php/twig/metadata.xml                          |   2 -
 dev-php/xhprof/metadata.xml                        |   1 -
 dev-python/PyFoam/metadata.xml                     |   2 +-
 dev-python/aadict/metadata.xml                     |   2 +-
 dev-python/abstract_rendering/metadata.xml         |   2 +-
 dev-python/aldryn-bootstrap3/metadata.xml          |   2 +-
 dev-python/apptools/metadata.xml                   |   2 +-
 dev-python/apse/metadata.xml                       |   2 +-
 dev-python/async/metadata.xml                      |   2 +-
 dev-python/automaton/metadata.xml                  |   2 +-
 dev-python/axiom/metadata.xml                      |   2 +-
 dev-python/blosc/metadata.xml                      |   2 +-
 dev-python/bpython/metadata.xml                    |   2 +-
 dev-python/castellan/metadata.xml                  |   2 +-
 dev-python/cfgparse/metadata.xml                   |   2 +-
 dev-python/cgkit/metadata.xml                      |   2 +-
 dev-python/clientcookie/metadata.xml               |   2 +-
 dev-python/compizconfig-python/metadata.xml        |   1 -
 dev-python/cycler/metadata.xml                     |   2 +-
 dev-python/d2to1/metadata.xml                      |   2 +-
 dev-python/dbutils/metadata.xml                    |   1 -
 dev-python/dj-database-url/metadata.xml            |   2 +-
 dev-python/django-classy-tags/metadata.xml         |   2 +-
 dev-python/django-cms/metadata.xml                 |   2 +-
 dev-python/django-durationfield/metadata.xml       |   2 +-
 dev-python/django-filer/metadata.xml               |   2 +-
 dev-python/django-ldap-groups/metadata.xml         |   1 -
 dev-python/django-mptt/metadata.xml                |   2 +-
 dev-python/django-sekizai/metadata.xml             |   2 +-
 dev-python/django-treebeard/metadata.xml           |   2 +-
 dev-python/django_polymorphic/metadata.xml         |   2 +-
 dev-python/doc8/metadata.xml                       |   2 +-
 dev-python/doit/metadata.xml                       |   2 +-
 dev-python/easy-thumbnails/metadata.xml            |   2 +-
 dev-python/enzyme/metadata.xml                     |   2 +-
 dev-python/et_xmlfile/metadata.xml                 |   2 +-
 dev-python/feedparser/metadata.xml                 |   2 +-
 dev-python/gevent/metadata.xml                     |   2 +-
 dev-python/guppy/metadata.xml                      |   2 +-
 dev-python/httpbin/metadata.xml                    |   2 +-
 dev-python/imdbpy/metadata.xml                     |   2 +-
 dev-python/iminuit/metadata.xml                    |   2 +-
 dev-python/intelhex/metadata.xml                   |   4 +-
 dev-python/jonpy/metadata.xml                      |   2 +-
 dev-python/lazy-object-proxy/metadata.xml          |   2 +-
 dev-python/logutils/metadata.xml                   |   2 +-
 dev-python/mamba/metadata.xml                      |   2 +-
 dev-python/markups/metadata.xml                    |   2 +-
 dev-python/mecab-python/metadata.xml               |   2 +-
 dev-python/mechanize/metadata.xml                  |   2 +-
 dev-python/memory_profiler/metadata.xml            |   2 +-
 dev-python/meteor-ejson/metadata.xml               |   2 +-
 dev-python/mpi4py/metadata.xml                     |   2 +-
 dev-python/mysql-python/metadata.xml               |   2 +-
 dev-python/nagiosplugin/metadata.xml               |   2 +-
 dev-python/oct2py/metadata.xml                     |   2 +-
 dev-python/oosuite/metadata.xml                    |   2 +-
 dev-python/os-brick/metadata.xml                   |   2 +-
 dev-python/oslo-reports/metadata.xml               |   2 +-
 dev-python/oslo-versionedobjects/metadata.xml      |   2 +-
 dev-python/pecan/metadata.xml                      |   2 +-
 dev-python/pid/metadata.xml                        |   2 +-
 dev-python/pillowfight/metadata.xml                |   2 +-
 dev-python/pivy/metadata.xml                       |   1 -
 dev-python/pkipplib/metadata.xml                   |   1 -
 dev-python/ply/metadata.xml                        |   2 +-
 dev-python/pmw/metadata.xml                        |   2 +-
 dev-python/py-gfm/metadata.xml                     |   2 +-
 dev-python/py-notify/metadata.xml                  |   1 -
 dev-python/pyamg/metadata.xml                      |   2 +-
 dev-python/pycapnp/metadata.xml                    |   2 +-
 dev-python/pycollada/metadata.xml                  |   2 +-
 dev-python/pydispatcher/metadata.xml               |   2 +-
 dev-python/pydns/metadata.xml                      |   2 +-
 dev-python/pyee/metadata.xml                       |   2 +-
 dev-python/pyenchant/metadata.xml                  |   2 +-
 dev-python/pygtk/metadata.xml                      |   2 +-
 dev-python/pykwalify/metadata.xml                  |   2 +-
 dev-python/pymediainfo/metadata.xml                |   2 +-
 dev-python/pymtp/metadata.xml                      |   2 +-
 dev-python/pyopengl/metadata.xml                   |   2 +-
 dev-python/pypax/metadata.xml                      |   4 +-
 dev-python/pyplusplus/metadata.xml                 |   2 +-
 dev-python/pypy-bin/metadata.xml                   |   2 +-
 dev-python/pypy/metadata.xml                       |   2 +-
 dev-python/pypy3-bin/metadata.xml                  |   2 +-
 dev-python/pypy3/metadata.xml                      |   2 +-
 dev-python/pyscaffold/metadata.xml                 |   2 +-
 dev-python/pyserial/metadata.xml                   |   2 +-
 dev-python/pysnmp/metadata.xml                     |   2 +-
 dev-python/pytest-httpbin/metadata.xml             |   2 +-
 dev-python/python-bugzilla/metadata.xml            |   2 +-
 dev-python/python-ddp/metadata.xml                 |   2 +-
 dev-python/python-editor/metadata.xml              |   2 +-
 dev-python/python-efl/metadata.xml                 |   4 +-
 dev-python/python-gnupg/metadata.xml               |   2 +-
 dev-python/python-ly/metadata.xml                  |   2 +-
 dev-python/python-meteor/metadata.xml              |   2 +-
 dev-python/pythondialog/metadata.xml               |   2 +-
 dev-python/pytidylib/metadata.xml                  |   2 +-
 dev-python/pyusb/metadata.xml                      |   2 +-
 dev-python/pyzor/metadata.xml                      |   2 +-
 dev-python/restructuredtext-lint/metadata.xml      |   2 +-
 dev-python/rope/metadata.xml                       |   2 +-
 dev-python/ropemacs/metadata.xml                   |   2 +-
 dev-python/rpyc/metadata.xml                       |   2 +-
 dev-python/ryu/metadata.xml                        |   2 +-
 dev-python/serpent/metadata.xml                    |   2 +-
 dev-python/simpleparse/metadata.xml                |   2 +-
 dev-python/simpy/metadata.xml                      |   2 +-
 dev-python/socksipy/metadata.xml                   |   2 +-
 dev-python/statistics/metadata.xml                 |   2 +-
 dev-python/sudsds/metadata.xml                     |   1 -
 dev-python/ttfquery/metadata.xml                   |   2 +-
 dev-python/uhashring/metadata.xml                  |   2 +-
 dev-python/urwidtrees/metadata.xml                 |   2 +-
 dev-python/utidylib/metadata.xml                   |   2 +-
 dev-python/vatnumber/metadata.xml                  |   1 -
 dev-python/versioneer/metadata.xml                 |   2 +-
 dev-python/zope-component/metadata.xml             |   2 +-
 dev-python/zope-event/metadata.xml                 |   2 +-
 dev-python/zope-interface/metadata.xml             |   2 +-
 dev-ros/actionlib/metadata.xml                     |   2 +-
 dev-ros/actionlib_msgs/metadata.xml                |   2 +-
 dev-ros/actionlib_tutorials/metadata.xml           |   2 +-
 dev-ros/amcl/metadata.xml                          |   2 +-
 dev-ros/angles/metadata.xml                        |   2 +-
 dev-ros/audio_capture/metadata.xml                 |   2 +-
 dev-ros/audio_common_msgs/metadata.xml             |   2 +-
 dev-ros/audio_play/metadata.xml                    |   2 +-
 dev-ros/base_local_planner/metadata.xml            |   2 +-
 dev-ros/bond/metadata.xml                          |   2 +-
 dev-ros/bondcpp/metadata.xml                       |   2 +-
 dev-ros/bondpy/metadata.xml                        |   2 +-
 dev-ros/calibration_estimation/metadata.xml        |   2 +-
 dev-ros/calibration_launch/metadata.xml            |   2 +-
 dev-ros/calibration_msgs/metadata.xml              |   2 +-
 dev-ros/calibration_setup_helper/metadata.xml      |   2 +-
 dev-ros/camera_calibration/metadata.xml            |   2 +-
 dev-ros/camera_calibration_parsers/metadata.xml    |   2 +-
 dev-ros/camera_info_manager/metadata.xml           |   2 +-
 dev-ros/carrot_planner/metadata.xml                |   2 +-
 dev-ros/class_loader/metadata.xml                  |   2 +-
 dev-ros/clear_costmap_recovery/metadata.xml        |   2 +-
 dev-ros/cmake_modules/metadata.xml                 |   2 +-
 dev-ros/collada_parser/metadata.xml                |   2 +-
 dev-ros/collada_urdf/metadata.xml                  |   2 +-
 .../compressed_depth_image_transport/metadata.xml  |   2 +-
 dev-ros/compressed_image_transport/metadata.xml    |   2 +-
 dev-ros/control_msgs/metadata.xml                  |   2 +-
 dev-ros/control_toolbox/metadata.xml               |   2 +-
 dev-ros/controller_interface/metadata.xml          |   2 +-
 dev-ros/controller_manager/metadata.xml            |   2 +-
 dev-ros/controller_manager_msgs/metadata.xml       |   2 +-
 dev-ros/controller_manager_tests/metadata.xml      |   2 +-
 dev-ros/convex_decomposition/metadata.xml          |   2 +-
 dev-ros/costmap_2d/metadata.xml                    |   2 +-
 dev-ros/cpp_common/metadata.xml                    |   2 +-
 dev-ros/cv_bridge/metadata.xml                     |   2 +-
 dev-ros/depth_image_proc/metadata.xml              |   2 +-
 dev-ros/depthimage_to_laserscan/metadata.xml       |   2 +-
 dev-ros/diagnostic_aggregator/metadata.xml         |   2 +-
 dev-ros/diagnostic_analysis/metadata.xml           |   2 +-
 dev-ros/diagnostic_common_diagnostics/metadata.xml |   2 +-
 dev-ros/diagnostic_msgs/metadata.xml               |   2 +-
 dev-ros/diagnostic_updater/metadata.xml            |   2 +-
 dev-ros/driver_base/metadata.xml                   |   2 +-
 dev-ros/dwa_local_planner/metadata.xml             |   2 +-
 dev-ros/dynamic_reconfigure/metadata.xml           |   2 +-
 dev-ros/eigen_conversions/metadata.xml             |   2 +-
 dev-ros/eigen_stl_containers/metadata.xml          |   2 +-
 dev-ros/fake_localization/metadata.xml             |   2 +-
 dev-ros/filters/metadata.xml                       |   2 +-
 dev-ros/gazebo_msgs/metadata.xml                   |   2 +-
 dev-ros/gazebo_plugins/metadata.xml                |   2 +-
 dev-ros/gazebo_ros/metadata.xml                    |   2 +-
 dev-ros/gazebo_ros_control/metadata.xml            |   2 +-
 dev-ros/gencpp/metadata.xml                        |   2 +-
 dev-ros/geneus/metadata.xml                        |   2 +-
 dev-ros/genlisp/metadata.xml                       |   2 +-
 dev-ros/genmsg/metadata.xml                        |   2 +-
 dev-ros/genpy/metadata.xml                         |   2 +-
 dev-ros/geodesy/metadata.xml                       |   2 +-
 dev-ros/geographic_msgs/metadata.xml               |   2 +-
 dev-ros/geometric_shapes/metadata.xml              |   2 +-
 dev-ros/geometry_msgs/metadata.xml                 |   2 +-
 dev-ros/global_planner/metadata.xml                |   2 +-
 dev-ros/gmapping/metadata.xml                      |   2 +-
 dev-ros/hardware_interface/metadata.xml            |   2 +-
 .../hector_compressed_map_transport/metadata.xml   |   2 +-
 dev-ros/hector_geotiff/metadata.xml                |   2 +-
 dev-ros/hector_geotiff_plugins/metadata.xml        |   2 +-
 dev-ros/hector_imu_attitude_to_tf/metadata.xml     |   2 +-
 dev-ros/hector_imu_tools/metadata.xml              |   2 +-
 dev-ros/hector_map_server/metadata.xml             |   2 +-
 dev-ros/hector_map_tools/metadata.xml              |   2 +-
 dev-ros/hector_mapping/metadata.xml                |   2 +-
 dev-ros/hector_marker_drawing/metadata.xml         |   2 +-
 dev-ros/hector_nav_msgs/metadata.xml               |   2 +-
 dev-ros/hector_pose_estimation/metadata.xml        |   2 +-
 dev-ros/hector_pose_estimation_core/metadata.xml   |   2 +-
 dev-ros/hector_slam_launch/metadata.xml            |   2 +-
 dev-ros/hector_trajectory_server/metadata.xml      |   2 +-
 dev-ros/image_cb_detector/metadata.xml             |   2 +-
 dev-ros/image_geometry/metadata.xml                |   2 +-
 dev-ros/image_proc/metadata.xml                    |   2 +-
 dev-ros/image_rotate/metadata.xml                  |   2 +-
 dev-ros/image_transport/metadata.xml               |   2 +-
 dev-ros/image_view/metadata.xml                    |   2 +-
 dev-ros/imu_processors/metadata.xml                |   2 +-
 dev-ros/imu_transformer/metadata.xml               |   2 +-
 dev-ros/interactive_marker_tutorials/metadata.xml  |   2 +-
 dev-ros/interactive_markers/metadata.xml           |   2 +-
 dev-ros/interval_intersection/metadata.xml         |   2 +-
 dev-ros/ivcon/metadata.xml                         |   2 +-
 dev-ros/joint_limits_interface/metadata.xml        |   2 +-
 dev-ros/joint_state_publisher/metadata.xml         |   2 +-
 dev-ros/joint_states_settler/metadata.xml          |   2 +-
 dev-ros/kdl_conversions/metadata.xml               |   2 +-
 dev-ros/kdl_parser/metadata.xml                    |   2 +-
 dev-ros/laser_assembler/metadata.xml               |   2 +-
 dev-ros/laser_cb_detector/metadata.xml             |   2 +-
 dev-ros/laser_filters/metadata.xml                 |   2 +-
 dev-ros/laser_geometry/metadata.xml                |   2 +-
 dev-ros/laser_proc/metadata.xml                    |   2 +-
 dev-ros/libmavconn/metadata.xml                    |   2 +-
 dev-ros/librviz_tutorial/metadata.xml              |   2 +-
 dev-ros/map_msgs/metadata.xml                      |   2 +-
 dev-ros/map_server/metadata.xml                    |   2 +-
 dev-ros/mavlink-gbp-release/metadata.xml           |   2 +-
 dev-ros/mavros/metadata.xml                        |   2 +-
 dev-ros/mavros_extras/metadata.xml                 |   2 +-
 dev-ros/mavros_msgs/metadata.xml                   |   2 +-
 dev-ros/message_filters/metadata.xml               |   2 +-
 dev-ros/message_generation/metadata.xml            |   2 +-
 dev-ros/message_runtime/metadata.xml               |   2 +-
 dev-ros/message_to_tf/metadata.xml                 |   2 +-
 dev-ros/mk/metadata.xml                            |   2 +-
 dev-ros/monocam_settler/metadata.xml               |   2 +-
 dev-ros/move_base/metadata.xml                     |   2 +-
 dev-ros/move_base_msgs/metadata.xml                |   2 +-
 dev-ros/move_slow_and_clear/metadata.xml           |   2 +-
 dev-ros/moveit_msgs/metadata.xml                   |   2 +-
 dev-ros/nav_core/metadata.xml                      |   2 +-
 dev-ros/nav_msgs/metadata.xml                      |   2 +-
 dev-ros/navfn/metadata.xml                         |   2 +-
 dev-ros/nodelet/metadata.xml                       |   2 +-
 dev-ros/nodelet_topic_tools/metadata.xml           |   2 +-
 dev-ros/nodelet_tutorial_math/metadata.xml         |   2 +-
 dev-ros/object_recognition_msgs/metadata.xml       |   2 +-
 dev-ros/octomap_msgs/metadata.xml                  |   2 +-
 dev-ros/octomap_ros/metadata.xml                   |   2 +-
 dev-ros/opencv_apps/metadata.xml                   |   2 +-
 dev-ros/opencv_tests/metadata.xml                  |   2 +-
 dev-ros/openni2_camera/metadata.xml                |   2 +-
 dev-ros/openni2_launch/metadata.xml                |   2 +-
 dev-ros/openslam_gmapping/metadata.xml             |   2 +-
 dev-ros/pcl_conversions/metadata.xml               |   2 +-
 dev-ros/pcl_msgs/metadata.xml                      |   2 +-
 dev-ros/pcl_ros/metadata.xml                       |   2 +-
 dev-ros/pluginlib/metadata.xml                     |   2 +-
 dev-ros/pluginlib_tutorials/metadata.xml           |   2 +-
 dev-ros/pointcloud_to_laserscan/metadata.xml       |   2 +-
 dev-ros/polled_camera/metadata.xml                 |   2 +-
 dev-ros/pr2_dashboard_aggregator/metadata.xml      |   2 +-
 dev-ros/pr2_description/metadata.xml               |   2 +-
 dev-ros/pr2_machine/metadata.xml                   |   2 +-
 dev-ros/pr2_msgs/metadata.xml                      |   2 +-
 dev-ros/python_qt_binding/metadata.xml             |   2 +-
 dev-ros/qt_dotgraph/metadata.xml                   |   2 +-
 dev-ros/qt_gui/metadata.xml                        |   2 +-
 dev-ros/qt_gui_app/metadata.xml                    |   2 +-
 dev-ros/qt_gui_cpp/metadata.xml                    |   2 +-
 dev-ros/qt_gui_py_common/metadata.xml              |   2 +-
 dev-ros/random_numbers/metadata.xml                |   2 +-
 dev-ros/realtime_tools/metadata.xml                |   2 +-
 dev-ros/resource_retriever/metadata.xml            |   2 +-
 dev-ros/rgbd_launch/metadata.xml                   |   2 +-
 dev-ros/robot_pose_ekf/metadata.xml                |   2 +-
 dev-ros/robot_pose_publisher/metadata.xml          |   2 +-
 dev-ros/robot_state_publisher/metadata.xml         |   2 +-
 dev-ros/rosapi/metadata.xml                        |   2 +-
 dev-ros/rosauth/metadata.xml                       |   2 +-
 dev-ros/rosbag/metadata.xml                        |   2 +-
 dev-ros/rosbag_storage/metadata.xml                |   2 +-
 dev-ros/rosbash/metadata.xml                       |   2 +-
 dev-ros/rosboost_cfg/metadata.xml                  |   2 +-
 dev-ros/rosbridge_library/metadata.xml             |   2 +-
 dev-ros/rosbridge_server/metadata.xml              |   2 +-
 dev-ros/rosbuild/metadata.xml                      |   2 +-
 dev-ros/rosclean/metadata.xml                      |   2 +-
 dev-ros/rosconsole/metadata.xml                    |   2 +-
 dev-ros/rosconsole_bridge/metadata.xml             |   2 +-
 dev-ros/roscpp/metadata.xml                        |   2 +-
 dev-ros/roscpp_serialization/metadata.xml          |   2 +-
 dev-ros/roscpp_traits/metadata.xml                 |   2 +-
 dev-ros/roscpp_tutorials/metadata.xml              |   2 +-
 dev-ros/roscreate/metadata.xml                     |   2 +-
 dev-ros/rosgraph/metadata.xml                      |   2 +-
 dev-ros/rosgraph_msgs/metadata.xml                 |   2 +-
 dev-ros/roslang/metadata.xml                       |   2 +-
 dev-ros/roslaunch/metadata.xml                     |   2 +-
 dev-ros/roslib/metadata.xml                        |   2 +-
 dev-ros/roslint/metadata.xml                       |   2 +-
 dev-ros/roslisp/metadata.xml                       |   2 +-
 dev-ros/roslz4/metadata.xml                        |   2 +-
 dev-ros/rosmake/metadata.xml                       |   2 +-
 dev-ros/rosmaster/metadata.xml                     |   2 +-
 dev-ros/rosmsg/metadata.xml                        |   2 +-
 dev-ros/rosnode/metadata.xml                       |   2 +-
 dev-ros/rosout/metadata.xml                        |   2 +-
 dev-ros/rospack/metadata.xml                       |   2 +-
 dev-ros/rosparam/metadata.xml                      |   2 +-
 dev-ros/rospy/metadata.xml                         |   2 +-
 dev-ros/rospy_tutorials/metadata.xml               |   2 +-
 dev-ros/rosserial_arduino/metadata.xml             |   2 +-
 dev-ros/rosserial_client/metadata.xml              |   2 +-
 dev-ros/rosserial_embeddedlinux/metadata.xml       |   2 +-
 dev-ros/rosserial_msgs/metadata.xml                |   2 +-
 dev-ros/rosserial_python/metadata.xml              |   2 +-
 dev-ros/rosserial_server/metadata.xml              |   2 +-
 dev-ros/rosserial_windows/metadata.xml             |   2 +-
 dev-ros/rosserial_xbee/metadata.xml                |   2 +-
 dev-ros/rosservice/metadata.xml                    |   2 +-
 dev-ros/rostest/metadata.xml                       |   2 +-
 dev-ros/rostime/metadata.xml                       |   2 +-
 dev-ros/rostopic/metadata.xml                      |   2 +-
 dev-ros/rosunit/metadata.xml                       |   2 +-
 dev-ros/roswtf/metadata.xml                        |   2 +-
 dev-ros/rotate_recovery/metadata.xml               |   2 +-
 dev-ros/rqt_action/metadata.xml                    |   2 +-
 dev-ros/rqt_bag/metadata.xml                       |   2 +-
 dev-ros/rqt_bag_plugins/metadata.xml               |   2 +-
 dev-ros/rqt_console/metadata.xml                   |   2 +-
 dev-ros/rqt_controller_manager/metadata.xml        |   2 +-
 dev-ros/rqt_dep/metadata.xml                       |   2 +-
 dev-ros/rqt_graph/metadata.xml                     |   2 +-
 dev-ros/rqt_gui/metadata.xml                       |   2 +-
 dev-ros/rqt_gui_cpp/metadata.xml                   |   2 +-
 dev-ros/rqt_gui_py/metadata.xml                    |   2 +-
 dev-ros/rqt_image_view/metadata.xml                |   2 +-
 dev-ros/rqt_launch/metadata.xml                    |   2 +-
 dev-ros/rqt_logger_level/metadata.xml              |   2 +-
 dev-ros/rqt_moveit/metadata.xml                    |   2 +-
 dev-ros/rqt_msg/metadata.xml                       |   2 +-
 dev-ros/rqt_nav_view/metadata.xml                  |   2 +-
 dev-ros/rqt_plot/metadata.xml                      |   2 +-
 dev-ros/rqt_pose_view/metadata.xml                 |   2 +-
 dev-ros/rqt_publisher/metadata.xml                 |   2 +-
 dev-ros/rqt_py_common/metadata.xml                 |   2 +-
 dev-ros/rqt_py_console/metadata.xml                |   2 +-
 dev-ros/rqt_reconfigure/metadata.xml               |   2 +-
 dev-ros/rqt_robot_dashboard/metadata.xml           |   2 +-
 dev-ros/rqt_robot_monitor/metadata.xml             |   2 +-
 dev-ros/rqt_robot_steering/metadata.xml            |   2 +-
 dev-ros/rqt_runtime_monitor/metadata.xml           |   2 +-
 dev-ros/rqt_rviz/metadata.xml                      |   2 +-
 dev-ros/rqt_service_caller/metadata.xml            |   2 +-
 dev-ros/rqt_shell/metadata.xml                     |   2 +-
 dev-ros/rqt_srv/metadata.xml                       |   2 +-
 dev-ros/rqt_tf_tree/metadata.xml                   |   2 +-
 dev-ros/rqt_top/metadata.xml                       |   2 +-
 dev-ros/rqt_topic/metadata.xml                     |   2 +-
 dev-ros/rqt_web/metadata.xml                       |   2 +-
 dev-ros/rviz/metadata.xml                          |   2 +-
 dev-ros/rviz_plugin_tutorials/metadata.xml         |   2 +-
 dev-ros/rviz_python_tutorial/metadata.xml          |   2 +-
 dev-ros/self_test/metadata.xml                     |   2 +-
 dev-ros/sensor_msgs/metadata.xml                   |   2 +-
 dev-ros/settlerlib/metadata.xml                    |   2 +-
 dev-ros/shape_msgs/metadata.xml                    |   2 +-
 dev-ros/shape_tools/metadata.xml                   |   2 +-
 dev-ros/smach/metadata.xml                         |   2 +-
 dev-ros/smach_msgs/metadata.xml                    |   2 +-
 dev-ros/smach_ros/metadata.xml                     |   2 +-
 dev-ros/smclib/metadata.xml                        |   2 +-
 dev-ros/sound_play/metadata.xml                    |   2 +-
 dev-ros/stage_ros/metadata.xml                     |   2 +-
 dev-ros/std_msgs/metadata.xml                      |   2 +-
 dev-ros/std_srvs/metadata.xml                      |   2 +-
 dev-ros/stereo_image_proc/metadata.xml             |   2 +-
 dev-ros/stereo_msgs/metadata.xml                   |   2 +-
 dev-ros/test_bond/metadata.xml                     |   2 +-
 dev-ros/test_diagnostic_aggregator/metadata.xml    |   2 +-
 dev-ros/test_nodelet/metadata.xml                  |   2 +-
 dev-ros/test_nodelet_topic_tools/metadata.xml      |   2 +-
 dev-ros/test_rosbag/metadata.xml                   |   2 +-
 dev-ros/test_rosbag_storage/metadata.xml           |   2 +-
 dev-ros/test_roscpp/metadata.xml                   |   2 +-
 dev-ros/test_rosgraph/metadata.xml                 |   2 +-
 dev-ros/test_roslaunch/metadata.xml                |   2 +-
 dev-ros/test_roslib_comm/metadata.xml              |   2 +-
 dev-ros/test_rosmaster/metadata.xml                |   2 +-
 dev-ros/test_rosparam/metadata.xml                 |   2 +-
 dev-ros/test_rospy/metadata.xml                    |   2 +-
 dev-ros/test_rosservice/metadata.xml               |   2 +-
 dev-ros/test_tf2/metadata.xml                      |   2 +-
 dev-ros/tf/metadata.xml                            |   2 +-
 dev-ros/tf2/metadata.xml                           |   2 +-
 dev-ros/tf2_bullet/metadata.xml                    |   2 +-
 dev-ros/tf2_geometry_msgs/metadata.xml             |   2 +-
 dev-ros/tf2_kdl/metadata.xml                       |   2 +-
 dev-ros/tf2_msgs/metadata.xml                      |   2 +-
 dev-ros/tf2_py/metadata.xml                        |   2 +-
 dev-ros/tf2_ros/metadata.xml                       |   2 +-
 dev-ros/tf2_sensor_msgs/metadata.xml               |   2 +-
 dev-ros/tf2_tools/metadata.xml                     |   2 +-
 dev-ros/tf_conversions/metadata.xml                |   2 +-
 dev-ros/theora_image_transport/metadata.xml        |   2 +-
 dev-ros/timestamp_tools/metadata.xml               |   2 +-
 dev-ros/topic_tools/metadata.xml                   |   2 +-
 dev-ros/trajectory_msgs/metadata.xml               |   2 +-
 dev-ros/transmission_interface/metadata.xml        |   2 +-
 dev-ros/turtle_actionlib/metadata.xml              |   2 +-
 dev-ros/turtle_tf/metadata.xml                     |   2 +-
 dev-ros/turtle_tf2/metadata.xml                    |   2 +-
 dev-ros/turtlesim/metadata.xml                     |   2 +-
 dev-ros/unique_id/metadata.xml                     |   2 +-
 dev-ros/urdf/metadata.xml                          |   2 +-
 dev-ros/urdf_parser_plugin/metadata.xml            |   2 +-
 dev-ros/urdf_tutorial/metadata.xml                 |   2 +-
 dev-ros/urg_c/metadata.xml                         |   2 +-
 dev-ros/urg_node/metadata.xml                      |   2 +-
 dev-ros/uuid_msgs/metadata.xml                     |   2 +-
 dev-ros/visp_auto_tracker/metadata.xml             |   2 +-
 dev-ros/visp_bridge/metadata.xml                   |   2 +-
 dev-ros/visp_camera_calibration/metadata.xml       |   2 +-
 dev-ros/visp_hand2eye_calibration/metadata.xml     |   2 +-
 dev-ros/visp_tracker/metadata.xml                  |   2 +-
 .../visualization_marker_tutorials/metadata.xml    |   2 +-
 dev-ros/visualization_msgs/metadata.xml            |   2 +-
 dev-ros/voxel_grid/metadata.xml                    |   2 +-
 dev-ros/xacro/metadata.xml                         |   2 +-
 dev-ros/xmlrpcpp/metadata.xml                      |   2 +-
 dev-ruby/abstract/metadata.xml                     |   2 +-
 dev-ruby/actionpack/metadata.xml                   |   2 +-
 dev-ruby/activerecord/metadata.xml                 |   2 +-
 dev-ruby/activeresource/metadata.xml               |   2 +-
 dev-ruby/activesupport/metadata.xml                |   2 +-
 dev-ruby/addressable/metadata.xml                  |   2 +-
 dev-ruby/archive-tar-minitar/metadata.xml          |   2 +-
 dev-ruby/aws-s3/metadata.xml                       |   2 +-
 dev-ruby/blankslate/metadata.xml                   |   2 +-
 dev-ruby/bouncy-castle-java/metadata.xml           |   1 -
 dev-ruby/builder/metadata.xml                      |   2 +-
 dev-ruby/classifier/metadata.xml                   |   2 +-
 dev-ruby/color/metadata.xml                        |   2 +-
 dev-ruby/coolio/metadata.xml                       |   1 -
 dev-ruby/cri/metadata.xml                          |   2 +-
 dev-ruby/curb/metadata.xml                         |   2 +-
 dev-ruby/dalli/metadata.xml                        |   1 -
 dev-ruby/delayer-deferred/metadata.xml             |   2 +-
 dev-ruby/delayer/metadata.xml                      |   2 +-
 dev-ruby/deprecated/metadata.xml                   |   2 +-
 dev-ruby/diff-lcs/metadata.xml                     |   2 +-
 dev-ruby/dnsruby/metadata.xml                      |   2 +-
 dev-ruby/dust/metadata.xml                         |   2 +-
 dev-ruby/extlib/metadata.xml                       |   2 +-
 dev-ruby/facter/metadata.xml                       |   6 +-
 dev-ruby/fattr/metadata.xml                        |   2 +-
 dev-ruby/gnuplot/metadata.xml                      |   2 +-
 dev-ruby/gruff/metadata.xml                        |   2 +-
 dev-ruby/highline/metadata.xml                     |   2 +-
 dev-ruby/hoe-seattlerb/metadata.xml                |   2 +-
 dev-ruby/hoe/metadata.xml                          |   2 +-
 dev-ruby/htmlentities/metadata.xml                 |   2 +-
 dev-ruby/imagesize/metadata.xml                    |   2 +-
 dev-ruby/instance_storage/metadata.xml             |   2 +-
 dev-ruby/jruby-openssl/metadata.xml                |   2 +-
 dev-ruby/json/metadata.xml                         |   2 +-
 dev-ruby/kissfft/metadata.xml                      |   2 +-
 dev-ruby/kramdown/metadata.xml                     |   2 +-
 dev-ruby/launchy/metadata.xml                      |   2 +-
 dev-ruby/log4r/metadata.xml                        |   2 +-
 dev-ruby/logging/metadata.xml                      |   2 +-
 dev-ruby/maxitest/metadata.xml                     |   2 +-
 dev-ruby/mecab-ruby/metadata.xml                   |   2 +-
 dev-ruby/metaid/metadata.xml                       |   2 +-
 dev-ruby/metasploit-payloads/metadata.xml          |   2 +-
 dev-ruby/mocha/metadata.xml                        |   2 +-
 dev-ruby/msgpack/metadata.xml                      |   2 +-
 dev-ruby/narray/metadata.xml                       |   2 +-
 dev-ruby/net-scp/metadata.xml                      |   2 +-
 dev-ruby/net-sftp/metadata.xml                     |   2 +-
 dev-ruby/net-ssh-gateway/metadata.xml              |   2 +-
 dev-ruby/net-ssh-multi/metadata.xml                |   2 +-
 dev-ruby/net-ssh/metadata.xml                      |   2 +-
 dev-ruby/oauth/metadata.xml                        |   2 +-
 dev-ruby/open4/metadata.xml                        |   2 +-
 dev-ruby/packetfu/metadata.xml                     |   2 +-
 dev-ruby/pcaprub/metadata.xml                      |   2 +-
 dev-ruby/plist/metadata.xml                        |   2 +-
 dev-ruby/pluggaloid/metadata.xml                   |   2 +-
 dev-ruby/png/metadata.xml                          |   2 +-
 dev-ruby/podcast/metadata.xml                      |   2 +-
 dev-ruby/polyglot/metadata.xml                     |   2 +-
 dev-ruby/priorityqueue/metadata.xml                |   2 +-
 dev-ruby/racc/metadata.xml                         |   2 +-
 dev-ruby/rack-cache/metadata.xml                   |   2 +-
 dev-ruby/rack/metadata.xml                         |   2 +-
 dev-ruby/radius/metadata.xml                       |   2 +-
 dev-ruby/rake/metadata.xml                         |   2 +-
 dev-ruby/rb-readline-r7/metadata.xml               |   2 +-
 dev-ruby/rb-readline/metadata.xml                  |   2 +-
 dev-ruby/rdoc/metadata.xml                         |   2 +-
 dev-ruby/rev/metadata.xml                          |   2 +-
 dev-ruby/right_http_connection/metadata.xml        |   2 +-
 dev-ruby/rjb/metadata.xml                          |   2 +-
 dev-ruby/rmagick/metadata.xml                      |   2 +-
 dev-ruby/robots/metadata.xml                       |   2 +-
 dev-ruby/rrdtool-bindings/metadata.xml             |   2 +-
 dev-ruby/rspec-core/metadata.xml                   |   2 +-
 dev-ruby/rspec-expectations/metadata.xml           |   2 +-
 dev-ruby/rspec-mocks/metadata.xml                  |   2 +-
 dev-ruby/rspec/metadata.xml                        |   2 +-
 dev-ruby/ruby-atk/metadata.xml                     |   2 +-
 dev-ruby/ruby-augeas/metadata.xml                  |   1 -
 dev-ruby/ruby-cairo-gobject/metadata.xml           |   2 +-
 dev-ruby/ruby-clutter-gstreamer/metadata.xml       |   2 +-
 dev-ruby/ruby-clutter-gtk/metadata.xml             |   2 +-
 dev-ruby/ruby-clutter/metadata.xml                 |   2 +-
 dev-ruby/ruby-elf/metadata.xml                     |   2 +-
 dev-ruby/ruby-filemagic/metadata.xml               |   2 +-
 dev-ruby/ruby-gdk3/metadata.xml                    |   2 +-
 dev-ruby/ruby-gdkpixbuf2/metadata.xml              |   2 +-
 dev-ruby/ruby-gio2/metadata.xml                    |   2 +-
 dev-ruby/ruby-glib2/metadata.xml                   |   2 +-
 dev-ruby/ruby-gnome2/metadata.xml                  |   2 +-
 dev-ruby/ruby-gobject-introspection/metadata.xml   |   2 +-
 dev-ruby/ruby-gstreamer/metadata.xml               |   2 +-
 dev-ruby/ruby-gtk2/metadata.xml                    |   2 +-
 dev-ruby/ruby-gtk3/metadata.xml                    |   2 +-
 dev-ruby/ruby-gtksourceview/metadata.xml           |   2 +-
 dev-ruby/ruby-gtksourceview3/metadata.xml          |   2 +-
 dev-ruby/ruby-hmac/metadata.xml                    |   2 +-
 dev-ruby/ruby-ldap/metadata.xml                    |   2 +-
 dev-ruby/ruby-mp3info/metadata.xml                 |   2 +-
 dev-ruby/ruby-oci8/metadata.xml                    |   2 +-
 dev-ruby/ruby-opengl/metadata.xml                  |   2 +-
 dev-ruby/ruby-openid/metadata.xml                  |   2 +-
 dev-ruby/ruby-pango/metadata.xml                   |   2 +-
 dev-ruby/ruby-poppler/metadata.xml                 |   2 +-
 dev-ruby/ruby-rsvg/metadata.xml                    |   2 +-
 dev-ruby/ruby-vte/metadata.xml                     |   2 +-
 dev-ruby/ruby-vte3/metadata.xml                    |   2 +-
 dev-ruby/ruby-webkit-gtk/metadata.xml              |   2 +-
 dev-ruby/ruby-webkit-gtk2/metadata.xml             |   2 +-
 dev-ruby/ruby-yadis/metadata.xml                   |   2 +-
 dev-ruby/ruby2ruby/metadata.xml                    |   2 +-
 dev-ruby/rubygems/metadata.xml                     |   2 +-
 dev-ruby/rubyntlm/metadata.xml                     |   2 +-
 dev-ruby/sdoc/metadata.xml                         |   2 +-
 dev-ruby/serialport/metadata.xml                   |   2 +-
 dev-ruby/shorturl/metadata.xml                     |   2 +-
 dev-ruby/simple-rss/metadata.xml                   |   2 +-
 dev-ruby/snmplib/metadata.xml                      |   2 +-
 dev-ruby/sparklines/metadata.xml                   |   2 +-
 dev-ruby/spreadsheet/metadata.xml                  |   2 +-
 dev-ruby/sqlite3/metadata.xml                      |   2 +-
 dev-ruby/syntax/metadata.xml                       |   2 +-
 dev-ruby/term-ansicolor/metadata.xml               |   2 +-
 dev-ruby/termcolor/metadata.xml                    |   2 +-
 dev-ruby/test-unit-rr/metadata.xml                 |   2 +-
 dev-ruby/test-unit/metadata.xml                    |   2 +-
 dev-ruby/text-hyphen/metadata.xml                  |   2 +-
 dev-ruby/textpow/metadata.xml                      |   2 +-
 dev-ruby/totoridipjp/metadata.xml                  |   2 +-
 dev-ruby/treetop/metadata.xml                      |   2 +-
 dev-ruby/trollop/metadata.xml                      |   2 +-
 dev-ruby/typhoeus/metadata.xml                     |   2 +-
 dev-ruby/tzinfo/metadata.xml                       |   2 +-
 dev-ruby/unf_ext/metadata.xml                      |   2 +-
 dev-ruby/uuidtools/metadata.xml                    |   2 +-
 dev-ruby/webrobots/metadata.xml                    |   2 +-
 dev-scheme/ikarus/metadata.xml                     |   1 -
 dev-scheme/kawa/metadata.xml                       |  20 +-
 dev-scheme/racket/metadata.xml                     |  11 +-
 dev-scheme/scheme48/metadata.xml                   |   1 -
 dev-scheme/scm/metadata.xml                        |  24 +-
 dev-tcltk/anigif/metadata.xml                      |   2 +-
 dev-tcltk/blt/metadata.xml                         |   2 +-
 dev-tcltk/tkXwin/metadata.xml                      |   2 +-
 dev-tex/dot2texi/metadata.xml                      |   4 +-
 dev-tex/dvi2gr/metadata.xml                        |   2 +-
 dev-tex/glossaries/metadata.xml                    |   1 -
 dev-tex/rail/metadata.xml                          |   2 +-
 dev-tex/rubber/metadata.xml                        |   2 +-
 dev-util/abi-compliance-checker/metadata.xml       |   2 +-
 dev-util/alleyoop/metadata.xml                     |   2 +-
 dev-util/appinventor/metadata.xml                  |   1 -
 dev-util/bitcoin-tx/metadata.xml                   |   2 +-
 dev-util/cgdb/metadata.xml                         |   2 +-
 dev-util/checkstyle/metadata.xml                   |   2 +-
 dev-util/cligh/metadata.xml                        |   2 +-
 dev-util/codeblocks/metadata.xml                   |   2 +-
 dev-util/complexity/metadata.xml                   |   1 -
 dev-util/confix-wrapper/metadata.xml               |   2 +-
 dev-util/confix/metadata.xml                       |   2 +-
 dev-util/crash/metadata.xml                        |   1 -
 dev-util/csup/metadata.xml                         |   1 -
 dev-util/ctags/metadata.xml                        |   2 +-
 dev-util/cwdiff/metadata.xml                       |   4 +-
 dev-util/exmap/metadata.xml                        |   1 -
 dev-util/ftjam/metadata.xml                        |   2 +-
 dev-util/geany-plugins/metadata.xml                |  32 +--
 dev-util/gtk-update-icon-cache/metadata.xml        |   2 +-
 dev-util/hxtools/metadata.xml                      |   1 -
 dev-util/intel-ocl-sdk/metadata.xml                |  12 +-
 dev-util/lttng-tools/metadata.xml                  |   2 +-
 dev-util/makeheaders/metadata.xml                  |   1 -
 dev-util/molecule/metadata.xml                     |   2 +-
 dev-util/monodevelop/metadata.xml                  |   6 +-
 dev-util/nemiver/metadata.xml                      |   4 +-
 dev-util/osc/metadata.xml                          |   1 -
 dev-util/pkgconfig-openbsd/metadata.xml            |   2 +-
 dev-util/pkgconfig/metadata.xml                    |   2 +-
 dev-util/re2c/metadata.xml                         |   2 +-
 dev-util/rej/metadata.xml                          |   1 -
 dev-util/reswrap/metadata.xml                      |   1 -
 dev-util/reviewboard/metadata.xml                  |   6 +-
 dev-util/rpmdevtools/metadata.xml                  |   1 -
 dev-util/stubgen/metadata.xml                      |   1 -
 dev-util/sysdig/metadata.xml                       |   2 +-
 dev-util/txt2regex/metadata.xml                    |   2 +-
 dev-util/valkyrie/metadata.xml                     |   1 -
 dev-util/watchr/metadata.xml                       |   2 +-
 dev-util/xdelta/metadata.xml                       |   2 +-
 dev-vcs/cssc/metadata.xml                          |   2 +-
 dev-vcs/cvsgraph/metadata.xml                      |   1 -
 dev-vcs/giggle/metadata.xml                        |   1 -
 dev-vcs/git-annex/metadata.xml                     |   2 +-
 dev-vcs/gitolite-gentoo/metadata.xml               |   3 +-
 dev-vcs/gitstats/metadata.xml                      |   2 +-
 dev-vcs/mercurial-server/metadata.xml              |   1 -
 dev-vcs/qct/metadata.xml                           |   2 +-
 dev-vcs/qsvn/metadata.xml                          |   1 -
 dev-vcs/veracity/metadata.xml                      |   2 +-
 games-action/awesomenauts/metadata.xml             |   2 +-
 games-action/beathazardultra/metadata.xml          |   2 +-
 games-action/hotline-miami/metadata.xml            |   4 +-
 games-action/lugaru/metadata.xml                   |   2 +-
 games-action/nighthawk/metadata.xml                |   2 +-
 games-action/openclonk/metadata.xml                |   1 -
 games-action/solar2/metadata.xml                   |   3 +-
 games-action/super-hexagon/metadata.xml            |   3 +-
 games-action/swordandsworcery/metadata.xml         |   3 +-
 games-action/teeworlds/metadata.xml                |   1 -
 games-action/trine2/metadata.xml                   |   5 +-
 games-action/trosh/metadata.xml                    |   1 -
 games-arcade/dynamitejack/metadata.xml             |   1 -
 games-arcade/mari0/metadata.xml                    |   1 -
 games-arcade/notpacman/metadata.xml                |   1 -
 games-arcade/nottetris2/metadata.xml               |   2 +-
 games-arcade/opensonic/metadata.xml                |   2 +-
 games-arcade/pachi/metadata.xml                    |   2 +-
 games-arcade/retrobattle/metadata.xml              |   1 -
 games-arcade/supertux/metadata.xml                 |   2 +-
 games-board/awale/metadata.xml                     |   1 -
 games-board/chessx/metadata.xml                    |   2 +-
 games-board/cockatrice/metadata.xml                |   3 +-
 games-board/holdingnuts/metadata.xml               |   2 +-
 games-board/kcheckers/metadata.xml                 |   2 +-
 games-board/qgo/metadata.xml                       |   2 +-
 games-board/stockfish/metadata.xml                 |   8 +-
 games-emulation/dolphin/metadata.xml               |   2 +-
 games-emulation/dosbox/metadata.xml                |   2 +-
 games-emulation/gambatte/metadata.xml              |   2 +-
 games-emulation/gnuboy/metadata.xml                |   2 +-
 games-emulation/higan/metadata.xml                 |   9 +-
 games-emulation/lxdream/metadata.xml               |   1 -
 games-emulation/mupen64plus/metadata.xml           |  14 +-
 games-emulation/pcsxr/metadata.xml                 |   4 +-
 games-emulation/ppsspp/metadata.xml                |   6 +-
 games-emulation/sdlmame/metadata.xml               |   2 +-
 games-emulation/vbam/metadata.xml                  |   2 +-
 games-engines/exult/metadata.xml                   |   2 +-
 games-engines/frotz/metadata.xml                   |   2 +-
 games-engines/love/metadata.xml                    |   1 -
 games-engines/openmw/metadata.xml                  |   1 -
 games-engines/renpy/metadata.xml                   |   7 +-
 games-engines/solarus/metadata.xml                 |   6 +-
 games-engines/stratagus/metadata.xml               |   2 +-
 games-fps/doom3/metadata.xml                       |   2 +-
 games-fps/duke3d-data/metadata.xml                 |   2 +-
 games-fps/duke3d-demodata/metadata.xml             |   1 -
 games-fps/duke3d/metadata.xml                      |   2 +-
 games-fps/eduke32/metadata.xml                     |   1 -
 games-fps/lsdldoom/metadata.xml                    |   6 +-
 games-fps/quake3-demo/metadata.xml                 |   2 +-
 games-fps/quake3-nsco/metadata.xml                 |   1 -
 games-kids/crayon-physics/metadata.xml             |   3 +-
 games-misc/fortune-mod-gentoo-dev/metadata.xml     |   1 -
 games-misc/katawa-shoujo/metadata.xml              |   1 -
 games-misc/little-inferno/metadata.xml             |   2 +-
 games-misc/lucidlife/metadata.xml                  |   1 -
 games-misc/sound-of-sorting/metadata.xml           |   2 +-
 games-misc/xcowsay/metadata.xml                    |   1 -
 games-mud/wxmud/metadata.xml                       |   2 +-
 games-puzzle/gtetrinet/metadata.xml                |   2 +-
 games-puzzle/ksokoban/metadata.xml                 |   2 +-
 games-puzzle/nightsky/metadata.xml                 |   3 +-
 games-puzzle/splice/metadata.xml                   |   1 -
 games-puzzle/tiny-and-big/metadata.xml             |   2 +-
 games-roguelike/FTL/metadata.xml                   |   3 +-
 games-roguelike/angband/metadata.xml               |   2 +-
 games-roguelike/stone-soup/metadata.xml            |   2 +-
 games-roguelike/tomenet/metadata.xml               |   3 +-
 games-rpg/a-bird-story/metadata.xml                |   2 +-
 games-rpg/arx-fatalis-data/metadata.xml            |   3 +-
 games-rpg/arx-fatalis-demo/metadata.xml            |   1 -
 games-rpg/arx-libertatis/metadata.xml              |  27 +-
 games-rpg/bastion/metadata.xml                     |   1 -
 games-rpg/dragonhunt/metadata.xml                  |   1 -
 games-rpg/dungeon-defenders/metadata.xml           |   3 +-
 games-rpg/eternal-lands-data/metadata.xml          |   6 +-
 games-rpg/grimrock/metadata.xml                    |   3 +-
 games-rpg/mana/metadata.xml                        |   1 -
 games-rpg/manaplus/metadata.xml                    |   1 -
 games-rpg/penumbra-collection/metadata.xml         |   1 -
 games-rpg/to-the-moon/metadata.xml                 |   2 +-
 games-rpg/valyriatear/metadata.xml                 |   5 +-
 games-rpg/zsdx/metadata.xml                        |   2 +-
 games-rpg/zsxd/metadata.xml                        |   2 +-
 games-simulation/fgrun/metadata.xml                |   2 +-
 games-simulation/openttd/metadata.xml              |   8 +-
 games-sports/foobillard/metadata.xml               |   2 +-
 games-strategy/freeorion/metadata.xml              |   2 +-
 games-strategy/ja2-stracciatella-data/metadata.xml |   1 -
 games-strategy/ja2-stracciatella/metadata.xml      |   1 -
 games-strategy/liquidwar6/metadata.xml             |  12 +-
 games-strategy/s25rttr/metadata.xml                |   3 +-
 games-strategy/wargus-data/metadata.xml            |   2 +-
 games-strategy/wargus/metadata.xml                 |   2 +-
 games-util/atlas/metadata.xml                      |   2 +-
 games-util/gslist/metadata.xml                     |   2 +-
 games-util/higan-purify/metadata.xml               |   1 -
 games-util/wit/metadata.xml                        |   2 +-
 games-util/xqf/metadata.xml                        |   2 +-
 gnome-base/gvfs/metadata.xml                       |  18 +-
 gnome-base/libglade/metadata.xml                   |   2 +-
 gnome-base/libgnomecanvas/metadata.xml             |   2 +-
 gnome-extra/gdesklets-core/metadata.xml            |   2 +-
 gnome-extra/gnome-user-share/metadata.xml          |   1 -
 gnome-extra/gnome-web-photo/metadata.xml           |   1 -
 gnome-extra/nautilus-sendto/metadata.xml           |   1 -
 gnome-extra/polkit-gnome/metadata.xml              |   1 -
 gnustep-apps/gemas/metadata.xml                    |   2 +-
 gnustep-apps/gnumail/metadata.xml                  |   2 +-
 gnustep-apps/gworkspace/metadata.xml               |   2 +-
 gnustep-apps/sogo/metadata.xml                     |   2 +-
 gnustep-base/gnustep-back-art/metadata.xml         |   2 +-
 gnustep-base/gnustep-back-cairo/metadata.xml       |   2 +-
 gnustep-base/gnustep-back-xlib/metadata.xml        |   2 +-
 gnustep-base/gnustep-make/metadata.xml             |   4 +-
 gnustep-libs/sope/metadata.xml                     |   2 +-
 java-virtuals/jaxp-virtual/metadata.xml            |   1 -
 java-virtuals/stax-api/metadata.xml                |   1 -
 kde-apps/gwenview/metadata.xml                     |   2 +-
 kde-apps/kcachegrind/metadata.xml                  |   2 +-
 kde-base/krossjava/metadata.xml                    |   1 -
 kde-misc/chromi/metadata.xml                       |   2 +-
 kde-misc/drop2ftp/metadata.xml                     |   1 -
 kde-misc/kcometen4/metadata.xml                    |   1 -
 kde-misc/kimtoy/metadata.xml                       |   2 +-
 kde-misc/kover/metadata.xml                        |   1 -
 kde-misc/krcstat/metadata.xml                      |   1 -
 kde-misc/krunner-googletranslate/metadata.xml      |   1 -
 kde-misc/magneto-kde/metadata.xml                  |   1 -
 kde-misc/plasma-applet-daisy/metadata.xml          |   1 -
 kde-misc/plasma-emergelog/metadata.xml             |   1 -
 kde-misc/stdin-plasmoid/metadata.xml               |   1 -
 kde-misc/systemd-kcm/metadata.xml                  |   2 +-
 mail-client/alpine/metadata.xml                    |  10 +-
 mail-client/balsa/metadata.xml                     |   8 +-
 mail-client/geary/metadata.xml                     |   1 -
 mail-client/mutt/metadata.xml                      |   2 +-
 mail-client/nmh/metadata.xml                       |   1 -
 mail-client/thunderbird/metadata.xml               |  10 +-
 mail-filter/MailScanner/metadata.xml               |   6 +-
 mail-filter/amavisd-new/metadata.xml               |  12 +-
 mail-filter/clamassassin/metadata.xml              |   4 +-
 mail-filter/dcc/metadata.xml                       |   2 +-
 mail-filter/libmilter/metadata.xml                 |   2 +-
 mail-filter/mimedefang/metadata.xml                |   2 +-
 mail-filter/opendmarc/metadata.xml                 |   2 +-
 mail-filter/policyd/metadata.xml                   |   2 +-
 mail-filter/postfwd/metadata.xml                   |   2 +-
 mail-filter/postgrey/metadata.xml                  |   2 +-
 mail-filter/rmilter/metadata.xml                   |   2 +-
 mail-filter/rspamd/metadata.xml                    |   2 +-
 mail-filter/spamassassin-botnet/metadata.xml       |   1 -
 mail-filter/spamassassin/metadata.xml              |   4 +-
 mail-filter/spamdyke/metadata.xml                  |   2 +-
 mail-filter/zdkimfilter/metadata.xml               |   4 +-
 mail-mta/exim/metadata.xml                         |  36 +--
 mail-mta/opensmtpd/metadata.xml                    |   3 +-
 mail-mta/postfix/metadata.xml                      |   2 +-
 mail-mta/qpsmtpd/metadata.xml                      |   2 +-
 mail-mta/ssmtp/metadata.xml                        |   2 +-
 media-fonts/bitstream-cyberbit/metadata.xml        |   1 -
 media-fonts/eb-garamond/metadata.xml               |   2 +-
 media-fonts/exljbris-free/metadata.xml             |   1 -
 media-fonts/fifth-leg/metadata.xml                 |   1 -
 media-fonts/intlfonts/metadata.xml                 |   2 +-
 media-fonts/jsmath-extra-dark/metadata.xml         |   2 +-
 media-fonts/jsmath-extra-light/metadata.xml        |   2 +-
 media-fonts/jsmath/metadata.xml                    |   2 +-
 media-fonts/liberation-fonts/metadata.xml          |   2 +-
 media-fonts/lklug/metadata.xml                     |   2 +-
 media-fonts/pothana2k/metadata.xml                 |   1 -
 media-fonts/quivira/metadata.xml                   |   1 -
 media-fonts/source-pro/metadata.xml                |   2 +-
 media-fonts/symbola/metadata.xml                   |   1 -
 media-gfx/autotrace/metadata.xml                   |   2 +-
 media-gfx/blender/metadata.xml                     |  12 +-
 media-gfx/cellwriter/metadata.xml                  |   1 -
 media-gfx/cutycapt/metadata.xml                    |   2 +-
 media-gfx/darktable/metadata.xml                   |   1 -
 media-gfx/exact-image/metadata.xml                 |   2 +-
 media-gfx/exiv2/metadata.xml                       |   4 +-
 media-gfx/fbida/metadata.xml                       |   6 +-
 media-gfx/fondu/metadata.xml                       |   2 +-
 media-gfx/fontforge/metadata.xml                   |   2 +-
 media-gfx/freecad/metadata.xml                     |   2 +-
 media-gfx/gimp-arrow-brushes/metadata.xml          |   2 +-
 media-gfx/hugin/metadata.xml                       |   2 +-
 media-gfx/icc_examin/metadata.xml                  |   2 +-
 media-gfx/imageworsener/metadata.xml               |   2 +-
 media-gfx/inkscape/metadata.xml                    |   2 +-
 media-gfx/iscan-plugin-gt-f500/metadata.xml        |   2 +-
 media-gfx/jpeg2ps/metadata.xml                     |   2 +-
 media-gfx/k3d/metadata.xml                         |   2 +-
 media-gfx/kflickr/metadata.xml                     |   2 +-
 media-gfx/kiconedit/metadata.xml                   |   1 -
 media-gfx/mkgallery/metadata.xml                   |   2 +-
 media-gfx/mypaint/metadata.xml                     |   1 -
 media-gfx/nip2/metadata.xml                        |   2 +-
 media-gfx/nvidia-texture-tools/metadata.xml        |   6 +-
 media-gfx/openexr_viewers/metadata.xml             |   2 +-
 media-gfx/photoqt/metadata.xml                     |   4 +-
 media-gfx/pinta/metadata.xml                       |   2 +-
 media-gfx/pixels2pgf/metadata.xml                  |   2 +-
 media-gfx/pornview/metadata.xml                    |   2 +-
 media-gfx/potrace/metadata.xml                     |   2 +-
 media-gfx/pycam/metadata.xml                       |   2 +-
 media-gfx/simple-scan/metadata.xml                 |   1 -
 media-gfx/viewnior/metadata.xml                    |   1 -
 media-gfx/xsane/metadata.xml                       |   2 +-
 media-gfx/yafaray/metadata.xml                     |   1 -
 media-libs/SoXt/metadata.xml                       |   2 +-
 media-libs/a52dec/metadata.xml                     |   2 +-
 media-libs/chromaprint/metadata.xml                |   2 +-
 media-libs/edje/metadata.xml                       |   6 +-
 media-libs/elementary/metadata.xml                 |   6 +-
 media-libs/emotion/metadata.xml                    |   6 +-
 media-libs/ethumb/metadata.xml                     |   6 +-
 media-libs/evas/metadata.xml                       |  20 +-
 media-libs/flac/metadata.xml                       |   2 +-
 media-libs/fnlib/metadata.xml                      |   6 +-
 media-libs/freeverb3/metadata.xml                  |   2 +-
 media-libs/gd/metadata.xml                         |   2 +-
 media-libs/glm/metadata.xml                        |   2 +-
 media-libs/gmtk/metadata.xml                       |   2 +-
 media-libs/gnonlin/metadata.xml                    |   2 +-
 media-libs/grilo/metadata.xml                      |   4 +-
 media-libs/gst-plugins-ugly/metadata.xml           |   2 +-
 media-libs/imlib2/metadata.xml                     |   6 +-
 media-libs/jbig2dec/metadata.xml                   |   2 +-
 media-libs/jbigkit/metadata.xml                    |   1 -
 media-libs/kvazaar/metadata.xml                    |   2 +-
 media-libs/libXcm/metadata.xml                     |   2 +-
 media-libs/libafterimage/metadata.xml              |   2 +-
 media-libs/libass/metadata.xml                     |   2 +-
 media-libs/libbdplus/metadata.xml                  |   2 +-
 media-libs/libbluray/metadata.xml                  |  10 +-
 media-libs/libcanberra/metadata.xml                |  14 +-
 media-libs/libextractor/metadata.xml               |   8 +-
 media-libs/libgroove/metadata.xml                  |   6 +-
 media-libs/libhdhomerun/metadata.xml               |   1 -
 media-libs/libiec61883/metadata.xml                |   1 -
 media-libs/libmpeg2/metadata.xml                   |   2 +-
 media-libs/libnsbmp/metadata.xml                   |   1 -
 media-libs/libnsgif/metadata.xml                   |   1 -
 media-libs/libnut/metadata.xml                     |   1 -
 media-libs/librosprite/metadata.xml                |   1 -
 media-libs/libsfml/metadata.xml                    |   2 +-
 media-libs/libsvgtiny/metadata.xml                 |   1 -
 media-libs/libv4l/metadata.xml                     |   1 -
 media-libs/libwebp/metadata.xml                    |   4 +-
 media-libs/libyami/metadata.xml                    |   2 +-
 media-libs/mesa/metadata.xml                       |   2 +-
 media-libs/netpbm/metadata.xml                     |   2 +-
 media-libs/openal/metadata.xml                     |   2 +-
 media-libs/openctm/metadata.xml                    |   2 +-
 media-libs/opusfile/metadata.xml                   |   6 +-
 media-libs/oyranos/metadata.xml                    |   2 +-
 media-libs/plib/metadata.xml                       |   2 +-
 media-libs/sdl-image/metadata.xml                  |   2 +-
 media-libs/sdl-mixer/metadata.xml                  |  12 +-
 media-libs/sdl-terminal/metadata.xml               |   2 +-
 media-libs/sdl2-image/metadata.xml                 |   2 +-
 media-libs/sdl2-mixer/metadata.xml                 |  14 +-
 media-libs/simage/metadata.xml                     |   2 +-
 media-libs/spandsp/metadata.xml                    |   2 +-
 media-libs/tremor/metadata.xml                     |   2 +-
 media-libs/vigra/metadata.xml                      |   2 +-
 media-libs/vips/metadata.xml                       |   2 +-
 media-libs/virglrenderer/metadata.xml              |   4 +-
 media-libs/waffle/metadata.xml                     |   1 -
 media-libs/x265/metadata.xml                       |   2 +-
 media-libs/zimg/metadata.xml                       |   2 +-
 media-plugins/audacious-plugins/metadata.xml       |  16 +-
 media-plugins/emotion_generic_players/metadata.xml |   4 +-
 media-plugins/evas_generic_loaders/metadata.xml    |   4 +-
 media-plugins/frei0r-plugins/metadata.xml          |   4 +-
 media-plugins/gmpc-avahi/metadata.xml              |   1 -
 media-plugins/gst-plugins-libnice/metadata.xml     |   1 -
 media-plugins/gst-plugins-meta/metadata.xml        |   9 +-
 media-plugins/gst-plugins-vaapi/metadata.xml       |   2 +-
 media-plugins/hexter/metadata.xml                  |   2 +-
 media-plugins/imlib2_loaders/metadata.xml          |  10 +-
 media-plugins/mda-lv2/metadata.xml                 |   2 +-
 media-plugins/mediastreamer-amr/metadata.xml       |   1 -
 media-plugins/mediastreamer-ilbc/metadata.xml      |   3 +-
 media-plugins/qmmp-plugin-pack/metadata.xml        |   1 -
 media-plugins/quodlibet-plugins/metadata.xml       |   2 +-
 media-plugins/vamp-aubio-plugins/metadata.xml      |   2 +-
 media-plugins/vdr-actuator/metadata.xml            |   1 -
 media-plugins/vdr-alcd/metadata.xml                |   1 -
 media-plugins/vdr-arghdirector/metadata.xml        |   1 -
 media-plugins/vdr-atscepg/metadata.xml             |   1 -
 media-plugins/vdr-audiorecorder/metadata.xml       |   1 -
 media-plugins/vdr-avards/metadata.xml              |   1 -
 media-plugins/vdr-bgprocess/metadata.xml           |   1 -
 media-plugins/vdr-browse/metadata.xml              |   1 -
 media-plugins/vdr-burn/metadata.xml                |   2 +-
 media-plugins/vdr-calc/metadata.xml                |   1 -
 media-plugins/vdr-cdplayer/metadata.xml            |   1 -
 media-plugins/vdr-chanman/metadata.xml             |   1 -
 media-plugins/vdr-channelblocker/metadata.xml      |   1 -
 media-plugins/vdr-cinebars/metadata.xml            |   1 -
 media-plugins/vdr-coverviewer/metadata.xml         |   1 -
 media-plugins/vdr-cpumon/metadata.xml              |   1 -
 media-plugins/vdr-decruft/metadata.xml             |   1 -
 media-plugins/vdr-devstatus/metadata.xml           |   1 -
 media-plugins/vdr-dummydevice/metadata.xml         |   1 -
 media-plugins/vdr-duplicates/metadata.xml          |   1 -
 media-plugins/vdr-dvd/metadata.xml                 |   2 +-
 media-plugins/vdr-epgsearch/metadata.xml           |   1 -
 media-plugins/vdr-exec/metadata.xml                |   1 -
 media-plugins/vdr-femon/metadata.xml               |   1 -
 media-plugins/vdr-fepg/metadata.xml                |   1 -
 media-plugins/vdr-filebrowser/metadata.xml         |   1 -
 media-plugins/vdr-fritzbox/metadata.xml            |   1 -
 media-plugins/vdr-graphtft/metadata.xml            |  12 +-
 media-plugins/vdr-iptv/metadata.xml                |   1 -
 media-plugins/vdr-joystick/metadata.xml            |   1 -
 media-plugins/vdr-launcher/metadata.xml            |   1 -
 media-plugins/vdr-live/metadata.xml                |   1 -
 media-plugins/vdr-mailbox/metadata.xml             |   1 -
 media-plugins/vdr-markad/metadata.xml              |   1 -
 media-plugins/vdr-mlist/metadata.xml               |   1 -
 media-plugins/vdr-mount/metadata.xml               |   1 -
 media-plugins/vdr-music/metadata.xml               |   3 +-
 media-plugins/vdr-newsticker/metadata.xml          |   1 -
 media-plugins/vdr-osdpip/metadata.xml              |   1 -
 media-plugins/vdr-osdserver/metadata.xml           |   1 -
 media-plugins/vdr-peer/metadata.xml                |   1 -
 media-plugins/vdr-permashift/metadata.xml          |   1 -
 media-plugins/vdr-picselshow/metadata.xml          |   1 -
 media-plugins/vdr-pilot/metadata.xml               |   1 -
 media-plugins/vdr-pilotskin/metadata.xml           |   1 -
 media-plugins/vdr-prefermenu/metadata.xml          |   1 -
 media-plugins/vdr-proxy/metadata.xml               |   1 -
 media-plugins/vdr-pvr350/metadata.xml              |   3 +-
 media-plugins/vdr-pvrinput/metadata.xml            |   1 -
 media-plugins/vdr-quicktimer/metadata.xml          |   1 -
 media-plugins/vdr-radiolist/metadata.xml           |   1 -
 media-plugins/vdr-recstatus/metadata.xml           |   1 -
 media-plugins/vdr-remote/metadata.xml              |   1 -
 media-plugins/vdr-rotor/metadata.xml               |   1 -
 media-plugins/vdr-rssreader/metadata.xml           |   1 -
 media-plugins/vdr-satip/metadata.xml               |   1 -
 media-plugins/vdr-scheduler/metadata.xml           |   1 -
 media-plugins/vdr-screenshot/metadata.xml          |   1 -
 media-plugins/vdr-serial/metadata.xml              |   1 -
 media-plugins/vdr-skincurses/metadata.xml          |   1 -
 media-plugins/vdr-sleeptimer/metadata.xml          |   1 -
 media-plugins/vdr-sndctl/metadata.xml              |   1 -
 media-plugins/vdr-solitaire/metadata.xml           |   1 -
 media-plugins/vdr-spider/metadata.xml              |   1 -
 media-plugins/vdr-suspendoutput/metadata.xml       |   1 -
 media-plugins/vdr-systeminfo/metadata.xml          |   1 -
 media-plugins/vdr-ttxtsubs/metadata.xml            |   1 -
 media-plugins/vdr-vcd/metadata.xml                 |   1 -
 media-plugins/vdr-vdrmanager/metadata.xml          |   1 -
 media-plugins/vdr-videosystem/metadata.xml         |   1 -
 media-plugins/vdr-vodcatcher/metadata.xml          |   1 -
 media-plugins/vdr-wapd/metadata.xml                |   1 -
 media-plugins/vdr-weatherng/metadata.xml           |   2 +-
 media-plugins/vdr-wirbelscan/metadata.xml          |   1 -
 media-plugins/vdr-xineliboutput/metadata.xml       |   2 +-
 media-plugins/vdr-zaphistory/metadata.xml          |   1 -
 media-plugins/vdr-zappilot/metadata.xml            |   1 -
 media-radio/ax25-tools/metadata.xml                |   2 +-
 media-radio/fldigi/metadata.xml                    |   2 +-
 media-radio/flrig/metadata.xml                     |   1 -
 media-radio/radiotray/metadata.xml                 |   2 +-
 media-radio/tucnak2/metadata.xml                   |   4 +-
 media-sound/a2jmidid/metadata.xml                  |   1 -
 media-sound/abcde/metadata.xml                     |  10 +-
 media-sound/abcmidi/metadata.xml                   |   2 +-
 media-sound/asunder/metadata.xml                   |   4 +-
 media-sound/audicle/metadata.xml                   |   1 -
 media-sound/baudline/metadata.xml                  |   1 -
 media-sound/cmix/metadata.xml                      |   2 +-
 media-sound/cmus/metadata.xml                      |   2 +-
 media-sound/easytag/metadata.xml                   |   6 +-
 media-sound/entagged-tageditor/metadata.xml        |   2 +-
 media-sound/flack/metadata.xml                     |   2 +-
 media-sound/fluid-soundfont/metadata.xml           |   1 -
 media-sound/freebirth/metadata.xml                 |   2 +-
 media-sound/google-musicmanager/metadata.xml       |   2 +-
 media-sound/gpodder/metadata.xml                   |   2 +-
 media-sound/id3ted/metadata.xml                    |   1 -
 media-sound/jack-rack/metadata.xml                 |   2 +-
 media-sound/kid3/metadata.xml                      |   2 +-
 media-sound/lmms/metadata.xml                      |   2 +-
 media-sound/miniaudicle/metadata.xml               |   1 -
 media-sound/mixxx/metadata.xml                     |   2 +-
 media-sound/mp3unicode/metadata.xml                |   2 +-
 media-sound/mumble/metadata.xml                    |   2 +-
 media-sound/murmur/metadata.xml                    |   2 +-
 media-sound/musescore/metadata.xml                 |   2 +-
 media-sound/ncmpcpp/metadata.xml                   |   6 +-
 media-sound/ogg2mp3/metadata.xml                   |   1 -
 media-sound/patchage/metadata.xml                  |   4 +-
 media-sound/picard/metadata.xml                    |   2 +-
 media-sound/pms/metadata.xml                       |   2 +-
 media-sound/pnmixer/metadata.xml                   |   6 +-
 media-sound/podcatcher/metadata.xml                |   2 +-
 media-sound/protux/metadata.xml                    |   2 +-
 media-sound/pulseaudio/metadata.xml                |   2 +-
 media-sound/qsampler/metadata.xml                  |   2 +-
 media-sound/qtmpc/metadata.xml                     |   1 -
 media-sound/quodlibet/metadata.xml                 |   2 +-
 media-sound/rip/metadata.xml                       |   2 +-
 media-sound/scmpc/metadata.xml                     |   1 -
 media-sound/shnflacverify/metadata.xml             |   2 +-
 media-sound/shoutcast-search/metadata.xml          |   2 +-
 media-sound/sndpeek/metadata.xml                   |   1 -
 media-sound/splay/metadata.xml                     |   2 +-
 media-sound/spotify/metadata.xml                   |   1 -
 media-sound/tomahawk/metadata.xml                  |   1 -
 media-sound/vdramgw/metadata.xml                   |   1 -
 media-sound/wildmidi/metadata.xml                  |   2 +-
 media-sound/xwax/metadata.xml                      |  12 +-
 media-tv/dvbstream/metadata.xml                    |   2 +-
 media-tv/kodi/metadata.xml                         |  36 +--
 media-tv/linuxtv-dvb-firmware/metadata.xml         |   1 -
 media-tv/me-tv/metadata.xml                        |   2 +-
 media-tv/shoutcast2vdr/metadata.xml                |   1 -
 media-tv/tvbrowser/metadata.xml                    |   2 +-
 media-tv/tvheadend/metadata.xml                    |   2 +-
 media-tv/tvmovie2vdr/metadata.xml                  |   1 -
 media-tv/xbmc/metadata.xml                         |  30 +--
 media-video/aravis/metadata.xml                    |   4 +-
 media-video/arista/metadata.xml                    |   1 -
 media-video/atomicparsley-wez/metadata.xml         |   2 +-
 media-video/bbtools/metadata.xml                   |   1 -
 media-video/cheese/metadata.xml                    |   1 -
 media-video/dvd9to5/metadata.xml                   |   1 -
 media-video/dvdrip/metadata.xml                    |   4 +-
 media-video/ffdiaporama/metadata.xml               |   5 +-
 media-video/ffmpegthumbnailer/metadata.xml         |   2 +-
 media-video/frameworks/metadata.xml                |   1 -
 media-video/gnome-mplayer/metadata.xml             |   4 +-
 media-video/handbrake/metadata.xml                 |   2 +-
 media-video/harvid/metadata.xml                    |   2 +-
 media-video/mjpg-streamer/metadata.xml             |   2 +-
 media-video/mkclean/metadata.xml                   |   2 +-
 media-video/mkvalidator/metadata.xml               |   2 +-
 media-video/motiontrack/metadata.xml               |   2 +-
 media-video/mplay-sh/metadata.xml                  |   1 -
 media-video/parole/metadata.xml                    |   2 +-
 media-video/pgcedit/metadata.xml                   |   2 +-
 media-video/projectx/metadata.xml                  |   2 +-
 media-video/rtmpdump/metadata.xml                  |   5 +-
 media-video/stk11xx/metadata.xml                   |   2 +-
 media-video/subtitleeditor/metadata.xml            |   1 -
 media-video/tsmuxer/metadata.xml                   |   2 +-
 media-video/ushare/metadata.xml                    |   2 +-
 media-video/vdr/metadata.xml                       |   2 +-
 media-video/vdrsync/metadata.xml                   |   1 -
 media-video/vstrip/metadata.xml                    |   1 -
 net-analyzer/2ping/metadata.xml                    |   2 +-
 net-analyzer/angst/metadata.xml                    |   2 +-
 net-analyzer/barnyard2/metadata.xml                |  72 +++---
 net-analyzer/bmon/metadata.xml                     |   2 +-
 net-analyzer/bwm-ng/metadata.xml                   |   4 +-
 net-analyzer/cacti-spine/metadata.xml              |   1 -
 net-analyzer/cacti/metadata.xml                    |   2 +-
 net-analyzer/chaosreader/metadata.xml              |   2 +-
 net-analyzer/cloudshark/metadata.xml               |   1 -
 net-analyzer/fail2ban/metadata.xml                 |   2 +-
 net-analyzer/fping/metadata.xml                    |   2 +-
 net-analyzer/goaccess/metadata.xml                 |   2 +-
 net-analyzer/gr-fosphor/metadata.xml               |   3 +-
 net-analyzer/gsm-receiver/metadata.xml             |   1 -
 net-analyzer/gspoof/metadata.xml                   |   2 +-
 net-analyzer/hping/metadata.xml                    |   1 -
 net-analyzer/httping/metadata.xml                  |   2 +-
 net-analyzer/icinga-web/metadata.xml               |   2 +-
 net-analyzer/icinga/metadata.xml                   |   2 +-
 net-analyzer/icinga2/metadata.xml                  |   2 +-
 net-analyzer/ipband/metadata.xml                   |   2 +-
 net-analyzer/ipv6-toolkit/metadata.xml             |   1 -
 net-analyzer/monitoring-plugins/metadata.xml       |  10 +-
 net-analyzer/munin/metadata.xml                    |   2 +-
 .../nagios-check_linux_bonding/metadata.xml        |   1 -
 net-analyzer/nagios-plugins-snmp/metadata.xml      |   1 -
 net-analyzer/nagios-plugins/metadata.xml           |  11 +-
 net-analyzer/ncrack/metadata.xml                   |   1 -
 net-analyzer/net-snmp/metadata.xml                 |   2 +-
 net-analyzer/netcat6/metadata.xml                  |   2 +-
 net-analyzer/netperf/metadata.xml                  |   4 +-
 net-analyzer/netsniff-ng/metadata.xml              |   1 -
 net-analyzer/netwatch/metadata.xml                 |   1 -
 net-analyzer/pchar/metadata.xml                    |   3 +-
 net-analyzer/pinger/metadata.xml                   |   4 +-
 net-analyzer/pmacct/metadata.xml                   |   8 +-
 net-analyzer/ripe-atlas-tools/metadata.xml         |   2 +-
 net-analyzer/rrdtool/metadata.xml                  |   6 +-
 net-analyzer/sancp/metadata.xml                    |   2 +-
 net-analyzer/scanlogd/metadata.xml                 |   4 +-
 net-analyzer/sguil-client/metadata.xml             |   2 +-
 net-analyzer/sguil-sensor/metadata.xml             |   2 +-
 net-analyzer/sguil-server/metadata.xml             |   2 +-
 net-analyzer/smokeping/metadata.xml                |   8 +-
 net-analyzer/snort/metadata.xml                    | 272 ++++++++++-----------
 net-analyzer/symon/metadata.xml                    |   6 +-
 net-analyzer/tcpdump/metadata.xml                  |   4 +-
 net-analyzer/tcpreplay/metadata.xml                |   2 +-
 net-analyzer/testssl/metadata.xml                  |   2 +-
 net-analyzer/thc-ipv6/metadata.xml                 |   1 -
 net-analyzer/traceproto/metadata.xml               |   2 +-
 net-analyzer/w3af/metadata.xml                     |   2 +-
 net-analyzer/wapiti/metadata.xml                   |   2 +-
 net-analyzer/wireshark/metadata.xml                |  22 +-
 net-analyzer/zabbix/metadata.xml                   |   2 +-
 net-analyzer/zmap/metadata.xml                     |   2 +-
 net-dialup/capi4k-utils/metadata.xml               |   6 +-
 net-dialup/cutecom/metadata.xml                    |   2 +-
 net-dialup/freeradius-client/metadata.xml          |   4 +-
 net-dialup/freeradius/metadata.xml                 |   2 +-
 net-dialup/mgetty/metadata.xml                     |   4 +-
 net-dialup/minicom/metadata.xml                    |   2 +-
 net-dialup/ppp-scripts/metadata.xml                |   2 +-
 net-dialup/ppp/metadata.xml                        |   2 +-
 net-dialup/tkvoice/metadata.xml                    |   2 +-
 net-dialup/ueagle-atm/metadata.xml                 |   2 +-
 net-dialup/ueagle4-atm/metadata.xml                |   2 +-
 net-dns/avahi/metadata.xml                         |   2 +-
 net-dns/dnsmasq/metadata.xml                       |  14 +-
 net-dns/dnssec-check/metadata.xml                  |   1 -
 net-dns/dnssec-lookup/metadata.xml                 |   1 -
 net-dns/dnssec-nodes/metadata.xml                  |   1 -
 net-dns/dnssec-system-tray/metadata.xml            |   1 -
 net-dns/dnssec-tools/metadata.xml                  |   1 -
 net-dns/dnssec-validator/metadata.xml              |   1 -
 net-dns/hesinfo/metadata.xml                       |   1 -
 net-dns/ldns-utils/metadata.xml                    |   6 +-
 net-dns/maradns/metadata.xml                       |   2 +-
 net-dns/mydns/metadata.xml                         |   4 +-
 net-dns/namecoin-qt/metadata.xml                   |   2 +-
 net-dns/namecoind/metadata.xml                     |   2 +-
 net-dns/nsd/metadata.xml                           |  18 +-
 net-dns/opendnssec/metadata.xml                    |  13 +-
 net-dns/pdns/metadata.xml                          |  16 +-
 net-dns/pdnsd/metadata.xml                         |   6 +-
 net-dns/resolvconf-symlink/metadata.xml            |   2 +-
 net-dns/sheerdns/metadata.xml                      |   1 -
 net-dns/unbound/metadata.xml                       |   6 +-
 net-dns/updatedd/metadata.xml                      |   2 +-
 net-firewall/arno-iptables-firewall/metadata.xml   |   2 +-
 net-firewall/ebtables/metadata.xml                 |   2 +-
 net-firewall/firehol/metadata.xml                  |   2 +-
 net-firewall/firewalld/metadata.xml                |   3 +-
 net-firewall/fwipsec/metadata.xml                  |   2 +-
 net-firewall/iptables/metadata.xml                 |   8 +-
 net-firewall/itval/metadata.xml                    |   2 +-
 net-firewall/nufw/metadata.xml                     |   8 +-
 net-firewall/sanewall/metadata.xml                 |   2 +-
 net-firewall/shapecfg/metadata.xml                 |   2 +-
 net-fs/cvmfs/metadata.xml                          |   2 +-
 net-fs/openafs/metadata.xml                        |   2 +-
 net-ftp/frox/metadata.xml                          |   2 +-
 net-ftp/lftp/metadata.xml                          |   6 +-
 net-ftp/pure-ftpd/metadata.xml                     |  22 +-
 net-im/bitlbee/metadata.xml                        |  14 +-
 net-im/centerim/metadata.xml                       |   8 +-
 net-im/climm/metadata.xml                          |   2 +-
 net-im/dianara/metadata.xml                        |   2 +-
 net-im/ekg2/metadata.xml                           |  20 +-
 net-im/jabberd2/metadata.xml                       |   8 +-
 net-im/licq/metadata.xml                           |   2 +-
 net-im/minbif/metadata.xml                         |   1 -
 net-im/psi/metadata.xml                            |   2 +-
 net-im/psimedia/metadata.xml                       |   2 +-
 net-im/qtwitter/metadata.xml                       |   1 -
 net-im/telepathy-connection-managers/metadata.xml  |  18 +-
 net-im/tkabber/metadata.xml                        |   2 +-
 net-irc/atheme-services/metadata.xml               |  10 +-
 net-irc/hexchat/metadata.xml                       |  24 +-
 net-irc/kvirc/metadata.xml                         |   2 +-
 net-irc/ngircd/metadata.xml                        |   2 +-
 net-irc/psybnc/metadata.xml                        |   6 +-
 net-irc/quassel/metadata.xml                       |   2 +-
 net-irc/unrealircd/metadata.xml                    |  20 +-
 net-libs/NativeThread/metadata.xml                 |   1 -
 net-libs/aqbanking/metadata.xml                    |   4 +-
 net-libs/c-client/metadata.xml                     |   4 +-
 net-libs/daq/metadata.xml                          |  71 +++---
 net-libs/gsnmp/metadata.xml                        |   1 -
 net-libs/hubbub/metadata.xml                       |   1 -
 net-libs/iax/metadata.xml                          |   2 +-
 net-libs/iojs/metadata.xml                         |   6 +-
 net-libs/ldns/metadata.xml                         |   6 +-
 net-libs/libbitcoinconsensus/metadata.xml          |   2 +-
 net-libs/libbtbb/metadata.xml                      |   2 +-
 net-libs/libdom/metadata.xml                       |   1 -
 net-libs/libeXosip/metadata.xml                    |   2 +-
 net-libs/libetpan/metadata.xml                     |   2 +-
 net-libs/libgsasl/metadata.xml                     |   4 +-
 net-libs/libhubbub/metadata.xml                    |   1 -
 net-libs/libinfinity/metadata.xml                  |   2 +-
 net-libs/libmicrohttpd/metadata.xml                |   5 +-
 net-libs/libmirisdr/metadata.xml                   |   1 -
 net-libs/libmnl/metadata.xml                       |   1 -
 net-libs/libnetfilter_cttimeout/metadata.xml       |   1 -
 net-libs/libnftnl/metadata.xml                     |   1 -
 net-libs/libosmo-abis/metadata.xml                 |   1 -
 net-libs/libosmo-dsp/metadata.xml                  |   1 -
 net-libs/libosmocore/metadata.xml                  |   5 +-
 net-libs/libpcap/metadata.xml                      |   4 +-
 net-libs/librsync/metadata.xml                     |   2 +-
 net-libs/libsrtp/metadata.xml                      |   2 +-
 net-libs/libssh/metadata.xml                       |  12 +-
 net-libs/libvncserver/metadata.xml                 |   2 +-
 net-libs/nativebiginteger/metadata.xml             |   1 -
 net-libs/nodejs/metadata.xml                       |   4 +-
 net-libs/onion/metadata.xml                        |   2 +-
 net-libs/openmq-cclient/metadata.xml               |   1 -
 net-libs/ortp/metadata.xml                         |   6 +-
 net-libs/phodav/metadata.xml                       |   2 +-
 net-libs/polarssl/metadata.xml                     |   2 +-
 net-libs/ripe-atlas-sagan/metadata.xml             |   2 +-
 net-libs/telepathy-qt/metadata.xml                 |   2 +-
 net-libs/webkit-gtk/metadata.xml                   |   4 +-
 net-mail/Freemail/metadata.xml                     |   1 -
 net-mail/autorespond/metadata.xml                  |   2 +-
 net-mail/mhonarc-gentoo/metadata.xml               |   1 -
 net-mail/mhonarc/metadata.xml                      |   1 -
 net-mail/mu/metadata.xml                           |   2 +-
 net-mail/sendEmail/metadata.xml                    |   1 -
 net-mail/vqadmin/metadata.xml                      |   2 +-
 net-misc/aria2/metadata.xml                        |   2 +-
 net-misc/badvpn/metadata.xml                       |   3 +-
 net-misc/batctl/metadata.xml                       |   1 -
 net-misc/batman-adv/metadata.xml                   |   1 -
 net-misc/bfgminer/metadata.xml                     |  82 +++----
 net-misc/bird/metadata.xml                         |   2 +-
 net-misc/cfengine/metadata.xml                     |   2 +-
 net-misc/chrony/metadata.xml                       |  14 +-
 net-misc/clusterssh/metadata.xml                   |   2 +-
 net-misc/connman-gtk/metadata.xml                  |   4 +-
 net-misc/connman-ui/metadata.xml                   |   2 +-
 net-misc/dhcp/metadata.xml                         |   4 +-
 net-misc/dnetstats/metadata.xml                    |   1 -
 net-misc/dropbox-cli/metadata.xml                  |   1 -
 net-misc/fatrat/metadata.xml                       |   4 +-
 net-misc/gcap/metadata.xml                         |   1 -
 net-misc/gsasl/metadata.xml                        |   4 +-
 net-misc/hotot/metadata.xml                        |   2 +-
 net-misc/httpie/metadata.xml                       |   1 -
 net-misc/iperf/metadata.xml                        |   2 +-
 net-misc/iprange/metadata.xml                      |   2 +-
 net-misc/ipsc/metadata.xml                         |   2 +-
 net-misc/ipsorcery/metadata.xml                    |   2 +-
 net-misc/iputils/metadata.xml                      |   2 +-
 net-misc/ipx-utils/metadata.xml                    |   1 -
 net-misc/isatapd/metadata.xml                      |   1 -
 net-misc/jlj/metadata.xml                          |   1 -
 net-misc/jumpgate/metadata.xml                     |   2 +-
 net-misc/knock/metadata.xml                        |   2 +-
 net-misc/l7-filter-userspace/metadata.xml          |   2 +-
 net-misc/lanmap/metadata.xml                       |   1 -
 net-misc/lcr/metadata.xml                          |   1 -
 net-misc/libteam/metadata.xml                      |   2 +-
 net-misc/lldpd/metadata.xml                        |  23 +-
 net-misc/mediatomb/metadata.xml                    |   2 +-
 net-misc/mico/metadata.xml                         |   1 -
 net-misc/minidlna/metadata.xml                     |   1 -
 net-misc/miredo/metadata.xml                       |   1 -
 net-misc/mosh/metadata.xml                         |   1 -
 net-misc/nat-traverse/metadata.xml                 |   2 +-
 net-misc/ncp/metadata.xml                          |   1 -
 net-misc/ndisc6/metadata.xml                       |   1 -
 net-misc/ofono/metadata.xml                        |   1 -
 net-misc/openconnect/metadata.xml                  |   7 +-
 net-misc/openvswitch/metadata.xml                  |   4 +-
 net-misc/proxytunnel/metadata.xml                  |   2 +-
 net-misc/putty/metadata.xml                        |   2 +-
 net-misc/rabbitmq-server/metadata.xml              |   1 -
 net-misc/rancid/metadata.xml                       |   1 -
 net-misc/rdesktop/metadata.xml                     |   2 +-
 net-misc/remmina/metadata.xml                      |   2 +-
 net-misc/rsync/metadata.xml                        |   2 +-
 net-misc/samplicator/metadata.xml                  |   2 +-
 net-misc/slimrat/metadata.xml                      |   2 +-
 net-misc/sparkleshare/metadata.xml                 |   2 +-
 net-misc/spice-gtk/metadata.xml                    |   2 +-
 net-misc/stargazer/metadata.xml                    |   2 +-
 net-misc/termpkg/metadata.xml                      |   2 +-
 net-misc/tigervnc/metadata.xml                     |   2 +-
 net-misc/tinc/metadata.xml                         |   4 +-
 net-misc/tor/metadata.xml                          |  14 +-
 net-misc/ttytter/metadata.xml                      |   1 -
 net-misc/udpxy/metadata.xml                        |   2 +-
 net-misc/usbip/metadata.xml                        |   1 -
 net-misc/vrrpd/metadata.xml                        |   2 +-
 net-misc/wget/metadata.xml                         |   4 +-
 net-misc/xrdp/metadata.xml                         |   2 +-
 net-misc/yaydl/metadata.xml                        |   1 -
 net-misc/youtube-viewer/metadata.xml               |   2 +-
 net-nds/389-ds-base/metadata.xml                   |  14 +-
 net-nds/gosa-core/metadata.xml                     |   4 +-
 net-nds/openldap/metadata.xml                      |  12 +-
 net-nds/shelldap/metadata.xml                      |   1 -
 net-nds/tac_plus/metadata.xml                      |   4 +-
 net-news/liferea/metadata.xml                      |   2 +-
 net-nntp/hellanzb/metadata.xml                     |   1 -
 net-nntp/inn/metadata.xml                          |   4 +-
 net-nntp/kwooty/metadata.xml                       |   2 +-
 net-nntp/nzbget/metadata.xml                       |   2 +-
 net-nntp/slrn/metadata.xml                         |   2 +-
 net-nntp/tin/metadata.xml                          |  10 +-
 net-nntp/ubh/metadata.xml                          |   2 +-
 net-p2p/bitcoin-cli/metadata.xml                   |   2 +-
 net-p2p/bitcoin-qt/metadata.xml                    |   2 +-
 net-p2p/bitcoind/metadata.xml                      |   2 +-
 net-p2p/bitcoinxt-qt/metadata.xml                  |   2 +-
 net-p2p/bitcoinxtd/metadata.xml                    |   2 +-
 net-p2p/deluge/metadata.xml                        |   4 +-
 net-p2p/fms/metadata.xml                           |   3 +-
 net-p2p/litecoind/metadata.xml                     |   2 +-
 net-p2p/transmission/metadata.xml                  |   4 +-
 net-p2p/vuze-coreplugins/metadata.xml              |   2 +-
 net-print/cups-filters/metadata.xml                |   2 +-
 net-print/cups/metadata.xml                        |   6 +-
 net-print/splix/metadata.xml                       |   2 +-
 net-proxy/adzapper/metadata.xml                    |   2 +-
 net-proxy/cntlm/metadata.xml                       |   2 +-
 net-proxy/dnsproxy/metadata.xml                    |   2 +-
 net-proxy/havp/metadata.xml                        |   2 +-
 net-proxy/rejik/metadata.xml                       |   2 +-
 net-proxy/sshproxy/metadata.xml                    |   4 +-
 net-proxy/tayga/metadata.xml                       |   1 -
 net-proxy/tinyproxy/metadata.xml                   |  10 +-
 net-voip/ekiga/metadata.xml                        |   1 -
 net-voip/linphone/metadata.xml                     |  10 +-
 net-voip/telepathy-gabble/metadata.xml             |   1 -
 net-voip/telepathy-salut/metadata.xml              |   1 -
 net-voip/yate/metadata.xml                         |   1 -
 net-wireless/ap-utils/metadata.xml                 |   2 +-
 net-wireless/chirp/metadata.xml                    |   1 -
 net-wireless/crda/metadata.xml                     |   3 +-
 net-wireless/gnuradio/metadata.xml                 |  41 ++--
 net-wireless/gr-baz/metadata.xml                   |   7 +-
 net-wireless/gr-iqbal/metadata.xml                 |   1 -
 net-wireless/gr-osmosdr/metadata.xml               |   1 -
 net-wireless/gr-scan/metadata.xml                  |   1 -
 net-wireless/hidclient/metadata.xml                |   1 -
 net-wireless/hostapd/metadata.xml                  |  10 +-
 net-wireless/kismet-ubertooth/metadata.xml         |   2 +-
 net-wireless/lorcon-old/metadata.xml               |   1 -
 net-wireless/lorcon/metadata.xml                   |   1 -
 net-wireless/mdk/metadata.xml                      |   1 -
 net-wireless/multimode/metadata.xml                |   1 -
 net-wireless/neard/metadata.xml                    |   2 +-
 net-wireless/openbsc/metadata.xml                  |   1 -
 net-wireless/openggsn/metadata.xml                 |   1 -
 net-wireless/osmobts/metadata.xml                  |   1 -
 net-wireless/osmocom-bb/metadata.xml               |   1 -
 net-wireless/rfkill/metadata.xml                   |   1 -
 net-wireless/rtl-sdr/metadata.xml                  |   1 -
 net-wireless/ubertooth/metadata.xml                |   2 +-
 net-wireless/wireless-regdb/metadata.xml           |   1 -
 net-wireless/wireless-tools/metadata.xml           |   2 +-
 net-wireless/wpa_supplicant/metadata.xml           |  22 +-
 net-wireless/yatebts/metadata.xml                  |   1 -
 ros-meta/audio_common/metadata.xml                 |   2 +-
 ros-meta/bond_core/metadata.xml                    |   2 +-
 ros-meta/calibration/metadata.xml                  |   2 +-
 ros-meta/common_msgs/metadata.xml                  |   2 +-
 ros-meta/common_tutorials/metadata.xml             |   2 +-
 ros-meta/desktop/metadata.xml                      |   2 +-
 ros-meta/desktop_full/metadata.xml                 |   2 +-
 ros-meta/diagnostics/metadata.xml                  |   2 +-
 ros-meta/driver_common/metadata.xml                |   2 +-
 ros-meta/executive_smach/metadata.xml              |   2 +-
 ros-meta/gazebo_ros_pkgs/metadata.xml              |   2 +-
 ros-meta/geographic_info/metadata.xml              |   2 +-
 ros-meta/geometry/metadata.xml                     |   2 +-
 ros-meta/geometry_experimental/metadata.xml        |   2 +-
 ros-meta/geometry_tutorials/metadata.xml           |   2 +-
 ros-meta/hector_localization/metadata.xml          |   2 +-
 ros-meta/hector_slam/metadata.xml                  |   2 +-
 ros-meta/image_common/metadata.xml                 |   2 +-
 ros-meta/image_pipeline/metadata.xml               |   2 +-
 ros-meta/image_transport_plugins/metadata.xml      |   2 +-
 ros-meta/imu_pipeline/metadata.xml                 |   2 +-
 ros-meta/laser_pipeline/metadata.xml               |   2 +-
 ros-meta/mavros/metadata.xml                       |   2 +-
 ros-meta/navigation/metadata.xml                   |   2 +-
 ros-meta/nodelet_core/metadata.xml                 |   2 +-
 ros-meta/perception/metadata.xml                   |   2 +-
 ros-meta/perception_pcl/metadata.xml               |   2 +-
 ros-meta/pr2_common/metadata.xml                   |   2 +-
 ros-meta/qt_gui_core/metadata.xml                  |   2 +-
 ros-meta/robot/metadata.xml                        |   2 +-
 ros-meta/robot_model/metadata.xml                  |   2 +-
 ros-meta/ros/metadata.xml                          |   2 +-
 ros-meta/ros_base/metadata.xml                     |   2 +-
 ros-meta/ros_comm/metadata.xml                     |   2 +-
 ros-meta/ros_control/metadata.xml                  |   2 +-
 ros-meta/ros_core/metadata.xml                     |   2 +-
 ros-meta/ros_tutorials/metadata.xml                |   2 +-
 ros-meta/rosbridge_suite/metadata.xml              |   2 +-
 ros-meta/roscpp_core/metadata.xml                  |   2 +-
 ros-meta/rosserial/metadata.xml                    |   2 +-
 ros-meta/rqt/metadata.xml                          |   2 +-
 ros-meta/rqt_common_plugins/metadata.xml           |   2 +-
 ros-meta/rqt_robot_plugins/metadata.xml            |   2 +-
 ros-meta/simulators/metadata.xml                   |   2 +-
 ros-meta/slam_gmapping/metadata.xml                |   2 +-
 ros-meta/unique_identifier/metadata.xml            |   2 +-
 ros-meta/vision_opencv/metadata.xml                |   2 +-
 ros-meta/vision_visp/metadata.xml                  |   2 +-
 ros-meta/visualization_tutorials/metadata.xml      |   2 +-
 ros-meta/viz/metadata.xml                          |   2 +-
 sci-astronomy/cpl/metadata.xml                     |   2 +-
 sci-astronomy/predict/metadata.xml                 |   4 +-
 sci-biology/biogrep/metadata.xml                   |   1 -
 sci-biology/biopandas/metadata.xml                 |   2 +-
 sci-biology/clustalw-mpi/metadata.xml              |   4 +-
 sci-biology/embassy-cbstools/metadata.xml          |   2 +-
 sci-biology/embassy-clustalomega/metadata.xml      |   2 +-
 sci-biology/embassy-domainatrix/metadata.xml       |   2 +-
 sci-biology/embassy-domalign/metadata.xml          |   2 +-
 sci-biology/embassy-domsearch/metadata.xml         |   2 +-
 sci-biology/embassy-esim4/metadata.xml             |   2 +-
 sci-biology/embassy-hmmer/metadata.xml             |   2 +-
 sci-biology/embassy-iprscan/metadata.xml           |   2 +-
 sci-biology/embassy-meme/metadata.xml              |   2 +-
 sci-biology/embassy-phylipnew/metadata.xml         |   2 +-
 sci-biology/embassy-signature/metadata.xml         |   2 +-
 sci-biology/embassy-structure/metadata.xml         |   2 +-
 sci-biology/embassy-topo/metadata.xml              |   2 +-
 sci-biology/embassy-vienna/metadata.xml            |   2 +-
 sci-biology/embassy/metadata.xml                   |   2 +-
 sci-biology/emboss/metadata.xml                    |   2 +-
 sci-biology/gatk/metadata.xml                      |   2 +-
 sci-biology/picard/metadata.xml                    |   2 +-
 sci-calculators/galculator/metadata.xml            |   2 +-
 sci-calculators/transcalc/metadata.xml             |   2 +-
 sci-calculators/units/metadata.xml                 |   2 +-
 sci-chemistry/apbs/metadata.xml                    |   2 +-
 sci-chemistry/ghemical/metadata.xml                |   2 +-
 sci-chemistry/gperiodic/metadata.xml               |   2 +-
 sci-chemistry/hollow/metadata.xml                  |   2 +-
 sci-chemistry/molequeue/metadata.xml               |   2 +-
 sci-chemistry/mopac7/metadata.xml                  |   2 +-
 sci-chemistry/prody/metadata.xml                   |   2 +-
 sci-chemistry/pymol-apbs-plugin/metadata.xml       |   2 +-
 sci-chemistry/votca-csg/metadata.xml               |   2 +-
 sci-chemistry/votca-csgapps/metadata.xml           |   2 +-
 sci-electronics/geda-xgsch2pcb/metadata.xml        |   1 -
 sci-electronics/geda/metadata.xml                  |   3 +-
 sci-electronics/gnetman/metadata.xml               |   2 +-
 sci-electronics/gplcver/metadata.xml               |   2 +-
 sci-electronics/gresistor/metadata.xml             |   1 -
 sci-electronics/kicad/metadata.xml                 |   2 +-
 sci-electronics/osqoop/metadata.xml                |   2 +-
 sci-electronics/plcedit/metadata.xml               |   1 -
 sci-electronics/pulseview/metadata.xml             |   4 +-
 sci-electronics/quartus-prime-lite/metadata.xml    |   1 +
 sci-electronics/sigrok-cli/metadata.xml            |   4 +-
 sci-electronics/splat/metadata.xml                 |   4 +-
 sci-geosciences/cdat-lite/metadata.xml             |   1 -
 sci-geosciences/congen/metadata.xml                |   1 -
 sci-geosciences/gmapcatcher/metadata.xml           |   1 -
 sci-geosciences/googleearth/metadata.xml           |   2 +-
 sci-geosciences/gshhs-data/metadata.xml            |   2 +-
 sci-geosciences/gshhs/metadata.xml                 |   2 +-
 .../harmonics-dwf-free-noncomm/metadata.xml        |   1 -
 sci-geosciences/harmonics-dwf-free/metadata.xml    |   1 -
 sci-geosciences/laszip/metadata.xml                |   2 +-
 sci-geosciences/libtcd/metadata.xml                |   1 -
 sci-geosciences/mapnik/metadata.xml                |   2 +-
 sci-geosciences/opencpn/metadata.xml               |   2 +-
 sci-geosciences/osm2pgsql/metadata.xml             |   2 +-
 sci-geosciences/swmm/metadata.xml                  |   1 -
 sci-geosciences/xtide/metadata.xml                 |   3 +-
 sci-libs/coinor-clp/metadata.xml                   |   8 +-
 sci-libs/coinor-osi/metadata.xml                   |   2 +-
 sci-libs/coinor-symphony/metadata.xml              |   2 +-
 sci-libs/freesteam/metadata.xml                    |   2 +-
 sci-libs/gerris/metadata.xml                       |   2 +-
 sci-libs/gts/metadata.xml                          |   2 +-
 sci-libs/ignition-math/metadata.xml                |   2 +-
 sci-libs/lemon/metadata.xml                        |   2 +-
 sci-libs/libcore/metadata.xml                      |   2 +-
 sci-libs/libghemical/metadata.xml                  |   4 +-
 sci-libs/libsigrok/metadata.xml                    |   8 +-
 sci-libs/libsigrokdecode/metadata.xml              |   2 +-
 sci-libs/libspatialindex/metadata.xml              |   1 -
 sci-libs/mumps/metadata.xml                        |   2 +-
 sci-libs/naga/metadata.xml                         |   1 -
 sci-libs/netcdf-cxx/metadata.xml                   |   2 +-
 sci-libs/openfoam/metadata.xml                     |   2 +-
 sci-libs/pymmlib/metadata.xml                      |   2 +-
 sci-libs/silo/metadata.xml                         |   2 +-
 sci-libs/spooles/metadata.xml                      |   2 +-
 sci-libs/spqr/metadata.xml                         |   4 +-
 sci-libs/starparse/metadata.xml                    |   2 +-
 sci-libs/suitesparse/metadata.xml                  |   2 +-
 sci-libs/vecmath-objectclub/metadata.xml           |   1 -
 sci-libs/votca-tools/metadata.xml                  |   2 +-
 sci-mathematics/agda/metadata.xml                  |   6 +-
 sci-mathematics/calc/metadata.xml                  |   2 +-
 sci-mathematics/cvc3/metadata.xml                  |   6 +-
 sci-mathematics/e/metadata.xml                     |   4 +-
 sci-mathematics/flint/metadata.xml                 |   6 +-
 sci-mathematics/gmm/metadata.xml                   |   2 +-
 sci-mathematics/isabelle/metadata.xml              |  32 +--
 sci-mathematics/kodkodi/metadata.xml               |   4 +-
 sci-mathematics/lpsolve/metadata.xml               |   2 +-
 sci-mathematics/msieve/metadata.xml                |   2 +-
 sci-mathematics/octave-epstk/metadata.xml          |   2 +-
 sci-mathematics/p9m4/metadata.xml                  |   2 +-
 sci-mathematics/qtoctave/metadata.xml              |   2 +-
 sci-mathematics/relational/metadata.xml            |   1 -
 sci-mathematics/rw/metadata.xml                    |   2 +-
 sci-mathematics/snns/metadata.xml                  |   2 +-
 sci-mathematics/yacas/metadata.xml                 |   2 +-
 sci-mathematics/yafu/metadata.xml                  |   2 +-
 sci-misc/fitsverify/metadata.xml                   |   2 +-
 sci-misc/nco/metadata.xml                          |   2 +-
 sci-physics/espresso++/metadata.xml                |   2 +-
 sci-physics/hepmc/metadata.xml                     |   4 +-
 sci-physics/hoomd-blue/metadata.xml                |   2 +-
 sci-physics/lhapdf/metadata.xml                    |   2 +-
 sci-physics/meep/metadata.xml                      |   2 +-
 sci-physics/sassena/metadata.xml                   |   2 +-
 sci-physics/thepeg/metadata.xml                    |  10 +-
 sci-physics/yoda/metadata.xml                      |   2 +-
 sci-visualization/gfsview/metadata.xml             |   2 +-
 sci-visualization/opendx-samples/metadata.xml      |   2 +-
 sci-visualization/opendx/metadata.xml              |   6 +-
 sci-visualization/visit/metadata.xml               |   2 +-
 sec-policy/selinux-base-policy/metadata.xml        |   2 +-
 sec-policy/selinux-base/metadata.xml               |   8 +-
 sys-apps/acl/metadata.xml                          |   8 +-
 sys-apps/arrayprobe/metadata.xml                   |   4 +-
 sys-apps/attr/metadata.xml                         |   4 +-
 sys-apps/baselayout-prefix/metadata.xml            |   2 +-
 sys-apps/baselayout/metadata.xml                   |   4 +-
 sys-apps/byld/metadata.xml                         |   6 +-
 sys-apps/cciss_vol_status/metadata.xml             |   6 +-
 sys-apps/cinit/metadata.xml                        |   1 -
 sys-apps/collectl/metadata.xml                     |   6 +-
 sys-apps/coreutils/metadata.xml                    |  12 +-
 sys-apps/cracklib-words/metadata.xml               |   8 +-
 sys-apps/dbus/metadata.xml                         |   2 +-
 sys-apps/debianutils/metadata.xml                  |   4 +-
 sys-apps/diffutils/metadata.xml                    |   4 +-
 sys-apps/dmapi/metadata.xml                        |   4 +-
 sys-apps/dmidecode/metadata.xml                    |   4 +-
 sys-apps/dnotify/metadata.xml                      |   4 +-
 sys-apps/ed/metadata.xml                           |   4 +-
 sys-apps/elfix/metadata.xml                        |   4 +-
 sys-apps/entropy-server/metadata.xml               |   3 +-
 sys-apps/entropy/metadata.xml                      |   1 -
 sys-apps/ethtool/metadata.xml                      |   6 +-
 sys-apps/fakeroot/metadata.xml                     |   4 +-
 sys-apps/fbset/metadata.xml                        |   4 +-
 sys-apps/file/metadata.xml                         |   4 +-
 sys-apps/findutils/metadata.xml                    |   6 +-
 sys-apps/firejail/metadata.xml                     |   2 +-
 sys-apps/fwcrv/metadata.xml                        |   4 +-
 sys-apps/gawk/metadata.xml                         |   6 +-
 sys-apps/gentoo-functions/metadata.xml             |   8 +-
 sys-apps/gnome-disk-utility/metadata.xml           |   2 +-
 sys-apps/grep/metadata.xml                         |   6 +-
 sys-apps/groff/metadata.xml                        |   4 +-
 sys-apps/gscanbus/metadata.xml                     |   6 +-
 sys-apps/hbaapi/metadata.xml                       |   6 +-
 sys-apps/hdparm/metadata.xml                       |   6 +-
 sys-apps/heirloom-tools/metadata.xml               |   2 +-
 sys-apps/help2man/metadata.xml                     |   4 +-
 sys-apps/hprofile/metadata.xml                     |   6 +-
 sys-apps/hwdata-gentoo/metadata.xml                |   2 +-
 sys-apps/hwids/metadata.xml                        |  14 +-
 sys-apps/hwloc/metadata.xml                        |  12 +-
 sys-apps/ifplugd/metadata.xml                      |   6 +-
 sys-apps/input-utils/metadata.xml                  |   1 -
 sys-apps/install-xattr/metadata.xml                |   4 +-
 sys-apps/iotools/metadata.xml                      |   2 +-
 sys-apps/iproute2/metadata.xml                     |  10 +-
 sys-apps/irqbalance/metadata.xml                   |  10 +-
 sys-apps/isapnptools/metadata.xml                  |   4 +-
 sys-apps/iucode_tool/metadata.xml                  |   4 +-
 sys-apps/kbd/metadata.xml                          |   6 +-
 sys-apps/keyutils/metadata.xml                     |   4 +-
 sys-apps/kmod/metadata.xml                         |  10 +-
 sys-apps/lcdsplash/metadata.xml                    |   4 +-
 sys-apps/lcdtest/metadata.xml                      |   4 +-
 sys-apps/lcdutils/metadata.xml                     |   1 -
 sys-apps/less/metadata.xml                         |   4 +-
 sys-apps/logwatch/metadata.xml                     |   6 +-
 sys-apps/lshw/metadata.xml                         |   4 +-
 sys-apps/magneto-core/metadata.xml                 |   1 -
 sys-apps/makedev/metadata.xml                      |   4 +-
 sys-apps/man-db/metadata.xml                       |   6 +-
 sys-apps/man-pages-posix/metadata.xml              |   4 +-
 sys-apps/man-pages/metadata.xml                    |   4 +-
 sys-apps/man/metadata.xml                          |   4 +-
 sys-apps/mawk/metadata.xml                         |   4 +-
 sys-apps/memtest86+/metadata.xml                   |   8 +-
 sys-apps/memtest86/metadata.xml                    |   6 +-
 sys-apps/memtester/metadata.xml                    |   4 +-
 sys-apps/microcode-ctl/metadata.xml                |   4 +-
 sys-apps/microcode-data/metadata.xml               |  10 +-
 sys-apps/minised/metadata.xml                      |   4 +-
 sys-apps/miscfiles/metadata.xml                    |   4 +-
 sys-apps/mlocate/metadata.xml                      |   4 +-
 sys-apps/modutils/metadata.xml                     |   4 +-
 sys-apps/moreutils/metadata.xml                    |   2 +-
 sys-apps/mtree/metadata.xml                        |   6 +-
 sys-apps/nawk/metadata.xml                         |   4 +-
 sys-apps/net-tools/metadata.xml                    |  16 +-
 sys-apps/netboot-base/metadata.xml                 |   4 +-
 sys-apps/netkit-base/metadata.xml                  |   4 +-
 sys-apps/openrc/metadata.xml                       |   2 +-
 sys-apps/paludis/metadata.xml                      |   4 +-
 sys-apps/pciutils/metadata.xml                     |  10 +-
 sys-apps/pcmciautils/metadata.xml                  |   2 +-
 sys-apps/pcsc-lite/metadata.xml                    |   6 +-
 sys-apps/pcsc-tools/metadata.xml                   |   2 +-
 sys-apps/pyrenamer/metadata.xml                    |   2 +-
 sys-apps/qdiskusage/metadata.xml                   |   1 -
 sys-apps/qingy/metadata.xml                        |  10 +-
 sys-apps/raidutils/metadata.xml                    |   2 +-
 sys-apps/razercfg/metadata.xml                     |   4 +-
 sys-apps/readahead-list/metadata.xml               |   4 +-
 sys-apps/rename/metadata.xml                       |   6 +-
 sys-apps/rescan-scsi-bus/metadata.xml              |   4 +-
 sys-apps/rigo-daemon/metadata.xml                  |   1 -
 sys-apps/rng-tools/metadata.xml                    |   6 +-
 sys-apps/sdparm/metadata.xml                       |   6 +-
 sys-apps/sed/metadata.xml                          |   6 +-
 sys-apps/setserial/metadata.xml                    |   6 +-
 sys-apps/sg3_utils/metadata.xml                    |   4 +-
 sys-apps/shadow/metadata.xml                       |   6 +-
 sys-apps/smartmontools/metadata.xml                |   8 +-
 sys-apps/syscriptor/metadata.xml                   |   6 +-
 sys-apps/syslog-notify/metadata.xml                |   1 -
 sys-apps/sysvinit/metadata.xml                     |   4 +-
 sys-apps/tcp-wrappers/metadata.xml                 |   6 +-
 sys-apps/texinfo/metadata.xml                      |   4 +-
 sys-apps/timer_entropyd/metadata.xml               |   2 +-
 sys-apps/tuxonice-userui/metadata.xml              |   2 +-
 sys-apps/ucspi-proxy/metadata.xml                  |   6 +-
 sys-apps/ucspi-unix/metadata.xml                   |   6 +-
 sys-apps/ultracopier/metadata.xml                  |   1 -
 sys-apps/usb_modeswitch/metadata.xml               |   2 +-
 sys-apps/usbredir/metadata.xml                     |   4 +-
 sys-apps/usbutils/metadata.xml                     |   6 +-
 sys-apps/usermode-utilities/metadata.xml           |   2 +-
 sys-apps/utempter/metadata.xml                     |   4 +-
 sys-apps/util-linux/metadata.xml                   |  22 +-
 sys-apps/v86d/metadata.xml                         |   2 +-
 sys-apps/watchdog/metadata.xml                     |   8 +-
 sys-apps/which/metadata.xml                        |   4 +-
 sys-apps/x86info/metadata.xml                      |   4 +-
 sys-apps/xinetd/metadata.xml                       |   2 +-
 sys-apps/xmbmon/metadata.xml                       |   4 +-
 sys-auth/fingerprint-gui/metadata.xml              |   1 -
 sys-auth/libnss-mysql/metadata.xml                 |   2 +-
 sys-auth/oath-toolkit/metadata.xml                 |   2 +-
 sys-auth/pam-script/metadata.xml                   |   2 +-
 sys-auth/pam_mktemp/metadata.xml                   |   2 +-
 sys-auth/pam_radius/metadata.xml                   |   2 +-
 sys-auth/passwdqc/metadata.xml                     |   2 +-
 sys-auth/polkit/metadata.xml                       |   2 +-
 sys-auth/sssd/metadata.xml                         |  12 +-
 sys-auth/thinkfinger/metadata.xml                  |   2 +-
 sys-block/aoetools/metadata.xml                    |   6 +-
 sys-block/buffer/metadata.xml                      |   4 +-
 sys-block/di/metadata.xml                          |   4 +-
 sys-block/eject/metadata.xml                       |   6 +-
 sys-block/endpoint/metadata.xml                    |   7 +-
 sys-block/fwdl/metadata.xml                        |   4 +-
 sys-block/gpart/metadata.xml                       |   4 +-
 sys-block/iscsitarget/metadata.xml                 |   6 +-
 sys-block/mbuffer/metadata.xml                     |   4 +-
 sys-block/mtx/metadata.xml                         |   6 +-
 sys-block/nbd/metadata.xml                         |   6 +-
 sys-block/noflushd/metadata.xml                    |   6 +-
 sys-block/open-iscsi/metadata.xml                  |   4 +-
 sys-block/partimage/metadata.xml                   |   8 +-
 sys-block/qla-fc-firmware/metadata.xml             |   6 +-
 sys-block/rts5229/metadata.xml                     |   1 -
 sys-block/rts_pstor/metadata.xml                   |   1 -
 sys-block/smp_utils/metadata.xml                   |   4 +-
 sys-block/tapecat/metadata.xml                     |   4 +-
 sys-block/tgt/metadata.xml                         |   2 +-
 sys-block/thin-provisioning-tools/metadata.xml     |   8 +-
 sys-block/vblade/metadata.xml                      |   6 +-
 sys-boot/aboot/metadata.xml                        |   2 +-
 sys-boot/arcload/metadata.xml                      |   1 -
 sys-boot/colo/metadata.xml                         |   1 -
 sys-boot/efibootmgr/metadata.xml                   |   2 +-
 sys-boot/getdvhoff/metadata.xml                    |   1 -
 sys-boot/grub/metadata.xml                         |  24 +-
 sys-boot/lilo/metadata.xml                         |  10 +-
 sys-boot/mbr-gpt/metadata.xml                      |   4 +-
 sys-boot/raincoat/metadata.xml                     |   2 +-
 sys-boot/sgibootcd/metadata.xml                    |   1 -
 sys-boot/syslinux/metadata.xml                     |   4 +-
 sys-boot/systemrescuecd-x86-grub/metadata.xml      |   2 +-
 sys-cluster/classads/metadata.xml                  |   2 +-
 sys-cluster/drbd-utils/metadata.xml                |   6 +-
 sys-cluster/drbd/metadata.xml                      |   6 +-
 sys-cluster/lspbs/metadata.xml                     |   2 +-
 sys-cluster/ocfs/metadata.xml                      |   2 +-
 sys-cluster/openmpi/metadata.xml                   |  14 +-
 sys-cluster/slurm/metadata.xml                     |  10 +-
 sys-cluster/vzctl/metadata.xml                     |   4 +-
 sys-devel/autoconf-archive/metadata.xml            |   4 +-
 sys-devel/autoconf-wrapper/metadata.xml            |   4 +-
 sys-devel/autoconf/metadata.xml                    |   6 +-
 sys-devel/autogen/metadata.xml                     |   2 +-
 sys-devel/automake-wrapper/metadata.xml            |   4 +-
 sys-devel/automake/metadata.xml                    |   4 +-
 sys-devel/bc/metadata.xml                          |   4 +-
 sys-devel/bin86/metadata.xml                       |   6 +-
 sys-devel/binutils-hppa64/metadata.xml             |   4 +-
 sys-devel/binutils/metadata.xml                    |   4 +-
 sys-devel/bison/metadata.xml                       |   4 +-
 sys-devel/cons/metadata.xml                        |   4 +-
 sys-devel/flex/metadata.xml                        |   6 +-
 sys-devel/gcc/metadata.xml                         |   2 +-
 sys-devel/gdb/metadata.xml                         |  10 +-
 sys-devel/gettext/metadata.xml                     |   8 +-
 sys-devel/gnuconfig/metadata.xml                   |   6 +-
 sys-devel/heirloom-devtools/metadata.xml           |   2 +-
 sys-devel/kgcc64/metadata.xml                      |   3 +-
 sys-devel/libtool/metadata.xml                     |   4 +-
 sys-devel/llvm/metadata.xml                        |  18 +-
 sys-devel/m4/metadata.xml                          |   4 +-
 sys-devel/make/metadata.xml                        |   4 +-
 sys-devel/patch/metadata.xml                       |   4 +-
 sys-devel/remake/metadata.xml                      |   6 +-
 sys-devel/smatch/metadata.xml                      |   2 +-
 sys-devel/sparse/metadata.xml                      |   6 +-
 sys-firmware/b43-firmware/metadata.xml             |   1 -
 sys-firmware/b43legacy-firmware/metadata.xml       |   1 -
 sys-firmware/bluez-firmware/metadata.xml           |   2 +-
 sys-firmware/ipw2100-firmware/metadata.xml         |   2 +-
 sys-firmware/ipw2200-firmware/metadata.xml         |   2 +-
 sys-firmware/ipxe/metadata.xml                     |  12 +-
 sys-firmware/iwl3160-7260-bt-ucode/metadata.xml    |   2 +-
 sys-firmware/seabios/metadata.xml                  |   5 +-
 sys-firmware/sgabios/metadata.xml                  |   1 -
 sys-firmware/sigrok-firmware-fx2lafw/metadata.xml  |   4 +-
 sys-firmware/vgabios/metadata.xml                  |   2 +-
 sys-freebsd/boot0/metadata.xml                     |   4 +-
 sys-freebsd/freebsd-lib/metadata.xml               |   6 +-
 sys-freebsd/freebsd-rescue/metadata.xml            |   4 +-
 sys-freebsd/freebsd-sbin/metadata.xml              |   6 +-
 sys-freebsd/freebsd-share/metadata.xml             |   4 +-
 sys-freebsd/freebsd-sources/metadata.xml           |   6 +-
 sys-freebsd/freebsd-ubin/metadata.xml              |   8 +-
 sys-freebsd/freebsd-usbin/metadata.xml             |   6 +-
 sys-fs/autorun/metadata.xml                        |   6 +-
 sys-fs/btrfs-progs/metadata.xml                    |   4 +-
 sys-fs/cramfs/metadata.xml                         |   6 +-
 sys-fs/cryptsetup/metadata.xml                     |  20 +-
 sys-fs/dd-rescue/metadata.xml                      |   4 +-
 sys-fs/devfsd/metadata.xml                         |   4 +-
 sys-fs/diskdev_cmds/metadata.xml                   |   1 -
 sys-fs/dmg2img/metadata.xml                        |   6 +-
 sys-fs/dmraid/metadata.xml                         |  10 +-
 sys-fs/dosfstools/metadata.xml                     |   6 +-
 sys-fs/e2fsprogs/metadata.xml                      |   8 +-
 sys-fs/e2tools/metadata.xml                        |   4 +-
 sys-fs/e4rat/metadata.xml                          |   2 +-
 sys-fs/exfat-utils/metadata.xml                    |   8 +-
 sys-fs/extundelete/metadata.xml                    |   6 +-
 sys-fs/f2fs-tools/metadata.xml                     |   2 +-
 sys-fs/fuse-exfat/metadata.xml                     |   8 +-
 sys-fs/fuseiso/metadata.xml                        |   2 +-
 sys-fs/inotify-tools/metadata.xml                  |   2 +-
 sys-fs/jdiskreport-bin/metadata.xml                |   1 -
 sys-fs/jfsutils/metadata.xml                       |   2 +-
 sys-fs/lde/metadata.xml                            |   6 +-
 sys-fs/lsscsi/metadata.xml                         |   4 +-
 sys-fs/lufs/metadata.xml                           |   6 +-
 sys-fs/lvm2/metadata.xml                           |  12 +-
 sys-fs/mdadm/metadata.xml                          |   4 +-
 sys-fs/mtd-utils/metadata.xml                      |   1 -
 sys-fs/mtools/metadata.xml                         |   4 +-
 sys-fs/mtpfs/metadata.xml                          |   2 +-
 sys-fs/multipath-tools/metadata.xml                |   4 +-
 sys-fs/nilfs-utils/metadata.xml                    |   2 +-
 sys-fs/ntfs3g/metadata.xml                         |  14 +-
 sys-fs/ocfs2-tools/metadata.xml                    |   2 +-
 sys-fs/progsreiserfs/metadata.xml                  |   4 +-
 sys-fs/quota/metadata.xml                          |  10 +-
 sys-fs/quotatool/metadata.xml                      |   4 +-
 sys-fs/redirfs/metadata.xml                        |   2 +-
 sys-fs/reiser4progs/metadata.xml                   |   8 +-
 sys-fs/reiserfsprogs/metadata.xml                  |   4 +-
 sys-fs/static-dev/metadata.xml                     |   4 +-
 sys-fs/sysfsutils/metadata.xml                     |   6 +-
 sys-fs/udftools/metadata.xml                       |   6 +-
 sys-fs/udisks/metadata.xml                         |  10 +-
 sys-fs/xfsdump/metadata.xml                        |   4 +-
 sys-fs/xfsprogs/metadata.xml                       |   4 +-
 sys-fs/zerofree/metadata.xml                       |   1 -
 sys-infiniband/ofed/metadata.xml                   |  18 +-
 sys-kernel/ck-sources/metadata.xml                 |   8 +-
 sys-kernel/genkernel-next/metadata.xml             |  13 +-
 sys-kernel/gentoo-sources/metadata.xml             |   6 +-
 sys-kernel/hardened-sources/metadata.xml           |   2 +-
 sys-kernel/linux-docs/metadata.xml                 |   2 +-
 sys-kernel/linux-firmware/metadata.xml             |   2 +-
 sys-kernel/mips-sources/metadata.xml               |   8 +-
 sys-kernel/pf-sources/metadata.xml                 |   4 +-
 sys-kernel/rt-sources/metadata.xml                 |   2 +-
 sys-kernel/vserver-sources/metadata.xml            |   2 +-
 sys-libs/binutils-libs/metadata.xml                |   4 +-
 sys-libs/cracklib/metadata.xml                     |   8 +-
 sys-libs/db/metadata.xml                           |   8 +-
 sys-libs/e2fsprogs-libs/metadata.xml               |   6 +-
 sys-libs/freeipmi/metadata.xml                     |   2 +-
 sys-libs/gdbm/metadata.xml                         |   8 +-
 sys-libs/glibc/metadata.xml                        |  10 +-
 sys-libs/gpm/metadata.xml                          |   4 +-
 sys-libs/itx-bind/metadata.xml                     |   1 -
 sys-libs/lib-compat/metadata.xml                   |   4 +-
 sys-libs/libaal/metadata.xml                       |   6 +-
 sys-libs/libavc1394/metadata.xml                   |   6 +-
 sys-libs/libcap-ng/metadata.xml                    |   4 +-
 sys-libs/libcap/metadata.xml                       |   4 +-
 sys-libs/libcxx/metadata.xml                       |   1 -
 sys-libs/libhugetlbfs/metadata.xml                 |  10 +-
 sys-libs/libieee1284/metadata.xml                  |   6 +-
 sys-libs/libraw1394/metadata.xml                   |   4 +-
 sys-libs/libseccomp/metadata.xml                   |   2 +-
 sys-libs/libtermcap-compat/metadata.xml            |   4 +-
 sys-libs/libunwind/metadata.xml                    |   4 +-
 sys-libs/libutempter/metadata.xml                  |   4 +-
 sys-libs/libvpd/metadata.xml                       |   2 +-
 sys-libs/lrmi/metadata.xml                         |   6 +-
 sys-libs/ncurses/metadata.xml                      |  10 +-
 sys-libs/nss-db/metadata.xml                       |   4 +-
 sys-libs/pwdb/metadata.xml                         |   4 +-
 sys-libs/readline/metadata.xml                     |   6 +-
 sys-libs/suacomp/metadata.xml                      |   2 +-
 sys-libs/timezone-data/metadata.xml                |   2 +-
 sys-libs/uclibc/metadata.xml                       |  10 +-
 sys-libs/zlib/metadata.xml                         |   8 +-
 sys-power/apcupsd/metadata.xml                     |   8 +-
 sys-power/athcool/metadata.xml                     |   4 +-
 sys-power/cpupower/metadata.xml                    |   2 +-
 sys-power/nvram-reboot/metadata.xml                |   6 +-
 sys-power/nvram-wakeup/metadata.xml                |   6 +-
 sys-process/acct/metadata.xml                      |   4 +-
 sys-process/atop/metadata.xml                      |   4 +-
 sys-process/criu/metadata.xml                      |   4 +-
 sys-process/cronie/metadata.xml                    |   4 +-
 sys-process/daemontools-encore/metadata.xml        |   6 +-
 sys-process/daemontools/metadata.xml               |   4 +-
 sys-process/latencytop/metadata.xml                |   4 +-
 sys-process/lsof/metadata.xml                      |   6 +-
 sys-process/numactl/metadata.xml                   |   4 +-
 sys-process/numad/metadata.xml                     |   4 +-
 sys-process/procps/metadata.xml                    |  12 +-
 sys-process/psmisc/metadata.xml                    |   6 +-
 sys-process/runit/metadata.xml                     |   4 +-
 sys-process/supervise-scripts/metadata.xml         |   4 +-
 sys-process/time/metadata.xml                      |   4 +-
 sys-process/watchpid/metadata.xml                  |   4 +-
 virtual/freedesktop-icon-theme/metadata.xml        |   1 -
 virtual/imap-c-client/metadata.xml                 |   1 -
 virtual/krb5/metadata.xml                          |   1 -
 virtual/mda/metadata.xml                           |   1 -
 virtual/mpi/metadata.xml                           |   2 +-
 virtual/mta/metadata.xml                           |   1 -
 virtual/mysql/metadata.xml                         |   2 +-
 virtual/podofo-build/metadata.xml                  |   2 +-
 www-apache/mod_authn_sasl/metadata.xml             |   2 +-
 www-apache/mod_nss/metadata.xml                    |   2 +-
 www-apache/mod_python/metadata.xml                 |   2 +-
 www-apache/mod_security/metadata.xml               |   6 +-
 www-apache/mod_slotlimit/metadata.xml              |   2 +-
 www-apache/mod_tidy/metadata.xml                   |   2 +-
 www-apache/mod_xml2enc/metadata.xml                |   2 +-
 www-apache/modsec-flameeyes/metadata.xml           |   2 +-
 www-apache/passenger/metadata.xml                  |   2 +-
 www-apps/ampache/metadata.xml                      |   2 +-
 www-apps/bitten/metadata.xml                       |   2 +-
 www-apps/cgisysinfo/metadata.xml                   |   1 -
 www-apps/cgit/metadata.xml                         |   1 -
 www-apps/drupal/metadata.xml                       |   4 +-
 www-apps/gitit/metadata.xml                        |  10 +-
 www-apps/hiawatha-monitor/metadata.xml             |   2 +-
 www-apps/horde-passwd/metadata.xml                 |   2 +-
 www-apps/novnc/metadata.xml                        |   2 +-
 www-apps/otrs/metadata.xml                         |   1 -
 www-apps/redmine/metadata.xml                      |   3 +-
 www-apps/rocketwiki-lqfb/metadata.xml              |   1 -
 www-apps/roundup/metadata.xml                      |   2 +-
 www-apps/trac-downloads/metadata.xml               |   1 -
 www-apps/trac-mercurial/metadata.xml               |   1 -
 www-apps/trac-tags/metadata.xml                    |   1 -
 www-apps/venus/metadata.xml                        |   1 -
 www-apps/websvn/metadata.xml                       |   2 +-
 www-client/dwb/metadata.xml                        |   2 +-
 www-client/elinks/metadata.xml                     |  12 +-
 www-client/midori/metadata.xml                     |   8 +-
 www-client/netsurf/metadata.xml                    |   9 +-
 www-client/opera/metadata.xml                      |   4 +-
 www-client/otter/metadata.xml                      |   2 +-
 www-client/phantomjs/metadata.xml                  |   2 +-
 www-client/qutebrowser/metadata.xml                |   2 +-
 www-client/ripe-atlas-cousteau/metadata.xml        |   2 +-
 www-client/seamonkey/metadata.xml                  |   8 +-
 www-client/surf/metadata.xml                       |   2 +-
 www-client/xombrero/metadata.xml                   |   1 -
 www-misc/fcgiwrap/metadata.xml                     |   2 +-
 www-misc/monitorix/metadata.xml                    |  12 +-
 www-misc/xxv/metadata.xml                          |   2 +-
 www-plugins/adobe-flash/metadata.xml               |   2 +-
 www-plugins/gnash/metadata.xml                     |  22 +-
 www-plugins/lightspark/metadata.xml                |   2 +-
 www-plugins/nspluginwrapper/metadata.xml           |   1 -
 www-plugins/pipelight/metadata.xml                 |   2 +-
 www-servers/apache/metadata.xml                    |  44 ++--
 www-servers/fnord/metadata.xml                     |   2 +-
 www-servers/hiawatha/metadata.xml                  |  16 +-
 www-servers/lighttpd/metadata.xml                  |  13 +-
 www-servers/nginx/metadata.xml                     |   2 +-
 www-servers/pound/metadata.xml                     |   2 +-
 www-servers/resin/metadata.xml                     |   2 +-
 www-servers/tomcat/metadata.xml                    |   2 +-
 x11-apps/amlc/metadata.xml                         |   2 +-
 x11-apps/ardesia/metadata.xml                      |   1 -
 x11-apps/intel-gpu-tools/metadata.xml              |   6 +-
 x11-apps/mesa-progs/metadata.xml                   |   2 +-
 x11-apps/xdm/metadata.xml                          |   4 +-
 x11-apps/xdpyinfo/metadata.xml                     |   2 +-
 x11-apps/xinit/metadata.xml                        |   2 +-
 x11-apps/xkbset/metadata.xml                       |   2 +-
 x11-base/xorg-server/metadata.xml                  |  18 +-
 x11-drivers/ati-drivers/metadata.xml               |   8 +-
 x11-drivers/nvidia-drivers/metadata.xml            |  16 +-
 x11-drivers/xf86-video-ivtv/metadata.xml           |   1 -
 x11-libs/compiz-bcop/metadata.xml                  |   1 -
 x11-libs/fltk/metadata.xml                         |   2 +-
 x11-libs/fox-wrapper/metadata.xml                  |   1 -
 x11-libs/glamor/metadata.xml                       |   2 +-
 x11-libs/goffice/metadata.xml                      |   1 -
 x11-libs/gtkmathview/metadata.xml                  |   4 +-
 x11-libs/libGLw/metadata.xml                       |   2 +-
 x11-libs/libdrm/metadata.xml                       |   4 +-
 x11-libs/libfm-extra/metadata.xml                  |   2 +-
 x11-libs/libfm/metadata.xml                        |   2 +-
 x11-libs/libgxim/metadata.xml                      |   2 +-
 x11-libs/librfm/metadata.xml                       |   2 +-
 x11-libs/libtinynotify-cli/metadata.xml            |   2 +-
 x11-libs/libtinynotify-systemwide/metadata.xml     |   2 +-
 x11-libs/libtinynotify/metadata.xml                |   2 +-
 x11-libs/libva-intel-driver/metadata.xml           |   2 +-
 x11-libs/libva/metadata.xml                        |   4 +-
 x11-libs/libxklavier/metadata.xml                  |   2 +-
 x11-libs/xosd/metadata.xml                         |   2 +-
 x11-misc/Xorgautoconfig/metadata.xml               |   1 -
 x11-misc/albert/metadata.xml                       |   2 +-
 x11-misc/autocutsel/metadata.xml                   |   2 +-
 x11-misc/bblaunch/metadata.xml                     |   2 +-
 x11-misc/bmpanel/metadata.xml                      |   4 +-
 x11-misc/calise/metadata.xml                       |   2 +-
 x11-misc/cdm/metadata.xml                          |   4 +-
 x11-misc/devilspie2/metadata.xml                   |   1 -
 x11-misc/e16keyedit/metadata.xml                   |   6 +-
 x11-misc/e16menuedit2/metadata.xml                 |   6 +-
 x11-misc/fbdesk/metadata.xml                       |   2 +-
 x11-misc/fbpager/metadata.xml                      |   2 +-
 x11-misc/fireflies/metadata.xml                    |   2 +-
 x11-misc/fpm2/metadata.xml                         |   1 -
 x11-misc/growl-for-linux/metadata.xml              |   1 -
 x11-misc/gtkdialog/metadata.xml                    |   4 +-
 x11-misc/iconbox/metadata.xml                      |   1 -
 x11-misc/imwheel/metadata.xml                      |   2 +-
 x11-misc/ipager/metadata.xml                       |   1 -
 x11-misc/launchy/metadata.xml                      |   1 -
 x11-misc/magneto-gtk/metadata.xml                  |   1 -
 x11-misc/magneto-gtk3/metadata.xml                 |   1 -
 x11-misc/nts/metadata.xml                          |   1 -
 x11-misc/obtheme/metadata.xml                      |   1 -
 x11-misc/openbox-menu/metadata.xml                 |   2 +-
 x11-misc/pcmanfm-qt/metadata.xml                   |   2 +-
 x11-misc/pcmanfm/metadata.xml                      |   2 +-
 x11-misc/peksystray/metadata.xml                   |   2 +-
 x11-misc/quitcount/metadata.xml                    |   2 +-
 x11-misc/screengrab/metadata.xml                   |   2 +-
 x11-misc/seetxt/metadata.xml                       |   2 +-
 x11-misc/sent/metadata.xml                         |   2 +-
 x11-misc/set_opacity/metadata.xml                  |   2 +-
 x11-misc/shutter/metadata.xml                      |   1 -
 x11-misc/spacefm/metadata.xml                      |   2 +-
 x11-misc/sprop/metadata.xml                        |   1 -
 x11-misc/sselp/metadata.xml                        |   1 -
 x11-misc/sw-notify-send/metadata.xml               |   2 +-
 x11-misc/tabbed/metadata.xml                       |   1 -
 x11-misc/vdpauinfo/metadata.xml                    |   1 -
 x11-misc/winswitch/metadata.xml                    |   1 -
 x11-misc/wmname/metadata.xml                       |   1 -
 x11-misc/x11vnc/metadata.xml                       |   2 +-
 x11-misc/xdialog/metadata.xml                      |   1 -
 x11-misc/xdiskusage/metadata.xml                   |   2 +-
 x11-misc/xearth/metadata.xml                       |   1 -
 x11-misc/xmobar/metadata.xml                       |   6 +-
 x11-misc/xscreensaver/metadata.xml                 |   4 +-
 x11-misc/xssstate/metadata.xml                     |   1 -
 x11-misc/xwinwrap/metadata.xml                     |   1 -
 x11-plugins/bfm/metadata.xml                       |   2 +-
 x11-plugins/compiz-plugins-extra/metadata.xml      |   3 +-
 x11-plugins/desklet-ImageSlideShow/metadata.xml    |   1 -
 x11-plugins/desklet-SlideShow/metadata.xml         |   1 -
 x11-plugins/echievements/metadata.xml              |   4 +-
 x11-plugins/epplets/metadata.xml                   |   6 +-
 x11-plugins/hexchat-javascript/metadata.xml        |   6 +-
 x11-plugins/pidgin-led-notification/metadata.xml   |   1 -
 x11-plugins/qled/metadata.xml                      |   1 -
 x11-plugins/tomboy-reminder/metadata.xml           |   1 -
 x11-plugins/vicious/metadata.xml                   |   1 -
 x11-plugins/wmbio/metadata.xml                     |   2 +-
 x11-plugins/wmfire/metadata.xml                    |   2 +-
 x11-plugins/wmsysmon/metadata.xml                  |   2 +-
 x11-terms/aterm/metadata.xml                       |   2 +-
 x11-terms/eterm/metadata.xml                       |   2 +-
 x11-terms/hanterm/metadata.xml                     |   2 +-
 x11-terms/terminology/metadata.xml                 |   5 +-
 x11-terms/valaterm/metadata.xml                    |   2 +-
 x11-themes/bespin/metadata.xml                     |   2 +-
 x11-themes/clearlooks-phenix/metadata.xml          |   2 +-
 x11-themes/ethemes/metadata.xml                    |   6 +-
 x11-themes/experience/metadata.xml                 |   2 +-
 x11-themes/gentoo-artwork/metadata.xml             |   8 +-
 x11-themes/gnome-colors-common/metadata.xml        |   2 +-
 x11-themes/gnome-colors-themes/metadata.xml        |   2 +-
 x11-themes/gtk-engines-quartz/metadata.xml         |   2 +-
 x11-themes/noia/metadata.xml                       |   1 -
 x11-themes/redhat-artwork/metadata.xml             |  12 +-
 x11-themes/shiki-colors/metadata.xml               |   2 +-
 x11-themes/skinenigmang-logos/metadata.xml         |   2 +-
 x11-themes/tactile/metadata.xml                    |   1 -
 x11-themes/tactile3/metadata.xml                   |   1 -
 x11-themes/vdrgraphtft-avp/metadata.xml            |   1 -
 x11-themes/vdrgraphtft-deepblue/metadata.xml       |   1 -
 x11-themes/vdrgraphtft-deeppurple/metadata.xml     |   1 -
 x11-themes/vdrgraphtft-poetter/metadata.xml        |   1 -
 x11-themes/wm-icons/metadata.xml                   |   2 +-
 x11-wm/afterstep/metadata.xml                      |   2 +-
 x11-wm/echinus/metadata.xml                        |   2 +-
 x11-wm/enlightenment/metadata.xml                  | 140 +++++------
 x11-wm/evilwm/metadata.xml                         |   2 +-
 x11-wm/fluxbox/metadata.xml                        |   2 +-
 x11-wm/goomwwm/metadata.xml                        |   1 -
 x11-wm/icewm/metadata.xml                          |   2 +-
 x11-wm/matchbox-common/metadata.xml                |   2 +-
 x11-wm/notion/metadata.xml                         |   2 +-
 x11-wm/openbox/metadata.xml                        |   2 +-
 x11-wm/pekwm/metadata.xml                          |   4 +-
 x11-wm/sithwm/metadata.xml                         |   1 -
 x11-wm/spectrwm/metadata.xml                       |   1 -
 x11-wm/stumpwm/metadata.xml                        |   2 +-
 x11-wm/subtle/metadata.xml                         |   4 +-
 x11-wm/windowmaker/metadata.xml                    |   2 +-
 x11-wm/wmfs/metadata.xml                           |   2 +-
 x11-wm/wmii/metadata.xml                           |   1 -
 x11-wm/xmonad-contrib/metadata.xml                 |   8 +-
 x11-wm/xmonad/metadata.xml                         |   2 +-
 x11-wm/xpra/metadata.xml                           |  20 +-
 xfce-base/libxfce4ui/metadata.xml                  |   4 +-
 xfce-base/xfce4-settings/metadata.xml              |   6 +-
 xfce-base/xfdesktop/metadata.xml                   |   2 +-
 xfce-extra/tumbler/metadata.xml                    |   2 +-
 xfce-extra/xfce4-clipman-plugin/metadata.xml       |   2 +-
 xfce-extra/xfce4-mixer/metadata.xml                |   2 +-
 xfce-extra/xfce4-mpc-plugin/metadata.xml           |   2 +-
 xfce-extra/xfce4-power-manager/metadata.xml        |   2 +-
 xfce-extra/xfce4-taskmanager/metadata.xml          |   4 +-
 xfce-extra/xfce4-whiskermenu-plugin/metadata.xml   |   6 +-
 xfce-extra/xfswitch-plugin/metadata.xml            |   6 +-
 2960 files changed, 4484 insertions(+), 5189 deletions(-)

diff --git a/app-accessibility/emacspeak/metadata.xml b/app-accessibility/emacspeak/metadata.xml
index e543475..32fcb5c 100644
--- a/app-accessibility/emacspeak/metadata.xml
+++ b/app-accessibility/emacspeak/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>accessibility</herd>

diff --git a/app-accessibility/nfbtrans/metadata.xml b/app-accessibility/nfbtrans/metadata.xml
index 2f0bbe4..f7b66d2 100644
--- a/app-accessibility/nfbtrans/metadata.xml
+++ b/app-accessibility/nfbtrans/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>accessibility</herd>
 <maintainer>

diff --git a/app-accessibility/simon/metadata.xml b/app-accessibility/simon/metadata.xml
index f4142ab..a90cc8f 100644
--- a/app-accessibility/simon/metadata.xml
+++ b/app-accessibility/simon/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<herd>accessibility</herd>
 	<use>
-		<flag name='kdepim'>Use <pkg>kde-apps/kdepimlibs</pkg></flag>
-		<flag name='opencv'>Use <pkg>media-libs/opencv</pkg></flag>
-		<flag name='sphinx'>Build sphinx backend (pulls <pkg>app-accessibility/julius</pkg> if disabled</flag>
+		<flag name="kdepim">Use <pkg>kde-apps/kdepimlibs</pkg></flag>
+		<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
+		<flag name="sphinx">Build sphinx backend (pulls <pkg>app-accessibility/julius</pkg> if disabled</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/app-admin/bcfg2/metadata.xml b/app-admin/bcfg2/metadata.xml
index 0f2dd7f..5647529 100644
--- a/app-admin/bcfg2/metadata.xml
+++ b/app-admin/bcfg2/metadata.xml
@@ -12,8 +12,8 @@
 	<name>Michael Jinks</name>
 </maintainer>
 <use>
-  <flag name='cheetah'>Include dev-python/cheetah support</flag>
-  <flag name='genshi'>Include dev-python/genshi support</flag>
-  <flag name='server'>Installs scripts to be used on the server-side of this app</flag>
+  <flag name="cheetah">Include dev-python/cheetah support</flag>
+  <flag name="genshi">Include dev-python/genshi support</flag>
+  <flag name="server">Installs scripts to be used on the server-side of this app</flag>
 </use>
 </pkgmetadata>

diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml
index b719686..9884e7b 100644
--- a/app-admin/calamares/metadata.xml
+++ b/app-admin/calamares/metadata.xml
@@ -18,4 +18,3 @@
 		<remote-id type="github">calamares/calamares</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/app-admin/checksec/metadata.xml b/app-admin/checksec/metadata.xml
index f1f666f..6174613 100644
--- a/app-admin/checksec/metadata.xml
+++ b/app-admin/checksec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-admin/collectd/metadata.xml b/app-admin/collectd/metadata.xml
index 268c9ab..5b48ac8 100644
--- a/app-admin/collectd/metadata.xml
+++ b/app-admin/collectd/metadata.xml
@@ -9,122 +9,122 @@
 		<description>Proxied Maintainer</description>
 	</maintainer>
 	<use>
-		<flag name='collectd_plugins_aggregation'>Build the aggregation plugin (aggregate multiplte values into a single value)</flag>
-		<flag name='collectd_plugins_apache'>Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag>
-		<flag name='collectd_plugins_apcups'>Build the apcups input plugin (UPS charge, load, input/output/battery voltage, etc.)</flag>
-		<flag name='collectd_plugins_ascent'>Build the ascent input plugin (statistics about a free server for World of Warcraft)</flag>
-		<flag name='collectd_plugins_battery'>Build the battery input plugin (charge, current and voltage of ACPI and PMU based laptop batteries)</flag>
-		<flag name='collectd_plugins_bind'>Build the bind input plugin (name server and resolver statistics)</flag>
-		<flag name='collectd_plugins_ceph'>Build the plugin for <pkg>sys-cluster/ceph</pkg></flag>
-		<flag name='collectd_plugins_cgroups'>Build the cgroups CPU accounting collection plugin</flag>
-		<flag name='collectd_plugins_conntrack'>Build the conntrack input plugin (number of nf_conntrack entries)</flag>
-		<flag name='collectd_plugins_contextswitch'>Build the contextswitch input plugin (number of context switches done by the operating system)</flag>
-		<flag name='collectd_plugins_cpu'>Build the cpu input plugin (time spent in the system, user, nice, idle, and related states)</flag>
-		<flag name='collectd_plugins_cpufreq'>Build the cpufreq input plugin (CPU frequency, for laptops with speedstep or similar)</flag>
-		<flag name='collectd_plugins_csv'>Build the csv output plugin (write to comma separated values (CSV) files)</flag>
-		<flag name='collectd_plugins_curl'>Build the curl input plugin (parse statistics from websites using regular expressions)</flag>
-		<flag name='collectd_plugins_curl_json'>Build the curl_json input plugin (get json data via curl and parse it)</flag>
-		<flag name='collectd_plugins_curl_xml'>Build the curl_xml input plugin (get xml data via curl and parse it)</flag>
-		<flag name='collectd_plugins_dbi'>Build the dbi input plugin (execute SQL statements on databases and interpret the reply)</flag>
-		<flag name='collectd_plugins_df'>Build the df input plugin (mountpoint usage)</flag>
-		<flag name='collectd_plugins_disk'>Build the disk input plugin (sectors read/written, number of read/write actions, average completion time of IO-operations)</flag>
-		<flag name='collectd_plugins_dns'>Build the dns input plugin (collects statistics of your DNS traffic on port udp/53)</flag>
-		<flag name='collectd_plugins_drbd'>Build the plugin for DRBD statistics</flag>
-		<flag name='collectd_plugins_email'>Build the email input plugin (opens a UNIX domain socket and starts accepting connections on that socket)</flag>
-		<flag name='collectd_plugins_entropy'>Build the entropy input plugin (available entropy on a system)</flag>
-		<flag name='collectd_plugins_ethstat'>Build the ethstat input plugin (performance statistics of Linux ethernet cards)</flag>
-		<flag name='collectd_plugins_exec'>Build the exec input/output plugin (executes scripts / applications and reads values back)</flag>
-		<flag name='collectd_plugins_fhcount'>Build the plugin for File handles statistics</flag>
-		<flag name='collectd_plugins_filecount'>Build the filecount input plugin (countd the number of files in a directory and all its subdirectories)</flag>
-		<flag name='collectd_plugins_fscache'>Build the fscache input plugin (information about the caching infrastructure for network file-systems etc)</flag>
-		<flag name='collectd_plugins_gmond'>Build the gmond input plugin (receive data from gmond, the client daemon of the Ganglia project)</flag>
-		<flag name='collectd_plugins_hddtemp'>Build the hddtemp input plugin (temperature of hard disks)</flag>
-		<flag name='collectd_plugins_interface'>Build the interface input plugin (information about traffic, packets and errors of interfaces)</flag>
-		<flag name='collectd_plugins_ipc'>Build the plugin for IPC statistics</flag>
-		<flag name='collectd_plugins_ipmi'>Build the ipmi input plugin (read hardware sensors from servers using the Intelligent Platform Management Interface (IPMI))</flag>
-		<flag name='collectd_plugins_iptables'>Build the iptables input plugin (statistics from a ip_tables based packet filter)</flag>
-		<flag name='collectd_plugins_irq'>Build the irq input plugin (number of times each interrupt has been handled by the os)</flag>
-		<flag name='collectd_plugins_java'>Build the java input plugin (embeds a JVM into collectd for writing plugins)</flag>
-		<flag name='collectd_plugins_libvirt'>Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
-		<flag name='collectd_plugins_load'>Build the load input plugin (system load)</flag>
-		<flag name='collectd_plugins_log_logstash'>Build the plugin for Logstash json_event compatible logging</flag>
-		<flag name='collectd_plugins_logfile'>Build the logfile output plugin (writes log messages to a text file)</flag>
-		<flag name='collectd_plugins_lvm'>Build the LVM input plugin</flag>
-		<flag name='collectd_plugins_madwifi'>Build the madwifi input plugin (information about Atheros wireless LAN chipsets)</flag>
-		<flag name='collectd_plugins_match_empty_counter'>Build the match_empty_counter filter plugin</flag>
-		<flag name='collectd_plugins_match_hashed'>Build the match_hashed filter plugin</flag>
-		<flag name='collectd_plugins_match_regex'>Build the match_regex filter plugin</flag>
-		<flag name='collectd_plugins_match_timediff'>Build the match_timediff filter plugin</flag>
-		<flag name='collectd_plugins_match_value'>Build the match_value filter plugin</flag>
-		<flag name='collectd_plugins_mbmon'>Build the mbmon input plugin (information from mainboard sensors)</flag>
-		<flag name='collectd_plugins_md'>Build the md input plugin (disk states in Linux md devices)</flag>
-		<flag name='collectd_plugins_memcachec'>Build the memcachec input plugin (connects to a memcached server)</flag>
-		<flag name='collectd_plugins_memcached'>Build the memcached input plugin (connects to a memcached daemon)</flag>
-		<flag name='collectd_plugins_memory'>Build the memory input plugin (physical memory utilization)</flag>
-		<flag name='collectd_plugins_multimeter'>Build the multimeter input plugin (reads a voltage or current from a multimeter connected to a serial bus)</flag>
-		<flag name='collectd_plugins_mysql'>Build the mysql input plugin (connects to an MySQL-database and issues a SHOW STATUS command)</flag>
-		<flag name='collectd_plugins_netlink'>Build the netlink input plugin (opens a netlink socket to the Linux kernel for getting statistics)</flag>
-		<flag name='collectd_plugins_network'>Build the network input/output plugin (communicates with other instances of collectd)</flag>
-		<flag name='collectd_plugins_nfs'>Build the nfs input plugin (usage of the Network File System)</flag>
-		<flag name='collectd_plugins_nginx'>Build the nginx input plugin (number of requests handled by the nginx daemon)</flag>
-		<flag name='collectd_plugins_notify_desktop'>Build the notify_desktop output plugin (uses libnotify to display notifications to the user)</flag>
-		<flag name='collectd_plugins_notify_email'>Build the notify_email output plugin (uses libESMTP to send notifications to a configured email address)</flag>
-		<flag name='collectd_plugins_ntpd'>Build the ntpd input plugin (queries an NTP server)</flag>
-		<flag name='collectd_plugins_numa'>Build the numa input plugin (statistics of the Linux Non-Uniform Memory Access (NUMA) subsystem)</flag>
-		<flag name='collectd_plugins_nut'>Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag>
-		<flag name='collectd_plugins_olsrd'>Build the olsrd input plugin (reads information about the Optimized Link State Routing daemon)</flag>
-		<flag name='collectd_plugins_onewire'>Build the onewire input plugin (collects temperature information from sensors)</flag>
-		<flag name='collectd_plugins_openldap'>Build the plugin for OpenLDAP statistics</flag>
-		<flag name='collectd_plugins_openvpn'>Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag>
-		<flag name='collectd_plugins_oracle'>Build the oracle input plugin (SQL-queries one or more Oracle database systems)</flag>
-		<flag name='collectd_plugins_perl'>Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag>
-		<flag name='collectd_plugins_ping'>Build the ping input plugin (measures network latency)</flag>
-		<flag name='collectd_plugins_postgresql'>Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag>
-		<flag name='collectd_plugins_powerdns'>Build the powerdns input plugin (connects to a local PowerDNS instance)</flag>
-		<flag name='collectd_plugins_processes'>Build the processes input plugin (statistics about processes)</flag>
-		<flag name='collectd_plugins_protocols'>Build the protocols input plugin (network protocols)</flag>
-		<flag name='collectd_plugins_python'>Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag>
-		<flag name='collectd_plugins_redis'>Build the Redis input plugin</flag>
-		<flag name='collectd_plugins_routeros'>Build the routeros input plugin (collect information on devices running RouterOS)</flag>
-		<flag name='collectd_plugins_rrdcached'>Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag>
-		<flag name='collectd_plugins_rrdtool'>Build the rrdtool output plugin (writes values to RRD-files)</flag>
-		<flag name='collectd_plugins_sensors'>Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag>
-		<flag name='collectd_plugins_serial'>Build the serial input plugin (collects the traffic on serial interfaces)</flag>
-		<flag name='collectd_plugins_smart'>Build the plugin for SMART statistics</flag>
-		<flag name='collectd_plugins_snmp'>Build the snmp input plugin (read values from network devices using SNMP)</flag>
-		<flag name='collectd_plugins_statsd'>Build the statsd input plugin (accepts statsd-type metrics from a UDP socket)</flag>
-		<flag name='collectd_plugins_swap'>Build the swap input plugin (amount of memory currently written to swap)</flag>
-		<flag name='collectd_plugins_syslog'>Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)</flag>
-		<flag name='collectd_plugins_table'>Build the table input plugin (parses table-like structured plain text)</flag>
-		<flag name='collectd_plugins_tail'>Build the tail input plugin (follows logfiles as e.g. tail -f)</flag>
-		<flag name='collectd_plugins_target_notification'>Build the target_notification filter plugin</flag>
-		<flag name='collectd_plugins_target_replace'>Build the target_replace filter plugin</flag>
-		<flag name='collectd_plugins_target_scale'>Build the target_scale filter plugin</flag>
-		<flag name='collectd_plugins_target_set'>Build the target_set filter plugin</flag>
-		<flag name='collectd_plugins_tcpconns'>Build the tcpconns input plugin (number of TCP connections to or from a specified port)</flag>
-		<flag name='collectd_plugins_teamspeak2'>Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag>
-		<flag name='collectd_plugins_ted'>Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag>
-		<flag name='collectd_plugins_thermal'>Build the thermal input plugin (ACPI thermal zone information)</flag>
-		<flag name='collectd_plugins_threshold'>Build the threshold plugin (checks values against configured thresholds and creates notifications if values are out of bounds)</flag>
-		<flag name='collectd_plugins_tokyotyrant'>Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag>
-		<flag name='collectd_plugins_turbostat'>Build the plugin for Advanced statistic on Intel cpu states</flag>
-		<flag name='collectd_plugins_unixsock'>Build the unixsock output plugin (opens a UNIX domain socket and accepts connections)</flag>
-		<flag name='collectd_plugins_uptime'>Build the uptime input plugin (system uptime)</flag>
-		<flag name='collectd_plugins_users'>Build the users input plugin (number of users currently logged in)</flag>
-		<flag name='collectd_plugins_uuid'>Build the uuid plugin (tries hard to determine the UUID of the system it is running on)</flag>
-		<flag name='collectd_plugins_varnish'>Build the varnish input plugin</flag>
-		<flag name='collectd_plugins_virt'>Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
-		<flag name='collectd_plugins_vmem'>Build the vmem input plugin (information about the virtual memory subsystem)</flag>
-		<flag name='collectd_plugins_wireless'>Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag>
-		<flag name='collectd_plugins_write_graphite'>Build the write_graphite output plugin (sends the values collected by collectd to Carbon, the storage layer of the Graphite time-series database)</flag>
-		<flag name='collectd_plugins_write_http'>Build the write_http output plugin (sends the values collected by collectd to a web-server)</flag>
-		<flag name='collectd_plugins_write_log'>Build the Log output plugin</flag>
-		<flag name='collectd_plugins_write_mongodb'>Build the write_mongodb output plugin (sends the values collected by collectd to a MongoDB)</flag>
-		<flag name='collectd_plugins_write_redis'>Build the Redis output plugin</flag>
-		<flag name='collectd_plugins_write_sensu'>Build the Sensu output plugin</flag>
-		<flag name='collectd_plugins_write_tsdb'>Build the TSDB output plugin</flag>
-		<flag name='collectd_plugins_zfs_arc'>Build the plugin for ZFS ARC statistics</flag>
-		<flag name='collectd_plugins_zookeeper'>Build the plugin for Zookeeper statistics</flag>
-		<flag name='contrib'>Install user-contributed files in the doc directory</flag>
+		<flag name="collectd_plugins_aggregation">Build the aggregation plugin (aggregate multiplte values into a single value)</flag>
+		<flag name="collectd_plugins_apache">Build the apache input plugin (transferred bytes, handled requests, detailed scoreboard statistics)</flag>
+		<flag name="collectd_plugins_apcups">Build the apcups input plugin (UPS charge, load, input/output/battery voltage, etc.)</flag>
+		<flag name="collectd_plugins_ascent">Build the ascent input plugin (statistics about a free server for World of Warcraft)</flag>
+		<flag name="collectd_plugins_battery">Build the battery input plugin (charge, current and voltage of ACPI and PMU based laptop batteries)</flag>
+		<flag name="collectd_plugins_bind">Build the bind input plugin (name server and resolver statistics)</flag>
+		<flag name="collectd_plugins_ceph">Build the plugin for <pkg>sys-cluster/ceph</pkg></flag>
+		<flag name="collectd_plugins_cgroups">Build the cgroups CPU accounting collection plugin</flag>
+		<flag name="collectd_plugins_conntrack">Build the conntrack input plugin (number of nf_conntrack entries)</flag>
+		<flag name="collectd_plugins_contextswitch">Build the contextswitch input plugin (number of context switches done by the operating system)</flag>
+		<flag name="collectd_plugins_cpu">Build the cpu input plugin (time spent in the system, user, nice, idle, and related states)</flag>
+		<flag name="collectd_plugins_cpufreq">Build the cpufreq input plugin (CPU frequency, for laptops with speedstep or similar)</flag>
+		<flag name="collectd_plugins_csv">Build the csv output plugin (write to comma separated values (CSV) files)</flag>
+		<flag name="collectd_plugins_curl">Build the curl input plugin (parse statistics from websites using regular expressions)</flag>
+		<flag name="collectd_plugins_curl_json">Build the curl_json input plugin (get json data via curl and parse it)</flag>
+		<flag name="collectd_plugins_curl_xml">Build the curl_xml input plugin (get xml data via curl and parse it)</flag>
+		<flag name="collectd_plugins_dbi">Build the dbi input plugin (execute SQL statements on databases and interpret the reply)</flag>
+		<flag name="collectd_plugins_df">Build the df input plugin (mountpoint usage)</flag>
+		<flag name="collectd_plugins_disk">Build the disk input plugin (sectors read/written, number of read/write actions, average completion time of IO-operations)</flag>
+		<flag name="collectd_plugins_dns">Build the dns input plugin (collects statistics of your DNS traffic on port udp/53)</flag>
+		<flag name="collectd_plugins_drbd">Build the plugin for DRBD statistics</flag>
+		<flag name="collectd_plugins_email">Build the email input plugin (opens a UNIX domain socket and starts accepting connections on that socket)</flag>
+		<flag name="collectd_plugins_entropy">Build the entropy input plugin (available entropy on a system)</flag>
+		<flag name="collectd_plugins_ethstat">Build the ethstat input plugin (performance statistics of Linux ethernet cards)</flag>
+		<flag name="collectd_plugins_exec">Build the exec input/output plugin (executes scripts / applications and reads values back)</flag>
+		<flag name="collectd_plugins_fhcount">Build the plugin for File handles statistics</flag>
+		<flag name="collectd_plugins_filecount">Build the filecount input plugin (countd the number of files in a directory and all its subdirectories)</flag>
+		<flag name="collectd_plugins_fscache">Build the fscache input plugin (information about the caching infrastructure for network file-systems etc)</flag>
+		<flag name="collectd_plugins_gmond">Build the gmond input plugin (receive data from gmond, the client daemon of the Ganglia project)</flag>
+		<flag name="collectd_plugins_hddtemp">Build the hddtemp input plugin (temperature of hard disks)</flag>
+		<flag name="collectd_plugins_interface">Build the interface input plugin (information about traffic, packets and errors of interfaces)</flag>
+		<flag name="collectd_plugins_ipc">Build the plugin for IPC statistics</flag>
+		<flag name="collectd_plugins_ipmi">Build the ipmi input plugin (read hardware sensors from servers using the Intelligent Platform Management Interface (IPMI))</flag>
+		<flag name="collectd_plugins_iptables">Build the iptables input plugin (statistics from a ip_tables based packet filter)</flag>
+		<flag name="collectd_plugins_irq">Build the irq input plugin (number of times each interrupt has been handled by the os)</flag>
+		<flag name="collectd_plugins_java">Build the java input plugin (embeds a JVM into collectd for writing plugins)</flag>
+		<flag name="collectd_plugins_libvirt">Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
+		<flag name="collectd_plugins_load">Build the load input plugin (system load)</flag>
+		<flag name="collectd_plugins_log_logstash">Build the plugin for Logstash json_event compatible logging</flag>
+		<flag name="collectd_plugins_logfile">Build the logfile output plugin (writes log messages to a text file)</flag>
+		<flag name="collectd_plugins_lvm">Build the LVM input plugin</flag>
+		<flag name="collectd_plugins_madwifi">Build the madwifi input plugin (information about Atheros wireless LAN chipsets)</flag>
+		<flag name="collectd_plugins_match_empty_counter">Build the match_empty_counter filter plugin</flag>
+		<flag name="collectd_plugins_match_hashed">Build the match_hashed filter plugin</flag>
+		<flag name="collectd_plugins_match_regex">Build the match_regex filter plugin</flag>
+		<flag name="collectd_plugins_match_timediff">Build the match_timediff filter plugin</flag>
+		<flag name="collectd_plugins_match_value">Build the match_value filter plugin</flag>
+		<flag name="collectd_plugins_mbmon">Build the mbmon input plugin (information from mainboard sensors)</flag>
+		<flag name="collectd_plugins_md">Build the md input plugin (disk states in Linux md devices)</flag>
+		<flag name="collectd_plugins_memcachec">Build the memcachec input plugin (connects to a memcached server)</flag>
+		<flag name="collectd_plugins_memcached">Build the memcached input plugin (connects to a memcached daemon)</flag>
+		<flag name="collectd_plugins_memory">Build the memory input plugin (physical memory utilization)</flag>
+		<flag name="collectd_plugins_multimeter">Build the multimeter input plugin (reads a voltage or current from a multimeter connected to a serial bus)</flag>
+		<flag name="collectd_plugins_mysql">Build the mysql input plugin (connects to an MySQL-database and issues a SHOW STATUS command)</flag>
+		<flag name="collectd_plugins_netlink">Build the netlink input plugin (opens a netlink socket to the Linux kernel for getting statistics)</flag>
+		<flag name="collectd_plugins_network">Build the network input/output plugin (communicates with other instances of collectd)</flag>
+		<flag name="collectd_plugins_nfs">Build the nfs input plugin (usage of the Network File System)</flag>
+		<flag name="collectd_plugins_nginx">Build the nginx input plugin (number of requests handled by the nginx daemon)</flag>
+		<flag name="collectd_plugins_notify_desktop">Build the notify_desktop output plugin (uses libnotify to display notifications to the user)</flag>
+		<flag name="collectd_plugins_notify_email">Build the notify_email output plugin (uses libESMTP to send notifications to a configured email address)</flag>
+		<flag name="collectd_plugins_ntpd">Build the ntpd input plugin (queries an NTP server)</flag>
+		<flag name="collectd_plugins_numa">Build the numa input plugin (statistics of the Linux Non-Uniform Memory Access (NUMA) subsystem)</flag>
+		<flag name="collectd_plugins_nut">Build the nut input plugin (collects UPS statistics using the Network UPS Tools)</flag>
+		<flag name="collectd_plugins_olsrd">Build the olsrd input plugin (reads information about the Optimized Link State Routing daemon)</flag>
+		<flag name="collectd_plugins_onewire">Build the onewire input plugin (collects temperature information from sensors)</flag>
+		<flag name="collectd_plugins_openldap">Build the plugin for OpenLDAP statistics</flag>
+		<flag name="collectd_plugins_openvpn">Build the openvpn input plugin (reads the status file printed by OpenVPN)</flag>
+		<flag name="collectd_plugins_oracle">Build the oracle input plugin (SQL-queries one or more Oracle database systems)</flag>
+		<flag name="collectd_plugins_perl">Build the perl language binding plugin (embeds a Perl interpreter into collectd for writing plugins)</flag>
+		<flag name="collectd_plugins_ping">Build the ping input plugin (measures network latency)</flag>
+		<flag name="collectd_plugins_postgresql">Build the postgresql input plugin (connects to and executes SQL statements on a PostgreSQL database)</flag>
+		<flag name="collectd_plugins_powerdns">Build the powerdns input plugin (connects to a local PowerDNS instance)</flag>
+		<flag name="collectd_plugins_processes">Build the processes input plugin (statistics about processes)</flag>
+		<flag name="collectd_plugins_protocols">Build the protocols input plugin (network protocols)</flag>
+		<flag name="collectd_plugins_python">Build the python language binding plugin (embeds a Python interpreter into collectd for writing plugins)</flag>
+		<flag name="collectd_plugins_redis">Build the Redis input plugin</flag>
+		<flag name="collectd_plugins_routeros">Build the routeros input plugin (collect information on devices running RouterOS)</flag>
+		<flag name="collectd_plugins_rrdcached">Build the rrdcached input/output plugin (connects to rrdcached and submits updates for RRD files)</flag>
+		<flag name="collectd_plugins_rrdtool">Build the rrdtool output plugin (writes values to RRD-files)</flag>
+		<flag name="collectd_plugins_sensors">Build the sensors input plugin (uses lm-sensors to read hardware sensors)</flag>
+		<flag name="collectd_plugins_serial">Build the serial input plugin (collects the traffic on serial interfaces)</flag>
+		<flag name="collectd_plugins_smart">Build the plugin for SMART statistics</flag>
+		<flag name="collectd_plugins_snmp">Build the snmp input plugin (read values from network devices using SNMP)</flag>
+		<flag name="collectd_plugins_statsd">Build the statsd input plugin (accepts statsd-type metrics from a UDP socket)</flag>
+		<flag name="collectd_plugins_swap">Build the swap input plugin (amount of memory currently written to swap)</flag>
+		<flag name="collectd_plugins_syslog">Build the syslog output plugin (receives messages from collectd and dispatches them to syslog)</flag>
+		<flag name="collectd_plugins_table">Build the table input plugin (parses table-like structured plain text)</flag>
+		<flag name="collectd_plugins_tail">Build the tail input plugin (follows logfiles as e.g. tail -f)</flag>
+		<flag name="collectd_plugins_target_notification">Build the target_notification filter plugin</flag>
+		<flag name="collectd_plugins_target_replace">Build the target_replace filter plugin</flag>
+		<flag name="collectd_plugins_target_scale">Build the target_scale filter plugin</flag>
+		<flag name="collectd_plugins_target_set">Build the target_set filter plugin</flag>
+		<flag name="collectd_plugins_tcpconns">Build the tcpconns input plugin (number of TCP connections to or from a specified port)</flag>
+		<flag name="collectd_plugins_teamspeak2">Build the teamspeak2 input plugin (collects traffic statistics from a teamspeak2 instance)</flag>
+		<flag name="collectd_plugins_ted">Build the ted input plugin (connects to The Energy Detective and reads the current power over connected power lines)</flag>
+		<flag name="collectd_plugins_thermal">Build the thermal input plugin (ACPI thermal zone information)</flag>
+		<flag name="collectd_plugins_threshold">Build the threshold plugin (checks values against configured thresholds and creates notifications if values are out of bounds)</flag>
+		<flag name="collectd_plugins_tokyotyrant">Build the tokyotyrant input plugin (number of records and file size from a running Tokyo Tyrant server)</flag>
+		<flag name="collectd_plugins_turbostat">Build the plugin for Advanced statistic on Intel cpu states</flag>
+		<flag name="collectd_plugins_unixsock">Build the unixsock output plugin (opens a UNIX domain socket and accepts connections)</flag>
+		<flag name="collectd_plugins_uptime">Build the uptime input plugin (system uptime)</flag>
+		<flag name="collectd_plugins_users">Build the users input plugin (number of users currently logged in)</flag>
+		<flag name="collectd_plugins_uuid">Build the uuid plugin (tries hard to determine the UUID of the system it is running on)</flag>
+		<flag name="collectd_plugins_varnish">Build the varnish input plugin</flag>
+		<flag name="collectd_plugins_virt">Build the libvirt input plugin (statistics about virtualized guests on a system)</flag>
+		<flag name="collectd_plugins_vmem">Build the vmem input plugin (information about the virtual memory subsystem)</flag>
+		<flag name="collectd_plugins_wireless">Build the wireless input plugin (signal quality, signal power and signal-to-noise ratio for wireless LAN cards)</flag>
+		<flag name="collectd_plugins_write_graphite">Build the write_graphite output plugin (sends the values collected by collectd to Carbon, the storage layer of the Graphite time-series database)</flag>
+		<flag name="collectd_plugins_write_http">Build the write_http output plugin (sends the values collected by collectd to a web-server)</flag>
+		<flag name="collectd_plugins_write_log">Build the Log output plugin</flag>
+		<flag name="collectd_plugins_write_mongodb">Build the write_mongodb output plugin (sends the values collected by collectd to a MongoDB)</flag>
+		<flag name="collectd_plugins_write_redis">Build the Redis output plugin</flag>
+		<flag name="collectd_plugins_write_sensu">Build the Sensu output plugin</flag>
+		<flag name="collectd_plugins_write_tsdb">Build the TSDB output plugin</flag>
+		<flag name="collectd_plugins_zfs_arc">Build the plugin for ZFS ARC statistics</flag>
+		<flag name="collectd_plugins_zookeeper">Build the plugin for Zookeeper statistics</flag>
+		<flag name="contrib">Install user-contributed files in the doc directory</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-admin/conky/metadata.xml b/app-admin/conky/metadata.xml
index 8edeb04..e8495ed 100644
--- a/app-admin/conky/metadata.xml
+++ b/app-admin/conky/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-admin/cronolog/metadata.xml b/app-admin/cronolog/metadata.xml
index 6752c3c..24847b0 100644
--- a/app-admin/cronolog/metadata.xml
+++ b/app-admin/cronolog/metadata.xml
@@ -13,4 +13,3 @@
 		as Apache, to split the access log into daily or monthly logs.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-admin/denyhosts/metadata.xml b/app-admin/denyhosts/metadata.xml
index fc42542..77c8c90 100644
--- a/app-admin/denyhosts/metadata.xml
+++ b/app-admin/denyhosts/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/app-admin/diradm/metadata.xml b/app-admin/diradm/metadata.xml
index 278b560..80b9f4b 100644
--- a/app-admin/diradm/metadata.xml
+++ b/app-admin/diradm/metadata.xml
@@ -6,7 +6,7 @@
         <name>Robin H. Johnson</name>
     </maintainer>
 	<use>
-		<flag name='automount'>Support for automount data in LDAP</flag>
-		<flag name='irixpasswd'>Support for storing separate IRIX passwords</flag>
+		<flag name="automount">Support for automount data in LDAP</flag>
+		<flag name="irixpasswd">Support for storing separate IRIX passwords</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-admin/elektra/metadata.xml b/app-admin/elektra/metadata.xml
index c3fe5e3..8801124 100644
--- a/app-admin/elektra/metadata.xml
+++ b/app-admin/elektra/metadata.xml
@@ -15,4 +15,3 @@
 	<flag name="yajl">Enable yajl support</flag>
 </use>
 </pkgmetadata>
-

diff --git a/app-admin/equo/metadata.xml b/app-admin/equo/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/app-admin/equo/metadata.xml
+++ b/app-admin/equo/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/app-admin/gtkdiskfree/metadata.xml b/app-admin/gtkdiskfree/metadata.xml
index 66824a4..878ec19 100644
--- a/app-admin/gtkdiskfree/metadata.xml
+++ b/app-admin/gtkdiskfree/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/app-admin/hardening-check/metadata.xml b/app-admin/hardening-check/metadata.xml
index 2c97c58..98f8649 100644
--- a/app-admin/hardening-check/metadata.xml
+++ b/app-admin/hardening-check/metadata.xml
@@ -11,4 +11,3 @@
 		<description>Upstream - please CC on bugs that concerns upstream</description>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-admin/hddtemp/metadata.xml b/app-admin/hddtemp/metadata.xml
index a6041c5..7be12fb 100644
--- a/app-admin/hddtemp/metadata.xml
+++ b/app-admin/hddtemp/metadata.xml
@@ -5,7 +5,7 @@
 	<email>aidecoe@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='network-cron'>
+	<flag name="network-cron">
 		Monthly cronjob to update hddtemp.db.
 	</flag>
 </use>

diff --git a/app-admin/keepassx/metadata.xml b/app-admin/keepassx/metadata.xml
index 9fe4915..fbe43ce 100644
--- a/app-admin/keepassx/metadata.xml
+++ b/app-admin/keepassx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/app-admin/kpcli/metadata.xml b/app-admin/kpcli/metadata.xml
index 434138d..87d50c9 100644
--- a/app-admin/kpcli/metadata.xml
+++ b/app-admin/kpcli/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>

diff --git a/app-admin/logsentry/metadata.xml b/app-admin/logsentry/metadata.xml
index d635429..60d78d3 100644
--- a/app-admin/logsentry/metadata.xml
+++ b/app-admin/logsentry/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-admin/logsurfer+/metadata.xml b/app-admin/logsurfer+/metadata.xml
index 2e90b80..d9cd2ca 100644
--- a/app-admin/logsurfer+/metadata.xml
+++ b/app-admin/logsurfer+/metadata.xml
@@ -5,4 +5,3 @@
 <email>maintainer-needed@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-admin/lsat/metadata.xml b/app-admin/lsat/metadata.xml
index 8bd21ed..4e8f7c8 100644
--- a/app-admin/lsat/metadata.xml
+++ b/app-admin/lsat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">

diff --git a/app-admin/matter/metadata.xml b/app-admin/matter/metadata.xml
index f5967f8..4370b55 100644
--- a/app-admin/matter/metadata.xml
+++ b/app-admin/matter/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Fabio Erculiani</name>
 	</maintainer>
 	<use>
-		<flag name='entropy'>Add Entropy support</flag>
+		<flag name="entropy">Add Entropy support</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/app-admin/mms-agent/metadata.xml b/app-admin/mms-agent/metadata.xml
index 480394a..fbeacea 100644
--- a/app-admin/mms-agent/metadata.xml
+++ b/app-admin/mms-agent/metadata.xml
@@ -18,4 +18,3 @@
 		<flag name="monitoring">Install the monitoring agent</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/app-admin/packagekit-base/metadata.xml b/app-admin/packagekit-base/metadata.xml
index c88633a..f72e634 100644
--- a/app-admin/packagekit-base/metadata.xml
+++ b/app-admin/packagekit-base/metadata.xml
@@ -13,4 +13,3 @@
 		</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/app-admin/packagekit-gtk/metadata.xml b/app-admin/packagekit-gtk/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/app-admin/packagekit-gtk/metadata.xml
+++ b/app-admin/packagekit-gtk/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/app-admin/packagekit-qt4/metadata.xml b/app-admin/packagekit-qt4/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/app-admin/packagekit-qt4/metadata.xml
+++ b/app-admin/packagekit-qt4/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/app-admin/packagekit/metadata.xml b/app-admin/packagekit/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/app-admin/packagekit/metadata.xml
+++ b/app-admin/packagekit/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/app-admin/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml
index e2e74b8..428baa8 100644
--- a/app-admin/puppet-lint/metadata.xml
+++ b/app-admin/puppet-lint/metadata.xml
@@ -2,8 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <!--
 $Id$
--->
-<pkgmetadata>
+--><pkgmetadata>
 <herd>sysadmin</herd>
 <herd>ruby</herd>
 <longdescription>Tim Sharpe's Puppet Linter. Enforces puppetlabs style.</longdescription>

diff --git a/app-admin/puppet/metadata.xml b/app-admin/puppet/metadata.xml
index 93a305e..8ce3d93 100644
--- a/app-admin/puppet/metadata.xml
+++ b/app-admin/puppet/metadata.xml
@@ -21,9 +21,9 @@
 	</longdescription>
 	<use>
 <!--		<flag name='puppetdb'>Enable puppetdb support</flag> -->
-		<flag name='augeas'>Enable augeas support</flag>
-		<flag name='diff'>Enable diff support</flag>
-		<flag name='rrdtool'>Enable rrdtool support</flag>
-		<flag name='shadow'>Enable shadow support</flag>
+		<flag name="augeas">Enable augeas support</flag>
+		<flag name="diff">Enable diff support</flag>
+		<flag name="rrdtool">Enable rrdtool support</flag>
+		<flag name="shadow">Enable shadow support</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-admin/qtpass/metadata.xml b/app-admin/qtpass/metadata.xml
index fdc73dc..20196e7 100644
--- a/app-admin/qtpass/metadata.xml
+++ b/app-admin/qtpass/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/app-admin/r10k/metadata.xml b/app-admin/r10k/metadata.xml
index bf6926e..f60aedb 100644
--- a/app-admin/r10k/metadata.xml
+++ b/app-admin/r10k/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/app-admin/ranpwd/metadata.xml b/app-admin/ranpwd/metadata.xml
index d3bec77..06ed5d7 100644
--- a/app-admin/ranpwd/metadata.xml
+++ b/app-admin/ranpwd/metadata.xml
@@ -2,5 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>crypto</herd>
-<longdescription></longdescription>
+<longdescription/>
 </pkgmetadata>

diff --git a/app-admin/rigo/metadata.xml b/app-admin/rigo/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/app-admin/rigo/metadata.xml
+++ b/app-admin/rigo/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/app-admin/sagan-rules/metadata.xml b/app-admin/sagan-rules/metadata.xml
index c9106df..7d27bc0 100644
--- a/app-admin/sagan-rules/metadata.xml
+++ b/app-admin/sagan-rules/metadata.xml
@@ -9,6 +9,6 @@
   <email>maksbotan@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='lognorm'>Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
+	<flag name="lognorm">Install normalize rules support with <pkg>dev-libs/liblognorm</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/app-admin/sagan/metadata.xml b/app-admin/sagan/metadata.xml
index 0d04c21..c980dc4 100644
--- a/app-admin/sagan/metadata.xml
+++ b/app-admin/sagan/metadata.xml
@@ -15,10 +15,10 @@
 		<name>Alexander Vershilov</name>
 	</maintainer>
 	<use>
-		<flag name='smtp'>Build witch SMTP (E-Mail) support</flag>
-		<flag name='lognorm'>Add support for log/rules normalizations via <pkg>dev-libs/liblognorm</pkg></flag>
-		<flag name='pcap'>Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
-		<flag name='libdnet'>Add support for <pkg>dev-libs/libdnet</pkg></flag>
-		<flag name='snort'>Add support to interact with Snort IDE using  <pkg>net-analyzer/snortsam</pkg>'</flag>
+		<flag name="smtp">Build witch SMTP (E-Mail) support</flag>
+		<flag name="lognorm">Add support for log/rules normalizations via <pkg>dev-libs/liblognorm</pkg></flag>
+		<flag name="pcap">Add support for network packet capture via <pkg>net-libs/libpcap</pkg></flag>
+		<flag name="libdnet">Add support for <pkg>dev-libs/libdnet</pkg></flag>
+		<flag name="snort">Add support to interact with Snort IDE using  <pkg>net-analyzer/snortsam</pkg>'</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-admin/sudo/metadata.xml b/app-admin/sudo/metadata.xml
index 9116d3c..535e864 100644
--- a/app-admin/sudo/metadata.xml
+++ b/app-admin/sudo/metadata.xml
@@ -9,10 +9,10 @@
     arguments.
   </longdescription>
   <use>
-	<flag name='sendmail'>
+	<flag name="sendmail">
 	  Allow sudo to send emails with sendmail.
 	</flag>
-    <flag name='offensive'>
+    <flag name="offensive">
       Let sudo print insults when the user types the wrong password.
     </flag>
   </use>

diff --git a/app-admin/sulfur/metadata.xml b/app-admin/sulfur/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/app-admin/sulfur/metadata.xml
+++ b/app-admin/sulfur/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/app-admin/sysklogd/metadata.xml b/app-admin/sysklogd/metadata.xml
index b3d8b65..5a2dd62 100644
--- a/app-admin/sysklogd/metadata.xml
+++ b/app-admin/sysklogd/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>base-system</herd>
 	<use>
-		<flag name='logrotate'>use app-admin/logrotate for rotating logs rather than custom cron scripts</flag>
+		<flag name="logrotate">use app-admin/logrotate for rotating logs rather than custom cron scripts</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-admin/testdisk/metadata.xml b/app-admin/testdisk/metadata.xml
index bcd5bf7..1cb2f38 100644
--- a/app-admin/testdisk/metadata.xml
+++ b/app-admin/testdisk/metadata.xml
@@ -8,8 +8,8 @@
 		<description>Primary maintainer</description>
     </maintainer>
 	<use>
-		<flag name='ntfs'>Include the ability to read NTFS filesystems</flag>
-		<flag name='reiserfs'>Include reiserfs reading ability</flag>
-		<flag name='ewf'>Include ewf library</flag>
+		<flag name="ntfs">Include the ability to read NTFS filesystems</flag>
+		<flag name="reiserfs">Include reiserfs reading ability</flag>
+		<flag name="ewf">Include ewf library</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-admin/ulogd/metadata.xml b/app-admin/ulogd/metadata.xml
index 9a59413..800262c 100644
--- a/app-admin/ulogd/metadata.xml
+++ b/app-admin/ulogd/metadata.xml
@@ -7,14 +7,14 @@
 		<name>Coacher</name>
 	</maintainer>
 	<use>
-		<flag name='json'>Build JSON output plugin to save packets in JSON file format.</flag>
-		<flag name='pcap'>Build PCAP output plugin to save packets in libpcap file format.</flag>
-		<flag name='mysql'>Build MySQL output plugin to save packets in a mysql database.</flag>
-		<flag name='postgres'>Build PGSQL output plugin to save packets in a postgres database.</flag>
-		<flag name='sqlite'>Build SQLITE3 output plugin to save packets in a sqlite database.</flag>
-		<flag name='nflog'>Build NFLOG input plugin to support stateless packet-based logging via nfnetlink_queue.</flag>
-		<flag name='nfct'>Build NFCT input plugin to support stateful flow-based logging via nf_conntrack_netlink.</flag>
-		<flag name='nfacct'>Build NFACCT input plugin to support traffic accounting via nfnetlink_acct.</flag>
-		<flag name='ulog'>Build ULOG input plugin to support deprecated packet-based logging via ULOG target.</flag>
+		<flag name="json">Build JSON output plugin to save packets in JSON file format.</flag>
+		<flag name="pcap">Build PCAP output plugin to save packets in libpcap file format.</flag>
+		<flag name="mysql">Build MySQL output plugin to save packets in a mysql database.</flag>
+		<flag name="postgres">Build PGSQL output plugin to save packets in a postgres database.</flag>
+		<flag name="sqlite">Build SQLITE3 output plugin to save packets in a sqlite database.</flag>
+		<flag name="nflog">Build NFLOG input plugin to support stateless packet-based logging via nfnetlink_queue.</flag>
+		<flag name="nfct">Build NFCT input plugin to support stateful flow-based logging via nf_conntrack_netlink.</flag>
+		<flag name="nfacct">Build NFACCT input plugin to support traffic accounting via nfnetlink_acct.</flag>
+		<flag name="ulog">Build ULOG input plugin to support deprecated packet-based logging via ULOG target.</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-admin/webalizer/metadata.xml b/app-admin/webalizer/metadata.xml
index bdcb957..8b8468c 100644
--- a/app-admin/webalizer/metadata.xml
+++ b/app-admin/webalizer/metadata.xml
@@ -7,6 +7,6 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
-		<flag name='xtended'>Include the 404 extension</flag>
+		<flag name="xtended">Include the 404 extension</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-admin/webapp-config/metadata.xml b/app-admin/webapp-config/metadata.xml
index 71fb941..173f01f 100644
--- a/app-admin/webapp-config/metadata.xml
+++ b/app-admin/webapp-config/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>web-apps</herd>

diff --git a/app-admin/whowatch/metadata.xml b/app-admin/whowatch/metadata.xml
index a7076d4..7713699 100644
--- a/app-admin/whowatch/metadata.xml
+++ b/app-admin/whowatch/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>jer@gentoo.org</email>

diff --git a/app-admin/yaala/metadata.xml b/app-admin/yaala/metadata.xml
index f6828df..b169a5e 100644
--- a/app-admin/yaala/metadata.xml
+++ b/app-admin/yaala/metadata.xml
@@ -8,6 +8,6 @@
     Yet Another Log Analyzer
   </longdescription>
   <use>
-    <flag name='storable'>Support for persistence of Perl data structures.</flag>
+    <flag name="storable">Support for persistence of Perl data structures.</flag>
   </use>
 </pkgmetadata>

diff --git a/app-arch/arj/metadata.xml b/app-arch/arj/metadata.xml
index 50e1f55..a4aea1b 100644
--- a/app-arch/arj/metadata.xml
+++ b/app-arch/arj/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-arch/defluff/metadata.xml b/app-arch/defluff/metadata.xml
index 0fa1145..a092042 100644
--- a/app-arch/defluff/metadata.xml
+++ b/app-arch/defluff/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/app-arch/deltarpm/metadata.xml b/app-arch/deltarpm/metadata.xml
index f7ce1ce..9aa1e30 100644
--- a/app-arch/deltarpm/metadata.xml
+++ b/app-arch/deltarpm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-arch/file-roller/metadata.xml b/app-arch/file-roller/metadata.xml
index eee4e27..2079029 100644
--- a/app-arch/file-roller/metadata.xml
+++ b/app-arch/file-roller/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>

diff --git a/app-arch/gzip/metadata.xml b/app-arch/gzip/metadata.xml
index 6620916..0e6ff89 100644
--- a/app-arch/gzip/metadata.xml
+++ b/app-arch/gzip/metadata.xml
@@ -6,6 +6,6 @@
  <remote-id type="cpe">cpe:/a:gnu:gzip</remote-id>
 </upstream>
 <use>
-<flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
+<flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
 </use>
 </pkgmetadata>

diff --git a/app-arch/innoextract/metadata.xml b/app-arch/innoextract/metadata.xml
index 33d1ccf..61a0304 100644
--- a/app-arch/innoextract/metadata.xml
+++ b/app-arch/innoextract/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-arch/libarchive/metadata.xml b/app-arch/libarchive/metadata.xml
index ca60b94..194c620 100644
--- a/app-arch/libarchive/metadata.xml
+++ b/app-arch/libarchive/metadata.xml
@@ -6,28 +6,28 @@
     <email>ssuominen@gentoo.org</email>
     <name>Samuli Suominen</name>
   </maintainer>
-  <longdescription lang='en'>
+  <longdescription lang="en">
     The bsdtar program creates and manipulates streaming archive files.
     It has a number of advantages over previous tar implementations.
   </longdescription>
   <use>
-    <flag name='zlib'>
+    <flag name="zlib">
       Allow accessing gzip-compressed archives through
       <pkg>sys-libs/zlib</pkg>. This only affects libarchive's native
       support: bsdtar will keep using gunzip as a filter if that's not
       built-in. It's also needed for supporting extraction of ZIP
       files.
     </flag>
-    <flag name='bzip2'>
+    <flag name="bzip2">
       Allow accessing bzip2-compressed archives through libbz2 (which
       comes with <pkg>app-arch/bzip2</pkg>). This only affects
       libarchive's native support: bsdtar will keep using bunzip2 as a
       filter if that's not built-in.
     </flag>
-    <flag name='nettle'>
+    <flag name="nettle">
       Use <pkg>dev-libs/nettle</pkg> as crypto backend
     </flag>
-    <flag name='e2fsprogs'>
+    <flag name="e2fsprogs">
       Use file flags from <pkg>sys-fs/e2fsprogs</pkg> headers instead of <pkg>virtual/os-headers</pkg> headers
     </flag>
   </use>

diff --git a/app-arch/libzpaq/metadata.xml b/app-arch/libzpaq/metadata.xml
index 7a46622..c4c6100 100644
--- a/app-arch/libzpaq/metadata.xml
+++ b/app-arch/libzpaq/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<use>
-		<flag name='jit'>Enable just-in-time compilation for faster
+		<flag name="jit">Enable just-in-time compilation for faster
 			compression (requires SSE2)</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-arch/lzop/metadata.xml b/app-arch/lzop/metadata.xml
index caaa4ac..25907ed 100644
--- a/app-arch/lzop/metadata.xml
+++ b/app-arch/lzop/metadata.xml
@@ -5,5 +5,5 @@
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
 </maintainer>
-<longdescription></longdescription>
+<longdescription/>
 </pkgmetadata>

diff --git a/app-arch/mscompress/metadata.xml b/app-arch/mscompress/metadata.xml
index eac9930..ced8c11 100644
--- a/app-arch/mscompress/metadata.xml
+++ b/app-arch/mscompress/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-arch/pxz/metadata.xml b/app-arch/pxz/metadata.xml
index f33d0ac..5bb98fb 100644
--- a/app-arch/pxz/metadata.xml
+++ b/app-arch/pxz/metadata.xml
@@ -13,4 +13,3 @@ to speed up compression time with minimal possible influence on compression
 ratio.
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-arch/rar/metadata.xml b/app-arch/rar/metadata.xml
index 373b125..a85d323 100644
--- a/app-arch/rar/metadata.xml
+++ b/app-arch/rar/metadata.xml
@@ -12,7 +12,7 @@
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<use>
-		<flag name='all_sfx'>
+		<flag name="all_sfx">
 			Install all SFX (Self-Extracting) files rather than just the native
 			format (allows creation of Windows EXEs on Linux ELF systems)
 		</flag>

diff --git a/app-arch/tar/metadata.xml b/app-arch/tar/metadata.xml
index f8de3a9..5b38aad 100644
--- a/app-arch/tar/metadata.xml
+++ b/app-arch/tar/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='minimal'>just install `tar`</flag>
+	<flag name="minimal">just install `tar`</flag>
 </use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:gnu:tar</remote-id>

diff --git a/app-arch/unshield/metadata.xml b/app-arch/unshield/metadata.xml
index 4fcc8d0..3369526 100644
--- a/app-arch/unshield/metadata.xml
+++ b/app-arch/unshield/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>pda</herd>

diff --git a/app-arch/upx-bin/metadata.xml b/app-arch/upx-bin/metadata.xml
index 2871414..5f21286 100644
--- a/app-arch/upx-bin/metadata.xml
+++ b/app-arch/upx-bin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-backup/attic/metadata.xml b/app-backup/attic/metadata.xml
index 52a07f2..406cf20 100644
--- a/app-backup/attic/metadata.xml
+++ b/app-backup/attic/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-backup/boxbackup/metadata.xml b/app-backup/boxbackup/metadata.xml
index eee6625..65452a7 100644
--- a/app-backup/boxbackup/metadata.xml
+++ b/app-backup/boxbackup/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>app-backup</herd>

diff --git a/app-backup/snapper/metadata.xml b/app-backup/snapper/metadata.xml
index 103a1ad..0f0eb6f 100644
--- a/app-backup/snapper/metadata.xml
+++ b/app-backup/snapper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription>
@@ -27,12 +27,12 @@
 		<remote-id type="github">openSUSE/snapper</remote-id>
 	</upstream>
 	<use>
-		<flag name='xattr'>
+		<flag name="xattr">
 		Add support for getting and setting POSIX extended attributes, through
 		<pkg>sys-apps/attr</pkg>.
 		</flag>
-		<flag name='btrfs'>Include Btrfs support <pkg>sys-fs/btrfs-progs</pkg></flag>
-		<flag name='ext4'>Include Ext4 support <pkg>sys-fs/e2fsprogs</pkg></flag>
-		<flag name='lvm'>Enable LVM thinprovisioned snapshots support <pkg>sys-fs/lvm2</pkg></flag>
+		<flag name="btrfs">Include Btrfs support <pkg>sys-fs/btrfs-progs</pkg></flag>
+		<flag name="ext4">Include Ext4 support <pkg>sys-fs/e2fsprogs</pkg></flag>
+		<flag name="lvm">Enable LVM thinprovisioned snapshots support <pkg>sys-fs/lvm2</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/app-backup/vzdump/metadata.xml b/app-backup/vzdump/metadata.xml
index a6301c0..9b5264d 100644
--- a/app-backup/vzdump/metadata.xml
+++ b/app-backup/vzdump/metadata.xml
@@ -18,4 +18,3 @@ There are several ways to provide consistency:
  - use LVM2 (no downtime)
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-benchmarks/expedite/metadata.xml b/app-benchmarks/expedite/metadata.xml
index 71cdd72..99165ad 100644
--- a/app-benchmarks/expedite/metadata.xml
+++ b/app-benchmarks/expedite/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>

diff --git a/app-benchmarks/iozone/metadata.xml b/app-benchmarks/iozone/metadata.xml
index 35303c2..e283886 100644
--- a/app-benchmarks/iozone/metadata.xml
+++ b/app-benchmarks/iozone/metadata.xml
@@ -7,5 +7,5 @@
     <name>Patrick Lauer</name>
     <description>A Filesystem benchmark tool</description>
 </maintainer>
-<longdescription></longdescription>
+<longdescription/>
 </pkgmetadata>

diff --git a/app-benchmarks/jmeter/metadata.xml b/app-benchmarks/jmeter/metadata.xml
index 44fe314..3712e22 100644
--- a/app-benchmarks/jmeter/metadata.xml
+++ b/app-benchmarks/jmeter/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>java</herd>
 <use>
-	<flag name='beanshell'>Enable BeanShell scripting support</flag>
+	<flag name="beanshell">Enable BeanShell scripting support</flag>
 </use>
 </pkgmetadata>

diff --git a/app-benchmarks/volanomark/metadata.xml b/app-benchmarks/volanomark/metadata.xml
index c9b7d13..6cd4902 100644
--- a/app-benchmarks/volanomark/metadata.xml
+++ b/app-benchmarks/volanomark/metadata.xml
@@ -6,4 +6,3 @@
 </maintainer>
 <longdescription>Java Benchmark test</longdescription>
 </pkgmetadata>
-

diff --git a/app-cdr/cdrdao/metadata.xml b/app-cdr/cdrdao/metadata.xml
index 4c53386..3c7976d 100644
--- a/app-cdr/cdrdao/metadata.xml
+++ b/app-cdr/cdrdao/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>media-optical</herd>

diff --git a/app-cdr/cdrkit/metadata.xml b/app-cdr/cdrkit/metadata.xml
index 115da0d..aae6e80 100644
--- a/app-cdr/cdrkit/metadata.xml
+++ b/app-cdr/cdrkit/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>media-optical</herd>
 <use>
-	<flag name='hfs'>Provide building of HFS (Apple) CD-images</flag>
+	<flag name="hfs">Provide building of HFS (Apple) CD-images</flag>
 </use>
 </pkgmetadata>
-

diff --git a/app-cdr/cdw/metadata.xml b/app-cdr/cdw/metadata.xml
index eb9cab9..ef2c6a7 100644
--- a/app-cdr/cdw/metadata.xml
+++ b/app-cdr/cdw/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>media-optical</herd>

diff --git a/app-cdr/cuetools/metadata.xml b/app-cdr/cuetools/metadata.xml
index 59121c9..3594ad3 100644
--- a/app-cdr/cuetools/metadata.xml
+++ b/app-cdr/cuetools/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>media-optical</herd>
 	<use>
-		<flag name='extras'>Install additional script that tag files based on cue/toc file information</flag>
+		<flag name="extras">Install additional script that tag files based on cue/toc file information</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-cdr/daa2iso/metadata.xml b/app-cdr/daa2iso/metadata.xml
index 5e3a61a..77bb27a 100644
--- a/app-cdr/daa2iso/metadata.xml
+++ b/app-cdr/daa2iso/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-cdr/disc-cover/metadata.xml b/app-cdr/disc-cover/metadata.xml
index e9db353..2aaa56d 100644
--- a/app-cdr/disc-cover/metadata.xml
+++ b/app-cdr/disc-cover/metadata.xml
@@ -9,7 +9,7 @@
     That's why the web application ebuild is manually slotted to 0.
   </longdescription>
   <use>
-	  <flag name='cdrom'>Enable audio CD support. This is not needed to make
+	  <flag name="cdrom">Enable audio CD support. This is not needed to make
 		  www-apps/disc-cover work.</flag>
   </use>
 </pkgmetadata>

diff --git a/app-cdr/dvdisaster/metadata.xml b/app-cdr/dvdisaster/metadata.xml
index 2a5e9ad..f02ca88 100644
--- a/app-cdr/dvdisaster/metadata.xml
+++ b/app-cdr/dvdisaster/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>media-optical</herd>

diff --git a/app-crypt/WiRouterKeyRec/metadata.xml b/app-crypt/WiRouterKeyRec/metadata.xml
index 6c08151..5f8f148 100644
--- a/app-crypt/WiRouterKeyRec/metadata.xml
+++ b/app-crypt/WiRouterKeyRec/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Agostino Sarubbo</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-crypt/acme/metadata.xml b/app-crypt/acme/metadata.xml
index c626e32..bee609a 100644
--- a/app-crypt/acme/metadata.xml
+++ b/app-crypt/acme/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-crypt/aespipe/metadata.xml b/app-crypt/aespipe/metadata.xml
index 68cdab5..b26c0f2 100644
--- a/app-crypt/aespipe/metadata.xml
+++ b/app-crypt/aespipe/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>

diff --git a/app-crypt/af_alg/metadata.xml b/app-crypt/af_alg/metadata.xml
index 7bb3d5a..ec7c7fc 100644
--- a/app-crypt/af_alg/metadata.xml
+++ b/app-crypt/af_alg/metadata.xml
@@ -7,11 +7,10 @@
 </maintainer>
 <longdescription lang="en">
 af_alg implements an OpenSSL engine that uses the AF_ALG functionailty found in
-kernel >= 2.6.38 for crypto offload. Be sure to actually check if it's faster,
+kernel &gt;= 2.6.38 for crypto offload. Be sure to actually check if it's faster,
 as for many modern systems, userspace software implementations are actually
 faster, as they avoid a kernel context switch. However, on embedded systems and
 others with crypto hardware, AF_ALG may be faster.  The homepage has more
 details.
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-crypt/ccrypt/metadata.xml b/app-crypt/ccrypt/metadata.xml
index 59cb594..85caba2 100644
--- a/app-crypt/ccrypt/metadata.xml
+++ b/app-crypt/ccrypt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>

diff --git a/app-crypt/codecrypt/metadata.xml b/app-crypt/codecrypt/metadata.xml
index 6b725ff..8a8bbde 100644
--- a/app-crypt/codecrypt/metadata.xml
+++ b/app-crypt/codecrypt/metadata.xml
@@ -12,10 +12,9 @@
 		that uses only quantum-computer-resistant algorithms
 	</longdescription>
 	<use>
-		<flag name='cryptopp'>
+		<flag name="cryptopp">
 			Build algorithms that need Crypto++ support
 			<pkg>dev-libs/crypto++</pkg>
 		</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/app-crypt/codegroup/metadata.xml b/app-crypt/codegroup/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/app-crypt/codegroup/metadata.xml
+++ b/app-crypt/codegroup/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-crypt/ekeyd/metadata.xml b/app-crypt/ekeyd/metadata.xml
index 11e009a..61422f7 100644
--- a/app-crypt/ekeyd/metadata.xml
+++ b/app-crypt/ekeyd/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Kristian Fiskerstrand</name>
   </maintainer>
   <use>
-    <flag name='usb'>
+    <flag name="usb">
       Build the libusb-based userland daemon for accessing the
       EntropyKey (alternative to the CDC USB driver). It is suggested
       to use this option by default, as the CDC driver in the kernel
@@ -14,12 +14,12 @@
       EntropyKey is too buggy), and can cause various problems.
     </flag>
 
-    <flag name='munin'>
+    <flag name="munin">
       Install a plugin for <pkg>net-analyzer/munin</pkg> to graph
       statistical data from ekeyd.
     </flag>
 
-    <flag name='minimal'>
+    <flag name="minimal">
       Only install the ekey-egd-linux service rather than the full
       ekeyd package.
     </flag>

diff --git a/app-crypt/gnupg/metadata.xml b/app-crypt/gnupg/metadata.xml
index c18f51d..6cb7075 100644
--- a/app-crypt/gnupg/metadata.xml
+++ b/app-crypt/gnupg/metadata.xml
@@ -7,28 +7,28 @@
     defined by RFC4880.
   </longdescription>
   <use>
-    <flag name='smartcard'>
+    <flag name="smartcard">
       Bring in <pkg>dev-libs/libusb</pkg> as a dependency; enable
       scdaemon.
     </flag>
-    <flag name='smartcard'>
+    <flag name="smartcard">
       Build scdaemon software. Enables usage of OpenPGP cards. For
       other type of smartcards, try
       <pkg>app-crypt/gnupg-pkcs11-scd</pkg>.
     </flag>
-    <flag name='usb'>
+    <flag name="usb">
       Build direct CCID access for scdaemon; requires
       <pkg>dev-libs/libusb</pkg>.
     </flag>
-    <flag name='mta'>
+    <flag name="mta">
       Build mta support using
       <pkg>virtual/mta</pkg>.
     </flag>
-    <flag name='tofu'>
+    <flag name="tofu">
       Enable support for Trust of First use trust model; requires
       <pkg>dev-db/sqlite</pkg>.
     </flag>
-    <flag name='tools'>
+    <flag name="tools">
       Install extra tools.
     </flag>
   </use>

diff --git a/app-crypt/hashcat-bin/metadata.xml b/app-crypt/hashcat-bin/metadata.xml
index 88e9eb1..44d1c7b 100644
--- a/app-crypt/hashcat-bin/metadata.xml
+++ b/app-crypt/hashcat-bin/metadata.xml
@@ -7,4 +7,3 @@
 <name>Rick Farina</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-crypt/ima-evm-utils/metadata.xml b/app-crypt/ima-evm-utils/metadata.xml
index e332ea4..3bdf34c 100644
--- a/app-crypt/ima-evm-utils/metadata.xml
+++ b/app-crypt/ima-evm-utils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>hardened</herd>

diff --git a/app-crypt/letsencrypt/metadata.xml b/app-crypt/letsencrypt/metadata.xml
index c626e32..bee609a 100644
--- a/app-crypt/letsencrypt/metadata.xml
+++ b/app-crypt/letsencrypt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-crypt/loop-aes-losetup/metadata.xml b/app-crypt/loop-aes-losetup/metadata.xml
index cdbc35f..8ea4760 100644
--- a/app-crypt/loop-aes-losetup/metadata.xml
+++ b/app-crypt/loop-aes-losetup/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>

diff --git a/app-crypt/md5deep/metadata.xml b/app-crypt/md5deep/metadata.xml
index ee1a315..faeae31 100644
--- a/app-crypt/md5deep/metadata.xml
+++ b/app-crypt/md5deep/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/app-crypt/oclhashcat-lite-bin/metadata.xml b/app-crypt/oclhashcat-lite-bin/metadata.xml
index 8006cb0..69c15d1 100644
--- a/app-crypt/oclhashcat-lite-bin/metadata.xml
+++ b/app-crypt/oclhashcat-lite-bin/metadata.xml
@@ -8,4 +8,3 @@
 </maintainer>
 <use><flag name="virtualcl">Support for Mosix VirtualCL Clustering Platform</flag></use>
 </pkgmetadata>
-

diff --git a/app-crypt/oclhashcat-plus-bin/metadata.xml b/app-crypt/oclhashcat-plus-bin/metadata.xml
index 8006cb0..69c15d1 100644
--- a/app-crypt/oclhashcat-plus-bin/metadata.xml
+++ b/app-crypt/oclhashcat-plus-bin/metadata.xml
@@ -8,4 +8,3 @@
 </maintainer>
 <use><flag name="virtualcl">Support for Mosix VirtualCL Clustering Platform</flag></use>
 </pkgmetadata>
-

diff --git a/app-crypt/pius/metadata.xml b/app-crypt/pius/metadata.xml
index 37d8499..7bb1a89 100644
--- a/app-crypt/pius/metadata.xml
+++ b/app-crypt/pius/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>crypto</herd>

diff --git a/app-crypt/shishi/metadata.xml b/app-crypt/shishi/metadata.xml
index 19b20b8..df6085a 100644
--- a/app-crypt/shishi/metadata.xml
+++ b/app-crypt/shishi/metadata.xml
@@ -12,4 +12,3 @@
   <flag name="arcfour">Enable ARCFOUR encryption/checksum type.</flag>
 </use>
 </pkgmetadata>
-

diff --git a/app-dicts/aspell-be/metadata.xml b/app-dicts/aspell-be/metadata.xml
index a12263d..a93dd08 100644
--- a/app-dicts/aspell-be/metadata.xml
+++ b/app-dicts/aspell-be/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
-	<flag name='classic'>Support classic spelling by default</flag>
+	<flag name="classic">Support classic spelling by default</flag>
 </use>
 </pkgmetadata>

diff --git a/app-dicts/aspell-ro/metadata.xml b/app-dicts/aspell-ro/metadata.xml
index 782dac1..4971142 100644
--- a/app-dicts/aspell-ro/metadata.xml
+++ b/app-dicts/aspell-ro/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/canna-2ch/metadata.xml b/app-dicts/canna-2ch/metadata.xml
index 2345725..f0a10e5 100644
--- a/app-dicts/canna-2ch/metadata.xml
+++ b/app-dicts/canna-2ch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/freedict-deu-eng/metadata.xml b/app-dicts/freedict-deu-eng/metadata.xml
index ea83f71..6f75dd0 100644
--- a/app-dicts/freedict-deu-eng/metadata.xml
+++ b/app-dicts/freedict-deu-eng/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/freedict-eng-fra/metadata.xml b/app-dicts/freedict-eng-fra/metadata.xml
index ea83f71..6f75dd0 100644
--- a/app-dicts/freedict-eng-fra/metadata.xml
+++ b/app-dicts/freedict-eng-fra/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/freedict-eng-ita/metadata.xml b/app-dicts/freedict-eng-ita/metadata.xml
index ea83f71..6f75dd0 100644
--- a/app-dicts/freedict-eng-ita/metadata.xml
+++ b/app-dicts/freedict-eng-ita/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/freedict-eng-swe/metadata.xml b/app-dicts/freedict-eng-swe/metadata.xml
index ea83f71..6f75dd0 100644
--- a/app-dicts/freedict-eng-swe/metadata.xml
+++ b/app-dicts/freedict-eng-swe/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/freedict-fra-eng/metadata.xml b/app-dicts/freedict-fra-eng/metadata.xml
index ea83f71..6f75dd0 100644
--- a/app-dicts/freedict-fra-eng/metadata.xml
+++ b/app-dicts/freedict-fra-eng/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/freedict-ita-eng/metadata.xml b/app-dicts/freedict-ita-eng/metadata.xml
index ea83f71..6f75dd0 100644
--- a/app-dicts/freedict-ita-eng/metadata.xml
+++ b/app-dicts/freedict-ita-eng/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/gjiten/metadata.xml b/app-dicts/gjiten/metadata.xml
index 76f61ee..4eaa419 100644
--- a/app-dicts/gjiten/metadata.xml
+++ b/app-dicts/gjiten/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/hunspell-kk/metadata.xml b/app-dicts/hunspell-kk/metadata.xml
index 5d321ae..fb3378c 100644
--- a/app-dicts/hunspell-kk/metadata.xml
+++ b/app-dicts/hunspell-kk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/libydpdict/metadata.xml b/app-dicts/libydpdict/metadata.xml
index e96e35b..91f4e72 100644
--- a/app-dicts/libydpdict/metadata.xml
+++ b/app-dicts/libydpdict/metadata.xml
@@ -5,4 +5,3 @@
 		<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 8d79323..b9827b8 100644
--- a/app-dicts/myspell-pt/metadata.xml
+++ b/app-dicts/myspell-pt/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
-	<flag name='preao'>Use the pre ortographic agreement version of the dictionary</flag>
+	<flag name="preao">Use the pre ortographic agreement version of the dictionary</flag>
 </use>
 </pkgmetadata>

diff --git a/app-dicts/myspell-zu/metadata.xml b/app-dicts/myspell-zu/metadata.xml
index c8e8a91..c65550c 100644
--- a/app-dicts/myspell-zu/metadata.xml
+++ b/app-dicts/myspell-zu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/opendict/metadata.xml b/app-dicts/opendict/metadata.xml
index b584d53..778060b 100644
--- a/app-dicts/opendict/metadata.xml
+++ b/app-dicts/opendict/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>wxwidgets</herd>

diff --git a/app-dicts/prime-dict/metadata.xml b/app-dicts/prime-dict/metadata.xml
index ac1c4bb..644e529 100644
--- a/app-dicts/prime-dict/metadata.xml
+++ b/app-dicts/prime-dict/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-cdict-en-zh-big5/metadata.xml b/app-dicts/stardict-cdict-en-zh-big5/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-cdict-en-zh-big5/metadata.xml
+++ b/app-dicts/stardict-cdict-en-zh-big5/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-cdict-en-zh-gb/metadata.xml b/app-dicts/stardict-cdict-en-zh-gb/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-cdict-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-cdict-en-zh-gb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-cedict-zh-en-big5/metadata.xml b/app-dicts/stardict-cedict-zh-en-big5/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-cedict-zh-en-big5/metadata.xml
+++ b/app-dicts/stardict-cedict-zh-en-big5/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-cedict-zh-en-gb/metadata.xml b/app-dicts/stardict-cedict-zh-en-gb/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-cedict-zh-en-gb/metadata.xml
+++ b/app-dicts/stardict-cedict-zh-en-gb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-dictd-devils/metadata.xml b/app-dicts/stardict-dictd-devils/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-dictd-devils/metadata.xml
+++ b/app-dicts/stardict-dictd-devils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-freedict-eng-deu/metadata.xml b/app-dicts/stardict-freedict-eng-deu/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-freedict-eng-deu/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-deu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-freedict-eng-fra/metadata.xml b/app-dicts/stardict-freedict-eng-fra/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-freedict-eng-fra/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-fra/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-freedict-eng-ita/metadata.xml b/app-dicts/stardict-freedict-eng-ita/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-freedict-eng-ita/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-ita/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-freedict-eng-lat/metadata.xml b/app-dicts/stardict-freedict-eng-lat/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-freedict-eng-lat/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-lat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-freedict-eng-rus/metadata.xml b/app-dicts/stardict-freedict-eng-rus/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-freedict-eng-rus/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-rus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-freedict-eng-spa/metadata.xml b/app-dicts/stardict-freedict-eng-spa/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-freedict-eng-spa/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-spa/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-freedict-eng-swe/metadata.xml b/app-dicts/stardict-freedict-eng-swe/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-freedict-eng-swe/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-swe/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-freedict-eng-tur/metadata.xml b/app-dicts/stardict-freedict-eng-tur/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-freedict-eng-tur/metadata.xml
+++ b/app-dicts/stardict-freedict-eng-tur/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-freedict-tur-deu/metadata.xml b/app-dicts/stardict-freedict-tur-deu/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-freedict-tur-deu/metadata.xml
+++ b/app-dicts/stardict-freedict-tur-deu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-freedict-tur-eng/metadata.xml b/app-dicts/stardict-freedict-tur-eng/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-freedict-tur-eng/metadata.xml
+++ b/app-dicts/stardict-freedict-tur-eng/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-langdao-en-zh-gb/metadata.xml b/app-dicts/stardict-langdao-en-zh-gb/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-langdao-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-langdao-en-zh-gb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-langdao-zh-en-gb/metadata.xml b/app-dicts/stardict-langdao-zh-en-gb/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-langdao-zh-en-gb/metadata.xml
+++ b/app-dicts/stardict-langdao-zh-en-gb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-mova-smiley/metadata.xml b/app-dicts/stardict-mova-smiley/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-mova-smiley/metadata.xml
+++ b/app-dicts/stardict-mova-smiley/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-oxford-en-zh-gb/metadata.xml b/app-dicts/stardict-oxford-en-zh-gb/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-oxford-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-oxford-en-zh-gb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-quick-eng-fra/metadata.xml b/app-dicts/stardict-quick-eng-fra/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-quick-eng-fra/metadata.xml
+++ b/app-dicts/stardict-quick-eng-fra/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-quick-eng-jpn/metadata.xml b/app-dicts/stardict-quick-eng-jpn/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-quick-eng-jpn/metadata.xml
+++ b/app-dicts/stardict-quick-eng-jpn/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-quick-jpn-eng/metadata.xml b/app-dicts/stardict-quick-jpn-eng/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-quick-jpn-eng/metadata.xml
+++ b/app-dicts/stardict-quick-jpn-eng/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-quick-ru-en/metadata.xml b/app-dicts/stardict-quick-ru-en/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-quick-ru-en/metadata.xml
+++ b/app-dicts/stardict-quick-ru-en/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/stardict-xdict-en-zh-big5/metadata.xml b/app-dicts/stardict-xdict-en-zh-big5/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-xdict-en-zh-big5/metadata.xml
+++ b/app-dicts/stardict-xdict-en-zh-big5/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-xdict-en-zh-gb/metadata.xml b/app-dicts/stardict-xdict-en-zh-gb/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-xdict-en-zh-gb/metadata.xml
+++ b/app-dicts/stardict-xdict-en-zh-gb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-xdict-zh-en-big5/metadata.xml b/app-dicts/stardict-xdict-zh-en-big5/metadata.xml
index 4bf636a..ba8e856 100644
--- a/app-dicts/stardict-xdict-zh-en-big5/metadata.xml
+++ b/app-dicts/stardict-xdict-zh-en-big5/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-dicts/stardict-xdict-zh-en-gb/metadata.xml b/app-dicts/stardict-xdict-zh-en-gb/metadata.xml
index beb7f53..f6dbf24 100644
--- a/app-dicts/stardict-xdict-zh-en-gb/metadata.xml
+++ b/app-dicts/stardict-xdict-zh-en-gb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-dicts/ydpdict/metadata.xml b/app-dicts/ydpdict/metadata.xml
index e96e35b..91f4e72 100644
--- a/app-dicts/ydpdict/metadata.xml
+++ b/app-dicts/ydpdict/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-doc/devmanual/metadata.xml b/app-doc/devmanual/metadata.xml
index 0d0a92f..9ef0d22 100644
--- a/app-doc/devmanual/metadata.xml
+++ b/app-doc/devmanual/metadata.xml
@@ -9,4 +9,3 @@ devmanual@gentoo.org
 </description>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-doc/doxygen/metadata.xml b/app-doc/doxygen/metadata.xml
index 46e7917..c573796 100644
--- a/app-doc/doxygen/metadata.xml
+++ b/app-doc/doxygen/metadata.xml
@@ -9,8 +9,8 @@
     as well as other languages (using additional helper tools).
 </longdescription>
 <use>
-	<flag name='clang'>support for <pkg>sys-devel/clang</pkg> assisted parsing</flag>
-	<flag name='dot'>allow to create dot graphs using <pkg>media-gfx/graphviz</pkg></flag>
-	<flag name='doxysearch'>build doxyindexer and doxysearch.cgi</flag>
+	<flag name="clang">support for <pkg>sys-devel/clang</pkg> assisted parsing</flag>
+	<flag name="dot">allow to create dot graphs using <pkg>media-gfx/graphviz</pkg></flag>
+	<flag name="doxysearch">build doxyindexer and doxysearch.cgi</flag>
 </use>
 </pkgmetadata>

diff --git a/app-doc/edox-data/metadata.xml b/app-doc/edox-data/metadata.xml
index c8e8ac1..ac83800 100644
--- a/app-doc/edox-data/metadata.xml
+++ b/app-doc/edox-data/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <upstream>
-	<remote-id type='sourceforge'>enlightenment</remote-id>
+	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/app-doc/kicad-doc/metadata.xml b/app-doc/kicad-doc/metadata.xml
index eab80cf..186e473 100644
--- a/app-doc/kicad-doc/metadata.xml
+++ b/app-doc/kicad-doc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/app-doc/linuxfromscratch/metadata.xml b/app-doc/linuxfromscratch/metadata.xml
index 9ae0b51..512a5f3 100644
--- a/app-doc/linuxfromscratch/metadata.xml
+++ b/app-doc/linuxfromscratch/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>base-system</herd>
 	<use>
-		<flag name='htmlsingle'>Install all-on-one-page HTML version.</flag>
+		<flag name="htmlsingle">Install all-on-one-page HTML version.</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-doc/tldp-howto/metadata.xml b/app-doc/tldp-howto/metadata.xml
index 14c5c2e..0abe3fa 100644
--- a/app-doc/tldp-howto/metadata.xml
+++ b/app-doc/tldp-howto/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<herd>base-system</herd>
 	<use>
-		<flag name='html'>Install multi-chapter HTML docs</flag>
-		<flag name='htmlsingle'>Install all-on-one-page HTML docs</flag>
-		<flag name='pdf'>Install pdf docs</flag>
-		<flag name='text'>Install plain-text docs</flag>
+		<flag name="html">Install multi-chapter HTML docs</flag>
+		<flag name="htmlsingle">Install all-on-one-page HTML docs</flag>
+		<flag name="pdf">Install pdf docs</flag>
+		<flag name="text">Install plain-text docs</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-editors/XML-XSH2/metadata.xml b/app-editors/XML-XSH2/metadata.xml
index 99066a7..6d38c0c 100644
--- a/app-editors/XML-XSH2/metadata.xml
+++ b/app-editors/XML-XSH2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer>

diff --git a/app-editors/dav/metadata.xml b/app-editors/dav/metadata.xml
index d8a63dd..6a605bf 100644
--- a/app-editors/dav/metadata.xml
+++ b/app-editors/dav/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-editors/emacs-vcs/metadata.xml b/app-editors/emacs-vcs/metadata.xml
index c5e623f..8b0b3d0 100644
--- a/app-editors/emacs-vcs/metadata.xml
+++ b/app-editors/emacs-vcs/metadata.xml
@@ -20,29 +20,29 @@
      available separately.
 </longdescription>
 <use>
-  <flag name='athena'>Enable the MIT Athena widget set
+  <flag name="athena">Enable the MIT Athena widget set
     (<pkg>x11-libs/libXaw</pkg>)</flag>
-  <flag name='games'>Support shared score files for games</flag>
-  <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
+  <flag name="games">Support shared score files for games</flag>
+  <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system
     font name</flag>
-  <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
+  <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file
     notification</flag>
-  <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
+  <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
     system font name</flag>
-  <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
+  <flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of
     version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
-  <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
-  <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
-  <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
+  <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
+  <flag name="hesiod">Enable support for <pkg>net-dns/hesiod</pkg></flag>
+  <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
     processing</flag>
-  <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
+  <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
     of the internal Lisp implementations</flag>
-  <flag name='pax_kernel'>Enable building under a PaX enabled kernel</flag>
-  <flag name='source'>Install C source files and make them available for
+  <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
+  <flag name="source">Install C source files and make them available for
     find-function</flag>
-  <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
+  <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
     preference to Emacs' own scrollbars</flag>
-  <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
+  <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
     This option has an effect only on architectures where "long" and
     "long long" types have different size.</flag>
 </use>

diff --git a/app-editors/emacs/metadata.xml b/app-editors/emacs/metadata.xml
index c5e623f..8b0b3d0 100644
--- a/app-editors/emacs/metadata.xml
+++ b/app-editors/emacs/metadata.xml
@@ -20,29 +20,29 @@
      available separately.
 </longdescription>
 <use>
-  <flag name='athena'>Enable the MIT Athena widget set
+  <flag name="athena">Enable the MIT Athena widget set
     (<pkg>x11-libs/libXaw</pkg>)</flag>
-  <flag name='games'>Support shared score files for games</flag>
-  <flag name='gconf'>Use <pkg>gnome-base/gconf</pkg> to read the system
+  <flag name="games">Support shared score files for games</flag>
+  <flag name="gconf">Use <pkg>gnome-base/gconf</pkg> to read the system
     font name</flag>
-  <flag name='gfile'>Use gfile (<pkg>dev-libs/glib</pkg>) for file
+  <flag name="gfile">Use gfile (<pkg>dev-libs/glib</pkg>) for file
     notification</flag>
-  <flag name='gsettings'>Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
+  <flag name="gsettings">Use gsettings (<pkg>dev-libs/glib</pkg>) to read the
     system font name</flag>
-  <flag name='gtk3'>Link against version 3 of the GIMP Toolkit instead of
+  <flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of
     version 2 (<pkg>x11-libs/gtk+</pkg>)</flag>
-  <flag name='gzip-el'>Compress bundled Emacs Lisp source</flag>
-  <flag name='hesiod'>Enable support for <pkg>net-dns/hesiod</pkg></flag>
-  <flag name='imagemagick'>Use <pkg>media-gfx/imagemagick</pkg> for image
+  <flag name="gzip-el">Compress bundled Emacs Lisp source</flag>
+  <flag name="hesiod">Enable support for <pkg>net-dns/hesiod</pkg></flag>
+  <flag name="imagemagick">Use <pkg>media-gfx/imagemagick</pkg> for image
     processing</flag>
-  <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
+  <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML instead
     of the internal Lisp implementations</flag>
-  <flag name='pax_kernel'>Enable building under a PaX enabled kernel</flag>
-  <flag name='source'>Install C source files and make them available for
+  <flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
+  <flag name="source">Install C source files and make them available for
     find-function</flag>
-  <flag name='toolkit-scroll-bars'>Use the selected toolkit's scrollbars in
+  <flag name="toolkit-scroll-bars">Use the selected toolkit's scrollbars in
     preference to Emacs' own scrollbars</flag>
-  <flag name='wide-int'>Prefer wide Emacs integers (typically 62-bit).
+  <flag name="wide-int">Prefer wide Emacs integers (typically 62-bit).
     This option has an effect only on architectures where "long" and
     "long long" types have different size.</flag>
 </use>

diff --git a/app-editors/fe/metadata.xml b/app-editors/fe/metadata.xml
index d9eb40b..fa1a2a3 100644
--- a/app-editors/fe/metadata.xml
+++ b/app-editors/fe/metadata.xml
@@ -28,6 +28,6 @@
   with a user interface frontend, all written in C.
 </longdescription>
 <use>
-  <flag name='sendmail'>Send mail after editor abend</flag>
+  <flag name="sendmail">Send mail after editor abend</flag>
 </use>
 </pkgmetadata>

diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml
index 12a7b70..7b45ad6 100644
--- a/app-editors/gedit-plugins/metadata.xml
+++ b/app-editors/gedit-plugins/metadata.xml
@@ -6,7 +6,7 @@
 <use>
 	<flag name="charmap">Insert special characters just by clicking on
 		them</flag>
-	<flag name='git'>Shows document changes related to git's HEAD</flag>
+	<flag name="git">Shows document changes related to git's HEAD</flag>
 	<flag name="terminal">Embed a terminal in the bottom pane</flag>
 	<flag name="zeitgeist">Build the plugin to inject events to <pkg>gnome-extra/zeitgeist</pkg></flag>
 </use>

diff --git a/app-editors/gummi/metadata.xml b/app-editors/gummi/metadata.xml
index 8356a1f..a9cd9b4 100644
--- a/app-editors/gummi/metadata.xml
+++ b/app-editors/gummi/metadata.xml
@@ -15,4 +15,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-editors/jasspa-microemacs/metadata.xml b/app-editors/jasspa-microemacs/metadata.xml
index 35a5862..db65897 100644
--- a/app-editors/jasspa-microemacs/metadata.xml
+++ b/app-editors/jasspa-microemacs/metadata.xml
@@ -20,6 +20,6 @@
      should be referred to as the JASSPA distribution.
 </longdescription>
 <use>
-  <flag name='nanoemacs'>Build NanoEmacs instead of MicroEmacs</flag>
+  <flag name="nanoemacs">Build NanoEmacs instead of MicroEmacs</flag>
 </use>
 </pkgmetadata>

diff --git a/app-editors/mousepad/metadata.xml b/app-editors/mousepad/metadata.xml
index 6b976ba..ea825ef 100644
--- a/app-editors/mousepad/metadata.xml
+++ b/app-editors/mousepad/metadata.xml
@@ -6,6 +6,6 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='gtk3'>Use GTK+3 instead of GTK+2</flag>
+    <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
   </use>
 </pkgmetadata>

diff --git a/app-editors/nano/metadata.xml b/app-editors/nano/metadata.xml
index 98a4895..db5f2bc 100644
--- a/app-editors/nano/metadata.xml
+++ b/app-editors/nano/metadata.xml
@@ -22,15 +22,15 @@ Pico as closely as possible while addressing the problems above and
 perhaps providing other extra functionality.
 </longdescription>
 <use>
- <flag name='justify'>Enable justify/unjustify functions for text formatting.</flag>
- <flag name='debug'>
+ <flag name="justify">Enable justify/unjustify functions for text formatting.</flag>
+ <flag name="debug">
   Enable debug messages and assert warnings.  Note that these will all be sent
   straight to stderr rather than some logging facility.
  </flag>
- <flag name='magic'>
+ <flag name="magic">
   Add magic file support (sys-apps/file) to automatically detect appropriate syntax highlighting
  </flag>
- <flag name='minimal'>
+ <flag name="minimal">
   Disable all fancy features, including ones that otherwise have a dedicated
   USE flag (such as spelling).
  </flag>

diff --git a/app-editors/ne/metadata.xml b/app-editors/ne/metadata.xml
index f3e7ae0..02a230f 100644
--- a/app-editors/ne/metadata.xml
+++ b/app-editors/ne/metadata.xml
@@ -5,6 +5,6 @@
 <email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='tinfo'>Link against libtinfo from sys-libs/ncurses</flag>
+<flag name="tinfo">Link against libtinfo from sys-libs/ncurses</flag>
 </use>
 </pkgmetadata>

diff --git a/app-editors/nedit/metadata.xml b/app-editors/nedit/metadata.xml
index a07a8af..5834a26 100644
--- a/app-editors/nedit/metadata.xml
+++ b/app-editors/nedit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-editors/neovim/metadata.xml b/app-editors/neovim/metadata.xml
index c15da2e..e227b2c 100644
--- a/app-editors/neovim/metadata.xml
+++ b/app-editors/neovim/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>vim</herd>
   <use>
-    <flag name='nvimpager'>Install nvimpager symlink to less.sh macro</flag>
+    <flag name="nvimpager">Install nvimpager symlink to less.sh macro</flag>
     <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations</flag>
   </use>
   <upstream>

diff --git a/app-editors/xemacs/metadata.xml b/app-editors/xemacs/metadata.xml
index 1476b66..413e871 100644
--- a/app-editors/xemacs/metadata.xml
+++ b/app-editors/xemacs/metadata.xml
@@ -6,14 +6,14 @@
     <email>xemacs@gentoo.org</email>
     <description>Primary Maintainer</description>
   </maintainer>
-  <longdescription></longdescription>
+  <longdescription/>
   <use>
-    <flag name='athena'>Chooses the MIT Athena widget set</flag>
-    <flag name='dnd'>Enables support for the <pkg>x11-libs/dnd</pkg>
+    <flag name="athena">Chooses the MIT Athena widget set</flag>
+    <flag name="dnd">Enables support for the <pkg>x11-libs/dnd</pkg>
       drag-n-drop library</flag>
-    <flag name='eolconv'>Support detection and translation of newline
+    <flag name="eolconv">Support detection and translation of newline
       conventions</flag>
-    <flag name='pop'>Support POP for mail retrieval</flag>
-    <flag name='xim'>Enable X11 XiM input method</flag>
+    <flag name="pop">Support POP for mail retrieval</flag>
+    <flag name="xim">Enable X11 XiM input method</flag>
   </use>
 </pkgmetadata>

diff --git a/app-editors/zile/metadata.xml b/app-editors/zile/metadata.xml
index 8a7000b..779b288 100644
--- a/app-editors/zile/metadata.xml
+++ b/app-editors/zile/metadata.xml
@@ -12,7 +12,7 @@
   user, e.g. root.
 </longdescription>
 <use>
-  <flag name='valgrind'>Enable usage of <pkg>dev-util/valgrind</pkg>
+  <flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg>
     in tests</flag>
 </use>
 </pkgmetadata>

diff --git a/app-emacs/anything/metadata.xml b/app-emacs/anything/metadata.xml
index 5abd82f..7f63d8b 100644
--- a/app-emacs/anything/metadata.xml
+++ b/app-emacs/anything/metadata.xml
@@ -6,6 +6,6 @@
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <use>
-  <flag name='extensions'>Install optional extensions</flag>
+  <flag name="extensions">Install optional extensions</flag>
 </use>
 </pkgmetadata>

diff --git a/app-emacs/auctex/metadata.xml b/app-emacs/auctex/metadata.xml
index 5376b5c..a7b4028 100644
--- a/app-emacs/auctex/metadata.xml
+++ b/app-emacs/auctex/metadata.xml
@@ -17,6 +17,6 @@
   buffer.
 </longdescription>
 <use>
-  <flag name='preview-latex'>Use bundled preview-latex</flag>
+  <flag name="preview-latex">Use bundled preview-latex</flag>
 </use>
 </pkgmetadata>

diff --git a/app-emacs/emacs-common-gentoo/metadata.xml b/app-emacs/emacs-common-gentoo/metadata.xml
index 0df1cf6..3825759 100644
--- a/app-emacs/emacs-common-gentoo/metadata.xml
+++ b/app-emacs/emacs-common-gentoo/metadata.xml
@@ -6,6 +6,6 @@
   <name>Gentoo GNU Emacs project</name>
 </maintainer>
 <use>
-  <flag name='games'>Support shared score files for games</flag>
+  <flag name="games">Support shared score files for games</flag>
 </use>
 </pkgmetadata>

diff --git a/app-emacs/org-mode/metadata.xml b/app-emacs/org-mode/metadata.xml
index 841e989..4f10031 100644
--- a/app-emacs/org-mode/metadata.xml
+++ b/app-emacs/org-mode/metadata.xml
@@ -21,8 +21,8 @@
   exported as a structured ASCII file, HTML, and LaTeX.
 </longdescription>
 <use>
-  <flag name='contrib'>Install user-contributed files</flag>
-  <flag name='odt-schema'>Install non-free schema files
+  <flag name="contrib">Install user-contributed files</flag>
+  <flag name="odt-schema">Install non-free schema files
     for OpenDocument Text exporter</flag>
 </use>
 </pkgmetadata>

diff --git a/app-emacs/remember/metadata.xml b/app-emacs/remember/metadata.xml
index 187bc89..dc970bb 100644
--- a/app-emacs/remember/metadata.xml
+++ b/app-emacs/remember/metadata.xml
@@ -16,7 +16,7 @@
   possible.
 </longdescription>
 <use>
-  <flag name='bbdb'>Include support for <pkg>app-emacs/bbdb</pkg></flag>
-  <flag name='planner'>Include support for <pkg>app-emacs/planner</pkg></flag>
+  <flag name="bbdb">Include support for <pkg>app-emacs/bbdb</pkg></flag>
+  <flag name="planner">Include support for <pkg>app-emacs/planner</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/app-emacs/wikipedia-mode/metadata.xml b/app-emacs/wikipedia-mode/metadata.xml
index 1ab9e74..0c402df 100644
--- a/app-emacs/wikipedia-mode/metadata.xml
+++ b/app-emacs/wikipedia-mode/metadata.xml
@@ -12,7 +12,7 @@
   wikipedia-mode provides syntax highlighting for MediaWiki markup.
 </longdescription>
 <use>
-  <flag name='outline-magic'>Enable support for outline-mode extensions
+  <flag name="outline-magic">Enable support for outline-mode extensions
   (<pkg>app-emacs/outline-magic</pkg>)</flag>
 </use>
 </pkgmetadata>

diff --git a/app-emulation/crossover-bin/metadata.xml b/app-emulation/crossover-bin/metadata.xml
index 76a1d1f..04e6a51 100644
--- a/app-emulation/crossover-bin/metadata.xml
+++ b/app-emulation/crossover-bin/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Richard Yao</name>
 	</maintainer>
 	<use>
-		<flag name='capi'>Enable ISDN support via CAPI</flag>
+		<flag name="capi">Enable ISDN support via CAPI</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-emulation/e-uae/metadata.xml b/app-emulation/e-uae/metadata.xml
index 2314e7a..0a61e43 100644
--- a/app-emulation/e-uae/metadata.xml
+++ b/app-emulation/e-uae/metadata.xml
@@ -9,8 +9,8 @@
 		WinUAE with UAE.
 	</longdescription>
 	<use>
-		<flag name='capslib'>Add CAPS library support</flag>
-		<flag name='sdl-sound'>Use <pkg>media-libs/sdl-sound</pkg> for audio
+		<flag name="capslib">Add CAPS library support</flag>
+		<flag name="sdl-sound">Use <pkg>media-libs/sdl-sound</pkg> for audio
 			output</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-emulation/ganeti-htools/metadata.xml b/app-emulation/ganeti-htools/metadata.xml
index 235f15f..02c3c44 100644
--- a/app-emulation/ganeti-htools/metadata.xml
+++ b/app-emulation/ganeti-htools/metadata.xml
@@ -19,4 +19,3 @@
 	rebalance the cluster.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-emulation/ganeti-instance-image/metadata.xml b/app-emulation/ganeti-instance-image/metadata.xml
index cee84c2..a6efca6 100644
--- a/app-emulation/ganeti-instance-image/metadata.xml
+++ b/app-emulation/ganeti-instance-image/metadata.xml
@@ -7,4 +7,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-emulation/ganeti/metadata.xml b/app-emulation/ganeti/metadata.xml
index e517e17..dc0b0f9 100644
--- a/app-emulation/ganeti/metadata.xml
+++ b/app-emulation/ganeti/metadata.xml
@@ -21,16 +21,15 @@
 	failures using commodity hardware. 
 	</longdescription>
 	<use>
-		<flag name='drbd'>Enable DRBD support</flag>
-		<flag name='filestorage'>Enable File Storage</flag>
-		<flag name='haskell-daemons'>Build haskell daemons instead of python</flag>
-		<flag name='htools'>Enable htools support</flag>
-		<flag name='kvm'>Enable KVM support</flag>
-		<flag name='lxc'>Enable Linux Countainers support</flag>
-		<flag name='multiple-users'>Enable support for running VMs as different users</flag>
-		<flag name='monitoring'>Enable the ganeti monitoring daemon</flag>
-		<flag name='rbd'>Enable rados block device support via sys-cluster/ceph</flag>
-		<flag name='xen'>Enable Xen support</flag>
+		<flag name="drbd">Enable DRBD support</flag>
+		<flag name="filestorage">Enable File Storage</flag>
+		<flag name="haskell-daemons">Build haskell daemons instead of python</flag>
+		<flag name="htools">Enable htools support</flag>
+		<flag name="kvm">Enable KVM support</flag>
+		<flag name="lxc">Enable Linux Countainers support</flag>
+		<flag name="multiple-users">Enable support for running VMs as different users</flag>
+		<flag name="monitoring">Enable the ganeti monitoring daemon</flag>
+		<flag name="rbd">Enable rados block device support via sys-cluster/ceph</flag>
+		<flag name="xen">Enable Xen support</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/app-emulation/playonlinux/metadata.xml b/app-emulation/playonlinux/metadata.xml
index d94fe6d..39af670 100644
--- a/app-emulation/playonlinux/metadata.xml
+++ b/app-emulation/playonlinux/metadata.xml
@@ -10,4 +10,3 @@
 		<flag name="winbind">Enables support for the winbind auth daemon</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/app-emulation/qemu-guest-agent/metadata.xml b/app-emulation/qemu-guest-agent/metadata.xml
index 6645932..7f49e1f 100644
--- a/app-emulation/qemu-guest-agent/metadata.xml
+++ b/app-emulation/qemu-guest-agent/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>qemu</herd>
 </pkgmetadata>
-

diff --git a/app-emulation/rex-client/metadata.xml b/app-emulation/rex-client/metadata.xml
index 3b15722..a40624f 100644
--- a/app-emulation/rex-client/metadata.xml
+++ b/app-emulation/rex-client/metadata.xml
@@ -5,4 +5,3 @@
 	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-emulation/uae/metadata.xml b/app-emulation/uae/metadata.xml
index 542646b..e4f768b 100644
--- a/app-emulation/uae/metadata.xml
+++ b/app-emulation/uae/metadata.xml
@@ -13,6 +13,6 @@
 		successful A500 and A2000 models.
 	</longdescription>
 	<use>
-		<flag name='scsi'>Enable the uaescsi.device</flag>
+		<flag name="scsi">Enable the uaescsi.device</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-emulation/vagrant/metadata.xml b/app-emulation/vagrant/metadata.xml
index 83fc583..d620023 100644
--- a/app-emulation/vagrant/metadata.xml
+++ b/app-emulation/vagrant/metadata.xml
@@ -8,7 +8,7 @@
 		<description>Proxy maintainer</description>
 	</maintainer>
 	<use>
-		<flag name='virtualbox'>
+		<flag name="virtualbox">
 			Use VirtualBox provider.
 		</flag>
 	</use>

diff --git a/app-emulation/vboxgtk/metadata.xml b/app-emulation/vboxgtk/metadata.xml
index e96e35b..91f4e72 100644
--- a/app-emulation/vboxgtk/metadata.xml
+++ b/app-emulation/vboxgtk/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-emulation/virt-manager/metadata.xml b/app-emulation/virt-manager/metadata.xml
index 26005ac..1865234 100644
--- a/app-emulation/virt-manager/metadata.xml
+++ b/app-emulation/virt-manager/metadata.xml
@@ -3,12 +3,12 @@
 <pkgmetadata>
   <herd>virtualization</herd>
   <use>
-    <flag name='policykit'>
+    <flag name="policykit">
       Enables <pkg>sys-auth/polkit</pkg> authentication support,
       required when using <pkg>app-emulation/libvirt</pkg> with
       PolicyKit authentication
     </flag>
-    <flag name='sasl'>
+    <flag name="sasl">
       Depend on the proper libraries needed to connect to SASL-enabled
       libvirtd instances (e.g. Kerberos-protected instances).
     </flag>

diff --git a/app-emulation/virt-viewer/metadata.xml b/app-emulation/virt-viewer/metadata.xml
index cdeb87c..d7b0ca7 100644
--- a/app-emulation/virt-viewer/metadata.xml
+++ b/app-emulation/virt-viewer/metadata.xml
@@ -9,4 +9,3 @@
 			machines.</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/app-emulation/virt-what/metadata.xml b/app-emulation/virt-what/metadata.xml
index 0bc914a..adfed7c 100644
--- a/app-emulation/virt-what/metadata.xml
+++ b/app-emulation/virt-what/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Doug Goldstein</name>
 	</maintainer>
 	<use>
-		<flag name='dmi'>Use <pkg>sys-apps/dmidecode</pkg> to read firmware data</flag>
+		<flag name="dmi">Use <pkg>sys-apps/dmidecode</pkg> to read firmware data</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/app-emulation/virtualbox-bin/metadata.xml b/app-emulation/virtualbox-bin/metadata.xml
index 8ad5c4d..8d7714e 100644
--- a/app-emulation/virtualbox-bin/metadata.xml
+++ b/app-emulation/virtualbox-bin/metadata.xml
@@ -6,11 +6,11 @@
     <name>Patrick Lauer</name>
   </maintainer>
 <use>
-	<flag name='additions'>Install Guest System Tools ISO</flag>
-	<flag name='chm'>Install kchmviewer binary to enable online help (in MS CHM format)</flag>
-	<flag name='headless'>Install without any graphic frontend</flag>
-	<flag name='sdk'>Enable building of SDK</flag>
-	<flag name='vboxwebsrv'>Install the VirtualBox webservice</flag>
-	<flag name='rdesktop-vrdp'>Install the rdesktop client integration</flag>
+	<flag name="additions">Install Guest System Tools ISO</flag>
+	<flag name="chm">Install kchmviewer binary to enable online help (in MS CHM format)</flag>
+	<flag name="headless">Install without any graphic frontend</flag>
+	<flag name="sdk">Enable building of SDK</flag>
+	<flag name="vboxwebsrv">Install the VirtualBox webservice</flag>
+	<flag name="rdesktop-vrdp">Install the rdesktop client integration</flag>
 </use>
 </pkgmetadata>

diff --git a/app-emulation/virtualbox/metadata.xml b/app-emulation/virtualbox/metadata.xml
index 7150ec6..0e67970 100644
--- a/app-emulation/virtualbox/metadata.xml
+++ b/app-emulation/virtualbox/metadata.xml
@@ -10,11 +10,11 @@
     <name>Patrick Lauer</name>
   </maintainer>
 <use>
-	<flag name='additions'>Install Guest System Tools ISO</flag>
-	<flag name='extensions'>Install extension module packages</flag>
-	<flag name='headless'>Build without any graphic frontend</flag>
-	<flag name='sdk'>Enable building of SDK</flag>
-	<flag name='udev'>Controls installation of special USB udev rules.</flag>
-	<flag name='vboxwebsrv'>Build and install the VirtualBox webservice</flag>
+	<flag name="additions">Install Guest System Tools ISO</flag>
+	<flag name="extensions">Install extension module packages</flag>
+	<flag name="headless">Build without any graphic frontend</flag>
+	<flag name="sdk">Enable building of SDK</flag>
+	<flag name="udev">Controls installation of special USB udev rules.</flag>
+	<flag name="vboxwebsrv">Build and install the VirtualBox webservice</flag>
 </use>
 </pkgmetadata>

diff --git a/app-emulation/vmips-cross-bin/metadata.xml b/app-emulation/vmips-cross-bin/metadata.xml
index 10ebbcc..54b2351 100644
--- a/app-emulation/vmips-cross-bin/metadata.xml
+++ b/app-emulation/vmips-cross-bin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-emulation/vmware-player/metadata.xml b/app-emulation/vmware-player/metadata.xml
index 47a0813..9be8d03 100644
--- a/app-emulation/vmware-player/metadata.xml
+++ b/app-emulation/vmware-player/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>vmware</herd>
 	<use>
-		<flag name='ovftool'>Install OVF tool for importing and exporting appliance files</flag>
+		<flag name="ovftool">Install OVF tool for importing and exporting appliance files</flag>
 		<flag name="vmware-tools">Install VMware Tools images</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-emulation/vov/metadata.xml b/app-emulation/vov/metadata.xml
index 2abfac6..e27de5a 100644
--- a/app-emulation/vov/metadata.xml
+++ b/app-emulation/vov/metadata.xml
@@ -12,6 +12,6 @@
   manipulation. It is a very useful tool to see if your programs work and how.
   </longdescription>
   <use>
-    <flag name='gprof'>build with profiling support</flag>
+    <flag name="gprof">build with profiling support</flag>
   </use>
 </pkgmetadata>

diff --git a/app-emulation/xen-tools/metadata.xml b/app-emulation/xen-tools/metadata.xml
index dfd18d1..97467e9 100644
--- a/app-emulation/xen-tools/metadata.xml
+++ b/app-emulation/xen-tools/metadata.xml
@@ -3,16 +3,16 @@
 <pkgmetadata>
 	<herd>xen</herd>
 	<use>
-		<flag name='api'>Build the C libxenapi bindings</flag>
-		<flag name='flask'>Enable the Flask XSM module from NSA</flag>
-		<flag name='hvm'>Enable support for hardware based virtualization (VT-x,AMD-v)</flag>
-		<flag name='qemu'>Enable IOEMU support via the use of qemu-dm</flag>
-		<flag name='pygrub'>Install the pygrub boot loader</flag>
-		<flag name='screen'>Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag>
-		<flag name='system-qemu'>Using <pkg>app-emulation/qemu</pkg> instead of the bundled one</flag>
-		<flag name='system-seabios'>Using <pkg>sys-firmware/seabios</pkg> instead of the bundled one</flag>
-		<flag name='ocaml'>Enable support for the ocaml language</flag>
-		<flag name='ovmf'>Enable support to boot UEFI guest vm, needed by hvm</flag>
-		<flag name='pam'>Enable pam support</flag>
+		<flag name="api">Build the C libxenapi bindings</flag>
+		<flag name="flask">Enable the Flask XSM module from NSA</flag>
+		<flag name="hvm">Enable support for hardware based virtualization (VT-x,AMD-v)</flag>
+		<flag name="qemu">Enable IOEMU support via the use of qemu-dm</flag>
+		<flag name="pygrub">Install the pygrub boot loader</flag>
+		<flag name="screen">Enable support for running domain U console in an <pkg>app-misc/screen</pkg> session</flag>
+		<flag name="system-qemu">Using <pkg>app-emulation/qemu</pkg> instead of the bundled one</flag>
+		<flag name="system-seabios">Using <pkg>sys-firmware/seabios</pkg> instead of the bundled one</flag>
+		<flag name="ocaml">Enable support for the ocaml language</flag>
+		<flag name="ovmf">Enable support to boot UEFI guest vm, needed by hvm</flag>
+		<flag name="pam">Enable pam support</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml
index caf273c..b36628e 100644
--- a/app-emulation/xen/metadata.xml
+++ b/app-emulation/xen/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>xen</herd>
 	<use>
-		<flag name='flask'>Enable the Flask XSM module from NSA</flag>
-		<flag name='xsm'>Enable the Xen Security Modules (XSM)</flag>
-		<flag name='efi'>Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag>
+		<flag name="flask">Enable the Flask XSM module from NSA</flag>
+		<flag name="xsm">Enable the Xen Security Modules (XSM)</flag>
+		<flag name="efi">Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-emulation/xtrs/metadata.xml b/app-emulation/xtrs/metadata.xml
index 8f00a04..ee65335 100644
--- a/app-emulation/xtrs/metadata.xml
+++ b/app-emulation/xtrs/metadata.xml
@@ -18,6 +18,6 @@
   bit spartan, but it gets the job done.
 </longdescription>
 <use>
-  <flag name='ls-dos'>Install LS-DOS disk images for Model 4P</flag>
+  <flag name="ls-dos">Install LS-DOS disk images for Model 4P</flag>
 </use>
 </pkgmetadata>

diff --git a/app-eselect/eselect-audicle/metadata.xml b/app-eselect/eselect-audicle/metadata.xml
index e96e35b..91f4e72 100644
--- a/app-eselect/eselect-audicle/metadata.xml
+++ b/app-eselect/eselect-audicle/metadata.xml
@@ -5,4 +5,3 @@
 		<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 e96e35b..91f4e72 100644
--- a/app-eselect/eselect-chuck/metadata.xml
+++ b/app-eselect/eselect-chuck/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-eselect/eselect-java/metadata.xml b/app-eselect/eselect-java/metadata.xml
index 82a57cc..8335e2c 100644
--- a/app-eselect/eselect-java/metadata.xml
+++ b/app-eselect/eselect-java/metadata.xml
@@ -5,4 +5,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-eselect/eselect-lua/metadata.xml b/app-eselect/eselect-lua/metadata.xml
index ffbaf99..afd5c52 100644
--- a/app-eselect/eselect-lua/metadata.xml
+++ b/app-eselect/eselect-lua/metadata.xml
@@ -6,4 +6,3 @@
 	</maintainer>
 	<longdescription lang="en">Lua eselect module</longdescription>
 </pkgmetadata>
-

diff --git a/app-eselect/eselect-miniaudicle/metadata.xml b/app-eselect/eselect-miniaudicle/metadata.xml
index e96e35b..91f4e72 100644
--- a/app-eselect/eselect-miniaudicle/metadata.xml
+++ b/app-eselect/eselect-miniaudicle/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-eselect/eselect-opencascade/metadata.xml b/app-eselect/eselect-opencascade/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/app-eselect/eselect-opencascade/metadata.xml
+++ b/app-eselect/eselect-opencascade/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-eselect/eselect-php/metadata.xml b/app-eselect/eselect-php/metadata.xml
index b4348f2..7623c8d 100644
--- a/app-eselect/eselect-php/metadata.xml
+++ b/app-eselect/eselect-php/metadata.xml
@@ -5,7 +5,6 @@
 	<longdescription lang="en">PHP eselect module
 	</longdescription>
 	<use>
-		<flag name='fpm'>Enable the FastCGI Process Manager SAPI</flag>
+		<flag name="fpm">Enable the FastCGI Process Manager SAPI</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/app-eselect/eselect-renpy/metadata.xml b/app-eselect/eselect-renpy/metadata.xml
index e52db06..ee67c30 100644
--- a/app-eselect/eselect-renpy/metadata.xml
+++ b/app-eselect/eselect-renpy/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Julian Ospald</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-eselect/eselect-sndpeek/metadata.xml b/app-eselect/eselect-sndpeek/metadata.xml
index e96e35b..91f4e72 100644
--- a/app-eselect/eselect-sndpeek/metadata.xml
+++ b/app-eselect/eselect-sndpeek/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-eselect/eselect-vi/metadata.xml b/app-eselect/eselect-vi/metadata.xml
index c7b901f..d221a8d 100644
--- a/app-eselect/eselect-vi/metadata.xml
+++ b/app-eselect/eselect-vi/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>vim</herd>
 </pkgmetadata>
-

diff --git a/app-forensics/foremost/metadata.xml b/app-forensics/foremost/metadata.xml
index 33d13a8..588a10a 100644
--- a/app-forensics/foremost/metadata.xml
+++ b/app-forensics/foremost/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>forensics</herd>

diff --git a/app-forensics/openscap/metadata.xml b/app-forensics/openscap/metadata.xml
index 6537c58..2c055be 100644
--- a/app-forensics/openscap/metadata.xml
+++ b/app-forensics/openscap/metadata.xml
@@ -17,4 +17,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-forensics/volatility/metadata.xml b/app-forensics/volatility/metadata.xml
index ee82a14..3c0e674 100644
--- a/app-forensics/volatility/metadata.xml
+++ b/app-forensics/volatility/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-i18n/enca/metadata.xml b/app-i18n/enca/metadata.xml
index e42fda9..7e45291 100644
--- a/app-i18n/enca/metadata.xml
+++ b/app-i18n/enca/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/app-i18n/fcitx-libpinyin/metadata.xml b/app-i18n/fcitx-libpinyin/metadata.xml
index c4a4afa..cd86b6b 100644
--- a/app-i18n/fcitx-libpinyin/metadata.xml
+++ b/app-i18n/fcitx-libpinyin/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>cjk</herd>
   <use>
-    <flag name='dictmanager'>
+    <flag name="dictmanager">
       Enable dictionary manager. Requires <pkg>dev-qt/qtwebkit</pkg>.
     </flag>
   </use>

diff --git a/app-i18n/fcitx/metadata.xml b/app-i18n/fcitx/metadata.xml
index aecebce..9be9adb 100644
--- a/app-i18n/fcitx/metadata.xml
+++ b/app-i18n/fcitx/metadata.xml
@@ -3,15 +3,15 @@
 <pkgmetadata>
   <herd>cjk</herd>
   <use>
-    <flag name='autostart'>Enable xdg-compatible autostart of fcitx</flag>
-    <flag name='enchant'>Use <pkg>app-text/enchant</pkg> for text prediction</flag>
-    <flag name='introspection'>Enable GObject Introspection</flag>
-    <flag name='gtk'>Install GTK2 IM module</flag>
-    <flag name='gtk3'>Install GTK3 IM module</flag>
-    <flag name='opencc'>Enable OpenCC for Chinese Transform</flag>
-    <flag name='pango'>Enable support for <pkg>x11-libs/pango</pkg></flag>
-    <flag name='qt4'>Install Qt4 IM module</flag>
-    <flag name='snooper'>Enable Key Snooper for GTK app</flag>
-    <flag name='table'>Enable Table IM</flag>
+    <flag name="autostart">Enable xdg-compatible autostart of fcitx</flag>
+    <flag name="enchant">Use <pkg>app-text/enchant</pkg> for text prediction</flag>
+    <flag name="introspection">Enable GObject Introspection</flag>
+    <flag name="gtk">Install GTK2 IM module</flag>
+    <flag name="gtk3">Install GTK3 IM module</flag>
+    <flag name="opencc">Enable OpenCC for Chinese Transform</flag>
+    <flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
+    <flag name="qt4">Install Qt4 IM module</flag>
+    <flag name="snooper">Enable Key Snooper for GTK app</flag>
+    <flag name="table">Enable Table IM</flag>
   </use>
 </pkgmetadata>

diff --git a/app-i18n/im-chooser/metadata.xml b/app-i18n/im-chooser/metadata.xml
index d7d9120..77cea0e 100644
--- a/app-i18n/im-chooser/metadata.xml
+++ b/app-i18n/im-chooser/metadata.xml
@@ -8,4 +8,3 @@ choose Input Method you want to use or disable it entirely
 on the desktop.
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-i18n/im-ja/metadata.xml b/app-i18n/im-ja/metadata.xml
index b2d3be2..2a36a4e 100644
--- a/app-i18n/im-ja/metadata.xml
+++ b/app-i18n/im-ja/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cjk</herd>

diff --git a/app-i18n/imsettings/metadata.xml b/app-i18n/imsettings/metadata.xml
index d6f8bf6..ac94bcf 100644
--- a/app-i18n/imsettings/metadata.xml
+++ b/app-i18n/imsettings/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cjk</herd>

diff --git a/app-i18n/libtomoe-gtk/metadata.xml b/app-i18n/libtomoe-gtk/metadata.xml
index c8eb91d..64244b7 100644
--- a/app-i18n/libtomoe-gtk/metadata.xml
+++ b/app-i18n/libtomoe-gtk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-i18n/man-pages-ja/metadata.xml b/app-i18n/man-pages-ja/metadata.xml
index f3e5ee8..26fa1a0 100644
--- a/app-i18n/man-pages-ja/metadata.xml
+++ b/app-i18n/man-pages-ja/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cjk</herd>

diff --git a/app-i18n/man-pages-pl/metadata.xml b/app-i18n/man-pages-pl/metadata.xml
index 80e3092..7466b20 100644
--- a/app-i18n/man-pages-pl/metadata.xml
+++ b/app-i18n/man-pages-pl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-i18n/poedit/metadata.xml b/app-i18n/poedit/metadata.xml
index 5af25ae..b679232 100644
--- a/app-i18n/poedit/metadata.xml
+++ b/app-i18n/poedit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>wxwidgets</herd>

diff --git a/app-i18n/scim-sayura/metadata.xml b/app-i18n/scim-sayura/metadata.xml
index f2b3cea..72cb5fb 100644
--- a/app-i18n/scim-sayura/metadata.xml
+++ b/app-i18n/scim-sayura/metadata.xml
@@ -6,4 +6,3 @@
 This package provides the Sayura Sinhala input method for SCIM.
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-i18n/scim-wijesekera/metadata.xml b/app-i18n/scim-wijesekera/metadata.xml
index 8a085c6..c3aeb5b 100644
--- a/app-i18n/scim-wijesekera/metadata.xml
+++ b/app-i18n/scim-wijesekera/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-i18n/tomoe/metadata.xml b/app-i18n/tomoe/metadata.xml
index 636ea3a..af6df36 100644
--- a/app-i18n/tomoe/metadata.xml
+++ b/app-i18n/tomoe/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-i18n/transifex-client/metadata.xml b/app-i18n/transifex-client/metadata.xml
index efd35c6..c7c47e1 100644
--- a/app-i18n/transifex-client/metadata.xml
+++ b/app-i18n/transifex-client/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-i18n/xvnkb/metadata.xml b/app-i18n/xvnkb/metadata.xml
index 48a1174..a3280db 100644
--- a/app-i18n/xvnkb/metadata.xml
+++ b/app-i18n/xvnkb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cjk</herd>

diff --git a/app-laptop/hdapsd/metadata.xml b/app-laptop/hdapsd/metadata.xml
index c9e1d83..1f2d54d 100644
--- a/app-laptop/hdapsd/metadata.xml
+++ b/app-laptop/hdapsd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/app-laptop/i8kutils/metadata.xml b/app-laptop/i8kutils/metadata.xml
index add522b..bc07e19 100644
--- a/app-laptop/i8kutils/metadata.xml
+++ b/app-laptop/i8kutils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/app-laptop/laptop-mode-tools/metadata.xml b/app-laptop/laptop-mode-tools/metadata.xml
index a757c1c..0799aba 100644
--- a/app-laptop/laptop-mode-tools/metadata.xml
+++ b/app-laptop/laptop-mode-tools/metadata.xml
@@ -10,6 +10,6 @@
 		</maintainer>
 	</upstream>
 	<use>
-		<flag name='scsi'>Adds dependency on sdparm to control non-SATA SCSI drivers</flag>
+		<flag name="scsi">Adds dependency on sdparm to control non-SATA SCSI drivers</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-laptop/prey/metadata.xml b/app-laptop/prey/metadata.xml
index a2c028a..9b7ee45 100644
--- a/app-laptop/prey/metadata.xml
+++ b/app-laptop/prey/metadata.xml
@@ -18,4 +18,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-laptop/tp_smapi/metadata.xml b/app-laptop/tp_smapi/metadata.xml
index 76b59d1..5d98121 100644
--- a/app-laptop/tp_smapi/metadata.xml
+++ b/app-laptop/tp_smapi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/app-leechcraft/lc-blasq/metadata.xml b/app-leechcraft/lc-blasq/metadata.xml
index 8043a57..fe5553e 100644
--- a/app-leechcraft/lc-blasq/metadata.xml
+++ b/app-leechcraft/lc-blasq/metadata.xml
@@ -8,4 +8,4 @@
 	<flag name="spegnersi">Support Flickr service</flag>
 	<flag name="vangog">Support Picasa service</flag>
 </use>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/app-leechcraft/lc-qrosp/metadata.xml b/app-leechcraft/lc-qrosp/metadata.xml
index 0572376..2c857dd 100644
--- a/app-leechcraft/lc-qrosp/metadata.xml
+++ b/app-leechcraft/lc-qrosp/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>leechcraft</herd>
 </pkgmetadata>
-

diff --git a/app-leechcraft/liblaretz/metadata.xml b/app-leechcraft/liblaretz/metadata.xml
index 94bc46f..2219e38 100644
--- a/app-leechcraft/liblaretz/metadata.xml
+++ b/app-leechcraft/liblaretz/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>leechcraft</herd>

diff --git a/app-misc/abook/metadata.xml b/app-misc/abook/metadata.xml
index 0bc3ff4..d749e27 100644
--- a/app-misc/abook/metadata.xml
+++ b/app-misc/abook/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-mail</herd>

diff --git a/app-misc/ca-certificates/metadata.xml b/app-misc/ca-certificates/metadata.xml
index 9f0fc84..e6feee2 100644
--- a/app-misc/ca-certificates/metadata.xml
+++ b/app-misc/ca-certificates/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-  <flag name='cacert'>
+  <flag name="cacert">
     Include root certs from CAcert (http://www.cacert.org/) and
     Software in the Public Interest (http://www.spi-inc.org/)
   </flag>

diff --git a/app-misc/calendar/metadata.xml b/app-misc/calendar/metadata.xml
index 175c868..a0c9932 100644
--- a/app-misc/calendar/metadata.xml
+++ b/app-misc/calendar/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>shell-tools</herd>

diff --git a/app-misc/cstream/metadata.xml b/app-misc/cstream/metadata.xml
index aec6dd2..f83940a 100644
--- a/app-misc/cstream/metadata.xml
+++ b/app-misc/cstream/metadata.xml
@@ -15,7 +15,6 @@ Features:
  - Build-in support for fifos. Example usage is a 'pseudo-device', something that sinks or delivers data at an appropriate rate, but looks like a file, i.e. if you test soundcard software. See the manpage for examples. 
  - Built-in data creation and sink, no more redirection of /dev/null and /dev/zero. These special devices speed varies greatly among operating systems, redirecting from it isn't appropriate benchmarking and a waste of resources anyway. 
  - Accepts 'k', 'm' and 'g' character after number for "kilo, mega, giga" bytes for overall data size limit. 
- - "gcc -Wall" clean source code, serious effort taken to avoid undefined behavior in ANSI C or POSIX, except long long is required. Limiting and reporting works on data amounts > 4 GB.
+ - "gcc -Wall" clean source code, serious effort taken to avoid undefined behavior in ANSI C or POSIX, except long long is required. Limiting and reporting works on data amounts &gt; 4 GB.
 </longdescription>
 </pkgmetadata>
-

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

diff --git a/app-misc/ddccontrol-db/metadata.xml b/app-misc/ddccontrol-db/metadata.xml
index 30e9b3a..e977a34 100644
--- a/app-misc/ddccontrol-db/metadata.xml
+++ b/app-misc/ddccontrol-db/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/app-misc/ddccontrol/metadata.xml b/app-misc/ddccontrol/metadata.xml
index fbe3ac7..1598de6 100644
--- a/app-misc/ddccontrol/metadata.xml
+++ b/app-misc/ddccontrol/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/app-misc/digitemp/metadata.xml b/app-misc/digitemp/metadata.xml
index a1eaad9..5fffefc 100644
--- a/app-misc/digitemp/metadata.xml
+++ b/app-misc/digitemp/metadata.xml
@@ -16,8 +16,8 @@ Counters, DS2409 MicroLAN Coupler (used in 1-wire hubs), and the AAG TAI-8540
 humidity sensor.
 </longdescription>
 <use>
-  <flag name='ds2490'>Build support for the ds2490 sensor</flag>
-  <flag name='ds9097'>Build support for the ds9097 sensor</flag>
-  <flag name='ds9097u'>Build support for the ds9097u sensor</flag>
+  <flag name="ds2490">Build support for the ds2490 sensor</flag>
+  <flag name="ds9097">Build support for the ds9097 sensor</flag>
+  <flag name="ds9097u">Build support for the ds9097u sensor</flag>
 </use>
 </pkgmetadata>

diff --git a/app-misc/dvtm/metadata.xml b/app-misc/dvtm/metadata.xml
index 8a9b49e..ca5f18f 100644
--- a/app-misc/dvtm/metadata.xml
+++ b/app-misc/dvtm/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-misc/emelfm2/metadata.xml b/app-misc/emelfm2/metadata.xml
index d08cba0..e1e6d97 100644
--- a/app-misc/emelfm2/metadata.xml
+++ b/app-misc/emelfm2/metadata.xml
@@ -2,6 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>desktop-misc</herd>
-  <use><flag name='ansi'>Add support for ANSI escape sequences</flag></use>
-  <use><flag name='gtk3'>Use <pkg>x11-libs/gtk:3</pkg> instead of <pkg>x11-libs/gtk:2</pkg></flag></use>
+  <use><flag name="ansi">Add support for ANSI escape sequences</flag></use>
+  <use><flag name="gtk3">Use <pkg>x11-libs/gtk:3</pkg> instead of <pkg>x11-libs/gtk:2</pkg></flag></use>
 </pkgmetadata>

diff --git a/app-misc/evemu/metadata.xml b/app-misc/evemu/metadata.xml
index efa5eb0..157326a 100644
--- a/app-misc/evemu/metadata.xml
+++ b/app-misc/evemu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

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

diff --git a/app-misc/geneweb/metadata.xml b/app-misc/geneweb/metadata.xml
index 48ff7bd..61183f6 100644
--- a/app-misc/geneweb/metadata.xml
+++ b/app-misc/geneweb/metadata.xml
@@ -12,7 +12,7 @@ relationship and consanguinity computing, developed in collaboration with Didier
 Rémy, research Director at INRIA.
 </longdescription>
 <use>
-  <flag name='ocamlopt'>Enable ocamlopt support (<pkg>dev-lang/ocaml</pkg>
+  <flag name="ocamlopt">Enable ocamlopt support (<pkg>dev-lang/ocaml</pkg>
     native code compiler)</flag>
 </use>
 </pkgmetadata>

diff --git a/app-misc/graphlcd-base/metadata.xml b/app-misc/graphlcd-base/metadata.xml
index 5856454..1071090 100644
--- a/app-misc/graphlcd-base/metadata.xml
+++ b/app-misc/graphlcd-base/metadata.xml
@@ -9,7 +9,7 @@
   This package provides Graphical LCD Driver.
 </longdescription>
 <use>
-  <flag name='g15'>Add support for <pkg>app-misc/g15daemon</pkg> driver
+  <flag name="g15">Add support for <pkg>app-misc/g15daemon</pkg> driver
     (e.g. Logitech G15 Keybord)</flag>
 </use>
 </pkgmetadata>

diff --git a/app-misc/hddled/metadata.xml b/app-misc/hddled/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/app-misc/hddled/metadata.xml
+++ b/app-misc/hddled/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-misc/hilite/metadata.xml b/app-misc/hilite/metadata.xml
index 91b41db..4d9e7a6 100644
--- a/app-misc/hilite/metadata.xml
+++ b/app-misc/hilite/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>shell-tools</herd>

diff --git a/app-misc/ignuit/metadata.xml b/app-misc/ignuit/metadata.xml
index e96e35b..91f4e72 100644
--- a/app-misc/ignuit/metadata.xml
+++ b/app-misc/ignuit/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-misc/iguanaIR/metadata.xml b/app-misc/iguanaIR/metadata.xml
index 32917ab..7fe8613 100644
--- a/app-misc/iguanaIR/metadata.xml
+++ b/app-misc/iguanaIR/metadata.xml
@@ -7,4 +7,3 @@
 <name>Joerg Bornkessel</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-misc/irtrans-irclient/metadata.xml b/app-misc/irtrans-irclient/metadata.xml
index 72a97e4..c6a2181 100644
--- a/app-misc/irtrans-irclient/metadata.xml
+++ b/app-misc/irtrans-irclient/metadata.xml
@@ -14,4 +14,3 @@
 <description>Proxying maintainer</description>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-misc/irtrans-irserver/metadata.xml b/app-misc/irtrans-irserver/metadata.xml
index efcfc90..44fa8a3 100644
--- a/app-misc/irtrans-irserver/metadata.xml
+++ b/app-misc/irtrans-irserver/metadata.xml
@@ -13,7 +13,6 @@
 		<description>Proxying maintainer</description>
 		</maintainer>
 	<use>
-		<flag name='mono'>Enable mono support</flag>
+		<flag name="mono">Enable mono support</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/app-misc/jq/metadata.xml b/app-misc/jq/metadata.xml
index 21adb91..b631195 100644
--- a/app-misc/jq/metadata.xml
+++ b/app-misc/jq/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -6,6 +6,6 @@
 		<name>Tim Harder</name>
 	</maintainer>
 	<use>
-		<flag name='oniguruma'>Use dev-libs/oniguruma for regular expression support</flag>
+		<flag name="oniguruma">Use dev-libs/oniguruma for regular expression support</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-misc/lcd-stuff/metadata.xml b/app-misc/lcd-stuff/metadata.xml
index 90b1182..f49cd00 100644
--- a/app-misc/lcd-stuff/metadata.xml
+++ b/app-misc/lcd-stuff/metadata.xml
@@ -14,7 +14,7 @@
   directory and file names based on the title.
 </longdescription>
 <use>
-  <flag name='mpd'>Add support for display of mpd controlled music
+  <flag name="mpd">Add support for display of mpd controlled music
     (<pkg>media-libs/libmpd</pkg>)</flag>
 </use>
 </pkgmetadata>

diff --git a/app-misc/lcd4linux/metadata.xml b/app-misc/lcd4linux/metadata.xml
index cee8d88..7c63416 100644
--- a/app-misc/lcd4linux/metadata.xml
+++ b/app-misc/lcd4linux/metadata.xml
@@ -10,7 +10,7 @@
   fully configurable and supports many data sources, displays and plugins.
 </longdescription>
 <use>
-  <flag name='mpd'>Add support for display of mpd controlled music
+  <flag name="mpd">Add support for display of mpd controlled music
     (<pkg>media-libs/libmpd</pkg>)</flag>
 </use>
 </pkgmetadata>

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

diff --git a/app-misc/ltunify/metadata.xml b/app-misc/ltunify/metadata.xml
index efa5eb0..157326a 100644
--- a/app-misc/ltunify/metadata.xml
+++ b/app-misc/ltunify/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-misc/magneto-loader/metadata.xml b/app-misc/magneto-loader/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/app-misc/magneto-loader/metadata.xml
+++ b/app-misc/magneto-loader/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/app-misc/note/metadata.xml b/app-misc/note/metadata.xml
index 622e71e..9f74f81 100644
--- a/app-misc/note/metadata.xml
+++ b/app-misc/note/metadata.xml
@@ -6,7 +6,7 @@
   <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>
+  <flag name="general">Add support for ascii flatfile backend</flag>
+  <flag name="text">Add support for text backend</flag>
 </use>
 </pkgmetadata>

diff --git a/app-misc/pax-utils/metadata.xml b/app-misc/pax-utils/metadata.xml
index e812a23..20768f7 100644
--- a/app-misc/pax-utils/metadata.xml
+++ b/app-misc/pax-utils/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <longdescription>A suite of ELF tools to aid auditing systems. Contains various ELF related utils for ELF32, ELF64 binaries useful for displaying PaX and security info on a large groups of binary files.</longdescription>
   <use>
-    <flag name='python'>Install a more powerful/faster version of lddtree</flag>
+    <flag name="python">Install a more powerful/faster version of lddtree</flag>
   </use>
 </pkgmetadata>

diff --git a/app-misc/pysmssend/metadata.xml b/app-misc/pysmssend/metadata.xml
index 5e3a61a..77bb27a 100644
--- a/app-misc/pysmssend/metadata.xml
+++ b/app-misc/pysmssend/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-misc/pystopwatch/metadata.xml b/app-misc/pystopwatch/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/app-misc/pystopwatch/metadata.xml
+++ b/app-misc/pystopwatch/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-misc/ranger/metadata.xml b/app-misc/ranger/metadata.xml
index 5cb9dc8..0c3017c 100644
--- a/app-misc/ranger/metadata.xml
+++ b/app-misc/ranger/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-misc/recoll/metadata.xml b/app-misc/recoll/metadata.xml
index ed2d6b0..816ec7e 100644
--- a/app-misc/recoll/metadata.xml
+++ b/app-misc/recoll/metadata.xml
@@ -5,22 +5,22 @@
 	<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>
-	<flag name='dvi'>Index dvi files</flag>
-	<flag name='ics'>Index iCalendar files</flag>
-	<flag name='info'>Index GNU info files</flag>
-	<flag name='inotify'>Use the Linux Kernel notification subsystem for monitoring file alterations in realtime</flag>
-	<flag name='lyx'>Index Latex lyx files</flag>
-	<flag name='msdoc'>Index Microsoft Word documents</flag>
-	<flag name='msppt'>Index Microsoft PowerPoint documents</flag>
-	<flag name='msxls'>Index Microsoft Excel documents</flag>
-	<flag name='pdf'>Index PDF documents</flag>
-	<flag name='rtf'>Index Microsoft RTF documents</flag>
-	<flag name='session'>Stop monitoring file alterations when X11 session terminates</flag>
-	<flag name='sound'>Index audio files</flag>
-	<flag name='tex'>Index TeX files</flag>
-	<flag name='wordperfect'>Index WordPerfect documents</flag>
-	<flag name='xml'>Index several XML-based formats (Abiword, FictionBook, Kword, Office OpenXML, OpenDocument, SVG)</flag>
+	<flag name="camelcase">Enable indexing for camelCase sentences and words</flag>
+	<flag name="chm">Index chm files</flag>
+	<flag name="dvi">Index dvi files</flag>
+	<flag name="ics">Index iCalendar files</flag>
+	<flag name="info">Index GNU info files</flag>
+	<flag name="inotify">Use the Linux Kernel notification subsystem for monitoring file alterations in realtime</flag>
+	<flag name="lyx">Index Latex lyx files</flag>
+	<flag name="msdoc">Index Microsoft Word documents</flag>
+	<flag name="msppt">Index Microsoft PowerPoint documents</flag>
+	<flag name="msxls">Index Microsoft Excel documents</flag>
+	<flag name="pdf">Index PDF documents</flag>
+	<flag name="rtf">Index Microsoft RTF documents</flag>
+	<flag name="session">Stop monitoring file alterations when X11 session terminates</flag>
+	<flag name="sound">Index audio files</flag>
+	<flag name="tex">Index TeX files</flag>
+	<flag name="wordperfect">Index WordPerfect documents</flag>
+	<flag name="xml">Index several XML-based formats (Abiword, FictionBook, Kword, Office OpenXML, OpenDocument, SVG)</flag>
 </use>
 </pkgmetadata>

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

diff --git a/app-misc/slashtime/metadata.xml b/app-misc/slashtime/metadata.xml
index 604e0a4..7303cef 100644
--- a/app-misc/slashtime/metadata.xml
+++ b/app-misc/slashtime/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/app-misc/sleepyhead/metadata.xml b/app-misc/sleepyhead/metadata.xml
index 2d0751e..1c99ee1 100644
--- a/app-misc/sleepyhead/metadata.xml
+++ b/app-misc/sleepyhead/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-misc/specto/metadata.xml b/app-misc/specto/metadata.xml
index a4d359b..8c9d14d 100644
--- a/app-misc/specto/metadata.xml
+++ b/app-misc/specto/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-misc/sphinx/metadata.xml b/app-misc/sphinx/metadata.xml
index fc8b152..b888bc0 100644
--- a/app-misc/sphinx/metadata.xml
+++ b/app-misc/sphinx/metadata.xml
@@ -5,8 +5,8 @@
   <email>graaff@gentoo.org</email>
 </maintainer>
 <use>
-  <flag name='id64'>use 64-bit document and word IDs</flag>
-  <flag name='re2'>use the <pkg>dev-libs/re2</pkg> regular expression library</flag>
-  <flag name='stemmer'>Enable language stemming support</flag>
+  <flag name="id64">use 64-bit document and word IDs</flag>
+  <flag name="re2">use the <pkg>dev-libs/re2</pkg> regular expression library</flag>
+  <flag name="stemmer">Enable language stemming support</flag>
 </use>
 </pkgmetadata>

diff --git a/app-misc/subsurface/metadata.xml b/app-misc/subsurface/metadata.xml
index 84651c1..4aae21b 100644
--- a/app-misc/subsurface/metadata.xml
+++ b/app-misc/subsurface/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>

diff --git a/app-misc/tablix/metadata.xml b/app-misc/tablix/metadata.xml
index 189ede3..e6219b1 100644
--- a/app-misc/tablix/metadata.xml
+++ b/app-misc/tablix/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
-  <flag name='pvm'>Add support for parallel virtual machine
+  <flag name="pvm">Add support for parallel virtual machine
     (<pkg>sys-cluster/pvm</pkg>)</flag>
 </use>
 </pkgmetadata>

diff --git a/app-misc/tasque/metadata.xml b/app-misc/tasque/metadata.xml
index 5ba7d3c..3c06891 100644
--- a/app-misc/tasque/metadata.xml
+++ b/app-misc/tasque/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<herd>dotnet</herd>
 	<use>
-		<flag name='rememberthemilk'>
+		<flag name="rememberthemilk">
 			Allows you to use http://www.rememberthemilk.com/ as your storage backend.
 		</flag>
-		<flag name='hiveminder'>
+		<flag name="hiveminder">
 			Allows you to use http://www.hiveminder.com/ as your storage backend.
 		</flag>
 	</use>

diff --git a/app-misc/towitoko/metadata.xml b/app-misc/towitoko/metadata.xml
index 2bda83b..e31b648 100644
--- a/app-misc/towitoko/metadata.xml
+++ b/app-misc/towitoko/metadata.xml
@@ -5,7 +5,7 @@
   <email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <use>
-  <flag name='moneyplex'>Makes libtowitoko work for the moneyplex home banking
+  <flag name="moneyplex">Makes libtowitoko work for the moneyplex home banking
     software</flag>
 </use>
 </pkgmetadata>

diff --git a/app-misc/utimer/metadata.xml b/app-misc/utimer/metadata.xml
index eaebd02..d1a7b52 100644
--- a/app-misc/utimer/metadata.xml
+++ b/app-misc/utimer/metadata.xml
@@ -15,4 +15,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-misc/worker/metadata.xml b/app-misc/worker/metadata.xml
index dd6a7aa..34e6298 100644
--- a/app-misc/worker/metadata.xml
+++ b/app-misc/worker/metadata.xml
@@ -11,7 +11,7 @@
   (similar to MidnightCommander).
 </longdescription>
 <use>
-  <flag name='avfs'>Enable support for <pkg>sys-fs/avfs</pkg></flag>
-  <flag name='magic'>Add magic file support from <pkg>sys-apps/file</pkg> to automatically detect file types</flag>
+  <flag name="avfs">Enable support for <pkg>sys-fs/avfs</pkg></flag>
+  <flag name="magic">Add magic file support from <pkg>sys-apps/file</pkg> to automatically detect file types</flag>
 </use>
 </pkgmetadata>

diff --git a/app-misc/workrave/metadata.xml b/app-misc/workrave/metadata.xml
index a1694e8..5e2b267 100644
--- a/app-misc/workrave/metadata.xml
+++ b/app-misc/workrave/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>

diff --git a/app-misc/yagtd/metadata.xml b/app-misc/yagtd/metadata.xml
index 81adea6..2590654 100644
--- a/app-misc/yagtd/metadata.xml
+++ b/app-misc/yagtd/metadata.xml
@@ -13,4 +13,3 @@ age-old but perfect method for tracking your stuff, and yaGTD can help you to
 manage efficiently this file. 
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-misc/zygrib/metadata.xml b/app-misc/zygrib/metadata.xml
index f5433d5..ffac4d3 100644
--- a/app-misc/zygrib/metadata.xml
+++ b/app-misc/zygrib/metadata.xml
@@ -5,7 +5,6 @@
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='maps'>Installs additional GSHHS maps for high resolution coastline data and cities</flag>
+		<flag name="maps">Installs additional GSHHS maps for high resolution coastline data and cities</flag>
 	</use>
 </pkgmetadata>
-

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

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

diff --git a/app-mobilephone/freesmee/metadata.xml b/app-mobilephone/freesmee/metadata.xml
index e430c1a..2e1c5d0 100644
--- a/app-mobilephone/freesmee/metadata.xml
+++ b/app-mobilephone/freesmee/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-mobilephone/gammu/metadata.xml b/app-mobilephone/gammu/metadata.xml
index 4b056ab..71834d0 100644
--- a/app-mobilephone/gammu/metadata.xml
+++ b/app-mobilephone/gammu/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
-  <flag name='irda'>Enables infrared support</flag>
+  <flag name="irda">Enables infrared support</flag>
 </use>
 </pkgmetadata>

diff --git a/app-mobilephone/gnokii/metadata.xml b/app-mobilephone/gnokii/metadata.xml
index 6698e29..eded902 100644
--- a/app-mobilephone/gnokii/metadata.xml
+++ b/app-mobilephone/gnokii/metadata.xml
@@ -9,9 +9,9 @@ change calendar entires, send and receive SMS messages and load ring tones
 depending on the phone you have.
 </longdescription>
 <use>
-  <flag name='ical'>Enable support for <pkg>dev-libs/libical</pkg></flag>
-  <flag name='irda'>Enable infrared support</flag>
-  <flag name='sms'>Enable SMS support (build smsd)</flag>
-  <flag name='pcsc-lite'>Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
+  <flag name="ical">Enable support for <pkg>dev-libs/libical</pkg></flag>
+  <flag name="irda">Enable infrared support</flag>
+  <flag name="sms">Enable SMS support (build smsd)</flag>
+  <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/app-mobilephone/gnome-phone-manager/metadata.xml b/app-mobilephone/gnome-phone-manager/metadata.xml
index 075e897..755902a 100644
--- a/app-mobilephone/gnome-phone-manager/metadata.xml
+++ b/app-mobilephone/gnome-phone-manager/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>

diff --git a/app-mobilephone/obexd/metadata.xml b/app-mobilephone/obexd/metadata.xml
index 476857a..253ba12 100644
--- a/app-mobilephone/obexd/metadata.xml
+++ b/app-mobilephone/obexd/metadata.xml
@@ -13,10 +13,9 @@
 		</description>
 	</maintainer>
 	<use>
-		<flag name='nokia'>Add support for Nokia backup
+		<flag name="nokia">Add support for Nokia backup
 		plugin</flag>
-  		<flag name='server'>Enables server installation, it's
+  		<flag name="server">Enables server installation, it's
   		incompatible with obex-data-server provided one</flag>
 	</use>
 </pkgmetadata>
-

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

diff --git a/app-mobilephone/smstools/metadata.xml b/app-mobilephone/smstools/metadata.xml
index eae00d6..30274ef 100644
--- a/app-mobilephone/smstools/metadata.xml
+++ b/app-mobilephone/smstools/metadata.xml
@@ -6,6 +6,6 @@
   <name>Tony Vroon</name>
 </maintainer>
 <use>
-  <flag name='stats'>Enable statistic reporting</flag>
+  <flag name="stats">Enable statistic reporting</flag>
 </use>
 </pkgmetadata>

diff --git a/app-mobilephone/yaps/metadata.xml b/app-mobilephone/yaps/metadata.xml
index 4686d86..9361027 100644
--- a/app-mobilephone/yaps/metadata.xml
+++ b/app-mobilephone/yaps/metadata.xml
@@ -6,6 +6,6 @@
   Yet Another Pager Software (optional with CAPI support).
 </longdescription>
 <use>
-  <flag name='capi'>Enable CAPI support</flag>
+  <flag name="capi">Enable CAPI support</flag>
 </use>
 </pkgmetadata>

diff --git a/app-office/abiword/metadata.xml b/app-office/abiword/metadata.xml
index 62f4bfa..c13e2d9 100644
--- a/app-office/abiword/metadata.xml
+++ b/app-office/abiword/metadata.xml
@@ -3,16 +3,16 @@
 <pkgmetadata>
 <herd>gnome-office</herd>
 <use>
-	<flag name='collab'>Enable collaborative editing plugin</flag>
-	<flag name='goffice'>Enable goffice plugin</flag>
-	<flag name='grammar'>Enable grammar checking via <pkg>dev-libs/link-grammar</pkg></flag>
+	<flag name="collab">Enable collaborative editing plugin</flag>
+	<flag name="goffice">Enable goffice plugin</flag>
+	<flag name="grammar">Enable grammar checking via <pkg>dev-libs/link-grammar</pkg></flag>
 	<flag name="map">Enable world map support through <pkg>media-libs/libchamplain</pkg></flag>
-	<flag name='math'>Enable support for <pkg>x11-libs/gtkmathview</pkg></flag>
-	<flag name='ots'>Enable Text Summarizer plugin</flag>
-	<flag name='plugins'>Enable plugins build (see http://www.abisource.com/wiki/PluginMatrix for more information). If your
+	<flag name="math">Enable support for <pkg>x11-libs/gtkmathview</pkg></flag>
+	<flag name="ots">Enable Text Summarizer plugin</flag>
+	<flag name="plugins">Enable plugins build (see http://www.abisource.com/wiki/PluginMatrix for more information). If your
 		file cannot be opened due lack of support, try enabling this.</flag>
 	<flag name="redland">Enables support redland and raptor libs.</flag>
-	<flag name='thesaurus'>Enable thesaurus support</flag>
-	<flag name='wordperfect'>Enable wordperfect file support via <pkg>app-text/libwpd</pkg></flag>
+	<flag name="thesaurus">Enable thesaurus support</flag>
+	<flag name="wordperfect">Enable wordperfect file support via <pkg>app-text/libwpd</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/app-office/gnumeric/metadata.xml b/app-office/gnumeric/metadata.xml
index 7ff312e..8f58012 100644
--- a/app-office/gnumeric/metadata.xml
+++ b/app-office/gnumeric/metadata.xml
@@ -5,7 +5,7 @@
 <use>
 	<flag name="libgda">Enable database support through
 		<pkg>gnome-extra/libgda</pkg>.</flag>
-	<flag name='python'>Enable python plugin loader.</flag>
-	<flag name='perl'>Enable perl plugin loader.</flag>
+	<flag name="python">Enable python plugin loader.</flag>
+	<flag name="perl">Enable perl plugin loader.</flag>
 </use>
 </pkgmetadata>

diff --git a/app-office/kmymoney/metadata.xml b/app-office/kmymoney/metadata.xml
index cb459ea..4563e65 100644
--- a/app-office/kmymoney/metadata.xml
+++ b/app-office/kmymoney/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>

diff --git a/app-office/lyx/metadata.xml b/app-office/lyx/metadata.xml
index 5fb0e29..0d64a13 100644
--- a/app-office/lyx/metadata.xml
+++ b/app-office/lyx/metadata.xml
@@ -15,23 +15,23 @@
   <description>Proxy Maintainer, CC bugs</description>
 </maintainer>
 <use>
-  <flag name='docbook'>Add support for docbook export</flag>
-  <flag name='dia'>Add support for diagrams (<pkg>app-office/dia</pkg>)</flag>
-  <flag name='dot'>Add support for DOT import (<pkg>media-gfx/graphviz</pkg>)
+  <flag name="docbook">Add support for docbook export</flag>
+  <flag name="dia">Add support for diagrams (<pkg>app-office/dia</pkg>)</flag>
+  <flag name="dot">Add support for DOT import (<pkg>media-gfx/graphviz</pkg>)
     </flag>
-  <flag name='html'>Add support for HTML import</flag>
-  <flag name='monolithic-build'>This should speed up compilation significantly
+  <flag name="html">Add support for HTML import</flag>
+  <flag name="monolithic-build">This should speed up compilation significantly
     when you have enough RAM (&gt; 600 MB)</flag>
-  <flag name='rcs'>Add support for revision control via <pkg>dev-vcs/rcs</pkg>
+  <flag name="rcs">Add support for revision control via <pkg>dev-vcs/rcs</pkg>
     </flag>
-  <flag name='rtf'>Add support for RTF import/export packages</flag>
-  <flag name='gnumeric'>Add support for importing Gnumeric/OpenOffice/MS Excel
+  <flag name="rtf">Add support for RTF import/export packages</flag>
+  <flag name="gnumeric">Add support for importing Gnumeric/OpenOffice/MS Excel
     spreadsheets into LyX.</flag>
-  <flag name='hunspell'>Add support for spellchecking based on hunspell and
+  <flag name="hunspell">Add support for spellchecking based on hunspell and
     reuse system-wide OpenOffice dictionaries. This also enable thesaurus
 	dictionaries not accessible via aspell.</flag>
-  <flag name='aspell'>Add support for aspell spellchecking</flag>
-  <flag name='enchant'>Add support for enchant spellchecking wrapper
+  <flag name="aspell">Add support for aspell spellchecking</flag>
+  <flag name="enchant">Add support for enchant spellchecking wrapper
     (both aspell and hunspell can be used by LyX).</flag>
 </use>
 </pkgmetadata>

diff --git a/app-office/mdbtools/metadata.xml b/app-office/mdbtools/metadata.xml
index 433061b..0b89459 100644
--- a/app-office/mdbtools/metadata.xml
+++ b/app-office/mdbtools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>

diff --git a/app-office/pinpoint/metadata.xml b/app-office/pinpoint/metadata.xml
index ee0a2f2..64407e7 100644
--- a/app-office/pinpoint/metadata.xml
+++ b/app-office/pinpoint/metadata.xml
@@ -8,4 +8,3 @@
 		beautiful images and small amounts of concise text in slides. 
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-office/unoconv/metadata.xml b/app-office/unoconv/metadata.xml
index 2a8b409..0d2d972 100644
--- a/app-office/unoconv/metadata.xml
+++ b/app-office/unoconv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>office</herd>

diff --git a/app-pda/dynamite/metadata.xml b/app-pda/dynamite/metadata.xml
index e551fa2..e64f97b 100644
--- a/app-pda/dynamite/metadata.xml
+++ b/app-pda/dynamite/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>pda</herd>

diff --git a/app-pda/ifuse/metadata.xml b/app-pda/ifuse/metadata.xml
index 413973e..c21e5da 100644
--- a/app-pda/ifuse/metadata.xml
+++ b/app-pda/ifuse/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>pda</herd>
 </pkgmetadata>
-

diff --git a/app-portage/conf-update/metadata.xml b/app-portage/conf-update/metadata.xml
index 6370686..a69ac92 100644
--- a/app-portage/conf-update/metadata.xml
+++ b/app-portage/conf-update/metadata.xml
@@ -14,7 +14,7 @@ conf-update es una herramienta basada en curses para el sistema
 portage de Gentoo Linux
 </longdescription>
 <use>
-  <flag name='colordiff'>Use colors when displaying diffs
+  <flag name="colordiff">Use colors when displaying diffs
     (<pkg>app-misc/colordiff</pkg>)</flag>
 </use>
 </pkgmetadata>

diff --git a/app-portage/deltup/metadata.xml b/app-portage/deltup/metadata.xml
index cbbc959..be71b71 100644
--- a/app-portage/deltup/metadata.xml
+++ b/app-portage/deltup/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>

diff --git a/app-portage/demerge/metadata.xml b/app-portage/demerge/metadata.xml
index b03def1..4add8de 100644
--- a/app-portage/demerge/metadata.xml
+++ b/app-portage/demerge/metadata.xml
@@ -8,4 +8,3 @@
 demerge makes it easy to revert to previous installation states.
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-portage/gpytage/metadata.xml b/app-portage/gpytage/metadata.xml
index 2b0a470..39d9baa 100644
--- a/app-portage/gpytage/metadata.xml
+++ b/app-portage/gpytage/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Brian Dolbec</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-portage/layman/metadata.xml b/app-portage/layman/metadata.xml
index d89c415..27be816 100644
--- a/app-portage/layman/metadata.xml
+++ b/app-portage/layman/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>tools-portage</herd>

diff --git a/app-portage/pfl/metadata.xml b/app-portage/pfl/metadata.xml
index d18909e..5da7bfd 100644
--- a/app-portage/pfl/metadata.xml
+++ b/app-portage/pfl/metadata.xml
@@ -12,6 +12,6 @@
 		</maintainer>
 	</upstream>
 	<use>
-		<flag name='network-cron'>Adds a cron job which does a weekly submit of the package database</flag>
+		<flag name="network-cron">Adds a cron job which does a weekly submit of the package database</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-shells/bash/metadata.xml b/app-shells/bash/metadata.xml
index 8598dc9..a35daa8 100644
--- a/app-shells/bash/metadata.xml
+++ b/app-shells/bash/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-  <flag name='bashlogger'>Log ALL commands typed into bash; should ONLY be
+  <flag name="bashlogger">Log ALL commands typed into bash; should ONLY be
     used in restricted environments such as honeypots</flag>
-  <flag name='mem-scramble'>Build with custom malloc/free overwriting allocated/freed memory</flag>
-  <flag name='net'>Enable /dev/tcp/host/port redirection</flag>
-  <flag name='plugins'>Add support for loading builtins at runtime via
+  <flag name="mem-scramble">Build with custom malloc/free overwriting allocated/freed memory</flag>
+  <flag name="net">Enable /dev/tcp/host/port redirection</flag>
+  <flag name="plugins">Add support for loading builtins at runtime via
     'enable'</flag>
 </use>
 <upstream>

diff --git a/app-shells/ccsh/metadata.xml b/app-shells/ccsh/metadata.xml
index cda1906..fc63ecc 100644
--- a/app-shells/ccsh/metadata.xml
+++ b/app-shells/ccsh/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-shells/scsh-install-lib/metadata.xml b/app-shells/scsh-install-lib/metadata.xml
index 41e2595..5a56f6e 100644
--- a/app-shells/scsh-install-lib/metadata.xml
+++ b/app-shells/scsh-install-lib/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>scheme</herd>
 <use>
-  <flag name='scsh'>Use a non-FHS directory layout</flag>
+  <flag name="scsh">Use a non-FHS directory layout</flag>
 </use>
 </pkgmetadata>

diff --git a/app-shells/shish/metadata.xml b/app-shells/shish/metadata.xml
index b568607..8205b2a 100644
--- a/app-shells/shish/metadata.xml
+++ b/app-shells/shish/metadata.xml
@@ -5,6 +5,6 @@
   <email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <use>
-  <flag name='diet'>Use <pkg>dev-libs/dietlibc</pkg></flag>
+  <flag name="diet">Use <pkg>dev-libs/dietlibc</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/app-shells/z/metadata.xml b/app-shells/z/metadata.xml
index f218e0f..3a901a8 100644
--- a/app-shells/z/metadata.xml
+++ b/app-shells/z/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-text/an/metadata.xml b/app-text/an/metadata.xml
index f24dead..dcb367a 100644
--- a/app-text/an/metadata.xml
+++ b/app-text/an/metadata.xml
@@ -6,4 +6,3 @@
   <name>Jeroen Roovers</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-text/crf++/metadata.xml b/app-text/crf++/metadata.xml
index 8142ace..83e476c 100644
--- a/app-text/crf++/metadata.xml
+++ b/app-text/crf++/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-text/crm114/metadata.xml b/app-text/crm114/metadata.xml
index 0a3be01..60f90ea 100644
--- a/app-text/crm114/metadata.xml
+++ b/app-text/crm114/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>shell-tools</herd>

diff --git a/app-text/dblatex/metadata.xml b/app-text/dblatex/metadata.xml
index fd1e6ca..83266c0 100644
--- a/app-text/dblatex/metadata.xml
+++ b/app-text/dblatex/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>proxy-maintainers</herd>

diff --git a/app-text/docbook-sgml-utils/metadata.xml b/app-text/docbook-sgml-utils/metadata.xml
index 506295e..9c72760 100644
--- a/app-text/docbook-sgml-utils/metadata.xml
+++ b/app-text/docbook-sgml-utils/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
   <use>
-    <flag name='jadetex'>Add support for <pkg>app-text/jadetex</pkg>
+    <flag name="jadetex">Add support for <pkg>app-text/jadetex</pkg>
     (for processing tex files produced by the TeX backend of
     Jade)</flag>
   </use>

diff --git a/app-text/dvipsk/metadata.xml b/app-text/dvipsk/metadata.xml
index 709c45b..4c5b18f 100644
--- a/app-text/dvipsk/metadata.xml
+++ b/app-text/dvipsk/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Alexis Ballier</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-text/gocr/metadata.xml b/app-text/gocr/metadata.xml
index a35dcc4..e207110 100644
--- a/app-text/gocr/metadata.xml
+++ b/app-text/gocr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>tex</herd>

diff --git a/app-text/groonga-normalizer-mysql/metadata.xml b/app-text/groonga-normalizer-mysql/metadata.xml
index c477344..c849a52 100644
--- a/app-text/groonga-normalizer-mysql/metadata.xml
+++ b/app-text/groonga-normalizer-mysql/metadata.xml
@@ -5,4 +5,3 @@
 <email>grknight@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-text/groonga/metadata.xml b/app-text/groonga/metadata.xml
index 606f8d9..393017e 100644
--- a/app-text/groonga/metadata.xml
+++ b/app-text/groonga/metadata.xml
@@ -20,4 +20,3 @@
    <flag name="zeromq">Enable <pkg>net-libs/zeromq</pkg> used for suggestion</flag>
 </use>
 </pkgmetadata>
-

diff --git a/app-text/gtranslator/metadata.xml b/app-text/gtranslator/metadata.xml
index 10bf6a4..cb4aa70 100644
--- a/app-text/gtranslator/metadata.xml
+++ b/app-text/gtranslator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>

diff --git a/app-text/hnb/metadata.xml b/app-text/hnb/metadata.xml
index fb6b465..9bd50e3 100644
--- a/app-text/hnb/metadata.xml
+++ b/app-text/hnb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-text/htmltidy/metadata.xml b/app-text/htmltidy/metadata.xml
index beb3576..c651ea7 100644
--- a/app-text/htmltidy/metadata.xml
+++ b/app-text/htmltidy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-text/hyperestraier/metadata.xml b/app-text/hyperestraier/metadata.xml
index 31c2aab..fab2b82 100644
--- a/app-text/hyperestraier/metadata.xml
+++ b/app-text/hyperestraier/metadata.xml
@@ -6,7 +6,7 @@
   <email>hattya@gentoo.org</email>
 </maintainer>
 <use>
-  <flag name='mecab'>Enable <pkg>app-text/mecab</pkg> support
+  <flag name="mecab">Enable <pkg>app-text/mecab</pkg> support
     for Estraier</flag>
 </use>
 </pkgmetadata>

diff --git a/app-text/iso-codes/metadata.xml b/app-text/iso-codes/metadata.xml
index 464d8fa..e98e185 100644
--- a/app-text/iso-codes/metadata.xml
+++ b/app-text/iso-codes/metadata.xml
@@ -8,4 +8,3 @@
 		translations in gettext .po form.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-text/keepnote/metadata.xml b/app-text/keepnote/metadata.xml
index 87c0dfd..514cf72 100644
--- a/app-text/keepnote/metadata.xml
+++ b/app-text/keepnote/metadata.xml
@@ -20,4 +20,3 @@
 		retrieve any note for later reference.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-text/lcdf-typetools/metadata.xml b/app-text/lcdf-typetools/metadata.xml
index 6ea4b72..6b0490c 100644
--- a/app-text/lcdf-typetools/metadata.xml
+++ b/app-text/lcdf-typetools/metadata.xml
@@ -13,7 +13,7 @@
   formerly distributed as part of a different package (mminstance).
 </longdescription>
 <use>
-  <flag name='kpathsea'>Enable integration with kpathsea search library
+  <flag name="kpathsea">Enable integration with kpathsea search library
     (TeX related)</flag>
 </use>
 </pkgmetadata>

diff --git a/app-text/liblangtag/metadata.xml b/app-text/liblangtag/metadata.xml
index d882101..8146c52 100644
--- a/app-text/liblangtag/metadata.xml
+++ b/app-text/liblangtag/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>office</herd>

diff --git a/app-text/llpp/metadata.xml b/app-text/llpp/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/app-text/llpp/metadata.xml
+++ b/app-text/llpp/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/app-text/lodgeit/metadata.xml b/app-text/lodgeit/metadata.xml
index c7fc072..bfa84d1 100644
--- a/app-text/lodgeit/metadata.xml
+++ b/app-text/lodgeit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/app-text/mathtex/metadata.xml b/app-text/mathtex/metadata.xml
index 0722c89..4900481 100644
--- a/app-text/mathtex/metadata.xml
+++ b/app-text/mathtex/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Manuel Rüger</name>
 	</maintainer>
 	<use>
-		<flag name='png'>Generate png images by default instead of gif</flag>
+		<flag name="png">Generate png images by default instead of gif</flag>
 	</use>
 	<longdescription>MathTeX parses a LaTeX math expression and immediately emits 
 	the corresponding gif (or png) image.  It can be used as cgi program to embed

diff --git a/app-text/mecab/metadata.xml b/app-text/mecab/metadata.xml
index b66c587..ed7f2d4 100644
--- a/app-text/mecab/metadata.xml
+++ b/app-text/mecab/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 53b35c2..4096085 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -9,4 +9,3 @@
 	<flag name="openssl">Use dev-libs/openssl crypto backend</flag>
 </use>
 </pkgmetadata>
-

diff --git a/app-text/odt2txt/metadata.xml b/app-text/odt2txt/metadata.xml
index 02dc900..be1fa93 100644
--- a/app-text/odt2txt/metadata.xml
+++ b/app-text/odt2txt/metadata.xml
@@ -10,4 +10,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-text/pdf2djvu/metadata.xml b/app-text/pdf2djvu/metadata.xml
index 091263a..43d3303 100644
--- a/app-text/pdf2djvu/metadata.xml
+++ b/app-text/pdf2djvu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>printing</herd>

diff --git a/app-text/poppler/metadata.xml b/app-text/poppler/metadata.xml
index 67846d6..2c2e86c 100644
--- a/app-text/poppler/metadata.xml
+++ b/app-text/poppler/metadata.xml
@@ -8,8 +8,8 @@
 	<name>Maciej Mrozowski</name>
 </maintainer>
 <use>
-	<flag name='introspection'>Enable GObject introspection.</flag>
-	<flag name='utils'>Install command-line PDF converters and various utilities.</flag>
+	<flag name="introspection">Enable GObject introspection.</flag>
+	<flag name="utils">Install command-line PDF converters and various utilities.</flag>
 </use>
 <slots>
 	<subslots>Reflects ABI compatibility of libpoppler.so only,

diff --git a/app-text/ps2eps/metadata.xml b/app-text/ps2eps/metadata.xml
index 8c2230e..7898eff 100644
--- a/app-text/ps2eps/metadata.xml
+++ b/app-text/ps2eps/metadata.xml
@@ -11,4 +11,3 @@
 		 from one-page Postscript documents
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-text/ps2pkm/metadata.xml b/app-text/ps2pkm/metadata.xml
index 709c45b..4c5b18f 100644
--- a/app-text/ps2pkm/metadata.xml
+++ b/app-text/ps2pkm/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Alexis Ballier</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/app-text/sary/metadata.xml b/app-text/sary/metadata.xml
index 14ee11b..ef93e4b 100644
--- a/app-text/sary/metadata.xml
+++ b/app-text/sary/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/app-text/scrollkeeper-dtd/metadata.xml b/app-text/scrollkeeper-dtd/metadata.xml
index 28f8905..341ceba 100644
--- a/app-text/scrollkeeper-dtd/metadata.xml
+++ b/app-text/scrollkeeper-dtd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>

diff --git a/app-text/skribe/metadata.xml b/app-text/skribe/metadata.xml
index e2d37eb..08fe6cd 100644
--- a/app-text/skribe/metadata.xml
+++ b/app-text/skribe/metadata.xml
@@ -8,4 +8,3 @@
 	reports, API documentations, etc. 
 </longdescription>
 </pkgmetadata>
-

diff --git a/app-text/texlive/metadata.xml b/app-text/texlive/metadata.xml
index 8ab8b8f..0d7a5f3 100644
--- a/app-text/texlive/metadata.xml
+++ b/app-text/texlive/metadata.xml
@@ -3,44 +3,44 @@
 <pkgmetadata>
 <herd>tex</herd>
 <use>
-  <flag name='context'>Add support for the ConTeXt format
+  <flag name="context">Add support for the ConTeXt format
     (<pkg>dev-texlive/texlive-context</pkg>)</flag>
-  <flag name='detex'>Add support for <pkg>dev-tex/detex</pkg>, a filter program
+  <flag name="detex">Add support for <pkg>dev-tex/detex</pkg>, a filter program
 	  that removes the LaTeX (or TeX) control sequences</flag>
-  <flag name='dvi2tty'>Add support for <pkg>dev-tex/dvi2tty</pkg> to preview
+  <flag name="dvi2tty">Add support for <pkg>dev-tex/dvi2tty</pkg> to preview
 	  dvi-files on text-only devices</flag>
-  <flag name='dvipdfm'>Add support for <pkg>app-text/dvipdfm</pkg> to convert
+  <flag name="dvipdfm">Add support for <pkg>app-text/dvipdfm</pkg> to convert
 	  DVI files to PDF</flag>
-  <flag name='epspdf'>Add support for <pkg>app-text/epspdf</pkg>, a tool for converting [e]ps files to pdf.</flag>
-  <flag name='extra'>Add support for extra TeXLive packages</flag>
-  <flag name='games'>Add typesetting support for games (chess, etc.)
+  <flag name="epspdf">Add support for <pkg>app-text/epspdf</pkg>, a tool for converting [e]ps files to pdf.</flag>
+  <flag name="extra">Add support for extra TeXLive packages</flag>
+  <flag name="games">Add typesetting support for games (chess, etc.)
     (<pkg>dev-texlive/texlive-games</pkg>)</flag>
-  <flag name='graphics'>Add support for several graphics packages
+  <flag name="graphics">Add support for several graphics packages
     (pgf, tikz,...)</flag>
-  <flag name='humanities'>Add LaTeX support for the humanities
+  <flag name="humanities">Add LaTeX support for the humanities
     (<pkg>dev-texlive/texlive-humanities</pkg>)</flag>
-  <flag name='jadetex'>Add support for <pkg>app-text/jadetex</pkg>
+  <flag name="jadetex">Add support for <pkg>app-text/jadetex</pkg>
     (for processing tex files produced by the TeX backend of Jade)</flag>
-  <flag name='luatex'>Add extra support for luatex</flag>
-  <flag name='metapost'>Add support for metapost: A tool for creating graphics in scalable PostScript.</flag>
-  <flag name='music'>Add support for music typesetting
+  <flag name="luatex">Add extra support for luatex</flag>
+  <flag name="metapost">Add support for metapost: A tool for creating graphics in scalable PostScript.</flag>
+  <flag name="music">Add support for music typesetting
     (<pkg>dev-texlive/texlive-music</pkg>)</flag>
-  <flag name='omega'>Add omega packages
+  <flag name="omega">Add omega packages
     (<pkg>dev-texlive/texlive-omega</pkg>)</flag>
-  <flag name='pdfannotextractor'>Add <pkg>dev-tex/pdfannotextractor</pkg> support, for extracting annotations from PDF files.</flag>
-  <flag name='pstricks'>Add pstricks packages
+  <flag name="pdfannotextractor">Add <pkg>dev-tex/pdfannotextractor</pkg> support, for extracting annotations from PDF files.</flag>
+  <flag name="pstricks">Add pstricks packages
     (<pkg>dev-texlive/texlive-pstricks</pkg>)</flag>
-  <flag name='publishers'>Add support for publishers
+  <flag name="publishers">Add support for publishers
     (<pkg>dev-texlive/texlive-publishers</pkg>)</flag>
-  <flag name='science'>Add typesetting support for natural and computer
+  <flag name="science">Add typesetting support for natural and computer
     sciences (<pkg>dev-texlive/texlive-science</pkg>)</flag>
-  <flag name='tex4ht'>Add support for <pkg>dev-tex/tex4ht</pkg>
+  <flag name="tex4ht">Add support for <pkg>dev-tex/tex4ht</pkg>
     (for converting (La)TeX to (X)HTML, XML and OO.org)</flag>
-  <flag name='texi2html'>Add support for <pkg>app-text/texi2html</pkg>
+  <flag name="texi2html">Add support for <pkg>app-text/texi2html</pkg>
 	  which converts texi files to HTML.</flag>
-  <flag name='xetex'>Add support for XeTeX macros
+  <flag name="xetex">Add support for XeTeX macros
     (<pkg>dev-texlive/texlive-xetex</pkg>)</flag>
-  <flag name='xindy'>Add support for <pkg>app-text/xindy</pkg>, a flexible
+  <flag name="xindy">Add support for <pkg>app-text/xindy</pkg>, a flexible
 	  indexing system</flag>
 </use>
 </pkgmetadata>

diff --git a/app-text/tofrodos/metadata.xml b/app-text/tofrodos/metadata.xml
index d67ff16..012d9f1 100644
--- a/app-text/tofrodos/metadata.xml
+++ b/app-text/tofrodos/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/app-text/wklej/metadata.xml b/app-text/wklej/metadata.xml
index 68cf499..2dc70c2 100644
--- a/app-text/wklej/metadata.xml
+++ b/app-text/wklej/metadata.xml
@@ -6,7 +6,7 @@
 	<name>Amadeusz Żołnowski</name>
 </maintainer>
 <use>
-	<flag name='vim'>Install the vim plugin allowing to paste
+	<flag name="vim">Install the vim plugin allowing to paste
 		through ':Wklej'.</flag>
 </use>
 </pkgmetadata>

diff --git a/app-text/wv/metadata.xml b/app-text/wv/metadata.xml
index dcd7c01..67ba29b 100644
--- a/app-text/wv/metadata.xml
+++ b/app-text/wv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>

diff --git a/app-text/xlhtml/metadata.xml b/app-text/xlhtml/metadata.xml
index 85226a0..2f41320 100644
--- a/app-text/xlhtml/metadata.xml
+++ b/app-text/xlhtml/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/app-text/yagf/metadata.xml b/app-text/yagf/metadata.xml
index 784a59b..af56acd 100644
--- a/app-text/yagf/metadata.xml
+++ b/app-text/yagf/metadata.xml
@@ -24,7 +24,7 @@
 		the online help for more details).
 	</longdescription>
 	<use>
-		<flag name='cuneiform'>Enable support for the <pkg>app-text/cuneiform</pkg> OCR engine.</flag>
-		<flag name='tesseract'>Enable support for the <pkg>app-text/tesseract</pkg> OCR engine.</flag>
+		<flag name="cuneiform">Enable support for the <pkg>app-text/cuneiform</pkg> OCR engine.</flag>
+		<flag name="tesseract">Enable support for the <pkg>app-text/tesseract</pkg> OCR engine.</flag>
 	</use>
 </pkgmetadata>

diff --git a/app-text/zathura-meta/metadata.xml b/app-text/zathura-meta/metadata.xml
index a023953..b985ff9 100644
--- a/app-text/zathura-meta/metadata.xml
+++ b/app-text/zathura-meta/metadata.xml
@@ -10,7 +10,7 @@
     <name>Michael Weber</name>
   </maintainer>
   <use>
-    <flag name='cb'>Install plug-in for ComicBook support</flag>
+    <flag name="cb">Install plug-in for ComicBook support</flag>
   </use>
   <upstream>
     <maintainer status="active">

diff --git a/app-text/zathura/metadata.xml b/app-text/zathura/metadata.xml
index 9b36a05..e39ff90 100644
--- a/app-text/zathura/metadata.xml
+++ b/app-text/zathura/metadata.xml
@@ -10,8 +10,8 @@
     <name>Michael Weber</name>
   </maintainer>
   <use>
-	<flag name='magic'>Use libmagic to determine mimetypes</flag>
-	<flag name='synctex'>Use libsynctex to get latex codeline from pdf</flag>
+	<flag name="magic">Use libmagic to determine mimetypes</flag>
+	<flag name="synctex">Use libsynctex to get latex codeline from pdf</flag>
   </use>
   <upstream>
     <maintainer status="active">

diff --git a/app-vim/cctree/metadata.xml b/app-vim/cctree/metadata.xml
index 7508b26..2e444c6 100644
--- a/app-vim/cctree/metadata.xml
+++ b/app-vim/cctree/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>

diff --git a/app-vim/colorv/metadata.xml b/app-vim/colorv/metadata.xml
index 386ec8b..d760cd8 100644
--- a/app-vim/colorv/metadata.xml
+++ b/app-vim/colorv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>

diff --git a/app-vim/matrix/metadata.xml b/app-vim/matrix/metadata.xml
index d46a2da..a641bbd 100644
--- a/app-vim/matrix/metadata.xml
+++ b/app-vim/matrix/metadata.xml
@@ -7,4 +7,3 @@
 		symbols seen in the Matrix.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-vim/neocomplcache/metadata.xml b/app-vim/neocomplcache/metadata.xml
index dd4d5e6..78c83b3 100644
--- a/app-vim/neocomplcache/metadata.xml
+++ b/app-vim/neocomplcache/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>vim</herd>

diff --git a/app-vim/nerdcommenter/metadata.xml b/app-vim/nerdcommenter/metadata.xml
index c7b901f..d221a8d 100644
--- a/app-vim/nerdcommenter/metadata.xml
+++ b/app-vim/nerdcommenter/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>vim</herd>
 </pkgmetadata>
-

diff --git a/app-vim/perl-support/metadata.xml b/app-vim/perl-support/metadata.xml
index f149eed..dd8ad5f 100644
--- a/app-vim/perl-support/metadata.xml
+++ b/app-vim/perl-support/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>

diff --git a/app-vim/pyclewn/metadata.xml b/app-vim/pyclewn/metadata.xml
index 23aecb1..4987491 100644
--- a/app-vim/pyclewn/metadata.xml
+++ b/app-vim/pyclewn/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>vim</herd>

diff --git a/app-vim/ri-browser/metadata.xml b/app-vim/ri-browser/metadata.xml
index c7b901f..d221a8d 100644
--- a/app-vim/ri-browser/metadata.xml
+++ b/app-vim/ri-browser/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>vim</herd>
 </pkgmetadata>
-

diff --git a/app-vim/salt-vim/metadata.xml b/app-vim/salt-vim/metadata.xml
index 371f108..df7ea02 100644
--- a/app-vim/salt-vim/metadata.xml
+++ b/app-vim/salt-vim/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>

diff --git a/app-vim/slimv/metadata.xml b/app-vim/slimv/metadata.xml
index 46c8b91..c9ec462 100644
--- a/app-vim/slimv/metadata.xml
+++ b/app-vim/slimv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>

diff --git a/app-vim/splice/metadata.xml b/app-vim/splice/metadata.xml
index 973257e..ec4a0e2 100644
--- a/app-vim/splice/metadata.xml
+++ b/app-vim/splice/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>

diff --git a/app-vim/taglist/metadata.xml b/app-vim/taglist/metadata.xml
index 73a739b..ebae36d 100644
--- a/app-vim/taglist/metadata.xml
+++ b/app-vim/taglist/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>

diff --git a/app-vim/tt2-syntax/metadata.xml b/app-vim/tt2-syntax/metadata.xml
index c7b901f..d221a8d 100644
--- a/app-vim/tt2-syntax/metadata.xml
+++ b/app-vim/tt2-syntax/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>vim</herd>
 </pkgmetadata>
-

diff --git a/app-vim/udev-syntax/metadata.xml b/app-vim/udev-syntax/metadata.xml
index d62456a..0997f5a 100644
--- a/app-vim/udev-syntax/metadata.xml
+++ b/app-vim/udev-syntax/metadata.xml
@@ -6,4 +6,3 @@
 		Vim syntax highlighting for udev.rules files.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-vim/vim-spell-cs/metadata.xml b/app-vim/vim-spell-cs/metadata.xml
index 403c997..403686e 100644
--- a/app-vim/vim-spell-cs/metadata.xml
+++ b/app-vim/vim-spell-cs/metadata.xml
@@ -17,4 +17,3 @@
 		iso-8859-2 a UTF-8.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-vim/vim-spell-da/metadata.xml b/app-vim/vim-spell-da/metadata.xml
index 2ad91c4..9d3dcdc 100644
--- a/app-vim/vim-spell-da/metadata.xml
+++ b/app-vim/vim-spell-da/metadata.xml
@@ -7,4 +7,3 @@
 		latin-1.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-vim/vim-spell-en/metadata.xml b/app-vim/vim-spell-en/metadata.xml
index 1daaf6a..c80cce1 100644
--- a/app-vim/vim-spell-en/metadata.xml
+++ b/app-vim/vim-spell-en/metadata.xml
@@ -7,4 +7,3 @@
 		latin-1 and ASCII.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-vim/vim-spell-pl/metadata.xml b/app-vim/vim-spell-pl/metadata.xml
index 9b8af51..5ea8fd8 100644
--- a/app-vim/vim-spell-pl/metadata.xml
+++ b/app-vim/vim-spell-pl/metadata.xml
@@ -7,4 +7,3 @@
 		ISO-8859-2 and CP1250.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-vim/vim-spell-ru/metadata.xml b/app-vim/vim-spell-ru/metadata.xml
index 8f8f7ad..c0b306f 100644
--- a/app-vim/vim-spell-ru/metadata.xml
+++ b/app-vim/vim-spell-ru/metadata.xml
@@ -11,4 +11,3 @@
 		Поддерживаемые кодировки UTF-8, koi8-r and cp1251.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/app-vim/vimclojure/metadata.xml b/app-vim/vimclojure/metadata.xml
index 3f30c04..320a2b6 100644
--- a/app-vim/vimclojure/metadata.xml
+++ b/app-vim/vimclojure/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/app-vim/vimpress/metadata.xml b/app-vim/vimpress/metadata.xml
index 2325539..8bbe5fc 100644
--- a/app-vim/vimpress/metadata.xml
+++ b/app-vim/vimpress/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>vim</herd>

diff --git a/dev-ada/asis-gcc/metadata.xml b/dev-ada/asis-gcc/metadata.xml
index 6f0393c..8d559ac 100644
--- a/dev-ada/asis-gcc/metadata.xml
+++ b/dev-ada/asis-gcc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ada</herd>

diff --git a/dev-cpp/gstreamermm/metadata.xml b/dev-cpp/gstreamermm/metadata.xml
index 0a65f18..a8318de 100644
--- a/dev-cpp/gstreamermm/metadata.xml
+++ b/dev-cpp/gstreamermm/metadata.xml
@@ -7,4 +7,3 @@
     <name>Gilles Dartiguelongue</name>
   </maintainer>
 </pkgmetadata>
-

diff --git a/dev-cpp/gtkmm-utils/metadata.xml b/dev-cpp/gtkmm-utils/metadata.xml
index 30bc9d0..e0575fe 100644
--- a/dev-cpp/gtkmm-utils/metadata.xml
+++ b/dev-cpp/gtkmm-utils/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-cpp/gtksourceviewmm/metadata.xml b/dev-cpp/gtksourceviewmm/metadata.xml
index 3d42796..cd895ab 100644
--- a/dev-cpp/gtksourceviewmm/metadata.xml
+++ b/dev-cpp/gtksourceviewmm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome-mm</herd>

diff --git a/dev-cpp/libxmlpp/metadata.xml b/dev-cpp/libxmlpp/metadata.xml
index bde0a3b..22b19f9 100644
--- a/dev-cpp/libxmlpp/metadata.xml
+++ b/dev-cpp/libxmlpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome-mm</herd>

diff --git a/dev-cpp/lucene++/metadata.xml b/dev-cpp/lucene++/metadata.xml
index 06ee9b5..cde6f19 100644
--- a/dev-cpp/lucene++/metadata.xml
+++ b/dev-cpp/lucene++/metadata.xml
@@ -9,4 +9,3 @@
 		<remote-id type="github">luceneplusplus/luceneplusplus</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-cpp/mm-common/metadata.xml b/dev-cpp/mm-common/metadata.xml
index 0c3fdbb..57c9d9c 100644
--- a/dev-cpp/mm-common/metadata.xml
+++ b/dev-cpp/mm-common/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>gnome-mm</herd>
 </pkgmetadata>
-

diff --git a/dev-cpp/pangomm/metadata.xml b/dev-cpp/pangomm/metadata.xml
index 0c3fdbb..57c9d9c 100644
--- a/dev-cpp/pangomm/metadata.xml
+++ b/dev-cpp/pangomm/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>gnome-mm</herd>
 </pkgmetadata>
-

diff --git a/dev-cpp/rudiments/metadata.xml b/dev-cpp/rudiments/metadata.xml
index 3f0771b..2bf2ef8 100644
--- a/dev-cpp/rudiments/metadata.xml
+++ b/dev-cpp/rudiments/metadata.xml
@@ -9,6 +9,6 @@
 		expressions, semaphores and signal handling.
 	</longdescription>
 	<upstream>
-		<remote-id type='sourceforge'>rudiments</remote-id>
+		<remote-id type="sourceforge">rudiments</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-cpp/websocketpp/metadata.xml b/dev-cpp/websocketpp/metadata.xml
index 3268b5e..ec75bd4 100644
--- a/dev-cpp/websocketpp/metadata.xml
+++ b/dev-cpp/websocketpp/metadata.xml
@@ -12,4 +12,3 @@
 		<remote-id type="github">zaphoyd/websocketpp</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-db/apgdiff/metadata.xml b/dev-db/apgdiff/metadata.xml
index 75a6940..bd7fbc0 100644
--- a/dev-db/apgdiff/metadata.xml
+++ b/dev-db/apgdiff/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>

diff --git a/dev-db/barman/metadata.xml b/dev-db/barman/metadata.xml
index 0d7a928..bc03dd8 100644
--- a/dev-db/barman/metadata.xml
+++ b/dev-db/barman/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-db/datadraw/metadata.xml b/dev-db/datadraw/metadata.xml
index d2893a9..8adb8b4 100644
--- a/dev-db/datadraw/metadata.xml
+++ b/dev-db/datadraw/metadata.xml
@@ -13,4 +13,3 @@
 DataDraw is a feature rich database generator for high performance C applications. DataDraw gives your C application a high performance object-oriented framework at speeds that beat hand coded C.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-db/db-je/metadata.xml b/dev-db/db-je/metadata.xml
index 59b15e8..00f5698 100644
--- a/dev-db/db-je/metadata.xml
+++ b/dev-db/db-je/metadata.xml
@@ -7,4 +7,3 @@
 	</maintainer>
 <herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-db/hyperdex/metadata.xml b/dev-db/hyperdex/metadata.xml
index f90563e..24cbb90 100644
--- a/dev-db/hyperdex/metadata.xml
+++ b/dev-db/hyperdex/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Patrick Lauer</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-db/m17n-contrib/metadata.xml b/dev-db/m17n-contrib/metadata.xml
index 2896f95..04dbcb7 100644
--- a/dev-db/m17n-contrib/metadata.xml
+++ b/dev-db/m17n-contrib/metadata.xml
@@ -6,4 +6,3 @@
 The m17n-contrib is a collection of contributed works to be used with the m17n library.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-db/mariadb-galera/metadata.xml b/dev-db/mariadb-galera/metadata.xml
index ecc7af5..fbb57c9 100644
--- a/dev-db/mariadb-galera/metadata.xml
+++ b/dev-db/mariadb-galera/metadata.xml
@@ -12,23 +12,23 @@ dev-db/mysql
 dev-db/mariadb
 -->
 <use>
-  <flag name='client-libs'>Build the libmysqlclient libraries</flag>
-  <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+  <flag name="client-libs">Build the libmysqlclient libraries</flag>
+  <flag name="embedded">Build embedded server (libmysqld)</flag>
+  <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
-  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='libressl'>Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
-  <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
-  <flag name='openssl'>Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
-  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
-  <flag name='server'>Build the server program</flag>
-  <flag name='sst-rsync'>Add tools needed to support the rsync SST method</flag>
-  <flag name='sst-xtrabackup'>Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag>
+  <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
+  <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
+  <flag name="oqgraph">Add support for the Open Query GRAPH engine</flag>
+  <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
+  <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
+  <flag name="server">Build the server program</flag>
+  <flag name="sst-rsync">Add tools needed to support the rsync SST method</flag>
+  <flag name="sst-xtrabackup">Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
-  <flag name='test'>Install upstream testsuites for end use.</flag>
-  <flag name='tokudb'>Add support for TokuDB storage engine</flag>
-  <flag name='tools'>Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
-  <flag name='yassl'>Enable SSL connections and crypto functions using the bundled yaSSL</flag>
+  <flag name="sphinx">Add suport for the sphinx full-text search engine</flag>
+  <flag name="test">Install upstream testsuites for end use.</flag>
+  <flag name="tokudb">Add support for TokuDB storage engine</flag>
+  <flag name="tools">Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
+  <flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml
index 1ff8c09..f7f488f 100644
--- a/dev-db/mariadb/metadata.xml
+++ b/dev-db/mariadb/metadata.xml
@@ -12,33 +12,33 @@ dev-db/mysql
 dev-db/mariadb
 -->
 <use>
-  <flag name='client-libs'>Build the libmysqlclient libraries</flag>
-  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
-  <flag name='community'>Enables the community features from upstream.</flag>
-  <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
-  <flag name='galera'>Enables galera replication</flag>
-  <flag name='innodb-lz4'>Enables lz4 compression methods for InnoDB/XtraDB</flag>
-  <flag name='innodb-lzo'>Enables lzo compression methods for InnoDB/XtraDB</flag>
-  <flag name='innodb-snappy'>Enables snappy compression methods for InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
+  <flag name="client-libs">Build the libmysqlclient libraries</flag>
+  <flag name="cluster">Add support for NDB clustering (deprecated)</flag>
+  <flag name="community">Enables the community features from upstream.</flag>
+  <flag name="embedded">Build embedded server (libmysqld)</flag>
+  <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+  <flag name="galera">Enables galera replication</flag>
+  <flag name="innodb-lz4">Enables lz4 compression methods for InnoDB/XtraDB</flag>
+  <flag name="innodb-lzo">Enables lzo compression methods for InnoDB/XtraDB</flag>
+  <flag name="innodb-snappy">Enables snappy compression methods for InnoDB/XtraDB using <pkg>app-arch/snappy</pkg></flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
-  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='libressl'>Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
-  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
-  <flag name='minimal'>Install client programs only, no server</flag>
-  <flag name='mroonga'>Add support for the Mroonga engine for interfacing with the Groonga text search</flag>
-  <flag name='openssl'>Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
-  <flag name='oqgraph'>Add support for the Open Query GRAPH engine</flag>
-  <flag name='pam'>Enable the optional PAM authentication plugin for the server</flag>
-  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
-  <flag name='server'>Build the server program</flag>
-  <flag name='sphinx'>Add suport for the sphinx full-text search engine</flag>
-  <flag name='sst-rsync'>Add tools needed to support the rsync SST method</flag>
-  <flag name='sst-xtrabackup'>Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag>
+  <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
+  <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
+  <flag name="max-idx-128">Raise the max index per table limit from 64 to 128</flag>
+  <flag name="minimal">Install client programs only, no server</flag>
+  <flag name="mroonga">Add support for the Mroonga engine for interfacing with the Groonga text search</flag>
+  <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
+  <flag name="oqgraph">Add support for the Open Query GRAPH engine</flag>
+  <flag name="pam">Enable the optional PAM authentication plugin for the server</flag>
+  <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
+  <flag name="server">Build the server program</flag>
+  <flag name="sphinx">Add suport for the sphinx full-text search engine</flag>
+  <flag name="sst-rsync">Add tools needed to support the rsync SST method</flag>
+  <flag name="sst-xtrabackup">Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name='tools'>Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
-  <flag name='test'>Install upstream testsuites for end use.</flag>
-  <flag name='tokudb'>Add support for TokuDB storage engine</flag>
-  <flag name='yassl'>Enable SSL connections and crypto functions using the bundled yaSSL</flag>
+  <flag name="tools">Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
+  <flag name="test">Install upstream testsuites for end use.</flag>
+  <flag name="tokudb">Add support for TokuDB storage engine</flag>
+  <flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-db/mycli/metadata.xml b/dev-db/mycli/metadata.xml
index e975a30..346a254 100644
--- a/dev-db/mycli/metadata.xml
+++ b/dev-db/mycli/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<use>

diff --git a/dev-db/mysql-cluster/metadata.xml b/dev-db/mysql-cluster/metadata.xml
index 3e4bee6..dda993e 100644
--- a/dev-db/mysql-cluster/metadata.xml
+++ b/dev-db/mysql-cluster/metadata.xml
@@ -7,19 +7,19 @@
     <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
   </maintainer>
 <use>
-  <flag name='cluster'>Add support for NDB clustering</flag>
-  <flag name='community'>Enables the community features from upstream.</flag>
-  <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+  <flag name="cluster">Add support for NDB clustering</flag>
+  <flag name="community">Enables the community features from upstream.</flag>
+  <flag name="embedded">Build embedded server (libmysqld)</flag>
+  <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
-  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='libressl'>Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
-  <flag name='openssl'>Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
-  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
-  <flag name='minimal'>Install client programs only, no server</flag>
-  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
+  <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
+  <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
+  <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
+  <flag name="max-idx-128">Raise the max index per table limit from 64 to 128</flag>
+  <flag name="minimal">Install client programs only, no server</flag>
+  <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name='test'>Install upstream testsuites for end use.</flag>
-  <flag name='yassl'>Enable SSL connections and crypto functions using the bundled yaSSL</flag>
+  <flag name="test">Install upstream testsuites for end use.</flag>
+  <flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-db/mysql-connector-c++/metadata.xml b/dev-db/mysql-connector-c++/metadata.xml
index 5b748c4..8e07201 100644
--- a/dev-db/mysql-connector-c++/metadata.xml
+++ b/dev-db/mysql-connector-c++/metadata.xml
@@ -4,7 +4,7 @@
 <herd>mysql</herd>
 <herd>proxy-maintainers</herd>
 <use>
-<flag name='gcov'>Build coverage support</flag>
+<flag name="gcov">Build coverage support</flag>
 </use>
 	<maintainer>
 		<email>idella4@gentoo.org</email>

diff --git a/dev-db/mysql-udf-ipv6/metadata.xml b/dev-db/mysql-udf-ipv6/metadata.xml
index 65690818a..81dc07a 100644
--- a/dev-db/mysql-udf-ipv6/metadata.xml
+++ b/dev-db/mysql-udf-ipv6/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-db/mysql/metadata.xml b/dev-db/mysql/metadata.xml
index c5f04ff..d8a2509 100644
--- a/dev-db/mysql/metadata.xml
+++ b/dev-db/mysql/metadata.xml
@@ -12,22 +12,22 @@ dev-db/mysql
 dev-db/mariadb
 -->
 <use>
-  <flag name='client-libs'>Build the libmysqlclient libraries</flag>
-  <flag name='cluster'>Add support for NDB clustering (deprecated)</flag>
-  <flag name='community'>Enables the community features from upstream.</flag>
-  <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+  <flag name="client-libs">Build the libmysqlclient libraries</flag>
+  <flag name="cluster">Add support for NDB clustering (deprecated)</flag>
+  <flag name="community">Enables the community features from upstream.</flag>
+  <flag name="embedded">Build embedded server (libmysqld)</flag>
+  <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
-  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='libressl'>Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
-  <flag name='openssl'>Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
-  <flag name='max-idx-128'>Raise the max index per table limit from 64 to 128</flag>
-  <flag name='minimal'>Install client programs only, no server</flag>
-  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
-  <flag name='server'>Build the server program</flag>
+  <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
+  <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
+  <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
+  <flag name="max-idx-128">Raise the max index per table limit from 64 to 128</flag>
+  <flag name="minimal">Install client programs only, no server</flag>
+  <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
+  <flag name="server">Build the server program</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name='test'>Install upstream testsuites for end use.</flag>
-  <flag name='tools'>Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
-  <flag name='yassl'>Enable SSL connections and crypto functions using the bundled yaSSL</flag>
+  <flag name="test">Install upstream testsuites for end use.</flag>
+  <flag name="tools">Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
+  <flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-db/percona-server/metadata.xml b/dev-db/percona-server/metadata.xml
index 5bea6cc..428ebf0 100644
--- a/dev-db/percona-server/metadata.xml
+++ b/dev-db/percona-server/metadata.xml
@@ -7,20 +7,20 @@
     <description>Libressl issues. Only assign if it's a direct Libressl issue. Do not directly assign for anything else.</description>
   </maintainer>
 <use>
-  <flag name='client-libs'>Build the libmysqlclient libraries</flag>
-  <flag name='embedded'>Build embedded server (libmysqld)</flag>
-  <flag name='extraengine'>Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
+  <flag name="client-libs">Build the libmysqlclient libraries</flag>
+  <flag name="embedded">Build embedded server (libmysqld)</flag>
+  <flag name="extraengine">Add support for alternative storage engines (Archive, CSV, Blackhole, Federated(X), Partition)</flag>
   <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for allocations.</flag>
-  <flag name='latin1'>Use LATIN1 encoding instead of UTF8</flag>
-  <flag name='libressl'>Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
-  <flag name='openssl'>Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
-  <flag name='profiling'>Add support for statement profiling (requires USE=community).</flag>
-  <flag name='server'>Build the server program</flag>
+  <flag name="latin1">Use LATIN1 encoding instead of UTF8</flag>
+  <flag name="libressl">Enable SSL connections and crypto functions using <pkg>dev-libs/libressl</pkg></flag>
+  <flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
+  <flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
+  <flag name="server">Build the server program</flag>
   <flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>
-  <flag name='test'>Install upstream testsuites for end use.</flag>
-  <flag name='tokudb'>Add support for TokuDB storage engine</flag>
-  <flag name='tokudb-backup-plugin'>Builds the TokuDB backup plugin</flag>
-  <flag name='tools'>Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
-  <flag name='yassl'>Enable SSL connections and crypto functions using the bundled yaSSL</flag>
+  <flag name="test">Install upstream testsuites for end use.</flag>
+  <flag name="tokudb">Add support for TokuDB storage engine</flag>
+  <flag name="tokudb-backup-plugin">Builds the TokuDB backup plugin</flag>
+  <flag name="tools">Build the command line tools (mysql, mysqldump, mysqladmin, etc)</flag>
+  <flag name="yassl">Enable SSL connections and crypto functions using the bundled yaSSL</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-db/pg_top/metadata.xml b/dev-db/pg_top/metadata.xml
index fd5d8d8..da90b39 100644
--- a/dev-db/pg_top/metadata.xml
+++ b/dev-db/pg_top/metadata.xml
@@ -7,4 +7,3 @@
 		top, pg_top allows you to monitor PostgreSQL processes.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-db/pgadmin3/metadata.xml b/dev-db/pgadmin3/metadata.xml
index d74b804..2de04e6 100644
--- a/dev-db/pgadmin3/metadata.xml
+++ b/dev-db/pgadmin3/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>postgresql</herd>
 <use>
-	<flag name='databasedesigner'>Enable the Database Designer component</flag>
+	<flag name="databasedesigner">Enable the Database Designer component</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-db/pgpool2/metadata.xml b/dev-db/pgpool2/metadata.xml
index d724a3d..9cfd4b9 100644
--- a/dev-db/pgpool2/metadata.xml
+++ b/dev-db/pgpool2/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
     <herd>postgresql</herd>
     <use>
-        <flag name='memcached'>Use memcached for query caching.</flag>
+        <flag name="memcached">Use memcached for query caching.</flag>
     </use>
 </pkgmetadata>

diff --git a/dev-db/phpmyadmin/metadata.xml b/dev-db/phpmyadmin/metadata.xml
index f618e25..7bb697a 100644
--- a/dev-db/phpmyadmin/metadata.xml
+++ b/dev-db/phpmyadmin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>web-apps</herd>

diff --git a/dev-db/phppgadmin/metadata.xml b/dev-db/phppgadmin/metadata.xml
index 096a77c..4afb70d 100644
--- a/dev-db/phppgadmin/metadata.xml
+++ b/dev-db/phppgadmin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>postgresql</herd>

diff --git a/dev-db/postgresql/metadata.xml b/dev-db/postgresql/metadata.xml
index 475fe36..8fb6d0f 100644
--- a/dev-db/postgresql/metadata.xml
+++ b/dev-db/postgresql/metadata.xml
@@ -3,14 +3,14 @@
 <pkgmetadata>
     <herd>postgresql</herd>
     <use>
-        <flag name='pg_legacytimestamp'>
+        <flag name="pg_legacytimestamp">
             Use double precision floating-point numbers instead of 64-bit
             integers for timestamp storage.
         </flag>
-        <flag name='server'>
+        <flag name="server">
             Disable to build and install the clients and libraries only.
         </flag>
-        <flag name='uuid'>
+        <flag name="uuid">
             Enable server side UUID generation (via
             <pkg>dev-libs/ossp-uuid</pkg>).
         </flag>

diff --git a/dev-db/psqlodbc/metadata.xml b/dev-db/psqlodbc/metadata.xml
index 9275f1a..c3c59cf 100644
--- a/dev-db/psqlodbc/metadata.xml
+++ b/dev-db/psqlodbc/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>postgresql</herd>
 <use>
-<flag name='iodbc'>Use dev-db/libiodbc. Disable to use dev-db/unixODBC.</flag>
+<flag name="iodbc">Use dev-db/libiodbc. Disable to use dev-db/unixODBC.</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-db/spatialite/metadata.xml b/dev-db/spatialite/metadata.xml
index dd2d306..adbecd7 100644
--- a/dev-db/spatialite/metadata.xml
+++ b/dev-db/spatialite/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>sci-geosciences</herd>
 <use>
-	<flag name='geos'>Add the <pkg>sci-libs/geos</pkg> library for exact topological tests</flag>
-	<flag name='proj'>Add the <pkg>sci-libs/proj</pkg> library for reprojection features</flag>
-	<flag name='xls'>Add the <pkg>dev-libs/freexl</pkg> library for xls import support</flag>
+	<flag name="geos">Add the <pkg>sci-libs/geos</pkg> library for exact topological tests</flag>
+	<flag name="proj">Add the <pkg>sci-libs/proj</pkg> library for reprojection features</flag>
+	<flag name="xls">Add the <pkg>dev-libs/freexl</pkg> library for xls import support</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-dotnet/nant/metadata.xml b/dev-dotnet/nant/metadata.xml
index 22bd071..d7a65d2 100644
--- a/dev-dotnet/nant/metadata.xml
+++ b/dev-dotnet/nant/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>dotnet</herd>

diff --git a/dev-embedded/avrdude/metadata.xml b/dev-embedded/avrdude/metadata.xml
index 1962441..f84fa05 100644
--- a/dev-embedded/avrdude/metadata.xml
+++ b/dev-embedded/avrdude/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>dev-embedded</herd>
 <use>
- <flag name='ftdi'>Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
+ <flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/dev-embedded/libftdi/metadata.xml b/dev-embedded/libftdi/metadata.xml
index 3f860e4..4b1fd3f 100644
--- a/dev-embedded/libftdi/metadata.xml
+++ b/dev-embedded/libftdi/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>dev-embedded</herd>
 <use>
- <flag name='tools'>build ftdi_eeprom helper tool</flag>
+ <flag name="tools">build ftdi_eeprom helper tool</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-embedded/pk2-la/metadata.xml b/dev-embedded/pk2-la/metadata.xml
index 49e4f61..6fcfa44 100644
--- a/dev-embedded/pk2-la/metadata.xml
+++ b/dev-embedded/pk2-la/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>embedded</herd>

diff --git a/dev-embedded/pk2cmd/metadata.xml b/dev-embedded/pk2cmd/metadata.xml
index 964d281..f7475d9 100644
--- a/dev-embedded/pk2cmd/metadata.xml
+++ b/dev-embedded/pk2cmd/metadata.xml
@@ -9,4 +9,3 @@
 This application allows the use of the PICKit2 PIC programming device.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-embedded/scratchbox-devkit-debian-squeeze/metadata.xml b/dev-embedded/scratchbox-devkit-debian-squeeze/metadata.xml
index 9a49334..8b64875 100644
--- a/dev-embedded/scratchbox-devkit-debian-squeeze/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-debian-squeeze/metadata.xml
@@ -5,4 +5,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-embedded/scratchbox-devkit-svn/metadata.xml b/dev-embedded/scratchbox-devkit-svn/metadata.xml
index 9a49334..8b64875 100644
--- a/dev-embedded/scratchbox-devkit-svn/metadata.xml
+++ b/dev-embedded/scratchbox-devkit-svn/metadata.xml
@@ -5,4 +5,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-embedded/scratchbox2/metadata.xml b/dev-embedded/scratchbox2/metadata.xml
index 9a49334..8b64875 100644
--- a/dev-embedded/scratchbox2/metadata.xml
+++ b/dev-embedded/scratchbox2/metadata.xml
@@ -5,4 +5,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-embedded/sunxi-tools/metadata.xml b/dev-embedded/sunxi-tools/metadata.xml
index c086d3f..895895d 100644
--- a/dev-embedded/sunxi-tools/metadata.xml
+++ b/dev-embedded/sunxi-tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>embedded</herd>

diff --git a/dev-games/aseprite/metadata.xml b/dev-games/aseprite/metadata.xml
index 938db89..d48b678 100644
--- a/dev-games/aseprite/metadata.xml
+++ b/dev-games/aseprite/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-games/etrophy/metadata.xml b/dev-games/etrophy/metadata.xml
index 71cdd72..99165ad 100644
--- a/dev-games/etrophy/metadata.xml
+++ b/dev-games/etrophy/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>

diff --git a/dev-games/guichan/metadata.xml b/dev-games/guichan/metadata.xml
index 30a76be..a5b0926 100644
--- a/dev-games/guichan/metadata.xml
+++ b/dev-games/guichan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/dev-games/higan-ananke/metadata.xml b/dev-games/higan-ananke/metadata.xml
index 01a746e..cad5a2a 100644
--- a/dev-games/higan-ananke/metadata.xml
+++ b/dev-games/higan-ananke/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
index 8791c3d..06a7f9a 100644
--- a/dev-games/ogre/metadata.xml
+++ b/dev-games/ogre/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>games</herd>

diff --git a/dev-games/t4k-common/metadata.xml b/dev-games/t4k-common/metadata.xml
index 01a746e..cad5a2a 100644
--- a/dev-games/t4k-common/metadata.xml
+++ b/dev-games/t4k-common/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/dev-go/go-colortext/metadata.xml b/dev-go/go-colortext/metadata.xml
index 0288559..87ec5f9 100644
--- a/dev-go/go-colortext/metadata.xml
+++ b/dev-go/go-colortext/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-go/gom/metadata.xml b/dev-go/gom/metadata.xml
index bb5c396..3249410 100644
--- a/dev-go/gom/metadata.xml
+++ b/dev-go/gom/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-haskell/ansi-terminal/metadata.xml b/dev-haskell/ansi-terminal/metadata.xml
index f769d50..bb63eda 100644
--- a/dev-haskell/ansi-terminal/metadata.xml
+++ b/dev-haskell/ansi-terminal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/attoparsec-enumerator/metadata.xml b/dev-haskell/attoparsec-enumerator/metadata.xml
index 8459a59..3fb765a 100644
--- a/dev-haskell/attoparsec-enumerator/metadata.xml
+++ b/dev-haskell/attoparsec-enumerator/metadata.xml
@@ -17,7 +17,7 @@
 		&gt; import Data.Enumerator.List
 		&gt; import System.IO
 		&gt;
-		&gt; parser = string &quot;foo&quot; &lt;|&gt; string &quot;bar&quot;
+		&gt; parser = string "foo" &lt;|&gt; string "bar"
 		&gt;
 		&gt; main = do
 		&gt;     xy &lt;- run_ (enumHandle 1 stdin $$ do

diff --git a/dev-haskell/biosff/metadata.xml b/dev-haskell/biosff/metadata.xml
index 714e2ad..85ee9ed 100644
--- a/dev-haskell/biosff/metadata.xml
+++ b/dev-haskell/biosff/metadata.xml
@@ -5,7 +5,7 @@
 	<longdescription>
 		The library contains the functionality for reading and writing
 		SFF files (sequencing data from 454 and Ion Torrent).  It duplicates
-		code from (and is incompatible with) the &quot;bio&quot; library.
+		code from (and is incompatible with) the "bio" library.
 	</longdescription>
 	<use>
 		<flag name="fclip">Build the fclip executable.</flag>

diff --git a/dev-haskell/bits-atomic/metadata.xml b/dev-haskell/bits-atomic/metadata.xml
index 67912b1..65b64af 100644
--- a/dev-haskell/bits-atomic/metadata.xml
+++ b/dev-haskell/bits-atomic/metadata.xml
@@ -6,7 +6,7 @@
 		Atomic operations including CAS (compare-and-swap), fetch &amp; add and variants
 		suitable for low-level shared-memory synchronization.
 		
-		The implementation is using GCC&#39;s builtin atomic operations (available in GCC &gt;=
+		The implementation is using GCC's builtin atomic operations (available in GCC &gt;=
 		4) in C wrappers called through the FFI. See these links for background:
 		
 		* GCC manual: &lt;https://gcc.gnu.org/onlinedocs/gcc/Atomic-Builtins.html&gt;

diff --git a/dev-haskell/bzlib/metadata.xml b/dev-haskell/bzlib/metadata.xml
index 420552f..2cc92a6 100644
--- a/dev-haskell/bzlib/metadata.xml
+++ b/dev-haskell/bzlib/metadata.xml
@@ -5,7 +5,7 @@
 	<longdescription>
 		This package provides a pure interface for compressing and
 		decompressing streams of data represented as lazy
-		&#39;ByteString&#39;s. It uses the bz2 C library so it has high
+		'ByteString's. It uses the bz2 C library so it has high
 		performance.
 		
 		It provides a convenient high level API suitable for most

diff --git a/dev-haskell/cabal-helper/metadata.xml b/dev-haskell/cabal-helper/metadata.xml
index c37e984..a4d5906 100644
--- a/dev-haskell/cabal-helper/metadata.xml
+++ b/dev-haskell/cabal-helper/metadata.xml
@@ -10,17 +10,17 @@
 		@cabal-helper@ uses a wrapper executable to compile the actual cabal-helper
 		executable at runtime while linking against an arbitrary version of
 		Cabal. This runtime-compiled helper executable is then used to extract
-		various bits and peices from Cabal\&#39;s on disk state (dist/setup-config)
-		written by it&#39;s configure command.
+		various bits and peices from Cabal\'s on disk state (dist/setup-config)
+		written by it's configure command.
 		
 		In addition to this the wrapper executable also supports installing any
 		version of Cabal from hackage in case it cannot be found in any available
 		package database. The wrapper installs these instances of the Cabal library
-		into a private package database so as to not interfere with the user&#39;s
+		into a private package database so as to not interfere with the user's
 		packages.
 		
 		Furthermore the wrapper supports one special case namely reading a state
-		file for Cabal itself. This is needed as Cabal compiles it&#39;s Setup.hs using
+		file for Cabal itself. This is needed as Cabal compiles it's Setup.hs using
 		itself and not using any version of Cabal installed in any package database.
 		
 		@cabal-helper@ can compile with @Cabal &gt;= 1.14@ but requires @Cabal &gt;= 1.16@

diff --git a/dev-haskell/cabal-install/metadata.xml b/dev-haskell/cabal-install/metadata.xml
index 2054a0d..bc3326b 100644
--- a/dev-haskell/cabal-install/metadata.xml
+++ b/dev-haskell/cabal-install/metadata.xml
@@ -9,6 +9,6 @@
 	</longdescription>
 	<use>
 		<flag name="noprefs">Ignore 'preferred-versions' file from hackage's tarball.</flag>
-		<flag name='network-uri'>Get Network.URI from the network-uri package.</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-haskell/chasingbottoms/metadata.xml b/dev-haskell/chasingbottoms/metadata.xml
index bf0a95f..21f906b 100644
--- a/dev-haskell/chasingbottoms/metadata.xml
+++ b/dev-haskell/chasingbottoms/metadata.xml
@@ -32,13 +32,13 @@
 		
 		Showing partial and infinite values (@\\\/!@ is join and @\/\\!@ is meet):
 		
-		[@&gt; approxShow 4 $ (True, bottom) \\\/! (bottom, \&#39;b\&#39;)@] @\&quot;Just (True, \&#39;b\&#39;)\&quot;@
+		[@&gt; approxShow 4 $ (True, bottom) \\\/! (bottom, \'b\')@] @\"Just (True, \'b\')\"@
 		
-		[@&gt; approxShow 4 $ (True, bottom) \/\\! (bottom, \&#39;b\&#39;)@] @\&quot;(_|_, _|_)\&quot;@
+		[@&gt; approxShow 4 $ (True, bottom) \/\\! (bottom, \'b\')@] @\"(_|_, _|_)\"@
 		
-		[@&gt; approxShow 4 $ ([1..\] :: [Int\])@] @\&quot;[1, 2, 3, _\&quot;@
+		[@&gt; approxShow 4 $ ([1..\] :: [Int\])@] @\"[1, 2, 3, _\"@
 		
-		[@&gt; approxShow 4 $ (cycle [bottom\] :: [Bool\])@] @\&quot;[_|_, _|_, _|_, _\&quot;@
+		[@&gt; approxShow 4 $ (cycle [bottom\] :: [Bool\])@] @\"[_|_, _|_, _|_, _\"@
 		
 		Approximately comparing infinite, partial values:
 		
@@ -47,16 +47,16 @@
 		[@&gt; approx 100 [2,4..\] \/=! approx 100 (filter even [bottom..\] :: [Int\])@] @True@
 		
 		The code above relies on the fact that @bottom@, just as @error
-		\&quot;...\&quot;@, @undefined@ and pattern match failures, yield
+		\"...\"@, @undefined@ and pattern match failures, yield
 		exceptions. Sometimes we are dealing with properly non-terminating
 		computations, such as the following example, and then it can be nice to
 		be able to apply a time-out:
 		
-		[@&gt; timeOut&#39; 1 (reverse [1..5\])@] @Value [5,4,3,2,1]@
+		[@&gt; timeOut' 1 (reverse [1..5\])@] @Value [5,4,3,2,1]@
 		
-		[@&gt; timeOut&#39; 1 (reverse [1..\])@] @NonTermination@
+		[@&gt; timeOut' 1 (reverse [1..\])@] @NonTermination@
 		
-		The time-out functionality can be used to treat \&quot;slow\&quot; computations as
+		The time-out functionality can be used to treat \"slow\" computations as
 		bottoms:
 		
 		[@&gt; let tweak = Tweak &amp;#x7b; approxDepth = Just 5, timeOutLimit = Just 2 &amp;#x7d;@]
@@ -86,8 +86,8 @@
 		[@ @] @Value ()@
 		
 		For the underlying theory and a larger example involving use of
-		QuickCheck, see the article \&quot;Chasing Bottoms, A Case Study in Program
-		Verification in the Presence of Partial and Infinite Values\&quot;
+		QuickCheck, see the article \"Chasing Bottoms, A Case Study in Program
+		Verification in the Presence of Partial and Infinite Values\"
 		(&lt;http://www.cse.chalmers.se/~nad/publications/danielsson-jansson-mpc2004.html&gt;).
 		
 		The code has been tested using GHC. Most parts can probably be

diff --git a/dev-haskell/chell/metadata.xml b/dev-haskell/chell/metadata.xml
index 3e81fb4..238cbf0 100644
--- a/dev-haskell/chell/metadata.xml
+++ b/dev-haskell/chell/metadata.xml
@@ -15,17 +15,17 @@
 		import Test.Chell
 		
 		tests_Math :: Suite
-		tests_Math = suite \&quot;math\&quot;
+		tests_Math = suite \"math\"
 		&amp;#x20;   test_Addition
 		&amp;#x20;   test_Subtraction
 		
 		test_Addition :: Test
-		test_Addition = assertions \&quot;addition\&quot; $ do
+		test_Addition = assertions \"addition\" $ do
 		&amp;#x20;   $expect (equal (2 + 1) 3)
 		&amp;#x20;   $expect (equal (1 + 2) 3)
 		
 		test_Subtraction :: Test
-		test_Subtraction = assertions \&quot;subtraction\&quot; $ do
+		test_Subtraction = assertions \"subtraction\" $ do
 		&amp;#x20;   $expect (equal (2 - 1) 1)
 		&amp;#x20;   $expect (equal (1 - 2) (-1))
 		

diff --git a/dev-haskell/citeproc-hs/metadata.xml b/dev-haskell/citeproc-hs/metadata.xml
index 472d0b8..0ff2a6b 100644
--- a/dev-haskell/citeproc-hs/metadata.xml
+++ b/dev-haskell/citeproc-hs/metadata.xml
@@ -18,6 +18,6 @@
 		found here:
 		&lt;http://citationstyles.org/&gt;.
 		
-		For the API documentation please see &quot;Text.CSL&quot;.
+		For the API documentation please see "Text.CSL".
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/cmdargs/metadata.xml b/dev-haskell/cmdargs/metadata.xml
index 30d92e9..38d52d1 100644
--- a/dev-haskell/cmdargs/metadata.xml
+++ b/dev-haskell/cmdargs/metadata.xml
@@ -4,19 +4,19 @@
 	<herd>haskell</herd>
 	<longdescription>
 		This library provides an easy way to define command line parsers. Most users
-		will want to use the &quot;System.Console.CmdArgs.Implicit&quot; module, whose
+		will want to use the "System.Console.CmdArgs.Implicit" module, whose
 		documentation contains an example.
 		
-		* &quot;System.Console.CmdArgs.Explicit&quot; provides a way to write command line
+		* "System.Console.CmdArgs.Explicit" provides a way to write command line
 		parsers for both single mode programs (most programs) and multiple
 		mode programs (e.g. darcs or cabal). Parsers are defined by constructing
 		a data structure.
 		
-		* &quot;System.Console.CmdArgs.Implicit&quot; provides a way to concisely define
+		* "System.Console.CmdArgs.Implicit" provides a way to concisely define
 		command line parsers, up to three times shorter than getopt. These parsers
 		are translated into the Explicit data type.
 		
-		* &quot;System.Console.CmdArgs.GetOpt&quot; provides a wrapper allowing compatiblity
+		* "System.Console.CmdArgs.GetOpt" provides a wrapper allowing compatiblity
 		with existing getopt parsers, mapping to the Explicit data type.
 		
 		For a general reference on what command line flags are commonly used,

diff --git a/dev-haskell/cmdlib/metadata.xml b/dev-haskell/cmdlib/metadata.xml
index 7c66804..c7178e1 100644
--- a/dev-haskell/cmdlib/metadata.xml
+++ b/dev-haskell/cmdlib/metadata.xml
@@ -7,7 +7,7 @@
 		powerful attribute system. Supports complex interfaces with many
 		options and commands, with option &amp; command grouping, with simple
 		and convenient API. Even though quite powerful, it strives to keep
-		simple things simple. The library uses &quot;System.Console.GetOpt&quot; as
+		simple things simple. The library uses "System.Console.GetOpt" as
 		its backend.
 		
 		In comparison to the other commandline handling libraries:

diff --git a/dev-haskell/configfile/metadata.xml b/dev-haskell/configfile/metadata.xml
index 920e548..133d59c 100644
--- a/dev-haskell/configfile/metadata.xml
+++ b/dev-haskell/configfile/metadata.xml
@@ -9,15 +9,15 @@
 		The ConfigFile module works with configuration files in a standard
 		format that is easy for the user to edit, easy for the programmer
 		to work with, yet remains powerful and flexible.  It is inspired by,
-		and compatible with, Python&#39;s ConfigParser module.  It uses files
+		and compatible with, Python's ConfigParser module.  It uses files
 		that resemble Windows .INI-style files, but with numerous
 		improvements.
 		
 		ConfigFile provides simple calls to both read and write config files.
-		It&#39;s possible to make a config file parsable by this module,
+		It's possible to make a config file parsable by this module,
 		the Unix shell, and make.
 	</longdescription>
 <use>
-  <flag name='buildtests'>Build the executable to run unit tests.</flag>
+  <flag name="buildtests">Build the executable to run unit tests.</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-haskell/criterion/metadata.xml b/dev-haskell/criterion/metadata.xml
index a65b742..09dd813 100644
--- a/dev-haskell/criterion/metadata.xml
+++ b/dev-haskell/criterion/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/dav/metadata.xml b/dev-haskell/dav/metadata.xml
index e064e3d..38f57f6 100644
--- a/dev-haskell/dav/metadata.xml
+++ b/dev-haskell/dav/metadata.xml
@@ -11,6 +11,6 @@
 		command-line operation.
 	</longdescription>
 	<use>
-		<flag name='network-uri'>Get Network.URI from the network-uri package.</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-haskell/dbus/metadata.xml b/dev-haskell/dbus/metadata.xml
index 205ed77..71cefc4 100644
--- a/dev-haskell/dbus/metadata.xml
+++ b/dev-haskell/dbus/metadata.xml
@@ -9,7 +9,7 @@
 	<longdescription>
 		D-Bus is a simple, message-based protocol for inter-process
 		communication, which allows applications to interact with other parts of
-		the machine and the user&#39;s session using remote procedure calls.
+		the machine and the user's session using remote procedure calls.
 		
 		D-Bus is a essential part of the modern Linux desktop, where it replaces
 		earlier protocols such as CORBA and DCOP.
@@ -31,8 +31,8 @@
 		&amp;#x20;   client &lt;- connectSession
 		&amp;#x20;   //
 		&amp;#x20;   \-- Request a list of connected clients from the bus
-		&amp;#x20;   reply &lt;- call_ client (methodCall \&quot;\/org\/freedesktop\/DBus\&quot; \&quot;org.freedesktop.DBus\&quot; \&quot;ListNames\&quot;)
-		&amp;#x20;       &amp;#x7b; methodCallDestination = Just \&quot;org.freedesktop.DBus\&quot;
+		&amp;#x20;   reply &lt;- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\")
+		&amp;#x20;       &amp;#x7b; methodCallDestination = Just \"org.freedesktop.DBus\"
 		&amp;#x20;       &amp;#x7d;
 		&amp;#x20;   //
 		&amp;#x20;   \-- org.freedesktop.DBus.ListNames() returns a single value, which is

diff --git a/dev-haskell/encoding/metadata.xml b/dev-haskell/encoding/metadata.xml
index 0b5f92f..924adeb 100644
--- a/dev-haskell/encoding/metadata.xml
+++ b/dev-haskell/encoding/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		Haskell has excellect handling of unicode, the Char type covers all unicode chars. Unfortunatly, there&#39;s no possibility to read or write something to the outer world in an encoding other than ascii due to the lack of support for encodings. This library should help with that.
+		Haskell has excellect handling of unicode, the Char type covers all unicode chars. Unfortunatly, there's no possibility to read or write something to the outer world in an encoding other than ascii due to the lack of support for encodings. This library should help with that.
 	</longdescription>
 	<use>
 		<flag name="systemencoding">Provide the getSystemEncoding action to query the locale.</flag>

diff --git a/dev-haskell/errors/metadata.xml b/dev-haskell/errors/metadata.xml
index be803d5..9c339e2 100644
--- a/dev-haskell/errors/metadata.xml
+++ b/dev-haskell/errors/metadata.xml
@@ -4,7 +4,7 @@
 	<herd>haskell</herd>
 	<longdescription>
 		The one-stop shop for all your error-handling needs!  Just import
-		&quot;Control.Error&quot;.
+		"Control.Error".
 		
 		This library encourages an error-handling style that directly uses the type
 		system, rather than out-of-band exceptions.

diff --git a/dev-haskell/executable-path/metadata.xml b/dev-haskell/executable-path/metadata.xml
index 680590a..f16ad43 100644
--- a/dev-haskell/executable-path/metadata.xml
+++ b/dev-haskell/executable-path/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		The documentation of &quot;System.Environment.getProgName&quot; says that
-		\&quot;However, this is hard-to-impossible to implement on some non-Unix OSes,
+		The documentation of "System.Environment.getProgName" says that
+		\"However, this is hard-to-impossible to implement on some non-Unix OSes,
 		so instead, for maximum portability, we just return the leafname
-		of the program as invoked.\&quot;
+		of the program as invoked.\"
 		This library tries to provide the missing path.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/extra/metadata.xml b/dev-haskell/extra/metadata.xml
index 3fc3088..05bd6f3 100644
--- a/dev-haskell/extra/metadata.xml
+++ b/dev-haskell/extra/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/fclabels/metadata.xml b/dev-haskell/fclabels/metadata.xml
index 5a4a3c8..5d36bd3 100644
--- a/dev-haskell/fclabels/metadata.xml
+++ b/dev-haskell/fclabels/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/fgl/metadata.xml b/dev-haskell/fgl/metadata.xml
index c8097c9..18a820e 100644
--- a/dev-haskell/fgl/metadata.xml
+++ b/dev-haskell/fgl/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		Martin Erwig&#39;s Functional Graph Library
+		Martin Erwig's Functional Graph Library
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/filestore/metadata.xml b/dev-haskell/filestore/metadata.xml
index dd58425..57144d9 100644
--- a/dev-haskell/filestore/metadata.xml
+++ b/dev-haskell/filestore/metadata.xml
@@ -9,7 +9,7 @@
 		or databases could be added.
 	</longdescription>
 	<use>
-		<flag name="maxcount">Make use of a recent (>= 2.3.0) Darcs feature which vastly improves the performance
+		<flag name="maxcount">Make use of a recent (&gt;= 2.3.0) Darcs feature which vastly improves the performance
 		of 'latest'.  You should disable this flag if you plan to use gitit with an
 		older version of Darcs, or 'latest' will raise an error.</flag>
 	</use>

diff --git a/dev-haskell/fingertree/metadata.xml b/dev-haskell/fingertree/metadata.xml
index bca9435..f6d9f02 100644
--- a/dev-haskell/fingertree/metadata.xml
+++ b/dev-haskell/fingertree/metadata.xml
@@ -9,7 +9,7 @@
 		in section 4 of
 		
 		* Ralf Hinze and Ross Paterson,
-		\&quot;Finger trees: a simple general-purpose data structure\&quot;,
+		\"Finger trees: a simple general-purpose data structure\",
 		/Journal of Functional Programming/ 16:2 (2006) pp 197-217.
 		&lt;http://www.soi.city.ac.uk/~ross/papers/FingerTree.html&gt;
 		

diff --git a/dev-haskell/generic-deriving/metadata.xml b/dev-haskell/generic-deriving/metadata.xml
index ca32db5..49e3c00 100644
--- a/dev-haskell/generic-deriving/metadata.xml
+++ b/dev-haskell/generic-deriving/metadata.xml
@@ -8,7 +8,7 @@
 		
 		*  /A generic deriving mechanism for Haskell/.
 		Jose Pedro Magalhaes, Atze Dijkstra, Johan Jeuring, and Andres Loeh.
-		Haskell&#39;10.
+		Haskell'10.
 		
 		The current implementation integrates with the new GHC Generics. See
 		&lt;http://www.haskell.org/haskellwiki/Generics&gt; for more information.

diff --git a/dev-haskell/ghc-syb-utils/metadata.xml b/dev-haskell/ghc-syb-utils/metadata.xml
index e20125f..38f0a45 100644
--- a/dev-haskell/ghc-syb-utils/metadata.xml
+++ b/dev-haskell/ghc-syb-utils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/glib/metadata.xml b/dev-haskell/glib/metadata.xml
index 5080676..2a82a19 100644
--- a/dev-haskell/glib/metadata.xml
+++ b/dev-haskell/glib/metadata.xml
@@ -9,7 +9,7 @@
 		wrap libraries that are themselves based on GLib.
 	</longdescription>
 	<use>
-		<flag name='closure_signals'>Use the the GClosure-based signals
+		<flag name="closure_signals">Use the the GClosure-based signals
         	implementation.</flag>
         </use>
 </pkgmetadata>

diff --git a/dev-haskell/gluraw/metadata.xml b/dev-haskell/gluraw/metadata.xml
index 2c166cf..83ca80f 100644
--- a/dev-haskell/gluraw/metadata.xml
+++ b/dev-haskell/gluraw/metadata.xml
@@ -4,10 +4,10 @@
 	<herd>haskell</herd>
 	<longdescription>
 		GLURaw is a raw Haskell binding for the GLU 1.3 OpenGL utility library. It is
-		basically a 1:1 mapping of GLU&#39;s C API, intended as a basis for a nicer
+		basically a 1:1 mapping of GLU's C API, intended as a basis for a nicer
 		interface.
 		
-		OpenGL is the industry&#39;s most widely used and supported 2D and 3D graphics
+		OpenGL is the industry's most widely used and supported 2D and 3D graphics
 		application programming interface (API), incorporating a broad set of
 		rendering, texture mapping, special effects, and other powerful visualization
 		functions. For more information about OpenGL and its various extensions,

diff --git a/dev-haskell/gnutls/metadata.xml b/dev-haskell/gnutls/metadata.xml
index af23295..8ffc051 100644
--- a/dev-haskell/gnutls/metadata.xml
+++ b/dev-haskell/gnutls/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		You almost certainly don&#39;t want to depend on this release.
+		You almost certainly don't want to depend on this release.
 		
 		This is a pre-alpha, almost useless release; its only purpose is to enable
 		TLS support in some of my other libraries. More complete bindings for GNU TLS

diff --git a/dev-haskell/gtk2hs-buildtools/metadata.xml b/dev-haskell/gtk2hs-buildtools/metadata.xml
index 0ce540f..1a141b6 100644
--- a/dev-haskell/gtk2hs-buildtools/metadata.xml
+++ b/dev-haskell/gtk2hs-buildtools/metadata.xml
@@ -13,7 +13,7 @@
 		to actually run Gtk2Hs programs.
 	</longdescription>
 	<use>
-		<flag name='closuresignals'>Use the the GClosure-based signals
+		<flag name="closuresignals">Use the the GClosure-based signals
 		implementation.</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-haskell/haddock-library/metadata.xml b/dev-haskell/haddock-library/metadata.xml
index fd73376..dfc8b71 100644
--- a/dev-haskell/haddock-library/metadata.xml
+++ b/dev-haskell/haddock-library/metadata.xml
@@ -7,7 +7,7 @@
 		libraries. These modules expose some functionality of it
 		without pulling in the GHC dependency. Please note that the
 		API is likely to change so specify upper bounds in your
-		project if you can&#39;t release often. For interacting with Haddock
+		project if you can't release often. For interacting with Haddock
 		itself, see the <pkg>dev-haskell/haddock</pkg> package.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/hamlet/metadata.xml b/dev-haskell/hamlet/metadata.xml
index 0b2d7cf..ecdb350 100644
--- a/dev-haskell/hamlet/metadata.xml
+++ b/dev-haskell/hamlet/metadata.xml
@@ -5,7 +5,7 @@
 	<longdescription>
 		Hamlet gives you a type-safe tool for generating HTML code. It works via Quasi-Quoting, and generating extremely efficient output code. The syntax is white-space sensitive, and it helps you avoid cross-site scripting issues and 404 errors. Please see the documentation at &lt;http://docs.yesodweb.com/book/hamlet/&gt; for more details.
 		
-		Here is a quick overview of hamlet html. Due to haddock escaping issues, we can&#39;t properly show variable insertion, but we are still going to show some conditionals. Please see &lt;http://www.yesodweb.com/book/templates&gt; for a thorough description
+		Here is a quick overview of hamlet html. Due to haddock escaping issues, we can't properly show variable insertion, but we are still going to show some conditionals. Please see &lt;http://www.yesodweb.com/book/templates&gt; for a thorough description
 		
 		&gt; !!!
 		&gt; &lt;html&gt;

diff --git a/dev-haskell/happstack-server/metadata.xml b/dev-haskell/happstack-server/metadata.xml
index 02a4cc3..1d0e584 100644
--- a/dev-haskell/happstack-server/metadata.xml
+++ b/dev-haskell/happstack-server/metadata.xml
@@ -6,7 +6,7 @@
 		Happstack Server provides an HTTP server and a rich set of functions for routing requests, handling query parameters, generating responses, working with cookies, serving files, and more. For in-depth documentation see the Happstack Crash Course &lt;http://happstack.com/docs/crashcourse/index.html&gt;
 	</longdescription>
 	<use>
-		<flag name='network-uri'>Get Network.URI from the network-uri package</flag>
-		<flag name='template_haskell'>Description: Template Haskell is available on this system</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package</flag>
+		<flag name="template_haskell">Description: Template Haskell is available on this system</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-haskell/harp/metadata.xml b/dev-haskell/harp/metadata.xml
index 69b2949..e85a7d4 100644
--- a/dev-haskell/harp/metadata.xml
+++ b/dev-haskell/harp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/haskell-src-meta/metadata.xml b/dev-haskell/haskell-src-meta/metadata.xml
index 160f468..25396cc 100644
--- a/dev-haskell/haskell-src-meta/metadata.xml
+++ b/dev-haskell/haskell-src-meta/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>haskell</herd>
 	<longdescription>
 		The translation from haskell-src-exts abstract syntax
-		to template-haskell abstract syntax isn&#39;t 100% complete yet.
+		to template-haskell abstract syntax isn't 100% complete yet.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/hexpat/metadata.xml b/dev-haskell/hexpat/metadata.xml
index b086c39..1cdb0a8 100644
--- a/dev-haskell/hexpat/metadata.xml
+++ b/dev-haskell/hexpat/metadata.xml
@@ -26,13 +26,13 @@
 		
 		If you want to do interactive I\/O, an obvious option is to use lazy parsing
 		with one of the lazy I\/O functions such as hGetContents.  However, this can be
-		problematic in some applications because it doesn&#39;t handle I\/O errors properly
+		problematic in some applications because it doesn't handle I\/O errors properly
 		and can give no guarantee of timely resource cleanup.  In these cases, chunked
 		I\/O is a better approach: Take a look at the /hexpat-enumerator/ package.
 		
-		/IO/ is filed under /Internal/ because it&#39;s low-level and most users won&#39;t want
+		/IO/ is filed under /Internal/ because it's low-level and most users won't want
 		it.  The other /Internal/ modules are re-exported by /Annotated/, /Tree/ and /Extended/,
-		so you won&#39;t need to import them directly.
+		so you won't need to import them directly.
 		
 		Credits to Iavor Diatchki and the @xml@ (XML.Light) package for /Proc/ and /Cursor/.
 		Thanks to the many contributors.
@@ -41,17 +41,17 @@
 		if you call a safe FFI callback from an unbound thread.  This can get out of
 		control in a busy application.  To avoid this, from version 0.19.1 we now delegate
 		processing to a single worker thread if the calling thread is not bound.
-		This essentially means that hexpat currently won&#39;t exploit multicores very well.
+		This essentially means that hexpat currently won't exploit multicores very well.
 		It also means that hexpat may be more efficient on threads spawned with forkOS
 		(to give you a bound thread) rather than forkIO.
 		
-		ChangeLog: 0.15 changes intended to fix a (rare) \&quot;error: a C finalizer called back into Haskell.\&quot;
+		ChangeLog: 0.15 changes intended to fix a (rare) \"error: a C finalizer called back into Haskell.\"
 		that seemed only to happen only on ghc6.12.X; 0.15.1 Fix broken Annotated parse;
 		0.16 switch from mtl to transformers; 0.17 fix mapNodeContainer &amp; rename some things.;
 		0.18 rename defaultEncoding to overrideEncoding. 0.18.3 formatG and indent were demanding list
 		items more than once (inefficient in chunked processing); 0.19 add Extended.hs;
 		0.19.1 fix a memory leak introduced in 0.19, delegate parsing to bound thread
-		if unbound (see note above); 0.19.2 include expat source code so \&#39;cabal install\&#39; just works
+		if unbound (see note above); 0.19.2 include expat source code so \'cabal install\' just works
 		on Linux, Mac and Windows (thanks Jacob Stanley); 0.19.3 fix misconfiguration of expat
 		which broke entity parsing; 0.19.4 bump version constraint for text; 0.19.5 bump text
 		to &lt; 0.12 and fix text-0.10.0.1 breakage; 0.19.6 dependency breakage with List;

diff --git a/dev-haskell/hs3/metadata.xml b/dev-haskell/hs3/metadata.xml
index 10587b8..8020044 100644
--- a/dev-haskell/hs3/metadata.xml
+++ b/dev-haskell/hs3/metadata.xml
@@ -4,11 +4,11 @@
 	<herd>haskell</herd>
 	<longdescription>
 		This is the Haskell S3 library.  It provides an
-		interface to Amazon&#39;s Simple Storage Service (S3), allowing Haskell
+		interface to Amazon's Simple Storage Service (S3), allowing Haskell
 		developers to reliably store and retrieve arbitrary amounts of
 		data from anywhere on the Internet.
 	</longdescription>
 	<use>
-		<flag name='network-uri'>Get Network.URI from the network-uri package.</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-haskell/hslogger/metadata.xml b/dev-haskell/hslogger/metadata.xml
index c579bd8..1db0e66 100644
--- a/dev-haskell/hslogger/metadata.xml
+++ b/dev-haskell/hslogger/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/hspec-core/metadata.xml b/dev-haskell/hspec-core/metadata.xml
index fd25c46..5744e28 100644
--- a/dev-haskell/hspec-core/metadata.xml
+++ b/dev-haskell/hspec-core/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>haskell</herd>
 	<longdescription>
 		This package exposes internal types and functions that can be
-		used to extend Hspec&#39;s functionality.
+		used to extend Hspec's functionality.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/httpd-shed/metadata.xml b/dev-haskell/httpd-shed/metadata.xml
index c112085..38e1541 100644
--- a/dev-haskell/httpd-shed/metadata.xml
+++ b/dev-haskell/httpd-shed/metadata.xml
@@ -9,6 +9,6 @@
 	</longdescription>
 	<use>
 		<flag name="buildexamples">Build example executables.</flag>
-		<flag name='network-uri'>Get Network.URI from the network-uri package.</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-haskell/hunit/metadata.xml b/dev-haskell/hunit/metadata.xml
index 80796dd..8794e4c 100644
--- a/dev-haskell/hunit/metadata.xml
+++ b/dev-haskell/hunit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/hxt-unicode/metadata.xml b/dev-haskell/hxt-unicode/metadata.xml
index 94a8ee2..774fbdd 100644
--- a/dev-haskell/hxt-unicode/metadata.xml
+++ b/dev-haskell/hxt-unicode/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/hxt/metadata.xml b/dev-haskell/hxt/metadata.xml
index c7063d2..81586f0 100644
--- a/dev-haskell/hxt/metadata.xml
+++ b/dev-haskell/hxt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/lazysmallcheck/metadata.xml b/dev-haskell/lazysmallcheck/metadata.xml
index 3336e2d..25e6c34 100644
--- a/dev-haskell/lazysmallcheck/metadata.xml
+++ b/dev-haskell/lazysmallcheck/metadata.xml
@@ -6,7 +6,7 @@
 		Lazy SmallCheck is a library for exhaustive, demand-driven testing of
 		Haskell programs.  It is based on the idea that if a property holds
 		for a partially-defined input then it must also hold for all
-		fully-defined refinements of the that input.  Compared to ``eager&#39;&#39;
+		fully-defined refinements of the that input.  Compared to ``eager''
 		input generation as in SmallCheck, Lazy SmallCheck may require
 		significantly fewer test-cases to verify a property for all inputs up
 		to a given depth.

diff --git a/dev-haskell/lcs/metadata.xml b/dev-haskell/lcs/metadata.xml
index fa121ce..2728730 100644
--- a/dev-haskell/lcs/metadata.xml
+++ b/dev-haskell/lcs/metadata.xml
@@ -4,15 +4,15 @@
 	<herd>haskell</herd>
 	<longdescription>
 		Provides a function lcs that takes two lists and returns a longest
-		common sublist. For example, lcs &quot;abcd&quot; &quot;acbd&quot; is either &quot;abd&quot; or
-		&quot;acd&quot;.
+		common sublist. For example, lcs "abcd" "acbd" is either "abd" or
+		"acd".
 		
 		The package provides a simple, stupid and (most of all) slow
 		implementation that needs, for inputs of length m and n, O(m+n)
 		space and O((m+n)!) time in the worst case.
 		
 		It also provides an implementation of the Hunt-Szymanski LCS
-		algorithm, based on that in &quot;String searching algorithms&quot; by
+		algorithm, based on that in "String searching algorithms" by
 		Graham A Stephen, ISBN 981021829X.
 		
 		Given inputs xs and ys of length m and n respectively, where there

diff --git a/dev-haskell/logict/metadata.xml b/dev-haskell/logict/metadata.xml
index 80f0869..cee2e78 100644
--- a/dev-haskell/logict/metadata.xml
+++ b/dev-haskell/logict/metadata.xml
@@ -5,8 +5,8 @@
 	<longdescription>
 		A continuation-based, backtracking, logic programming monad.
 		An adaptation of the two-continuation implementation found
-		in the paper &quot;Backtracking, Interleaving, and Terminating
-		Monad Transformers&quot; available here:
+		in the paper "Backtracking, Interleaving, and Terminating
+		Monad Transformers" available here:
 		&lt;http://okmij.org/ftp/papers/LogicT.pdf&gt;
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/lvmlib/metadata.xml b/dev-haskell/lvmlib/metadata.xml
index 124dc00..fad507b 100644
--- a/dev-haskell/lvmlib/metadata.xml
+++ b/dev-haskell/lvmlib/metadata.xml
@@ -9,6 +9,6 @@
 		compiling core programs into LVM instructions and a library. The LVM is used
 		as a backend for the Helium compiler. At the moment, one LVM runtime
 		implementation is available (written in C). More information about LVM can be
-		found in Chapter 6 of Daan Leijen&#39;s PhD Thesis, The Lambda Abroad.
+		found in Chapter 6 of Daan Leijen's PhD Thesis, The Lambda Abroad.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/mersenne-random-pure64/metadata.xml b/dev-haskell/mersenne-random-pure64/metadata.xml
index e88086f..13de961 100644
--- a/dev-haskell/mersenne-random-pure64/metadata.xml
+++ b/dev-haskell/mersenne-random-pure64/metadata.xml
@@ -15,7 +15,7 @@
 		classic mersenne twister, along with instances of RandomGen, so the
 		generator can be used with System.Random. The generator should
 		typically be a few times faster than the default StdGen (but a tad
-		slower than the impure &#39;mersenne-random&#39; library based on SIMD
+		slower than the impure 'mersenne-random' library based on SIMD
 		instructions and destructive state updates.
 		
 	</longdescription>

diff --git a/dev-haskell/monad-journal/metadata.xml b/dev-haskell/monad-journal/metadata.xml
index bf88292..63f1d83 100644
--- a/dev-haskell/monad-journal/metadata.xml
+++ b/dev-haskell/monad-journal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/monadcatchio-mtl/metadata.xml b/dev-haskell/monadcatchio-mtl/metadata.xml
index 9ee12f6..bdb998a 100644
--- a/dev-haskell/monadcatchio-mtl/metadata.xml
+++ b/dev-haskell/monadcatchio-mtl/metadata.xml
@@ -10,6 +10,6 @@
 		Provides a monad-transformer version of the @Control.Exception.catch@
 		function. For this, it defines the @MonadCatchIO@ class, a subset of
 		@MonadIO@. It defines proper instances for most monad transformers in
-		the &#39;mtl&#39; library.
+		the 'mtl' library.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/monadcatchio-transformers/metadata.xml b/dev-haskell/monadcatchio-transformers/metadata.xml
index 71ec45b..73de4f1 100644
--- a/dev-haskell/monadcatchio-transformers/metadata.xml
+++ b/dev-haskell/monadcatchio-transformers/metadata.xml
@@ -5,7 +5,7 @@
 	<longdescription>
 		Provides functions to throw and catch exceptions. Unlike the functions from
 		@Control.Exception@, which work in @IO@, these work in any stack of monad
-		transformers (from the &#39;transformers&#39; package) with @IO@ as the base monad.
+		transformers (from the 'transformers' package) with @IO@ as the base monad.
 		You can extend this functionality to other monads, by creating an instance
 		of the @MonadCatchIO@ class.
 	</longdescription>

diff --git a/dev-haskell/nanospec/metadata.xml b/dev-haskell/nanospec/metadata.xml
index 3576907..50a7466 100644
--- a/dev-haskell/nanospec/metadata.xml
+++ b/dev-haskell/nanospec/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		A lightweight implementation of a subset of Hspec&#39;s API with
+		A lightweight implementation of a subset of Hspec's API with
 		minimal dependencies.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/network-multicast/metadata.xml b/dev-haskell/network-multicast/metadata.xml
index 196bd19..1f42cce 100644
--- a/dev-haskell/network-multicast/metadata.xml
+++ b/dev-haskell/network-multicast/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		The &quot;Network.Multicast&quot; module is for sending
+		The "Network.Multicast" module is for sending
 		UDP datagrams over multicast (class D) addresses.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/opengl/metadata.xml b/dev-haskell/opengl/metadata.xml
index 1c35071..23c00a6 100644
--- a/dev-haskell/opengl/metadata.xml
+++ b/dev-haskell/opengl/metadata.xml
@@ -6,7 +6,7 @@
 		A Haskell binding for the OpenGL graphics system (GL, version 3.2) and its
 		accompanying utility library (GLU, version 1.3).
 		
-		OpenGL is the industry&#39;s most widely used and supported 2D and 3D graphics
+		OpenGL is the industry's most widely used and supported 2D and 3D graphics
 		application programming interface (API), incorporating a broad set of
 		rendering, texture mapping, special effects, and other powerful visualization
 		functions. For more information about OpenGL and its various extensions,

diff --git a/dev-haskell/openglraw/metadata.xml b/dev-haskell/openglraw/metadata.xml
index 3fc1f64..04fa3d7 100644
--- a/dev-haskell/openglraw/metadata.xml
+++ b/dev-haskell/openglraw/metadata.xml
@@ -4,7 +4,7 @@
 	<herd>haskell</herd>
 	<longdescription>
 		OpenGLRaw is a raw Haskell binding for the OpenGL 3.2 graphics system and
-		lots of OpenGL extensions. It is basically a 1:1 mapping of OpenGL&#39;s C API,
+		lots of OpenGL extensions. It is basically a 1:1 mapping of OpenGL's C API,
 		intended as a basis for a nicer interface. OpenGLRaw offers access to all
 		necessary functions, tokens and types plus a general facility for loading
 		extension entries. The module hierarchy closely mirrors the naming structure
@@ -13,7 +13,7 @@
 		needed for building this package. If an API entry is not found at runtime, a
 		userError is thrown.
 		
-		OpenGL is the industry&#39;s most widely used and supported 2D and 3D graphics
+		OpenGL is the industry's most widely used and supported 2D and 3D graphics
 		application programming interface (API), incorporating a broad set of
 		rendering, texture mapping, special effects, and other powerful visualization
 		functions. For more information about OpenGL and its various extensions,

diff --git a/dev-haskell/options/metadata.xml b/dev-haskell/options/metadata.xml
index 51a1b75..94fb330 100644
--- a/dev-haskell/options/metadata.xml
+++ b/dev-haskell/options/metadata.xml
@@ -18,12 +18,12 @@
 		&amp;#x20;   , optQuiet :: Bool
 		&amp;#x20;   &amp;#x7d;
 		
-		instance &#39;Options&#39; MainOptions where
+		instance 'Options' MainOptions where
 		&amp;#x20;   defineOptions = pure MainOptions
-		&amp;#x20;       \&lt;*\&gt; simpleOption \&quot;message\&quot; \&quot;Hello world!\&quot;
-		&amp;#x20;           \&quot;A message to show the user.\&quot;
-		&amp;#x20;       \&lt;*\&gt; simpleOption \&quot;quiet\&quot; False
-		&amp;#x20;           \&quot;Whether to be quiet.\&quot;
+		&amp;#x20;       \&lt;*\&gt; simpleOption \"message\" \"Hello world!\"
+		&amp;#x20;           \"A message to show the user.\"
+		&amp;#x20;       \&lt;*\&gt; simpleOption \"quiet\" False
+		&amp;#x20;           \"Whether to be quiet.\"
 		
 		main :: IO ()
 		main = runCommand $ \\opts args -&gt; do
@@ -34,7 +34,7 @@
 		
 		&gt;$ ./hello
 		&gt;Hello world!
-		&gt;$ ./hello --message=&#39;ciao mondo&#39;
+		&gt;$ ./hello --message='ciao mondo'
 		&gt;ciao mondo
 		&gt;$ ./hello --quiet
 		&gt;$
@@ -52,7 +52,7 @@
 		&gt;Application Options:
 		&gt;  --message :: text
 		&gt;    A message to show the user.
-		&gt;    default: &quot;Hello world!&quot;
+		&gt;    default: "Hello world!"
 		&gt;  --quiet :: bool
 		&gt;    Whether to be quiet.
 		&gt;    default: false

diff --git a/dev-haskell/patience/metadata.xml b/dev-haskell/patience/metadata.xml
index 24a8de9..3799b2c 100644
--- a/dev-haskell/patience/metadata.xml
+++ b/dev-haskell/patience/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		This library implements the \&quot;patience diff\&quot; algorithm, as well as the patience
+		This library implements the \"patience diff\" algorithm, as well as the patience
 		algorithm for the longest increasing subsequence problem.
 		
 		Patience diff computes the difference between two lists, for example the

diff --git a/dev-haskell/pcap/metadata.xml b/dev-haskell/pcap/metadata.xml
index ba093b3..a96dcd6 100644
--- a/dev-haskell/pcap/metadata.xml
+++ b/dev-haskell/pcap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/pcre-light/metadata.xml b/dev-haskell/pcre-light/metadata.xml
index 2062799..7b735c3 100644
--- a/dev-haskell/pcre-light/metadata.xml
+++ b/dev-haskell/pcre-light/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/pipes/metadata.xml b/dev-haskell/pipes/metadata.xml
index 739bd90..9ca0446 100644
--- a/dev-haskell/pipes/metadata.xml
+++ b/dev-haskell/pipes/metadata.xml
@@ -3,12 +3,12 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		\&quot;Coroutines done right\&quot;.  This library generalizes iteratees and coroutines
+		\"Coroutines done right\".  This library generalizes iteratees and coroutines
 		simply and elegantly.
 		
 		Advantages over traditional iteratee\/coroutine implementations:
 		
-		* /Concise API/: Use three simple commands: (&#39;&gt;-&gt;&#39;), &#39;request&#39;, and &#39;respond&#39;
+		* /Concise API/: Use three simple commands: ('&gt;-&gt;'), 'request', and 'respond'
 		
 		* /Bidirectionality/: Implement duplex channels
 		
@@ -25,8 +25,8 @@
 		
 		* /Extensive Documentation/: Second to none!
 		
-		Import &quot;Control.Proxy&quot; to use the library.
+		Import "Control.Proxy" to use the library.
 		
-		Read &quot;Control.Proxy.Tutorial&quot; for an extensive tutorial.
+		Read "Control.Proxy.Tutorial" for an extensive tutorial.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/preprocessor-tools/metadata.xml b/dev-haskell/preprocessor-tools/metadata.xml
index 217bd1b..67fa8c9 100644
--- a/dev-haskell/preprocessor-tools/metadata.xml
+++ b/dev-haskell/preprocessor-tools/metadata.xml
@@ -4,7 +4,7 @@
 	<herd>haskell</herd>
 	<longdescription>
 		This library provides a quick-and-dirty (but often effective)
-		method for extending Haskell&#39;s syntax using a custom
+		method for extending Haskell's syntax using a custom
 		preprocessor.  It parses Haskell into a bare-bones AST with just
 		enough knowledge of the syntax to preserve nesting, and then
 		allows transformations on the AST.

diff --git a/dev-haskell/pretty-show/metadata.xml b/dev-haskell/pretty-show/metadata.xml
index 6818b93..785d01b 100644
--- a/dev-haskell/pretty-show/metadata.xml
+++ b/dev-haskell/pretty-show/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		We provide a library and an executable for working with derived &#39;Show&#39;
-		instances. By using the library, we can parse derived &#39;Show&#39; instances into a
+		We provide a library and an executable for working with derived 'Show'
+		instances. By using the library, we can parse derived 'Show' instances into a
 		generic data structure. The @ppsh@ tool uses the library to produce
-		human-readable versions of &#39;Show&#39; instances, which can be quite handy for
+		human-readable versions of 'Show' instances, which can be quite handy for
 		debugging Haskell programs.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/psqueue/metadata.xml b/dev-haskell/psqueue/metadata.xml
index 1c09f17..564ad8b 100644
--- a/dev-haskell/psqueue/metadata.xml
+++ b/dev-haskell/psqueue/metadata.xml
@@ -5,7 +5,7 @@
 	<longdescription>
 		A /priority search queue/ efficiently supports the
 		opperations of both a search tree and a priority queue. A
-		&#39;Binding&#39; is a product of a key and a priority.  Bindings
+		'Binding' is a product of a key and a priority.  Bindings
 		can be inserted, deleted, modified and queried in
 		logarithmic time, and the binding with the least priority
 		can be retrieved in constant time.  A queue can be built

diff --git a/dev-haskell/psqueues/metadata.xml b/dev-haskell/psqueues/metadata.xml
index d4c0b90..f44e265 100644
--- a/dev-haskell/psqueues/metadata.xml
+++ b/dev-haskell/psqueues/metadata.xml
@@ -8,7 +8,7 @@
 		three different flavors.
 		
 		* @OrdPSQ k p v@, which uses the @Ord k@ instance to provide fast insertion,
-		deletion and lookup. This implementation is based on Ralf Hinze&#39;s
+		deletion and lookup. This implementation is based on Ralf Hinze's
 		&lt;http://citeseer.ist.psu.edu/hinze01simple.html A Simple Implementation Technique for Priority Search Queues&gt;.
 		Hence, it is similar to the
 		&lt;http://hackage.haskell.org/package/PSQueue PSQueue&gt; library, although it is
@@ -19,7 +19,7 @@
 		(like @IntMap@) with an additional min-heap property.
 		
 		* @HashPSQ k p v@ is a fairly straightforward extension of @IntPSQ@: it
-		simply uses the keys&#39; hashes as indices in the @IntPSQ@. If there are any
+		simply uses the keys' hashes as indices in the @IntPSQ@. If there are any
 		hash collisions, it uses an @OrdPSQ@ to resolve those. The performance of
 		this implementation is comparable to that of @IntPSQ@, but it is more widely
 		applicable since the keys are not restricted to @Int@, but rather to any
@@ -43,6 +43,6 @@
 		
 		* Schedulers;
 		
-		* Pathfinding algorithms, such as Dijkstra&#39;s and A*.
+		* Pathfinding algorithms, such as Dijkstra's and A*.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/regex-base/metadata.xml b/dev-haskell/regex-base/metadata.xml
index f17f7f7..647d366 100644
--- a/dev-haskell/regex-base/metadata.xml
+++ b/dev-haskell/regex-base/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>haskell</herd>

diff --git a/dev-haskell/regex-compat-tdfa/metadata.xml b/dev-haskell/regex-compat-tdfa/metadata.xml
index b74f210..da6e952 100644
--- a/dev-haskell/regex-compat-tdfa/metadata.xml
+++ b/dev-haskell/regex-compat-tdfa/metadata.xml
@@ -9,10 +9,10 @@
 	<longdescription>
 		One module layer over regex-tdfa to replace Text.Regex.
 		
-		regex-compat can&#39;t use Unicode characters correctly because
+		regex-compat can't use Unicode characters correctly because
 		of using regex-posix. This is not good for Unicode users.
 		
-		I modified regex-compat to use regex-tdfa for solving today&#39;s
+		I modified regex-compat to use regex-tdfa for solving today's
 		problem.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/regex-compat/metadata.xml b/dev-haskell/regex-compat/metadata.xml
index f17f7f7..647d366 100644
--- a/dev-haskell/regex-compat/metadata.xml
+++ b/dev-haskell/regex-compat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>haskell</herd>

diff --git a/dev-haskell/regex-pcre-builtin/metadata.xml b/dev-haskell/regex-pcre-builtin/metadata.xml
index f6f96ae..726ce5a 100644
--- a/dev-haskell/regex-pcre-builtin/metadata.xml
+++ b/dev-haskell/regex-pcre-builtin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/regex-posix/metadata.xml b/dev-haskell/regex-posix/metadata.xml
index e95faa9..5f88eca 100644
--- a/dev-haskell/regex-posix/metadata.xml
+++ b/dev-haskell/regex-posix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/regex-tdfa-rc/metadata.xml b/dev-haskell/regex-tdfa-rc/metadata.xml
index c84a9eb..8fbddf6 100644
--- a/dev-haskell/regex-tdfa-rc/metadata.xml
+++ b/dev-haskell/regex-tdfa-rc/metadata.xml
@@ -6,6 +6,6 @@
 		<email>haskell@gentoo.org</email>
 	</maintainer>
 	<longdescription>
-		A new all Haskell &quot;tagged&quot; DFA regex engine, inspired by libtre (fork by Roman Cheplyaka)
+		A new all Haskell "tagged" DFA regex engine, inspired by libtre (fork by Roman Cheplyaka)
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/regex-tdfa/metadata.xml b/dev-haskell/regex-tdfa/metadata.xml
index 5ecb166..d96445e 100644
--- a/dev-haskell/regex-tdfa/metadata.xml
+++ b/dev-haskell/regex-tdfa/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		A new all Haskell &quot;tagged&quot; DFA regex engine, inspired by libtre
+		A new all Haskell "tagged" DFA regex engine, inspired by libtre
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/rfc5051/metadata.xml b/dev-haskell/rfc5051/metadata.xml
index 0b09a7b..790e918 100644
--- a/dev-haskell/rfc5051/metadata.xml
+++ b/dev-haskell/rfc5051/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<use>
-		<flag name='mkunicodedata'>build codes generator itself</flag>
+		<flag name="mkunicodedata">build codes generator itself</flag>
 	</use>
 	<longdescription>
 		This library implements @i;unicode-casemap@,
@@ -13,7 +13,7 @@
 		dependency that depends on a large C library, and rfc5051 might be better
 		for some purposes.
 		
-		Here is a list of strings sorted by the Prelude&#39;s @sort@ function:
+		Here is a list of strings sorted by the Prelude's @sort@ function:
 		
 		@Abe Oeb abe ab&amp;#233; oeb &amp;#193;be &amp;#196;be &amp;#212;eb &amp;#225;be &amp;#228;be &amp;#244;eb@
 		

diff --git a/dev-haskell/shakespeare-js/metadata.xml b/dev-haskell/shakespeare-js/metadata.xml
index e0bbd82..d794eef 100644
--- a/dev-haskell/shakespeare-js/metadata.xml
+++ b/dev-haskell/shakespeare-js/metadata.xml
@@ -13,8 +13,8 @@
 		shakespeare-js was originally called julius, and shakespeare originated from the hamlet template package.
 	</longdescription>
 	<use>
-		<flag name='test_coffee'>Test coffee.</flag>
-		<flag name='test_export'>Test export.</flag>
-		<flag name='test_roy'>Test roy.</flag>
+		<flag name="test_coffee">Test coffee.</flag>
+		<flag name="test_export">Test export.</flag>
+		<flag name="test_roy">Test roy.</flag>
         </use>
 </pkgmetadata>

diff --git a/dev-haskell/shakespeare-text/metadata.xml b/dev-haskell/shakespeare-text/metadata.xml
index 2cca42a..23acf0f 100644
--- a/dev-haskell/shakespeare-text/metadata.xml
+++ b/dev-haskell/shakespeare-text/metadata.xml
@@ -5,7 +5,7 @@
 	<longdescription>
 		interpolation with quasi-quotation: stick haskell variables into haskell strings
 		
-		Note there is no dependency on haskell-src-extras. If you don&#39;t mind that dependency, you may want to look at using these packages: Interpolation, interpolatedstring-perl6, interpolatedstring-qq.
+		Note there is no dependency on haskell-src-extras. If you don't mind that dependency, you may want to look at using these packages: Interpolation, interpolatedstring-perl6, interpolatedstring-qq.
 		
 		This package has 1 other general feature that those others may not (but would be easy to duplicate): instead of using quasi-quoting you can also use an external file. It also has url/embeding interpolation, with \@ and \^, which are used in Yesod.
 		

diff --git a/dev-haskell/shakespeare/metadata.xml b/dev-haskell/shakespeare/metadata.xml
index 28c1ef2..de1e06e 100644
--- a/dev-haskell/shakespeare/metadata.xml
+++ b/dev-haskell/shakespeare/metadata.xml
@@ -11,8 +11,8 @@
 		Please see the documentation at &lt;http://docs.yesodweb.com/book/hamlet/&gt; for more details.
 	</longdescription>
 	<use>
-		<flag name='test_export'>Test export.</flag>
-		<flag name='test_coffee'>Render tests through coffeescript render function.</flag>
-		<flag name='test_roy'>Render tests through roy render function.</flag>
+		<flag name="test_export">Test export.</flag>
+		<flag name="test_coffee">Render tests through coffeescript render function.</flag>
+		<flag name="test_roy">Render tests through roy render function.</flag>
         </use>
 </pkgmetadata>

diff --git a/dev-haskell/shellish/metadata.xml b/dev-haskell/shellish/metadata.xml
index e8f79ca..1815703 100644
--- a/dev-haskell/shellish/metadata.xml
+++ b/dev-haskell/shellish/metadata.xml
@@ -4,7 +4,7 @@
 	<herd>haskell</herd>
 	<longdescription>
 		The shellisg package provides a single module for convenient
-		\&quot;systems\&quot; programming in Haskell, similar in spirit to POSIX
+		\"systems\" programming in Haskell, similar in spirit to POSIX
 		shells or PERL.
 		
 		* Elegance and safety is sacrificed for conciseness and

diff --git a/dev-haskell/shelly/metadata.xml b/dev-haskell/shelly/metadata.xml
index 12bd177..381bd9f 100644
--- a/dev-haskell/shelly/metadata.xml
+++ b/dev-haskell/shelly/metadata.xml
@@ -25,6 +25,6 @@
 		<remote-id type="github">yesodweb/Shelly.hs</remote-id>
 	</upstream>
 	<use>
-		<flag name='lifted'>run the tests against Shelly.Lifted</flag>
+		<flag name="lifted">run the tests against Shelly.Lifted</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-haskell/snap-core/metadata.xml b/dev-haskell/snap-core/metadata.xml
index 8c38256..c5821ca 100644
--- a/dev-haskell/snap-core/metadata.xml
+++ b/dev-haskell/snap-core/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<use>
-		<flag name='portable'>No non-haskell unportable code.</flag>
+		<flag name="portable">No non-haskell unportable code.</flag>
 	</use>
 	<longdescription>
 		Snap is a simple and fast web development framework and server written in
@@ -18,8 +18,8 @@
 		
 		2. Type aliases and helper functions for Iteratee I/O
 		
-		3. A monad for programming web handlers called \&quot;Snap\&quot;, inspired by
-		happstack&#39;s (&lt;http://happstack.com/index.html&gt;), which allows:
+		3. A monad for programming web handlers called \"Snap\", inspired by
+		happstack's (&lt;http://happstack.com/index.html&gt;), which allows:
 		
 		* Stateful access to the HTTP request and response objects
 		
@@ -29,8 +29,8 @@
 		* Early termination of the computation if you know early what you want
 		to return and want to prevent further monadic processing
 		
-		/Quick start/: The &#39;Snap&#39; monad and HTTP definitions are in &quot;Snap.Core&quot;,
-		some iteratee utilities are in &quot;Snap.Iteratee&quot;.
+		/Quick start/: The 'Snap' monad and HTTP definitions are in "Snap.Core",
+		some iteratee utilities are in "Snap.Iteratee".
 		
 		Higher-level facilities for building web applications (like user/session
 		management, component interfaces, data modeling, etc.) are planned but not

diff --git a/dev-haskell/snap-server/metadata.xml b/dev-haskell/snap-server/metadata.xml
index 18bd089..b90bc55 100644
--- a/dev-haskell/snap-server/metadata.xml
+++ b/dev-haskell/snap-server/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<use>
-		<flag name='openssl'>enable https support using <pkg>dev-haskell/hsopenssl</pkg></flag>
-		<flag name='portable'>no non-haskell unportable code.</flag>
+		<flag name="openssl">enable https support using <pkg>dev-haskell/hsopenssl</pkg></flag>
+		<flag name="portable">no non-haskell unportable code.</flag>
 	</use>
 	<longdescription>
 		Snap is a simple and fast web development framework and server written in

diff --git a/dev-haskell/stringable/metadata.xml b/dev-haskell/stringable/metadata.xml
index f8a154b..f0e023f 100644
--- a/dev-haskell/stringable/metadata.xml
+++ b/dev-haskell/stringable/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		&#39;Data.Stringable&#39; provides a type class with a set of functions for
+		'Data.Stringable' provides a type class with a set of functions for
 		converting to and from the most often used string-linke types in
 		Haskell.
 	</longdescription>

diff --git a/dev-haskell/stringprep/metadata.xml b/dev-haskell/stringprep/metadata.xml
index aa8f1bd..6ec3551 100644
--- a/dev-haskell/stringprep/metadata.xml
+++ b/dev-haskell/stringprep/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		Implements the &quot;StringPrep&quot; algorithm
+		Implements the "StringPrep" algorithm
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/system-filepath/metadata.xml b/dev-haskell/system-filepath/metadata.xml
index 1d8d4bd..fe24026 100644
--- a/dev-haskell/system-filepath/metadata.xml
+++ b/dev-haskell/system-filepath/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/tagsoup/metadata.xml b/dev-haskell/tagsoup/metadata.xml
index b0dd1f7..d9b6822 100644
--- a/dev-haskell/tagsoup/metadata.xml
+++ b/dev-haskell/tagsoup/metadata.xml
@@ -8,10 +8,10 @@
 		from the web. The library also provides useful functions to extract information
 		from an HTML document, making it ideal for screen-scraping.
 		
-		Users should start from the &quot;Text.HTML.TagSoup&quot; module.
+		Users should start from the "Text.HTML.TagSoup" module.
 	</longdescription>
 	<use>
-		<flag name='download'>Build with Download module.</flag>
-		<flag name='testprog'>Build the test program.</flag>
+		<flag name="download">Build with Download module.</flag>
+		<flag name="testprog">Build the test program.</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-haskell/tasty-quickcheck/metadata.xml b/dev-haskell/tasty-quickcheck/metadata.xml
index baa19de..f5025fd 100644
--- a/dev-haskell/tasty-quickcheck/metadata.xml
+++ b/dev-haskell/tasty-quickcheck/metadata.xml
@@ -6,6 +6,6 @@
 		QuickCheck support for the Tasty test framework.
 	</longdescription>
 <use>
-  <flag name='old-quickcheck'>Use Quick-Check &lt; 2.7.</flag>
+  <flag name="old-quickcheck">Use Quick-Check &lt; 2.7.</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-haskell/temporary-rc/metadata.xml b/dev-haskell/temporary-rc/metadata.xml
index b8fc68e..cbf8cac 100644
--- a/dev-haskell/temporary-rc/metadata.xml
+++ b/dev-haskell/temporary-rc/metadata.xml
@@ -4,9 +4,9 @@
 	<herd>haskell</herd>
 	<longdescription>
 		The functions for creating temporary files and directories in the base library are quite limited. The unixutils
-		package contains some good ones, but they aren&#39;t portable to Windows.
+		package contains some good ones, but they aren't portable to Windows.
 		This library just repackages the Cabal implementations of its own temporary file and folder functions so that
 		you can use them without linking against Cabal or depending on it being installed.
-		This is a better maintained fork of the &quot;temporary&quot; package.
+		This is a better maintained fork of the "temporary" package.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/temporary/metadata.xml b/dev-haskell/temporary/metadata.xml
index 606821e..4abec69 100644
--- a/dev-haskell/temporary/metadata.xml
+++ b/dev-haskell/temporary/metadata.xml
@@ -4,7 +4,7 @@
 	<herd>haskell</herd>
 	<longdescription>
 		The functions for creating temporary files and directories in the base library are quite limited. The unixutils
-		package contains some good ones, but they aren&#39;t portable to Windows.
+		package contains some good ones, but they aren't portable to Windows.
 		This library just repackages the Cabal implementations of its own temporary file and folder functions so that
 		you can use them without linking against Cabal or depending on it being installed.
 	</longdescription>

diff --git a/dev-haskell/text-icu/metadata.xml b/dev-haskell/text-icu/metadata.xml
index f187cf8..90f31b5 100644
--- a/dev-haskell/text-icu/metadata.xml
+++ b/dev-haskell/text-icu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/tf-random/metadata.xml b/dev-haskell/tf-random/metadata.xml
index 73f4792..7e48a86 100644
--- a/dev-haskell/tf-random/metadata.xml
+++ b/dev-haskell/tf-random/metadata.xml
@@ -7,9 +7,9 @@
 		
 		The package provides the following:
 		
-		* A splittable PRNG that implements the standard &#39;System.Random.RandomGen&#39; class.
+		* A splittable PRNG that implements the standard 'System.Random.RandomGen' class.
 		
-		* The generator also implements an alternative version of the &#39;System.Random.TF.Gen.RandomGen&#39; class (exported from &quot;System.Random.TF.Gen&quot;), which requires the generator to return pseudorandom integers from the full 32-bit range, and contains an n-way split function.
+		* The generator also implements an alternative version of the 'System.Random.TF.Gen.RandomGen' class (exported from "System.Random.TF.Gen"), which requires the generator to return pseudorandom integers from the full 32-bit range, and contains an n-way split function.
 		
 		* An alternative version of the @Random@ class is provided, which is linked to the new @RandomGen@ class, together with @Random@ instances for some integral types.
 		

diff --git a/dev-haskell/th-orphans/metadata.xml b/dev-haskell/th-orphans/metadata.xml
index 2fa13b1..6b4efe7 100644
--- a/dev-haskell/th-orphans/metadata.xml
+++ b/dev-haskell/th-orphans/metadata.xml
@@ -5,7 +5,7 @@
 	<longdescription>
 		Orphan instances for TH datatypes.  In particular, instances
 		for Ord and Lift, as well as a few missing Show / Eq.  These
-		instances used to live in haskell-src-meta, and that&#39;s where
+		instances used to live in haskell-src-meta, and that's where
 		the version number started.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/time-compat/metadata.xml b/dev-haskell/time-compat/metadata.xml
index 025d913..3285b1a 100644
--- a/dev-haskell/time-compat/metadata.xml
+++ b/dev-haskell/time-compat/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		Compatibility with the &lt;old-time&gt; package for the \&quot;new\&quot;
+		Compatibility with the &lt;old-time&gt; package for the \"new\"
 		&lt;time&gt; package.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/timezone-olson/metadata.xml b/dev-haskell/timezone-olson/metadata.xml
index bc6d1b8..8305a0c 100644
--- a/dev-haskell/timezone-olson/metadata.xml
+++ b/dev-haskell/timezone-olson/metadata.xml
@@ -9,7 +9,7 @@
 		information about this format, see
 		&lt;http://www.twinsun.com/tz/tz-link.htm&gt;. Functions
 		are provided for converting the parsed data into
-		&#39;TimeZoneSeries&#39; objects from the timezone-series
+		'TimeZoneSeries' objects from the timezone-series
 		package. On many platforms, binary Olson timezone
 		files suitable for use with this package are
 		available in the directory /usr/share/zoneinfo

diff --git a/dev-haskell/tls/metadata.xml b/dev-haskell/tls/metadata.xml
index 3fc8510..bb8953c 100644
--- a/dev-haskell/tls/metadata.xml
+++ b/dev-haskell/tls/metadata.xml
@@ -17,7 +17,7 @@
 		ciphers, compressions and certificates functions.
 	</longdescription>
 	<use>
-		<flag name='compat'>Accept SSLv2 compatible handshake.</flag>
-		<flag name='network'>Use the base network library.</flag>
+		<flag name="compat">Accept SSLv2 compatible handshake.</flag>
+		<flag name="network">Use the base network library.</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-haskell/transformers/metadata.xml b/dev-haskell/transformers/metadata.xml
index 4235374..4e0c755 100644
--- a/dev-haskell/transformers/metadata.xml
+++ b/dev-haskell/transformers/metadata.xml
@@ -8,7 +8,7 @@
 	</maintainer>
 	<longdescription>
 		Haskell 98 part of a monad transformer library, inspired by the paper
-		\&quot;Functional Programming with Overloading and Higher-Order Polymorphism\&quot;,
+		\"Functional Programming with Overloading and Higher-Order Polymorphism\",
 		by Mark P Jones, in /Advanced School of Functional Programming/, 1995
 		(&lt;http://web.cecs.pdx.edu/~mpj/pubs/springschool.html&gt;).
 		

diff --git a/dev-haskell/uniplate/metadata.xml b/dev-haskell/uniplate/metadata.xml
index 97b3587..8885d42 100644
--- a/dev-haskell/uniplate/metadata.xml
+++ b/dev-haskell/uniplate/metadata.xml
@@ -11,25 +11,25 @@
 		To get started with Uniplate you should import one of the three following
 		modules:
 		
-		* &quot;Data.Generics.Uniplate.Data&quot; - to quickly start writing generic functions.
+		* "Data.Generics.Uniplate.Data" - to quickly start writing generic functions.
 		Most users should start by importing this module.
 		
-		* &quot;Data.Generics.Uniplate.Direct&quot; - a replacement for &quot;Data.Generics.Uniplate.Data&quot;
+		* "Data.Generics.Uniplate.Direct" - a replacement for "Data.Generics.Uniplate.Data"
 		with substantially higher performance (around 5 times), but requires writing
 		instance declarations.
 		
-		* &quot;Data.Generics.Uniplate.Operations&quot; - definitions of all the operations defined
+		* "Data.Generics.Uniplate.Operations" - definitions of all the operations defined
 		by Uniplate. Both the above two modules re-export this module.
 		
 		In addition, some users may want to make use of the following modules:
 		
-		* &quot;Data.Generics.Uniplate.Zipper&quot; - a zipper built on top of Uniplate instances.
+		* "Data.Generics.Uniplate.Zipper" - a zipper built on top of Uniplate instances.
 		
-		* &quot;Data.Generics.SYB&quot; - users transitioning from the Scrap Your Boilerplate library.
+		* "Data.Generics.SYB" - users transitioning from the Scrap Your Boilerplate library.
 		
-		* &quot;Data.Generics.Compos&quot; - users transitioning from the Compos library.
+		* "Data.Generics.Compos" - users transitioning from the Compos library.
 		
-		* &quot;Data.Generics.Uniplate.DataOnly&quot; - users making use of both @Data@ and @Direct@
+		* "Data.Generics.Uniplate.DataOnly" - users making use of both @Data@ and @Direct@
 		to avoid getting instance conflicts.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/uri/metadata.xml b/dev-haskell/uri/metadata.xml
index efb9b12..f030de8 100644
--- a/dev-haskell/uri/metadata.xml
+++ b/dev-haskell/uri/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-haskell/uuagc/metadata.xml b/dev-haskell/uuagc/metadata.xml
index dd02a1b..7d775a8 100644
--- a/dev-haskell/uuagc/metadata.xml
+++ b/dev-haskell/uuagc/metadata.xml
@@ -9,6 +9,6 @@
 		Generates Haskell files from an attribute grammar specification
 	</longdescription>
 	<use>
-		<flag name='with-loag'>Use <pkg>dev-haskell/minisat</pkg> external SAT-solver to schedule all Linear Ordered AGs.</flag>
+		<flag name="with-loag">Use <pkg>dev-haskell/minisat</pkg> external SAT-solver to schedule all Linear Ordered AGs.</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-haskell/vector-th-unbox/metadata.xml b/dev-haskell/vector-th-unbox/metadata.xml
index 4ea423e..25a618b 100644
--- a/dev-haskell/vector-th-unbox/metadata.xml
+++ b/dev-haskell/vector-th-unbox/metadata.xml
@@ -6,6 +6,6 @@
 		A Template Haskell deriver for unboxed vectors, given a pair of coercion
 		functions to and from some existing type with an Unbox instance.
 		
-		Refer to &quot;Data.Vector.Unboxed.Deriving&quot; for documentation and examples.
+		Refer to "Data.Vector.Unboxed.Deriving" for documentation and examples.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/wai-app-static/metadata.xml b/dev-haskell/wai-app-static/metadata.xml
index a5800fa..9df95da 100644
--- a/dev-haskell/wai-app-static/metadata.xml
+++ b/dev-haskell/wai-app-static/metadata.xml
@@ -6,6 +6,6 @@
 		Also provides some helper functions and datatypes for use outside of WAI.
 	</longdescription>
 	<use>
-		<flag name='print'>print debug info.</flag>
+		<flag name="print">print debug info.</flag>
         </use>
 </pkgmetadata>

diff --git a/dev-haskell/wl-pprint/metadata.xml b/dev-haskell/wl-pprint/metadata.xml
index ec54d29..3b54eb5 100644
--- a/dev-haskell/wl-pprint/metadata.xml
+++ b/dev-haskell/wl-pprint/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<longdescription>
-		This is a pretty printing library based on Wadler&#39;s paper &quot;A Prettier
-		Printer&quot;.  See the haddocks for full info.  This version allows the
-		library user to declare overlapping instances of the &#39;Pretty&#39; class.
+		This is a pretty printing library based on Wadler's paper "A Prettier
+		Printer".  See the haddocks for full info.  This version allows the
+		library user to declare overlapping instances of the 'Pretty' class.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-haskell/yesod-auth/metadata.xml b/dev-haskell/yesod-auth/metadata.xml
index 9012d9b..ea87983 100644
--- a/dev-haskell/yesod-auth/metadata.xml
+++ b/dev-haskell/yesod-auth/metadata.xml
@@ -6,6 +6,6 @@
                 Authentication for Yesod.
         </longdescription>
 <use>
-  <flag name='network-uri'>Get Network.URI from the network-uri package</flag>
+  <flag name="network-uri">Get Network.URI from the network-uri package</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-haskell/yesod-form/metadata.xml b/dev-haskell/yesod-form/metadata.xml
index 2d6eeda..c6237ef 100644
--- a/dev-haskell/yesod-form/metadata.xml
+++ b/dev-haskell/yesod-form/metadata.xml
@@ -6,6 +6,6 @@
                 Form handling support for Yesod Web Framework
         </longdescription>
 <use>
-  <flag name='network-uri'>Get Network.URI from the network-uri package</flag>
+  <flag name="network-uri">Get Network.URI from the network-uri package</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-haskell/zlib/metadata.xml b/dev-haskell/zlib/metadata.xml
index 36750ef..2f012e4 100644
--- a/dev-haskell/zlib/metadata.xml
+++ b/dev-haskell/zlib/metadata.xml
@@ -5,8 +5,8 @@
 	<longdescription>
 		This package provides a pure interface for compressing and
 		decompressing streams of data represented as lazy
-		&#39;ByteString&#39;s. It uses the zlib C library so it has high
-		performance. It supports the \&quot;zlib\&quot;, \&quot;gzip\&quot; and \&quot;raw\&quot;
+		'ByteString's. It uses the zlib C library so it has high
+		performance. It supports the \"zlib\", \"gzip\" and \"raw\"
 		compression formats.
 		
 		It provides a convenient high level API suitable for most

diff --git a/dev-java/absolutelayout/metadata.xml b/dev-java/absolutelayout/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/absolutelayout/metadata.xml
+++ b/dev-java/absolutelayout/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/annogen/metadata.xml b/dev-java/annogen/metadata.xml
index 25da11d..3456324 100644
--- a/dev-java/annogen/metadata.xml
+++ b/dev-java/annogen/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/aopalliance/metadata.xml b/dev-java/aopalliance/metadata.xml
index 742f6b6..33f1f32 100644
--- a/dev-java/aopalliance/metadata.xml
+++ b/dev-java/aopalliance/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/appframework/metadata.xml b/dev-java/appframework/metadata.xml
index fd5a554..54f3f7f 100644
--- a/dev-java/appframework/metadata.xml
+++ b/dev-java/appframework/metadata.xml
@@ -11,4 +11,3 @@
     * Persistent session state: support for automatically and selectively saving GUI state from one run of an application to the next.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/asm/metadata.xml b/dev-java/asm/metadata.xml
index d399bf7..1ef28ab 100644
--- a/dev-java/asm/metadata.xml
+++ b/dev-java/asm/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<herd>java</herd>
 

diff --git a/dev-java/aspectj/metadata.xml b/dev-java/aspectj/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/aspectj/metadata.xml
+++ b/dev-java/aspectj/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/bctsp/metadata.xml b/dev-java/bctsp/metadata.xml
index 82a57cc..8335e2c 100644
--- a/dev-java/bctsp/metadata.xml
+++ b/dev-java/bctsp/metadata.xml
@@ -5,4 +5,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/beansbinding/metadata.xml b/dev-java/beansbinding/metadata.xml
index 6f5f177..12d1c22 100644
--- a/dev-java/beansbinding/metadata.xml
+++ b/dev-java/beansbinding/metadata.xml
@@ -6,4 +6,3 @@
 Beans Binding (JSR 295) is about keeping the properties of two beans in sync. This project provides the reference implementation of Beans Binding, with an additional emphasis on the ability to bind to Swing components, and easy integration with IDEs such as NetBeans.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/bsf/metadata.xml b/dev-java/bsf/metadata.xml
index abc882c..45f6df3 100644
--- a/dev-java/bsf/metadata.xml
+++ b/dev-java/bsf/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/bytecode/metadata.xml b/dev-java/bytecode/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/bytecode/metadata.xml
+++ b/dev-java/bytecode/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/cacao/metadata.xml b/dev-java/cacao/metadata.xml
index d3217b4..5bb6d0c 100644
--- a/dev-java/cacao/metadata.xml
+++ b/dev-java/cacao/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/cal10n/metadata.xml b/dev-java/cal10n/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/cal10n/metadata.xml
+++ b/dev-java/cal10n/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/classmate/metadata.xml b/dev-java/classmate/metadata.xml
index a983ca9..d3dc620 100644
--- a/dev-java/classmate/metadata.xml
+++ b/dev-java/classmate/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="github">cowtowncoder/java-classmate</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/commons-codec/metadata.xml b/dev-java/commons-codec/metadata.xml
index 4ddd96d..51152b1 100644
--- a/dev-java/commons-codec/metadata.xml
+++ b/dev-java/commons-codec/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/commons-compress/metadata.xml b/dev-java/commons-compress/metadata.xml
index fed3658..266fe13 100644
--- a/dev-java/commons-compress/metadata.xml
+++ b/dev-java/commons-compress/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/commons-primitives/metadata.xml b/dev-java/commons-primitives/metadata.xml
index 72db416..7c6a776 100644
--- a/dev-java/commons-primitives/metadata.xml
+++ b/dev-java/commons-primitives/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/db4o-jdk11/metadata.xml b/dev-java/db4o-jdk11/metadata.xml
index 21237a6..08b5ba8 100644
--- a/dev-java/db4o-jdk11/metadata.xml
+++ b/dev-java/db4o-jdk11/metadata.xml
@@ -7,4 +7,3 @@
 	</maintainer>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/db4o-jdk12/metadata.xml b/dev-java/db4o-jdk12/metadata.xml
index 21237a6..08b5ba8 100644
--- a/dev-java/db4o-jdk12/metadata.xml
+++ b/dev-java/db4o-jdk12/metadata.xml
@@ -7,4 +7,3 @@
 	</maintainer>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/db4o-jdk5/metadata.xml b/dev-java/db4o-jdk5/metadata.xml
index 21237a6..08b5ba8 100644
--- a/dev-java/db4o-jdk5/metadata.xml
+++ b/dev-java/db4o-jdk5/metadata.xml
@@ -7,4 +7,3 @@
 	</maintainer>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/dict4j/metadata.xml b/dev-java/dict4j/metadata.xml
index 1436ee7..095f02c 100644
--- a/dev-java/dict4j/metadata.xml
+++ b/dev-java/dict4j/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/dnsjava/metadata.xml b/dev-java/dnsjava/metadata.xml
index c76c838..5da579a 100644
--- a/dev-java/dnsjava/metadata.xml
+++ b/dev-java/dnsjava/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="sourceforge">http://sourceforge.net/projects/dnsjava/</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/dsiutils/metadata.xml b/dev-java/dsiutils/metadata.xml
index 706df8c..aa2a2dc 100644
--- a/dev-java/dsiutils/metadata.xml
+++ b/dev-java/dsiutils/metadata.xml
@@ -11,4 +11,3 @@
 		the material in a single place.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/fec/metadata.xml b/dev-java/fec/metadata.xml
index a40f7c1..54d0836 100644
--- a/dev-java/fec/metadata.xml
+++ b/dev-java/fec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-java/fontbox/metadata.xml b/dev-java/fontbox/metadata.xml
index c075010..bc6017b 100644
--- a/dev-java/fontbox/metadata.xml
+++ b/dev-java/fontbox/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/forehead/metadata.xml b/dev-java/forehead/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/forehead/metadata.xml
+++ b/dev-java/forehead/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/gnu-classpath-inetlib/metadata.xml b/dev-java/gnu-classpath-inetlib/metadata.xml
index 50b68a3..b4e7998 100644
--- a/dev-java/gnu-classpath-inetlib/metadata.xml
+++ b/dev-java/gnu-classpath-inetlib/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/gnu-classpath/metadata.xml b/dev-java/gnu-classpath/metadata.xml
index 4feb4c2..c3e3a68 100644
--- a/dev-java/gnu-classpath/metadata.xml
+++ b/dev-java/gnu-classpath/metadata.xml
@@ -14,4 +14,3 @@
 		<flag name="xml">Build with native XML backend</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/dev-java/gnu-crypto/metadata.xml b/dev-java/gnu-crypto/metadata.xml
index 3a7ea50..4d78ca2 100644
--- a/dev-java/gnu-crypto/metadata.xml
+++ b/dev-java/gnu-crypto/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/gnu-javamail/metadata.xml b/dev-java/gnu-javamail/metadata.xml
index a2c2a21..5a19a2b 100644
--- a/dev-java/gnu-javamail/metadata.xml
+++ b/dev-java/gnu-javamail/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/groovy/metadata.xml b/dev-java/groovy/metadata.xml
index 5f29033..8d6b20b 100644
--- a/dev-java/groovy/metadata.xml
+++ b/dev-java/groovy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>

diff --git a/dev-java/hp-jdk-bin/metadata.xml b/dev-java/hp-jdk-bin/metadata.xml
index 53104d3..0c66569 100644
--- a/dev-java/hp-jdk-bin/metadata.xml
+++ b/dev-java/hp-jdk-bin/metadata.xml
@@ -8,4 +8,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/ini4j/metadata.xml b/dev-java/ini4j/metadata.xml
index 7b30775..03761a0 100644
--- a/dev-java/ini4j/metadata.xml
+++ b/dev-java/ini4j/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>

diff --git a/dev-java/iso-relax/metadata.xml b/dev-java/iso-relax/metadata.xml
index 587ddf1..5445e91 100644
--- a/dev-java/iso-relax/metadata.xml
+++ b/dev-java/iso-relax/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/jal/metadata.xml b/dev-java/jal/metadata.xml
index 182e3b1..5e0ade0 100644
--- a/dev-java/jal/metadata.xml
+++ b/dev-java/jal/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/jama/metadata.xml b/dev-java/jama/metadata.xml
index 3926a38..838c00a 100644
--- a/dev-java/jama/metadata.xml
+++ b/dev-java/jama/metadata.xml
@@ -2,4 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>java</herd>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/dev-java/janino/metadata.xml b/dev-java/janino/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/janino/metadata.xml
+++ b/dev-java/janino/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/jansi/metadata.xml b/dev-java/jansi/metadata.xml
index faca085..efba57d 100644
--- a/dev-java/jansi/metadata.xml
+++ b/dev-java/jansi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/jarbundler/metadata.xml b/dev-java/jarbundler/metadata.xml
index 18ca276..8a38e05 100644
--- a/dev-java/jarbundler/metadata.xml
+++ b/dev-java/jarbundler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/jarjar/metadata.xml b/dev-java/jarjar/metadata.xml
index 2637dba..87a5c95 100644
--- a/dev-java/jarjar/metadata.xml
+++ b/dev-java/jarjar/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/java-gnome/metadata.xml b/dev-java/java-gnome/metadata.xml
index a26d7de..cf264ec 100644
--- a/dev-java/java-gnome/metadata.xml
+++ b/dev-java/java-gnome/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/java-service-wrapper/metadata.xml b/dev-java/java-service-wrapper/metadata.xml
index 1f05146..b0f898a 100644
--- a/dev-java/java-service-wrapper/metadata.xml
+++ b/dev-java/java-service-wrapper/metadata.xml
@@ -15,4 +15,3 @@
     	* Logging
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/javatoolkit/metadata.xml b/dev-java/javatoolkit/metadata.xml
index e80ed52..7303cef 100644
--- a/dev-java/javatoolkit/metadata.xml
+++ b/dev-java/javatoolkit/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>

diff --git a/dev-java/jboss-logging/metadata.xml b/dev-java/jboss-logging/metadata.xml
index 34e7aaf..5e22ec6 100644
--- a/dev-java/jboss-logging/metadata.xml
+++ b/dev-java/jboss-logging/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="github">jboss-logging/jboss-logging</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/jboss-logmanager/metadata.xml b/dev-java/jboss-logmanager/metadata.xml
index 323b20f..df30504 100644
--- a/dev-java/jboss-logmanager/metadata.xml
+++ b/dev-java/jboss-logmanager/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="github">jboss-logging/jboss-logmanager</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/jboss-modules/metadata.xml b/dev-java/jboss-modules/metadata.xml
index 6a960ae..176bc36 100644
--- a/dev-java/jboss-modules/metadata.xml
+++ b/dev-java/jboss-modules/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="github">jboss-modules/jboss-modules</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/jcalendar/metadata.xml b/dev-java/jcalendar/metadata.xml
index 3754862..9c205cd 100644
--- a/dev-java/jcalendar/metadata.xml
+++ b/dev-java/jcalendar/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/jcifs/metadata.xml b/dev-java/jcifs/metadata.xml
index 40818e0..be2aa8d 100644
--- a/dev-java/jcifs/metadata.xml
+++ b/dev-java/jcifs/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/jdom-jaxen/metadata.xml b/dev-java/jdom-jaxen/metadata.xml
index 878118a..eff3654 100644
--- a/dev-java/jdom-jaxen/metadata.xml
+++ b/dev-java/jdom-jaxen/metadata.xml
@@ -6,4 +6,3 @@
 Jaxen binding for jdom.  Split from jdom to resolve circular dependencies.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/jebl/metadata.xml b/dev-java/jebl/metadata.xml
index 2d3eace..5399c3e 100644
--- a/dev-java/jebl/metadata.xml
+++ b/dev-java/jebl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/jempbox/metadata.xml b/dev-java/jempbox/metadata.xml
index 60ef72e..2e638b0 100644
--- a/dev-java/jempbox/metadata.xml
+++ b/dev-java/jempbox/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/jettison/metadata.xml b/dev-java/jettison/metadata.xml
index a106dba..ba1dabe 100644
--- a/dev-java/jettison/metadata.xml
+++ b/dev-java/jettison/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/jgoodies-animation/metadata.xml b/dev-java/jgoodies-animation/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/jgoodies-animation/metadata.xml
+++ b/dev-java/jgoodies-animation/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/jgoodies-binding/metadata.xml b/dev-java/jgoodies-binding/metadata.xml
index fa29e52..c19e65b 100644
--- a/dev-java/jgoodies-binding/metadata.xml
+++ b/dev-java/jgoodies-binding/metadata.xml
@@ -6,4 +6,3 @@
 		A library to bind object properties to UI components.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/jgoodies-common/metadata.xml b/dev-java/jgoodies-common/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/jgoodies-common/metadata.xml
+++ b/dev-java/jgoodies-common/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/jgoodies-forms/metadata.xml b/dev-java/jgoodies-forms/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/jgoodies-forms/metadata.xml
+++ b/dev-java/jgoodies-forms/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/jgoodies-looks/metadata.xml b/dev-java/jgoodies-looks/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/jgoodies-looks/metadata.xml
+++ b/dev-java/jgoodies-looks/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/jline/metadata.xml b/dev-java/jline/metadata.xml
index 86ff45e..293f4fc 100644
--- a/dev-java/jline/metadata.xml
+++ b/dev-java/jline/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>

diff --git a/dev-java/joda-time/metadata.xml b/dev-java/joda-time/metadata.xml
index 1736ea0..10dc600 100644
--- a/dev-java/joda-time/metadata.xml
+++ b/dev-java/joda-time/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>

diff --git a/dev-java/jopt-simple/metadata.xml b/dev-java/jopt-simple/metadata.xml
index b4f998d..82362bd 100644
--- a/dev-java/jopt-simple/metadata.xml
+++ b/dev-java/jopt-simple/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="github">pholser/jopt-simple</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/jsoup/metadata.xml b/dev-java/jsoup/metadata.xml
index a2b6848..3aa5cfe 100644
--- a/dev-java/jsoup/metadata.xml
+++ b/dev-java/jsoup/metadata.xml
@@ -15,4 +15,3 @@
 		validating, to invalid tag-soup; jsoup will create a sensible parse tree.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/jsr225/metadata.xml b/dev-java/jsr225/metadata.xml
index cca2317..8ae3c2a 100644
--- a/dev-java/jsr225/metadata.xml
+++ b/dev-java/jsr225/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>

diff --git a/dev-java/jss/metadata.xml b/dev-java/jss/metadata.xml
index 6b82ef4..5ecb9a0 100644
--- a/dev-java/jss/metadata.xml
+++ b/dev-java/jss/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/jssc/metadata.xml b/dev-java/jssc/metadata.xml
index 65edaf7..308fe8a 100644
--- a/dev-java/jssc/metadata.xml
+++ b/dev-java/jssc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>

diff --git a/dev-java/junit/metadata.xml b/dev-java/junit/metadata.xml
index 3cc51b7..7ca84b8 100644
--- a/dev-java/junit/metadata.xml
+++ b/dev-java/junit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/jython/metadata.xml b/dev-java/jython/metadata.xml
index 51cc338..cb41430 100644
--- a/dev-java/jython/metadata.xml
+++ b/dev-java/jython/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>

diff --git a/dev-java/kunststoff/metadata.xml b/dev-java/kunststoff/metadata.xml
index fd86213..816c7ea 100644
--- a/dev-java/kunststoff/metadata.xml
+++ b/dev-java/kunststoff/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/ldapsdk/metadata.xml b/dev-java/ldapsdk/metadata.xml
index 9fa69c6..ffc14a2 100644
--- a/dev-java/ldapsdk/metadata.xml
+++ b/dev-java/ldapsdk/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/logback/metadata.xml b/dev-java/logback/metadata.xml
index 0934aa3..662ba21 100644
--- a/dev-java/logback/metadata.xml
+++ b/dev-java/logback/metadata.xml
@@ -6,4 +6,3 @@
 		<flag name="tomcat">Builds Apache Tomcat support</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/dev-java/lucene/metadata.xml b/dev-java/lucene/metadata.xml
index bd2c9d0..d0ed9f7 100644
--- a/dev-java/lucene/metadata.xml
+++ b/dev-java/lucene/metadata.xml
@@ -7,6 +7,6 @@
   <description>Maintainer for actual Lucene issues.</description>
 </maintainer>
 <use>
-  <flag name='contrib'>Include extra functionality from contrib/</flag>
+  <flag name="contrib">Include extra functionality from contrib/</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-java/lzmajio/metadata.xml b/dev-java/lzmajio/metadata.xml
index 21237a6..08b5ba8 100644
--- a/dev-java/lzmajio/metadata.xml
+++ b/dev-java/lzmajio/metadata.xml
@@ -7,4 +7,3 @@
 	</maintainer>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/mersennetwister/metadata.xml b/dev-java/mersennetwister/metadata.xml
index 59b15e8..00f5698 100644
--- a/dev-java/mersennetwister/metadata.xml
+++ b/dev-java/mersennetwister/metadata.xml
@@ -7,4 +7,3 @@
 	</maintainer>
 <herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/milton-api/metadata.xml b/dev-java/milton-api/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/milton-api/metadata.xml
+++ b/dev-java/milton-api/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/milton-mail-api/metadata.xml b/dev-java/milton-mail-api/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/milton-mail-api/metadata.xml
+++ b/dev-java/milton-mail-api/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/mimepull/metadata.xml b/dev-java/mimepull/metadata.xml
index ebb97bf..1b75d71 100644
--- a/dev-java/mimepull/metadata.xml
+++ b/dev-java/mimepull/metadata.xml
@@ -9,4 +9,3 @@
 	the attachment parts is provided using those files.
   </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/minlog/metadata.xml b/dev-java/minlog/metadata.xml
index 4171231..598be60 100644
--- a/dev-java/minlog/metadata.xml
+++ b/dev-java/minlog/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<upstream>
-		<remote-id type='github'>EsotericSoftware/minlog</remote-id>
+		<remote-id type="github">EsotericSoftware/minlog</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/nanoxml/metadata.xml b/dev-java/nanoxml/metadata.xml
index 3298d92..3ae0a26 100644
--- a/dev-java/nanoxml/metadata.xml
+++ b/dev-java/nanoxml/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/objenesis/metadata.xml b/dev-java/objenesis/metadata.xml
index 9594fec..613a168 100644
--- a/dev-java/objenesis/metadata.xml
+++ b/dev-java/objenesis/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="google-code">objenesis</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/odfdom/metadata.xml b/dev-java/odfdom/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/odfdom/metadata.xml
+++ b/dev-java/odfdom/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/osgi-core-api/metadata.xml b/dev-java/osgi-core-api/metadata.xml
index 95a6790..838c00a 100644
--- a/dev-java/osgi-core-api/metadata.xml
+++ b/dev-java/osgi-core-api/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/osgi-enterprise-api/metadata.xml b/dev-java/osgi-enterprise-api/metadata.xml
index 82a57cc..8335e2c 100644
--- a/dev-java/osgi-enterprise-api/metadata.xml
+++ b/dev-java/osgi-enterprise-api/metadata.xml
@@ -5,4 +5,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/pdfbox/metadata.xml b/dev-java/pdfbox/metadata.xml
index 4a14d0c..ce693b5 100644
--- a/dev-java/pdfbox/metadata.xml
+++ b/dev-java/pdfbox/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/plexus-classworlds/metadata.xml b/dev-java/plexus-classworlds/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/plexus-classworlds/metadata.xml
+++ b/dev-java/plexus-classworlds/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/radeox/metadata.xml b/dev-java/radeox/metadata.xml
index 0eaa5d1..0146c41 100644
--- a/dev-java/radeox/metadata.xml
+++ b/dev-java/radeox/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/sac/metadata.xml b/dev-java/sac/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/sac/metadata.xml
+++ b/dev-java/sac/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/sat4j-core/metadata.xml b/dev-java/sat4j-core/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/sat4j-core/metadata.xml
+++ b/dev-java/sat4j-core/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/sat4j-pseudo/metadata.xml b/dev-java/sat4j-pseudo/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/sat4j-pseudo/metadata.xml
+++ b/dev-java/sat4j-pseudo/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/sbt/metadata.xml b/dev-java/sbt/metadata.xml
index a2d342d..ff60cc9 100644
--- a/dev-java/sbt/metadata.xml
+++ b/dev-java/sbt/metadata.xml
@@ -4,9 +4,9 @@
 <maintainer>
   <email>gienah@gentoo.org</email>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 The interactive build tool.
 Use Scala to define your tasks. Then run them in parallel from the shell. 
 </longdescription>
-<use><flag name='binary'>Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.</flag></use>
+<use><flag name="binary">Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.</flag></use>
 </pkgmetadata>

diff --git a/dev-java/shared-objects/metadata.xml b/dev-java/shared-objects/metadata.xml
index f3335de..b2ba497 100644
--- a/dev-java/shared-objects/metadata.xml
+++ b/dev-java/shared-objects/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/skinlf/metadata.xml b/dev-java/skinlf/metadata.xml
index 556630d..8b21b3c 100644
--- a/dev-java/skinlf/metadata.xml
+++ b/dev-java/skinlf/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/snappy/metadata.xml b/dev-java/snappy/metadata.xml
index de75276..2f78571 100644
--- a/dev-java/snappy/metadata.xml
+++ b/dev-java/snappy/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="github">xerial/snappy-java</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/spring-aop/metadata.xml b/dev-java/spring-aop/metadata.xml
index e6f1914..6b33543 100644
--- a/dev-java/spring-aop/metadata.xml
+++ b/dev-java/spring-aop/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">SpringSource/spring-framework</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/spring-beans/metadata.xml b/dev-java/spring-beans/metadata.xml
index e6f1914..6b33543 100644
--- a/dev-java/spring-beans/metadata.xml
+++ b/dev-java/spring-beans/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">SpringSource/spring-framework</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/spring-core/metadata.xml b/dev-java/spring-core/metadata.xml
index e6f1914..6b33543 100644
--- a/dev-java/spring-core/metadata.xml
+++ b/dev-java/spring-core/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">SpringSource/spring-framework</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/spring-expression/metadata.xml b/dev-java/spring-expression/metadata.xml
index e6f1914..6b33543 100644
--- a/dev-java/spring-expression/metadata.xml
+++ b/dev-java/spring-expression/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">SpringSource/spring-framework</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/spring-instrument/metadata.xml b/dev-java/spring-instrument/metadata.xml
index e6f1914..6b33543 100644
--- a/dev-java/spring-instrument/metadata.xml
+++ b/dev-java/spring-instrument/metadata.xml
@@ -13,4 +13,3 @@
 		<remote-id type="github">SpringSource/spring-framework</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/spymemcached/metadata.xml b/dev-java/spymemcached/metadata.xml
index 9cb4302..1558b9f 100644
--- a/dev-java/spymemcached/metadata.xml
+++ b/dev-java/spymemcached/metadata.xml
@@ -3,10 +3,9 @@
 <pkgmetadata>
 	<herd>java</herd>
 	<use>
-		<flag name='spring'>Build support for the spring framework</flag>
+		<flag name="spring">Build support for the spring framework</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">spymemcached</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/stringtemplate/metadata.xml b/dev-java/stringtemplate/metadata.xml
index a02bbaa..0243144 100644
--- a/dev-java/stringtemplate/metadata.xml
+++ b/dev-java/stringtemplate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/sux4j/metadata.xml b/dev-java/sux4j/metadata.xml
index 18d3cb3..89061b7 100644
--- a/dev-java/sux4j/metadata.xml
+++ b/dev-java/sux4j/metadata.xml
@@ -13,4 +13,3 @@ The resulting code is rather sparse. The main highlights are:
     * a few Java implementation of monotone minimal perfect hashing. 
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/swarmcache/metadata.xml b/dev-java/swarmcache/metadata.xml
index ac0456a..386d6ec 100644
--- a/dev-java/swarmcache/metadata.xml
+++ b/dev-java/swarmcache/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/swidgets/metadata.xml b/dev-java/swidgets/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/swidgets/metadata.xml
+++ b/dev-java/swidgets/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/swing-worker/metadata.xml b/dev-java/swing-worker/metadata.xml
index 32d1391..1ab39fd 100644
--- a/dev-java/swing-worker/metadata.xml
+++ b/dev-java/swing-worker/metadata.xml
@@ -7,4 +7,3 @@ swing-worker is a backport for Java 1.5 of the Swing Threading libraries
 available within the Java 1.6 API.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/swingx/metadata.xml b/dev-java/swingx/metadata.xml
index 82a57cc..8335e2c 100644
--- a/dev-java/swingx/metadata.xml
+++ b/dev-java/swingx/metadata.xml
@@ -5,4 +5,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/tablelayout/metadata.xml b/dev-java/tablelayout/metadata.xml
index e80ed52..7303cef 100644
--- a/dev-java/tablelayout/metadata.xml
+++ b/dev-java/tablelayout/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>

diff --git a/dev-java/tapestry/metadata.xml b/dev-java/tapestry/metadata.xml
index 2380d63..cb5ac0b 100644
--- a/dev-java/tapestry/metadata.xml
+++ b/dev-java/tapestry/metadata.xml
@@ -10,4 +10,3 @@ Tapestry reconceptualizes web application development in terms of objects, metho
 Tapestry is an alternative to scripting environments such as JavaServer Pages or Velocity. Tapestry goes far further, providing a complete framework for creating extremely dynamic applications with minimal amounts of coding.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-java/texhyphj/metadata.xml b/dev-java/texhyphj/metadata.xml
index a7fff26..9c9f688 100644
--- a/dev-java/texhyphj/metadata.xml
+++ b/dev-java/texhyphj/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/toolbar/metadata.xml b/dev-java/toolbar/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/toolbar/metadata.xml
+++ b/dev-java/toolbar/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/trident/metadata.xml b/dev-java/trident/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/trident/metadata.xml
+++ b/dev-java/trident/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/unkrig-nullanalysis/metadata.xml b/dev-java/unkrig-nullanalysis/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/unkrig-nullanalysis/metadata.xml
+++ b/dev-java/unkrig-nullanalysis/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/werken-xpath/metadata.xml b/dev-java/werken-xpath/metadata.xml
index c15d8f0..d09e01f 100644
--- a/dev-java/werken-xpath/metadata.xml
+++ b/dev-java/werken-xpath/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/ws-commons-util/metadata.xml b/dev-java/ws-commons-util/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/ws-commons-util/metadata.xml
+++ b/dev-java/ws-commons-util/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-java/wstx/metadata.xml b/dev-java/wstx/metadata.xml
index a8b223e..06e46c2 100644
--- a/dev-java/wstx/metadata.xml
+++ b/dev-java/wstx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-java/xerial-core/metadata.xml b/dev-java/xerial-core/metadata.xml
index e39d18f..684a98e 100644
--- a/dev-java/xerial-core/metadata.xml
+++ b/dev-java/xerial-core/metadata.xml
@@ -6,4 +6,3 @@
 		<remote-id type="google-code">xerial</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/dev-java/xml-commons/metadata.xml b/dev-java/xml-commons/metadata.xml
index b910167..2d0c573 100644
--- a/dev-java/xml-commons/metadata.xml
+++ b/dev-java/xml-commons/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/xml-xmlbeans/metadata.xml b/dev-java/xml-xmlbeans/metadata.xml
index 3f89838..79125e1 100644
--- a/dev-java/xml-xmlbeans/metadata.xml
+++ b/dev-java/xml-xmlbeans/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>java</herd>
 

diff --git a/dev-java/xz-java/metadata.xml b/dev-java/xz-java/metadata.xml
index 93e6e97..1824f19 100644
--- a/dev-java/xz-java/metadata.xml
+++ b/dev-java/xz-java/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-java/yanfs/metadata.xml b/dev-java/yanfs/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-java/yanfs/metadata.xml
+++ b/dev-java/yanfs/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-lang/ats/metadata.xml b/dev-lang/ats/metadata.xml
index b68ddd1..2eec024 100644
--- a/dev-lang/ats/metadata.xml
+++ b/dev-lang/ats/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-lang/bas/metadata.xml b/dev-lang/bas/metadata.xml
index 367faed..6bc2642 100644
--- a/dev-lang/bas/metadata.xml
+++ b/dev-lang/bas/metadata.xml
@@ -5,6 +5,6 @@
     <email>maintainer-needed@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='lr0'>Use the LR0 parser instead of the recursive descending parser</flag>
+    <flag name="lr0">Use the LR0 parser instead of the recursive descending parser</flag>
   </use>
 </pkgmetadata>

diff --git a/dev-lang/bff/metadata.xml b/dev-lang/bff/metadata.xml
index 9e77c1f..4f4825a 100644
--- a/dev-lang/bff/metadata.xml
+++ b/dev-lang/bff/metadata.xml
@@ -9,4 +9,3 @@ bff is a slightly optimized interpreter for brainfuck, a turing-complete
 programming language.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-lang/crystal/metadata.xml b/dev-lang/crystal/metadata.xml
index a0e7647..7d958c4 100644
--- a/dev-lang/crystal/metadata.xml
+++ b/dev-lang/crystal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/dev-lang/elixir/metadata.xml b/dev-lang/elixir/metadata.xml
index d553c35..3391531 100644
--- a/dev-lang/elixir/metadata.xml
+++ b/dev-lang/elixir/metadata.xml
@@ -16,10 +16,10 @@
 		<changelog>
 			https://github.com/elixir-lang/elixir/blob/master/CHANGELOG.md
 		</changelog>
-		<doc lang='en'>
+		<doc lang="en">
 			http://elixir-lang.org/docs.html
 		</doc>
-		<remote-id type='github'>
+		<remote-id type="github">
 			elixir-lang/elixir
 		</remote-id>
 	</upstream>

diff --git a/dev-lang/ghc/metadata.xml b/dev-lang/ghc/metadata.xml
index 873a999..05bff5b 100644
--- a/dev-lang/ghc/metadata.xml
+++ b/dev-lang/ghc/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<use>
-		<flag name='binary'>Install the binary version directly, rather than using it to build the source version.</flag>
-		<flag name='ghcbootstrap'>Bootstrap from an existing GHC installation.</flag>
-		<flag name='ghcmakebinary'>Build with less runtime depends (bundle libffi for building bootstrap binaries).</flag>
-		<flag name='llvm'>Enable llvm code generator for ghc (-fllvm).</flag>
+		<flag name="binary">Install the binary version directly, rather than using it to build the source version.</flag>
+		<flag name="ghcbootstrap">Bootstrap from an existing GHC installation.</flag>
+		<flag name="ghcmakebinary">Build with less runtime depends (bundle libffi for building bootstrap binaries).</flag>
+		<flag name="llvm">Enable llvm code generator for ghc (-fllvm).</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-lang/go-bootstrap/metadata.xml b/dev-lang/go-bootstrap/metadata.xml
index afdfdb9..1738abf 100644
--- a/dev-lang/go-bootstrap/metadata.xml
+++ b/dev-lang/go-bootstrap/metadata.xml
@@ -8,6 +8,6 @@
 	<longdescription lang="en">
 		This package is only necessary until gccgo supports go-1.4. It
 		will be removed as soon as stable gcc supports this.
-		It is here so that >=dev-lang/go 1.5 can use it to bootstrap.
+		It is here so that &gt;=dev-lang/go 1.5 can use it to bootstrap.
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-lang/gwydion-dylan-bin/metadata.xml b/dev-lang/gwydion-dylan-bin/metadata.xml
index b757f0b..9979a50 100644
--- a/dev-lang/gwydion-dylan-bin/metadata.xml
+++ b/dev-lang/gwydion-dylan-bin/metadata.xml
@@ -14,4 +14,3 @@ supports multiple inheritance, polymorphism, multiple dispatch, keyword
 arguments, object introspection, and many other advanced features.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-lang/icon/metadata.xml b/dev-lang/icon/metadata.xml
index 8595a9c..69edcf2 100644
--- a/dev-lang/icon/metadata.xml
+++ b/dev-lang/icon/metadata.xml
@@ -2,5 +2,5 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>lang-misc</herd>
-<use><flag name='iplsrc'>install the icon programming library source</flag></use>
+<use><flag name="iplsrc">install the icon programming library source</flag></use>
 </pkgmetadata>

diff --git a/dev-lang/io/metadata.xml b/dev-lang/io/metadata.xml
index 39a9737..056d4cc 100644
--- a/dev-lang/io/metadata.xml
+++ b/dev-lang/io/metadata.xml
@@ -24,4 +24,3 @@ concurrency), LISP (code is a runtime inspectable/modifiable tree) and Lua
 (small, embeddable).
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-lang/lazarus/metadata.xml b/dev-lang/lazarus/metadata.xml
index 642a64e..f370d2a 100644
--- a/dev-lang/lazarus/metadata.xml
+++ b/dev-lang/lazarus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>lang-misc</herd>

diff --git a/dev-lang/logtalk/metadata.xml b/dev-lang/logtalk/metadata.xml
index c314a54..ba56af5 100644
--- a/dev-lang/logtalk/metadata.xml
+++ b/dev-lang/logtalk/metadata.xml
@@ -3,12 +3,12 @@
 <pkgmetadata>
 <herd>prolog</herd>
 <use>
-	<flag name='gnupl'>Support GNU Prolog back-end compiler</flag>
-	<flag name='qupl'>Support Qu-Prolog back-end compiler</flag>
-	<flag name='swipl'>Support SWI-Prolog back-end compiler</flag>
-	<flag name='xsbpl'>Support XSB back-end compiler</flag>
-	<flag name='yappl'>Support YAP back-end compiler</flag>
-	<flag name='xslt'>Support for generating html documentation using xslt</flag>
-	<flag name='fop'>Support for generating pdf documentation using fop</flag>
+	<flag name="gnupl">Support GNU Prolog back-end compiler</flag>
+	<flag name="qupl">Support Qu-Prolog back-end compiler</flag>
+	<flag name="swipl">Support SWI-Prolog back-end compiler</flag>
+	<flag name="xsbpl">Support XSB back-end compiler</flag>
+	<flag name="yappl">Support YAP back-end compiler</flag>
+	<flag name="xslt">Support for generating html documentation using xslt</flag>
+	<flag name="fop">Support for generating pdf documentation using fop</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-lang/lua/metadata.xml b/dev-lang/lua/metadata.xml
index cfb994f..0120a42 100644
--- a/dev-lang/lua/metadata.xml
+++ b/dev-lang/lua/metadata.xml
@@ -9,5 +9,5 @@
 	<email>rafaelmartins@gentoo.org</email>
 	<name>Rafael G. Martins</name>
 </maintainer>
-<use><flag name='deprecated'>make deprecated data structures/routines available</flag></use>
+<use><flag name="deprecated">make deprecated data structures/routines available</flag></use>
 </pkgmetadata>

diff --git a/dev-lang/luajit/metadata.xml b/dev-lang/luajit/metadata.xml
index e3ee128..5df8415 100644
--- a/dev-lang/luajit/metadata.xml
+++ b/dev-lang/luajit/metadata.xml
@@ -6,7 +6,7 @@
     <name>Rafael G. Martins</name>
   </maintainer>
   <use>
-    <flag name='lua52compat'>
+    <flag name="lua52compat">
       Enable some upwards-compatible features
       from Lua 5.2 that are unlikely to break existing code.
     </flag>
@@ -15,4 +15,3 @@
     LuaJIT is a Just-In-Time Compiler for the Lua programming language.
   </longdescription>
 </pkgmetadata>
-

diff --git a/dev-lang/mono-basic/metadata.xml b/dev-lang/mono-basic/metadata.xml
index 9b12b95..b678a42 100644
--- a/dev-lang/mono-basic/metadata.xml
+++ b/dev-lang/mono-basic/metadata.xml
@@ -6,4 +6,3 @@
 		Visual Basic .NET compiler and runtime
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-lang/mono/metadata.xml b/dev-lang/mono/metadata.xml
index 9529ca5..91e40e8 100644
--- a/dev-lang/mono/metadata.xml
+++ b/dev-lang/mono/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>dotnet</herd>
 <use>
-	<flag name='pax_kernel'>Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
-	<flag name='xen'>Make mono generate code that is considerably faster on xen VMs but slightly slower on for normal systems.</flag>
+	<flag name="pax_kernel">Enable if the user plans to run the package under a pax enabled hardened kernel</flag>
+	<flag name="xen">Make mono generate code that is considerably faster on xen VMs but slightly slower on for normal systems.</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-lang/nasm/metadata.xml b/dev-lang/nasm/metadata.xml
index ebc02cb..0b7d2f1 100644
--- a/dev-lang/nasm/metadata.xml
+++ b/dev-lang/nasm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-lang/nqc/metadata.xml b/dev-lang/nqc/metadata.xml
index 30bc973..7a31448 100644
--- a/dev-lang/nqc/metadata.xml
+++ b/dev-lang/nqc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-lang/nwcc/metadata.xml b/dev-lang/nwcc/metadata.xml
index 42f4a82..0433b36 100644
--- a/dev-lang/nwcc/metadata.xml
+++ b/dev-lang/nwcc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-lang/perl/metadata.xml b/dev-lang/perl/metadata.xml
index 1f1398a..50e60f0 100644
--- a/dev-lang/perl/metadata.xml
+++ b/dev-lang/perl/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>perl</herd>
 	<use>
-		<flag name='ithreads'>Enable Perl threads, has some compatibility problems</flag>
+		<flag name="ithreads">Enable Perl threads, has some compatibility problems</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-lang/php/metadata.xml b/dev-lang/php/metadata.xml
index 2224016..395f6b5 100644
--- a/dev-lang/php/metadata.xml
+++ b/dev-lang/php/metadata.xml
@@ -3,27 +3,27 @@
 <pkgmetadata>
 	<herd>php</herd>
 	<use>
-		<flag name='cli'>Enable CLI SAPI</flag>
-		<flag name='embed'>Enable embed SAPI</flag>
-		<flag name='enchant'>Add supports Enchant spelling library.</flag>
-		<flag name='fileinfo'>Add fileinfo extension support</flag>
-		<flag name='filter'>Add filter extension support</flag>
-		<flag name='fpm'>Enable the FastCGI Process Manager SAPI</flag>
-		<flag name='gd'>Adds support for gd (bundled with PHP)</flag>
-		<flag name='hash'>Enable the hash extension</flag>
-		<flag name='json'>Enable JSON support</flag>
-		<flag name='ldap-sasl'>Add SASL support for the PHP LDAP extension</flag>
-		<flag name='mysqlnd'>Use native driver for mysql, mysqli, PDO_Mysql</flag>
-		<flag name='libmysqlclient'>Use libmyslclient driver for mysql, mysqli, PDO_Mysql (not recommended)</flag>
-		<flag name='intl'>Enables the intl extension for extended internalization support</flag>
-		<flag name='opcache'>Enables built-in opcode cache, replacing pecl-apc et.al</flag>
-		<flag name='pdo'>Enable the bundled PDO extensions</flag>
-		<flag name='phar'>Enables the phar extension to provide phar archive support</flag>
-		<flag name='phpdbg'>Enable the PHP Debug Command Line SAPI (like gdb for php)</flag>
-		<flag name='xmlreader'>Enable XMLReader support</flag>
-		<flag name='xmlwriter'>Enable XMLWriter support</flag>
-		<flag name='xslt'>Enable the XSL extension</flag>
-		<flag name='vpx'>Enable webp suppoprt for GD</flag>
-		<flag name='zip'>Enable ZIP file support</flag>
+		<flag name="cli">Enable CLI SAPI</flag>
+		<flag name="embed">Enable embed SAPI</flag>
+		<flag name="enchant">Add supports Enchant spelling library.</flag>
+		<flag name="fileinfo">Add fileinfo extension support</flag>
+		<flag name="filter">Add filter extension support</flag>
+		<flag name="fpm">Enable the FastCGI Process Manager SAPI</flag>
+		<flag name="gd">Adds support for gd (bundled with PHP)</flag>
+		<flag name="hash">Enable the hash extension</flag>
+		<flag name="json">Enable JSON support</flag>
+		<flag name="ldap-sasl">Add SASL support for the PHP LDAP extension</flag>
+		<flag name="mysqlnd">Use native driver for mysql, mysqli, PDO_Mysql</flag>
+		<flag name="libmysqlclient">Use libmyslclient driver for mysql, mysqli, PDO_Mysql (not recommended)</flag>
+		<flag name="intl">Enables the intl extension for extended internalization support</flag>
+		<flag name="opcache">Enables built-in opcode cache, replacing pecl-apc et.al</flag>
+		<flag name="pdo">Enable the bundled PDO extensions</flag>
+		<flag name="phar">Enables the phar extension to provide phar archive support</flag>
+		<flag name="phpdbg">Enable the PHP Debug Command Line SAPI (like gdb for php)</flag>
+		<flag name="xmlreader">Enable XMLReader support</flag>
+		<flag name="xmlwriter">Enable XMLWriter support</flag>
+		<flag name="xslt">Enable the XSL extension</flag>
+		<flag name="vpx">Enable webp suppoprt for GD</flag>
+		<flag name="zip">Enable ZIP file support</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-lang/rakudo/metadata.xml b/dev-lang/rakudo/metadata.xml
index 75666cc..0e57a6b 100644
--- a/dev-lang/rakudo/metadata.xml
+++ b/dev-lang/rakudo/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Patrick Lauer</name>
 	</maintainer>
         <use>
-        <flag name='parrot'>Build the parrot backend (default)</flag> 
-	<flag name='moar'>Build the MoarVM backend (experimental)</flag>
+        <flag name="parrot">Build the parrot backend (default)</flag> 
+	<flag name="moar">Build the MoarVM backend (experimental)</flag>
         </use>
 </pkgmetadata>

diff --git a/dev-lang/spidermonkey/metadata.xml b/dev-lang/spidermonkey/metadata.xml
index ec0cd3c..80d2507 100644
--- a/dev-lang/spidermonkey/metadata.xml
+++ b/dev-lang/spidermonkey/metadata.xml
@@ -6,9 +6,8 @@
 		Stand-alone JavaScript C library
 	</longdescription>
 	<use>
-		<flag name='debug'>Enable assertions to allow for easier debugging of programs that link to spidermonkey -- note this will often crash software on regular end-user systems</flag>
-		<flag name='threadsafe'>Build a threadsafe version of spidermonkey</flag>
-		<flag name='system-icu'>Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled -- note, only takes effect when icu flag is enabled</flag>
+		<flag name="debug">Enable assertions to allow for easier debugging of programs that link to spidermonkey -- note this will often crash software on regular end-user systems</flag>
+		<flag name="threadsafe">Build a threadsafe version of spidermonkey</flag>
+		<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg> instead of bundled -- note, only takes effect when icu flag is enabled</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/dev-lang/srf/metadata.xml b/dev-lang/srf/metadata.xml
index c0594a6..3da5928 100644
--- a/dev-lang/srf/metadata.xml
+++ b/dev-lang/srf/metadata.xml
@@ -11,4 +11,3 @@ similar to Stephen Kleene's recursive functions. You can use srf to help
 understand recursive functions, or Peano arithmetic.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-lang/swi-prolog/metadata.xml b/dev-lang/swi-prolog/metadata.xml
index 49e918f..88333bf 100644
--- a/dev-lang/swi-prolog/metadata.xml
+++ b/dev-lang/swi-prolog/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>prolog</herd>
 <use>
-	<flag name='archive'>Use libarchive for extension packs</flag>
-	<flag name='uuid'>Use ossp-uuid for UUID pack</flag>
+	<flag name="archive">Use libarchive for extension packs</flag>
+	<flag name="uuid">Use ossp-uuid for UUID pack</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-lang/teyjus/metadata.xml b/dev-lang/teyjus/metadata.xml
index e14550d..47cb497 100644
--- a/dev-lang/teyjus/metadata.xml
+++ b/dev-lang/teyjus/metadata.xml
@@ -5,7 +5,7 @@
   <email>gienah@gentoo.org</email>
   <name>Mark Wright</name>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 The Teyjus system is an efficient implementation of the higher-order
 logic programming language Lambda Prolog. The main strength of Lambda
 Prolog, a language developed by Dale Miller and Gopalan Nadathur, is

diff --git a/dev-lang/tuprolog/metadata.xml b/dev-lang/tuprolog/metadata.xml
index 05a0045..7e53cf0 100644
--- a/dev-lang/tuprolog/metadata.xml
+++ b/dev-lang/tuprolog/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>prolog</herd>

diff --git a/dev-lang/whitespace/metadata.xml b/dev-lang/whitespace/metadata.xml
index 96f7e3f..57991c6 100644
--- a/dev-lang/whitespace/metadata.xml
+++ b/dev-lang/whitespace/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>haskell</herd>

diff --git a/dev-lang/xsb/metadata.xml b/dev-lang/xsb/metadata.xml
index 299cf67..1a3e7c0 100644
--- a/dev-lang/xsb/metadata.xml
+++ b/dev-lang/xsb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>prolog</herd>

diff --git a/dev-lang/yap/metadata.xml b/dev-lang/yap/metadata.xml
index 9720e3e..f68e980 100644
--- a/dev-lang/yap/metadata.xml
+++ b/dev-lang/yap/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>prolog</herd>
 <use>
-	<flag name='R'>Enable support for connecting R to Prolog</flag>
+	<flag name="R">Enable support for connecting R to Prolog</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/MicroJSON/metadata.xml b/dev-libs/MicroJSON/metadata.xml
index e73da0e..65cbd1f 100644
--- a/dev-libs/MicroJSON/metadata.xml
+++ b/dev-libs/MicroJSON/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

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

diff --git a/dev-libs/ace/metadata.xml b/dev-libs/ace/metadata.xml
index 1444c98..7c11e36 100644
--- a/dev-libs/ace/metadata.xml
+++ b/dev-libs/ace/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>cpp</herd>
 <use>
-  <flag name='ciao'>Include Component Intergraced Ace ORB into the build of
+  <flag name="ciao">Include Component Intergraced Ace ORB into the build of
     ace</flag>
-  <flag name='tao'>Include the ACE ORB (CORBA stuff) (called tao) into the
+  <flag name="tao">Include the ACE ORB (CORBA stuff) (called tao) into the
     build of ace</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/angelscript/metadata.xml b/dev-libs/angelscript/metadata.xml
index e0a9408..26215a0 100644
--- a/dev-libs/angelscript/metadata.xml
+++ b/dev-libs/angelscript/metadata.xml
@@ -12,4 +12,3 @@
 		</subslots>
 	</slots>
 </pkgmetadata>
-

diff --git a/dev-libs/bcm2835/metadata.xml b/dev-libs/bcm2835/metadata.xml
index 8a9b49e..ca5f18f 100644
--- a/dev-libs/bcm2835/metadata.xml
+++ b/dev-libs/bcm2835/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
 </pkgmetadata>
-

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

diff --git a/dev-libs/cgicc/metadata.xml b/dev-libs/cgicc/metadata.xml
index d11428d..d5c4c3c 100644
--- a/dev-libs/cgicc/metadata.xml
+++ b/dev-libs/cgicc/metadata.xml
@@ -18,4 +18,3 @@ Web. cgicc performs the following functions:
  - Compatible with FastCGI
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-libs/collada-dom/metadata.xml b/dev-libs/collada-dom/metadata.xml
index 1f9eb19..caea2fe 100644
--- a/dev-libs/collada-dom/metadata.xml
+++ b/dev-libs/collada-dom/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-libs/crossguid/metadata.xml b/dev-libs/crossguid/metadata.xml
index 65b78d5..462401d 100644
--- a/dev-libs/crossguid/metadata.xml
+++ b/dev-libs/crossguid/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>xbox</herd>
 <upstream>
-	<remote-id type='github'>graeme-hill/crossguid</remote-id>
+	<remote-id type="github">graeme-hill/crossguid</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/dev-libs/cxxtools/metadata.xml b/dev-libs/cxxtools/metadata.xml
index 5f9f146..4399dba 100644
--- a/dev-libs/cxxtools/metadata.xml
+++ b/dev-libs/cxxtools/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/cyrus-sasl/metadata.xml b/dev-libs/cyrus-sasl/metadata.xml
index 69c8e0a..a3cf1de 100644
--- a/dev-libs/cyrus-sasl/metadata.xml
+++ b/dev-libs/cyrus-sasl/metadata.xml
@@ -3,13 +3,13 @@
 <pkgmetadata>
 <herd>net-mail</herd>
 <use>
-  <flag name='authdaemond'>Add Courier-IMAP authdaemond unix socket
+  <flag name="authdaemond">Add Courier-IMAP authdaemond unix socket
     support (<pkg>net-mail/courier-imap</pkg>, <pkg>mail-mta/courier</pkg>)
     </flag>
-  <flag name='openldap'>Add ldap support for saslauthd</flag>
-  <flag name='ldapdb'>Enable ldapdb plugin</flag>
-  <flag name='sample'>Enable sample client and server</flag>
-  <flag name='srp'>Enable SRP authentication</flag>
-  <flag name='urandom'>Use /dev/urandom instead of /dev/random</flag>
+  <flag name="openldap">Add ldap support for saslauthd</flag>
+  <flag name="ldapdb">Enable ldapdb plugin</flag>
+  <flag name="sample">Enable sample client and server</flag>
+  <flag name="srp">Enable SRP authentication</flag>
+  <flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/dotconf/metadata.xml b/dev-libs/dotconf/metadata.xml
index 2f0bbe4..f7b66d2 100644
--- a/dev-libs/dotconf/metadata.xml
+++ b/dev-libs/dotconf/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <herd>accessibility</herd>
 <maintainer>

diff --git a/dev-libs/e_dbus/metadata.xml b/dev-libs/e_dbus/metadata.xml
index f4d06d2..d136264 100644
--- a/dev-libs/e_dbus/metadata.xml
+++ b/dev-libs/e_dbus/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='bluetooth'>Enable interfacing with <pkg>net-wireless/bluez</pkg> DBus API</flag>
-	<flag name='ofono'>Enable interfacing with <pkg>net-misc/ofono</pkg> DBus API</flag>
-	<flag name='test-binaries'>Enable building of test binaries for enabled features</flag>
+	<flag name="bluetooth">Enable interfacing with <pkg>net-wireless/bluez</pkg> DBus API</flag>
+	<flag name="ofono">Enable interfacing with <pkg>net-misc/ofono</pkg> DBus API</flag>
+	<flag name="test-binaries">Enable building of test binaries for enabled features</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/ecore/metadata.xml b/dev-libs/ecore/metadata.xml
index 8ee6a9d..a6bc295 100644
--- a/dev-libs/ecore/metadata.xml
+++ b/dev-libs/ecore/metadata.xml
@@ -1,16 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='ares'>Enables support for asynchronous DNS using the <pkg>net-dns/c-ares</pkg> library</flag>
-	<flag name='gles'>Add gles support to the ecore-evas-wayland module</flag>
-	<flag name='glib'>Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
-	<flag name='xprint'>Enable X11 Xprint support</flag>
-	<flag name='inotify'>Enable support for inotify</flag>
-	<flag name='evas'>Provides easy to use canvas by gluing <pkg>media-libs/evas</pkg> and various input/output systems</flag>
-	<flag name='tslib'>Build with tslib support for touchscreen devices</flag>
-	<flag name='wayland'>Add support for <pkg>dev-libs/wayland</pkg></flag>
+	<flag name="ares">Enables support for asynchronous DNS using the <pkg>net-dns/c-ares</pkg> library</flag>
+	<flag name="gles">Add gles support to the ecore-evas-wayland module</flag>
+	<flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
+	<flag name="xprint">Enable X11 Xprint support</flag>
+	<flag name="inotify">Enable support for inotify</flag>
+	<flag name="evas">Provides easy to use canvas by gluing <pkg>media-libs/evas</pkg> and various input/output systems</flag>
+	<flag name="tslib">Build with tslib support for touchscreen devices</flag>
+	<flag name="wayland">Add support for <pkg>dev-libs/wayland</pkg></flag>
 </use>
 <longdescription>
 Ecore is a clean and tiny event loop library with many modules to do

diff --git a/dev-libs/eet/metadata.xml b/dev-libs/eet/metadata.xml
index bbdb2b2..74563a3 100644
--- a/dev-libs/eet/metadata.xml
+++ b/dev-libs/eet/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <longdescription>

diff --git a/dev-libs/eeze/metadata.xml b/dev-libs/eeze/metadata.xml
index c8506d1..ae1804c 100644
--- a/dev-libs/eeze/metadata.xml
+++ b/dev-libs/eeze/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='utilities'>Install some test utilities for mount/umount support in eeze</flag>
+	<flag name="utilities">Install some test utilities for mount/umount support in eeze</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index 8b04c32..097865a 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -1,29 +1,29 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='bmp'>Enable WBMP image loader</flag>
-	<flag name='drm'>Enable DRM engine</flag>
-	<flag name='eet'>Enable Eet image loader</flag>
-	<flag name='egl'>Enable EGL rendering</flag>
-	<flag name='fribidi'>Enable bidirectional text support</flag>
-	<flag name='gles'>Enable the OpenGL ES GL implementation</flag>
-	<flag name='glib'>Enable <pkg>dev-libs/glib</pkg> support</flag>
-	<flag name='harfbuzz'>Enable complex text shaping and layout support</flag>
-	<flag name='ibus'>Enable Intelligent Input Bus</flag>
-	<flag name='ico'>Enable Ico image loader</flag>
-	<flag name='oldlua'>USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
-	<flag name='physics'>Enable Bullet physics effects and support</flag>
-	<flag name='pixman'>Enable PixMan for software rendering</flag>
-	<flag name='ppm'>Enable PMAPS image loader</flag>
-	<flag name='psd'>Enable PSD image loader</flag>
-	<flag name='scim'>Enable Smart Common Input Method</flag>
-	<flag name='tga'>Enable Tga image loader</flag>
-	<flag name='tslib'>Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
-	<flag name='v4l2'>Enable Video4Linux2 support</flag>
-	<flag name='valgrind'>Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
-	<flag name='webp'>Enable WebP image loader</flag>
-	<flag name='xim'>Enable X Input Method</flag>
+	<flag name="bmp">Enable WBMP image loader</flag>
+	<flag name="drm">Enable DRM engine</flag>
+	<flag name="eet">Enable Eet image loader</flag>
+	<flag name="egl">Enable EGL rendering</flag>
+	<flag name="fribidi">Enable bidirectional text support</flag>
+	<flag name="gles">Enable the OpenGL ES GL implementation</flag>
+	<flag name="glib">Enable <pkg>dev-libs/glib</pkg> support</flag>
+	<flag name="harfbuzz">Enable complex text shaping and layout support</flag>
+	<flag name="ibus">Enable Intelligent Input Bus</flag>
+	<flag name="ico">Enable Ico image loader</flag>
+	<flag name="oldlua">USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
+	<flag name="physics">Enable Bullet physics effects and support</flag>
+	<flag name="pixman">Enable PixMan for software rendering</flag>
+	<flag name="ppm">Enable PMAPS image loader</flag>
+	<flag name="psd">Enable PSD image loader</flag>
+	<flag name="scim">Enable Smart Common Input Method</flag>
+	<flag name="tga">Enable Tga image loader</flag>
+	<flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
+	<flag name="v4l2">Enable Video4Linux2 support</flag>
+	<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
+	<flag name="webp">Enable WebP image loader</flag>
+	<flag name="xim">Enable X Input Method</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/efreet/metadata.xml b/dev-libs/efreet/metadata.xml
index 71cdd72..99165ad 100644
--- a/dev-libs/efreet/metadata.xml
+++ b/dev-libs/efreet/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>

diff --git a/dev-libs/eina/metadata.xml b/dev-libs/eina/metadata.xml
index aa94722..3e92977 100644
--- a/dev-libs/eina/metadata.xml
+++ b/dev-libs/eina/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='mempool-buddy'>Compile 'buddy' memory pool allocation</flag>
-	<flag name='mempool-chained-pool'>Compile 'chained-pool' memory pool allocation</flag>
-	<flag name='mempool-fixed-bitmap'>Compile 'fixed-bitmap' memory pool allocation</flag>
-	<flag name='mempool-one-big'>Compile 'one-big' memory pool allocation</flag>
-	<flag name='mempool-pass-through'>Compile 'pass-through' (system's malloc) memory pool allocation</flag>
-	<flag name='default-mempool'>By default use system's allocator (pass-through) instead of custom choice for Eina's own data structures</flag>
-	<flag name='valgrind'>Compile in valgrind hints for smoother integration</flag>
+	<flag name="mempool-buddy">Compile 'buddy' memory pool allocation</flag>
+	<flag name="mempool-chained-pool">Compile 'chained-pool' memory pool allocation</flag>
+	<flag name="mempool-fixed-bitmap">Compile 'fixed-bitmap' memory pool allocation</flag>
+	<flag name="mempool-one-big">Compile 'one-big' memory pool allocation</flag>
+	<flag name="mempool-pass-through">Compile 'pass-through' (system's malloc) memory pool allocation</flag>
+	<flag name="default-mempool">By default use system's allocator (pass-through) instead of custom choice for Eina's own data structures</flag>
+	<flag name="valgrind">Compile in valgrind hints for smoother integration</flag>
 </use>
 <longdescription>
 Eina is a multi-platform library that provides optimized data types

diff --git a/dev-libs/eio/metadata.xml b/dev-libs/eio/metadata.xml
index 71cdd72..99165ad 100644
--- a/dev-libs/eio/metadata.xml
+++ b/dev-libs/eio/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>

diff --git a/dev-libs/embryo/metadata.xml b/dev-libs/embryo/metadata.xml
index 0a1f737..d75dabc 100644
--- a/dev-libs/embryo/metadata.xml
+++ b/dev-libs/embryo/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <longdescription>

diff --git a/dev-libs/fampp2/metadata.xml b/dev-libs/fampp2/metadata.xml
index 4cacf08..748ee49 100644
--- a/dev-libs/fampp2/metadata.xml
+++ b/dev-libs/fampp2/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<herd>cpp</herd>
 	<use>
-		<flag name='stlport'>Include support for <pkg>dev-libs/STLport</pkg></flag>
+		<flag name="stlport">Include support for <pkg>dev-libs/STLport</pkg></flag>
 	</use>
 	<upstream>
-		<remote-id type='sourceforge'>fampp</remote-id>
+		<remote-id type="sourceforge">fampp</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/fcgi/metadata.xml b/dev-libs/fcgi/metadata.xml
index 9b5105a..baef581 100644
--- a/dev-libs/fcgi/metadata.xml
+++ b/dev-libs/fcgi/metadata.xml
@@ -6,6 +6,6 @@
   <name>Rafael G. Martins</name>
 </maintainer>
 <use>
-  <flag name='html'>Install HTML documentation</flag>
+  <flag name="html">Install HTML documentation</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/fddl/metadata.xml b/dev-libs/fddl/metadata.xml
index 85cd1f1..d99bc87 100644
--- a/dev-libs/fddl/metadata.xml
+++ b/dev-libs/fddl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-libs/ferrisloki/metadata.xml b/dev-libs/ferrisloki/metadata.xml
index 0323b70..d196588 100644
--- a/dev-libs/ferrisloki/metadata.xml
+++ b/dev-libs/ferrisloki/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>cpp</herd>
 <use>
-  <flag name='stlport'>Include support for <pkg>dev-libs/STLport</pkg></flag>
+  <flag name="stlport">Include support for <pkg>dev-libs/STLport</pkg></flag>
 </use>
 <upstream>
 	<remote-id type="sourceforge">witme</remote-id>

diff --git a/dev-libs/gecode/metadata.xml b/dev-libs/gecode/metadata.xml
index 572f73e..96477e7 100644
--- a/dev-libs/gecode/metadata.xml
+++ b/dev-libs/gecode/metadata.xml
@@ -10,4 +10,3 @@
 		</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/dev-libs/gmime/metadata.xml b/dev-libs/gmime/metadata.xml
index a007320..009ffda 100644
--- a/dev-libs/gmime/metadata.xml
+++ b/dev-libs/gmime/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>

diff --git a/dev-libs/gmp/metadata.xml b/dev-libs/gmp/metadata.xml
index 284648e..c59de3b 100644
--- a/dev-libs/gmp/metadata.xml
+++ b/dev-libs/gmp/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>toolchain</herd>
 <use>
-	<flag name='asm'>Enable use of hand optimized assembly routines (faster execution)</flag>
-	<flag name='pgo'>After building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag>
+	<flag name="asm">Enable use of hand optimized assembly routines (faster execution)</flag>
+	<flag name="pgo">After building gmp, run some tests against to produce faster libraries -- this option will double the compile time</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/jansson/metadata.xml b/dev-libs/jansson/metadata.xml
index 569987a..1cec61f 100644
--- a/dev-libs/jansson/metadata.xml
+++ b/dev-libs/jansson/metadata.xml
@@ -10,4 +10,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-libs/jemalloc/metadata.xml b/dev-libs/jemalloc/metadata.xml
index a53e4b4..4a50092 100644
--- a/dev-libs/jemalloc/metadata.xml
+++ b/dev-libs/jemalloc/metadata.xml
@@ -6,7 +6,6 @@
 		Jemalloc is a general-purpose scalable concurrent allocator
 	</longdescription>
 	<use>
-		<flag name='stats'>Enable statistics calculation/reporting</flag>
+		<flag name="stats">Enable statistics calculation/reporting</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/dev-libs/json-c/metadata.xml b/dev-libs/json-c/metadata.xml
index 7faf5b9..b6b667f 100644
--- a/dev-libs/json-c/metadata.xml
+++ b/dev-libs/json-c/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-libs/jsoncpp/metadata.xml b/dev-libs/jsoncpp/metadata.xml
index a348080..e01f23f 100644
--- a/dev-libs/jsoncpp/metadata.xml
+++ b/dev-libs/jsoncpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-libs/keybinder/metadata.xml b/dev-libs/keybinder/metadata.xml
index 8348bfd..0c2ab83 100644
--- a/dev-libs/keybinder/metadata.xml
+++ b/dev-libs/keybinder/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-libs/kpathsea/metadata.xml b/dev-libs/kpathsea/metadata.xml
index 709c45b..4c5b18f 100644
--- a/dev-libs/kpathsea/metadata.xml
+++ b/dev-libs/kpathsea/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Alexis Ballier</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/libRocket/metadata.xml b/dev-libs/libRocket/metadata.xml
index 751ccdc..15d7980 100644
--- a/dev-libs/libRocket/metadata.xml
+++ b/dev-libs/libRocket/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-libs/libaio/metadata.xml b/dev-libs/libaio/metadata.xml
index 1bc18f3..c679f87 100644
--- a/dev-libs/libaio/metadata.xml
+++ b/dev-libs/libaio/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>

diff --git a/dev-libs/libb64/metadata.xml b/dev-libs/libb64/metadata.xml
index f28dc07..dd8e83d 100644
--- a/dev-libs/libb64/metadata.xml
+++ b/dev-libs/libb64/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-libs/libcss/metadata.xml b/dev-libs/libcss/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/dev-libs/libcss/metadata.xml
+++ b/dev-libs/libcss/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/libdbh/metadata.xml b/dev-libs/libdbh/metadata.xml
index 7043867..24915ef 100644
--- a/dev-libs/libdbh/metadata.xml
+++ b/dev-libs/libdbh/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-libs/libestr/metadata.xml b/dev-libs/libestr/metadata.xml
index 377419e..60c7f53 100644
--- a/dev-libs/libestr/metadata.xml
+++ b/dev-libs/libestr/metadata.xml
@@ -11,4 +11,3 @@
 	<name>Maxim Koltsov</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/libev/metadata.xml b/dev-libs/libev/metadata.xml
index 1369185..e42a8bd 100644
--- a/dev-libs/libev/metadata.xml
+++ b/dev-libs/libev/metadata.xml
@@ -6,4 +6,3 @@
     <name>Yixun Lan</name>
   </maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/libevent/metadata.xml b/dev-libs/libevent/metadata.xml
index 6e8c263..d1e9b99 100644
--- a/dev-libs/libevent/metadata.xml
+++ b/dev-libs/libevent/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-libs/libexecinfo/metadata.xml b/dev-libs/libexecinfo/metadata.xml
index 5d71e6f..1792d80 100644
--- a/dev-libs/libexecinfo/metadata.xml
+++ b/dev-libs/libexecinfo/metadata.xml
@@ -9,4 +9,3 @@
 	compiler.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-libs/libexplain/metadata.xml b/dev-libs/libexplain/metadata.xml
index fc8c8c8..f88eefb 100644
--- a/dev-libs/libexplain/metadata.xml
+++ b/dev-libs/libexplain/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>shell-tools</herd>

diff --git a/dev-libs/libffi/metadata.xml b/dev-libs/libffi/metadata.xml
index 691534b..5f8cc7e 100644
--- a/dev-libs/libffi/metadata.xml
+++ b/dev-libs/libffi/metadata.xml
@@ -31,6 +31,6 @@
 		between the two languages.
 	</longdescription>
 	<use>
-		<flag name='pax_kernel'>Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
+		<flag name="pax_kernel">Use PaX emulated trampolines, for we can't use PROT_EXEC</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-libs/libgee/metadata.xml b/dev-libs/libgee/metadata.xml
index 8f409b1..7293646 100644
--- a/dev-libs/libgee/metadata.xml
+++ b/dev-libs/libgee/metadata.xml
@@ -6,4 +6,3 @@
 libgee is a collection library providing GObject-based interfaces and classes for commonly used data structures. 
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-libs/libhid/metadata.xml b/dev-libs/libhid/metadata.xml
index 006ee5d..56f1b4a 100644
--- a/dev-libs/libhid/metadata.xml
+++ b/dev-libs/libhid/metadata.xml
@@ -11,4 +11,3 @@ libusb, thus it requires no HID support in the kernel and provides means to
 take control over a device even if the kernel governs it.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-libs/libhtmlparse/metadata.xml b/dev-libs/libhtmlparse/metadata.xml
index e96e35b..91f4e72 100644
--- a/dev-libs/libhtmlparse/metadata.xml
+++ b/dev-libs/libhtmlparse/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/libiconv/metadata.xml b/dev-libs/libiconv/metadata.xml
index c06fa33..7dc69ce 100644
--- a/dev-libs/libiconv/metadata.xml
+++ b/dev-libs/libiconv/metadata.xml
@@ -8,4 +8,3 @@ functions as glibc already embed. Libraries and applications needs it
 when built in a non-glibc system.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-libs/libisoburn/metadata.xml b/dev-libs/libisoburn/metadata.xml
index 8617e65..2a7ab78 100644
--- a/dev-libs/libisoburn/metadata.xml
+++ b/dev-libs/libisoburn/metadata.xml
@@ -7,14 +7,14 @@
 <name>Daniel Pielmeier</name>
 </maintainer>
 <use>
-<flag name='external-filters'>Allow the use of external processes as file content 
+<flag name="external-filters">Allow the use of external processes as file content 
 filters (Note: this is a potential security risk)</flag>
-<flag name='external-filters-setuid'>Also allow the use of external setuid 
+<flag name="external-filters-setuid">Also allow the use of external setuid 
 processes as file content filters (Note: this is a potential security 
 risk)</flag>
-<flag name='launch-frontend'>Enable the tcl gui for xorriso</flag>
-<flag name='launch-frontend-setuid'>Enable the tcl gui for xorriso under setuid</flag>
-<flag name='frontend-optional'>Use <pkg>dev-tcltk/bwidget</pkg> which is not strictly required for the frontend</flag>
+<flag name="launch-frontend">Enable the tcl gui for xorriso</flag>
+<flag name="launch-frontend-setuid">Enable the tcl gui for xorriso under setuid</flag>
+<flag name="frontend-optional">Use <pkg>dev-tcltk/bwidget</pkg> which is not strictly required for the frontend</flag>
 <flag name="cdio">Enable EXPERIMENTAL use of libcdio as system adapter</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/libisofs/metadata.xml b/dev-libs/libisofs/metadata.xml
index 7562711..3923327 100644
--- a/dev-libs/libisofs/metadata.xml
+++ b/dev-libs/libisofs/metadata.xml
@@ -7,6 +7,6 @@
 <name>Daniel Pielmeier</name>
 </maintainer>
 <use>
-<flag name='verbose-debug'>Enable verbose debug messages</flag>
+<flag name="verbose-debug">Enable verbose debug messages</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/libjit/metadata.xml b/dev-libs/libjit/metadata.xml
index e35a06f..9d507ed 100644
--- a/dev-libs/libjit/metadata.xml
+++ b/dev-libs/libjit/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>dotnet</herd>
 <use>
-  <flag name='interpreter'>Enable the libjit interpreter</flag>
-  <flag name='long-double'>Enable the use of long double for jit_nfloat</flag>
+  <flag name="interpreter">Enable the libjit interpreter</flag>
+  <flag name="long-double">Enable the use of long double for jit_nfloat</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/liblogging/metadata.xml b/dev-libs/liblogging/metadata.xml
index 44f1627..2db6360 100644
--- a/dev-libs/liblogging/metadata.xml
+++ b/dev-libs/liblogging/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/dev-libs/libmaxminddb/metadata.xml b/dev-libs/libmaxminddb/metadata.xml
index 56ab0cf..0c050f9 100644
--- a/dev-libs/libmaxminddb/metadata.xml
+++ b/dev-libs/libmaxminddb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>

diff --git a/dev-libs/libmcs/metadata.xml b/dev-libs/libmcs/metadata.xml
index 5054793..1cbd101 100644
--- a/dev-libs/libmcs/metadata.xml
+++ b/dev-libs/libmcs/metadata.xml
@@ -5,5 +5,5 @@
           <email>jdhore@gentoo.org</email>
           <name>Jeff Horelick</name>
   </maintainer>
-  <longdescription></longdescription>
+  <longdescription/>
 </pkgmetadata>

diff --git a/dev-libs/libmodbus/metadata.xml b/dev-libs/libmodbus/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/dev-libs/libmodbus/metadata.xml
+++ b/dev-libs/libmodbus/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/libmowgli/metadata.xml b/dev-libs/libmowgli/metadata.xml
index 9ee9b55..b5aaeb5 100644
--- a/dev-libs/libmowgli/metadata.xml
+++ b/dev-libs/libmowgli/metadata.xml
@@ -10,5 +10,5 @@
     <name>Nathan Phillip Brink</name>
     <description>Co-maintainer</description>
   </maintainer>
-  <longdescription></longdescription>
+  <longdescription/>
 </pkgmetadata>

diff --git a/dev-libs/libnfc/metadata.xml b/dev-libs/libnfc/metadata.xml
index 77f62c5..1ba29ed 100644
--- a/dev-libs/libnfc/metadata.xml
+++ b/dev-libs/libnfc/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Mike Auty</name>
 	</maintainer>
 	<use>
-		<flag name='pcsc-lite'>Enable NFC drivers that require pcsc-lite</flag>
+		<flag name="pcsc-lite">Enable NFC drivers that require pcsc-lite</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">libnfc</remote-id>

diff --git a/dev-libs/libnl/metadata.xml b/dev-libs/libnl/metadata.xml
index 3513ab3..3b7135c 100644
--- a/dev-libs/libnl/metadata.xml
+++ b/dev-libs/libnl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>

diff --git a/dev-libs/libnsfb/metadata.xml b/dev-libs/libnsfb/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/dev-libs/libnsfb/metadata.xml
+++ b/dev-libs/libnsfb/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/libntru/metadata.xml b/dev-libs/libntru/metadata.xml
index 0782666..56b50d5 100644
--- a/dev-libs/libntru/metadata.xml
+++ b/dev-libs/libntru/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Julian Ospald</name>
 	</maintainer>
 	<upstream>
-		<remote-id type='github'>tbuktu/libntru</remote-id>
+		<remote-id type="github">tbuktu/libntru</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/dev-libs/liboobs/metadata.xml b/dev-libs/liboobs/metadata.xml
index 211a06a..50bec16 100644
--- a/dev-libs/liboobs/metadata.xml
+++ b/dev-libs/liboobs/metadata.xml
@@ -9,4 +9,3 @@
 		backend and data consistency too
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-libs/libparserutils/metadata.xml b/dev-libs/libparserutils/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/dev-libs/libparserutils/metadata.xml
+++ b/dev-libs/libparserutils/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/librep/metadata.xml b/dev-libs/librep/metadata.xml
index fe9769d..d2bdcef 100644
--- a/dev-libs/librep/metadata.xml
+++ b/dev-libs/librep/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-libs/libserialport/metadata.xml b/dev-libs/libserialport/metadata.xml
index 253e7c3..9211408 100644
--- a/dev-libs/libserialport/metadata.xml
+++ b/dev-libs/libserialport/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>dev-embedded</herd>

diff --git a/dev-libs/libsigc++/metadata.xml b/dev-libs/libsigc++/metadata.xml
index 250a48a..e6cf74a 100644
--- a/dev-libs/libsigc++/metadata.xml
+++ b/dev-libs/libsigc++/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome-mm</herd>

diff --git a/dev-libs/libsigsegv/metadata.xml b/dev-libs/libsigsegv/metadata.xml
index 4b262b7..9800397 100644
--- a/dev-libs/libsigsegv/metadata.xml
+++ b/dev-libs/libsigsegv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>common-lisp</herd>

diff --git a/dev-libs/libsqlora8/metadata.xml b/dev-libs/libsqlora8/metadata.xml
index 95a63af..36bb67f 100644
--- a/dev-libs/libsqlora8/metadata.xml
+++ b/dev-libs/libsqlora8/metadata.xml
@@ -9,6 +9,6 @@
   interface. Makes simple programming tasks much easier than with plain OCI.
 </longdescription>
 <use>
-  <flag name='orathreads'>Use Oracle threads</flag>
+  <flag name="orathreads">Use Oracle threads</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/libtecla/metadata.xml b/dev-libs/libtecla/metadata.xml
index d610aa8..63bef1b 100644
--- a/dev-libs/libtecla/metadata.xml
+++ b/dev-libs/libtecla/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   The tecla library provides UNIX and LINUX programs with interactive
   command line editing facilities, similar to those of the UNIX tcsh
   shell. In addition to simple command-line editing, it supports

diff --git a/dev-libs/libtermkey/metadata.xml b/dev-libs/libtermkey/metadata.xml
index ade7dc1..e76fa84 100644
--- a/dev-libs/libtermkey/metadata.xml
+++ b/dev-libs/libtermkey/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <herd>vim</herd>
   <use>
-    <flag name='demos'>Install demos, which pulls in <pkg>dev-libs/glib</pkg></flag>
+    <flag name="demos">Install demos, which pulls in <pkg>dev-libs/glib</pkg></flag>
   </use>
 </pkgmetadata>

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

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

diff --git a/dev-libs/libwapcaplet/metadata.xml b/dev-libs/libwapcaplet/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/dev-libs/libwapcaplet/metadata.xml
+++ b/dev-libs/libwapcaplet/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/libxls/metadata.xml b/dev-libs/libxls/metadata.xml
index e62d4c5..a210978 100644
--- a/dev-libs/libxls/metadata.xml
+++ b/dev-libs/libxls/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-libs/log4cxx/metadata.xml b/dev-libs/log4cxx/metadata.xml
index 6c89210..637de3e 100644
--- a/dev-libs/log4cxx/metadata.xml
+++ b/dev-libs/log4cxx/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>cpp</herd>
 <use>
-  <flag name='smtp' restrict='&lt;dev-libs/log4cxx-0.10'>Offer SMTP support via
+  <flag name="smtp" restrict="&lt;dev-libs/log4cxx-0.10">Offer SMTP support via
     <pkg>net-libs/libsmtp</pkg></flag>
-  <flag name='smtp' restrict='&gt;=dev-libs/log4cxx-0.10'>Offer SMTP support via
+  <flag name="smtp" restrict="&gt;=dev-libs/log4cxx-0.10">Offer SMTP support via
     <pkg>net-libs/libesmtp</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/lzo/metadata.xml b/dev-libs/lzo/metadata.xml
index caaa4ac..25907ed 100644
--- a/dev-libs/lzo/metadata.xml
+++ b/dev-libs/lzo/metadata.xml
@@ -5,5 +5,5 @@
     <email>binki@gentoo.org</email>
     <name>Nathan Phillip Brink</name>
 </maintainer>
-<longdescription></longdescription>
+<longdescription/>
 </pkgmetadata>

diff --git a/dev-libs/m17n-lib/metadata.xml b/dev-libs/m17n-lib/metadata.xml
index 8c2cd4b..4741774 100644
--- a/dev-libs/m17n-lib/metadata.xml
+++ b/dev-libs/m17n-lib/metadata.xml
@@ -3,19 +3,19 @@
 <pkgmetadata>
   <herd>cjk</herd>
   <use>
-    <flag name='X'>
+    <flag name="X">
       Builds the Graphical User Interface API and utilities for the
       package.
     </flag>
-    <flag name='anthy'>Enable support for <pkg>app-i18n/anthy</pkg>
+    <flag name="anthy">Enable support for <pkg>app-i18n/anthy</pkg>
     input method.</flag>
-    <flag name='athena'>Enable the MIT Athena widget set
+    <flag name="athena">Enable the MIT Athena widget set
     (<pkg>x11-libs/libXaw</pkg>)</flag>
-    <flag name='gd'>
+    <flag name="gd">
       Build API and utilities based on <pkg>media-libs/gd</pkg>. This
       flag is only meaningful if the X USE flag is also enabled.
     </flag>
-    <flag name='libotf'>Use <pkg>dev-libs/libotf</pkg> to handle OpenType fonts</flag>
-    <flag name='libxml2'>Use <pkg>dev-libs/libxml2</pkg> to parse XML</flag>
+    <flag name="libotf">Use <pkg>dev-libs/libotf</pkg> to handle OpenType fonts</flag>
+    <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML</flag>
   </use>
 </pkgmetadata>

diff --git a/dev-libs/nsgenbind/metadata.xml b/dev-libs/nsgenbind/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/dev-libs/nsgenbind/metadata.xml
+++ b/dev-libs/nsgenbind/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/nss/metadata.xml b/dev-libs/nss/metadata.xml
index 0e2139c..ef61057 100644
--- a/dev-libs/nss/metadata.xml
+++ b/dev-libs/nss/metadata.xml
@@ -3,12 +3,12 @@
 <pkgmetadata>
 <herd>mozilla</herd>
 <use>
-  <flag name='cacert'>
+  <flag name="cacert">
     Include root/class3 certs from CAcert (http://http://www.cacert.org/) and
     Software in the Public Interest (http://www.spi-inc.org/)
   </flag>
-  <flag name='nss-pem'>Add support for libnsspem</flag>
-  <flag name='utils'>Install utilities included with the library</flag>
+  <flag name="nss-pem">Add support for libnsspem</flag>
+  <flag name="utils">Install utilities included with the library</flag>
 </use>
 <upstream>
   <remote-id type="cpe">cpe:/a:mozilla:nss</remote-id>

diff --git a/dev-libs/openssl/metadata.xml b/dev-libs/openssl/metadata.xml
index f457065..b7cc1cd 100644
--- a/dev-libs/openssl/metadata.xml
+++ b/dev-libs/openssl/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
- <flag name='asm'>Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
- <flag name='bindist'>Disable EC algorithms (as they seem to be patented) -- note: changes the ABI</flag>
- <flag name='sctp'>Support for Stream Control Transmission Protocol</flag>
- <flag name='rfc3779'>Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
- <flag name='tls-heartbeat'>Enable the Heartbeat Extension in TLS and DTLS</flag>
+ <flag name="asm">Support assembly hand optimized crypto functions (i.e. faster run time)</flag>
+ <flag name="bindist">Disable EC algorithms (as they seem to be patented) -- note: changes the ABI</flag>
+ <flag name="sctp">Support for Stream Control Transmission Protocol</flag>
+ <flag name="rfc3779">Enable support for RFC 3779 (X.509 Extensions for IP Addresses and AS Identifiers)</flag>
+ <flag name="tls-heartbeat">Enable the Heartbeat Extension in TLS and DTLS</flag>
 </use>
 <upstream>
  <remote-id type="cpe">cpe:/a:openssl:openssl</remote-id>

diff --git a/dev-libs/ppl/metadata.xml b/dev-libs/ppl/metadata.xml
index f109b1b..3584f23 100644
--- a/dev-libs/ppl/metadata.xml
+++ b/dev-libs/ppl/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>toolchain</herd>
 <use>
-  <flag name='lpsol'>Build the ppl_lpsol linear programming problem solver</flag>
+  <flag name="lpsol">Build the ppl_lpsol linear programming problem solver</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/qjson/metadata.xml b/dev-libs/qjson/metadata.xml
index 2218c37..8f60b5c 100644
--- a/dev-libs/qjson/metadata.xml
+++ b/dev-libs/qjson/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>

diff --git a/dev-libs/qqwing/metadata.xml b/dev-libs/qqwing/metadata.xml
index 8005424..36fc81a 100644
--- a/dev-libs/qqwing/metadata.xml
+++ b/dev-libs/qqwing/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>

diff --git a/dev-libs/safestr/metadata.xml b/dev-libs/safestr/metadata.xml
index fec67fc..4f6f6bd 100644
--- a/dev-libs/safestr/metadata.xml
+++ b/dev-libs/safestr/metadata.xml
@@ -12,4 +12,3 @@ handling should be straightforward.  The library should work on all modern
 Unix-like platforms, as well as any 32-bit Microsoft Windows OS.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-libs/softhsm/metadata.xml b/dev-libs/softhsm/metadata.xml
index 77def0a..0926560 100644
--- a/dev-libs/softhsm/metadata.xml
+++ b/dev-libs/softhsm/metadata.xml
@@ -5,4 +5,3 @@
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/starpu/metadata.xml b/dev-libs/starpu/metadata.xml
index 362d944..8a26ab4 100644
--- a/dev-libs/starpu/metadata.xml
+++ b/dev-libs/starpu/metadata.xml
@@ -5,7 +5,7 @@
   <email>bicatali@gentoo.org</email>
   <description>Feel free to update and/or fix</description>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
   StarPU is a runtime system that offers support for heterogeneous
   multicore machines. While many efforts are devoted to design efficient
   computation kernels for those architectures (e.g. to implement BLAS

diff --git a/dev-libs/totem-pl-parser/metadata.xml b/dev-libs/totem-pl-parser/metadata.xml
index dd1d648..90786c3 100644
--- a/dev-libs/totem-pl-parser/metadata.xml
+++ b/dev-libs/totem-pl-parser/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name='archive'>Enables support for accessing media files in archives
+	<flag name="archive">Enables support for accessing media files in archives
 		transparently via <pkg>app-arch/libarchive</pkg></flag>
 	<flag name="quvi">Use <pkg>media-libs/libquvi</pkg> for parsing video
 		links</flag>

diff --git a/dev-libs/ucommon/metadata.xml b/dev-libs/ucommon/metadata.xml
index 2b98dd2..076cf48 100644
--- a/dev-libs/ucommon/metadata.xml
+++ b/dev-libs/ucommon/metadata.xml
@@ -11,6 +11,6 @@
 	<name>Maxim Koltsov</name>
 </maintainer>
 <use>
-	<flag name='socks'>Build with socks proxy support</flag>
+	<flag name="socks">Build with socks proxy support</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/userspace-rcu/metadata.xml b/dev-libs/userspace-rcu/metadata.xml
index 8597f04..a6cb317 100644
--- a/dev-libs/userspace-rcu/metadata.xml
+++ b/dev-libs/userspace-rcu/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-<flag name='regression-test'>Run regression tests (requires FEATURES=test)</flag>
+<flag name="regression-test">Run regression tests (requires FEATURES=test)</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/uthash/metadata.xml b/dev-libs/uthash/metadata.xml
index b492c34..85dd936 100644
--- a/dev-libs/uthash/metadata.xml
+++ b/dev-libs/uthash/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>

diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 56eac98..dd18351 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -3,21 +3,21 @@
 <pkgmetadata>
 <herd>x11</herd>
 <use>
-	<flag name='colord'>Allow setting color managment</flag>
-	<flag name='drm'>Enable drm compositor support</flag>
-	<flag name='editor'>Install wayland-editor example application</flag>
-	<flag name='egl'>Enable egl acceleration</flag>
-	<flag name='fbdev'>Enable fbdev compositor support</flag>
-	<flag name='gles2'>Use GLESv2 cairo instead of full GL</flag>
-	<flag name='headless'>Headless backend and a noop renderer, mainly for testing purposes</flag>
-	<flag name='ivi'>Enable the IVI shell</flag>
-	<flag name='launch'>Install weston-launch utility</flag>
-	<flag name='rdp'>Enable Remote Desktop Protocol compositor support</flag>
-	<flag name='resize-optimization'>Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
-	<flag name='rpi'>Raspberry Pi GPU support</flag>
-	<flag name='screen-sharing'>Enable screen-sharing through RDP</flag>
-	<flag name='unwind'>Enable libunwind usage for backtraces</flag>
-	<flag name='wayland-compositor'>Enable Wayland compositor support</flag>
-	<flag name='xwayland'>Enable ability support native X11 applications</flag>
+	<flag name="colord">Allow setting color managment</flag>
+	<flag name="drm">Enable drm compositor support</flag>
+	<flag name="editor">Install wayland-editor example application</flag>
+	<flag name="egl">Enable egl acceleration</flag>
+	<flag name="fbdev">Enable fbdev compositor support</flag>
+	<flag name="gles2">Use GLESv2 cairo instead of full GL</flag>
+	<flag name="headless">Headless backend and a noop renderer, mainly for testing purposes</flag>
+	<flag name="ivi">Enable the IVI shell</flag>
+	<flag name="launch">Install weston-launch utility</flag>
+	<flag name="rdp">Enable Remote Desktop Protocol compositor support</flag>
+	<flag name="resize-optimization">Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
+	<flag name="rpi">Raspberry Pi GPU support</flag>
+	<flag name="screen-sharing">Enable screen-sharing through RDP</flag>
+	<flag name="unwind">Enable libunwind usage for backtraces</flag>
+	<flag name="wayland-compositor">Enable Wayland compositor support</flag>
+	<flag name="xwayland">Enable ability support native X11 applications</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/xapian/metadata.xml b/dev-libs/xapian/metadata.xml
index 2860138..ca3e85b 100644
--- a/dev-libs/xapian/metadata.xml
+++ b/dev-libs/xapian/metadata.xml
@@ -20,8 +20,8 @@
 		applications.
 	</longdescription>
 	<use>
-		<flag name='brass'>Enabled brass backend db support</flag>
-		<flag name='chert'>Enabled chert backend db support</flag>
-		<flag name='inmemory'>Enabled inmemory backend db support</flag>
+		<flag name="brass">Enabled brass backend db support</flag>
+		<flag name="chert">Enabled chert backend db support</flag>
+		<flag name="inmemory">Enabled inmemory backend db support</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-libs/xerces-c/metadata.xml b/dev-libs/xerces-c/metadata.xml
index 4ae03a9..b6a7983 100644
--- a/dev-libs/xerces-c/metadata.xml
+++ b/dev-libs/xerces-c/metadata.xml
@@ -4,12 +4,12 @@
 <herd>cpp</herd>
 <longdescription>xerces-c is a C++ library specializing in XML parsing. It is released by the Apache Foundation</longdescription>
 <use>
-  <flag name='iconv'>Use iconv (<pkg>virtual/libiconv</pkg>) as message loader
+  <flag name="iconv">Use iconv (<pkg>virtual/libiconv</pkg>) as message loader
     and transcoder (in general it would be possible to use iconv only as
     message loader and something else like icu or the native method as
     transcoder and vice-versa, but this is a less common case and hard to
     handle)</flag>
-  <flag name='threads'>Enable threading support through pthread (or other
+  <flag name="threads">Enable threading support through pthread (or other
     libraries on AIX, IRIX, HPUX, Solars). Highly recommended</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-libs/xml-security-c/metadata.xml b/dev-libs/xml-security-c/metadata.xml
index adf8372..c4c0519 100644
--- a/dev-libs/xml-security-c/metadata.xml
+++ b/dev-libs/xml-security-c/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<herd>cpp</herd>
 	<use>
-		<flag name='xalan'>Enable support for XSLT and XPath parsing 
+		<flag name="xalan">Enable support for XSLT and XPath parsing 
 			by <pkg>dev-libs/xalan-c</pkg></flag>
-		<flag name='nss'>Use <pkg>dev-libs/nss</pkg> for certain crypto
+		<flag name="nss">Use <pkg>dev-libs/nss</pkg> for certain crypto
 			operations (configureable at runtime)</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-libs/xmlrpc-c/metadata.xml b/dev-libs/xmlrpc-c/metadata.xml
index 409bfb3..9ddbbfe 100644
--- a/dev-libs/xmlrpc-c/metadata.xml
+++ b/dev-libs/xmlrpc-c/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-libs/xmlwrapp/metadata.xml b/dev-libs/xmlwrapp/metadata.xml
index 3b13d8c..aad7956 100644
--- a/dev-libs/xmlwrapp/metadata.xml
+++ b/dev-libs/xmlwrapp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cpp</herd>

diff --git a/dev-libs/xxl/metadata.xml b/dev-libs/xxl/metadata.xml
index e96e35b..91f4e72 100644
--- a/dev-libs/xxl/metadata.xml
+++ b/dev-libs/xxl/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-libs/yaz/metadata.xml b/dev-libs/yaz/metadata.xml
index fe67454..e4a06d1 100644
--- a/dev-libs/yaz/metadata.xml
+++ b/dev-libs/yaz/metadata.xml
@@ -6,6 +6,6 @@
   <name>Robin H. Johnson</name>
 </maintainer>
 <use>
-  <flag name='ziffy'>Install ziffy, a promiscuous Z39.50 APDU sniffer</flag>
+  <flag name="ziffy">Install ziffy, a promiscuous Z39.50 APDU sniffer</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-lisp/abcl/metadata.xml b/dev-lisp/abcl/metadata.xml
index b89ccb6..53e4fff 100644
--- a/dev-lisp/abcl/metadata.xml
+++ b/dev-lisp/abcl/metadata.xml
@@ -8,8 +8,8 @@
 		Lisp that runs in a Java virtual machine.
 	</longdescription>
 	<use>
-	<flag name='clisp'>Build Armed Bear Common Lisp using GNU CLISP</flag>
-	<flag name='cmucl'>Build Armed Bear Common Lisp using CMU Common Lisp</flag>
-	<flag name='jad'>Enable support for disassembling compiled code using JAD</flag>
+	<flag name="clisp">Build Armed Bear Common Lisp using GNU CLISP</flag>
+	<flag name="cmucl">Build Armed Bear Common Lisp using CMU Common Lisp</flag>
+	<flag name="jad">Enable support for disassembling compiled code using JAD</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-lisp/cl-ppcre-unicode/metadata.xml b/dev-lisp/cl-ppcre-unicode/metadata.xml
index b2ce1c4..38443f0 100644
--- a/dev-lisp/cl-ppcre-unicode/metadata.xml
+++ b/dev-lisp/cl-ppcre-unicode/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>common-lisp</herd>

diff --git a/dev-lisp/cl-ppcre/metadata.xml b/dev-lisp/cl-ppcre/metadata.xml
index d7a0a16..f74418e 100644
--- a/dev-lisp/cl-ppcre/metadata.xml
+++ b/dev-lisp/cl-ppcre/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>common-lisp</herd>

diff --git a/dev-lisp/cl-unicode/metadata.xml b/dev-lisp/cl-unicode/metadata.xml
index 4b20b69..a1f0819 100644
--- a/dev-lisp/cl-unicode/metadata.xml
+++ b/dev-lisp/cl-unicode/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>common-lisp</herd>

diff --git a/dev-lisp/cmucl/metadata.xml b/dev-lisp/cmucl/metadata.xml
index 805c759..f2ace08 100644
--- a/dev-lisp/cmucl/metadata.xml
+++ b/dev-lisp/cmucl/metadata.xml
@@ -31,6 +31,6 @@ ANSI Common Lisp standard. Here is a summary of its main features:
    code profiler.
 </longdescription>
 <use>
-<flag name='source'>Include source code for CMUCL in installation</flag>
+<flag name="source">Include source code for CMUCL in installation</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-lisp/flexi-streams/metadata.xml b/dev-lisp/flexi-streams/metadata.xml
index 6523f99..0a0911d 100644
--- a/dev-lisp/flexi-streams/metadata.xml
+++ b/dev-lisp/flexi-streams/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>common-lisp</herd>

diff --git a/dev-lisp/gcl/metadata.xml b/dev-lisp/gcl/metadata.xml
index 3e77021..83dd1ec 100644
--- a/dev-lisp/gcl/metadata.xml
+++ b/dev-lisp/gcl/metadata.xml
@@ -8,7 +8,7 @@
     code, providing for both good performance and facile portability.
   </longdescription>
   <use>
-    <flag name='ansi'>Build a GCL with ANSI support (else build a traditional CLtL1 image)</flag>
-    <flag name='athena'>Build xgcl - an interface to <pkg>x11-libs/libXaw</pkg></flag>
+    <flag name="ansi">Build a GCL with ANSI support (else build a traditional CLtL1 image)</flag>
+    <flag name="athena">Build xgcl - an interface to <pkg>x11-libs/libXaw</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
index bad39a3..7bbc76d 100644
--- a/dev-lisp/sbcl/metadata.xml
+++ b/dev-lisp/sbcl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-lua/LuaBitOp/metadata.xml b/dev-lua/LuaBitOp/metadata.xml
index b5d1585..440332c 100644
--- a/dev-lua/LuaBitOp/metadata.xml
+++ b/dev-lua/LuaBitOp/metadata.xml
@@ -10,4 +10,3 @@
 		operations.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-lua/busted/metadata.xml b/dev-lua/busted/metadata.xml
index a32ed10..5e0ce2a 100644
--- a/dev-lua/busted/metadata.xml
+++ b/dev-lua/busted/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

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

diff --git a/dev-lua/lua-term/metadata.xml b/dev-lua/lua-term/metadata.xml
index c472272..449c226 100644
--- a/dev-lua/lua-term/metadata.xml
+++ b/dev-lua/lua-term/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-lua/lua_cliargs/metadata.xml b/dev-lua/lua_cliargs/metadata.xml
index 7bc2fd0..8b9e3d1 100644
--- a/dev-lua/lua_cliargs/metadata.xml
+++ b/dev-lua/lua_cliargs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-lua/luacov/metadata.xml b/dev-lua/luacov/metadata.xml
index 9a0905f..0b81aa6 100644
--- a/dev-lua/luacov/metadata.xml
+++ b/dev-lua/luacov/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-lua/luadoc/metadata.xml b/dev-lua/luadoc/metadata.xml
index 946b8a6..bf70915 100644
--- a/dev-lua/luadoc/metadata.xml
+++ b/dev-lua/luadoc/metadata.xml
@@ -11,4 +11,3 @@
     declarations and functions.
   </longdescription>
 </pkgmetadata>
-

diff --git a/dev-lua/luafilesystem/metadata.xml b/dev-lua/luafilesystem/metadata.xml
index 8a505cb..09999bb 100644
--- a/dev-lua/luafilesystem/metadata.xml
+++ b/dev-lua/luafilesystem/metadata.xml
@@ -12,4 +12,3 @@
 	structure and file attributes.
   </longdescription>
 </pkgmetadata>
-

diff --git a/dev-lua/lualdap/metadata.xml b/dev-lua/lualdap/metadata.xml
index 55afbdc..2e49c71 100644
--- a/dev-lua/lualdap/metadata.xml
+++ b/dev-lua/lualdap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-lua/luarocks/metadata.xml b/dev-lua/luarocks/metadata.xml
index e5711e3..aa67518 100644
--- a/dev-lua/luarocks/metadata.xml
+++ b/dev-lua/luarocks/metadata.xml
@@ -8,9 +8,9 @@
     <email>rafaelmartins@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='curl'>Uses <pkg>net-misc/curl</pkg> for fetching lua
+    <flag name="curl">Uses <pkg>net-misc/curl</pkg> for fetching lua
       packages instead of <pkg>net-misc/wget</pkg>.</flag>
-    <flag name='openssl'>Uses <pkg>dev-libs/openssl</pkg> for verifying lua
+    <flag name="openssl">Uses <pkg>dev-libs/openssl</pkg> for verifying lua
       packages instead of md5sum.</flag>
   </use>
 </pkgmetadata>

diff --git a/dev-lua/luassert/metadata.xml b/dev-lua/luassert/metadata.xml
index 0434a68..237ddfd 100644
--- a/dev-lua/luassert/metadata.xml
+++ b/dev-lua/luassert/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-lua/luvit/metadata.xml b/dev-lua/luvit/metadata.xml
index bae9592..520a489 100644
--- a/dev-lua/luvit/metadata.xml
+++ b/dev-lua/luvit/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Julian Ospald</name>
 	</maintainer>
 	<use>
-		<flag name='bundled-libs'>Use bundled versions of some libraries.</flag>
+		<flag name="bundled-libs">Use bundled versions of some libraries.</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/dev-lua/mediator_lua/metadata.xml b/dev-lua/mediator_lua/metadata.xml
index 2f71d61..f86723e 100644
--- a/dev-lua/mediator_lua/metadata.xml
+++ b/dev-lua/mediator_lua/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-lua/say/metadata.xml b/dev-lua/say/metadata.xml
index d1b838f..cb2d812 100644
--- a/dev-lua/say/metadata.xml
+++ b/dev-lua/say/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-ml/batteries/metadata.xml b/dev-ml/batteries/metadata.xml
index 7c20df7..ce6fb25 100644
--- a/dev-ml/batteries/metadata.xml
+++ b/dev-ml/batteries/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ml</herd>

diff --git a/dev-ml/cairo-ocaml/metadata.xml b/dev-ml/cairo-ocaml/metadata.xml
index ba8768a..2212fed 100644
--- a/dev-ml/cairo-ocaml/metadata.xml
+++ b/dev-ml/cairo-ocaml/metadata.xml
@@ -2,12 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
    This package contains all the development stuff you need to use Cairo in
    your OCaml programs. The folowing backends are supported: PostScript,
    PDF, PNG, In-memory images and X11.
 </longdescription>
 <use>
-  <flag name='pango'>Enable support for <pkg>x11-libs/pango</pkg></flag>
+  <flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/dev-ml/camlimages/metadata.xml b/dev-ml/camlimages/metadata.xml
index 429e62b..e4f3fad 100644
--- a/dev-ml/camlimages/metadata.xml
+++ b/dev-ml/camlimages/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ml</herd>

diff --git a/dev-ml/deriving-ocsigen/metadata.xml b/dev-ml/deriving-ocsigen/metadata.xml
index 009b874..d03028b 100644
--- a/dev-ml/deriving-ocsigen/metadata.xml
+++ b/dev-ml/deriving-ocsigen/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>ml</herd>
 <use>
-	<flag name='type-conv'>Enable type-conv for the syntax extention.</flag>
+	<flag name="type-conv">Enable type-conv for the syntax extention.</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-ml/io-page/metadata.xml b/dev-ml/io-page/metadata.xml
index 832ee88..7de4823 100644
--- a/dev-ml/io-page/metadata.xml
+++ b/dev-ml/io-page/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>ml</herd>

diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml
index 36defae..4d94d07 100644
--- a/dev-ml/lablgtk/metadata.xml
+++ b/dev-ml/lablgtk/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>ml</herd>
 <use>
-	<flag name='glade'>Enable libglade bindings compilation.</flag>
-	<flag name='gnomecanvas'>Enable libgnomecanvas bindings compilation.</flag>
-	<flag name='sourceview'>Enable GtkSourceView support</flag>
+	<flag name="glade">Enable libglade bindings compilation.</flag>
+	<flag name="gnomecanvas">Enable libgnomecanvas bindings compilation.</flag>
+	<flag name="sourceview">Enable GtkSourceView support</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-ml/mirage-profile/metadata.xml b/dev-ml/mirage-profile/metadata.xml
index 13a51b9..b5b7df0 100644
--- a/dev-ml/mirage-profile/metadata.xml
+++ b/dev-ml/mirage-profile/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>ml</herd>

diff --git a/dev-ml/ocaml-augeas/metadata.xml b/dev-ml/ocaml-augeas/metadata.xml
index 41c55d8..bc6b1a6 100644
--- a/dev-ml/ocaml-augeas/metadata.xml
+++ b/dev-ml/ocaml-augeas/metadata.xml
@@ -8,4 +8,3 @@
 ocaml-augeas is a set of Ocaml bindings around augeas.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-ml/ocaml-cstruct/metadata.xml b/dev-ml/ocaml-cstruct/metadata.xml
index d81d9c8..0daee3d 100644
--- a/dev-ml/ocaml-cstruct/metadata.xml
+++ b/dev-ml/ocaml-cstruct/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>ml</herd>

diff --git a/dev-ml/ocaml-dns/metadata.xml b/dev-ml/ocaml-dns/metadata.xml
index 048f61d..6a5da2b 100644
--- a/dev-ml/ocaml-dns/metadata.xml
+++ b/dev-ml/ocaml-dns/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>ml</herd>

diff --git a/dev-ml/ocaml-pcap/metadata.xml b/dev-ml/ocaml-pcap/metadata.xml
index 1f1335c..7e5c77c 100644
--- a/dev-ml/ocaml-pcap/metadata.xml
+++ b/dev-ml/ocaml-pcap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>ml</herd>

diff --git a/dev-ml/ocaml-sqlite3/metadata.xml b/dev-ml/ocaml-sqlite3/metadata.xml
index edc007d..a3c2581 100644
--- a/dev-ml/ocaml-sqlite3/metadata.xml
+++ b/dev-ml/ocaml-sqlite3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ml</herd>

diff --git a/dev-ml/ocaml-uri/metadata.xml b/dev-ml/ocaml-uri/metadata.xml
index 06b4aa1..5b1bec1 100644
--- a/dev-ml/ocaml-uri/metadata.xml
+++ b/dev-ml/ocaml-uri/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>ml</herd>

diff --git a/dev-ml/ocamldap/metadata.xml b/dev-ml/ocamldap/metadata.xml
index 413ab23..4705358 100644
--- a/dev-ml/ocamldap/metadata.xml
+++ b/dev-ml/ocamldap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ml</herd>

diff --git a/dev-ml/ocamlgsl/metadata.xml b/dev-ml/ocamlgsl/metadata.xml
index 926da8d..2546a40 100644
--- a/dev-ml/ocamlgsl/metadata.xml
+++ b/dev-ml/ocamlgsl/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   This is an interface to GSL (GNU scientific library), for the
   Objective Caml langage.
 </longdescription>

diff --git a/dev-ml/ocamlnet/metadata.xml b/dev-ml/ocamlnet/metadata.xml
index 6220a6c..156ab39 100644
--- a/dev-ml/ocamlnet/metadata.xml
+++ b/dev-ml/ocamlnet/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 	<herd>ml</herd>
 <use>
-	<flag name='cryptokit'>Enables encryption support via <pkg>dev-ml/cryptokit</pkg></flag>
-	<flag name='httpd'>Enables net-httpd web server component</flag>
-	<flag name='zip'>Enables netzip support to read/write gzip data using object channels</flag>
+	<flag name="cryptokit">Enables encryption support via <pkg>dev-ml/cryptokit</pkg></flag>
+	<flag name="httpd">Enables net-httpd web server component</flag>
+	<flag name="zip">Enables netzip support to read/write gzip data using object channels</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-ml/ocplib-endian/metadata.xml b/dev-ml/ocplib-endian/metadata.xml
index 4bc293e..0451b56 100644
--- a/dev-ml/ocplib-endian/metadata.xml
+++ b/dev-ml/ocplib-endian/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>ml</herd>

diff --git a/dev-ml/pcre-ocaml/metadata.xml b/dev-ml/pcre-ocaml/metadata.xml
index c33bef4..c3e5875 100644
--- a/dev-ml/pcre-ocaml/metadata.xml
+++ b/dev-ml/pcre-ocaml/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ml</herd>

diff --git a/dev-ml/pgocaml/metadata.xml b/dev-ml/pgocaml/metadata.xml
index 2bf9f17..cace4b2 100644
--- a/dev-ml/pgocaml/metadata.xml
+++ b/dev-ml/pgocaml/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>ml</herd>
 		<use>
-			<flag name='batteries'>Enable Batteries support instead of extlib</flag>
+			<flag name="batteries">Enable Batteries support instead of extlib</flag>
 		</use>
 </pkgmetadata>

diff --git a/dev-ml/pomap/metadata.xml b/dev-ml/pomap/metadata.xml
index 2aa45d7..f21c41a 100644
--- a/dev-ml/pomap/metadata.xml
+++ b/dev-ml/pomap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ml</herd>

diff --git a/dev-ml/postgresql-ocaml/metadata.xml b/dev-ml/postgresql-ocaml/metadata.xml
index d80e52b..452a21c 100644
--- a/dev-ml/postgresql-ocaml/metadata.xml
+++ b/dev-ml/postgresql-ocaml/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ml</herd>

diff --git a/dev-ml/qcheck/metadata.xml b/dev-ml/qcheck/metadata.xml
index aa4fd4b..3dfaf20 100644
--- a/dev-ml/qcheck/metadata.xml
+++ b/dev-ml/qcheck/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ml</herd>

diff --git a/dev-ml/res/metadata.xml b/dev-ml/res/metadata.xml
index 49b53ef..9ec3dcd 100644
--- a/dev-ml/res/metadata.xml
+++ b/dev-ml/res/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ml</herd>

diff --git a/dev-ml/stringext/metadata.xml b/dev-ml/stringext/metadata.xml
index e08529e..75f5ca2 100644
--- a/dev-ml/stringext/metadata.xml
+++ b/dev-ml/stringext/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>ml</herd>

diff --git a/dev-perl/Data-Stag/metadata.xml b/dev-perl/Data-Stag/metadata.xml
index 559eab5..0881fb4 100644
--- a/dev-perl/Data-Stag/metadata.xml
+++ b/dev-perl/Data-Stag/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>

diff --git a/dev-perl/File-RsyncP/metadata.xml b/dev-perl/File-RsyncP/metadata.xml
index 1420bd2..844e1c6 100644
--- a/dev-perl/File-RsyncP/metadata.xml
+++ b/dev-perl/File-RsyncP/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>

diff --git a/dev-perl/Linux-DesktopFiles/metadata.xml b/dev-perl/Linux-DesktopFiles/metadata.xml
index d6a3ba4..801e938 100644
--- a/dev-perl/Linux-DesktopFiles/metadata.xml
+++ b/dev-perl/Linux-DesktopFiles/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>perl</herd>
 </pkgmetadata>
-

diff --git a/dev-perl/Log-Log4perl/metadata.xml b/dev-perl/Log-Log4perl/metadata.xml
index f7e45e3..9fbb56f 100644
--- a/dev-perl/Log-Log4perl/metadata.xml
+++ b/dev-perl/Log-Log4perl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>

diff --git a/dev-perl/Mail-Mbox-MessageParser/metadata.xml b/dev-perl/Mail-Mbox-MessageParser/metadata.xml
index 291e45d..2dadbdf 100644
--- a/dev-perl/Mail-Mbox-MessageParser/metadata.xml
+++ b/dev-perl/Mail-Mbox-MessageParser/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>

diff --git a/dev-perl/Net-Whois-IP/metadata.xml b/dev-perl/Net-Whois-IP/metadata.xml
index c5e45f1..3c29b85 100644
--- a/dev-perl/Net-Whois-IP/metadata.xml
+++ b/dev-perl/Net-Whois-IP/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-perl/XML-RSS/metadata.xml b/dev-perl/XML-RSS/metadata.xml
index c7f7c29..a1a12d9 100644
--- a/dev-perl/XML-RSS/metadata.xml
+++ b/dev-perl/XML-RSS/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>

diff --git a/dev-perl/frontier-rpc/metadata.xml b/dev-perl/frontier-rpc/metadata.xml
index 6435d07..db9b121 100644
--- a/dev-perl/frontier-rpc/metadata.xml
+++ b/dev-perl/frontier-rpc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>

diff --git a/dev-perl/gnome2-perl/metadata.xml b/dev-perl/gnome2-perl/metadata.xml
index ab3eaf9..bb4e605 100644
--- a/dev-perl/gnome2-perl/metadata.xml
+++ b/dev-perl/gnome2-perl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>

diff --git a/dev-perl/gnome2-wnck/metadata.xml b/dev-perl/gnome2-wnck/metadata.xml
index 17c0d63..3fc246b 100644
--- a/dev-perl/gnome2-wnck/metadata.xml
+++ b/dev-perl/gnome2-wnck/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>

diff --git a/dev-perl/mecab-perl/metadata.xml b/dev-perl/mecab-perl/metadata.xml
index eeb54f4..92a708b 100644
--- a/dev-perl/mecab-perl/metadata.xml
+++ b/dev-perl/mecab-perl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cjk</herd>

diff --git a/dev-perl/perltidy/metadata.xml b/dev-perl/perltidy/metadata.xml
index 66094e0..eb3a6a5 100644
--- a/dev-perl/perltidy/metadata.xml
+++ b/dev-perl/perltidy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>

diff --git a/dev-perl/wxperl/metadata.xml b/dev-perl/wxperl/metadata.xml
index 25c3693..8f8263c 100644
--- a/dev-perl/wxperl/metadata.xml
+++ b/dev-perl/wxperl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>perl</herd>

diff --git a/dev-php/PEAR-Archive_Tar/metadata.xml b/dev-php/PEAR-Archive_Tar/metadata.xml
index 583f01b..6624b7f 100644
--- a/dev-php/PEAR-Archive_Tar/metadata.xml
+++ b/dev-php/PEAR-Archive_Tar/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>php</herd>

diff --git a/dev-php/PEAR-Console_CommandLine/metadata.xml b/dev-php/PEAR-Console_CommandLine/metadata.xml
index 4044421..064d87d 100644
--- a/dev-php/PEAR-Console_CommandLine/metadata.xml
+++ b/dev-php/PEAR-Console_CommandLine/metadata.xml
@@ -10,4 +10,3 @@
 A full featured command line options and arguments parser
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/PEAR-Console_Getopt/metadata.xml b/dev-php/PEAR-Console_Getopt/metadata.xml
index a05633b..bc4947b 100644
--- a/dev-php/PEAR-Console_Getopt/metadata.xml
+++ b/dev-php/PEAR-Console_Getopt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>php</herd>

diff --git a/dev-php/PEAR-HTTP_Request2/metadata.xml b/dev-php/PEAR-HTTP_Request2/metadata.xml
index a685ca0..112a781 100644
--- a/dev-php/PEAR-HTTP_Request2/metadata.xml
+++ b/dev-php/PEAR-HTTP_Request2/metadata.xml
@@ -6,10 +6,9 @@
 		Provides an easy way to perform HTTP requests.
 	</longdescription>
 	<use>
-		<flag name='curl'>Force dev-lang/php to be compiled with curl extension</flag>
-		<flag name='fileinfo'>Force dev-lang/php to be compiled with fileinfo extension</flag>
-		<flag name='ssl'>Force dev-lang/php to be compiled with ssl extension</flag>
-		<flag name='zlib'>Force dev-lang/php to be compiled with zlib extension</flag>
+		<flag name="curl">Force dev-lang/php to be compiled with curl extension</flag>
+		<flag name="fileinfo">Force dev-lang/php to be compiled with fileinfo extension</flag>
+		<flag name="ssl">Force dev-lang/php to be compiled with ssl extension</flag>
+		<flag name="zlib">Force dev-lang/php to be compiled with zlib extension</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/dev-php/PEAR-PEAR/metadata.xml b/dev-php/PEAR-PEAR/metadata.xml
index d7157d0..f632468 100644
--- a/dev-php/PEAR-PEAR/metadata.xml
+++ b/dev-php/PEAR-PEAR/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>php</herd>

diff --git a/dev-php/PEAR-PHP_Shell/metadata.xml b/dev-php/PEAR-PHP_Shell/metadata.xml
index 258d1b7..10c044f 100644
--- a/dev-php/PEAR-PHP_Shell/metadata.xml
+++ b/dev-php/PEAR-PHP_Shell/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>php</herd>
 	<use>
-		<flag name='auto-completion'>Enable tab-completion</flag>
+		<flag name="auto-completion">Enable tab-completion</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-php/PEAR-Structures_Graph/metadata.xml b/dev-php/PEAR-Structures_Graph/metadata.xml
index 045221f..43f3ca7 100644
--- a/dev-php/PEAR-Structures_Graph/metadata.xml
+++ b/dev-php/PEAR-Structures_Graph/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>php</herd>

diff --git a/dev-php/PEAR-XML_Util/metadata.xml b/dev-php/PEAR-XML_Util/metadata.xml
index 7202905..396e4aa 100644
--- a/dev-php/PEAR-XML_Util/metadata.xml
+++ b/dev-php/PEAR-XML_Util/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>php</herd>

diff --git a/dev-php/PHPMailer/metadata.xml b/dev-php/PHPMailer/metadata.xml
index 08bad5b..b64044c 100644
--- a/dev-php/PHPMailer/metadata.xml
+++ b/dev-php/PHPMailer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>php</herd>

diff --git a/dev-php/YAML/metadata.xml b/dev-php/YAML/metadata.xml
index ae9becc..8af0653 100644
--- a/dev-php/YAML/metadata.xml
+++ b/dev-php/YAML/metadata.xml
@@ -10,4 +10,3 @@
 The Symfony YAML Component
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/ZendFramework/metadata.xml b/dev-php/ZendFramework/metadata.xml
index d240bb4..7e21135 100644
--- a/dev-php/ZendFramework/metadata.xml
+++ b/dev-php/ZendFramework/metadata.xml
@@ -7,9 +7,9 @@
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
 	<use>
-		<flag name='cli'>Enables the CLI</flag>
-		<flag name='doc'>Installs the documentation</flag>
-		<flag name='examples'>Installs the examples</flag>
-		<flag name='minimal'>Installs the minimal version without Dojo toolkit, tests and demos</flag>
+		<flag name="cli">Enables the CLI</flag>
+		<flag name="doc">Installs the documentation</flag>
+		<flag name="examples">Installs the examples</flag>
+		<flag name="minimal">Installs the minimal version without Dojo toolkit, tests and demos</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-php/pecl-amqp/metadata.xml b/dev-php/pecl-amqp/metadata.xml
index 928b80f..0958745 100644
--- a/dev-php/pecl-amqp/metadata.xml
+++ b/dev-php/pecl-amqp/metadata.xml
@@ -5,4 +5,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-cairo/metadata.xml b/dev-php/pecl-cairo/metadata.xml
index b98253a..b25b5be 100644
--- a/dev-php/pecl-cairo/metadata.xml
+++ b/dev-php/pecl-cairo/metadata.xml
@@ -7,4 +7,3 @@
 		as expose all available functionality in cairo to PHP users.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-haru/metadata.xml b/dev-php/pecl-haru/metadata.xml
index 0c93320..c193ddc 100644
--- a/dev-php/pecl-haru/metadata.xml
+++ b/dev-php/pecl-haru/metadata.xml
@@ -6,4 +6,3 @@
 		using the Haru Free PDF Library.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-libevent/metadata.xml b/dev-php/pecl-libevent/metadata.xml
index 35fcff4..2d2189b 100644
--- a/dev-php/pecl-libevent/metadata.xml
+++ b/dev-php/pecl-libevent/metadata.xml
@@ -7,4 +7,3 @@
 <name>Ole Markus With</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-mongo/metadata.xml b/dev-php/pecl-mongo/metadata.xml
index abaf29c..fd3dbe3 100644
--- a/dev-php/pecl-mongo/metadata.xml
+++ b/dev-php/pecl-mongo/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>php</herd>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-oauth/metadata.xml b/dev-php/pecl-oauth/metadata.xml
index 928b80f..0958745 100644
--- a/dev-php/pecl-oauth/metadata.xml
+++ b/dev-php/pecl-oauth/metadata.xml
@@ -5,4 +5,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-redis/metadata.xml b/dev-php/pecl-redis/metadata.xml
index 191d18b..2af2b36 100644
--- a/dev-php/pecl-redis/metadata.xml
+++ b/dev-php/pecl-redis/metadata.xml
@@ -6,4 +6,3 @@
 		<flag name="igbinary">Enables igbinary serialisation support</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-rrd/metadata.xml b/dev-php/pecl-rrd/metadata.xml
index abaf29c..fd3dbe3 100644
--- a/dev-php/pecl-rrd/metadata.xml
+++ b/dev-php/pecl-rrd/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>php</herd>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-sphinx/metadata.xml b/dev-php/pecl-sphinx/metadata.xml
index abaf29c..fd3dbe3 100644
--- a/dev-php/pecl-sphinx/metadata.xml
+++ b/dev-php/pecl-sphinx/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>php</herd>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-spl_types/metadata.xml b/dev-php/pecl-spl_types/metadata.xml
index a351b45..3d0c667 100644
--- a/dev-php/pecl-spl_types/metadata.xml
+++ b/dev-php/pecl-spl_types/metadata.xml
@@ -6,4 +6,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-taint/metadata.xml b/dev-php/pecl-taint/metadata.xml
index f191922..2c8c53a 100644
--- a/dev-php/pecl-taint/metadata.xml
+++ b/dev-php/pecl-taint/metadata.xml
@@ -6,4 +6,3 @@
 		Extension used for detecting XSS codes(tainted string)
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-uploadprogress/metadata.xml b/dev-php/pecl-uploadprogress/metadata.xml
index 6299f70..400417e 100644
--- a/dev-php/pecl-uploadprogress/metadata.xml
+++ b/dev-php/pecl-uploadprogress/metadata.xml
@@ -6,4 +6,3 @@
 See http://cvs.php.net/viewvc.cgi/pecl/uploadprogress/examples/ for a little example.  It is only known to work on Apache with mod_php, other SAPI implementations unfortunately still have issues.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-xrange/metadata.xml b/dev-php/pecl-xrange/metadata.xml
index 928b80f..0958745 100644
--- a/dev-php/pecl-xrange/metadata.xml
+++ b/dev-php/pecl-xrange/metadata.xml
@@ -5,4 +5,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-yaml/metadata.xml b/dev-php/pecl-yaml/metadata.xml
index 09e07c1..6b5e053 100644
--- a/dev-php/pecl-yaml/metadata.xml
+++ b/dev-php/pecl-yaml/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Ole Markus With</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-php/pecl-zendopcache/metadata.xml b/dev-php/pecl-zendopcache/metadata.xml
index cfc2950..48b42a6 100644
--- a/dev-php/pecl-zendopcache/metadata.xml
+++ b/dev-php/pecl-zendopcache/metadata.xml
@@ -8,4 +8,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/php-codebrowser/metadata.xml b/dev-php/php-codebrowser/metadata.xml
index 9bdb49e..36a591c 100644
--- a/dev-php/php-codebrowser/metadata.xml
+++ b/dev-php/php-codebrowser/metadata.xml
@@ -10,4 +10,3 @@
 PHP_CodeBrowser generates a html view for code browsing with higlighted and colored errors, parsed from xml reports generated from codesniffer or phpunit.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/phpdepend/metadata.xml b/dev-php/phpdepend/metadata.xml
index e69fad8..7f6aa6e 100644
--- a/dev-php/phpdepend/metadata.xml
+++ b/dev-php/phpdepend/metadata.xml
@@ -10,4 +10,3 @@
 Static code analyser for PHP
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/phpmd/metadata.xml b/dev-php/phpmd/metadata.xml
index 020eb56..3b5aed4 100644
--- a/dev-php/phpmd/metadata.xml
+++ b/dev-php/phpmd/metadata.xml
@@ -10,4 +10,3 @@
 PHP mess detector
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-php/recaptcha/metadata.xml b/dev-php/recaptcha/metadata.xml
index 24eb848..edd675b 100644
--- a/dev-php/recaptcha/metadata.xml
+++ b/dev-php/recaptcha/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-php/twig/metadata.xml b/dev-php/twig/metadata.xml
index 8749191..e6f4f88 100644
--- a/dev-php/twig/metadata.xml
+++ b/dev-php/twig/metadata.xml
@@ -7,5 +7,3 @@
   </maintainer>
   <herd>php</herd>
 </pkgmetadata>
-
-

diff --git a/dev-php/xhprof/metadata.xml b/dev-php/xhprof/metadata.xml
index 7d83cdf..82983d1 100644
--- a/dev-php/xhprof/metadata.xml
+++ b/dev-php/xhprof/metadata.xml
@@ -6,4 +6,3 @@
 XHProf is a function-level hierarchical profiler for PHP
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-python/PyFoam/metadata.xml b/dev-python/PyFoam/metadata.xml
index bea7baf..32fce48 100644
--- a/dev-python/PyFoam/metadata.xml
+++ b/dev-python/PyFoam/metadata.xml
@@ -12,6 +12,6 @@
 		<name>Oliver Borm</name>
 	</maintainer>
 	<use>
-  		<flag name='extras'>Enable optional dependencies</flag>
+  		<flag name="extras">Enable optional dependencies</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-python/aadict/metadata.xml b/dev-python/aadict/metadata.xml
index 447e599..a107c19 100644
--- a/dev-python/aadict/metadata.xml
+++ b/dev-python/aadict/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/abstract_rendering/metadata.xml b/dev-python/abstract_rendering/metadata.xml
index 27bb7d4..4600eb8 100644
--- a/dev-python/abstract_rendering/metadata.xml
+++ b/dev-python/abstract_rendering/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/aldryn-bootstrap3/metadata.xml b/dev-python/aldryn-bootstrap3/metadata.xml
index 7f97f37..062cf52 100644
--- a/dev-python/aldryn-bootstrap3/metadata.xml
+++ b/dev-python/aldryn-bootstrap3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/apptools/metadata.xml b/dev-python/apptools/metadata.xml
index 4c11ab8..281379a 100644
--- a/dev-python/apptools/metadata.xml
+++ b/dev-python/apptools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/apse/metadata.xml b/dev-python/apse/metadata.xml
index 104473b..f13a12f 100644
--- a/dev-python/apse/metadata.xml
+++ b/dev-python/apse/metadata.xml
@@ -11,6 +11,6 @@
 	</longdescription>
 	<longdescription lang="ja">
 		Python言語に近似した文字列の一致を判断させます。タイピング・エラー、スペリング・
-		エラー、ボキャブラリ的に近い単語、一般的な同意語(GAG ACT)、略語を同一視できます>。agrepプログラムと同一のアルゴリズムを用いて、Apseはユーザーに"一致する"と判断>した場合の処理(置換、削除、追加)を何回行うかを選ばせます。
+		エラー、ボキャブラリ的に近い単語、一般的な同意語(GAG ACT)、略語を同一視できます&gt;。agrepプログラムと同一のアルゴリズムを用いて、Apseはユーザーに"一致する"と判断&gt;した場合の処理(置換、削除、追加)を何回行うかを選ばせます。
 	</longdescription>
 </pkgmetadata>

diff --git a/dev-python/async/metadata.xml b/dev-python/async/metadata.xml
index 71f6c30..eb772b7 100644
--- a/dev-python/async/metadata.xml
+++ b/dev-python/async/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/automaton/metadata.xml b/dev-python/automaton/metadata.xml
index 11cecfa..c87979f 100644
--- a/dev-python/automaton/metadata.xml
+++ b/dev-python/automaton/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/axiom/metadata.xml b/dev-python/axiom/metadata.xml
index 82bf554..ea8baf2 100644
--- a/dev-python/axiom/metadata.xml
+++ b/dev-python/axiom/metadata.xml
@@ -6,7 +6,7 @@
 		mapper. Its primary goal is to provide an object-oriented layer with
 		what we consider to be the key aspects of OO, i.e. polymorphism and
 		message dispatch, without hindering the power of an RDBMS. It is
-		designed to &quot;feel pythonic&quot;, without encouraging the typical ORM
+		designed to "feel pythonic", without encouraging the typical ORM
 		behavior such as potato programming.</longdescription>
 	<upstream>
 		<remote-id type="pypi">Axiom</remote-id>

diff --git a/dev-python/blosc/metadata.xml b/dev-python/blosc/metadata.xml
index 9428920..9f379bf 100644
--- a/dev-python/blosc/metadata.xml
+++ b/dev-python/blosc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>

diff --git a/dev-python/bpython/metadata.xml b/dev-python/bpython/metadata.xml
index e107a47..cff36a4 100644
--- a/dev-python/bpython/metadata.xml
+++ b/dev-python/bpython/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/castellan/metadata.xml b/dev-python/castellan/metadata.xml
index 59f281a..189e7cb 100644
--- a/dev-python/castellan/metadata.xml
+++ b/dev-python/castellan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/cfgparse/metadata.xml b/dev-python/cfgparse/metadata.xml
index 14a1d4c..386fbf8 100644
--- a/dev-python/cfgparse/metadata.xml
+++ b/dev-python/cfgparse/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/cgkit/metadata.xml b/dev-python/cgkit/metadata.xml
index 7fa3271..cb8aab5 100644
--- a/dev-python/cgkit/metadata.xml
+++ b/dev-python/cgkit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/clientcookie/metadata.xml b/dev-python/clientcookie/metadata.xml
index 3786995..f58b37d 100644
--- a/dev-python/clientcookie/metadata.xml
+++ b/dev-python/clientcookie/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/compizconfig-python/metadata.xml b/dev-python/compizconfig-python/metadata.xml
index 20b5ab5..82160b4 100644
--- a/dev-python/compizconfig-python/metadata.xml
+++ b/dev-python/compizconfig-python/metadata.xml
@@ -4,4 +4,3 @@
 <herd>desktop-effects</herd>
 <longdescription lang="en">Python bindings for libcompizconfig.</longdescription>
 </pkgmetadata>
-

diff --git a/dev-python/cycler/metadata.xml b/dev-python/cycler/metadata.xml
index f778d54..ea87fd3 100644
--- a/dev-python/cycler/metadata.xml
+++ b/dev-python/cycler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/d2to1/metadata.xml b/dev-python/d2to1/metadata.xml
index bc3f41c..1dfc8bb 100644
--- a/dev-python/d2to1/metadata.xml
+++ b/dev-python/d2to1/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/dbutils/metadata.xml b/dev-python/dbutils/metadata.xml
index acf9520..691aa8f 100644
--- a/dev-python/dbutils/metadata.xml
+++ b/dev-python/dbutils/metadata.xml
@@ -13,4 +13,3 @@ like Webware for Python or other web application servers. The suite supports
 DB-API 2 compliant database interfaces and the classic PyGreSQL interface.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-python/dj-database-url/metadata.xml b/dev-python/dj-database-url/metadata.xml
index 83de504..6847904 100644
--- a/dev-python/dj-database-url/metadata.xml
+++ b/dev-python/dj-database-url/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/django-classy-tags/metadata.xml b/dev-python/django-classy-tags/metadata.xml
index b6694d0a..6e52646 100644
--- a/dev-python/django-classy-tags/metadata.xml
+++ b/dev-python/django-classy-tags/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/django-cms/metadata.xml b/dev-python/django-cms/metadata.xml
index e9f2e09..c2bdd24 100644
--- a/dev-python/django-cms/metadata.xml
+++ b/dev-python/django-cms/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/django-durationfield/metadata.xml b/dev-python/django-durationfield/metadata.xml
index d796c2e..a660502 100644
--- a/dev-python/django-durationfield/metadata.xml
+++ b/dev-python/django-durationfield/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/django-filer/metadata.xml b/dev-python/django-filer/metadata.xml
index d46e701..38e5ec0 100644
--- a/dev-python/django-filer/metadata.xml
+++ b/dev-python/django-filer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/django-ldap-groups/metadata.xml b/dev-python/django-ldap-groups/metadata.xml
index 9121b32..9e1c7be 100644
--- a/dev-python/django-ldap-groups/metadata.xml
+++ b/dev-python/django-ldap-groups/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Ian Delaney</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-python/django-mptt/metadata.xml b/dev-python/django-mptt/metadata.xml
index ff3ffdd..41cd6aa 100644
--- a/dev-python/django-mptt/metadata.xml
+++ b/dev-python/django-mptt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/django-sekizai/metadata.xml b/dev-python/django-sekizai/metadata.xml
index 2b8495f..bbeea8c 100644
--- a/dev-python/django-sekizai/metadata.xml
+++ b/dev-python/django-sekizai/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/django-treebeard/metadata.xml b/dev-python/django-treebeard/metadata.xml
index f67692a..aae1467 100644
--- a/dev-python/django-treebeard/metadata.xml
+++ b/dev-python/django-treebeard/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/django_polymorphic/metadata.xml b/dev-python/django_polymorphic/metadata.xml
index 8e246e5..c8448d3 100644
--- a/dev-python/django_polymorphic/metadata.xml
+++ b/dev-python/django_polymorphic/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/doc8/metadata.xml b/dev-python/doc8/metadata.xml
index 26fee01..eea6d1e 100644
--- a/dev-python/doc8/metadata.xml
+++ b/dev-python/doc8/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/doit/metadata.xml b/dev-python/doit/metadata.xml
index 8981713..ace625d 100644
--- a/dev-python/doit/metadata.xml
+++ b/dev-python/doit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/easy-thumbnails/metadata.xml b/dev-python/easy-thumbnails/metadata.xml
index 635e441..20d1b62 100644
--- a/dev-python/easy-thumbnails/metadata.xml
+++ b/dev-python/easy-thumbnails/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/enzyme/metadata.xml b/dev-python/enzyme/metadata.xml
index b8785a0..b092f50 100644
--- a/dev-python/enzyme/metadata.xml
+++ b/dev-python/enzyme/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>

diff --git a/dev-python/et_xmlfile/metadata.xml b/dev-python/et_xmlfile/metadata.xml
index 4c1907f..34d236c 100644
--- a/dev-python/et_xmlfile/metadata.xml
+++ b/dev-python/et_xmlfile/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/feedparser/metadata.xml b/dev-python/feedparser/metadata.xml
index 02d4834..398ed3c 100644
--- a/dev-python/feedparser/metadata.xml
+++ b/dev-python/feedparser/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/gevent/metadata.xml b/dev-python/gevent/metadata.xml
index 6eb3bbc..e77efaa 100644
--- a/dev-python/gevent/metadata.xml
+++ b/dev-python/gevent/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/guppy/metadata.xml b/dev-python/guppy/metadata.xml
index 8912ab8..7645f74 100644
--- a/dev-python/guppy/metadata.xml
+++ b/dev-python/guppy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/httpbin/metadata.xml b/dev-python/httpbin/metadata.xml
index 728f4fb..c20641b 100644
--- a/dev-python/httpbin/metadata.xml
+++ b/dev-python/httpbin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/imdbpy/metadata.xml b/dev-python/imdbpy/metadata.xml
index c5ec21b..18cbc5c 100644
--- a/dev-python/imdbpy/metadata.xml
+++ b/dev-python/imdbpy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>mythtv</herd>

diff --git a/dev-python/iminuit/metadata.xml b/dev-python/iminuit/metadata.xml
index 585191b..93465f0 100644
--- a/dev-python/iminuit/metadata.xml
+++ b/dev-python/iminuit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/intelhex/metadata.xml b/dev-python/intelhex/metadata.xml
index 41f8300..73a787d 100644
--- a/dev-python/intelhex/metadata.xml
+++ b/dev-python/intelhex/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>python</herd>
 <upstream>
-	<remote-id type='pypi'>IntelHex</remote-id>
-	<remote-id type='github'>bialix/intelhex</remote-id>
+	<remote-id type="pypi">IntelHex</remote-id>
+	<remote-id type="github">bialix/intelhex</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/dev-python/jonpy/metadata.xml b/dev-python/jonpy/metadata.xml
index 89bf617..5103c52 100644
--- a/dev-python/jonpy/metadata.xml
+++ b/dev-python/jonpy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/lazy-object-proxy/metadata.xml b/dev-python/lazy-object-proxy/metadata.xml
index f95d51a..139dca7 100644
--- a/dev-python/lazy-object-proxy/metadata.xml
+++ b/dev-python/lazy-object-proxy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/logutils/metadata.xml b/dev-python/logutils/metadata.xml
index 49aeb89..87ec706 100644
--- a/dev-python/logutils/metadata.xml
+++ b/dev-python/logutils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/mamba/metadata.xml b/dev-python/mamba/metadata.xml
index a637f3f..f2a8375 100644
--- a/dev-python/mamba/metadata.xml
+++ b/dev-python/mamba/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/markups/metadata.xml b/dev-python/markups/metadata.xml
index 8254514..4857b1a 100644
--- a/dev-python/markups/metadata.xml
+++ b/dev-python/markups/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/mecab-python/metadata.xml b/dev-python/mecab-python/metadata.xml
index b66c587..ed7f2d4 100644
--- a/dev-python/mecab-python/metadata.xml
+++ b/dev-python/mecab-python/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/dev-python/mechanize/metadata.xml b/dev-python/mechanize/metadata.xml
index c934af9..9c04055 100644
--- a/dev-python/mechanize/metadata.xml
+++ b/dev-python/mechanize/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/memory_profiler/metadata.xml b/dev-python/memory_profiler/metadata.xml
index deca567..f7a32cf 100644
--- a/dev-python/memory_profiler/metadata.xml
+++ b/dev-python/memory_profiler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/meteor-ejson/metadata.xml b/dev-python/meteor-ejson/metadata.xml
index cdc8aea..3dd330e 100644
--- a/dev-python/meteor-ejson/metadata.xml
+++ b/dev-python/meteor-ejson/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/mpi4py/metadata.xml b/dev-python/mpi4py/metadata.xml
index 67eec76..60bfc6b 100644
--- a/dev-python/mpi4py/metadata.xml
+++ b/dev-python/mpi4py/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/mysql-python/metadata.xml b/dev-python/mysql-python/metadata.xml
index f908185..8e649cf 100644
--- a/dev-python/mysql-python/metadata.xml
+++ b/dev-python/mysql-python/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/nagiosplugin/metadata.xml b/dev-python/nagiosplugin/metadata.xml
index f5bafd5..1bfc67d 100644
--- a/dev-python/nagiosplugin/metadata.xml
+++ b/dev-python/nagiosplugin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>

diff --git a/dev-python/oct2py/metadata.xml b/dev-python/oct2py/metadata.xml
index 397ec8d..2e63692 100644
--- a/dev-python/oct2py/metadata.xml
+++ b/dev-python/oct2py/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-mathematics</herd>

diff --git a/dev-python/oosuite/metadata.xml b/dev-python/oosuite/metadata.xml
index 0db43e9..a661b54 100644
--- a/dev-python/oosuite/metadata.xml
+++ b/dev-python/oosuite/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-mathematics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   The OpenOpt suite of Python packages contains the following modules:
   * openopt: universal numerical optimization package with
     several solvers (e.g. ralg) and connections to tens of other,

diff --git a/dev-python/os-brick/metadata.xml b/dev-python/os-brick/metadata.xml
index 3b21234..1eedc70 100644
--- a/dev-python/os-brick/metadata.xml
+++ b/dev-python/os-brick/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/oslo-reports/metadata.xml b/dev-python/oslo-reports/metadata.xml
index d9ab41f..c367c50 100644
--- a/dev-python/oslo-reports/metadata.xml
+++ b/dev-python/oslo-reports/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/oslo-versionedobjects/metadata.xml b/dev-python/oslo-versionedobjects/metadata.xml
index 1cdf074..8022abc 100644
--- a/dev-python/oslo-versionedobjects/metadata.xml
+++ b/dev-python/oslo-versionedobjects/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/pecan/metadata.xml b/dev-python/pecan/metadata.xml
index bb366ec..cb4e4e7 100644
--- a/dev-python/pecan/metadata.xml
+++ b/dev-python/pecan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/pid/metadata.xml b/dev-python/pid/metadata.xml
index fca014d..e506309 100644
--- a/dev-python/pid/metadata.xml
+++ b/dev-python/pid/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/pillowfight/metadata.xml b/dev-python/pillowfight/metadata.xml
index d904e1b..91d90ee 100644
--- a/dev-python/pillowfight/metadata.xml
+++ b/dev-python/pillowfight/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/pivy/metadata.xml b/dev-python/pivy/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/dev-python/pivy/metadata.xml
+++ b/dev-python/pivy/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-python/pkipplib/metadata.xml b/dev-python/pkipplib/metadata.xml
index ad10d14..de483c5 100644
--- a/dev-python/pkipplib/metadata.xml
+++ b/dev-python/pkipplib/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>python</herd>
 </pkgmetadata>
-

diff --git a/dev-python/ply/metadata.xml b/dev-python/ply/metadata.xml
index b05d6ef..3548cd6 100644
--- a/dev-python/ply/metadata.xml
+++ b/dev-python/ply/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/pmw/metadata.xml b/dev-python/pmw/metadata.xml
index 550a430..3d154b2 100644
--- a/dev-python/pmw/metadata.xml
+++ b/dev-python/pmw/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/py-gfm/metadata.xml b/dev-python/py-gfm/metadata.xml
index 2917cb9..a88cb1e 100644
--- a/dev-python/py-gfm/metadata.xml
+++ b/dev-python/py-gfm/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>python</herd>
 <upstream>
-	<remote-id type='github'>google/py-gfm</remote-id>
+	<remote-id type="github">google/py-gfm</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/dev-python/py-notify/metadata.xml b/dev-python/py-notify/metadata.xml
index 73e8200..ee7e8b2 100644
--- a/dev-python/py-notify/metadata.xml
+++ b/dev-python/py-notify/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
   <herd>python</herd>
 </pkgmetadata>
-

diff --git a/dev-python/pyamg/metadata.xml b/dev-python/pyamg/metadata.xml
index bb2714d..dc8de41 100644
--- a/dev-python/pyamg/metadata.xml
+++ b/dev-python/pyamg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>

diff --git a/dev-python/pycapnp/metadata.xml b/dev-python/pycapnp/metadata.xml
index 1c218f0..287b2e4 100644
--- a/dev-python/pycapnp/metadata.xml
+++ b/dev-python/pycapnp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/pycollada/metadata.xml b/dev-python/pycollada/metadata.xml
index 1ba6038..1f3f937 100644
--- a/dev-python/pycollada/metadata.xml
+++ b/dev-python/pycollada/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/pydispatcher/metadata.xml b/dev-python/pydispatcher/metadata.xml
index 5223b98..865be7d 100644
--- a/dev-python/pydispatcher/metadata.xml
+++ b/dev-python/pydispatcher/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/pydns/metadata.xml b/dev-python/pydns/metadata.xml
index 74156bc..a565bff 100644
--- a/dev-python/pydns/metadata.xml
+++ b/dev-python/pydns/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/pyee/metadata.xml b/dev-python/pyee/metadata.xml
index 0019e45..102f970 100644
--- a/dev-python/pyee/metadata.xml
+++ b/dev-python/pyee/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/pyenchant/metadata.xml b/dev-python/pyenchant/metadata.xml
index 7323438..eab3acf 100644
--- a/dev-python/pyenchant/metadata.xml
+++ b/dev-python/pyenchant/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/pygtk/metadata.xml b/dev-python/pygtk/metadata.xml
index 6d9588f..d9424e6 100644
--- a/dev-python/pygtk/metadata.xml
+++ b/dev-python/pygtk/metadata.xml
@@ -10,7 +10,7 @@ managing memory and type casting. When combined with PyORBit and
 gnome-python, it can be used to write full featured Gnome applications.
 </longdescription>
 <longdescription lang="ja">
-PyGTKは、Python言語プログラムでGTK+ライブラリを使うための、マネージング・メモリ>やタイプ・キャスティングの様な詰まらない事柄の世話をしてくれる便利なラッパーを提
+PyGTKは、Python言語プログラムでGTK+ライブラリを使うための、マネージング・メモリ&gt;やタイプ・キャスティングの様な詰まらない事柄の世話をしてくれる便利なラッパーを提
 供します。PyORBitとgnome-pythonと組みあわせると、GNOMEのアプリケーションの特性を
 完全に抑えるものにすることができます。
 </longdescription>

diff --git a/dev-python/pykwalify/metadata.xml b/dev-python/pykwalify/metadata.xml
index 6a883f9..6da84ed 100644
--- a/dev-python/pykwalify/metadata.xml
+++ b/dev-python/pykwalify/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/pymediainfo/metadata.xml b/dev-python/pymediainfo/metadata.xml
index 8cf570e..5e26eee 100644
--- a/dev-python/pymediainfo/metadata.xml
+++ b/dev-python/pymediainfo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>

diff --git a/dev-python/pymtp/metadata.xml b/dev-python/pymtp/metadata.xml
index 8c7487a..361e6ad 100644
--- a/dev-python/pymtp/metadata.xml
+++ b/dev-python/pymtp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sound</herd>

diff --git a/dev-python/pyopengl/metadata.xml b/dev-python/pyopengl/metadata.xml
index 01435dc..5827a0b 100644
--- a/dev-python/pyopengl/metadata.xml
+++ b/dev-python/pyopengl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/pypax/metadata.xml b/dev-python/pypax/metadata.xml
index a3052a5..3055bd7 100644
--- a/dev-python/pypax/metadata.xml
+++ b/dev-python/pypax/metadata.xml
@@ -8,7 +8,7 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
-		<flag name='xtpax'>Enable XATTR_PAX_FLAGS support.</flag>
-		<flag name='ptpax'>Enable PT_PAX_FLAGS support.</flag>
+		<flag name="xtpax">Enable XATTR_PAX_FLAGS support.</flag>
+		<flag name="ptpax">Enable PT_PAX_FLAGS support.</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-python/pyplusplus/metadata.xml b/dev-python/pyplusplus/metadata.xml
index c82440a..9608322 100644
--- a/dev-python/pyplusplus/metadata.xml
+++ b/dev-python/pyplusplus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/pypy-bin/metadata.xml b/dev-python/pypy-bin/metadata.xml
index 86eeefa..1ffa9f2 100644
--- a/dev-python/pypy-bin/metadata.xml
+++ b/dev-python/pypy-bin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/pypy/metadata.xml b/dev-python/pypy/metadata.xml
index fbcef58..d6a8701 100644
--- a/dev-python/pypy/metadata.xml
+++ b/dev-python/pypy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/pypy3-bin/metadata.xml b/dev-python/pypy3-bin/metadata.xml
index 86eeefa..1ffa9f2 100644
--- a/dev-python/pypy3-bin/metadata.xml
+++ b/dev-python/pypy3-bin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/pypy3/metadata.xml b/dev-python/pypy3/metadata.xml
index 932940b..e1efe0b 100644
--- a/dev-python/pypy3/metadata.xml
+++ b/dev-python/pypy3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/pyscaffold/metadata.xml b/dev-python/pyscaffold/metadata.xml
index b57a002..4099772 100644
--- a/dev-python/pyscaffold/metadata.xml
+++ b/dev-python/pyscaffold/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/pyserial/metadata.xml b/dev-python/pyserial/metadata.xml
index cd6dfe2..3d869b1 100644
--- a/dev-python/pyserial/metadata.xml
+++ b/dev-python/pyserial/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/pysnmp/metadata.xml b/dev-python/pysnmp/metadata.xml
index 47fab46..f6f3316 100644
--- a/dev-python/pysnmp/metadata.xml
+++ b/dev-python/pysnmp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/pytest-httpbin/metadata.xml b/dev-python/pytest-httpbin/metadata.xml
index ea414c1..1979ce6 100644
--- a/dev-python/pytest-httpbin/metadata.xml
+++ b/dev-python/pytest-httpbin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/python-bugzilla/metadata.xml b/dev-python/python-bugzilla/metadata.xml
index 183a8ac..a703ecc 100644
--- a/dev-python/python-bugzilla/metadata.xml
+++ b/dev-python/python-bugzilla/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-python/python-ddp/metadata.xml b/dev-python/python-ddp/metadata.xml
index fdf8040..0a2a2f0 100644
--- a/dev-python/python-ddp/metadata.xml
+++ b/dev-python/python-ddp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/python-editor/metadata.xml b/dev-python/python-editor/metadata.xml
index 98a6524..686c806 100644
--- a/dev-python/python-editor/metadata.xml
+++ b/dev-python/python-editor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/python-efl/metadata.xml b/dev-python/python-efl/metadata.xml
index 71cdd72..99165ad 100644
--- a/dev-python/python-efl/metadata.xml
+++ b/dev-python/python-efl/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>

diff --git a/dev-python/python-gnupg/metadata.xml b/dev-python/python-gnupg/metadata.xml
index 5f73a64..4006903 100644
--- a/dev-python/python-gnupg/metadata.xml
+++ b/dev-python/python-gnupg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/python-ly/metadata.xml b/dev-python/python-ly/metadata.xml
index da4892e..cc6a640 100644
--- a/dev-python/python-ly/metadata.xml
+++ b/dev-python/python-ly/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>

diff --git a/dev-python/python-meteor/metadata.xml b/dev-python/python-meteor/metadata.xml
index f2576bf..8b48854 100644
--- a/dev-python/python-meteor/metadata.xml
+++ b/dev-python/python-meteor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/pythondialog/metadata.xml b/dev-python/pythondialog/metadata.xml
index 0e8716f..32f96b9 100644
--- a/dev-python/pythondialog/metadata.xml
+++ b/dev-python/pythondialog/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/pytidylib/metadata.xml b/dev-python/pytidylib/metadata.xml
index e05a647..da6a12e 100644
--- a/dev-python/pytidylib/metadata.xml
+++ b/dev-python/pytidylib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/pyusb/metadata.xml b/dev-python/pyusb/metadata.xml
index a14d1d0..b291e8b 100644
--- a/dev-python/pyusb/metadata.xml
+++ b/dev-python/pyusb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/pyzor/metadata.xml b/dev-python/pyzor/metadata.xml
index be0eb97..c04565f 100644
--- a/dev-python/pyzor/metadata.xml
+++ b/dev-python/pyzor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/restructuredtext-lint/metadata.xml b/dev-python/restructuredtext-lint/metadata.xml
index a49b91e..f3f2776 100644
--- a/dev-python/restructuredtext-lint/metadata.xml
+++ b/dev-python/restructuredtext-lint/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/rope/metadata.xml b/dev-python/rope/metadata.xml
index 2361f86..711e52f 100644
--- a/dev-python/rope/metadata.xml
+++ b/dev-python/rope/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/ropemacs/metadata.xml b/dev-python/ropemacs/metadata.xml
index 5f678f2..9bd7533 100644
--- a/dev-python/ropemacs/metadata.xml
+++ b/dev-python/ropemacs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/rpyc/metadata.xml b/dev-python/rpyc/metadata.xml
index e9326a7..5d21dee 100644
--- a/dev-python/rpyc/metadata.xml
+++ b/dev-python/rpyc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/ryu/metadata.xml b/dev-python/ryu/metadata.xml
index 9e34a18..e91936b 100644
--- a/dev-python/ryu/metadata.xml
+++ b/dev-python/ryu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/serpent/metadata.xml b/dev-python/serpent/metadata.xml
index 69586ce..264a869 100644
--- a/dev-python/serpent/metadata.xml
+++ b/dev-python/serpent/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/simpleparse/metadata.xml b/dev-python/simpleparse/metadata.xml
index d4aa44f..a0a170f 100644
--- a/dev-python/simpleparse/metadata.xml
+++ b/dev-python/simpleparse/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/simpy/metadata.xml b/dev-python/simpy/metadata.xml
index b2ce45d..b4a764d 100644
--- a/dev-python/simpy/metadata.xml
+++ b/dev-python/simpy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>

diff --git a/dev-python/socksipy/metadata.xml b/dev-python/socksipy/metadata.xml
index 01d8963..f5ef976 100644
--- a/dev-python/socksipy/metadata.xml
+++ b/dev-python/socksipy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/statistics/metadata.xml b/dev-python/statistics/metadata.xml
index de7f4df..5e33c5a 100644
--- a/dev-python/statistics/metadata.xml
+++ b/dev-python/statistics/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/sudsds/metadata.xml b/dev-python/sudsds/metadata.xml
index 091da06..5ccabfc 100644
--- a/dev-python/sudsds/metadata.xml
+++ b/dev-python/sudsds/metadata.xml
@@ -6,4 +6,3 @@
 		A lightweight SOAP python client for consuming Web Services. Czech NIC labs fork.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-python/ttfquery/metadata.xml b/dev-python/ttfquery/metadata.xml
index 479d942..fa12fc9 100644
--- a/dev-python/ttfquery/metadata.xml
+++ b/dev-python/ttfquery/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>fonts</herd>

diff --git a/dev-python/uhashring/metadata.xml b/dev-python/uhashring/metadata.xml
index 955ac96..70d897f 100644
--- a/dev-python/uhashring/metadata.xml
+++ b/dev-python/uhashring/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/urwidtrees/metadata.xml b/dev-python/urwidtrees/metadata.xml
index c93589b..18e40f2 100644
--- a/dev-python/urwidtrees/metadata.xml
+++ b/dev-python/urwidtrees/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-python/utidylib/metadata.xml b/dev-python/utidylib/metadata.xml
index f793393..17a2b03 100644
--- a/dev-python/utidylib/metadata.xml
+++ b/dev-python/utidylib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/vatnumber/metadata.xml b/dev-python/vatnumber/metadata.xml
index 06bf5f5..086f751 100644
--- a/dev-python/vatnumber/metadata.xml
+++ b/dev-python/vatnumber/metadata.xml
@@ -9,4 +9,3 @@
 		<flag name="vies">Enable VIES</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/dev-python/versioneer/metadata.xml b/dev-python/versioneer/metadata.xml
index 2465c15..e0b789f 100644
--- a/dev-python/versioneer/metadata.xml
+++ b/dev-python/versioneer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>python</herd>

diff --git a/dev-python/zope-component/metadata.xml b/dev-python/zope-component/metadata.xml
index fb31035..18c1643 100644
--- a/dev-python/zope-component/metadata.xml
+++ b/dev-python/zope-component/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/zope-event/metadata.xml b/dev-python/zope-event/metadata.xml
index f9df9f1..3417e57 100644
--- a/dev-python/zope-event/metadata.xml
+++ b/dev-python/zope-event/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-python/zope-interface/metadata.xml b/dev-python/zope-interface/metadata.xml
index 2d178c0..f888d21 100644
--- a/dev-python/zope-interface/metadata.xml
+++ b/dev-python/zope-interface/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>python</herd>

diff --git a/dev-ros/actionlib/metadata.xml b/dev-ros/actionlib/metadata.xml
index 088b4e8..d1ccc1c 100644
--- a/dev-ros/actionlib/metadata.xml
+++ b/dev-ros/actionlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/actionlib_msgs/metadata.xml b/dev-ros/actionlib_msgs/metadata.xml
index 2d3b5cc..7c144cf 100644
--- a/dev-ros/actionlib_msgs/metadata.xml
+++ b/dev-ros/actionlib_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/actionlib_tutorials/metadata.xml b/dev-ros/actionlib_tutorials/metadata.xml
index 38abe1f..9263625 100644
--- a/dev-ros/actionlib_tutorials/metadata.xml
+++ b/dev-ros/actionlib_tutorials/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/amcl/metadata.xml b/dev-ros/amcl/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/amcl/metadata.xml
+++ b/dev-ros/amcl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/angles/metadata.xml b/dev-ros/angles/metadata.xml
index 7c93259..a00b0c8 100644
--- a/dev-ros/angles/metadata.xml
+++ b/dev-ros/angles/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/audio_capture/metadata.xml b/dev-ros/audio_capture/metadata.xml
index 11ebb41..052c64d 100644
--- a/dev-ros/audio_capture/metadata.xml
+++ b/dev-ros/audio_capture/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/audio_common_msgs/metadata.xml b/dev-ros/audio_common_msgs/metadata.xml
index 11ebb41..052c64d 100644
--- a/dev-ros/audio_common_msgs/metadata.xml
+++ b/dev-ros/audio_common_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/audio_play/metadata.xml b/dev-ros/audio_play/metadata.xml
index 11ebb41..052c64d 100644
--- a/dev-ros/audio_play/metadata.xml
+++ b/dev-ros/audio_play/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/base_local_planner/metadata.xml b/dev-ros/base_local_planner/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/base_local_planner/metadata.xml
+++ b/dev-ros/base_local_planner/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/bond/metadata.xml b/dev-ros/bond/metadata.xml
index 500c8eb..6c2a82d 100644
--- a/dev-ros/bond/metadata.xml
+++ b/dev-ros/bond/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/bondcpp/metadata.xml b/dev-ros/bondcpp/metadata.xml
index 500c8eb..6c2a82d 100644
--- a/dev-ros/bondcpp/metadata.xml
+++ b/dev-ros/bondcpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/bondpy/metadata.xml b/dev-ros/bondpy/metadata.xml
index 500c8eb..6c2a82d 100644
--- a/dev-ros/bondpy/metadata.xml
+++ b/dev-ros/bondpy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/calibration_estimation/metadata.xml b/dev-ros/calibration_estimation/metadata.xml
index 11ffa23..b5f28dc 100644
--- a/dev-ros/calibration_estimation/metadata.xml
+++ b/dev-ros/calibration_estimation/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/calibration_launch/metadata.xml b/dev-ros/calibration_launch/metadata.xml
index 11ffa23..b5f28dc 100644
--- a/dev-ros/calibration_launch/metadata.xml
+++ b/dev-ros/calibration_launch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/calibration_msgs/metadata.xml b/dev-ros/calibration_msgs/metadata.xml
index 11ffa23..b5f28dc 100644
--- a/dev-ros/calibration_msgs/metadata.xml
+++ b/dev-ros/calibration_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/calibration_setup_helper/metadata.xml b/dev-ros/calibration_setup_helper/metadata.xml
index 11ffa23..b5f28dc 100644
--- a/dev-ros/calibration_setup_helper/metadata.xml
+++ b/dev-ros/calibration_setup_helper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/camera_calibration/metadata.xml b/dev-ros/camera_calibration/metadata.xml
index 90c35a2..8c79df0 100644
--- a/dev-ros/camera_calibration/metadata.xml
+++ b/dev-ros/camera_calibration/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/camera_calibration_parsers/metadata.xml b/dev-ros/camera_calibration_parsers/metadata.xml
index b01f287..abd895f 100644
--- a/dev-ros/camera_calibration_parsers/metadata.xml
+++ b/dev-ros/camera_calibration_parsers/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/camera_info_manager/metadata.xml b/dev-ros/camera_info_manager/metadata.xml
index b01f287..abd895f 100644
--- a/dev-ros/camera_info_manager/metadata.xml
+++ b/dev-ros/camera_info_manager/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/carrot_planner/metadata.xml b/dev-ros/carrot_planner/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/carrot_planner/metadata.xml
+++ b/dev-ros/carrot_planner/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/class_loader/metadata.xml b/dev-ros/class_loader/metadata.xml
index 9c5e3a9..7a9b07e 100644
--- a/dev-ros/class_loader/metadata.xml
+++ b/dev-ros/class_loader/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/clear_costmap_recovery/metadata.xml b/dev-ros/clear_costmap_recovery/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/clear_costmap_recovery/metadata.xml
+++ b/dev-ros/clear_costmap_recovery/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/cmake_modules/metadata.xml b/dev-ros/cmake_modules/metadata.xml
index 9ceae0a..2b01a48 100644
--- a/dev-ros/cmake_modules/metadata.xml
+++ b/dev-ros/cmake_modules/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/collada_parser/metadata.xml b/dev-ros/collada_parser/metadata.xml
index b2ab0e6..0724a71 100644
--- a/dev-ros/collada_parser/metadata.xml
+++ b/dev-ros/collada_parser/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/collada_urdf/metadata.xml b/dev-ros/collada_urdf/metadata.xml
index b2ab0e6..0724a71 100644
--- a/dev-ros/collada_urdf/metadata.xml
+++ b/dev-ros/collada_urdf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/compressed_depth_image_transport/metadata.xml b/dev-ros/compressed_depth_image_transport/metadata.xml
index 97c7091..1d01ac4 100644
--- a/dev-ros/compressed_depth_image_transport/metadata.xml
+++ b/dev-ros/compressed_depth_image_transport/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/compressed_image_transport/metadata.xml b/dev-ros/compressed_image_transport/metadata.xml
index 97c7091..1d01ac4 100644
--- a/dev-ros/compressed_image_transport/metadata.xml
+++ b/dev-ros/compressed_image_transport/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/control_msgs/metadata.xml b/dev-ros/control_msgs/metadata.xml
index da1d5da..c300a13 100644
--- a/dev-ros/control_msgs/metadata.xml
+++ b/dev-ros/control_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/control_toolbox/metadata.xml b/dev-ros/control_toolbox/metadata.xml
index 82c7f05..eca2bde 100644
--- a/dev-ros/control_toolbox/metadata.xml
+++ b/dev-ros/control_toolbox/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/controller_interface/metadata.xml b/dev-ros/controller_interface/metadata.xml
index 2b50e8a..f4a590e 100644
--- a/dev-ros/controller_interface/metadata.xml
+++ b/dev-ros/controller_interface/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/controller_manager/metadata.xml b/dev-ros/controller_manager/metadata.xml
index 2b50e8a..f4a590e 100644
--- a/dev-ros/controller_manager/metadata.xml
+++ b/dev-ros/controller_manager/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/controller_manager_msgs/metadata.xml b/dev-ros/controller_manager_msgs/metadata.xml
index 2b50e8a..f4a590e 100644
--- a/dev-ros/controller_manager_msgs/metadata.xml
+++ b/dev-ros/controller_manager_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/controller_manager_tests/metadata.xml b/dev-ros/controller_manager_tests/metadata.xml
index 2b50e8a..f4a590e 100644
--- a/dev-ros/controller_manager_tests/metadata.xml
+++ b/dev-ros/controller_manager_tests/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/convex_decomposition/metadata.xml b/dev-ros/convex_decomposition/metadata.xml
index 6d15438..53eff48 100644
--- a/dev-ros/convex_decomposition/metadata.xml
+++ b/dev-ros/convex_decomposition/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/costmap_2d/metadata.xml b/dev-ros/costmap_2d/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/costmap_2d/metadata.xml
+++ b/dev-ros/costmap_2d/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/cpp_common/metadata.xml b/dev-ros/cpp_common/metadata.xml
index d41b871..c6d73fb 100644
--- a/dev-ros/cpp_common/metadata.xml
+++ b/dev-ros/cpp_common/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/cv_bridge/metadata.xml b/dev-ros/cv_bridge/metadata.xml
index 266dc38..08c6dc2 100644
--- a/dev-ros/cv_bridge/metadata.xml
+++ b/dev-ros/cv_bridge/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/depth_image_proc/metadata.xml b/dev-ros/depth_image_proc/metadata.xml
index 90c35a2..8c79df0 100644
--- a/dev-ros/depth_image_proc/metadata.xml
+++ b/dev-ros/depth_image_proc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/depthimage_to_laserscan/metadata.xml b/dev-ros/depthimage_to_laserscan/metadata.xml
index 686b656..25b33d3 100644
--- a/dev-ros/depthimage_to_laserscan/metadata.xml
+++ b/dev-ros/depthimage_to_laserscan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/diagnostic_aggregator/metadata.xml b/dev-ros/diagnostic_aggregator/metadata.xml
index 7403d8e..d20e2ad 100644
--- a/dev-ros/diagnostic_aggregator/metadata.xml
+++ b/dev-ros/diagnostic_aggregator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/diagnostic_analysis/metadata.xml b/dev-ros/diagnostic_analysis/metadata.xml
index 7403d8e..d20e2ad 100644
--- a/dev-ros/diagnostic_analysis/metadata.xml
+++ b/dev-ros/diagnostic_analysis/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/diagnostic_common_diagnostics/metadata.xml b/dev-ros/diagnostic_common_diagnostics/metadata.xml
index 7403d8e..d20e2ad 100644
--- a/dev-ros/diagnostic_common_diagnostics/metadata.xml
+++ b/dev-ros/diagnostic_common_diagnostics/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/diagnostic_msgs/metadata.xml b/dev-ros/diagnostic_msgs/metadata.xml
index 2d3b5cc..7c144cf 100644
--- a/dev-ros/diagnostic_msgs/metadata.xml
+++ b/dev-ros/diagnostic_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/diagnostic_updater/metadata.xml b/dev-ros/diagnostic_updater/metadata.xml
index 7403d8e..d20e2ad 100644
--- a/dev-ros/diagnostic_updater/metadata.xml
+++ b/dev-ros/diagnostic_updater/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/driver_base/metadata.xml b/dev-ros/driver_base/metadata.xml
index 9e7fdee..8b58827 100644
--- a/dev-ros/driver_base/metadata.xml
+++ b/dev-ros/driver_base/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/dwa_local_planner/metadata.xml b/dev-ros/dwa_local_planner/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/dwa_local_planner/metadata.xml
+++ b/dev-ros/dwa_local_planner/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/dynamic_reconfigure/metadata.xml b/dev-ros/dynamic_reconfigure/metadata.xml
index 6d2512b..a61b04b 100644
--- a/dev-ros/dynamic_reconfigure/metadata.xml
+++ b/dev-ros/dynamic_reconfigure/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/eigen_conversions/metadata.xml b/dev-ros/eigen_conversions/metadata.xml
index 2d8e130..85acac4 100644
--- a/dev-ros/eigen_conversions/metadata.xml
+++ b/dev-ros/eigen_conversions/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/eigen_stl_containers/metadata.xml b/dev-ros/eigen_stl_containers/metadata.xml
index 62e93bb..232003b 100644
--- a/dev-ros/eigen_stl_containers/metadata.xml
+++ b/dev-ros/eigen_stl_containers/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/fake_localization/metadata.xml b/dev-ros/fake_localization/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/fake_localization/metadata.xml
+++ b/dev-ros/fake_localization/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/filters/metadata.xml b/dev-ros/filters/metadata.xml
index 8d40320..1b9228c 100644
--- a/dev-ros/filters/metadata.xml
+++ b/dev-ros/filters/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/gazebo_msgs/metadata.xml b/dev-ros/gazebo_msgs/metadata.xml
index 2cda806..4026599 100644
--- a/dev-ros/gazebo_msgs/metadata.xml
+++ b/dev-ros/gazebo_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/gazebo_plugins/metadata.xml b/dev-ros/gazebo_plugins/metadata.xml
index 2cda806..4026599 100644
--- a/dev-ros/gazebo_plugins/metadata.xml
+++ b/dev-ros/gazebo_plugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/gazebo_ros/metadata.xml b/dev-ros/gazebo_ros/metadata.xml
index 2cda806..4026599 100644
--- a/dev-ros/gazebo_ros/metadata.xml
+++ b/dev-ros/gazebo_ros/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/gazebo_ros_control/metadata.xml b/dev-ros/gazebo_ros_control/metadata.xml
index 2cda806..4026599 100644
--- a/dev-ros/gazebo_ros_control/metadata.xml
+++ b/dev-ros/gazebo_ros_control/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/gencpp/metadata.xml b/dev-ros/gencpp/metadata.xml
index 9576306..13a160d 100644
--- a/dev-ros/gencpp/metadata.xml
+++ b/dev-ros/gencpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/geneus/metadata.xml b/dev-ros/geneus/metadata.xml
index 38009a3..63bdf5d 100644
--- a/dev-ros/geneus/metadata.xml
+++ b/dev-ros/geneus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/genlisp/metadata.xml b/dev-ros/genlisp/metadata.xml
index f031905..c030991 100644
--- a/dev-ros/genlisp/metadata.xml
+++ b/dev-ros/genlisp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/genmsg/metadata.xml b/dev-ros/genmsg/metadata.xml
index 9e675a2..d7467f9 100644
--- a/dev-ros/genmsg/metadata.xml
+++ b/dev-ros/genmsg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/genpy/metadata.xml b/dev-ros/genpy/metadata.xml
index a588e78..6478b80 100644
--- a/dev-ros/genpy/metadata.xml
+++ b/dev-ros/genpy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/geodesy/metadata.xml b/dev-ros/geodesy/metadata.xml
index 15ed56b..e4634a0 100644
--- a/dev-ros/geodesy/metadata.xml
+++ b/dev-ros/geodesy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/geographic_msgs/metadata.xml b/dev-ros/geographic_msgs/metadata.xml
index 15ed56b..e4634a0 100644
--- a/dev-ros/geographic_msgs/metadata.xml
+++ b/dev-ros/geographic_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/geometric_shapes/metadata.xml b/dev-ros/geometric_shapes/metadata.xml
index 520964c..8fade16 100644
--- a/dev-ros/geometric_shapes/metadata.xml
+++ b/dev-ros/geometric_shapes/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/geometry_msgs/metadata.xml b/dev-ros/geometry_msgs/metadata.xml
index 2d3b5cc..7c144cf 100644
--- a/dev-ros/geometry_msgs/metadata.xml
+++ b/dev-ros/geometry_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/global_planner/metadata.xml b/dev-ros/global_planner/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/global_planner/metadata.xml
+++ b/dev-ros/global_planner/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/gmapping/metadata.xml b/dev-ros/gmapping/metadata.xml
index 2787121..6680cdd 100644
--- a/dev-ros/gmapping/metadata.xml
+++ b/dev-ros/gmapping/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hardware_interface/metadata.xml b/dev-ros/hardware_interface/metadata.xml
index 2b50e8a..f4a590e 100644
--- a/dev-ros/hardware_interface/metadata.xml
+++ b/dev-ros/hardware_interface/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_compressed_map_transport/metadata.xml b/dev-ros/hector_compressed_map_transport/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_compressed_map_transport/metadata.xml
+++ b/dev-ros/hector_compressed_map_transport/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_geotiff/metadata.xml b/dev-ros/hector_geotiff/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_geotiff/metadata.xml
+++ b/dev-ros/hector_geotiff/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_geotiff_plugins/metadata.xml b/dev-ros/hector_geotiff_plugins/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_geotiff_plugins/metadata.xml
+++ b/dev-ros/hector_geotiff_plugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_imu_attitude_to_tf/metadata.xml b/dev-ros/hector_imu_attitude_to_tf/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_imu_attitude_to_tf/metadata.xml
+++ b/dev-ros/hector_imu_attitude_to_tf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_imu_tools/metadata.xml b/dev-ros/hector_imu_tools/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_imu_tools/metadata.xml
+++ b/dev-ros/hector_imu_tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_map_server/metadata.xml b/dev-ros/hector_map_server/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_map_server/metadata.xml
+++ b/dev-ros/hector_map_server/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_map_tools/metadata.xml b/dev-ros/hector_map_tools/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_map_tools/metadata.xml
+++ b/dev-ros/hector_map_tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_mapping/metadata.xml b/dev-ros/hector_mapping/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_mapping/metadata.xml
+++ b/dev-ros/hector_mapping/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_marker_drawing/metadata.xml b/dev-ros/hector_marker_drawing/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_marker_drawing/metadata.xml
+++ b/dev-ros/hector_marker_drawing/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_nav_msgs/metadata.xml b/dev-ros/hector_nav_msgs/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_nav_msgs/metadata.xml
+++ b/dev-ros/hector_nav_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_pose_estimation/metadata.xml b/dev-ros/hector_pose_estimation/metadata.xml
index 017b917..19aa8ea 100644
--- a/dev-ros/hector_pose_estimation/metadata.xml
+++ b/dev-ros/hector_pose_estimation/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_pose_estimation_core/metadata.xml b/dev-ros/hector_pose_estimation_core/metadata.xml
index 017b917..19aa8ea 100644
--- a/dev-ros/hector_pose_estimation_core/metadata.xml
+++ b/dev-ros/hector_pose_estimation_core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_slam_launch/metadata.xml b/dev-ros/hector_slam_launch/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_slam_launch/metadata.xml
+++ b/dev-ros/hector_slam_launch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/hector_trajectory_server/metadata.xml b/dev-ros/hector_trajectory_server/metadata.xml
index d3cf71e..3851ae3 100644
--- a/dev-ros/hector_trajectory_server/metadata.xml
+++ b/dev-ros/hector_trajectory_server/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/image_cb_detector/metadata.xml b/dev-ros/image_cb_detector/metadata.xml
index 11ffa23..b5f28dc 100644
--- a/dev-ros/image_cb_detector/metadata.xml
+++ b/dev-ros/image_cb_detector/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/image_geometry/metadata.xml b/dev-ros/image_geometry/metadata.xml
index 266dc38..08c6dc2 100644
--- a/dev-ros/image_geometry/metadata.xml
+++ b/dev-ros/image_geometry/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/image_proc/metadata.xml b/dev-ros/image_proc/metadata.xml
index 90c35a2..8c79df0 100644
--- a/dev-ros/image_proc/metadata.xml
+++ b/dev-ros/image_proc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/image_rotate/metadata.xml b/dev-ros/image_rotate/metadata.xml
index 90c35a2..8c79df0 100644
--- a/dev-ros/image_rotate/metadata.xml
+++ b/dev-ros/image_rotate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/image_transport/metadata.xml b/dev-ros/image_transport/metadata.xml
index b01f287..abd895f 100644
--- a/dev-ros/image_transport/metadata.xml
+++ b/dev-ros/image_transport/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/image_view/metadata.xml b/dev-ros/image_view/metadata.xml
index 90c35a2..8c79df0 100644
--- a/dev-ros/image_view/metadata.xml
+++ b/dev-ros/image_view/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/imu_processors/metadata.xml b/dev-ros/imu_processors/metadata.xml
index 59d1d9e..c821843 100644
--- a/dev-ros/imu_processors/metadata.xml
+++ b/dev-ros/imu_processors/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/imu_transformer/metadata.xml b/dev-ros/imu_transformer/metadata.xml
index 59d1d9e..c821843 100644
--- a/dev-ros/imu_transformer/metadata.xml
+++ b/dev-ros/imu_transformer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/interactive_marker_tutorials/metadata.xml b/dev-ros/interactive_marker_tutorials/metadata.xml
index e1ee206..1fb9369 100644
--- a/dev-ros/interactive_marker_tutorials/metadata.xml
+++ b/dev-ros/interactive_marker_tutorials/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/interactive_markers/metadata.xml b/dev-ros/interactive_markers/metadata.xml
index 06342c0..910d81d 100644
--- a/dev-ros/interactive_markers/metadata.xml
+++ b/dev-ros/interactive_markers/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/interval_intersection/metadata.xml b/dev-ros/interval_intersection/metadata.xml
index 11ffa23..b5f28dc 100644
--- a/dev-ros/interval_intersection/metadata.xml
+++ b/dev-ros/interval_intersection/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/ivcon/metadata.xml b/dev-ros/ivcon/metadata.xml
index 01a9af4..32e6069 100644
--- a/dev-ros/ivcon/metadata.xml
+++ b/dev-ros/ivcon/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/joint_limits_interface/metadata.xml b/dev-ros/joint_limits_interface/metadata.xml
index 2b50e8a..f4a590e 100644
--- a/dev-ros/joint_limits_interface/metadata.xml
+++ b/dev-ros/joint_limits_interface/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/joint_state_publisher/metadata.xml b/dev-ros/joint_state_publisher/metadata.xml
index b2ab0e6..0724a71 100644
--- a/dev-ros/joint_state_publisher/metadata.xml
+++ b/dev-ros/joint_state_publisher/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/joint_states_settler/metadata.xml b/dev-ros/joint_states_settler/metadata.xml
index 11ffa23..b5f28dc 100644
--- a/dev-ros/joint_states_settler/metadata.xml
+++ b/dev-ros/joint_states_settler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/kdl_conversions/metadata.xml b/dev-ros/kdl_conversions/metadata.xml
index 2d8e130..85acac4 100644
--- a/dev-ros/kdl_conversions/metadata.xml
+++ b/dev-ros/kdl_conversions/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/kdl_parser/metadata.xml b/dev-ros/kdl_parser/metadata.xml
index b2ab0e6..0724a71 100644
--- a/dev-ros/kdl_parser/metadata.xml
+++ b/dev-ros/kdl_parser/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/laser_assembler/metadata.xml b/dev-ros/laser_assembler/metadata.xml
index 3dbf9bf..10e666d 100644
--- a/dev-ros/laser_assembler/metadata.xml
+++ b/dev-ros/laser_assembler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/laser_cb_detector/metadata.xml b/dev-ros/laser_cb_detector/metadata.xml
index 11ffa23..b5f28dc 100644
--- a/dev-ros/laser_cb_detector/metadata.xml
+++ b/dev-ros/laser_cb_detector/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/laser_filters/metadata.xml b/dev-ros/laser_filters/metadata.xml
index a51d14a..8ccd0ce 100644
--- a/dev-ros/laser_filters/metadata.xml
+++ b/dev-ros/laser_filters/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/laser_geometry/metadata.xml b/dev-ros/laser_geometry/metadata.xml
index 46f29be..26b75e4 100644
--- a/dev-ros/laser_geometry/metadata.xml
+++ b/dev-ros/laser_geometry/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/laser_proc/metadata.xml b/dev-ros/laser_proc/metadata.xml
index 7c2a6eb..5a837b0 100644
--- a/dev-ros/laser_proc/metadata.xml
+++ b/dev-ros/laser_proc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/libmavconn/metadata.xml b/dev-ros/libmavconn/metadata.xml
index 9add6fb..c23624e 100644
--- a/dev-ros/libmavconn/metadata.xml
+++ b/dev-ros/libmavconn/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/librviz_tutorial/metadata.xml b/dev-ros/librviz_tutorial/metadata.xml
index e1ee206..1fb9369 100644
--- a/dev-ros/librviz_tutorial/metadata.xml
+++ b/dev-ros/librviz_tutorial/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/map_msgs/metadata.xml b/dev-ros/map_msgs/metadata.xml
index 8a5ed02..d85186f 100644
--- a/dev-ros/map_msgs/metadata.xml
+++ b/dev-ros/map_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/map_server/metadata.xml b/dev-ros/map_server/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/map_server/metadata.xml
+++ b/dev-ros/map_server/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/mavlink-gbp-release/metadata.xml b/dev-ros/mavlink-gbp-release/metadata.xml
index db2cac3..a803478 100644
--- a/dev-ros/mavlink-gbp-release/metadata.xml
+++ b/dev-ros/mavlink-gbp-release/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/mavros/metadata.xml b/dev-ros/mavros/metadata.xml
index 9add6fb..c23624e 100644
--- a/dev-ros/mavros/metadata.xml
+++ b/dev-ros/mavros/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/mavros_extras/metadata.xml b/dev-ros/mavros_extras/metadata.xml
index 9add6fb..c23624e 100644
--- a/dev-ros/mavros_extras/metadata.xml
+++ b/dev-ros/mavros_extras/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/mavros_msgs/metadata.xml b/dev-ros/mavros_msgs/metadata.xml
index 9add6fb..c23624e 100644
--- a/dev-ros/mavros_msgs/metadata.xml
+++ b/dev-ros/mavros_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/message_filters/metadata.xml b/dev-ros/message_filters/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/message_filters/metadata.xml
+++ b/dev-ros/message_filters/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/message_generation/metadata.xml b/dev-ros/message_generation/metadata.xml
index bf725cc..9c68b1f 100644
--- a/dev-ros/message_generation/metadata.xml
+++ b/dev-ros/message_generation/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/message_runtime/metadata.xml b/dev-ros/message_runtime/metadata.xml
index f821157..938f27f 100644
--- a/dev-ros/message_runtime/metadata.xml
+++ b/dev-ros/message_runtime/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/message_to_tf/metadata.xml b/dev-ros/message_to_tf/metadata.xml
index 017b917..19aa8ea 100644
--- a/dev-ros/message_to_tf/metadata.xml
+++ b/dev-ros/message_to_tf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/mk/metadata.xml b/dev-ros/mk/metadata.xml
index d0c10cf..55c0da5 100644
--- a/dev-ros/mk/metadata.xml
+++ b/dev-ros/mk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/monocam_settler/metadata.xml b/dev-ros/monocam_settler/metadata.xml
index 11ffa23..b5f28dc 100644
--- a/dev-ros/monocam_settler/metadata.xml
+++ b/dev-ros/monocam_settler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/move_base/metadata.xml b/dev-ros/move_base/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/move_base/metadata.xml
+++ b/dev-ros/move_base/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/move_base_msgs/metadata.xml b/dev-ros/move_base_msgs/metadata.xml
index 8a5ed02..d85186f 100644
--- a/dev-ros/move_base_msgs/metadata.xml
+++ b/dev-ros/move_base_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/move_slow_and_clear/metadata.xml b/dev-ros/move_slow_and_clear/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/move_slow_and_clear/metadata.xml
+++ b/dev-ros/move_slow_and_clear/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/moveit_msgs/metadata.xml b/dev-ros/moveit_msgs/metadata.xml
index 9e33b27..8030a60 100644
--- a/dev-ros/moveit_msgs/metadata.xml
+++ b/dev-ros/moveit_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/nav_core/metadata.xml b/dev-ros/nav_core/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/nav_core/metadata.xml
+++ b/dev-ros/nav_core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/nav_msgs/metadata.xml b/dev-ros/nav_msgs/metadata.xml
index 2d3b5cc..7c144cf 100644
--- a/dev-ros/nav_msgs/metadata.xml
+++ b/dev-ros/nav_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/navfn/metadata.xml b/dev-ros/navfn/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/navfn/metadata.xml
+++ b/dev-ros/navfn/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/nodelet/metadata.xml b/dev-ros/nodelet/metadata.xml
index 33bcb0c..66af76f 100644
--- a/dev-ros/nodelet/metadata.xml
+++ b/dev-ros/nodelet/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/nodelet_topic_tools/metadata.xml b/dev-ros/nodelet_topic_tools/metadata.xml
index 33bcb0c..66af76f 100644
--- a/dev-ros/nodelet_topic_tools/metadata.xml
+++ b/dev-ros/nodelet_topic_tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/nodelet_tutorial_math/metadata.xml b/dev-ros/nodelet_tutorial_math/metadata.xml
index 38abe1f..9263625 100644
--- a/dev-ros/nodelet_tutorial_math/metadata.xml
+++ b/dev-ros/nodelet_tutorial_math/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/object_recognition_msgs/metadata.xml b/dev-ros/object_recognition_msgs/metadata.xml
index eb59c0a..9d3d0c0 100644
--- a/dev-ros/object_recognition_msgs/metadata.xml
+++ b/dev-ros/object_recognition_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/octomap_msgs/metadata.xml b/dev-ros/octomap_msgs/metadata.xml
index 4be018a..6fac7ba 100644
--- a/dev-ros/octomap_msgs/metadata.xml
+++ b/dev-ros/octomap_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/octomap_ros/metadata.xml b/dev-ros/octomap_ros/metadata.xml
index 9d69b3c..f32fc1d 100644
--- a/dev-ros/octomap_ros/metadata.xml
+++ b/dev-ros/octomap_ros/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/opencv_apps/metadata.xml b/dev-ros/opencv_apps/metadata.xml
index 266dc38..08c6dc2 100644
--- a/dev-ros/opencv_apps/metadata.xml
+++ b/dev-ros/opencv_apps/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/opencv_tests/metadata.xml b/dev-ros/opencv_tests/metadata.xml
index 266dc38..08c6dc2 100644
--- a/dev-ros/opencv_tests/metadata.xml
+++ b/dev-ros/opencv_tests/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/openni2_camera/metadata.xml b/dev-ros/openni2_camera/metadata.xml
index 06936ea..b4a1381 100644
--- a/dev-ros/openni2_camera/metadata.xml
+++ b/dev-ros/openni2_camera/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/openni2_launch/metadata.xml b/dev-ros/openni2_launch/metadata.xml
index 178020c..44d9f93 100644
--- a/dev-ros/openni2_launch/metadata.xml
+++ b/dev-ros/openni2_launch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/openslam_gmapping/metadata.xml b/dev-ros/openslam_gmapping/metadata.xml
index c248b96..6fc09ec 100644
--- a/dev-ros/openslam_gmapping/metadata.xml
+++ b/dev-ros/openslam_gmapping/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/pcl_conversions/metadata.xml b/dev-ros/pcl_conversions/metadata.xml
index b19e363..a6fa41f 100644
--- a/dev-ros/pcl_conversions/metadata.xml
+++ b/dev-ros/pcl_conversions/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/pcl_msgs/metadata.xml b/dev-ros/pcl_msgs/metadata.xml
index a765a41..3737cf5 100644
--- a/dev-ros/pcl_msgs/metadata.xml
+++ b/dev-ros/pcl_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/pcl_ros/metadata.xml b/dev-ros/pcl_ros/metadata.xml
index 3fbdb8f..a3b5c3d 100644
--- a/dev-ros/pcl_ros/metadata.xml
+++ b/dev-ros/pcl_ros/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/pluginlib/metadata.xml b/dev-ros/pluginlib/metadata.xml
index 2d4844b..8667ed7 100644
--- a/dev-ros/pluginlib/metadata.xml
+++ b/dev-ros/pluginlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/pluginlib_tutorials/metadata.xml b/dev-ros/pluginlib_tutorials/metadata.xml
index 38abe1f..9263625 100644
--- a/dev-ros/pluginlib_tutorials/metadata.xml
+++ b/dev-ros/pluginlib_tutorials/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/pointcloud_to_laserscan/metadata.xml b/dev-ros/pointcloud_to_laserscan/metadata.xml
index 73f0102..a08d68b 100644
--- a/dev-ros/pointcloud_to_laserscan/metadata.xml
+++ b/dev-ros/pointcloud_to_laserscan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/polled_camera/metadata.xml b/dev-ros/polled_camera/metadata.xml
index b01f287..abd895f 100644
--- a/dev-ros/polled_camera/metadata.xml
+++ b/dev-ros/polled_camera/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/pr2_dashboard_aggregator/metadata.xml b/dev-ros/pr2_dashboard_aggregator/metadata.xml
index 88a4cd6..6efd828 100644
--- a/dev-ros/pr2_dashboard_aggregator/metadata.xml
+++ b/dev-ros/pr2_dashboard_aggregator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/pr2_description/metadata.xml b/dev-ros/pr2_description/metadata.xml
index 88a4cd6..6efd828 100644
--- a/dev-ros/pr2_description/metadata.xml
+++ b/dev-ros/pr2_description/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/pr2_machine/metadata.xml b/dev-ros/pr2_machine/metadata.xml
index 88a4cd6..6efd828 100644
--- a/dev-ros/pr2_machine/metadata.xml
+++ b/dev-ros/pr2_machine/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/pr2_msgs/metadata.xml b/dev-ros/pr2_msgs/metadata.xml
index 88a4cd6..6efd828 100644
--- a/dev-ros/pr2_msgs/metadata.xml
+++ b/dev-ros/pr2_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/python_qt_binding/metadata.xml b/dev-ros/python_qt_binding/metadata.xml
index 51aa73b..b1a12ff 100644
--- a/dev-ros/python_qt_binding/metadata.xml
+++ b/dev-ros/python_qt_binding/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/qt_dotgraph/metadata.xml b/dev-ros/qt_dotgraph/metadata.xml
index 2d88111..894d892 100644
--- a/dev-ros/qt_dotgraph/metadata.xml
+++ b/dev-ros/qt_dotgraph/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/qt_gui/metadata.xml b/dev-ros/qt_gui/metadata.xml
index 2d88111..894d892 100644
--- a/dev-ros/qt_gui/metadata.xml
+++ b/dev-ros/qt_gui/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/qt_gui_app/metadata.xml b/dev-ros/qt_gui_app/metadata.xml
index 2d88111..894d892 100644
--- a/dev-ros/qt_gui_app/metadata.xml
+++ b/dev-ros/qt_gui_app/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/qt_gui_cpp/metadata.xml b/dev-ros/qt_gui_cpp/metadata.xml
index 2d88111..894d892 100644
--- a/dev-ros/qt_gui_cpp/metadata.xml
+++ b/dev-ros/qt_gui_cpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/qt_gui_py_common/metadata.xml b/dev-ros/qt_gui_py_common/metadata.xml
index 2d88111..894d892 100644
--- a/dev-ros/qt_gui_py_common/metadata.xml
+++ b/dev-ros/qt_gui_py_common/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/random_numbers/metadata.xml b/dev-ros/random_numbers/metadata.xml
index 9eecefd..a8d6741 100644
--- a/dev-ros/random_numbers/metadata.xml
+++ b/dev-ros/random_numbers/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/realtime_tools/metadata.xml b/dev-ros/realtime_tools/metadata.xml
index 1b54833..29f7946 100644
--- a/dev-ros/realtime_tools/metadata.xml
+++ b/dev-ros/realtime_tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/resource_retriever/metadata.xml b/dev-ros/resource_retriever/metadata.xml
index 5469bd6..6a5cbb4 100644
--- a/dev-ros/resource_retriever/metadata.xml
+++ b/dev-ros/resource_retriever/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rgbd_launch/metadata.xml b/dev-ros/rgbd_launch/metadata.xml
index 1ad19e8..fbf5273 100644
--- a/dev-ros/rgbd_launch/metadata.xml
+++ b/dev-ros/rgbd_launch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/robot_pose_ekf/metadata.xml b/dev-ros/robot_pose_ekf/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/robot_pose_ekf/metadata.xml
+++ b/dev-ros/robot_pose_ekf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/robot_pose_publisher/metadata.xml b/dev-ros/robot_pose_publisher/metadata.xml
index 46c06e4..0affcca 100644
--- a/dev-ros/robot_pose_publisher/metadata.xml
+++ b/dev-ros/robot_pose_publisher/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/robot_state_publisher/metadata.xml b/dev-ros/robot_state_publisher/metadata.xml
index 1d107f4..d2f0d6c 100644
--- a/dev-ros/robot_state_publisher/metadata.xml
+++ b/dev-ros/robot_state_publisher/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosapi/metadata.xml b/dev-ros/rosapi/metadata.xml
index d548185..c655f4f 100644
--- a/dev-ros/rosapi/metadata.xml
+++ b/dev-ros/rosapi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosauth/metadata.xml b/dev-ros/rosauth/metadata.xml
index ade7f22..157822d 100644
--- a/dev-ros/rosauth/metadata.xml
+++ b/dev-ros/rosauth/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosbag/metadata.xml b/dev-ros/rosbag/metadata.xml
index c75640d..ca2c4cb 100644
--- a/dev-ros/rosbag/metadata.xml
+++ b/dev-ros/rosbag/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ros</herd>

diff --git a/dev-ros/rosbag_storage/metadata.xml b/dev-ros/rosbag_storage/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/rosbag_storage/metadata.xml
+++ b/dev-ros/rosbag_storage/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosbash/metadata.xml b/dev-ros/rosbash/metadata.xml
index d0c10cf..55c0da5 100644
--- a/dev-ros/rosbash/metadata.xml
+++ b/dev-ros/rosbash/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosboost_cfg/metadata.xml b/dev-ros/rosboost_cfg/metadata.xml
index d0c10cf..55c0da5 100644
--- a/dev-ros/rosboost_cfg/metadata.xml
+++ b/dev-ros/rosboost_cfg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosbridge_library/metadata.xml b/dev-ros/rosbridge_library/metadata.xml
index d548185..c655f4f 100644
--- a/dev-ros/rosbridge_library/metadata.xml
+++ b/dev-ros/rosbridge_library/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosbridge_server/metadata.xml b/dev-ros/rosbridge_server/metadata.xml
index d548185..c655f4f 100644
--- a/dev-ros/rosbridge_server/metadata.xml
+++ b/dev-ros/rosbridge_server/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosbuild/metadata.xml b/dev-ros/rosbuild/metadata.xml
index d0c10cf..55c0da5 100644
--- a/dev-ros/rosbuild/metadata.xml
+++ b/dev-ros/rosbuild/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosclean/metadata.xml b/dev-ros/rosclean/metadata.xml
index d0c10cf..55c0da5 100644
--- a/dev-ros/rosclean/metadata.xml
+++ b/dev-ros/rosclean/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosconsole/metadata.xml b/dev-ros/rosconsole/metadata.xml
index d8ccd39..85d3ccd 100644
--- a/dev-ros/rosconsole/metadata.xml
+++ b/dev-ros/rosconsole/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ros</herd>

diff --git a/dev-ros/rosconsole_bridge/metadata.xml b/dev-ros/rosconsole_bridge/metadata.xml
index f90c61a..62e3f0f 100644
--- a/dev-ros/rosconsole_bridge/metadata.xml
+++ b/dev-ros/rosconsole_bridge/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roscpp/metadata.xml b/dev-ros/roscpp/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/roscpp/metadata.xml
+++ b/dev-ros/roscpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roscpp_serialization/metadata.xml b/dev-ros/roscpp_serialization/metadata.xml
index d41b871..c6d73fb 100644
--- a/dev-ros/roscpp_serialization/metadata.xml
+++ b/dev-ros/roscpp_serialization/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roscpp_traits/metadata.xml b/dev-ros/roscpp_traits/metadata.xml
index d41b871..c6d73fb 100644
--- a/dev-ros/roscpp_traits/metadata.xml
+++ b/dev-ros/roscpp_traits/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roscpp_tutorials/metadata.xml b/dev-ros/roscpp_tutorials/metadata.xml
index 1360d75..53c74b5 100644
--- a/dev-ros/roscpp_tutorials/metadata.xml
+++ b/dev-ros/roscpp_tutorials/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roscreate/metadata.xml b/dev-ros/roscreate/metadata.xml
index d0c10cf..55c0da5 100644
--- a/dev-ros/roscreate/metadata.xml
+++ b/dev-ros/roscreate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosgraph/metadata.xml b/dev-ros/rosgraph/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/rosgraph/metadata.xml
+++ b/dev-ros/rosgraph/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosgraph_msgs/metadata.xml b/dev-ros/rosgraph_msgs/metadata.xml
index d101ce6..c50f0d8 100644
--- a/dev-ros/rosgraph_msgs/metadata.xml
+++ b/dev-ros/rosgraph_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roslang/metadata.xml b/dev-ros/roslang/metadata.xml
index d0c10cf..55c0da5 100644
--- a/dev-ros/roslang/metadata.xml
+++ b/dev-ros/roslang/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roslaunch/metadata.xml b/dev-ros/roslaunch/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/roslaunch/metadata.xml
+++ b/dev-ros/roslaunch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roslib/metadata.xml b/dev-ros/roslib/metadata.xml
index d0c10cf..55c0da5 100644
--- a/dev-ros/roslib/metadata.xml
+++ b/dev-ros/roslib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roslint/metadata.xml b/dev-ros/roslint/metadata.xml
index 3605109..d472a9a 100644
--- a/dev-ros/roslint/metadata.xml
+++ b/dev-ros/roslint/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roslisp/metadata.xml b/dev-ros/roslisp/metadata.xml
index 10cafb5..34f48df 100644
--- a/dev-ros/roslisp/metadata.xml
+++ b/dev-ros/roslisp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roslz4/metadata.xml b/dev-ros/roslz4/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/roslz4/metadata.xml
+++ b/dev-ros/roslz4/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosmake/metadata.xml b/dev-ros/rosmake/metadata.xml
index d0c10cf..55c0da5 100644
--- a/dev-ros/rosmake/metadata.xml
+++ b/dev-ros/rosmake/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosmaster/metadata.xml b/dev-ros/rosmaster/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/rosmaster/metadata.xml
+++ b/dev-ros/rosmaster/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosmsg/metadata.xml b/dev-ros/rosmsg/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/rosmsg/metadata.xml
+++ b/dev-ros/rosmsg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosnode/metadata.xml b/dev-ros/rosnode/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/rosnode/metadata.xml
+++ b/dev-ros/rosnode/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosout/metadata.xml b/dev-ros/rosout/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/rosout/metadata.xml
+++ b/dev-ros/rosout/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rospack/metadata.xml b/dev-ros/rospack/metadata.xml
index 34042c3..f10ed76 100644
--- a/dev-ros/rospack/metadata.xml
+++ b/dev-ros/rospack/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosparam/metadata.xml b/dev-ros/rosparam/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/rosparam/metadata.xml
+++ b/dev-ros/rosparam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rospy/metadata.xml b/dev-ros/rospy/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/rospy/metadata.xml
+++ b/dev-ros/rospy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rospy_tutorials/metadata.xml b/dev-ros/rospy_tutorials/metadata.xml
index 1360d75..53c74b5 100644
--- a/dev-ros/rospy_tutorials/metadata.xml
+++ b/dev-ros/rospy_tutorials/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosserial_arduino/metadata.xml b/dev-ros/rosserial_arduino/metadata.xml
index 853c4a1..662b791 100644
--- a/dev-ros/rosserial_arduino/metadata.xml
+++ b/dev-ros/rosserial_arduino/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosserial_client/metadata.xml b/dev-ros/rosserial_client/metadata.xml
index 853c4a1..662b791 100644
--- a/dev-ros/rosserial_client/metadata.xml
+++ b/dev-ros/rosserial_client/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosserial_embeddedlinux/metadata.xml b/dev-ros/rosserial_embeddedlinux/metadata.xml
index 853c4a1..662b791 100644
--- a/dev-ros/rosserial_embeddedlinux/metadata.xml
+++ b/dev-ros/rosserial_embeddedlinux/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosserial_msgs/metadata.xml b/dev-ros/rosserial_msgs/metadata.xml
index 853c4a1..662b791 100644
--- a/dev-ros/rosserial_msgs/metadata.xml
+++ b/dev-ros/rosserial_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosserial_python/metadata.xml b/dev-ros/rosserial_python/metadata.xml
index 853c4a1..662b791 100644
--- a/dev-ros/rosserial_python/metadata.xml
+++ b/dev-ros/rosserial_python/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosserial_server/metadata.xml b/dev-ros/rosserial_server/metadata.xml
index 853c4a1..662b791 100644
--- a/dev-ros/rosserial_server/metadata.xml
+++ b/dev-ros/rosserial_server/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosserial_windows/metadata.xml b/dev-ros/rosserial_windows/metadata.xml
index 853c4a1..662b791 100644
--- a/dev-ros/rosserial_windows/metadata.xml
+++ b/dev-ros/rosserial_windows/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosserial_xbee/metadata.xml b/dev-ros/rosserial_xbee/metadata.xml
index 853c4a1..662b791 100644
--- a/dev-ros/rosserial_xbee/metadata.xml
+++ b/dev-ros/rosserial_xbee/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosservice/metadata.xml b/dev-ros/rosservice/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/rosservice/metadata.xml
+++ b/dev-ros/rosservice/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rostest/metadata.xml b/dev-ros/rostest/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/rostest/metadata.xml
+++ b/dev-ros/rostest/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rostime/metadata.xml b/dev-ros/rostime/metadata.xml
index d41b871..c6d73fb 100644
--- a/dev-ros/rostime/metadata.xml
+++ b/dev-ros/rostime/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rostopic/metadata.xml b/dev-ros/rostopic/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/rostopic/metadata.xml
+++ b/dev-ros/rostopic/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rosunit/metadata.xml b/dev-ros/rosunit/metadata.xml
index d0c10cf..55c0da5 100644
--- a/dev-ros/rosunit/metadata.xml
+++ b/dev-ros/rosunit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/roswtf/metadata.xml b/dev-ros/roswtf/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/roswtf/metadata.xml
+++ b/dev-ros/roswtf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rotate_recovery/metadata.xml b/dev-ros/rotate_recovery/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/rotate_recovery/metadata.xml
+++ b/dev-ros/rotate_recovery/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_action/metadata.xml b/dev-ros/rqt_action/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_action/metadata.xml
+++ b/dev-ros/rqt_action/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_bag/metadata.xml b/dev-ros/rqt_bag/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_bag/metadata.xml
+++ b/dev-ros/rqt_bag/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_bag_plugins/metadata.xml b/dev-ros/rqt_bag_plugins/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_bag_plugins/metadata.xml
+++ b/dev-ros/rqt_bag_plugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_console/metadata.xml b/dev-ros/rqt_console/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_console/metadata.xml
+++ b/dev-ros/rqt_console/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_controller_manager/metadata.xml b/dev-ros/rqt_controller_manager/metadata.xml
index 2b50e8a..f4a590e 100644
--- a/dev-ros/rqt_controller_manager/metadata.xml
+++ b/dev-ros/rqt_controller_manager/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_dep/metadata.xml b/dev-ros/rqt_dep/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_dep/metadata.xml
+++ b/dev-ros/rqt_dep/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_graph/metadata.xml b/dev-ros/rqt_graph/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_graph/metadata.xml
+++ b/dev-ros/rqt_graph/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_gui/metadata.xml b/dev-ros/rqt_gui/metadata.xml
index 1274b6f..1590eb6 100644
--- a/dev-ros/rqt_gui/metadata.xml
+++ b/dev-ros/rqt_gui/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_gui_cpp/metadata.xml b/dev-ros/rqt_gui_cpp/metadata.xml
index 1274b6f..1590eb6 100644
--- a/dev-ros/rqt_gui_cpp/metadata.xml
+++ b/dev-ros/rqt_gui_cpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_gui_py/metadata.xml b/dev-ros/rqt_gui_py/metadata.xml
index 1274b6f..1590eb6 100644
--- a/dev-ros/rqt_gui_py/metadata.xml
+++ b/dev-ros/rqt_gui_py/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_image_view/metadata.xml b/dev-ros/rqt_image_view/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_image_view/metadata.xml
+++ b/dev-ros/rqt_image_view/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_launch/metadata.xml b/dev-ros/rqt_launch/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_launch/metadata.xml
+++ b/dev-ros/rqt_launch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_logger_level/metadata.xml b/dev-ros/rqt_logger_level/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_logger_level/metadata.xml
+++ b/dev-ros/rqt_logger_level/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_moveit/metadata.xml b/dev-ros/rqt_moveit/metadata.xml
index 28fc5ef..07e852f 100644
--- a/dev-ros/rqt_moveit/metadata.xml
+++ b/dev-ros/rqt_moveit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_msg/metadata.xml b/dev-ros/rqt_msg/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_msg/metadata.xml
+++ b/dev-ros/rqt_msg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_nav_view/metadata.xml b/dev-ros/rqt_nav_view/metadata.xml
index 28fc5ef..07e852f 100644
--- a/dev-ros/rqt_nav_view/metadata.xml
+++ b/dev-ros/rqt_nav_view/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_plot/metadata.xml b/dev-ros/rqt_plot/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_plot/metadata.xml
+++ b/dev-ros/rqt_plot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_pose_view/metadata.xml b/dev-ros/rqt_pose_view/metadata.xml
index 28fc5ef..07e852f 100644
--- a/dev-ros/rqt_pose_view/metadata.xml
+++ b/dev-ros/rqt_pose_view/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_publisher/metadata.xml b/dev-ros/rqt_publisher/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_publisher/metadata.xml
+++ b/dev-ros/rqt_publisher/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_py_common/metadata.xml b/dev-ros/rqt_py_common/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_py_common/metadata.xml
+++ b/dev-ros/rqt_py_common/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_py_console/metadata.xml b/dev-ros/rqt_py_console/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_py_console/metadata.xml
+++ b/dev-ros/rqt_py_console/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_reconfigure/metadata.xml b/dev-ros/rqt_reconfigure/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_reconfigure/metadata.xml
+++ b/dev-ros/rqt_reconfigure/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_robot_dashboard/metadata.xml b/dev-ros/rqt_robot_dashboard/metadata.xml
index 28fc5ef..07e852f 100644
--- a/dev-ros/rqt_robot_dashboard/metadata.xml
+++ b/dev-ros/rqt_robot_dashboard/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_robot_monitor/metadata.xml b/dev-ros/rqt_robot_monitor/metadata.xml
index 28fc5ef..07e852f 100644
--- a/dev-ros/rqt_robot_monitor/metadata.xml
+++ b/dev-ros/rqt_robot_monitor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_robot_steering/metadata.xml b/dev-ros/rqt_robot_steering/metadata.xml
index 28fc5ef..07e852f 100644
--- a/dev-ros/rqt_robot_steering/metadata.xml
+++ b/dev-ros/rqt_robot_steering/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_runtime_monitor/metadata.xml b/dev-ros/rqt_runtime_monitor/metadata.xml
index 28fc5ef..07e852f 100644
--- a/dev-ros/rqt_runtime_monitor/metadata.xml
+++ b/dev-ros/rqt_runtime_monitor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_rviz/metadata.xml b/dev-ros/rqt_rviz/metadata.xml
index 28fc5ef..07e852f 100644
--- a/dev-ros/rqt_rviz/metadata.xml
+++ b/dev-ros/rqt_rviz/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_service_caller/metadata.xml b/dev-ros/rqt_service_caller/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_service_caller/metadata.xml
+++ b/dev-ros/rqt_service_caller/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_shell/metadata.xml b/dev-ros/rqt_shell/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_shell/metadata.xml
+++ b/dev-ros/rqt_shell/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_srv/metadata.xml b/dev-ros/rqt_srv/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_srv/metadata.xml
+++ b/dev-ros/rqt_srv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_tf_tree/metadata.xml b/dev-ros/rqt_tf_tree/metadata.xml
index 28fc5ef..07e852f 100644
--- a/dev-ros/rqt_tf_tree/metadata.xml
+++ b/dev-ros/rqt_tf_tree/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_top/metadata.xml b/dev-ros/rqt_top/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_top/metadata.xml
+++ b/dev-ros/rqt_top/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_topic/metadata.xml b/dev-ros/rqt_topic/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_topic/metadata.xml
+++ b/dev-ros/rqt_topic/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rqt_web/metadata.xml b/dev-ros/rqt_web/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/dev-ros/rqt_web/metadata.xml
+++ b/dev-ros/rqt_web/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rviz/metadata.xml b/dev-ros/rviz/metadata.xml
index a54bf17..2ddef28 100644
--- a/dev-ros/rviz/metadata.xml
+++ b/dev-ros/rviz/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rviz_plugin_tutorials/metadata.xml b/dev-ros/rviz_plugin_tutorials/metadata.xml
index e1ee206..1fb9369 100644
--- a/dev-ros/rviz_plugin_tutorials/metadata.xml
+++ b/dev-ros/rviz_plugin_tutorials/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/rviz_python_tutorial/metadata.xml b/dev-ros/rviz_python_tutorial/metadata.xml
index e1ee206..1fb9369 100644
--- a/dev-ros/rviz_python_tutorial/metadata.xml
+++ b/dev-ros/rviz_python_tutorial/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/self_test/metadata.xml b/dev-ros/self_test/metadata.xml
index 7403d8e..d20e2ad 100644
--- a/dev-ros/self_test/metadata.xml
+++ b/dev-ros/self_test/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/sensor_msgs/metadata.xml b/dev-ros/sensor_msgs/metadata.xml
index 2d3b5cc..7c144cf 100644
--- a/dev-ros/sensor_msgs/metadata.xml
+++ b/dev-ros/sensor_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/settlerlib/metadata.xml b/dev-ros/settlerlib/metadata.xml
index 11ffa23..b5f28dc 100644
--- a/dev-ros/settlerlib/metadata.xml
+++ b/dev-ros/settlerlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/shape_msgs/metadata.xml b/dev-ros/shape_msgs/metadata.xml
index 2d3b5cc..7c144cf 100644
--- a/dev-ros/shape_msgs/metadata.xml
+++ b/dev-ros/shape_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/shape_tools/metadata.xml b/dev-ros/shape_tools/metadata.xml
index e66c6b2..49ea21f 100644
--- a/dev-ros/shape_tools/metadata.xml
+++ b/dev-ros/shape_tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/smach/metadata.xml b/dev-ros/smach/metadata.xml
index df9f6c9..cad98c8 100644
--- a/dev-ros/smach/metadata.xml
+++ b/dev-ros/smach/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/smach_msgs/metadata.xml b/dev-ros/smach_msgs/metadata.xml
index df9f6c9..cad98c8 100644
--- a/dev-ros/smach_msgs/metadata.xml
+++ b/dev-ros/smach_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/smach_ros/metadata.xml b/dev-ros/smach_ros/metadata.xml
index df9f6c9..cad98c8 100644
--- a/dev-ros/smach_ros/metadata.xml
+++ b/dev-ros/smach_ros/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/smclib/metadata.xml b/dev-ros/smclib/metadata.xml
index 500c8eb..6c2a82d 100644
--- a/dev-ros/smclib/metadata.xml
+++ b/dev-ros/smclib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/sound_play/metadata.xml b/dev-ros/sound_play/metadata.xml
index 11ebb41..052c64d 100644
--- a/dev-ros/sound_play/metadata.xml
+++ b/dev-ros/sound_play/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/stage_ros/metadata.xml b/dev-ros/stage_ros/metadata.xml
index c5c1aaa..8c1d038 100644
--- a/dev-ros/stage_ros/metadata.xml
+++ b/dev-ros/stage_ros/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/std_msgs/metadata.xml b/dev-ros/std_msgs/metadata.xml
index f81a27a..56e2217 100644
--- a/dev-ros/std_msgs/metadata.xml
+++ b/dev-ros/std_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/std_srvs/metadata.xml b/dev-ros/std_srvs/metadata.xml
index d101ce6..c50f0d8 100644
--- a/dev-ros/std_srvs/metadata.xml
+++ b/dev-ros/std_srvs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/stereo_image_proc/metadata.xml b/dev-ros/stereo_image_proc/metadata.xml
index 90c35a2..8c79df0 100644
--- a/dev-ros/stereo_image_proc/metadata.xml
+++ b/dev-ros/stereo_image_proc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/stereo_msgs/metadata.xml b/dev-ros/stereo_msgs/metadata.xml
index 2d3b5cc..7c144cf 100644
--- a/dev-ros/stereo_msgs/metadata.xml
+++ b/dev-ros/stereo_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_bond/metadata.xml b/dev-ros/test_bond/metadata.xml
index 500c8eb..6c2a82d 100644
--- a/dev-ros/test_bond/metadata.xml
+++ b/dev-ros/test_bond/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_diagnostic_aggregator/metadata.xml b/dev-ros/test_diagnostic_aggregator/metadata.xml
index 7403d8e..d20e2ad 100644
--- a/dev-ros/test_diagnostic_aggregator/metadata.xml
+++ b/dev-ros/test_diagnostic_aggregator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_nodelet/metadata.xml b/dev-ros/test_nodelet/metadata.xml
index 33bcb0c..66af76f 100644
--- a/dev-ros/test_nodelet/metadata.xml
+++ b/dev-ros/test_nodelet/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_nodelet_topic_tools/metadata.xml b/dev-ros/test_nodelet_topic_tools/metadata.xml
index 33bcb0c..66af76f 100644
--- a/dev-ros/test_nodelet_topic_tools/metadata.xml
+++ b/dev-ros/test_nodelet_topic_tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_rosbag/metadata.xml b/dev-ros/test_rosbag/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/test_rosbag/metadata.xml
+++ b/dev-ros/test_rosbag/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_rosbag_storage/metadata.xml b/dev-ros/test_rosbag_storage/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/test_rosbag_storage/metadata.xml
+++ b/dev-ros/test_rosbag_storage/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_roscpp/metadata.xml b/dev-ros/test_roscpp/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/test_roscpp/metadata.xml
+++ b/dev-ros/test_roscpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_rosgraph/metadata.xml b/dev-ros/test_rosgraph/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/test_rosgraph/metadata.xml
+++ b/dev-ros/test_rosgraph/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_roslaunch/metadata.xml b/dev-ros/test_roslaunch/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/test_roslaunch/metadata.xml
+++ b/dev-ros/test_roslaunch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_roslib_comm/metadata.xml b/dev-ros/test_roslib_comm/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/test_roslib_comm/metadata.xml
+++ b/dev-ros/test_roslib_comm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_rosmaster/metadata.xml b/dev-ros/test_rosmaster/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/test_rosmaster/metadata.xml
+++ b/dev-ros/test_rosmaster/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_rosparam/metadata.xml b/dev-ros/test_rosparam/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/test_rosparam/metadata.xml
+++ b/dev-ros/test_rosparam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_rospy/metadata.xml b/dev-ros/test_rospy/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/test_rospy/metadata.xml
+++ b/dev-ros/test_rospy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_rosservice/metadata.xml b/dev-ros/test_rosservice/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/test_rosservice/metadata.xml
+++ b/dev-ros/test_rosservice/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/test_tf2/metadata.xml b/dev-ros/test_tf2/metadata.xml
index 51f204d..0b847ee 100644
--- a/dev-ros/test_tf2/metadata.xml
+++ b/dev-ros/test_tf2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/tf/metadata.xml b/dev-ros/tf/metadata.xml
index 2d8e130..85acac4 100644
--- a/dev-ros/tf/metadata.xml
+++ b/dev-ros/tf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/tf2/metadata.xml b/dev-ros/tf2/metadata.xml
index 51f204d..0b847ee 100644
--- a/dev-ros/tf2/metadata.xml
+++ b/dev-ros/tf2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/tf2_bullet/metadata.xml b/dev-ros/tf2_bullet/metadata.xml
index 51f204d..0b847ee 100644
--- a/dev-ros/tf2_bullet/metadata.xml
+++ b/dev-ros/tf2_bullet/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/tf2_geometry_msgs/metadata.xml b/dev-ros/tf2_geometry_msgs/metadata.xml
index 51f204d..0b847ee 100644
--- a/dev-ros/tf2_geometry_msgs/metadata.xml
+++ b/dev-ros/tf2_geometry_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/tf2_kdl/metadata.xml b/dev-ros/tf2_kdl/metadata.xml
index 51f204d..0b847ee 100644
--- a/dev-ros/tf2_kdl/metadata.xml
+++ b/dev-ros/tf2_kdl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/tf2_msgs/metadata.xml b/dev-ros/tf2_msgs/metadata.xml
index 51f204d..0b847ee 100644
--- a/dev-ros/tf2_msgs/metadata.xml
+++ b/dev-ros/tf2_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/tf2_py/metadata.xml b/dev-ros/tf2_py/metadata.xml
index 51f204d..0b847ee 100644
--- a/dev-ros/tf2_py/metadata.xml
+++ b/dev-ros/tf2_py/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/tf2_ros/metadata.xml b/dev-ros/tf2_ros/metadata.xml
index 51f204d..0b847ee 100644
--- a/dev-ros/tf2_ros/metadata.xml
+++ b/dev-ros/tf2_ros/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/tf2_sensor_msgs/metadata.xml b/dev-ros/tf2_sensor_msgs/metadata.xml
index 51f204d..0b847ee 100644
--- a/dev-ros/tf2_sensor_msgs/metadata.xml
+++ b/dev-ros/tf2_sensor_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/tf2_tools/metadata.xml b/dev-ros/tf2_tools/metadata.xml
index 51f204d..0b847ee 100644
--- a/dev-ros/tf2_tools/metadata.xml
+++ b/dev-ros/tf2_tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/tf_conversions/metadata.xml b/dev-ros/tf_conversions/metadata.xml
index 2d8e130..85acac4 100644
--- a/dev-ros/tf_conversions/metadata.xml
+++ b/dev-ros/tf_conversions/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/theora_image_transport/metadata.xml b/dev-ros/theora_image_transport/metadata.xml
index 97c7091..1d01ac4 100644
--- a/dev-ros/theora_image_transport/metadata.xml
+++ b/dev-ros/theora_image_transport/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/timestamp_tools/metadata.xml b/dev-ros/timestamp_tools/metadata.xml
index 9e7fdee..8b58827 100644
--- a/dev-ros/timestamp_tools/metadata.xml
+++ b/dev-ros/timestamp_tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/topic_tools/metadata.xml b/dev-ros/topic_tools/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/topic_tools/metadata.xml
+++ b/dev-ros/topic_tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/trajectory_msgs/metadata.xml b/dev-ros/trajectory_msgs/metadata.xml
index 2d3b5cc..7c144cf 100644
--- a/dev-ros/trajectory_msgs/metadata.xml
+++ b/dev-ros/trajectory_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/transmission_interface/metadata.xml b/dev-ros/transmission_interface/metadata.xml
index 2b50e8a..f4a590e 100644
--- a/dev-ros/transmission_interface/metadata.xml
+++ b/dev-ros/transmission_interface/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/turtle_actionlib/metadata.xml b/dev-ros/turtle_actionlib/metadata.xml
index 38abe1f..9263625 100644
--- a/dev-ros/turtle_actionlib/metadata.xml
+++ b/dev-ros/turtle_actionlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/turtle_tf/metadata.xml b/dev-ros/turtle_tf/metadata.xml
index c02c459..00483fc 100644
--- a/dev-ros/turtle_tf/metadata.xml
+++ b/dev-ros/turtle_tf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/turtle_tf2/metadata.xml b/dev-ros/turtle_tf2/metadata.xml
index c02c459..00483fc 100644
--- a/dev-ros/turtle_tf2/metadata.xml
+++ b/dev-ros/turtle_tf2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/turtlesim/metadata.xml b/dev-ros/turtlesim/metadata.xml
index 1360d75..53c74b5 100644
--- a/dev-ros/turtlesim/metadata.xml
+++ b/dev-ros/turtlesim/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/unique_id/metadata.xml b/dev-ros/unique_id/metadata.xml
index b274068..709a6b5 100644
--- a/dev-ros/unique_id/metadata.xml
+++ b/dev-ros/unique_id/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/urdf/metadata.xml b/dev-ros/urdf/metadata.xml
index b2ab0e6..0724a71 100644
--- a/dev-ros/urdf/metadata.xml
+++ b/dev-ros/urdf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/urdf_parser_plugin/metadata.xml b/dev-ros/urdf_parser_plugin/metadata.xml
index b2ab0e6..0724a71 100644
--- a/dev-ros/urdf_parser_plugin/metadata.xml
+++ b/dev-ros/urdf_parser_plugin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/urdf_tutorial/metadata.xml b/dev-ros/urdf_tutorial/metadata.xml
index 1d606bf..fbefffe 100644
--- a/dev-ros/urdf_tutorial/metadata.xml
+++ b/dev-ros/urdf_tutorial/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/urg_c/metadata.xml b/dev-ros/urg_c/metadata.xml
index b268280..c44c371 100644
--- a/dev-ros/urg_c/metadata.xml
+++ b/dev-ros/urg_c/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/urg_node/metadata.xml b/dev-ros/urg_node/metadata.xml
index 2114d7e..737327a 100644
--- a/dev-ros/urg_node/metadata.xml
+++ b/dev-ros/urg_node/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/uuid_msgs/metadata.xml b/dev-ros/uuid_msgs/metadata.xml
index b274068..709a6b5 100644
--- a/dev-ros/uuid_msgs/metadata.xml
+++ b/dev-ros/uuid_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/visp_auto_tracker/metadata.xml b/dev-ros/visp_auto_tracker/metadata.xml
index f279d19..b1bdd1b 100644
--- a/dev-ros/visp_auto_tracker/metadata.xml
+++ b/dev-ros/visp_auto_tracker/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/visp_bridge/metadata.xml b/dev-ros/visp_bridge/metadata.xml
index f279d19..b1bdd1b 100644
--- a/dev-ros/visp_bridge/metadata.xml
+++ b/dev-ros/visp_bridge/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/visp_camera_calibration/metadata.xml b/dev-ros/visp_camera_calibration/metadata.xml
index f279d19..b1bdd1b 100644
--- a/dev-ros/visp_camera_calibration/metadata.xml
+++ b/dev-ros/visp_camera_calibration/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/visp_hand2eye_calibration/metadata.xml b/dev-ros/visp_hand2eye_calibration/metadata.xml
index f279d19..b1bdd1b 100644
--- a/dev-ros/visp_hand2eye_calibration/metadata.xml
+++ b/dev-ros/visp_hand2eye_calibration/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/visp_tracker/metadata.xml b/dev-ros/visp_tracker/metadata.xml
index f279d19..b1bdd1b 100644
--- a/dev-ros/visp_tracker/metadata.xml
+++ b/dev-ros/visp_tracker/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/visualization_marker_tutorials/metadata.xml b/dev-ros/visualization_marker_tutorials/metadata.xml
index e1ee206..1fb9369 100644
--- a/dev-ros/visualization_marker_tutorials/metadata.xml
+++ b/dev-ros/visualization_marker_tutorials/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/visualization_msgs/metadata.xml b/dev-ros/visualization_msgs/metadata.xml
index 2d3b5cc..7c144cf 100644
--- a/dev-ros/visualization_msgs/metadata.xml
+++ b/dev-ros/visualization_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/voxel_grid/metadata.xml b/dev-ros/voxel_grid/metadata.xml
index 8694432..d7ed477 100644
--- a/dev-ros/voxel_grid/metadata.xml
+++ b/dev-ros/voxel_grid/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/xacro/metadata.xml b/dev-ros/xacro/metadata.xml
index fe41d21..d7b5924 100644
--- a/dev-ros/xacro/metadata.xml
+++ b/dev-ros/xacro/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ros/xmlrpcpp/metadata.xml b/dev-ros/xmlrpcpp/metadata.xml
index bcf2b81..39c5513 100644
--- a/dev-ros/xmlrpcpp/metadata.xml
+++ b/dev-ros/xmlrpcpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/dev-ruby/abstract/metadata.xml b/dev-ruby/abstract/metadata.xml
index 524558a..40e0fa2 100644
--- a/dev-ruby/abstract/metadata.xml
+++ b/dev-ruby/abstract/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/actionpack/metadata.xml b/dev-ruby/actionpack/metadata.xml
index 069495c..73034e5 100644
--- a/dev-ruby/actionpack/metadata.xml
+++ b/dev-ruby/actionpack/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/activerecord/metadata.xml b/dev-ruby/activerecord/metadata.xml
index 069495c..73034e5 100644
--- a/dev-ruby/activerecord/metadata.xml
+++ b/dev-ruby/activerecord/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/activeresource/metadata.xml b/dev-ruby/activeresource/metadata.xml
index 4c1d4a4..b7b7a6a 100644
--- a/dev-ruby/activeresource/metadata.xml
+++ b/dev-ruby/activeresource/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/activesupport/metadata.xml b/dev-ruby/activesupport/metadata.xml
index 069495c..73034e5 100644
--- a/dev-ruby/activesupport/metadata.xml
+++ b/dev-ruby/activesupport/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/addressable/metadata.xml b/dev-ruby/addressable/metadata.xml
index be949fc..23a4fd9 100644
--- a/dev-ruby/addressable/metadata.xml
+++ b/dev-ruby/addressable/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/archive-tar-minitar/metadata.xml b/dev-ruby/archive-tar-minitar/metadata.xml
index 75effc9..601d507 100644
--- a/dev-ruby/archive-tar-minitar/metadata.xml
+++ b/dev-ruby/archive-tar-minitar/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/aws-s3/metadata.xml b/dev-ruby/aws-s3/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/aws-s3/metadata.xml
+++ b/dev-ruby/aws-s3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/blankslate/metadata.xml b/dev-ruby/blankslate/metadata.xml
index 9ad0935..a8f99ac 100644
--- a/dev-ruby/blankslate/metadata.xml
+++ b/dev-ruby/blankslate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/bouncy-castle-java/metadata.xml b/dev-ruby/bouncy-castle-java/metadata.xml
index 604e0a4..7303cef 100644
--- a/dev-ruby/bouncy-castle-java/metadata.xml
+++ b/dev-ruby/bouncy-castle-java/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>java</herd>
 </pkgmetadata>
-

diff --git a/dev-ruby/builder/metadata.xml b/dev-ruby/builder/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/builder/metadata.xml
+++ b/dev-ruby/builder/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/classifier/metadata.xml b/dev-ruby/classifier/metadata.xml
index 0999615..471aa43 100644
--- a/dev-ruby/classifier/metadata.xml
+++ b/dev-ruby/classifier/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/color/metadata.xml b/dev-ruby/color/metadata.xml
index 373f091..57a269e 100644
--- a/dev-ruby/color/metadata.xml
+++ b/dev-ruby/color/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/coolio/metadata.xml b/dev-ruby/coolio/metadata.xml
index fbf4d35..8521361 100644
--- a/dev-ruby/coolio/metadata.xml
+++ b/dev-ruby/coolio/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>ruby</herd>
 </pkgmetadata>
-

diff --git a/dev-ruby/cri/metadata.xml b/dev-ruby/cri/metadata.xml
index c9304d7..a42b2e4 100644
--- a/dev-ruby/cri/metadata.xml
+++ b/dev-ruby/cri/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/curb/metadata.xml b/dev-ruby/curb/metadata.xml
index 7947344..e98a2ca 100644
--- a/dev-ruby/curb/metadata.xml
+++ b/dev-ruby/curb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/dalli/metadata.xml b/dev-ruby/dalli/metadata.xml
index 8f1c665..c7d720a 100644
--- a/dev-ruby/dalli/metadata.xml
+++ b/dev-ruby/dalli/metadata.xml
@@ -6,4 +6,3 @@
     <remote-id type="github">petergoldstein/dalli</remote-id>
   </upstream>
 </pkgmetadata>
-

diff --git a/dev-ruby/delayer-deferred/metadata.xml b/dev-ruby/delayer-deferred/metadata.xml
index 46ded82..88ccded 100644
--- a/dev-ruby/delayer-deferred/metadata.xml
+++ b/dev-ruby/delayer-deferred/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/delayer/metadata.xml b/dev-ruby/delayer/metadata.xml
index cc5a83e..12fdd33 100644
--- a/dev-ruby/delayer/metadata.xml
+++ b/dev-ruby/delayer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/deprecated/metadata.xml b/dev-ruby/deprecated/metadata.xml
index d4c7ea6..94dafa4 100644
--- a/dev-ruby/deprecated/metadata.xml
+++ b/dev-ruby/deprecated/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/diff-lcs/metadata.xml b/dev-ruby/diff-lcs/metadata.xml
index bbd6743..2c88a86 100644
--- a/dev-ruby/diff-lcs/metadata.xml
+++ b/dev-ruby/diff-lcs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/dnsruby/metadata.xml b/dev-ruby/dnsruby/metadata.xml
index 0087805..06e6ac4 100644
--- a/dev-ruby/dnsruby/metadata.xml
+++ b/dev-ruby/dnsruby/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/dust/metadata.xml b/dev-ruby/dust/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/dust/metadata.xml
+++ b/dev-ruby/dust/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/extlib/metadata.xml b/dev-ruby/extlib/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/extlib/metadata.xml
+++ b/dev-ruby/extlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/facter/metadata.xml b/dev-ruby/facter/metadata.xml
index dd12a79..857dff2 100644
--- a/dev-ruby/facter/metadata.xml
+++ b/dev-ruby/facter/metadata.xml
@@ -7,8 +7,8 @@
 	<herd>sysadmin</herd>
 	<herd>ruby</herd>
 	<use>
-		<flag name='dmi'>Use <pkg>sys-apps/dmidecode</pkg> to determine hardware system properties</flag>
-		<flag name='virt'>Use <pkg>app-emulation/virt-what</pkg> for virtual machine detection</flag>
-		<flag name='pciutils'>Use <pkg>sys-apps/pciutils</pkg> to determine hardware system properties</flag>
+		<flag name="dmi">Use <pkg>sys-apps/dmidecode</pkg> to determine hardware system properties</flag>
+		<flag name="virt">Use <pkg>app-emulation/virt-what</pkg> for virtual machine detection</flag>
+		<flag name="pciutils">Use <pkg>sys-apps/pciutils</pkg> to determine hardware system properties</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-ruby/fattr/metadata.xml b/dev-ruby/fattr/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/fattr/metadata.xml
+++ b/dev-ruby/fattr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/gnuplot/metadata.xml b/dev-ruby/gnuplot/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/gnuplot/metadata.xml
+++ b/dev-ruby/gnuplot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/gruff/metadata.xml b/dev-ruby/gruff/metadata.xml
index 7283890..4b85f6d 100644
--- a/dev-ruby/gruff/metadata.xml
+++ b/dev-ruby/gruff/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/highline/metadata.xml b/dev-ruby/highline/metadata.xml
index 2f8d5b7..45266ec 100644
--- a/dev-ruby/highline/metadata.xml
+++ b/dev-ruby/highline/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/hoe-seattlerb/metadata.xml b/dev-ruby/hoe-seattlerb/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/hoe-seattlerb/metadata.xml
+++ b/dev-ruby/hoe-seattlerb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/hoe/metadata.xml b/dev-ruby/hoe/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/hoe/metadata.xml
+++ b/dev-ruby/hoe/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/htmlentities/metadata.xml b/dev-ruby/htmlentities/metadata.xml
index 2e6df8f..b0f408d 100644
--- a/dev-ruby/htmlentities/metadata.xml
+++ b/dev-ruby/htmlentities/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/imagesize/metadata.xml b/dev-ruby/imagesize/metadata.xml
index 4827a9a..81d46ef 100644
--- a/dev-ruby/imagesize/metadata.xml
+++ b/dev-ruby/imagesize/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/instance_storage/metadata.xml b/dev-ruby/instance_storage/metadata.xml
index f0edcdf..873276e 100644
--- a/dev-ruby/instance_storage/metadata.xml
+++ b/dev-ruby/instance_storage/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/jruby-openssl/metadata.xml b/dev-ruby/jruby-openssl/metadata.xml
index ac30777..0214832 100644
--- a/dev-ruby/jruby-openssl/metadata.xml
+++ b/dev-ruby/jruby-openssl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/json/metadata.xml b/dev-ruby/json/metadata.xml
index 59e5723..836873b 100644
--- a/dev-ruby/json/metadata.xml
+++ b/dev-ruby/json/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/kissfft/metadata.xml b/dev-ruby/kissfft/metadata.xml
index 7264cc8..adca29a 100644
--- a/dev-ruby/kissfft/metadata.xml
+++ b/dev-ruby/kissfft/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-ruby/kramdown/metadata.xml b/dev-ruby/kramdown/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/kramdown/metadata.xml
+++ b/dev-ruby/kramdown/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/launchy/metadata.xml b/dev-ruby/launchy/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/launchy/metadata.xml
+++ b/dev-ruby/launchy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/log4r/metadata.xml b/dev-ruby/log4r/metadata.xml
index bd7d558..53e8f48 100644
--- a/dev-ruby/log4r/metadata.xml
+++ b/dev-ruby/log4r/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/logging/metadata.xml b/dev-ruby/logging/metadata.xml
index 4bc9455..1dc56ac 100644
--- a/dev-ruby/logging/metadata.xml
+++ b/dev-ruby/logging/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/maxitest/metadata.xml b/dev-ruby/maxitest/metadata.xml
index b4d509e..61976dd 100644
--- a/dev-ruby/maxitest/metadata.xml
+++ b/dev-ruby/maxitest/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/mecab-ruby/metadata.xml b/dev-ruby/mecab-ruby/metadata.xml
index b66c587..ed7f2d4 100644
--- a/dev-ruby/mecab-ruby/metadata.xml
+++ b/dev-ruby/mecab-ruby/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/dev-ruby/metaid/metadata.xml b/dev-ruby/metaid/metadata.xml
index 2fa4934..cccdef7 100644
--- a/dev-ruby/metaid/metadata.xml
+++ b/dev-ruby/metaid/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/metasploit-payloads/metadata.xml b/dev-ruby/metasploit-payloads/metadata.xml
index 4448ed2..dda959f 100644
--- a/dev-ruby/metasploit-payloads/metadata.xml
+++ b/dev-ruby/metasploit-payloads/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-ruby/mocha/metadata.xml b/dev-ruby/mocha/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/mocha/metadata.xml
+++ b/dev-ruby/mocha/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/msgpack/metadata.xml b/dev-ruby/msgpack/metadata.xml
index a2cd157..0e4a7ec 100644
--- a/dev-ruby/msgpack/metadata.xml
+++ b/dev-ruby/msgpack/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/narray/metadata.xml b/dev-ruby/narray/metadata.xml
index 25d79cd..470930a 100644
--- a/dev-ruby/narray/metadata.xml
+++ b/dev-ruby/narray/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/net-scp/metadata.xml b/dev-ruby/net-scp/metadata.xml
index c4ec636..be5f477 100644
--- a/dev-ruby/net-scp/metadata.xml
+++ b/dev-ruby/net-scp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/net-sftp/metadata.xml b/dev-ruby/net-sftp/metadata.xml
index 2b68926..64690fa 100644
--- a/dev-ruby/net-sftp/metadata.xml
+++ b/dev-ruby/net-sftp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/net-ssh-gateway/metadata.xml b/dev-ruby/net-ssh-gateway/metadata.xml
index 4df31c1..6187ddb 100644
--- a/dev-ruby/net-ssh-gateway/metadata.xml
+++ b/dev-ruby/net-ssh-gateway/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/net-ssh-multi/metadata.xml b/dev-ruby/net-ssh-multi/metadata.xml
index 1a9d505..7c6a3e0 100644
--- a/dev-ruby/net-ssh-multi/metadata.xml
+++ b/dev-ruby/net-ssh-multi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/net-ssh/metadata.xml b/dev-ruby/net-ssh/metadata.xml
index 051e681..b917e62 100644
--- a/dev-ruby/net-ssh/metadata.xml
+++ b/dev-ruby/net-ssh/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/oauth/metadata.xml b/dev-ruby/oauth/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/oauth/metadata.xml
+++ b/dev-ruby/oauth/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/open4/metadata.xml b/dev-ruby/open4/metadata.xml
index 6c1c587..deab394 100644
--- a/dev-ruby/open4/metadata.xml
+++ b/dev-ruby/open4/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/packetfu/metadata.xml b/dev-ruby/packetfu/metadata.xml
index 22d6b66..6e4144f 100644
--- a/dev-ruby/packetfu/metadata.xml
+++ b/dev-ruby/packetfu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/pcaprub/metadata.xml b/dev-ruby/pcaprub/metadata.xml
index 8508c8c..6136d42 100644
--- a/dev-ruby/pcaprub/metadata.xml
+++ b/dev-ruby/pcaprub/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/plist/metadata.xml b/dev-ruby/plist/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/plist/metadata.xml
+++ b/dev-ruby/plist/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/pluggaloid/metadata.xml b/dev-ruby/pluggaloid/metadata.xml
index 46ded82..88ccded 100644
--- a/dev-ruby/pluggaloid/metadata.xml
+++ b/dev-ruby/pluggaloid/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/png/metadata.xml b/dev-ruby/png/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/png/metadata.xml
+++ b/dev-ruby/png/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/podcast/metadata.xml b/dev-ruby/podcast/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/podcast/metadata.xml
+++ b/dev-ruby/podcast/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/polyglot/metadata.xml b/dev-ruby/polyglot/metadata.xml
index e14a9aa..959e1f1 100644
--- a/dev-ruby/polyglot/metadata.xml
+++ b/dev-ruby/polyglot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/priorityqueue/metadata.xml b/dev-ruby/priorityqueue/metadata.xml
index 32aa4ec..4171016 100644
--- a/dev-ruby/priorityqueue/metadata.xml
+++ b/dev-ruby/priorityqueue/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/racc/metadata.xml b/dev-ruby/racc/metadata.xml
index ddf9adf..febc99f 100644
--- a/dev-ruby/racc/metadata.xml
+++ b/dev-ruby/racc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/rack-cache/metadata.xml b/dev-ruby/rack-cache/metadata.xml
index d49eb15..d56fe2a 100644
--- a/dev-ruby/rack-cache/metadata.xml
+++ b/dev-ruby/rack-cache/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/rack/metadata.xml b/dev-ruby/rack/metadata.xml
index d2c4f9b..4cf96e3 100644
--- a/dev-ruby/rack/metadata.xml
+++ b/dev-ruby/rack/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/radius/metadata.xml b/dev-ruby/radius/metadata.xml
index a9cecbe..e400d03 100644
--- a/dev-ruby/radius/metadata.xml
+++ b/dev-ruby/radius/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/rake/metadata.xml b/dev-ruby/rake/metadata.xml
index bac1a67..67d4dd3 100644
--- a/dev-ruby/rake/metadata.xml
+++ b/dev-ruby/rake/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/rb-readline-r7/metadata.xml b/dev-ruby/rb-readline-r7/metadata.xml
index a95c5f0..84b805f 100644
--- a/dev-ruby/rb-readline-r7/metadata.xml
+++ b/dev-ruby/rb-readline-r7/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-ruby/rb-readline/metadata.xml b/dev-ruby/rb-readline/metadata.xml
index 2630a89..ccb4c89 100644
--- a/dev-ruby/rb-readline/metadata.xml
+++ b/dev-ruby/rb-readline/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/rdoc/metadata.xml b/dev-ruby/rdoc/metadata.xml
index d01a316..cf6c25d 100644
--- a/dev-ruby/rdoc/metadata.xml
+++ b/dev-ruby/rdoc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/rev/metadata.xml b/dev-ruby/rev/metadata.xml
index 738a582..fa20b28 100644
--- a/dev-ruby/rev/metadata.xml
+++ b/dev-ruby/rev/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/right_http_connection/metadata.xml b/dev-ruby/right_http_connection/metadata.xml
index 207ffe4..59dcc28 100644
--- a/dev-ruby/right_http_connection/metadata.xml
+++ b/dev-ruby/right_http_connection/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/rjb/metadata.xml b/dev-ruby/rjb/metadata.xml
index 1d45f6d..4c49d39 100644
--- a/dev-ruby/rjb/metadata.xml
+++ b/dev-ruby/rjb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/rmagick/metadata.xml b/dev-ruby/rmagick/metadata.xml
index 2a02d2b..55cc31e 100644
--- a/dev-ruby/rmagick/metadata.xml
+++ b/dev-ruby/rmagick/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/robots/metadata.xml b/dev-ruby/robots/metadata.xml
index 05f4d87..48e893e 100644
--- a/dev-ruby/robots/metadata.xml
+++ b/dev-ruby/robots/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-ruby/rrdtool-bindings/metadata.xml b/dev-ruby/rrdtool-bindings/metadata.xml
index 8e9d89e..17640aa 100644
--- a/dev-ruby/rrdtool-bindings/metadata.xml
+++ b/dev-ruby/rrdtool-bindings/metadata.xml
@@ -4,6 +4,6 @@
   <herd>ruby</herd>
   <herd>netmon</herd>
 <use>
-<flag name='graph'>Enable support for graphing functions</flag>
+<flag name="graph">Enable support for graphing functions</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-ruby/rspec-core/metadata.xml b/dev-ruby/rspec-core/metadata.xml
index 9a6e369..c749bc2 100644
--- a/dev-ruby/rspec-core/metadata.xml
+++ b/dev-ruby/rspec-core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/rspec-expectations/metadata.xml b/dev-ruby/rspec-expectations/metadata.xml
index 5f0e700..af071c4 100644
--- a/dev-ruby/rspec-expectations/metadata.xml
+++ b/dev-ruby/rspec-expectations/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/rspec-mocks/metadata.xml b/dev-ruby/rspec-mocks/metadata.xml
index 38e759d..86132d1 100644
--- a/dev-ruby/rspec-mocks/metadata.xml
+++ b/dev-ruby/rspec-mocks/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/rspec/metadata.xml b/dev-ruby/rspec/metadata.xml
index f420278..c71df7c 100644
--- a/dev-ruby/rspec/metadata.xml
+++ b/dev-ruby/rspec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/ruby-atk/metadata.xml b/dev-ruby/ruby-atk/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-atk/metadata.xml
+++ b/dev-ruby/ruby-atk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-augeas/metadata.xml b/dev-ruby/ruby-augeas/metadata.xml
index 58d38b7..5551b5a 100644
--- a/dev-ruby/ruby-augeas/metadata.xml
+++ b/dev-ruby/ruby-augeas/metadata.xml
@@ -9,4 +9,3 @@
 ruby-augeas is a set of Ruby bindings around augeas.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-ruby/ruby-cairo-gobject/metadata.xml b/dev-ruby/ruby-cairo-gobject/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-cairo-gobject/metadata.xml
+++ b/dev-ruby/ruby-cairo-gobject/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-clutter-gstreamer/metadata.xml b/dev-ruby/ruby-clutter-gstreamer/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-clutter-gstreamer/metadata.xml
+++ b/dev-ruby/ruby-clutter-gstreamer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-clutter-gtk/metadata.xml b/dev-ruby/ruby-clutter-gtk/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-clutter-gtk/metadata.xml
+++ b/dev-ruby/ruby-clutter-gtk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-clutter/metadata.xml b/dev-ruby/ruby-clutter/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-clutter/metadata.xml
+++ b/dev-ruby/ruby-clutter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-elf/metadata.xml b/dev-ruby/ruby-elf/metadata.xml
index ea071df..33cb1c9 100644
--- a/dev-ruby/ruby-elf/metadata.xml
+++ b/dev-ruby/ruby-elf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-ruby/ruby-filemagic/metadata.xml b/dev-ruby/ruby-filemagic/metadata.xml
index fbb8276..2dfbc2e 100644
--- a/dev-ruby/ruby-filemagic/metadata.xml
+++ b/dev-ruby/ruby-filemagic/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-gdk3/metadata.xml b/dev-ruby/ruby-gdk3/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-gdk3/metadata.xml
+++ b/dev-ruby/ruby-gdk3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-gdkpixbuf2/metadata.xml b/dev-ruby/ruby-gdkpixbuf2/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-gdkpixbuf2/metadata.xml
+++ b/dev-ruby/ruby-gdkpixbuf2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-gio2/metadata.xml b/dev-ruby/ruby-gio2/metadata.xml
index 1fba4d7..639c32b 100644
--- a/dev-ruby/ruby-gio2/metadata.xml
+++ b/dev-ruby/ruby-gio2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/ruby-glib2/metadata.xml b/dev-ruby/ruby-glib2/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-glib2/metadata.xml
+++ b/dev-ruby/ruby-glib2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-gnome2/metadata.xml b/dev-ruby/ruby-gnome2/metadata.xml
index 988f164..73c5801 100644
--- a/dev-ruby/ruby-gnome2/metadata.xml
+++ b/dev-ruby/ruby-gnome2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-gobject-introspection/metadata.xml b/dev-ruby/ruby-gobject-introspection/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-gobject-introspection/metadata.xml
+++ b/dev-ruby/ruby-gobject-introspection/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-gstreamer/metadata.xml b/dev-ruby/ruby-gstreamer/metadata.xml
index c0e279a..5af6804 100644
--- a/dev-ruby/ruby-gstreamer/metadata.xml
+++ b/dev-ruby/ruby-gstreamer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-gtk2/metadata.xml b/dev-ruby/ruby-gtk2/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-gtk2/metadata.xml
+++ b/dev-ruby/ruby-gtk2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-gtk3/metadata.xml b/dev-ruby/ruby-gtk3/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-gtk3/metadata.xml
+++ b/dev-ruby/ruby-gtk3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-gtksourceview/metadata.xml b/dev-ruby/ruby-gtksourceview/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-gtksourceview/metadata.xml
+++ b/dev-ruby/ruby-gtksourceview/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-gtksourceview3/metadata.xml b/dev-ruby/ruby-gtksourceview3/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-gtksourceview3/metadata.xml
+++ b/dev-ruby/ruby-gtksourceview3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-hmac/metadata.xml b/dev-ruby/ruby-hmac/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/ruby-hmac/metadata.xml
+++ b/dev-ruby/ruby-hmac/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-ldap/metadata.xml b/dev-ruby/ruby-ldap/metadata.xml
index bf840c3..f289c1f 100644
--- a/dev-ruby/ruby-ldap/metadata.xml
+++ b/dev-ruby/ruby-ldap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-mp3info/metadata.xml b/dev-ruby/ruby-mp3info/metadata.xml
index fd993e7..c924140 100644
--- a/dev-ruby/ruby-mp3info/metadata.xml
+++ b/dev-ruby/ruby-mp3info/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/ruby-oci8/metadata.xml b/dev-ruby/ruby-oci8/metadata.xml
index cace519..707e094 100644
--- a/dev-ruby/ruby-oci8/metadata.xml
+++ b/dev-ruby/ruby-oci8/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-opengl/metadata.xml b/dev-ruby/ruby-opengl/metadata.xml
index bbd5d2d..5939ade 100644
--- a/dev-ruby/ruby-opengl/metadata.xml
+++ b/dev-ruby/ruby-opengl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/ruby-openid/metadata.xml b/dev-ruby/ruby-openid/metadata.xml
index dc0e5b7..316cfe2 100644
--- a/dev-ruby/ruby-openid/metadata.xml
+++ b/dev-ruby/ruby-openid/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/ruby-pango/metadata.xml b/dev-ruby/ruby-pango/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-pango/metadata.xml
+++ b/dev-ruby/ruby-pango/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-poppler/metadata.xml b/dev-ruby/ruby-poppler/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-poppler/metadata.xml
+++ b/dev-ruby/ruby-poppler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-rsvg/metadata.xml b/dev-ruby/ruby-rsvg/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-rsvg/metadata.xml
+++ b/dev-ruby/ruby-rsvg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-vte/metadata.xml b/dev-ruby/ruby-vte/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-vte/metadata.xml
+++ b/dev-ruby/ruby-vte/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-vte3/metadata.xml b/dev-ruby/ruby-vte3/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-vte3/metadata.xml
+++ b/dev-ruby/ruby-vte3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-webkit-gtk/metadata.xml b/dev-ruby/ruby-webkit-gtk/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-webkit-gtk/metadata.xml
+++ b/dev-ruby/ruby-webkit-gtk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-webkit-gtk2/metadata.xml b/dev-ruby/ruby-webkit-gtk2/metadata.xml
index cb6c355..a69152a 100644
--- a/dev-ruby/ruby-webkit-gtk2/metadata.xml
+++ b/dev-ruby/ruby-webkit-gtk2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby-yadis/metadata.xml b/dev-ruby/ruby-yadis/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/ruby-yadis/metadata.xml
+++ b/dev-ruby/ruby-yadis/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/ruby2ruby/metadata.xml b/dev-ruby/ruby2ruby/metadata.xml
index d82e96c..770eb61 100644
--- a/dev-ruby/ruby2ruby/metadata.xml
+++ b/dev-ruby/ruby2ruby/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/rubygems/metadata.xml b/dev-ruby/rubygems/metadata.xml
index bc82c8b..32afaf2 100644
--- a/dev-ruby/rubygems/metadata.xml
+++ b/dev-ruby/rubygems/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/rubyntlm/metadata.xml b/dev-ruby/rubyntlm/metadata.xml
index eca8c98..5c79fae 100644
--- a/dev-ruby/rubyntlm/metadata.xml
+++ b/dev-ruby/rubyntlm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-ruby/sdoc/metadata.xml b/dev-ruby/sdoc/metadata.xml
index e580e9f..3ad35ad 100644
--- a/dev-ruby/sdoc/metadata.xml
+++ b/dev-ruby/sdoc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/serialport/metadata.xml b/dev-ruby/serialport/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/serialport/metadata.xml
+++ b/dev-ruby/serialport/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/shorturl/metadata.xml b/dev-ruby/shorturl/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/shorturl/metadata.xml
+++ b/dev-ruby/shorturl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/simple-rss/metadata.xml b/dev-ruby/simple-rss/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/simple-rss/metadata.xml
+++ b/dev-ruby/simple-rss/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/snmplib/metadata.xml b/dev-ruby/snmplib/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/snmplib/metadata.xml
+++ b/dev-ruby/snmplib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/sparklines/metadata.xml b/dev-ruby/sparklines/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/sparklines/metadata.xml
+++ b/dev-ruby/sparklines/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/spreadsheet/metadata.xml b/dev-ruby/spreadsheet/metadata.xml
index ef07a62..142e8c4 100644
--- a/dev-ruby/spreadsheet/metadata.xml
+++ b/dev-ruby/spreadsheet/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/sqlite3/metadata.xml b/dev-ruby/sqlite3/metadata.xml
index 0b4c472..144e8d4 100644
--- a/dev-ruby/sqlite3/metadata.xml
+++ b/dev-ruby/sqlite3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/syntax/metadata.xml b/dev-ruby/syntax/metadata.xml
index 689bf30..fc8cde9 100644
--- a/dev-ruby/syntax/metadata.xml
+++ b/dev-ruby/syntax/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/term-ansicolor/metadata.xml b/dev-ruby/term-ansicolor/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/term-ansicolor/metadata.xml
+++ b/dev-ruby/term-ansicolor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/termcolor/metadata.xml b/dev-ruby/termcolor/metadata.xml
index 321af5d..95391f6 100644
--- a/dev-ruby/termcolor/metadata.xml
+++ b/dev-ruby/termcolor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/test-unit-rr/metadata.xml b/dev-ruby/test-unit-rr/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/test-unit-rr/metadata.xml
+++ b/dev-ruby/test-unit-rr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/test-unit/metadata.xml b/dev-ruby/test-unit/metadata.xml
index 82492cf..8b31a51 100644
--- a/dev-ruby/test-unit/metadata.xml
+++ b/dev-ruby/test-unit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/text-hyphen/metadata.xml b/dev-ruby/text-hyphen/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/text-hyphen/metadata.xml
+++ b/dev-ruby/text-hyphen/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/textpow/metadata.xml b/dev-ruby/textpow/metadata.xml
index fb4d26d..61358cb 100644
--- a/dev-ruby/textpow/metadata.xml
+++ b/dev-ruby/textpow/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/totoridipjp/metadata.xml b/dev-ruby/totoridipjp/metadata.xml
index 46ded82..88ccded 100644
--- a/dev-ruby/totoridipjp/metadata.xml
+++ b/dev-ruby/totoridipjp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/treetop/metadata.xml b/dev-ruby/treetop/metadata.xml
index c236da7..b0254be 100644
--- a/dev-ruby/treetop/metadata.xml
+++ b/dev-ruby/treetop/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/trollop/metadata.xml b/dev-ruby/trollop/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/trollop/metadata.xml
+++ b/dev-ruby/trollop/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/typhoeus/metadata.xml b/dev-ruby/typhoeus/metadata.xml
index 2ba565f..0c5734b 100644
--- a/dev-ruby/typhoeus/metadata.xml
+++ b/dev-ruby/typhoeus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/tzinfo/metadata.xml b/dev-ruby/tzinfo/metadata.xml
index 9d6e8da..0040b11 100644
--- a/dev-ruby/tzinfo/metadata.xml
+++ b/dev-ruby/tzinfo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/unf_ext/metadata.xml b/dev-ruby/unf_ext/metadata.xml
index 97b3cd9..114ddee 100644
--- a/dev-ruby/unf_ext/metadata.xml
+++ b/dev-ruby/unf_ext/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-ruby/uuidtools/metadata.xml b/dev-ruby/uuidtools/metadata.xml
index 0dca07e..04a0d7c 100644
--- a/dev-ruby/uuidtools/metadata.xml
+++ b/dev-ruby/uuidtools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>ruby</herd>

diff --git a/dev-ruby/webrobots/metadata.xml b/dev-ruby/webrobots/metadata.xml
index d5cba8f..2866557 100644
--- a/dev-ruby/webrobots/metadata.xml
+++ b/dev-ruby/webrobots/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ruby</herd>

diff --git a/dev-scheme/ikarus/metadata.xml b/dev-scheme/ikarus/metadata.xml
index 09e0bb5..de82f61 100644
--- a/dev-scheme/ikarus/metadata.xml
+++ b/dev-scheme/ikarus/metadata.xml
@@ -12,4 +12,3 @@
 		Scheme.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-scheme/kawa/metadata.xml b/dev-scheme/kawa/metadata.xml
index a427d8e..fb3f43f 100644
--- a/dev-scheme/kawa/metadata.xml
+++ b/dev-scheme/kawa/metadata.xml
@@ -10,18 +10,18 @@
   compiled code runs at reasonable speed.
 </longdescription>
 <use>
-  <flag name='awt'>Assume AWT is available</flag>
-  <flag name='echo2'>Enable support for the Echo2 web toolkit with
+  <flag name="awt">Assume AWT is available</flag>
+  <flag name="echo2">Enable support for the Echo2 web toolkit with
     <pkg>dev-java/echo2</pkg></flag>
-  <flag name='frontend'>Build "kawa" front-end program using
+  <flag name="frontend">Build "kawa" front-end program using
     <pkg>sys-libs/readline</pkg></flag> 
-  <flag name='jemacs'>Build JEmacs</flag>
-  <flag name='krl'>Build BRL emulation and KRL</flag>
-  <flag name='sax'>Assume SAX2 is available with <pkg>dev-java/sax</pkg></flag>
-  <flag name='servlets'>Build support for generating servlets with
+  <flag name="jemacs">Build JEmacs</flag>
+  <flag name="krl">Build BRL emulation and KRL</flag>
+  <flag name="sax">Assume SAX2 is available with <pkg>dev-java/sax</pkg></flag>
+  <flag name="servlets">Build support for generating servlets with
     <pkg>dev-java/servletapi</pkg></flag>
-  <flag name='swing'>Assume Swing is available</flag>
-  <flag name='swt'>Assume SWT is available with <pkg>dev-java/swt</pkg></flag>
-  <flag name='xqtests'>Support XQuery Test Suite</flag>
+  <flag name="swing">Assume Swing is available</flag>
+  <flag name="swt">Assume SWT is available with <pkg>dev-java/swt</pkg></flag>
+  <flag name="xqtests">Support XQuery Test Suite</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-scheme/racket/metadata.xml b/dev-scheme/racket/metadata.xml
index 5fbf28b..ebd9fa1 100644
--- a/dev-scheme/racket/metadata.xml
+++ b/dev-scheme/racket/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
   <herd>scheme</herd>
   <longdescription lang="en">
@@ -14,19 +13,19 @@ Extend Racket whenever you need to. Mold it to better suit your tasks without sa
 Whether you're just starting out, want to know more about programming language applications or models, looking to expand your horizons, or ready to dive into research, Racket can help you become a better programmer and system builder.
   </longdescription>
   <use>
-    <flag name='backtrace'> 
+    <flag name="backtrace"> 
       Support GC backtrace dumps
     </flag>
-    <flag name='futures'> 
+    <flag name="futures"> 
       Enable racket/future library for fine-grained hardware parallelism
     </flag>
-    <flag name='places'> 
+    <flag name="places"> 
       Enable racket/place library for share-nothing parallelism and message-passing communication. Compared to futures, places are heavyweight, but they have a simpler performance model.
     </flag>
-    <flag name='plot'> 
+    <flag name="plot"> 
       Enable plot libraries
     </flag>
-    <flag name='threads'> 
+    <flag name="threads"> 
       Enable support for green threads 
     </flag>
   </use>

diff --git a/dev-scheme/scheme48/metadata.xml b/dev-scheme/scheme48/metadata.xml
index 150a738..9ec55af 100644
--- a/dev-scheme/scheme48/metadata.xml
+++ b/dev-scheme/scheme48/metadata.xml
@@ -8,4 +8,3 @@ Rees. It is based on a byte-code interpreter and is designed to be used as a
 testbed for experiments in implementation techniques and as an expository tool.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-scheme/scm/metadata.xml b/dev-scheme/scm/metadata.xml
index c9ae03b..49da7a7 100644
--- a/dev-scheme/scm/metadata.xml
+++ b/dev-scheme/scm/metadata.xml
@@ -6,26 +6,26 @@
 SCM is a  Scheme implementation conforming to  Revised5 Report on the Algorithmic Language Scheme and the IEEE P1178 specification.
 	</longdescription>
 	<use>
-		<flag name='arrays'>Support for  arrays, uniform-arrays and
+		<flag name="arrays">Support for  arrays, uniform-arrays and
 			uniform-vectors.</flag>
-		<flag name='bignums'>Support for large precision integers.</flag>
-		<flag name='cautious'>SCM will always check the number of arguments to
+		<flag name="bignums">Support for large precision integers.</flag>
+		<flag name="cautious">SCM will always check the number of arguments to
 			interpreted closures.</flag>
-		<flag name='dynamic-linking'>Be able to load compiled files while
+		<flag name="dynamic-linking">Be able to load compiled files while
 			running.</flag>
-		<flag name='engineering-notation'>Floats to display in engineering
+		<flag name="engineering-notation">Floats to display in engineering
 			notation (exponents always multiples of 3) instead of scientific
 			notation.</flag>
-		<flag name='gsubr'>generalized c arguments: for arbitrary 
+		<flag name="gsubr">generalized c arguments: for arbitrary 
 			(more then 11) arguments to C functions.</flag>
-		<flag name='inexact'>Support for floating point numbers.</flag>
-		<flag name='ioext'>Commonly available I/O extensions: line I/O, file
+		<flag name="inexact">Support for floating point numbers.</flag>
+		<flag name="ioext">Commonly available I/O extensions: line I/O, file
 			positioning, file delete and rename, and directory functions.</flag>
-		<flag name='libscm'>Build and install libscm.a and related headers</flag>
-		<flag name='macro'>C level support for hygienic and referentially 
+		<flag name="libscm">Build and install libscm.a and related headers</flag>
+		<flag name="macro">C level support for hygienic and referentially 
 			transparent macros (syntax-rules macros).</flag>
-		<flag name='regex'>String regular expression matching.</flag>
-		<flag name='unix'>Support for: nice, acct, lstat, readlink, symlink,
+		<flag name="regex">String regular expression matching.</flag>
+		<flag name="unix">Support for: nice, acct, lstat, readlink, symlink,
 			mknod and sync.</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-tcltk/anigif/metadata.xml b/dev-tcltk/anigif/metadata.xml
index 895107e..2beba77 100644
--- a/dev-tcltk/anigif/metadata.xml
+++ b/dev-tcltk/anigif/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <upstream>

diff --git a/dev-tcltk/blt/metadata.xml b/dev-tcltk/blt/metadata.xml
index 8285e54..6678747 100644
--- a/dev-tcltk/blt/metadata.xml
+++ b/dev-tcltk/blt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>tcltk</herd>

diff --git a/dev-tcltk/tkXwin/metadata.xml b/dev-tcltk/tkXwin/metadata.xml
index 145f106..5800d34 100644
--- a/dev-tcltk/tkXwin/metadata.xml
+++ b/dev-tcltk/tkXwin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>tcltk</herd>

diff --git a/dev-tex/dot2texi/metadata.xml b/dev-tex/dot2texi/metadata.xml
index 8ac42f0..02a2866 100644
--- a/dev-tex/dot2texi/metadata.xml
+++ b/dev-tex/dot2texi/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>tex</herd>
 <use>
-  <flag name='pgf'>Enable support for <pkg>dev-tex/pgf</pkg> (The TeX Portable
+  <flag name="pgf">Enable support for <pkg>dev-tex/pgf</pkg> (The TeX Portable
     Graphic Format)</flag>
-  <flag name='pstricks'>Enable pstricks support</flag>
+  <flag name="pstricks">Enable pstricks support</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-tex/dvi2gr/metadata.xml b/dev-tex/dvi2gr/metadata.xml
index 3ff1f0c..39289e8 100644
--- a/dev-tex/dvi2gr/metadata.xml
+++ b/dev-tex/dvi2gr/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   dvi2gr is a small utility to translate a TeX file (DVI) into a string
   recognized by the Grace plotting tool.
 </longdescription>

diff --git a/dev-tex/glossaries/metadata.xml b/dev-tex/glossaries/metadata.xml
index 0ae9672..21ff3a5 100644
--- a/dev-tex/glossaries/metadata.xml
+++ b/dev-tex/glossaries/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>tex</herd>
 </pkgmetadata>
-

diff --git a/dev-tex/rail/metadata.xml b/dev-tex/rail/metadata.xml
index 73ea9d0..b923cfa 100644
--- a/dev-tex/rail/metadata.xml
+++ b/dev-tex/rail/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>tex</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 A C program and LaTeX package to draw syntax diagrams specified in EBNF.
 </longdescription>
 </pkgmetadata>

diff --git a/dev-tex/rubber/metadata.xml b/dev-tex/rubber/metadata.xml
index fdb2383..1939ab7 100644
--- a/dev-tex/rubber/metadata.xml
+++ b/dev-tex/rubber/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>tex</herd>

diff --git a/dev-util/abi-compliance-checker/metadata.xml b/dev-util/abi-compliance-checker/metadata.xml
index 7e74674..ebccf8c 100644
--- a/dev-util/abi-compliance-checker/metadata.xml
+++ b/dev-util/abi-compliance-checker/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-util/alleyoop/metadata.xml b/dev-util/alleyoop/metadata.xml
index 9dfbfeb..bff4db9 100644
--- a/dev-util/alleyoop/metadata.xml
+++ b/dev-util/alleyoop/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/dev-util/appinventor/metadata.xml b/dev-util/appinventor/metadata.xml
index b57d368..6a67278 100644
--- a/dev-util/appinventor/metadata.xml
+++ b/dev-util/appinventor/metadata.xml
@@ -15,4 +15,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml
index 7f47f7b..e188f33 100644
--- a/dev-util/bitcoin-tx/metadata.xml
+++ b/dev-util/bitcoin-tx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/dev-util/cgdb/metadata.xml b/dev-util/cgdb/metadata.xml
index 9dcc257..cb772e5 100644
--- a/dev-util/cgdb/metadata.xml
+++ b/dev-util/cgdb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>dev-tools</herd>

diff --git a/dev-util/checkstyle/metadata.xml b/dev-util/checkstyle/metadata.xml
index 8992a19..0a63c3f 100644
--- a/dev-util/checkstyle/metadata.xml
+++ b/dev-util/checkstyle/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/dev-util/cligh/metadata.xml b/dev-util/cligh/metadata.xml
index 6440345..eb0517a 100644
--- a/dev-util/cligh/metadata.xml
+++ b/dev-util/cligh/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-util/codeblocks/metadata.xml b/dev-util/codeblocks/metadata.xml
index af0cdfe..0f3a706 100644
--- a/dev-util/codeblocks/metadata.xml
+++ b/dev-util/codeblocks/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>wxwidgets</herd>

diff --git a/dev-util/complexity/metadata.xml b/dev-util/complexity/metadata.xml
index 704d8f9..ef0483f 100644
--- a/dev-util/complexity/metadata.xml
+++ b/dev-util/complexity/metadata.xml
@@ -6,4 +6,3 @@
 <name>Jeroen Roovers</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-util/confix-wrapper/metadata.xml b/dev-util/confix-wrapper/metadata.xml
index a21ff66..a866b9c 100644
--- a/dev-util/confix-wrapper/metadata.xml
+++ b/dev-util/confix-wrapper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-util/confix/metadata.xml b/dev-util/confix/metadata.xml
index a21ff66..a866b9c 100644
--- a/dev-util/confix/metadata.xml
+++ b/dev-util/confix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-util/crash/metadata.xml b/dev-util/crash/metadata.xml
index 1bbfd3c..d76a32f 100644
--- a/dev-util/crash/metadata.xml
+++ b/dev-util/crash/metadata.xml
@@ -13,4 +13,3 @@
 		utility with the source code level debugging capabilities of gdb. 
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-util/csup/metadata.xml b/dev-util/csup/metadata.xml
index 6457f0d..ecedda4 100644
--- a/dev-util/csup/metadata.xml
+++ b/dev-util/csup/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>bsd</herd>
 </pkgmetadata>
-

diff --git a/dev-util/ctags/metadata.xml b/dev-util/ctags/metadata.xml
index 6ea9db6..4306b79 100644
--- a/dev-util/ctags/metadata.xml
+++ b/dev-util/ctags/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>vim</herd>

diff --git a/dev-util/cwdiff/metadata.xml b/dev-util/cwdiff/metadata.xml
index ee07c16..2948ad1 100644
--- a/dev-util/cwdiff/metadata.xml
+++ b/dev-util/cwdiff/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='a2ps'>install <pkg>app-text/a2ps</pkg> for postscript output</flag>
-		<flag name='mercurial'>install hg wdiff alias for <pkg>dev-vcs/mercurial</pkg></flag>
+		<flag name="a2ps">install <pkg>app-text/a2ps</pkg> for postscript output</flag>
+		<flag name="mercurial">install hg wdiff alias for <pkg>dev-vcs/mercurial</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">junghans/cwdiff</remote-id>

diff --git a/dev-util/exmap/metadata.xml b/dev-util/exmap/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/dev-util/exmap/metadata.xml
+++ b/dev-util/exmap/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-util/ftjam/metadata.xml b/dev-util/ftjam/metadata.xml
index 15aead7..12b33e7 100644
--- a/dev-util/ftjam/metadata.xml
+++ b/dev-util/ftjam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-util/geany-plugins/metadata.xml b/dev-util/geany-plugins/metadata.xml
index afa89be..628a1ab 100644
--- a/dev-util/geany-plugins/metadata.xml
+++ b/dev-util/geany-plugins/metadata.xml
@@ -6,21 +6,21 @@
     <name>Nathan Phillip Brink</name>
   </maintainer>
   <use>
-    <flag name='autoclose'>Enable the autoclose plugin.</flag>
-    <flag name='automark'>Enable the automark plugin</flag>
-    <flag name='commander'>Enable the commander plugin which provides a command panel for rapid access to any action.</flag>
-    <flag name='ctags'>Enable ctags plugin</flag>
-    <flag name='debugger'>Enable the debugger plugin which interfaces with <pkg>sys-devel/gdb</pkg></flag>
-    <flag name='defineformat'>Enable the defineformat plugin.</flag>
-    <flag name='devhelp'>Enable the devhelp plugin which integrates <pkg>dev-util/devhelp</pkg></flag>
-    <flag name='enchant'>Enable spell checking using enchant</flag>
-    <flag name='gpg'>Enable geanypg plugin which integrates GPG using <pkg>app-crypt/gpgme</pkg></flag>
-    <flag name='gtkspell'>Use gtkspell for dictionary support</flag>
-    <flag name='markdown'>Enable the markdown plugin which uses <pkg>app-text/discount</pkg> and <pkg>net-libs/webkit-gtk</pkg> to display a realtime preview markdown.</flag>
-    <flag name='multiterm'>Enable the multiterm plugin</flag>
-    <flag name='overview'>Enable overview plugin</flag>
-    <flag name='scope'>Enable the scope plugin which is a graphical GDB front-end</flag>
-    <flag name='soup'>Enable updatechecker and geniuspaste plugins which require <pkg>net-libs/libsoup</pkg></flag>
-    <flag name='webkit'>Enable webhelper plugin which requires <pkg>net-libs/webkit-gtk</pkg></flag>
+    <flag name="autoclose">Enable the autoclose plugin.</flag>
+    <flag name="automark">Enable the automark plugin</flag>
+    <flag name="commander">Enable the commander plugin which provides a command panel for rapid access to any action.</flag>
+    <flag name="ctags">Enable ctags plugin</flag>
+    <flag name="debugger">Enable the debugger plugin which interfaces with <pkg>sys-devel/gdb</pkg></flag>
+    <flag name="defineformat">Enable the defineformat plugin.</flag>
+    <flag name="devhelp">Enable the devhelp plugin which integrates <pkg>dev-util/devhelp</pkg></flag>
+    <flag name="enchant">Enable spell checking using enchant</flag>
+    <flag name="gpg">Enable geanypg plugin which integrates GPG using <pkg>app-crypt/gpgme</pkg></flag>
+    <flag name="gtkspell">Use gtkspell for dictionary support</flag>
+    <flag name="markdown">Enable the markdown plugin which uses <pkg>app-text/discount</pkg> and <pkg>net-libs/webkit-gtk</pkg> to display a realtime preview markdown.</flag>
+    <flag name="multiterm">Enable the multiterm plugin</flag>
+    <flag name="overview">Enable overview plugin</flag>
+    <flag name="scope">Enable the scope plugin which is a graphical GDB front-end</flag>
+    <flag name="soup">Enable updatechecker and geniuspaste plugins which require <pkg>net-libs/libsoup</pkg></flag>
+    <flag name="webkit">Enable webhelper plugin which requires <pkg>net-libs/webkit-gtk</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/dev-util/gtk-update-icon-cache/metadata.xml b/dev-util/gtk-update-icon-cache/metadata.xml
index f93807a..23586bf 100644
--- a/dev-util/gtk-update-icon-cache/metadata.xml
+++ b/dev-util/gtk-update-icon-cache/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>gnome</herd>

diff --git a/dev-util/hxtools/metadata.xml b/dev-util/hxtools/metadata.xml
index 9b23367..6fffb68 100644
--- a/dev-util/hxtools/metadata.xml
+++ b/dev-util/hxtools/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>suse</herd>
 </pkgmetadata>
-

diff --git a/dev-util/intel-ocl-sdk/metadata.xml b/dev-util/intel-ocl-sdk/metadata.xml
index 4064b68..e157675 100644
--- a/dev-util/intel-ocl-sdk/metadata.xml
+++ b/dev-util/intel-ocl-sdk/metadata.xml
@@ -10,11 +10,11 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<use>
-		<flag name='android'>Install android related files</flag>
-		<flag name='tools'>Install Intel Offline Compiler</flag>
-		<flag name='system-boost'>Use system boost (dev-libs/boost) instead of bundled one</flag>
-		<flag name='system-clang'>Use system clang (sys-devel/clang) instead of bundled one</flag>
-		<flag name='system-qt'>Use system Qt (sys-devel-qtcore, sys-devel/qtgui) instead of bundled one</flag>
-		<flag name='system-tbb'>Use sytem Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
+		<flag name="android">Install android related files</flag>
+		<flag name="tools">Install Intel Offline Compiler</flag>
+		<flag name="system-boost">Use system boost (dev-libs/boost) instead of bundled one</flag>
+		<flag name="system-clang">Use system clang (sys-devel/clang) instead of bundled one</flag>
+		<flag name="system-qt">Use system Qt (sys-devel-qtcore, sys-devel/qtgui) instead of bundled one</flag>
+		<flag name="system-tbb">Use sytem Thread Building Blocks (dev-cpp/tbb) instead of bundled one</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-util/lttng-tools/metadata.xml b/dev-util/lttng-tools/metadata.xml
index c177fda..961887d 100644
--- a/dev-util/lttng-tools/metadata.xml
+++ b/dev-util/lttng-tools/metadata.xml
@@ -10,6 +10,6 @@
 		LTTng, the Linux Trace Toolkit Next Generation, is a project that aims at producing a highly efficient full system tracing solution
 	</longdescription>
 	<use>
-		<flag name='ust'>Support LTTng-UST (Userspace Tracing)</flag>
+		<flag name="ust">Support LTTng-UST (Userspace Tracing)</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-util/makeheaders/metadata.xml b/dev-util/makeheaders/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/dev-util/makeheaders/metadata.xml
+++ b/dev-util/makeheaders/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-util/molecule/metadata.xml b/dev-util/molecule/metadata.xml
index 25eddff..7a765c1 100644
--- a/dev-util/molecule/metadata.xml
+++ b/dev-util/molecule/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Fabio Erculiani</name>
 	</maintainer>
 	<use>
-		<flag name='plugins'>Add plugins provided by dev-util/molecule-plugins</flag>
+		<flag name="plugins">Add plugins provided by dev-util/molecule-plugins</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-util/monodevelop/metadata.xml b/dev-util/monodevelop/metadata.xml
index 9314408..14be1b1 100644
--- a/dev-util/monodevelop/metadata.xml
+++ b/dev-util/monodevelop/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
   <herd>dotnet</herd>
   <use>
-	<flag name='git'>Enable Git version control support</flag>
-	<flag name='gnome'>Enable support gnome support (unsetting this flag is unsupported)</flag>
-	<flag name='qtcurve'>Remove qtcurve check (unsupported)</flag>
+	<flag name="git">Enable Git version control support</flag>
+	<flag name="gnome">Enable support gnome support (unsetting this flag is unsupported)</flag>
+	<flag name="qtcurve">Remove qtcurve check (unsupported)</flag>
   </use>
 </pkgmetadata>

diff --git a/dev-util/nemiver/metadata.xml b/dev-util/nemiver/metadata.xml
index aaf2445..10a2f18 100644
--- a/dev-util/nemiver/metadata.xml
+++ b/dev-util/nemiver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
@@ -7,7 +7,7 @@
 	debugger that integrates well in the GNOME environment.
   </longdescription>
   <use>
-	<flag name='memoryview'>Enable the optional hexadecimal memory inspection
+	<flag name="memoryview">Enable the optional hexadecimal memory inspection
 	with <pkg>app-editors/ghex</pkg>.</flag>
   </use>
 </pkgmetadata>

diff --git a/dev-util/osc/metadata.xml b/dev-util/osc/metadata.xml
index 4a239b9..71f533f 100644
--- a/dev-util/osc/metadata.xml
+++ b/dev-util/osc/metadata.xml
@@ -6,4 +6,3 @@
 Subversion-like client for Open Build Service - http://open-build-service.org/ It serves as client for the source code repository part of the build service, and it is used to edit metadata or query about build results.
 </longdescription>
 </pkgmetadata>
-

diff --git a/dev-util/pkgconfig-openbsd/metadata.xml b/dev-util/pkgconfig-openbsd/metadata.xml
index 37d7540..896864e 100644
--- a/dev-util/pkgconfig-openbsd/metadata.xml
+++ b/dev-util/pkgconfig-openbsd/metadata.xml
@@ -6,6 +6,6 @@
     <name>Samuli Suominen</name>
   </maintainer>
   <use>
-    <flag name='pkg-config'>Install as a replacement for <pkg>dev-util/pkgconfig</pkg></flag>
+    <flag name="pkg-config">Install as a replacement for <pkg>dev-util/pkgconfig</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/dev-util/pkgconfig/metadata.xml b/dev-util/pkgconfig/metadata.xml
index 572c23e..1e47ef8 100644
--- a/dev-util/pkgconfig/metadata.xml
+++ b/dev-util/pkgconfig/metadata.xml
@@ -6,6 +6,6 @@
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='internal-glib'>Use internal copy of <pkg>dev-libs/glib</pkg></flag>
+		<flag name="internal-glib">Use internal copy of <pkg>dev-libs/glib</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-util/re2c/metadata.xml b/dev-util/re2c/metadata.xml
index 461ea18..9d22640 100644
--- a/dev-util/re2c/metadata.xml
+++ b/dev-util/re2c/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-util/rej/metadata.xml b/dev-util/rej/metadata.xml
index 704d8f9..ef0483f 100644
--- a/dev-util/rej/metadata.xml
+++ b/dev-util/rej/metadata.xml
@@ -6,4 +6,3 @@
 <name>Jeroen Roovers</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-util/reswrap/metadata.xml b/dev-util/reswrap/metadata.xml
index 5506476..00c1680 100644
--- a/dev-util/reswrap/metadata.xml
+++ b/dev-util/reswrap/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Matti Bickel</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-util/reviewboard/metadata.xml b/dev-util/reviewboard/metadata.xml
index d43f049..a762b06 100644
--- a/dev-util/reviewboard/metadata.xml
+++ b/dev-util/reviewboard/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Ian Delaney</name>
 	</maintainer>
 	<use>
-		<flag name='codebase'>Enables a build of the docs/codebase folder</flag>
-		<flag name='manual'>Enables a build of the docs/manual folder</flag>
-		<flag name='rnotes'>Enables a doc build of the release notes</flag>
+		<flag name="codebase">Enables a build of the docs/codebase folder</flag>
+		<flag name="manual">Enables a build of the docs/manual folder</flag>
+		<flag name="rnotes">Enables a doc build of the release notes</flag>
 	</use>
 </pkgmetadata>

diff --git a/dev-util/rpmdevtools/metadata.xml b/dev-util/rpmdevtools/metadata.xml
index b5a20d8..52d257f 100644
--- a/dev-util/rpmdevtools/metadata.xml
+++ b/dev-util/rpmdevtools/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Stanislav Ochotnicky</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-util/stubgen/metadata.xml b/dev-util/stubgen/metadata.xml
index fb7ec4a..fcc6fe9 100644
--- a/dev-util/stubgen/metadata.xml
+++ b/dev-util/stubgen/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Christoph Mende</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/dev-util/sysdig/metadata.xml b/dev-util/sysdig/metadata.xml
index b924cd9..a05a63d 100644
--- a/dev-util/sysdig/metadata.xml
+++ b/dev-util/sysdig/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-util/txt2regex/metadata.xml b/dev-util/txt2regex/metadata.xml
index 1942ce1..6227bf2 100644
--- a/dev-util/txt2regex/metadata.xml
+++ b/dev-util/txt2regex/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>shell-tools</herd>

diff --git a/dev-util/valkyrie/metadata.xml b/dev-util/valkyrie/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/dev-util/valkyrie/metadata.xml
+++ b/dev-util/valkyrie/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/dev-util/watchr/metadata.xml b/dev-util/watchr/metadata.xml
index 69263d2..3c43de1 100644
--- a/dev-util/watchr/metadata.xml
+++ b/dev-util/watchr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer><email>graaff@gentoo.org</email></maintainer>

diff --git a/dev-util/xdelta/metadata.xml b/dev-util/xdelta/metadata.xml
index 9c72896..50960a3 100644
--- a/dev-util/xdelta/metadata.xml
+++ b/dev-util/xdelta/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/dev-vcs/cssc/metadata.xml b/dev-vcs/cssc/metadata.xml
index ab89925..fd7975d 100644
--- a/dev-vcs/cssc/metadata.xml
+++ b/dev-vcs/cssc/metadata.xml
@@ -5,6 +5,6 @@
 <email>jer@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='valgrind'>Enable usage of <pkg>dev-util/valgrind</pkg> in tests</flag>
+<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in tests</flag>
 </use>
 </pkgmetadata>

diff --git a/dev-vcs/cvsgraph/metadata.xml b/dev-vcs/cvsgraph/metadata.xml
index 1f00c0c..cff4061 100644
--- a/dev-vcs/cvsgraph/metadata.xml
+++ b/dev-vcs/cvsgraph/metadata.xml
@@ -9,4 +9,3 @@
 		stand-alone version of this graph code. So, it was time to write one.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-vcs/giggle/metadata.xml b/dev-vcs/giggle/metadata.xml
index ff68861..1235669 100644
--- a/dev-vcs/giggle/metadata.xml
+++ b/dev-vcs/giggle/metadata.xml
@@ -9,4 +9,3 @@
 		GTK+ based frontend for GIT
 	</longdescription>
 </pkgmetadata>
-

diff --git a/dev-vcs/git-annex/metadata.xml b/dev-vcs/git-annex/metadata.xml
index e7807d6..2e3bb62 100644
--- a/dev-vcs/git-annex/metadata.xml
+++ b/dev-vcs/git-annex/metadata.xml
@@ -30,7 +30,7 @@
 		<flag name="dns">Enable the haskell DNS library for DNS lookup</flag>
 		<flag name="ekg">Enable use of EKG to monitor git-annex as it runs.</flag>
 		<flag name="feed">Enable podcast feed support</flag>
-		<flag name='network-uri'>Get Network.URI from the network-uri package.</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 		<flag name="production">Enable production build (slower build; faster binary)</flag>
 		<flag name="pairing">Enable pairing of git annex repositories</flag>
 		<flag name="quvi">Enable use of quvi to download videos</flag>

diff --git a/dev-vcs/gitolite-gentoo/metadata.xml b/dev-vcs/gitolite-gentoo/metadata.xml
index 7e8ef57..02b4dda 100644
--- a/dev-vcs/gitolite-gentoo/metadata.xml
+++ b/dev-vcs/gitolite-gentoo/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="contrib">Install user-contributed files</flag>
 		<flag name="tools">Install tools to e.g. convert a Gitosis config to
-			gitolite or one to check if your setup is gitolite >= 3.x compatible</flag>
+			gitolite or one to check if your setup is gitolite &gt;= 3.x compatible</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/dev-vcs/gitstats/metadata.xml b/dev-vcs/gitstats/metadata.xml
index b28b460..aa37752 100644
--- a/dev-vcs/gitstats/metadata.xml
+++ b/dev-vcs/gitstats/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>dev-tools</herd>

diff --git a/dev-vcs/mercurial-server/metadata.xml b/dev-vcs/mercurial-server/metadata.xml
index 2180b69..93982a3 100644
--- a/dev-vcs/mercurial-server/metadata.xml
+++ b/dev-vcs/mercurial-server/metadata.xml
@@ -11,4 +11,3 @@
 	provides convenient and fine-grained key management and access control.
   </longdescription>
 </pkgmetadata>
-

diff --git a/dev-vcs/qct/metadata.xml b/dev-vcs/qct/metadata.xml
index 18eeabb..d94b6fd 100644
--- a/dev-vcs/qct/metadata.xml
+++ b/dev-vcs/qct/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>qt</herd>

diff --git a/dev-vcs/qsvn/metadata.xml b/dev-vcs/qsvn/metadata.xml
index c4db622..ab02f99 100644
--- a/dev-vcs/qsvn/metadata.xml
+++ b/dev-vcs/qsvn/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>qt</herd>
 </pkgmetadata>
-

diff --git a/dev-vcs/veracity/metadata.xml b/dev-vcs/veracity/metadata.xml
index 2455d09..5484483 100644
--- a/dev-vcs/veracity/metadata.xml
+++ b/dev-vcs/veracity/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/games-action/awesomenauts/metadata.xml b/games-action/awesomenauts/metadata.xml
index fcab3b2..dbbe0d9 100644
--- a/games-action/awesomenauts/metadata.xml
+++ b/games-action/awesomenauts/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>
+		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
 		</flag>
 	</use>

diff --git a/games-action/beathazardultra/metadata.xml b/games-action/beathazardultra/metadata.xml
index fcab3b2..dbbe0d9 100644
--- a/games-action/beathazardultra/metadata.xml
+++ b/games-action/beathazardultra/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>
+		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
 		</flag>
 	</use>

diff --git a/games-action/hotline-miami/metadata.xml b/games-action/hotline-miami/metadata.xml
index 83ea943..e5a44ea 100644
--- a/games-action/hotline-miami/metadata.xml
+++ b/games-action/hotline-miami/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>Use bundled libraries.</flag>
-		<flag name='launcher'>Install qt launcher</flag>
+		<flag name="bundled-libs">Use bundled libraries.</flag>
+		<flag name="launcher">Install qt launcher</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-action/lugaru/metadata.xml b/games-action/lugaru/metadata.xml
index e1217c9..44fd866 100644
--- a/games-action/lugaru/metadata.xml
+++ b/games-action/lugaru/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-action/nighthawk/metadata.xml b/games-action/nighthawk/metadata.xml
index d24f5c9..8569ac0 100644
--- a/games-action/nighthawk/metadata.xml
+++ b/games-action/nighthawk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-action/openclonk/metadata.xml b/games-action/openclonk/metadata.xml
index c5180b6..b0ce92a 100644
--- a/games-action/openclonk/metadata.xml
+++ b/games-action/openclonk/metadata.xml
@@ -18,4 +18,3 @@
 		important features of Clonk.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/games-action/solar2/metadata.xml b/games-action/solar2/metadata.xml
index d13413d..dbbe0d9 100644
--- a/games-action/solar2/metadata.xml
+++ b/games-action/solar2/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>
+		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
 		</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-action/super-hexagon/metadata.xml b/games-action/super-hexagon/metadata.xml
index d13413d..dbbe0d9 100644
--- a/games-action/super-hexagon/metadata.xml
+++ b/games-action/super-hexagon/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>
+		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
 		</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-action/swordandsworcery/metadata.xml b/games-action/swordandsworcery/metadata.xml
index d13413d..dbbe0d9 100644
--- a/games-action/swordandsworcery/metadata.xml
+++ b/games-action/swordandsworcery/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>
+		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
 		</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-action/teeworlds/metadata.xml b/games-action/teeworlds/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-action/teeworlds/metadata.xml
+++ b/games-action/teeworlds/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-action/trine2/metadata.xml b/games-action/trine2/metadata.xml
index 17a39c8..c87b23f 100644
--- a/games-action/trine2/metadata.xml
+++ b/games-action/trine2/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>Use bundled libraries.</flag>
-		<flag name='launcher'>Install gtk+ launcher</flag>
+		<flag name="bundled-libs">Use bundled libraries.</flag>
+		<flag name="launcher">Install gtk+ launcher</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-action/trosh/metadata.xml b/games-action/trosh/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-action/trosh/metadata.xml
+++ b/games-action/trosh/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-arcade/dynamitejack/metadata.xml b/games-arcade/dynamitejack/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-arcade/dynamitejack/metadata.xml
+++ b/games-arcade/dynamitejack/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-arcade/mari0/metadata.xml b/games-arcade/mari0/metadata.xml
index b3eb6f8..651f435 100644
--- a/games-arcade/mari0/metadata.xml
+++ b/games-arcade/mari0/metadata.xml
@@ -14,4 +14,3 @@
 		having their own Portal gun!
 	</longdescription>
 </pkgmetadata>
-

diff --git a/games-arcade/notpacman/metadata.xml b/games-arcade/notpacman/metadata.xml
index 7b7fcba..27afac7 100644
--- a/games-arcade/notpacman/metadata.xml
+++ b/games-arcade/notpacman/metadata.xml
@@ -10,4 +10,3 @@
 		you very much, so you should be careful to make Pacman avoid them.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/games-arcade/nottetris2/metadata.xml b/games-arcade/nottetris2/metadata.xml
index b16ee40..acdcccf 100644
--- a/games-arcade/nottetris2/metadata.xml
+++ b/games-arcade/nottetris2/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>
-	<longdescription lang='en'>
+	<longdescription lang="en">
 		Not Tetris 2 is the spiritual successor of the classic Tetris
 		mixed with physics. The result is a fun spinoff in which blocks
 		are no longer bound to the usual grid. Blocks can be rotated and

diff --git a/games-arcade/opensonic/metadata.xml b/games-arcade/opensonic/metadata.xml
index ab86d0d..968413f 100644
--- a/games-arcade/opensonic/metadata.xml
+++ b/games-arcade/opensonic/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-arcade/pachi/metadata.xml b/games-arcade/pachi/metadata.xml
index 7f11966..7808305 100644
--- a/games-arcade/pachi/metadata.xml
+++ b/games-arcade/pachi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-arcade/retrobattle/metadata.xml b/games-arcade/retrobattle/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-arcade/retrobattle/metadata.xml
+++ b/games-arcade/retrobattle/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-arcade/supertux/metadata.xml b/games-arcade/supertux/metadata.xml
index d311938..cca95e7 100644
--- a/games-arcade/supertux/metadata.xml
+++ b/games-arcade/supertux/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-board/awale/metadata.xml b/games-board/awale/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-board/awale/metadata.xml
+++ b/games-board/awale/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-board/chessx/metadata.xml b/games-board/chessx/metadata.xml
index 0e27367..8f2ce1e 100644
--- a/games-board/chessx/metadata.xml
+++ b/games-board/chessx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-board/cockatrice/metadata.xml b/games-board/cockatrice/metadata.xml
index 34eddf8..fde850b 100644
--- a/games-board/cockatrice/metadata.xml
+++ b/games-board/cockatrice/metadata.xml
@@ -16,7 +16,7 @@
         <bugs-to>https://github.com/mbruker/Cockatrice/issues</bugs-to>
 	</upstream>
 	<use>
-		<flag name='server'>Compile server support</flag>
+		<flag name="server">Compile server support</flag>
 	</use>
 	<longdescription lang="en">
 		Cockatrice is an open-source multiplatform software for playing card
@@ -26,4 +26,3 @@
 		and server are written in Qt 4.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/games-board/holdingnuts/metadata.xml b/games-board/holdingnuts/metadata.xml
index 5f0ceae..c081b16 100644
--- a/games-board/holdingnuts/metadata.xml
+++ b/games-board/holdingnuts/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>games</herd>

diff --git a/games-board/kcheckers/metadata.xml b/games-board/kcheckers/metadata.xml
index 7391bf2..7fb9d8d 100644
--- a/games-board/kcheckers/metadata.xml
+++ b/games-board/kcheckers/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-board/qgo/metadata.xml b/games-board/qgo/metadata.xml
index 25ef5d7..df42681 100644
--- a/games-board/qgo/metadata.xml
+++ b/games-board/qgo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-board/stockfish/metadata.xml b/games-board/stockfish/metadata.xml
index 1f5c48a..7646e4b 100644
--- a/games-board/stockfish/metadata.xml
+++ b/games-board/stockfish/metadata.xml
@@ -6,9 +6,9 @@
     <name>Ben de Groot</name>
   </maintainer>
   <use>
-    <flag name='armv7'>Build for armv7; enables PIE</flag>
-    <flag name='general-32'>Generic unoptimized 32-bits build</flag>
-    <flag name='general-64'>Generic unoptimized 64-bits build</flag>
-    <flag name='optimize'>Enable upstream -O3 optimizations (default enabled)</flag>
+    <flag name="armv7">Build for armv7; enables PIE</flag>
+    <flag name="general-32">Generic unoptimized 32-bits build</flag>
+    <flag name="general-64">Generic unoptimized 64-bits build</flag>
+    <flag name="optimize">Enable upstream -O3 optimizations (default enabled)</flag>
   </use>
 </pkgmetadata>

diff --git a/games-emulation/dolphin/metadata.xml b/games-emulation/dolphin/metadata.xml
index 2e94d66..81f0ce9 100644
--- a/games-emulation/dolphin/metadata.xml
+++ b/games-emulation/dolphin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<use>

diff --git a/games-emulation/dosbox/metadata.xml b/games-emulation/dosbox/metadata.xml
index c14766f..fb84ca1 100644
--- a/games-emulation/dosbox/metadata.xml
+++ b/games-emulation/dosbox/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-emulation/gambatte/metadata.xml b/games-emulation/gambatte/metadata.xml
index 72dfd59..0d18f25 100644
--- a/games-emulation/gambatte/metadata.xml
+++ b/games-emulation/gambatte/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-emulation/gnuboy/metadata.xml b/games-emulation/gnuboy/metadata.xml
index e8d4012..880ed7d 100644
--- a/games-emulation/gnuboy/metadata.xml
+++ b/games-emulation/gnuboy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-emulation/higan/metadata.xml b/games-emulation/higan/metadata.xml
index a4f1fbe..70d1d1c 100644
--- a/games-emulation/higan/metadata.xml
+++ b/games-emulation/higan/metadata.xml
@@ -3,13 +3,12 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='profile_accuracy'>
+		<flag name="profile_accuracy">
 			Compile a binary optimized for accuracy</flag>
-		<flag name='profile_balanced'>
+		<flag name="profile_balanced">
 			Compile a binary with balanced optimization</flag>
-		<flag name='profile_performance'>
+		<flag name="profile_performance">
 			Compile a binary optimized for performance</flag>
-		<flag name='udev'>Enable udev based input</flag>
+		<flag name="udev">Enable udev based input</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-emulation/lxdream/metadata.xml b/games-emulation/lxdream/metadata.xml
index 32d9f17..d8c6e59 100644
--- a/games-emulation/lxdream/metadata.xml
+++ b/games-emulation/lxdream/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/games-emulation/mupen64plus/metadata.xml b/games-emulation/mupen64plus/metadata.xml
index 8d1417e..2dca277 100644
--- a/games-emulation/mupen64plus/metadata.xml
+++ b/games-emulation/mupen64plus/metadata.xml
@@ -10,13 +10,13 @@
 		<name>Christian Birchinger</name>
 	</maintainer>
 	<use>
-		<flag name='audio-sdl'>Enable SDL audio plugin.</flag>
-		<flag name='input-sdl'>Enable SDL input plugin.</flag>
-		<flag name='rsp-hle'>Enable HLE RSP plugin.</flag>
-		<flag name='ui-console'>Enable default console UI.</flag>
-		<flag name='ui-m64py'>Enable PyQt4 UI using <pkg>games-emulation/m64py</pkg>.</flag>
-		<flag name='video-glide64mk2'>Enable Glide64mk2 video plugin.</flag>
-		<flag name='video-rice'>Enable Rice video plugin.</flag>
+		<flag name="audio-sdl">Enable SDL audio plugin.</flag>
+		<flag name="input-sdl">Enable SDL input plugin.</flag>
+		<flag name="rsp-hle">Enable HLE RSP plugin.</flag>
+		<flag name="ui-console">Enable default console UI.</flag>
+		<flag name="ui-m64py">Enable PyQt4 UI using <pkg>games-emulation/m64py</pkg>.</flag>
+		<flag name="video-glide64mk2">Enable Glide64mk2 video plugin.</flag>
+		<flag name="video-rice">Enable Rice video plugin.</flag>
 	</use>
 	<longdescription>Mupen64Plus is a plugin-based N64 emulator for Linux which is capable of accurately playing many games.
 Included are four MIPS R4300 CPU emulators, with dynamic recompilers for 32-bit x86 and 64-bit amd64 systems,

diff --git a/games-emulation/pcsxr/metadata.xml b/games-emulation/pcsxr/metadata.xml
index f8bb87d..7e04ec0 100644
--- a/games-emulation/pcsxr/metadata.xml
+++ b/games-emulation/pcsxr/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<use>
-		<flag name='cdio'>Use libcdio for CD support</flag>
-		<flag name='sdl'>Use SDL sound backend (other parts of SDL are used unconditionally)</flag>
+		<flag name="cdio">Use libcdio for CD support</flag>
+		<flag name="sdl">Use SDL sound backend (other parts of SDL are used unconditionally)</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-emulation/ppsspp/metadata.xml b/games-emulation/ppsspp/metadata.xml
index be7e8b7..af37a74 100644
--- a/games-emulation/ppsspp/metadata.xml
+++ b/games-emulation/ppsspp/metadata.xml
@@ -7,9 +7,9 @@
 		<name>RobinDX</name>
 	</maintainer>
 	<use>
-		<flag name='qt4'>Adds support for the Qt GUI/Application Toolkit version 4.x</flag>
-		<flag name='qt5'>Adds support for the Qt GUI/Application Toolkit version 5.x</flag>
-		<flag name='sdl'>Adds support for Simple Direct Layer (media library)</flag>
+		<flag name="qt4">Adds support for the Qt GUI/Application Toolkit version 4.x</flag>
+		<flag name="qt5">Adds support for the Qt GUI/Application Toolkit version 5.x</flag>
+		<flag name="sdl">Adds support for Simple Direct Layer (media library)</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/hrydgard/ppsspp/issues</bugs-to>

diff --git a/games-emulation/sdlmame/metadata.xml b/games-emulation/sdlmame/metadata.xml
index e6370db..af2f98a 100644
--- a/games-emulation/sdlmame/metadata.xml
+++ b/games-emulation/sdlmame/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>games</herd>

diff --git a/games-emulation/vbam/metadata.xml b/games-emulation/vbam/metadata.xml
index 8cc172c..13e23a2 100644
--- a/games-emulation/vbam/metadata.xml
+++ b/games-emulation/vbam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-engines/exult/metadata.xml b/games-engines/exult/metadata.xml
index 1749c2b..1c9acdb 100644
--- a/games-engines/exult/metadata.xml
+++ b/games-engines/exult/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-engines/frotz/metadata.xml b/games-engines/frotz/metadata.xml
index fba6233..555170a 100644
--- a/games-engines/frotz/metadata.xml
+++ b/games-engines/frotz/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-engines/love/metadata.xml b/games-engines/love/metadata.xml
index 32d9f17..d8c6e59 100644
--- a/games-engines/love/metadata.xml
+++ b/games-engines/love/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/games-engines/openmw/metadata.xml b/games-engines/openmw/metadata.xml
index 1c8c5f7..02370cb 100644
--- a/games-engines/openmw/metadata.xml
+++ b/games-engines/openmw/metadata.xml
@@ -25,4 +25,3 @@
 		engine uses to improve its functionality.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/games-engines/renpy/metadata.xml b/games-engines/renpy/metadata.xml
index 81a8e71..e2ff5c7 100644
--- a/games-engines/renpy/metadata.xml
+++ b/games-engines/renpy/metadata.xml
@@ -22,18 +22,17 @@
 		while its Python support allows for complex simulation games.
 	</longdescription>
 	<use>
-		<flag name='development'>Install IDE for game developers and
+		<flag name="development">Install IDE for game developers and
 			an empty game template</flag>
 	</use>
 	<upstream>
-		<maintainer status='active'>
+		<maintainer status="active">
 			<email>pytom@bishoujo.us</email>
 			<name>Tom Rothamel</name>
 		</maintainer>
 		<changelog>http://www.renpy.org/latest.html</changelog>
 		<bugs-to>https://github.com/renpy/renpy/issues</bugs-to>
 		<doc>http://renpy.org/wiki/renpy/doc</doc>
-		<remote-id type='github'>renpy/renpy</remote-id>
+		<remote-id type="github">renpy/renpy</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/games-engines/solarus/metadata.xml b/games-engines/solarus/metadata.xml
index 302d78c..cbf45f5 100644
--- a/games-engines/solarus/metadata.xml
+++ b/games-engines/solarus/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='doc'>Install doxygen developer documentation.</flag>
-		<flag name='luajit'>Use LuaJIT instead of default Lua.</flag>
+		<flag name="doc">Install doxygen developer documentation.</flag>
+		<flag name="luajit">Use LuaJIT instead of default Lua.</flag>
 	</use>
 	<upstream>
-		<remote-id type='github'>christopho/solarus</remote-id>
+		<remote-id type="github">christopho/solarus</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/games-engines/stratagus/metadata.xml b/games-engines/stratagus/metadata.xml
index ddb83c7..fc00320 100644
--- a/games-engines/stratagus/metadata.xml
+++ b/games-engines/stratagus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-fps/doom3/metadata.xml b/games-fps/doom3/metadata.xml
index 3f1bc96..d8046bc 100644
--- a/games-fps/doom3/metadata.xml
+++ b/games-fps/doom3/metadata.xml
@@ -11,7 +11,7 @@ frightening and gripping first person gaming experience ever created. For more
 information, checkout http://www.doom3.com
 </longdescription>
   <use>
-    <flag name='dedicated'>install only as a dedicated game server</flag>
+    <flag name="dedicated">install only as a dedicated game server</flag>
     <flag name="roe">Adds support for the Resurrection of Evil expansion</flag>
   </use>
 </pkgmetadata>

diff --git a/games-fps/duke3d-data/metadata.xml b/games-fps/duke3d-data/metadata.xml
index 3fba2a0..5efb97b 100644
--- a/games-fps/duke3d-data/metadata.xml
+++ b/games-fps/duke3d-data/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='gog'>Extract the data from the GOG.com installer.</flag>
+		<flag name="gog">Extract the data from the GOG.com installer.</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-fps/duke3d-demodata/metadata.xml b/games-fps/duke3d-demodata/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-fps/duke3d-demodata/metadata.xml
+++ b/games-fps/duke3d-demodata/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-fps/duke3d/metadata.xml b/games-fps/duke3d/metadata.xml
index e941f24..b4e1d35 100644
--- a/games-fps/duke3d/metadata.xml
+++ b/games-fps/duke3d/metadata.xml
@@ -53,6 +53,6 @@ What doesn't work/known bugs:
 </longdescription>
   <use>
     <flag name="demo">Install the demo files</flag>
-    <flag name='pic'>disable optimized assembly code that is not PIC friendly</flag>
+    <flag name="pic">disable optimized assembly code that is not PIC friendly</flag>
   </use>
 </pkgmetadata>

diff --git a/games-fps/eduke32/metadata.xml b/games-fps/eduke32/metadata.xml
index 52cdfe8..01ac643 100644
--- a/games-fps/eduke32/metadata.xml
+++ b/games-fps/eduke32/metadata.xml
@@ -22,4 +22,3 @@
 			(needs USE 'opengl')</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-fps/lsdldoom/metadata.xml b/games-fps/lsdldoom/metadata.xml
index 26853b0..9240e88 100644
--- a/games-fps/lsdldoom/metadata.xml
+++ b/games-fps/lsdldoom/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>games</herd>
 <use>
-	<flag name='net'>Enables network game support</flag>
-	<flag name='shareware'>Install <pkg>games-fps/doom-data</pkg> for shareware wad file</flag>
-	<flag name='freedoom'>Install <pkg>games-fps/freedoom</pkg> wad file</flag>
+	<flag name="net">Enables network game support</flag>
+	<flag name="shareware">Install <pkg>games-fps/doom-data</pkg> for shareware wad file</flag>
+	<flag name="freedoom">Install <pkg>games-fps/freedoom</pkg> wad file</flag>
 </use>
 </pkgmetadata>

diff --git a/games-fps/quake3-demo/metadata.xml b/games-fps/quake3-demo/metadata.xml
index 69805c6..ec9701a 100644
--- a/games-fps/quake3-demo/metadata.xml
+++ b/games-fps/quake3-demo/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>games</herd>
 <use>
-	<flag name='dedicated'>install only as a dedicated game serer</flag>
+	<flag name="dedicated">install only as a dedicated game serer</flag>
 </use>
 </pkgmetadata>

diff --git a/games-fps/quake3-nsco/metadata.xml b/games-fps/quake3-nsco/metadata.xml
index 5ba89f1..fe01528 100644
--- a/games-fps/quake3-nsco/metadata.xml
+++ b/games-fps/quake3-nsco/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 	<herd>games</herd>
 

diff --git a/games-kids/crayon-physics/metadata.xml b/games-kids/crayon-physics/metadata.xml
index d13413d..dbbe0d9 100644
--- a/games-kids/crayon-physics/metadata.xml
+++ b/games-kids/crayon-physics/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>
+		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
 		</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-misc/fortune-mod-gentoo-dev/metadata.xml b/games-misc/fortune-mod-gentoo-dev/metadata.xml
index 066f9db..bbc3d9c 100644
--- a/games-misc/fortune-mod-gentoo-dev/metadata.xml
+++ b/games-misc/fortune-mod-gentoo-dev/metadata.xml
@@ -9,4 +9,3 @@
 		me.</description>
 </maintainer>
 </pkgmetadata>
-

diff --git a/games-misc/katawa-shoujo/metadata.xml b/games-misc/katawa-shoujo/metadata.xml
index 37434ac..e2230c4 100644
--- a/games-misc/katawa-shoujo/metadata.xml
+++ b/games-misc/katawa-shoujo/metadata.xml
@@ -28,4 +28,3 @@
 		character.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/games-misc/little-inferno/metadata.xml b/games-misc/little-inferno/metadata.xml
index 89f2b69..2133b02 100644
--- a/games-misc/little-inferno/metadata.xml
+++ b/games-misc/little-inferno/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>Use bundled libraries.</flag>
+		<flag name="bundled-libs">Use bundled libraries.</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-misc/lucidlife/metadata.xml b/games-misc/lucidlife/metadata.xml
index a562c47..2f384c0 100644
--- a/games-misc/lucidlife/metadata.xml
+++ b/games-misc/lucidlife/metadata.xml
@@ -7,4 +7,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/games-misc/sound-of-sorting/metadata.xml b/games-misc/sound-of-sorting/metadata.xml
index ceaf45e..45ee51d 100644
--- a/games-misc/sound-of-sorting/metadata.xml
+++ b/games-misc/sound-of-sorting/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/games-misc/xcowsay/metadata.xml b/games-misc/xcowsay/metadata.xml
index 2ab4df7..0d90316 100644
--- a/games-misc/xcowsay/metadata.xml
+++ b/games-misc/xcowsay/metadata.xml
@@ -11,4 +11,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/games-mud/wxmud/metadata.xml b/games-mud/wxmud/metadata.xml
index 15ec30a..eaeb434 100644
--- a/games-mud/wxmud/metadata.xml
+++ b/games-mud/wxmud/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/games-puzzle/gtetrinet/metadata.xml b/games-puzzle/gtetrinet/metadata.xml
index 7c5a33c..37789ee 100644
--- a/games-puzzle/gtetrinet/metadata.xml
+++ b/games-puzzle/gtetrinet/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-puzzle/ksokoban/metadata.xml b/games-puzzle/ksokoban/metadata.xml
index 61f9072..0d83306 100644
--- a/games-puzzle/ksokoban/metadata.xml
+++ b/games-puzzle/ksokoban/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/games-puzzle/nightsky/metadata.xml b/games-puzzle/nightsky/metadata.xml
index d13413d..dbbe0d9 100644
--- a/games-puzzle/nightsky/metadata.xml
+++ b/games-puzzle/nightsky/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>
+		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
 		</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-puzzle/splice/metadata.xml b/games-puzzle/splice/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-puzzle/splice/metadata.xml
+++ b/games-puzzle/splice/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-puzzle/tiny-and-big/metadata.xml b/games-puzzle/tiny-and-big/metadata.xml
index fcab3b2..dbbe0d9 100644
--- a/games-puzzle/tiny-and-big/metadata.xml
+++ b/games-puzzle/tiny-and-big/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>
+		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
 		</flag>
 	</use>

diff --git a/games-roguelike/FTL/metadata.xml b/games-roguelike/FTL/metadata.xml
index 1f7b07a..2dca1f1 100644
--- a/games-roguelike/FTL/metadata.xml
+++ b/games-roguelike/FTL/metadata.xml
@@ -9,7 +9,6 @@
 		<description>Proxied maintainer</description>
 	</maintainer>
 	<use>
-		<flag name='bundled-libs'>Use bundled libraries.</flag>
+		<flag name="bundled-libs">Use bundled libraries.</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-roguelike/angband/metadata.xml b/games-roguelike/angband/metadata.xml
index b8e6986..aff940f 100644
--- a/games-roguelike/angband/metadata.xml
+++ b/games-roguelike/angband/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='sound'>Enable and install sounds</flag>
+		<flag name="sound">Enable and install sounds</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-roguelike/stone-soup/metadata.xml b/games-roguelike/stone-soup/metadata.xml
index bc6d43e..f9cf827 100644
--- a/games-roguelike/stone-soup/metadata.xml
+++ b/games-roguelike/stone-soup/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-roguelike/tomenet/metadata.xml b/games-roguelike/tomenet/metadata.xml
index 1712bc5..8fe1f5e 100644
--- a/games-roguelike/tomenet/metadata.xml
+++ b/games-roguelike/tomenet/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='server'>Compile server support</flag>
+		<flag name="server">Compile server support</flag>
 	</use>
 	<longdescription lang="en">
 		TomeNET is a multiplayer fantasy dungeon exploration game based on
@@ -16,4 +16,3 @@
 		artifacts.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/games-rpg/a-bird-story/metadata.xml b/games-rpg/a-bird-story/metadata.xml
index ef31c08..440634c 100644
--- a/games-rpg/a-bird-story/metadata.xml
+++ b/games-rpg/a-bird-story/metadata.xml
@@ -7,6 +7,6 @@
 		<name>Julian Ospald</name>
 	</maintainer>
 	<use>
-		<flag name='bundled-libs'>Use bundled libraries</flag>
+		<flag name="bundled-libs">Use bundled libraries</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-rpg/arx-fatalis-data/metadata.xml b/games-rpg/arx-fatalis-data/metadata.xml
index a43d973..4bc5f11 100644
--- a/games-rpg/arx-fatalis-data/metadata.xml
+++ b/games-rpg/arx-fatalis-data/metadata.xml
@@ -14,7 +14,6 @@
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
 	<use>
-		<flag name='gog'>Extract the data from the GOG.com installer.</flag>
+		<flag name="gog">Extract the data from the GOG.com installer.</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-rpg/arx-fatalis-demo/metadata.xml b/games-rpg/arx-fatalis-demo/metadata.xml
index 2b36594..3879686 100644
--- a/games-rpg/arx-fatalis-demo/metadata.xml
+++ b/games-rpg/arx-fatalis-demo/metadata.xml
@@ -14,4 +14,3 @@
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/games-rpg/arx-libertatis/metadata.xml b/games-rpg/arx-libertatis/metadata.xml
index 13a0ce0..3a5dd3e 100644
--- a/games-rpg/arx-libertatis/metadata.xml
+++ b/games-rpg/arx-libertatis/metadata.xml
@@ -7,20 +7,20 @@
 		<name>Julian Ospald</name>
 	</maintainer>
 	<use>
-		<flag name='c++0x'>Build ROOT using the C++11 standard.</flag>
-		<flag name='crash-reporter'>Build a <pkg>dev-qt/qtgui</pkg>-based
+		<flag name="c++0x">Build ROOT using the C++11 standard.</flag>
+		<flag name="crash-reporter">Build a <pkg>dev-qt/qtgui</pkg>-based
 			tool that allows to submit crash information to the upstream
 			backtracker.</flag>
-		<flag name='debug'>Enable asserts and debug logging.</flag>
-		<flag name='static'>Link libraries statically, currently only
+		<flag name="debug">Enable asserts and debug logging.</flag>
+		<flag name="static">Link libraries statically, currently only
 			<pkg>media-libs/glew</pkg></flag>
-		<flag name='tools'>Build tools that can extract the game's data and
+		<flag name="tools">Build tools that can extract the game's data and
 			save files.</flag>
-		<flag name='unity-build'>Build everything in one big source file,
+		<flag name="unity-build">Build everything in one big source file,
 			allowing for faster build times and better optimizations at
 			the cost of higher memory usage.</flag>
 	</use>
-	<longdescription lang='en'>
+	<longdescription lang="en">
 		Arx Libertatis is a cross-platform, open source port of
 		Arx Fatalis, a 2002 first-person role-playing game/dungeon crawler
 		developed by Arkane Studios.
@@ -31,7 +31,7 @@
 		modern systems, porting the game to new systems as well as
 		eliminating bugs and limitations.
 	</longdescription>
-	<longdescription lang='de'>
+	<longdescription lang="de">
 		Arx Libertatis ist eine cross-platform, open source Portierung
 		von Arx Fatalis, ein Rollenspiel/Dungeon Crawler in Ego-Perspektive
 		aus dem Jahr 2002, entwickelt von Arkane Studios.
@@ -44,7 +44,7 @@
 		portiert und bugs und Beschränkungen behebt.
 	</longdescription>
 	<upstream>
-		<maintainer status='active'>
+		<maintainer status="active">
 			<email>daniel@constexpr.org</email>
 			<name>Daniel Scharrer</name>
 		</maintainer>
@@ -52,10 +52,9 @@
 		<changelog>
 			http://wiki.arx-libertatis.org/Changelog
 		</changelog>
-		<doc lang='en'>http://wiki.arx-libertatis.org/</doc>
-		<remote-id type='github'>arx/ArxLibertatis</remote-id>
-		<remote-id type='sourceforge'>arx</remote-id>
-		<remote-id type='freecode'>arx-libertatis</remote-id>
+		<doc lang="en">http://wiki.arx-libertatis.org/</doc>
+		<remote-id type="github">arx/ArxLibertatis</remote-id>
+		<remote-id type="sourceforge">arx</remote-id>
+		<remote-id type="freecode">arx-libertatis</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/games-rpg/bastion/metadata.xml b/games-rpg/bastion/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-rpg/bastion/metadata.xml
+++ b/games-rpg/bastion/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-rpg/dragonhunt/metadata.xml b/games-rpg/dragonhunt/metadata.xml
index 7466967..d3c2cc9 100644
--- a/games-rpg/dragonhunt/metadata.xml
+++ b/games-rpg/dragonhunt/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-rpg/dungeon-defenders/metadata.xml b/games-rpg/dungeon-defenders/metadata.xml
index d13413d..dbbe0d9 100644
--- a/games-rpg/dungeon-defenders/metadata.xml
+++ b/games-rpg/dungeon-defenders/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>
+		<flag name="bundled-libs">
 			Use the upstream provided bundled libraries.
 		</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-rpg/eternal-lands-data/metadata.xml b/games-rpg/eternal-lands-data/metadata.xml
index 5bb4bb3..2e27ec5 100644
--- a/games-rpg/eternal-lands-data/metadata.xml
+++ b/games-rpg/eternal-lands-data/metadata.xml
@@ -9,8 +9,8 @@
 <longdescription>Eternal Lands is a FREE MMORPG (massively multiplayer online
 	role playing game)</longdescription>
 <use>
-  <flag name='bloodsuckermaps'>Will install Bloodsucker's Maps in place of the official map files.</flag>
-  <flag name='music'>Adds in-game music.</flag>
-  <flag name='sound'>Adds in-game sound effects.</flag>
+  <flag name="bloodsuckermaps">Will install Bloodsucker's Maps in place of the official map files.</flag>
+  <flag name="music">Adds in-game music.</flag>
+  <flag name="sound">Adds in-game sound effects.</flag>
 </use>
 </pkgmetadata>

diff --git a/games-rpg/grimrock/metadata.xml b/games-rpg/grimrock/metadata.xml
index c5c7aae..2133b02 100644
--- a/games-rpg/grimrock/metadata.xml
+++ b/games-rpg/grimrock/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>Use bundled libraries.</flag>
+		<flag name="bundled-libs">Use bundled libraries.</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-rpg/mana/metadata.xml b/games-rpg/mana/metadata.xml
index f533fcb..2b9f5c3 100644
--- a/games-rpg/mana/metadata.xml
+++ b/games-rpg/mana/metadata.xml
@@ -8,4 +8,3 @@
 		<bugs-to>http://bugs.manasource.org/my_view_page.php</bugs-to>
 	</upstream>
 </pkgmetadata>
-

diff --git a/games-rpg/manaplus/metadata.xml b/games-rpg/manaplus/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-rpg/manaplus/metadata.xml
+++ b/games-rpg/manaplus/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-rpg/penumbra-collection/metadata.xml b/games-rpg/penumbra-collection/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-rpg/penumbra-collection/metadata.xml
+++ b/games-rpg/penumbra-collection/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-rpg/to-the-moon/metadata.xml b/games-rpg/to-the-moon/metadata.xml
index 66b6e3d..86a9b5e 100644
--- a/games-rpg/to-the-moon/metadata.xml
+++ b/games-rpg/to-the-moon/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='bundled-libs'>Use bundled libraries</flag>
+		<flag name="bundled-libs">Use bundled libraries</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-rpg/valyriatear/metadata.xml b/games-rpg/valyriatear/metadata.xml
index 6a16693..b483880 100644
--- a/games-rpg/valyriatear/metadata.xml
+++ b/games-rpg/valyriatear/metadata.xml
@@ -3,10 +3,9 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='editor'>Compile the Qt editor along with the game</flag>
+		<flag name="editor">Compile the Qt editor along with the game</flag>
 	</use>
 	<upstream>
-		<remote-id type='github'>Bertram25/ValyriaTear</remote-id>
+		<remote-id type="github">Bertram25/ValyriaTear</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/games-rpg/zsdx/metadata.xml b/games-rpg/zsdx/metadata.xml
index dc4de72..f83c03a 100644
--- a/games-rpg/zsdx/metadata.xml
+++ b/games-rpg/zsdx/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<upstream>
-		<remote-id type='github'>christopho/zsdx</remote-id>
+		<remote-id type="github">christopho/zsdx</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/games-rpg/zsxd/metadata.xml b/games-rpg/zsxd/metadata.xml
index 86cefb6..cc70e21 100644
--- a/games-rpg/zsxd/metadata.xml
+++ b/games-rpg/zsxd/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<upstream>
-		<remote-id type='github'>christopho/zsxd</remote-id>
+		<remote-id type="github">christopho/zsxd</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/games-simulation/fgrun/metadata.xml b/games-simulation/fgrun/metadata.xml
index 02cb491..333dcba 100644
--- a/games-simulation/fgrun/metadata.xml
+++ b/games-simulation/fgrun/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-simulation/openttd/metadata.xml b/games-simulation/openttd/metadata.xml
index 0316793..8afe81f 100644
--- a/games-simulation/openttd/metadata.xml
+++ b/games-simulation/openttd/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='aplaymidi'>Enables midi music in game, using aplaymidi as an external player</flag>
+		<flag name="aplaymidi">Enables midi music in game, using aplaymidi as an external player</flag>
 
-		<flag name='openmedia'>Enables the free open media sets: OpenGFX, OpenSFX, OpenMSX, removing the requirement for proprietary TTD assets to play OpenTTD.</flag>
-		<flag name='lzo'>Enables LZO compression for savegames. This is only needed to load extremely old savegames. (versions before 0.2)</flag>
-		<flag name='dedicated'>Build only the openttd server, and not the client.</flag>
+		<flag name="openmedia">Enables the free open media sets: OpenGFX, OpenSFX, OpenMSX, removing the requirement for proprietary TTD assets to play OpenTTD.</flag>
+		<flag name="lzo">Enables LZO compression for savegames. This is only needed to load extremely old savegames. (versions before 0.2)</flag>
+		<flag name="dedicated">Build only the openttd server, and not the client.</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-sports/foobillard/metadata.xml b/games-sports/foobillard/metadata.xml
index cc7bcdb..70e507a 100644
--- a/games-sports/foobillard/metadata.xml
+++ b/games-sports/foobillard/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-strategy/freeorion/metadata.xml b/games-strategy/freeorion/metadata.xml
index c49fe3e..52001f2 100644
--- a/games-strategy/freeorion/metadata.xml
+++ b/games-strategy/freeorion/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/games-strategy/ja2-stracciatella-data/metadata.xml b/games-strategy/ja2-stracciatella-data/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-strategy/ja2-stracciatella-data/metadata.xml
+++ b/games-strategy/ja2-stracciatella-data/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-strategy/ja2-stracciatella/metadata.xml b/games-strategy/ja2-stracciatella/metadata.xml
index 27bf0ad..ff6aeb5 100644
--- a/games-strategy/ja2-stracciatella/metadata.xml
+++ b/games-strategy/ja2-stracciatella/metadata.xml
@@ -7,4 +7,3 @@
 		<flag name="linguas_ru_gold">Support for russian gold ja2 version</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-strategy/liquidwar6/metadata.xml b/games-strategy/liquidwar6/metadata.xml
index d315171..36321fa 100644
--- a/games-strategy/liquidwar6/metadata.xml
+++ b/games-strategy/liquidwar6/metadata.xml
@@ -3,13 +3,13 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='doc'>Convert the info pages to html</flag>
-		<flag name='gles2'>Enable OpenGL ES 2.0 support</flag>
-		<flag name='gtk'>Used to display error/critical messages</flag>
-		<flag name='maps'>Install extra maps</flag>
-		<flag name='ogg'>Enable mod-ogg via <pkg>media-libs/sdl-mixer</pkg>
+		<flag name="doc">Convert the info pages to html</flag>
+		<flag name="gles2">Enable OpenGL ES 2.0 support</flag>
+		<flag name="gtk">Used to display error/critical messages</flag>
+		<flag name="maps">Install extra maps</flag>
+		<flag name="ogg">Enable mod-ogg via <pkg>media-libs/sdl-mixer</pkg>
 			(currently the only sound provider)</flag>
-		<flag name='readline'>Enable interactive script shell for
+		<flag name="readline">Enable interactive script shell for
 			hacking</flag>
 	</use>
 	<longdescription lang="en">

diff --git a/games-strategy/s25rttr/metadata.xml b/games-strategy/s25rttr/metadata.xml
index d916cbb..cd03b27 100644
--- a/games-strategy/s25rttr/metadata.xml
+++ b/games-strategy/s25rttr/metadata.xml
@@ -7,7 +7,6 @@
         <bugs-to>https://bugs.launchpad.net/s25rttr</bugs-to>
 	</upstream>
 	<use>
-		<flag name='glfw'>Compile another video driver based on <pkg>media-libs/glfw</pkg>.</flag>
+		<flag name="glfw">Compile another video driver based on <pkg>media-libs/glfw</pkg>.</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/games-strategy/wargus-data/metadata.xml b/games-strategy/wargus-data/metadata.xml
index 251ecfd..6ab50b7 100644
--- a/games-strategy/wargus-data/metadata.xml
+++ b/games-strategy/wargus-data/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-strategy/wargus/metadata.xml b/games-strategy/wargus/metadata.xml
index 4c6b683..ef62588 100644
--- a/games-strategy/wargus/metadata.xml
+++ b/games-strategy/wargus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-util/atlas/metadata.xml b/games-util/atlas/metadata.xml
index aace199..5e10684 100644
--- a/games-util/atlas/metadata.xml
+++ b/games-util/atlas/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/games-util/gslist/metadata.xml b/games-util/gslist/metadata.xml
index bda4ebb..32465f4 100644
--- a/games-util/gslist/metadata.xml
+++ b/games-util/gslist/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='web'>Enable the web interface</flag>
+		<flag name="web">Enable the web interface</flag>
 	</use>
 </pkgmetadata>

diff --git a/games-util/higan-purify/metadata.xml b/games-util/higan-purify/metadata.xml
index 01a746e..cad5a2a 100644
--- a/games-util/higan-purify/metadata.xml
+++ b/games-util/higan-purify/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>games</herd>
 </pkgmetadata>
-

diff --git a/games-util/wit/metadata.xml b/games-util/wit/metadata.xml
index b9f7dda..96d5501 100644
--- a/games-util/wit/metadata.xml
+++ b/games-util/wit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/games-util/xqf/metadata.xml b/games-util/xqf/metadata.xml
index f309284..bc7e6dc 100644
--- a/games-util/xqf/metadata.xml
+++ b/games-util/xqf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/gnome-base/gvfs/metadata.xml b/gnome-base/gvfs/metadata.xml
index 7d7a983..42f4619 100644
--- a/gnome-base/gvfs/metadata.xml
+++ b/gnome-base/gvfs/metadata.xml
@@ -4,20 +4,20 @@
 <herd>gnome</herd>
 <longdescription lang="en">
 gvfs is a userspace virtual filesystem designed to work with the i/o
-abstractions of gio (a library availible in glib >= 2.15.1). It
+abstractions of gio (a library availible in glib &gt;= 2.15.1). It
 installs several modules that are automatically used by applications
 using the APIs of libgio. There is also fuse support that allows
 applications not using gio to access the gvfs filesystems.
 </longdescription>
 <use>
-	<flag name='afp'>Enables support for accessing AFP (Apple Filing Protocol) network shares</flag>
-	<flag name='archive'>Enables support for accessing files in archives transparently via <pkg>app-arch/libarchive</pkg></flag>
-	<flag name='bluray'>Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
-	<flag name='fuse'>Enables fuse mount points in $HOME/.gvfs for legacy application access</flag>
-	<flag name='gnome-online-accounts'>Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
-	<flag name='google'>Enables support for accessing Google accounts via <pkg>dev-libs/libgdata</pkg></flag>
-	<flag name='http'>Enable the HTTP/DAV backend using <pkg>net-libs/libsoup-gnome</pkg></flag>
+	<flag name="afp">Enables support for accessing AFP (Apple Filing Protocol) network shares</flag>
+	<flag name="archive">Enables support for accessing files in archives transparently via <pkg>app-arch/libarchive</pkg></flag>
+	<flag name="bluray">Enable playback of Blu-ray filesystems using <pkg>media-libs/libbluray</pkg></flag>
+	<flag name="fuse">Enables fuse mount points in $HOME/.gvfs for legacy application access</flag>
+	<flag name="gnome-online-accounts">Enable configuration panel for <pkg>net-libs/gnome-online-accounts</pkg> accounts</flag>
+	<flag name="google">Enables support for accessing Google accounts via <pkg>dev-libs/libgdata</pkg></flag>
+	<flag name="http">Enable the HTTP/DAV backend using <pkg>net-libs/libsoup-gnome</pkg></flag>
 	<flag name="nfs">Enable NFS client support via <pkg>net-fs/libnfs</pkg>.</flag>
-	<flag name='udev'>Enable udev base replacement code for cdda feature</flag>
+	<flag name="udev">Enable udev base replacement code for cdda feature</flag>
 </use>
 </pkgmetadata>

diff --git a/gnome-base/libglade/metadata.xml b/gnome-base/libglade/metadata.xml
index e7f00dd..196142c 100644
--- a/gnome-base/libglade/metadata.xml
+++ b/gnome-base/libglade/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name='tools'>Install libglade-convert Python script.</flag>
+		<flag name="tools">Install libglade-convert Python script.</flag>
 	</use>
 </pkgmetadata>

diff --git a/gnome-base/libgnomecanvas/metadata.xml b/gnome-base/libgnomecanvas/metadata.xml
index ea52545..8a90da2 100644
--- a/gnome-base/libgnomecanvas/metadata.xml
+++ b/gnome-base/libgnomecanvas/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name='glade'>Enable glade support</flag>
+	<flag name="glade">Enable glade support</flag>
 </use>
 </pkgmetadata>

diff --git a/gnome-extra/gdesklets-core/metadata.xml b/gnome-extra/gdesklets-core/metadata.xml
index abdb9f8..98395b2 100644
--- a/gnome-extra/gdesklets-core/metadata.xml
+++ b/gnome-extra/gdesklets-core/metadata.xml
@@ -6,6 +6,6 @@
 		<bugs-to>https://bugs.launchpad.net/gdesklets</bugs-to>
 	</upstream>
 	<use>
-		<flag name='dbus'>Enable gDesklets Controls to use DBus</flag>
+		<flag name="dbus">Enable gDesklets Controls to use DBus</flag>
 	</use>
 </pkgmetadata>

diff --git a/gnome-extra/gnome-user-share/metadata.xml b/gnome-extra/gnome-user-share/metadata.xml
index e98dd90..da6fd63 100644
--- a/gnome-extra/gnome-user-share/metadata.xml
+++ b/gnome-extra/gnome-user-share/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>gnome</herd>
 </pkgmetadata>
-

diff --git a/gnome-extra/gnome-web-photo/metadata.xml b/gnome-extra/gnome-web-photo/metadata.xml
index 2869616..8804b36 100644
--- a/gnome-extra/gnome-web-photo/metadata.xml
+++ b/gnome-extra/gnome-web-photo/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Markos Chandras</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/gnome-extra/nautilus-sendto/metadata.xml b/gnome-extra/nautilus-sendto/metadata.xml
index 48a8d92..dad9001 100644
--- a/gnome-extra/nautilus-sendto/metadata.xml
+++ b/gnome-extra/nautilus-sendto/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 </pkgmetadata>
-

diff --git a/gnome-extra/polkit-gnome/metadata.xml b/gnome-extra/polkit-gnome/metadata.xml
index 8d6549b..941d094 100644
--- a/gnome-extra/polkit-gnome/metadata.xml
+++ b/gnome-extra/polkit-gnome/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>freedesktop</herd>
 </pkgmetadata>
-

diff --git a/gnustep-apps/gemas/metadata.xml b/gnustep-apps/gemas/metadata.xml
index 5fcc88f..0ed19a6 100644
--- a/gnustep-apps/gemas/metadata.xml
+++ b/gnustep-apps/gemas/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>gnustep</herd>
 	<longdescription>Gemas is a simple code editor for GNUstep. It have autoindentation and highlight syntax for C, C++, Objective-C, Objective-C++, GSmarkup. And to edit Strings, Plist, GNUmakefile, ChangeLog files and plain text files (INSTALL, README, ...)</longdescription>
 	<use>
-		<flag name='projectcenter'>Build and install plugin for <pkg>gnustep-apps/projectcenter</pkg></flag>
+		<flag name="projectcenter">Build and install plugin for <pkg>gnustep-apps/projectcenter</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/gnustep-apps/gnumail/metadata.xml b/gnustep-apps/gnumail/metadata.xml
index 0271db4..d62831c 100644
--- a/gnustep-apps/gnumail/metadata.xml
+++ b/gnustep-apps/gnumail/metadata.xml
@@ -8,7 +8,7 @@ GNUMail.app is a fully featured mail application running on Linux (or FreeBSD, O
 GNUMail.app was written from scratch. It uses Pantomime as its mail handling framework.
 </longdescription>
 <use>
-	<flag name='emoticon'>Enable extra Emoticon Bundle to see smiley's in e-mail
+	<flag name="emoticon">Enable extra Emoticon Bundle to see smiley's in e-mail
 		messages</flag>
 </use>
 </pkgmetadata>

diff --git a/gnustep-apps/gworkspace/metadata.xml b/gnustep-apps/gworkspace/metadata.xml
index 5bdd002..099aece 100644
--- a/gnustep-apps/gworkspace/metadata.xml
+++ b/gnustep-apps/gworkspace/metadata.xml
@@ -6,6 +6,6 @@
 GWorkspace is the official GNUstep workspace manager. It is a clone of the NeXT workspace manager. GWorkspace is becoming more and more stable every day and it is already ready for daily usage.
 </longdescription>
 <use>
-	<flag name='gwmetadata'>Enable the metadata indexing and searching system</flag>
+	<flag name="gwmetadata">Enable the metadata indexing and searching system</flag>
 </use>
 </pkgmetadata>

diff --git a/gnustep-apps/sogo/metadata.xml b/gnustep-apps/sogo/metadata.xml
index f3cc8a8..f26d868 100644
--- a/gnustep-apps/sogo/metadata.xml
+++ b/gnustep-apps/sogo/metadata.xml
@@ -11,6 +11,6 @@
 		<name>Michael Weber</name>
 	</maintainer>
 	<upstream>
-		<remote-id type='github'>inverse-inc/sogo</remote-id>
+		<remote-id type="github">inverse-inc/sogo</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/gnustep-base/gnustep-back-art/metadata.xml b/gnustep-base/gnustep-back-art/metadata.xml
index 08d2c4d..626b41b 100644
--- a/gnustep-base/gnustep-back-art/metadata.xml
+++ b/gnustep-base/gnustep-back-art/metadata.xml
@@ -20,6 +20,6 @@ DPS functions required by the front-end system.
 This package installs a backend that supports libart_lgpl.
 </longdescription>
 <use>
-	<flag name='xim'>Enable X11 XiM input method</flag>
+	<flag name="xim">Enable X11 XiM input method</flag>
 </use>
 </pkgmetadata>

diff --git a/gnustep-base/gnustep-back-cairo/metadata.xml b/gnustep-base/gnustep-back-cairo/metadata.xml
index 9094147..6920307 100644
--- a/gnustep-base/gnustep-back-cairo/metadata.xml
+++ b/gnustep-base/gnustep-back-cairo/metadata.xml
@@ -6,6 +6,6 @@
 	Cairo back-end component for the GNUstep GUI Library.
 </longdescription>
 <use>
-	<flag name='xim'>Enable X11 XiM input method</flag>
+	<flag name="xim">Enable X11 XiM input method</flag>
 </use>
 </pkgmetadata>

diff --git a/gnustep-base/gnustep-back-xlib/metadata.xml b/gnustep-base/gnustep-back-xlib/metadata.xml
index 395546f..b850ae4 100644
--- a/gnustep-base/gnustep-back-xlib/metadata.xml
+++ b/gnustep-base/gnustep-back-xlib/metadata.xml
@@ -20,6 +20,6 @@ DPS functions required by the front-end system.
 This package installs a backend that supports X11.
 </longdescription>
 <use>
-	<flag name='xim'>Enable X11 XiM input method</flag>
+	<flag name="xim">Enable X11 XiM input method</flag>
 </use>
 </pkgmetadata>

diff --git a/gnustep-base/gnustep-make/metadata.xml b/gnustep-base/gnustep-make/metadata.xml
index 10f57cd..7ea2411 100644
--- a/gnustep-base/gnustep-make/metadata.xml
+++ b/gnustep-base/gnustep-make/metadata.xml
@@ -10,7 +10,7 @@ configuration, building, installation, and packaging.  It also allows
 the user to easily create cross-compiled binaries.
 </longdescription>
 <use>
-	<flag name='libobjc2'>Enables use of the GNUstep Objective-C runtime (<pkg>gnustep-base/libobjc2</pkg>) with non-fragile ABI and <pkg>sys-devel/clang</pkg> compiler</flag>
-	<flag name='native-exceptions'>Enables use of the native Objective-C exception support (@try/@catch/@finally) built-in objective-c exceptions with compilers that support it </flag>
+	<flag name="libobjc2">Enables use of the GNUstep Objective-C runtime (<pkg>gnustep-base/libobjc2</pkg>) with non-fragile ABI and <pkg>sys-devel/clang</pkg> compiler</flag>
+	<flag name="native-exceptions">Enables use of the native Objective-C exception support (@try/@catch/@finally) built-in objective-c exceptions with compilers that support it </flag>
 </use>
 </pkgmetadata>

diff --git a/gnustep-libs/sope/metadata.xml b/gnustep-libs/sope/metadata.xml
index b82e2bc..67c6417 100644
--- a/gnustep-libs/sope/metadata.xml
+++ b/gnustep-libs/sope/metadata.xml
@@ -11,6 +11,6 @@
 		<name>Michael Weber</name>
 	</maintainer>
 	<upstream>
-		<remote-id type='github'>inverse-inc/sope</remote-id>
+		<remote-id type="github">inverse-inc/sope</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/java-virtuals/jaxp-virtual/metadata.xml b/java-virtuals/jaxp-virtual/metadata.xml
index 8d124bc..484092b 100644
--- a/java-virtuals/jaxp-virtual/metadata.xml
+++ b/java-virtuals/jaxp-virtual/metadata.xml
@@ -6,4 +6,3 @@
     Virtual for Java API for XML Processing (JAXP)
   </longdescription>
 </pkgmetadata>
-

diff --git a/java-virtuals/stax-api/metadata.xml b/java-virtuals/stax-api/metadata.xml
index 44c8317..6c80d41 100644
--- a/java-virtuals/stax-api/metadata.xml
+++ b/java-virtuals/stax-api/metadata.xml
@@ -6,4 +6,3 @@
     Virtual for Streaming API for XML (StAX)
   </longdescription>
 </pkgmetadata>
-

diff --git a/kde-apps/gwenview/metadata.xml b/kde-apps/gwenview/metadata.xml
index 1f2e4b6..e8b1827 100644
--- a/kde-apps/gwenview/metadata.xml
+++ b/kde-apps/gwenview/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>

diff --git a/kde-apps/kcachegrind/metadata.xml b/kde-apps/kcachegrind/metadata.xml
index a3cf3ee..771718e 100644
--- a/kde-apps/kcachegrind/metadata.xml
+++ b/kde-apps/kcachegrind/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>

diff --git a/kde-base/krossjava/metadata.xml b/kde-base/krossjava/metadata.xml
index 73d9fb1..ab434ce 100644
--- a/kde-base/krossjava/metadata.xml
+++ b/kde-base/krossjava/metadata.xml
@@ -4,4 +4,3 @@
 	<herd>java</herd>
 	<herd>kde</herd>
 </pkgmetadata>
-

diff --git a/kde-misc/chromi/metadata.xml b/kde-misc/chromi/metadata.xml
index 313bf94..ac2f0fc 100644
--- a/kde-misc/chromi/metadata.xml
+++ b/kde-misc/chromi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>

diff --git a/kde-misc/drop2ftp/metadata.xml b/kde-misc/drop2ftp/metadata.xml
index 721dd1c..a23f444 100644
--- a/kde-misc/drop2ftp/metadata.xml
+++ b/kde-misc/drop2ftp/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>kde</herd>
 </pkgmetadata>
-

diff --git a/kde-misc/kcometen4/metadata.xml b/kde-misc/kcometen4/metadata.xml
index 721dd1c..a23f444 100644
--- a/kde-misc/kcometen4/metadata.xml
+++ b/kde-misc/kcometen4/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>kde</herd>
 </pkgmetadata>
-

diff --git a/kde-misc/kimtoy/metadata.xml b/kde-misc/kimtoy/metadata.xml
index 3a49e21..a23f444 100644
--- a/kde-misc/kimtoy/metadata.xml
+++ b/kde-misc/kimtoy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>

diff --git a/kde-misc/kover/metadata.xml b/kde-misc/kover/metadata.xml
index 77f01e8..433ba54 100644
--- a/kde-misc/kover/metadata.xml
+++ b/kde-misc/kover/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/kde-misc/krcstat/metadata.xml b/kde-misc/krcstat/metadata.xml
index 6222792..8d1e86a 100644
--- a/kde-misc/krcstat/metadata.xml
+++ b/kde-misc/krcstat/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>kde</herd>
 </pkgmetadata>
-

diff --git a/kde-misc/krunner-googletranslate/metadata.xml b/kde-misc/krunner-googletranslate/metadata.xml
index 721dd1c..a23f444 100644
--- a/kde-misc/krunner-googletranslate/metadata.xml
+++ b/kde-misc/krunner-googletranslate/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>kde</herd>
 </pkgmetadata>
-

diff --git a/kde-misc/magneto-kde/metadata.xml b/kde-misc/magneto-kde/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/kde-misc/magneto-kde/metadata.xml
+++ b/kde-misc/magneto-kde/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/kde-misc/plasma-applet-daisy/metadata.xml b/kde-misc/plasma-applet-daisy/metadata.xml
index 721dd1c..a23f444 100644
--- a/kde-misc/plasma-applet-daisy/metadata.xml
+++ b/kde-misc/plasma-applet-daisy/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>kde</herd>
 </pkgmetadata>
-

diff --git a/kde-misc/plasma-emergelog/metadata.xml b/kde-misc/plasma-emergelog/metadata.xml
index 6222792..8d1e86a 100644
--- a/kde-misc/plasma-emergelog/metadata.xml
+++ b/kde-misc/plasma-emergelog/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>kde</herd>
 </pkgmetadata>
-

diff --git a/kde-misc/stdin-plasmoid/metadata.xml b/kde-misc/stdin-plasmoid/metadata.xml
index 721dd1c..a23f444 100644
--- a/kde-misc/stdin-plasmoid/metadata.xml
+++ b/kde-misc/stdin-plasmoid/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>kde</herd>
 </pkgmetadata>
-

diff --git a/kde-misc/systemd-kcm/metadata.xml b/kde-misc/systemd-kcm/metadata.xml
index 7214bf9..e1c5ce1 100644
--- a/kde-misc/systemd-kcm/metadata.xml
+++ b/kde-misc/systemd-kcm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>

diff --git a/mail-client/alpine/metadata.xml b/mail-client/alpine/metadata.xml
index 6b7b10e..554dd62 100644
--- a/mail-client/alpine/metadata.xml
+++ b/mail-client/alpine/metadata.xml
@@ -3,14 +3,14 @@
 <pkgmetadata>
 	<herd>net-mail</herd>
 	<use>
-		<flag name='chappa'>enhance alpine by applying Eduardo Chappa's
+		<flag name="chappa">enhance alpine by applying Eduardo Chappa's
 			patches</flag>
-		<flag name='onlyalpine'>installs only the alpine binary, so it does
+		<flag name="onlyalpine">installs only the alpine binary, so it does
 			not collied with <pkg>app-editors/pico</pkg> and/or 
 			<pkg>mail-client/pine</pkg></flag>
-		<flag name='passfile'>Adds support for caching passwords into a file
+		<flag name="passfile">Adds support for caching passwords into a file
 			between sessions</flag>
-		<flag name='smime'>Enable support for S/MIME</flag>
-		<flag name='topal'>Enable support for <pkg>net-mail/topal</pkg></flag>
+		<flag name="smime">Enable support for S/MIME</flag>
+		<flag name="topal">Enable support for <pkg>net-mail/topal</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/mail-client/balsa/metadata.xml b/mail-client/balsa/metadata.xml
index 43c78fd..8406e55 100644
--- a/mail-client/balsa/metadata.xml
+++ b/mail-client/balsa/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name='crypt'>Adds support for GnuPG encryption</flag>
-		<flag name='gtkhtml'>Use gtkhtml for HTML rendering</flag>
-		<flag name='gtkspell'>Use gtkspell for dictionary support</flag>
-		<flag name='rubrica'>Adds support for <pkg>app-office/rubrica</pkg>
+		<flag name="crypt">Adds support for GnuPG encryption</flag>
+		<flag name="gtkhtml">Use gtkhtml for HTML rendering</flag>
+		<flag name="gtkspell">Use gtkspell for dictionary support</flag>
+		<flag name="rubrica">Adds support for <pkg>app-office/rubrica</pkg>
 			addressbook</flag>
 	</use>
 </pkgmetadata>

diff --git a/mail-client/geary/metadata.xml b/mail-client/geary/metadata.xml
index e98dd90..da6fd63 100644
--- a/mail-client/geary/metadata.xml
+++ b/mail-client/geary/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>gnome</herd>
 </pkgmetadata>
-

diff --git a/mail-client/mutt/metadata.xml b/mail-client/mutt/metadata.xml
index a0ca5a4..435dba8 100644
--- a/mail-client/mutt/metadata.xml
+++ b/mail-client/mutt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-mail</herd>

diff --git a/mail-client/nmh/metadata.xml b/mail-client/nmh/metadata.xml
index fd653cd..7c09058 100644
--- a/mail-client/nmh/metadata.xml
+++ b/mail-client/nmh/metadata.xml
@@ -10,4 +10,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/mail-client/thunderbird/metadata.xml b/mail-client/thunderbird/metadata.xml
index 71406ae..3121466 100644
--- a/mail-client/thunderbird/metadata.xml
+++ b/mail-client/thunderbird/metadata.xml
@@ -5,14 +5,14 @@
 <use>
 	<flag name="bindist">Disable official Thunderbird branding (icons, name) which 
 		are not binary-redistributable according to upstream.</flag>
-	<flag name='crypt'> Enable encryption support with enigmail</flag>
-	<flag name='mozdom'>Enable Mozilla's DOM inspector</flag>
-	<flag name='lightning'>Enable app-global calendar support
+	<flag name="crypt"> Enable encryption support with enigmail</flag>
+	<flag name="mozdom">Enable Mozilla's DOM inspector</flag>
+	<flag name="lightning">Enable app-global calendar support
 		(note 38.0 and above bundles calendar support when this flag is off)</flag>
-	<flag name='custom-optimization'>Fine-tune custom compiler optimizations
+	<flag name="custom-optimization">Fine-tune custom compiler optimizations
 		(-Os, -O0, -O1, -O2, -O3)</flag>
 	<flag name="jemalloc3">Enable or disable jemalloc3 (forced-on when supported prior to 38.0)</flag>
-	<flag name='gstreamer-0'>Use gstreamer:0.10 instead of gstreamer:1 for media support</flag>
+	<flag name="gstreamer-0">Use gstreamer:0.10 instead of gstreamer:1 for media support</flag>
 	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
 		instead of bundled.</flag>
 	<flag name="system-icu">Use the system-wide <pkg>dev-libs/icu</pkg>

diff --git a/mail-filter/MailScanner/metadata.xml b/mail-filter/MailScanner/metadata.xml
index c7e2a08..6c21346 100644
--- a/mail-filter/MailScanner/metadata.xml
+++ b/mail-filter/MailScanner/metadata.xml
@@ -6,9 +6,9 @@
   <name>Patrick Lauer</name>
 </maintainer>
 <use>
-	<flag name='exim'>Set <pkg>mail-mta</pkg> to used MTA</flag>
-	<flag name='postfix'>Set <pkg>mail-mta/postfix</pkg> to used MTA</flag>
-	<flag name='spamassassin'>Enable usage of
+	<flag name="exim">Set <pkg>mail-mta</pkg> to used MTA</flag>
+	<flag name="postfix">Set <pkg>mail-mta/postfix</pkg> to used MTA</flag>
+	<flag name="spamassassin">Enable usage of
 		<pkg>mail-filter/spamassassin</pkg> for spam protection</flag>
 </use>
 </pkgmetadata>

diff --git a/mail-filter/amavisd-new/metadata.xml b/mail-filter/amavisd-new/metadata.xml
index ad94427..2f0b51b 100644
--- a/mail-filter/amavisd-new/metadata.xml
+++ b/mail-filter/amavisd-new/metadata.xml
@@ -4,11 +4,11 @@
 	<herd>net-mail</herd>
 	<herd>antivirus</herd>
 	<use>
-		<flag name='courier'>Add courier support</flag>
-		<flag name='dkim'>Add DomainKeys Identified Mail support</flag>
-		<flag name='qmail'>Add qmail support</flag>
-		<flag name='razor'>Add support for mail-filter/razor</flag>
-		<flag name='spamassassin'>Add support for mail-filter/spamassassin</flag>
-		<flag name='zmq'>Add support for zeromq sockets</flag>
+		<flag name="courier">Add courier support</flag>
+		<flag name="dkim">Add DomainKeys Identified Mail support</flag>
+		<flag name="qmail">Add qmail support</flag>
+		<flag name="razor">Add support for mail-filter/razor</flag>
+		<flag name="spamassassin">Add support for mail-filter/spamassassin</flag>
+		<flag name="zmq">Add support for zeromq sockets</flag>
 	</use>
 </pkgmetadata>

diff --git a/mail-filter/clamassassin/metadata.xml b/mail-filter/clamassassin/metadata.xml
index 065f543..888cbb2 100644
--- a/mail-filter/clamassassin/metadata.xml
+++ b/mail-filter/clamassassin/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>net-mail</herd>
 <use>
-	<flag name='clamd'>Use the <pkg>app-antivirus/clamav</pkg> daemon for virus
+	<flag name="clamd">Use the <pkg>app-antivirus/clamav</pkg> daemon for virus
 		checking</flag>
-	<flag name='subject-rewrite'>Adds support for subject rewriting</flag>
+	<flag name="subject-rewrite">Adds support for subject rewriting</flag>
 </use>
 </pkgmetadata>

diff --git a/mail-filter/dcc/metadata.xml b/mail-filter/dcc/metadata.xml
index e64b530..5b46a45 100644
--- a/mail-filter/dcc/metadata.xml
+++ b/mail-filter/dcc/metadata.xml
@@ -6,7 +6,7 @@
 	<email>robbat2@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='rrdtool'>Enable <pkg>net-analyzer/rrdtool</pkg> interface
+	<flag name="rrdtool">Enable <pkg>net-analyzer/rrdtool</pkg> interface
 		scripts</flag>
 </use>
 </pkgmetadata>

diff --git a/mail-filter/libmilter/metadata.xml b/mail-filter/libmilter/metadata.xml
index a1e561b..9326d69 100644
--- a/mail-filter/libmilter/metadata.xml
+++ b/mail-filter/libmilter/metadata.xml
@@ -4,6 +4,6 @@
 <herd>net-mail</herd>
 <longdescription>The Sendmail filter API (Milter)</longdescription>
 <use>
-	<flag name='poll'>Use poll instead of select</flag>
+	<flag name="poll">Use poll instead of select</flag>
 </use>
 </pkgmetadata>

diff --git a/mail-filter/mimedefang/metadata.xml b/mail-filter/mimedefang/metadata.xml
index c38fa00..d99e46d 100644
--- a/mail-filter/mimedefang/metadata.xml
+++ b/mail-filter/mimedefang/metadata.xml
@@ -4,6 +4,6 @@
 <herd>net-mail</herd>
 <longdescription>A program for Milter supported mail servers that implements antispam, antivirus and other customizable filtering on email messages</longdescription>
 <use>
-	<flag name='poll'>Use poll instead of select</flag>
+	<flag name="poll">Use poll instead of select</flag>
 </use>
 </pkgmetadata>

diff --git a/mail-filter/opendmarc/metadata.xml b/mail-filter/opendmarc/metadata.xml
index 6288164..1751753 100644
--- a/mail-filter/opendmarc/metadata.xml
+++ b/mail-filter/opendmarc/metadata.xml
@@ -9,7 +9,7 @@
 		<remote-id type="sourceforge">opendmarc</remote-id>
 	</upstream>
 	<use>
-		<flag name='spf'>Use the <pkg>mail-filter/libspf2</pkg>
+		<flag name="spf">Use the <pkg>mail-filter/libspf2</pkg>
 			for Sender Policy Framework checking</flag>
 	</use>
 </pkgmetadata>

diff --git a/mail-filter/policyd/metadata.xml b/mail-filter/policyd/metadata.xml
index 6363b10..0881601 100644
--- a/mail-filter/policyd/metadata.xml
+++ b/mail-filter/policyd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-mail</herd>

diff --git a/mail-filter/postfwd/metadata.xml b/mail-filter/postfwd/metadata.xml
index 46967d2..f0d4b84 100644
--- a/mail-filter/postfwd/metadata.xml
+++ b/mail-filter/postfwd/metadata.xml
@@ -12,7 +12,7 @@
 		<description>Proxy-Maintainer. Assign bugs to him</description>
 	</maintainer>
 	<upstream>
-	    <maintainer status='active'>
+	    <maintainer status="active">
 			<email>info@postfwd.org</email>
 			<name>Jan Peter Kessler</name>
 	    </maintainer>

diff --git a/mail-filter/postgrey/metadata.xml b/mail-filter/postgrey/metadata.xml
index 2d56b3e..3f9e4f0 100644
--- a/mail-filter/postgrey/metadata.xml
+++ b/mail-filter/postgrey/metadata.xml
@@ -18,6 +18,6 @@
   </maintainer>
 <longdescription>Postgrey is a Postfix policy server implementing greylisting developed by David Schweikert at the ISG.EE.</longdescription>
 <use>
-	<flag name='targrey'>Enables the targrey patch</flag>
+	<flag name="targrey">Enables the targrey patch</flag>
 </use>
 </pkgmetadata>

diff --git a/mail-filter/rmilter/metadata.xml b/mail-filter/rmilter/metadata.xml
index 39e6b2a..074004d 100644
--- a/mail-filter/rmilter/metadata.xml
+++ b/mail-filter/rmilter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/mail-filter/rspamd/metadata.xml b/mail-filter/rspamd/metadata.xml
index bfb2476..1d8095e 100644
--- a/mail-filter/rspamd/metadata.xml
+++ b/mail-filter/rspamd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/mail-filter/spamassassin-botnet/metadata.xml b/mail-filter/spamassassin-botnet/metadata.xml
index 4223ba5..f529bb1 100644
--- a/mail-filter/spamassassin-botnet/metadata.xml
+++ b/mail-filter/spamassassin-botnet/metadata.xml
@@ -14,4 +14,3 @@ hosts that aren't intended to be acting as a direct mail submitter outside of
 their own domain.
 </longdescription>
 </pkgmetadata>
-

diff --git a/mail-filter/spamassassin/metadata.xml b/mail-filter/spamassassin/metadata.xml
index 822c9ad..cd32402 100644
--- a/mail-filter/spamassassin/metadata.xml
+++ b/mail-filter/spamassassin/metadata.xml
@@ -5,8 +5,8 @@
     <email>maintainer-needed@gentoo.org</email>
   </maintainer>
 <use>
-  <flag name='qmail'>Build qmail functionality and docs</flag>
-  <flag name='bayes'>
+  <flag name="qmail">Build qmail functionality and docs</flag>
+  <flag name="bayes">
     Require a database (MySQL, SQLite, Postgres, or BerkDB) backend to
     enable the Bayesian filtering database.
   </flag>

diff --git a/mail-filter/spamdyke/metadata.xml b/mail-filter/spamdyke/metadata.xml
index e8a572f..ef26bc7 100644
--- a/mail-filter/spamdyke/metadata.xml
+++ b/mail-filter/spamdyke/metadata.xml
@@ -13,6 +13,6 @@ features to enhance qmail.
 Best of all, using spamdyke does not require patching or recompiling qmail!
 </longdescription>
 <use>
-	<flag name='ssl'>Enables TLS protocol for spamdyke</flag>
+	<flag name="ssl">Enables TLS protocol for spamdyke</flag>
 </use>
 </pkgmetadata>

diff --git a/mail-filter/zdkimfilter/metadata.xml b/mail-filter/zdkimfilter/metadata.xml
index f2b0781..ee8f8a7 100644
--- a/mail-filter/zdkimfilter/metadata.xml
+++ b/mail-filter/zdkimfilter/metadata.xml
@@ -5,13 +5,13 @@
 <longdescription>A program implementing the DKIM signing/verification for Courier
 </longdescription>
 <use>
-	<flag name='debug'>
+	<flag name="debug">
 	Log process and signal information. Also leave the child process running for
 	gdb examination.
 	</flag>
 </use>
 <use>
-	<flag name='opendbx'>
+	<flag name="opendbx">
 	An alternate statistics based storage engine.
 	</flag>
 </use>

diff --git a/mail-mta/exim/metadata.xml b/mail-mta/exim/metadata.xml
index 0315a95..816ff8e 100644
--- a/mail-mta/exim/metadata.xml
+++ b/mail-mta/exim/metadata.xml
@@ -16,31 +16,31 @@
 		quite different to that of sendmail.
 	</longdescription>
 	<use>
-		<flag name='dcc'>Adds support for Distributed Checksum Clearinghouse
+		<flag name="dcc">Adds support for Distributed Checksum Clearinghouse
 			(DCC)</flag>
-		<flag name='dane'>Adds support for DNS-based Authentication of Named Entities</flag>
-		<flag name='dkim'>Adds support for DomainKeys Identified Mail
+		<flag name="dane">Adds support for DNS-based Authentication of Named Entities</flag>
+		<flag name="dkim">Adds support for DomainKeys Identified Mail
 			(DKIM)</flag>
-		<flag name='dnsdb'>Adds support for a DNS search for a record whose
+		<flag name="dnsdb">Adds support for a DNS search for a record whose
 			domain name is the supplied query</flag>
-		<flag name='dovecot-sasl'>Adds support for Dovecot's
+		<flag name="dovecot-sasl">Adds support for Dovecot's
 			authentication</flag>
-		<flag name='dlfunc'>Install local_scan.h header to compile separate
+		<flag name="dlfunc">Install local_scan.h header to compile separate
 			dlfunc libraries</flag>
-		<flag name='dmarc'>Adds support for DMARC</flag>
-		<flag name='dsn'>Adds support for Delivery Status Notifications
+		<flag name="dmarc">Adds support for DMARC</flag>
+		<flag name="dsn">Adds support for Delivery Status Notifications
 			(DSN)</flag>
-		<flag name='exiscan-acl'>Patch providing support for content
+		<flag name="exiscan-acl">Patch providing support for content
 			scanning</flag>
-		<flag name='lmtp'>Adds support for lmtp</flag>
-		<flag name='mbx'>Adds support for UW's mbx format</flag>
-		<flag name='spf'>Adds support for Sender Policy Framework</flag>
-		<flag name='srs'>Adds support for Sender Rewriting Scheme</flag>
-		<flag name='proxy'>Add support for being behind a proxy, such as HAProxy</flag>
-		<flag name='pkcs11'>Require pkcs11 support in <pkg>net-libs/gnutls</pkg> with USE=gnutls</flag>
-		<flag name='redis'>Adds support for querying <pkg>dev-db/redis</pkg></flag>
-		<flag name='prdr'>Adds support for Per-Recipient Data Response</flag>
-		<flag name='tpda'>Adds support for Transport Post-Delivery Actions</flag>
+		<flag name="lmtp">Adds support for lmtp</flag>
+		<flag name="mbx">Adds support for UW's mbx format</flag>
+		<flag name="spf">Adds support for Sender Policy Framework</flag>
+		<flag name="srs">Adds support for Sender Rewriting Scheme</flag>
+		<flag name="proxy">Add support for being behind a proxy, such as HAProxy</flag>
+		<flag name="pkcs11">Require pkcs11 support in <pkg>net-libs/gnutls</pkg> with USE=gnutls</flag>
+		<flag name="redis">Adds support for querying <pkg>dev-db/redis</pkg></flag>
+		<flag name="prdr">Adds support for Per-Recipient Data Response</flag>
+		<flag name="tpda">Adds support for Transport Post-Delivery Actions</flag>
 	</use>
 	<upstream>
 		<bugs-to>http://bugs.exim.org/</bugs-to>

diff --git a/mail-mta/opensmtpd/metadata.xml b/mail-mta/opensmtpd/metadata.xml
index 23ffebf..09a82c4 100644
--- a/mail-mta/opensmtpd/metadata.xml
+++ b/mail-mta/opensmtpd/metadata.xml
@@ -9,7 +9,6 @@ OpenSMTPD is an implementation of the server-side SMTP protocol as defined by RF
 <name>Jason A. Donenfeld</name>
 </maintainer>
 <use>
-<flag name='mta'>Enable this to install as system-wide MTA</flag>
+<flag name="mta">Enable this to install as system-wide MTA</flag>
 </use>
 </pkgmetadata>
-

diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index 1e9d89e..b992965 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-mail</herd>

diff --git a/mail-mta/qpsmtpd/metadata.xml b/mail-mta/qpsmtpd/metadata.xml
index 6a67d9c..be57161 100644
--- a/mail-mta/qpsmtpd/metadata.xml
+++ b/mail-mta/qpsmtpd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>net-mail</herd>

diff --git a/mail-mta/ssmtp/metadata.xml b/mail-mta/ssmtp/metadata.xml
index 44448fe..82edd9a 100644
--- a/mail-mta/ssmtp/metadata.xml
+++ b/mail-mta/ssmtp/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <herd>net-mail</herd>
   <use>
-    <flag name='mta'>Install symlinks for sendmail-compatible MTA.</flag>
+    <flag name="mta">Install symlinks for sendmail-compatible MTA.</flag>
   </use>
 </pkgmetadata>

diff --git a/media-fonts/bitstream-cyberbit/metadata.xml b/media-fonts/bitstream-cyberbit/metadata.xml
index 0e0310e..328060b 100644
--- a/media-fonts/bitstream-cyberbit/metadata.xml
+++ b/media-fonts/bitstream-cyberbit/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-fonts/eb-garamond/metadata.xml b/media-fonts/eb-garamond/metadata.xml
index 526aedf..f48034f 100644
--- a/media-fonts/eb-garamond/metadata.xml
+++ b/media-fonts/eb-garamond/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>fonts</herd>

diff --git a/media-fonts/exljbris-free/metadata.xml b/media-fonts/exljbris-free/metadata.xml
index 45d8e5a..7a68d4d 100644
--- a/media-fonts/exljbris-free/metadata.xml
+++ b/media-fonts/exljbris-free/metadata.xml
@@ -7,4 +7,3 @@
 		Fontin Sans and Tallys.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/media-fonts/fifth-leg/metadata.xml b/media-fonts/fifth-leg/metadata.xml
index 0f6c71b..715bb3c 100644
--- a/media-fonts/fifth-leg/metadata.xml
+++ b/media-fonts/fifth-leg/metadata.xml
@@ -6,4 +6,3 @@
 Fifth Leg font is simplistic, technical sans serif. It is used for openSUSE branded material. Free alternative that mimics Cholla font.
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-fonts/intlfonts/metadata.xml b/media-fonts/intlfonts/metadata.xml
index 8d6a84c..3a0faca 100644
--- a/media-fonts/intlfonts/metadata.xml
+++ b/media-fonts/intlfonts/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>fonts</herd>
 <use>
-	<flag name='bdf'>Installs BDF fonts in addition to PCF</flag>
+	<flag name="bdf">Installs BDF fonts in addition to PCF</flag>
 </use>
 </pkgmetadata>

diff --git a/media-fonts/jsmath-extra-dark/metadata.xml b/media-fonts/jsmath-extra-dark/metadata.xml
index b657ba6..a751914 100644
--- a/media-fonts/jsmath-extra-dark/metadata.xml
+++ b/media-fonts/jsmath-extra-dark/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-mathematics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   Extra jsMath fonts, dark version. Used in math web sites.
 </longdescription>
 </pkgmetadata>

diff --git a/media-fonts/jsmath-extra-light/metadata.xml b/media-fonts/jsmath-extra-light/metadata.xml
index 593b325..fe7001d 100644
--- a/media-fonts/jsmath-extra-light/metadata.xml
+++ b/media-fonts/jsmath-extra-light/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-mathematics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   Extra jsMath fonts, light version. Used in math web sites.
 </longdescription>
 </pkgmetadata>

diff --git a/media-fonts/jsmath/metadata.xml b/media-fonts/jsmath/metadata.xml
index 5de508b..4743f52 100644
--- a/media-fonts/jsmath/metadata.xml
+++ b/media-fonts/jsmath/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-mathematics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   Rasterized fonts saved in image files to enable viewing of jsMath
   pages by a web-browser which is missing access to TeX fonts.
 </longdescription>

diff --git a/media-fonts/liberation-fonts/metadata.xml b/media-fonts/liberation-fonts/metadata.xml
index 6412fa6..ed1a4a1 100644
--- a/media-fonts/liberation-fonts/metadata.xml
+++ b/media-fonts/liberation-fonts/metadata.xml
@@ -6,7 +6,7 @@
 		<email>je_fro@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='fontforge'>Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
+		<flag name="fontforge">Use <pkg>media-gfx/fontforge</pkg> to build fonts from source</flag>
 	</use>
 	<longdescription lang="en">
 		A GPL-2 Helvetica/Times/Courier replacement TrueType font set, courtesy of Red Hat

diff --git a/media-fonts/lklug/metadata.xml b/media-fonts/lklug/metadata.xml
index 0f04489..38b5387 100644
--- a/media-fonts/lklug/metadata.xml
+++ b/media-fonts/lklug/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>fonts</herd>

diff --git a/media-fonts/pothana2k/metadata.xml b/media-fonts/pothana2k/metadata.xml
index 356cfa4..696065e 100644
--- a/media-fonts/pothana2k/metadata.xml
+++ b/media-fonts/pothana2k/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>fonts</herd>
 </pkgmetadata>
-

diff --git a/media-fonts/quivira/metadata.xml b/media-fonts/quivira/metadata.xml
index 0e0310e..328060b 100644
--- a/media-fonts/quivira/metadata.xml
+++ b/media-fonts/quivira/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-fonts/source-pro/metadata.xml b/media-fonts/source-pro/metadata.xml
index 70a22ad..81fc261 100644
--- a/media-fonts/source-pro/metadata.xml
+++ b/media-fonts/source-pro/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>fonts</herd>

diff --git a/media-fonts/symbola/metadata.xml b/media-fonts/symbola/metadata.xml
index 0e0310e..328060b 100644
--- a/media-fonts/symbola/metadata.xml
+++ b/media-fonts/symbola/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-gfx/autotrace/metadata.xml b/media-gfx/autotrace/metadata.xml
index 3245562..96803e9 100644
--- a/media-gfx/autotrace/metadata.xml
+++ b/media-gfx/autotrace/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>graphics</herd>

diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index f2841cf..6ffe7ac 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -19,24 +19,24 @@
   </longdescription>
 
   <use>
-    <flag name='game-engine' restrict='&gt;=media-gfx/blender-2.50'>
+    <flag name="game-engine" restrict="&gt;=media-gfx/blender-2.50">
       Adds Game Engine support to Blender.
     </flag>
-    <flag name='collada'>
+    <flag name="collada">
       Add support for Collada interchange format through
       <pkg>media-libs/opencollada</pkg>.
     </flag>
-    <flag name='cycles'>
+    <flag name="cycles">
       Build cycles renderer (requires <pkg>media-libs/openimageio</pkg> and
       <pkg>dev-libs/boost</pkg>).
     </flag>
-    <flag name='dds'>
+    <flag name="dds">
       Adds DDS textures support to Blender.
     </flag>
-    <flag name='player'>
+    <flag name="player">
       Build the Blender Player. THis requires the Game engine.
     </flag>
-    <flag name='elbeem'>
+    <flag name="elbeem">
       Adds surface fluid simulation to Blender using El'Beem library.
     </flag>
     <flag name="doc">

diff --git a/media-gfx/cellwriter/metadata.xml b/media-gfx/cellwriter/metadata.xml
index 530e784..e770d1b 100644
--- a/media-gfx/cellwriter/metadata.xml
+++ b/media-gfx/cellwriter/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>graphics</herd>
 </pkgmetadata>
-

diff --git a/media-gfx/cutycapt/metadata.xml b/media-gfx/cutycapt/metadata.xml
index 3e43c93..737fb5f 100644
--- a/media-gfx/cutycapt/metadata.xml
+++ b/media-gfx/cutycapt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/media-gfx/darktable/metadata.xml b/media-gfx/darktable/metadata.xml
index 5eef5f7..abd4ce3 100644
--- a/media-gfx/darktable/metadata.xml
+++ b/media-gfx/darktable/metadata.xml
@@ -21,4 +21,3 @@
 		<remote-id type="sourceforge">darktable</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/media-gfx/exact-image/metadata.xml b/media-gfx/exact-image/metadata.xml
index 39ad2ab..dfa41b3 100644
--- a/media-gfx/exact-image/metadata.xml
+++ b/media-gfx/exact-image/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>graphics</herd>
 <use>
-	<flag name='swig'>Adds Swig support <pkg>dev-lang/swig</pkg></flag>
+	<flag name="swig">Adds Swig support <pkg>dev-lang/swig</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/media-gfx/exiv2/metadata.xml b/media-gfx/exiv2/metadata.xml
index 795480e..c3371bd 100644
--- a/media-gfx/exiv2/metadata.xml
+++ b/media-gfx/exiv2/metadata.xml
@@ -8,7 +8,7 @@
 		write EXIF, IPTC and XMP image metadata.
 	</longdescription>
 	<use>
-		<flag name='contrib'>Build additional contrib components</flag>
-		<flag name='webready'>Support reading metadata over the internet</flag>
+		<flag name="contrib">Build additional contrib components</flag>
+		<flag name="webready">Support reading metadata over the internet</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-gfx/fbida/metadata.xml b/media-gfx/fbida/metadata.xml
index 99f7a4d..5181249 100644
--- a/media-gfx/fbida/metadata.xml
+++ b/media-gfx/fbida/metadata.xml
@@ -5,8 +5,8 @@
 <email>jer@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='fbcon'>Install the framebuffer image viewer "fbi"</flag>
-<flag name='X'>Install the Motif based image viewer "ida"</flag>
-<flag name='webp'>Enable support for the WebP image format</flag>
+<flag name="fbcon">Install the framebuffer image viewer "fbi"</flag>
+<flag name="X">Install the Motif based image viewer "ida"</flag>
+<flag name="webp">Enable support for the WebP image format</flag>
 </use>
 </pkgmetadata>

diff --git a/media-gfx/fondu/metadata.xml b/media-gfx/fondu/metadata.xml
index 04ef939..53e8fc8 100644
--- a/media-gfx/fondu/metadata.xml
+++ b/media-gfx/fondu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>fonts</herd>

diff --git a/media-gfx/fontforge/metadata.xml b/media-gfx/fontforge/metadata.xml
index feae06f..fdda9ca 100644
--- a/media-gfx/fontforge/metadata.xml
+++ b/media-gfx/fontforge/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>fonts</herd>

diff --git a/media-gfx/freecad/metadata.xml b/media-gfx/freecad/metadata.xml
index 6a07df4..b4e7941 100644
--- a/media-gfx/freecad/metadata.xml
+++ b/media-gfx/freecad/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-gfx/gimp-arrow-brushes/metadata.xml b/media-gfx/gimp-arrow-brushes/metadata.xml
index 034358f..cc36239 100644
--- a/media-gfx/gimp-arrow-brushes/metadata.xml
+++ b/media-gfx/gimp-arrow-brushes/metadata.xml
@@ -5,4 +5,4 @@
 	<email>pacho@gentoo.org</email>
 	<name>Pacho Ramos</name>
 </maintainer>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/media-gfx/hugin/metadata.xml b/media-gfx/hugin/metadata.xml
index e87859e..68c6182 100644
--- a/media-gfx/hugin/metadata.xml
+++ b/media-gfx/hugin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>graphics</herd>

diff --git a/media-gfx/icc_examin/metadata.xml b/media-gfx/icc_examin/metadata.xml
index 096b6f2..ff476b5 100644
--- a/media-gfx/icc_examin/metadata.xml
+++ b/media-gfx/icc_examin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-gfx/imageworsener/metadata.xml b/media-gfx/imageworsener/metadata.xml
index 8cd6f48..3c9dd7a 100644
--- a/media-gfx/imageworsener/metadata.xml
+++ b/media-gfx/imageworsener/metadata.xml
@@ -6,6 +6,6 @@
 	<name>Sebastian Pipping</name>
 </maintainer>
 <use>
-	<flag name='webp'>enable webp image format support</flag>
+	<flag name="webp">enable webp image format support</flag>
 </use>
 </pkgmetadata>

diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index 765f0ae..df4bab7 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>graphics</herd>

diff --git a/media-gfx/iscan-plugin-gt-f500/metadata.xml b/media-gfx/iscan-plugin-gt-f500/metadata.xml
index 2f94838..259f2b8 100644
--- a/media-gfx/iscan-plugin-gt-f500/metadata.xml
+++ b/media-gfx/iscan-plugin-gt-f500/metadata.xml
@@ -19,7 +19,7 @@
   </longdescription>
 
   <use>
-    <flag name='minimal'>
+    <flag name="minimal">
       Install the firmware only, and not the plugin.
     </flag>
   </use>

diff --git a/media-gfx/jpeg2ps/metadata.xml b/media-gfx/jpeg2ps/metadata.xml
index 19f4dfa..4048f76 100644
--- a/media-gfx/jpeg2ps/metadata.xml
+++ b/media-gfx/jpeg2ps/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>graphics</herd>
 <use>
-	<flag name='metric'>
+	<flag name="metric">
 		Default to A4 paper size
 	</flag>
 </use>

diff --git a/media-gfx/k3d/metadata.xml b/media-gfx/k3d/metadata.xml
index 9e499d3..815649b 100644
--- a/media-gfx/k3d/metadata.xml
+++ b/media-gfx/k3d/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>graphics</herd>

diff --git a/media-gfx/kflickr/metadata.xml b/media-gfx/kflickr/metadata.xml
index c04ae1d..850777e 100644
--- a/media-gfx/kflickr/metadata.xml
+++ b/media-gfx/kflickr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>

diff --git a/media-gfx/kiconedit/metadata.xml b/media-gfx/kiconedit/metadata.xml
index 6222792..8d1e86a 100644
--- a/media-gfx/kiconedit/metadata.xml
+++ b/media-gfx/kiconedit/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>kde</herd>
 </pkgmetadata>
-

diff --git a/media-gfx/mkgallery/metadata.xml b/media-gfx/mkgallery/metadata.xml
index 125072f..92d92ff 100644
--- a/media-gfx/mkgallery/metadata.xml
+++ b/media-gfx/mkgallery/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-gfx/mypaint/metadata.xml b/media-gfx/mypaint/metadata.xml
index 5e3a61a..77bb27a 100644
--- a/media-gfx/mypaint/metadata.xml
+++ b/media-gfx/mypaint/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-gfx/nip2/metadata.xml b/media-gfx/nip2/metadata.xml
index 4bae0b7..68e7450 100644
--- a/media-gfx/nip2/metadata.xml
+++ b/media-gfx/nip2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>graphics</herd>

diff --git a/media-gfx/nvidia-texture-tools/metadata.xml b/media-gfx/nvidia-texture-tools/metadata.xml
index c9e6515..848f698 100644
--- a/media-gfx/nvidia-texture-tools/metadata.xml
+++ b/media-gfx/nvidia-texture-tools/metadata.xml
@@ -5,8 +5,8 @@
 		<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>
-		<flag name='glew'>Enable support for The OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag>
+		<flag name="cg">Enable NVIDIA C graphics compiler toolkit plug-in</flag>
+		<flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>
+		<flag name="glew">Enable support for The OpenGL Extension Wrangler Library (<pkg>media-libs/glew</pkg>)</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-gfx/openexr_viewers/metadata.xml b/media-gfx/openexr_viewers/metadata.xml
index 68f5c47..505d9f2 100644
--- a/media-gfx/openexr_viewers/metadata.xml
+++ b/media-gfx/openexr_viewers/metadata.xml
@@ -6,6 +6,6 @@
 		<email>media-video@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='cg'>Add support for nvidia's cg shaders</flag>
+		<flag name="cg">Add support for nvidia's cg shaders</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-gfx/photoqt/metadata.xml b/media-gfx/photoqt/metadata.xml
index 417b83e..399fbb2 100644
--- a/media-gfx/photoqt/metadata.xml
+++ b/media-gfx/photoqt/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
   <herd>qt</herd>
   <use>
-    <flag name='exiv2'>
+    <flag name="exiv2">
       Use <pkg>media-gfx/exiv2</pkg> as optional dependency
     </flag>
-    <flag name='graphicsmagick'>
+    <flag name="graphicsmagick">
       Use <pkg>media-gfx/graphicsmagick</pkg> as optional dependency
     </flag>
   </use>

diff --git a/media-gfx/pinta/metadata.xml b/media-gfx/pinta/metadata.xml
index e34018d..7135366 100644
--- a/media-gfx/pinta/metadata.xml
+++ b/media-gfx/pinta/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/media-gfx/pixels2pgf/metadata.xml b/media-gfx/pixels2pgf/metadata.xml
index 1a7e726..15a4bd3 100644
--- a/media-gfx/pixels2pgf/metadata.xml
+++ b/media-gfx/pixels2pgf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-gfx/pornview/metadata.xml b/media-gfx/pornview/metadata.xml
index ceb29d5..e0c49af 100644
--- a/media-gfx/pornview/metadata.xml
+++ b/media-gfx/pornview/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-gfx/potrace/metadata.xml b/media-gfx/potrace/metadata.xml
index 6e7a692..9768ddf 100644
--- a/media-gfx/potrace/metadata.xml
+++ b/media-gfx/potrace/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>fonts</herd>

diff --git a/media-gfx/pycam/metadata.xml b/media-gfx/pycam/metadata.xml
index 1e3d48b..12d3f11 100644
--- a/media-gfx/pycam/metadata.xml
+++ b/media-gfx/pycam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-gfx/simple-scan/metadata.xml b/media-gfx/simple-scan/metadata.xml
index 006e40b..66fd195 100644
--- a/media-gfx/simple-scan/metadata.xml
+++ b/media-gfx/simple-scan/metadata.xml
@@ -15,4 +15,3 @@
 		<remote-id type="launchpad">simple-scan</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/media-gfx/viewnior/metadata.xml b/media-gfx/viewnior/metadata.xml
index b73e1c3..b264351 100644
--- a/media-gfx/viewnior/metadata.xml
+++ b/media-gfx/viewnior/metadata.xml
@@ -8,4 +8,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/media-gfx/xsane/metadata.xml b/media-gfx/xsane/metadata.xml
index a203d1b..f4ee349 100644
--- a/media-gfx/xsane/metadata.xml
+++ b/media-gfx/xsane/metadata.xml
@@ -7,6 +7,6 @@
 	<email>pacho@gentoo.org</email>
 </maintainer>
 <use>
-        <flag name='ocr'>Enable support for Optical Character Recognition reader</flag>
+        <flag name="ocr">Enable support for Optical Character Recognition reader</flag>
 </use>
 </pkgmetadata>

diff --git a/media-gfx/yafaray/metadata.xml b/media-gfx/yafaray/metadata.xml
index 3ec6e16..058d1eb 100644
--- a/media-gfx/yafaray/metadata.xml
+++ b/media-gfx/yafaray/metadata.xml
@@ -10,4 +10,3 @@ An render engine consists of a "faceless" computer program that interacts with a
 	<flag name="blender">install <pkg>media-gfx/blender</pkg> scripts</flag>
 </use>
 </pkgmetadata>
-

diff --git a/media-libs/SoXt/metadata.xml b/media-libs/SoXt/metadata.xml
index ed3a075..9f049b0 100644
--- a/media-libs/SoXt/metadata.xml
+++ b/media-libs/SoXt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-physics</herd>

diff --git a/media-libs/a52dec/metadata.xml b/media-libs/a52dec/metadata.xml
index 43ecccf..74493e6 100644
--- a/media-libs/a52dec/metadata.xml
+++ b/media-libs/a52dec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sound</herd>

diff --git a/media-libs/chromaprint/metadata.xml b/media-libs/chromaprint/metadata.xml
index d9e8bed..43c5734 100644
--- a/media-libs/chromaprint/metadata.xml
+++ b/media-libs/chromaprint/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sound</herd>

diff --git a/media-libs/edje/metadata.xml b/media-libs/edje/metadata.xml
index a87f862..799168d 100644
--- a/media-libs/edje/metadata.xml
+++ b/media-libs/edje/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='cache'>Enable caching</flag>
+	<flag name="cache">Enable caching</flag>
 </use>
 <longdescription>
 Edje is a complex graphical design and layout library.

diff --git a/media-libs/elementary/metadata.xml b/media-libs/elementary/metadata.xml
index a5064e0..2d945fa 100644
--- a/media-libs/elementary/metadata.xml
+++ b/media-libs/elementary/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='quicklaunch'>Enable quick-launch support</flag>
+	<flag name="quicklaunch">Enable quick-launch support</flag>
 </use>
 <longdescription>
 Elementary is a widget set. It is a new-style of widget set much more

diff --git a/media-libs/emotion/metadata.xml b/media-libs/emotion/metadata.xml
index 1fd15a0..225efc9 100644
--- a/media-libs/emotion/metadata.xml
+++ b/media-libs/emotion/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='vlc'>Enable support for the <pkg>media-video/vlc</pkg> player backend</flag>
+	<flag name="vlc">Enable support for the <pkg>media-video/vlc</pkg> player backend</flag>
 </use>
 </pkgmetadata>

diff --git a/media-libs/ethumb/metadata.xml b/media-libs/ethumb/metadata.xml
index da9ba6b..a54dd9c 100644
--- a/media-libs/ethumb/metadata.xml
+++ b/media-libs/ethumb/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='emotion'>Add support for <pkg>media-libs/emotion</pkg></flag>
+	<flag name="emotion">Add support for <pkg>media-libs/emotion</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/media-libs/evas/metadata.xml b/media-libs/evas/metadata.xml
index 338f21e..fb7ffee 100644
--- a/media-libs/evas/metadata.xml
+++ b/media-libs/evas/metadata.xml
@@ -1,16 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='bmp'>Support windows bitmap (bmp) image loader</flag>
-	<flag name='eet'>Support dev-libs/eet</flag>
-	<flag name='ico'>Support windows icon (ico) image loader</flag>
-	<flag name='gles'>Enable gles flavor of gl instead of standard</flag>
-	<flag name='ppm'>Support PPM image loader</flag>
-	<flag name='psd'>Support PSD image loader</flag>
-	<flag name='tga'>Support tga image loader</flag>
-	<flag name='wayland'>Add support for <pkg>dev-libs/wayland</pkg></flag>
+	<flag name="bmp">Support windows bitmap (bmp) image loader</flag>
+	<flag name="eet">Support dev-libs/eet</flag>
+	<flag name="ico">Support windows icon (ico) image loader</flag>
+	<flag name="gles">Enable gles flavor of gl instead of standard</flag>
+	<flag name="ppm">Support PPM image loader</flag>
+	<flag name="psd">Support PSD image loader</flag>
+	<flag name="tga">Support tga image loader</flag>
+	<flag name="wayland">Add support for <pkg>dev-libs/wayland</pkg></flag>
 </use>
 <longdescription>
 Evas is a hardware-accelerated canvas API for X-Windows that can draw 

diff --git a/media-libs/flac/metadata.xml b/media-libs/flac/metadata.xml
index 8aa52ec..a2b8f3b 100644
--- a/media-libs/flac/metadata.xml
+++ b/media-libs/flac/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>

diff --git a/media-libs/fnlib/metadata.xml b/media-libs/fnlib/metadata.xml
index 91cf3f1..ce1b87e 100644
--- a/media-libs/fnlib/metadata.xml
+++ b/media-libs/fnlib/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.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>
+	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/media-libs/freeverb3/metadata.xml b/media-libs/freeverb3/metadata.xml
index f75e7ca..2001569 100644
--- a/media-libs/freeverb3/metadata.xml
+++ b/media-libs/freeverb3/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>

diff --git a/media-libs/gd/metadata.xml b/media-libs/gd/metadata.xml
index 0502941..5d65c50 100644
--- a/media-libs/gd/metadata.xml
+++ b/media-libs/gd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>graphics</herd>

diff --git a/media-libs/glm/metadata.xml b/media-libs/glm/metadata.xml
index 5c60eb1..ff38ba0 100644
--- a/media-libs/glm/metadata.xml
+++ b/media-libs/glm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-libs/gmtk/metadata.xml b/media-libs/gmtk/metadata.xml
index 5e8e199..ba67427 100644
--- a/media-libs/gmtk/metadata.xml
+++ b/media-libs/gmtk/metadata.xml
@@ -6,6 +6,6 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='dconf'>Enable support for <pkg>gnome-base/dconf</pkg></flag>
+    <flag name="dconf">Enable support for <pkg>gnome-base/dconf</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/media-libs/gnonlin/metadata.xml b/media-libs/gnonlin/metadata.xml
index c8b7721..2eb27a7 100644
--- a/media-libs/gnonlin/metadata.xml
+++ b/media-libs/gnonlin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gstreamer</herd>

diff --git a/media-libs/grilo/metadata.xml b/media-libs/grilo/metadata.xml
index e7dd29b..a2dcfce 100644
--- a/media-libs/grilo/metadata.xml
+++ b/media-libs/grilo/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<herd>gnome</herd>
 	<use>
-		<flag name='network'>Enable network access for media discovery using
+		<flag name="network">Enable network access for media discovery using
 			<pkg>net-libs/libsoup</pkg></flag>
-		<flag name='playlist'>Enable support for playlists through
+		<flag name="playlist">Enable support for playlists through
 			<pkg>dev-libs/totem-pl-parser</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/media-libs/gst-plugins-ugly/metadata.xml b/media-libs/gst-plugins-ugly/metadata.xml
index 2c5774d..2e21904 100644
--- a/media-libs/gst-plugins-ugly/metadata.xml
+++ b/media-libs/gst-plugins-ugly/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gstreamer</herd>

diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 91eab26..ce816ad 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <longdescription>
@@ -46,6 +46,6 @@ installed - that is all - it does not require an XServer to run unless you wish
 to display images.
 </longdescription>
 <upstream>
-	<remote-id type='sourceforge'>enlightenment</remote-id>
+	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/media-libs/jbig2dec/metadata.xml b/media-libs/jbig2dec/metadata.xml
index 3396928..6a8762e 100644
--- a/media-libs/jbig2dec/metadata.xml
+++ b/media-libs/jbig2dec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>graphics</herd>

diff --git a/media-libs/jbigkit/metadata.xml b/media-libs/jbigkit/metadata.xml
index 58327d3..8a08fd3 100644
--- a/media-libs/jbigkit/metadata.xml
+++ b/media-libs/jbigkit/metadata.xml
@@ -7,4 +7,3 @@
 	high-resolution images such as fax pages or scanned documents.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/media-libs/kvazaar/metadata.xml b/media-libs/kvazaar/metadata.xml
index 1480a3a..b030196 100644
--- a/media-libs/kvazaar/metadata.xml
+++ b/media-libs/kvazaar/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>

diff --git a/media-libs/libXcm/metadata.xml b/media-libs/libXcm/metadata.xml
index b8863a3..d0bb9c4 100644
--- a/media-libs/libXcm/metadata.xml
+++ b/media-libs/libXcm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-libs/libafterimage/metadata.xml b/media-libs/libafterimage/metadata.xml
index 7a85a42..1aeaad4 100644
--- a/media-libs/libafterimage/metadata.xml
+++ b/media-libs/libafterimage/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-physics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   libAfterImage is a generic image manipulation library.
   It was initially implemented to address AfterStep Window Manager's needs for
   image handling, but it evolved into software suitable for project

diff --git a/media-libs/libass/metadata.xml b/media-libs/libass/metadata.xml
index afa2b53..511cf81 100644
--- a/media-libs/libass/metadata.xml
+++ b/media-libs/libass/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>

diff --git a/media-libs/libbdplus/metadata.xml b/media-libs/libbdplus/metadata.xml
index 17b802a..20932a6 100644
--- a/media-libs/libbdplus/metadata.xml
+++ b/media-libs/libbdplus/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <herd>video</herd>
   <use>
-    <flag name='aacs'>Add support for decryption of AACS</flag>
+    <flag name="aacs">Add support for decryption of AACS</flag>
   </use>
 </pkgmetadata>

diff --git a/media-libs/libbluray/metadata.xml b/media-libs/libbluray/metadata.xml
index 6f34503..1137d05 100644
--- a/media-libs/libbluray/metadata.xml
+++ b/media-libs/libbluray/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
   <herd>video</herd>
   <use>
-    <flag name='aacs'>Add support for decryption of AACS</flag>
-    <flag name='bdplus'>Use <pkg>media-libs/libbdplus</pkg> for BD+ decryption</flag>
-    <flag name='java'>Add support for BD-J</flag>
-	<flag name='udf'>Add UDF (Universal Disk Format) support</flag>
-    <flag name='utils'>Install command-line utilities and examples</flag>
+    <flag name="aacs">Add support for decryption of AACS</flag>
+    <flag name="bdplus">Use <pkg>media-libs/libbdplus</pkg> for BD+ decryption</flag>
+    <flag name="java">Add support for BD-J</flag>
+	<flag name="udf">Add UDF (Universal Disk Format) support</flag>
+    <flag name="utils">Install command-line utilities and examples</flag>
   </use>
 </pkgmetadata>

diff --git a/media-libs/libcanberra/metadata.xml b/media-libs/libcanberra/metadata.xml
index 0737312..048af1d 100644
--- a/media-libs/libcanberra/metadata.xml
+++ b/media-libs/libcanberra/metadata.xml
@@ -8,25 +8,25 @@
 		(http://0pointer.de/public/sound-theme-spec.html)
 	</longdescription>
 	<use>
-		<flag name='alsa'>Enables ALSA sound driver.</flag>
-		<flag name='gstreamer'>Enables gstreamer sound driver. Not useful when
+		<flag name="alsa">Enables ALSA sound driver.</flag>
+		<flag name="gstreamer">Enables gstreamer sound driver. Not useful when
 			alsa or pulseaudio is available.</flag>
-		<flag name='gtk'>Enables building of gtk+ helper library, gtk+ runtime
+		<flag name="gtk">Enables building of gtk+ helper library, gtk+ runtime
 			sound effects and the canberra-gtk-play utility. To enable the gtk+
 			sound effects add canberra-gtk-module to the colon separated list of
 			modules in the GTK_MODULES environment variable.</flag>
-		<flag name='gtk3'>Enables building of gtk+3 helper library, gtk+3
+		<flag name="gtk3">Enables building of gtk+3 helper library, gtk+3
 			runtime sound effects and the canberra-gtk-play utility. To enable
 			the gtk+3 sound effects add canberra-gtk-module to the colon
 			separated list of modules in the GTK_MODULES environment
 			variable.</flag>
-		<flag name='pulseaudio'>Enables PulseAudio sound driver that should be
+		<flag name="pulseaudio">Enables PulseAudio sound driver that should be
 			able to support positional event sounds. This is the preferred
 			choice for best sound events experience and picked by default if
 			compiled in and possible to use at runtime.</flag>
-		<flag name='sound'>Install x11-themes/sound-theme-freedesktop to get
+		<flag name="sound">Install x11-themes/sound-theme-freedesktop to get
 			sounds on Gnome and Xfce.</flag>
-		<flag name='tdb'>Enables Trivial Database support for caching
+		<flag name="tdb">Enables Trivial Database support for caching
 			purposes.</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
index a4ea11c..421725e 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/metadata.xml
@@ -7,9 +7,9 @@
     <name>Samuli Suominen</name>
   </maintainer>
   <use>
-    <flag name='archive'>Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
-    <flag name='gsf'>Enable OLE2 (MS Office) plug-in support using <pkg>gnome-base/libgsf</pkg></flag>
-    <flag name='magic'>Enable magic support using <pkg>sys-apps/file</pkg></flag>
-    <flag name='midi'>Enable MIDI support through <pkg>media-libs/libsmf</pkg></flag>
+    <flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
+    <flag name="gsf">Enable OLE2 (MS Office) plug-in support using <pkg>gnome-base/libgsf</pkg></flag>
+    <flag name="magic">Enable magic support using <pkg>sys-apps/file</pkg></flag>
+    <flag name="midi">Enable MIDI support through <pkg>media-libs/libsmf</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/media-libs/libgroove/metadata.xml b/media-libs/libgroove/metadata.xml
index f0312cc..da18ef7 100644
--- a/media-libs/libgroove/metadata.xml
+++ b/media-libs/libgroove/metadata.xml
@@ -11,9 +11,9 @@
 	This library provides decoding and encoding of audio on a playlist. It is intended to be used as a backend for music player applications. That said, it is also generic enough to be used as a backend for any streaming audio processing utility.
 </longdescription>
 <use>
-	<flag name='chromaprint'>Enable audio fingerprinting using <pkg>media-libs/chromaprint</pkg>.</flag>
-	<flag name='loudness'>Enable loudness detection according to the EBU R128 standard using <pkg>media-libs/libebur128</pkg>.</flag>
-	<flag name='sound'>Enable audio playing.</flag>
+	<flag name="chromaprint">Enable audio fingerprinting using <pkg>media-libs/chromaprint</pkg>.</flag>
+	<flag name="loudness">Enable loudness detection according to the EBU R128 standard using <pkg>media-libs/libebur128</pkg>.</flag>
+	<flag name="sound">Enable audio playing.</flag>
 </use>
 <upstream>
 	<maintainer status="active">

diff --git a/media-libs/libhdhomerun/metadata.xml b/media-libs/libhdhomerun/metadata.xml
index 0a94bad..d6b0729 100644
--- a/media-libs/libhdhomerun/metadata.xml
+++ b/media-libs/libhdhomerun/metadata.xml
@@ -6,4 +6,3 @@
 <name>Doug Goldstein</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-libs/libiec61883/metadata.xml b/media-libs/libiec61883/metadata.xml
index 7fbd877..6d0be58 100644
--- a/media-libs/libiec61883/metadata.xml
+++ b/media-libs/libiec61883/metadata.xml
@@ -14,4 +14,3 @@ MPEG2-TS, and AMDTP (audio and music) using only raw1394 and not the complicated
 setup and maintenance of other kernel modules and their /dev nodes.
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-libs/libmpeg2/metadata.xml b/media-libs/libmpeg2/metadata.xml
index 4ffd0a6..3086b17 100644
--- a/media-libs/libmpeg2/metadata.xml
+++ b/media-libs/libmpeg2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>

diff --git a/media-libs/libnsbmp/metadata.xml b/media-libs/libnsbmp/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/media-libs/libnsbmp/metadata.xml
+++ b/media-libs/libnsbmp/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-libs/libnsgif/metadata.xml b/media-libs/libnsgif/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/media-libs/libnsgif/metadata.xml
+++ b/media-libs/libnsgif/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-libs/libnut/metadata.xml b/media-libs/libnut/metadata.xml
index 6e18c68..42cce5e 100644
--- a/media-libs/libnut/metadata.xml
+++ b/media-libs/libnut/metadata.xml
@@ -9,4 +9,3 @@
 NUT is a container format under construction by MPlayer and FFmpeg developers.
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-libs/librosprite/metadata.xml b/media-libs/librosprite/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/media-libs/librosprite/metadata.xml
+++ b/media-libs/librosprite/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-libs/libsfml/metadata.xml b/media-libs/libsfml/metadata.xml
index b4ccfa3..57bd334 100644
--- a/media-libs/libsfml/metadata.xml
+++ b/media-libs/libsfml/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-libs/libsvgtiny/metadata.xml b/media-libs/libsvgtiny/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/media-libs/libsvgtiny/metadata.xml
+++ b/media-libs/libsvgtiny/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-libs/libv4l/metadata.xml b/media-libs/libv4l/metadata.xml
index 1e04bfc..1bcf6b6 100644
--- a/media-libs/libv4l/metadata.xml
+++ b/media-libs/libv4l/metadata.xml
@@ -25,4 +25,3 @@
 	application transparent libv4lconvert conversion where necessary.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/media-libs/libwebp/metadata.xml b/media-libs/libwebp/metadata.xml
index 1e4704a..bd83326 100644
--- a/media-libs/libwebp/metadata.xml
+++ b/media-libs/libwebp/metadata.xml
@@ -4,8 +4,8 @@
 	<herd>graphics</herd>
 	<herd>chromium</herd>
 	<use>
-		<flag name='experimental'>Build with -DWEBP_EXPERIMENTAL_FEATURES</flag>
-		<flag name='swap-16bit-csp'>Enable byte swapping for 16 bit colorspace</flag>
+		<flag name="experimental">Build with -DWEBP_EXPERIMENTAL_FEATURES</flag>
+		<flag name="swap-16bit-csp">Enable byte swapping for 16 bit colorspace</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">webp</remote-id>

diff --git a/media-libs/libyami/metadata.xml b/media-libs/libyami/metadata.xml
index f9490d9..129f1d6 100644
--- a/media-libs/libyami/metadata.xml
+++ b/media-libs/libyami/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>

diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml
index d1a38c6..4cb96e2 100644
--- a/media-libs/mesa/metadata.xml
+++ b/media-libs/mesa/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>x11</herd>

diff --git a/media-libs/netpbm/metadata.xml b/media-libs/netpbm/metadata.xml
index 972ef59..c53b711 100644
--- a/media-libs/netpbm/metadata.xml
+++ b/media-libs/netpbm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>graphics</herd>

diff --git a/media-libs/openal/metadata.xml b/media-libs/openal/metadata.xml
index 5f943cf..271c2e3 100644
--- a/media-libs/openal/metadata.xml
+++ b/media-libs/openal/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>sound</herd>
 	<use>
-		<flag name='alstream'>Build and install the FFmpeg based alstream example utility</flag>
+		<flag name="alstream">Build and install the FFmpeg based alstream example utility</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-libs/openctm/metadata.xml b/media-libs/openctm/metadata.xml
index b24c95e..5d3d4db 100644
--- a/media-libs/openctm/metadata.xml
+++ b/media-libs/openctm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>3dprint</herd>

diff --git a/media-libs/opusfile/metadata.xml b/media-libs/opusfile/metadata.xml
index 5d867fd..01e3207 100644
--- a/media-libs/opusfile/metadata.xml
+++ b/media-libs/opusfile/metadata.xml
@@ -6,8 +6,8 @@
 <name>Markos Chandras</name>
 </maintainer>
 <use>
-<flag name='fixed-point'>Enable fixed-point arithmetic operations</flag>
-<flag name='float'>Enable floating point arithmetic operations</flag>
-<flag name='http'>Enable http connections</flag>
+<flag name="fixed-point">Enable fixed-point arithmetic operations</flag>
+<flag name="float">Enable floating point arithmetic operations</flag>
+<flag name="http">Enable http connections</flag>
 </use>
 </pkgmetadata>

diff --git a/media-libs/oyranos/metadata.xml b/media-libs/oyranos/metadata.xml
index 1142ce5..634202d 100644
--- a/media-libs/oyranos/metadata.xml
+++ b/media-libs/oyranos/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-libs/plib/metadata.xml b/media-libs/plib/metadata.xml
index a93edc1..266d597 100644
--- a/media-libs/plib/metadata.xml
+++ b/media-libs/plib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/media-libs/sdl-image/metadata.xml b/media-libs/sdl-image/metadata.xml
index 9758b7a..de3f801 100644
--- a/media-libs/sdl-image/metadata.xml
+++ b/media-libs/sdl-image/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>games</herd>
 <use>
-	 <flag name='webp'>support loading WEBP images</flag>
+	 <flag name="webp">support loading WEBP images</flag>
 </use>
 </pkgmetadata>

diff --git a/media-libs/sdl-mixer/metadata.xml b/media-libs/sdl-mixer/metadata.xml
index f6db1ba..98a0875 100644
--- a/media-libs/sdl-mixer/metadata.xml
+++ b/media-libs/sdl-mixer/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
 <herd>games</herd>
 <use>
- <flag name='fluidsynth'>Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
- <flag name='midi'>basic support for MIDI files</flag>
- <flag name='mod'>basic support for MOD files</flag>
- <flag name='playtools'>Install playwave and playmus tools (useful for testing)</flag>
- <flag name='smpeg'>Use <pkg>media-libs/smpeg</pkg> for MP3 support</flag>
- <flag name='wav'>support WAVE files</flag>
+ <flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg> for MIDI support</flag>
+ <flag name="midi">basic support for MIDI files</flag>
+ <flag name="mod">basic support for MOD files</flag>
+ <flag name="playtools">Install playwave and playmus tools (useful for testing)</flag>
+ <flag name="smpeg">Use <pkg>media-libs/smpeg</pkg> for MP3 support</flag>
+ <flag name="wav">support WAVE files</flag>
 </use>
 </pkgmetadata>

diff --git a/media-libs/sdl-terminal/metadata.xml b/media-libs/sdl-terminal/metadata.xml
index bc9d5f9..75fc14c 100644
--- a/media-libs/sdl-terminal/metadata.xml
+++ b/media-libs/sdl-terminal/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>games</herd>

diff --git a/media-libs/sdl2-image/metadata.xml b/media-libs/sdl2-image/metadata.xml
index 2ee1978..7ac32c7 100644
--- a/media-libs/sdl2-image/metadata.xml
+++ b/media-libs/sdl2-image/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		 <flag name='webp'>support loading WEBP images</flag>
+		 <flag name="webp">support loading WEBP images</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-libs/sdl2-mixer/metadata.xml b/media-libs/sdl2-mixer/metadata.xml
index 0947c53..827251d 100644
--- a/media-libs/sdl2-mixer/metadata.xml
+++ b/media-libs/sdl2-mixer/metadata.xml
@@ -3,15 +3,15 @@
 <pkgmetadata>
 	<herd>games</herd>
 	<use>
-		<flag name='fluidsynth'>Use <pkg>media-sound/fluidsynth</pkg>
+		<flag name="fluidsynth">Use <pkg>media-sound/fluidsynth</pkg>
 			for MIDI support</flag>
-		<flag name='midi'>basic support for MIDI files</flag>
-		<flag name='mod'>basic support for MOD files</flag>
-		<flag name='playtools'>Install playwave and playmus tools (useful
+		<flag name="midi">basic support for MIDI files</flag>
+		<flag name="mod">basic support for MOD files</flag>
+		<flag name="playtools">Install playwave and playmus tools (useful
 			for testing)</flag>
-		<flag name='smpeg'>Use <pkg>media-libs/smpeg</pkg> for MP3 support
+		<flag name="smpeg">Use <pkg>media-libs/smpeg</pkg> for MP3 support
 		</flag>
-		<flag name='tremor'>enable OGG Vorbis music via libtremor</flag>
-		<flag name='wav'>support WAVE files</flag>
+		<flag name="tremor">enable OGG Vorbis music via libtremor</flag>
+		<flag name="wav">support WAVE files</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-libs/simage/metadata.xml b/media-libs/simage/metadata.xml
index f0f8dec..16be0db 100644
--- a/media-libs/simage/metadata.xml
+++ b/media-libs/simage/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-libs/spandsp/metadata.xml b/media-libs/spandsp/metadata.xml
index 185b740..76224cf 100644
--- a/media-libs/spandsp/metadata.xml
+++ b/media-libs/spandsp/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <maintainer><email>chainsaw@gentoo.org</email></maintainer>
   <use>
-	<flag name='fixed-point'>Enable fixed point support</flag>
+	<flag name="fixed-point">Enable fixed point support</flag>
   </use>
 </pkgmetadata>

diff --git a/media-libs/tremor/metadata.xml b/media-libs/tremor/metadata.xml
index 39ff199..a1063d4 100644
--- a/media-libs/tremor/metadata.xml
+++ b/media-libs/tremor/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>sound</herd>
 	<use>
-		<flag name='low-accuracy'>enable 32bit only multiply operations</flag>
+		<flag name="low-accuracy">enable 32bit only multiply operations</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-libs/vigra/metadata.xml b/media-libs/vigra/metadata.xml
index 5b58a21..20bfa75 100644
--- a/media-libs/vigra/metadata.xml
+++ b/media-libs/vigra/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>printing</herd>

diff --git a/media-libs/vips/metadata.xml b/media-libs/vips/metadata.xml
index 9207203..1115b2a 100644
--- a/media-libs/vips/metadata.xml
+++ b/media-libs/vips/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>graphics</herd>

diff --git a/media-libs/virglrenderer/metadata.xml b/media-libs/virglrenderer/metadata.xml
index a4357d4..a0569b3 100644
--- a/media-libs/virglrenderer/metadata.xml
+++ b/media-libs/virglrenderer/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>qemu</herd>
 </pkgmetadata>

diff --git a/media-libs/waffle/metadata.xml b/media-libs/waffle/metadata.xml
index dfd7cc8..4e444db 100644
--- a/media-libs/waffle/metadata.xml
+++ b/media-libs/waffle/metadata.xml
@@ -8,4 +8,3 @@
 	<flag name="wayland">Enable Wayland support</flag>
 </use>
 </pkgmetadata>
-

diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml
index 7a6a91d..65829b8 100644
--- a/media-libs/x265/metadata.xml
+++ b/media-libs/x265/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>

diff --git a/media-libs/zimg/metadata.xml b/media-libs/zimg/metadata.xml
index 95ff1d8..2ae9328 100644
--- a/media-libs/zimg/metadata.xml
+++ b/media-libs/zimg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>

diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index 731f28e..3b90ee9 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/metadata.xml
@@ -7,16 +7,16 @@
   <name>Tony Vroon</name>
 </maintainer>
 <use>
-	<flag name='adplug'>Build with AdPlug (Adlib sound card emulation)
+	<flag name="adplug">Build with AdPlug (Adlib sound card emulation)
 		support</flag>
-	<flag name='bs2b'>Enable Bauer Bauer stereophonic-to-binaural
+	<flag name="bs2b">Enable Bauer Bauer stereophonic-to-binaural
 		headphone filter</flag>
-	<flag name='cue'>Support CUE sheets using the libcue library</flag>
-	<flag name='fluidsynth'>Support FluidSynth as MIDI synth backend</flag>
-	<flag name='http'>Support HTTP streams through neon</flag>
+	<flag name="cue">Support CUE sheets using the libcue library</flag>
+	<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag>
+	<flag name="http">Support HTTP streams through neon</flag>
 	<flag name="gtk3">Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+)</flag>
-	<flag name='midi'>Build with amidi-plug (MIDI synth) support</flag>
-	<flag name='scrobbler'>Build with scrobbler/LastFM submission support</flag>
-	<flag name='sid'>Build with SID (Commodore 64 Audio) support</flag>
+	<flag name="midi">Build with amidi-plug (MIDI synth) support</flag>
+	<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
+	<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>
 </use>
 </pkgmetadata>

diff --git a/media-plugins/emotion_generic_players/metadata.xml b/media-plugins/emotion_generic_players/metadata.xml
index 71cdd72..99165ad 100644
--- a/media-plugins/emotion_generic_players/metadata.xml
+++ b/media-plugins/emotion_generic_players/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>

diff --git a/media-plugins/evas_generic_loaders/metadata.xml b/media-plugins/evas_generic_loaders/metadata.xml
index 71cdd72..99165ad 100644
--- a/media-plugins/evas_generic_loaders/metadata.xml
+++ b/media-plugins/evas_generic_loaders/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>

diff --git a/media-plugins/frei0r-plugins/metadata.xml b/media-plugins/frei0r-plugins/metadata.xml
index 296444e..e831e31 100644
--- a/media-plugins/frei0r-plugins/metadata.xml
+++ b/media-plugins/frei0r-plugins/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
   <herd>video</herd>
   <use>
-    <flag name='facedetect'>Enables building of facedetect plugin, which
+    <flag name="facedetect">Enables building of facedetect plugin, which
       depends on <pkg>media-libs/opencv</pkg>
     </flag>
-    <flag name='scale0tilt'>Enables building of scale0tilt and vectorscope
+    <flag name="scale0tilt">Enables building of scale0tilt and vectorscope
       plugins, which depend on <pkg>media-libs/gavl</pkg>
     </flag>
   </use>

diff --git a/media-plugins/gmpc-avahi/metadata.xml b/media-plugins/gmpc-avahi/metadata.xml
index 615a5d8..f939777 100644
--- a/media-plugins/gmpc-avahi/metadata.xml
+++ b/media-plugins/gmpc-avahi/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Christoph Mende</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/gst-plugins-libnice/metadata.xml b/media-plugins/gst-plugins-libnice/metadata.xml
index 7b25886..e9f6bc4 100644
--- a/media-plugins/gst-plugins-libnice/metadata.xml
+++ b/media-plugins/gst-plugins-libnice/metadata.xml
@@ -4,4 +4,3 @@
 <herd>gnome</herd>
 <herd>gstreamer</herd>
 </pkgmetadata>
-

diff --git a/media-plugins/gst-plugins-meta/metadata.xml b/media-plugins/gst-plugins-meta/metadata.xml
index 60872e4..bfe7a2c 100644
--- a/media-plugins/gst-plugins-meta/metadata.xml
+++ b/media-plugins/gst-plugins-meta/metadata.xml
@@ -10,12 +10,11 @@ plugins.  This will allow USE flags to be changed without re-compiling apps,
 since gstreamer plugins are all run-time dependencies.
 </longdescription>
 <use>
-	<flag name='http'>Enable http streaming via <pkg>net-libs/libsoup</pkg></flag>
-	<flag name='opus'>Enable Opus audio codec support</flag>
-	<flag name='libvisual'>Enable visualization effects via 
+	<flag name="http">Enable http streaming via <pkg>net-libs/libsoup</pkg></flag>
+	<flag name="opus">Enable Opus audio codec support</flag>
+	<flag name="libvisual">Enable visualization effects via 
 		<pkg>media-libs/libvisual</pkg></flag>
-	<flag name='vpx'>Enables vp8 codec support using libvpx, required to
+	<flag name="vpx">Enables vp8 codec support using libvpx, required to
 		play some HTML5 videos</flag>
 </use>
 </pkgmetadata>
-

diff --git a/media-plugins/gst-plugins-vaapi/metadata.xml b/media-plugins/gst-plugins-vaapi/metadata.xml
index f075f16..b591b2b 100644
--- a/media-plugins/gst-plugins-vaapi/metadata.xml
+++ b/media-plugins/gst-plugins-vaapi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gstreamer</herd>

diff --git a/media-plugins/hexter/metadata.xml b/media-plugins/hexter/metadata.xml
index 878957e..7453a0f 100644
--- a/media-plugins/hexter/metadata.xml
+++ b/media-plugins/hexter/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>proaudio</herd>
   <use>
-    <flag name='gtk2'>Enable <pkg>x11-libs/gtk+:2</pkg> based GUI</flag>
+    <flag name="gtk2">Enable <pkg>x11-libs/gtk+:2</pkg> based GUI</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">dssi</remote-id>

diff --git a/media-plugins/imlib2_loaders/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index 58032d5..596ac20 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='eet'>Enable Eet image loader</flag>
-	<flag name='xcf'>Enable XCF image loader</flag>
+	<flag name="eet">Enable Eet image loader</flag>
+	<flag name="xcf">Enable XCF image loader</flag>
 </use>
 <longdescription>
 additional image library loaders for imlib2
 </longdescription>
 <upstream>
-	<remote-id type='sourceforge'>enlightenment</remote-id>
+	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/media-plugins/mda-lv2/metadata.xml b/media-plugins/mda-lv2/metadata.xml
index f973c5a..a9d9d38 100644
--- a/media-plugins/mda-lv2/metadata.xml
+++ b/media-plugins/mda-lv2/metadata.xml
@@ -5,7 +5,7 @@
 <longdescription lang="en">
 	MDA-LV2 is an LV2 port of the MDA plugins by Paul Kellett. It contains 36 high-quality plugins for a variety of tasks.
 
-	This is a more or less faithful port of both the effects and instrument plugins. The only functional difference in code is to support LV2-style toggle ports (> 0.0 is on, rather than 0.5). All the plugins have been tested, and thanks to several bug fixes this collection should be more reliable than the original.
+	This is a more or less faithful port of both the effects and instrument plugins. The only functional difference in code is to support LV2-style toggle ports (&gt; 0.0 is on, rather than 0.5). All the plugins have been tested, and thanks to several bug fixes this collection should be more reliable than the original.
 
 	No custom UIs are included, however control ports are grouped and given designations where appropriate, so hosts should be able to generate a good generic UI. The original "programs" are available as standard LV2 presets. The documentation from the old web site has been included in the data files and is readable by hosts, so detailed port and plugin documentation can be made available in the UI. This is intended to establish a precedent; hosts are encouraged to make this information somehow visible (currently at least Ardour 3 and Jalv support this by showing tooltips for controls, and Ardour has a drop down pane for the plugin description).
 

diff --git a/media-plugins/mediastreamer-amr/metadata.xml b/media-plugins/mediastreamer-amr/metadata.xml
index b10fb8d..ee2fca9 100644
--- a/media-plugins/mediastreamer-amr/metadata.xml
+++ b/media-plugins/mediastreamer-amr/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Andrew Savchenko</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/mediastreamer-ilbc/metadata.xml b/media-plugins/mediastreamer-ilbc/metadata.xml
index bef02d1..8a73e52 100644
--- a/media-plugins/mediastreamer-ilbc/metadata.xml
+++ b/media-plugins/mediastreamer-ilbc/metadata.xml
@@ -6,9 +6,8 @@
 		<name>Andrew Savchenko</name>
 	</maintainer>
 	<use>
-		<flag name='20ms-frames'>enable 20ms frame size (default is 30ms). Some
+		<flag name="20ms-frames">enable 20ms frame size (default is 30ms). Some
 		VOIP providers such as Gizmo5 (aka Sipphone) require the codec to be
 		compiled with the 30ms setting.</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/media-plugins/qmmp-plugin-pack/metadata.xml b/media-plugins/qmmp-plugin-pack/metadata.xml
index 1ed066c..94277f8 100644
--- a/media-plugins/qmmp-plugin-pack/metadata.xml
+++ b/media-plugins/qmmp-plugin-pack/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/quodlibet-plugins/metadata.xml b/media-plugins/quodlibet-plugins/metadata.xml
index 8b51913..a007fa2 100644
--- a/media-plugins/quodlibet-plugins/metadata.xml
+++ b/media-plugins/quodlibet-plugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-plugins/vamp-aubio-plugins/metadata.xml b/media-plugins/vamp-aubio-plugins/metadata.xml
index c225d33..5179b9f 100644
--- a/media-plugins/vamp-aubio-plugins/metadata.xml
+++ b/media-plugins/vamp-aubio-plugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proaudio</herd>

diff --git a/media-plugins/vdr-actuator/metadata.xml b/media-plugins/vdr-actuator/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-actuator/metadata.xml
+++ b/media-plugins/vdr-actuator/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-alcd/metadata.xml b/media-plugins/vdr-alcd/metadata.xml
index b3d0dc1..4964df7 100644
--- a/media-plugins/vdr-alcd/metadata.xml
+++ b/media-plugins/vdr-alcd/metadata.xml
@@ -16,4 +16,3 @@
 VDR plugin: Control the LCD of the Siemens Activy 300
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-arghdirector/metadata.xml b/media-plugins/vdr-arghdirector/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-arghdirector/metadata.xml
+++ b/media-plugins/vdr-arghdirector/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-atscepg/metadata.xml b/media-plugins/vdr-atscepg/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-atscepg/metadata.xml
+++ b/media-plugins/vdr-atscepg/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-audiorecorder/metadata.xml b/media-plugins/vdr-audiorecorder/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-audiorecorder/metadata.xml
+++ b/media-plugins/vdr-audiorecorder/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-avards/metadata.xml b/media-plugins/vdr-avards/metadata.xml
index b9c00d0..7b718b6 100644
--- a/media-plugins/vdr-avards/metadata.xml
+++ b/media-plugins/vdr-avards/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-bgprocess/metadata.xml b/media-plugins/vdr-bgprocess/metadata.xml
index 1d6580f..6b00253 100644
--- a/media-plugins/vdr-bgprocess/metadata.xml
+++ b/media-plugins/vdr-bgprocess/metadata.xml
@@ -7,4 +7,3 @@
     <name>Gentoo VDR Project</name>
   </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-browse/metadata.xml b/media-plugins/vdr-browse/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-browse/metadata.xml
+++ b/media-plugins/vdr-browse/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-burn/metadata.xml b/media-plugins/vdr-burn/metadata.xml
index 073e327..0f7a546 100644
--- a/media-plugins/vdr-burn/metadata.xml
+++ b/media-plugins/vdr-burn/metadata.xml
@@ -8,6 +8,6 @@
     </maintainer>
     <longdescription>VDR plugin to burn DVD's and DVD file structures</longdescription>
 	<use>
-		<flag name='dvdarchive'>DMH DVD - Archive</flag>
+		<flag name="dvdarchive">DMH DVD - Archive</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-plugins/vdr-calc/metadata.xml b/media-plugins/vdr-calc/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-calc/metadata.xml
+++ b/media-plugins/vdr-calc/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-cdplayer/metadata.xml b/media-plugins/vdr-cdplayer/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-cdplayer/metadata.xml
+++ b/media-plugins/vdr-cdplayer/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-chanman/metadata.xml b/media-plugins/vdr-chanman/metadata.xml
index 6782567..cbc3523 100644
--- a/media-plugins/vdr-chanman/metadata.xml
+++ b/media-plugins/vdr-chanman/metadata.xml
@@ -17,4 +17,3 @@
 </maintainer>
 
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-channelblocker/metadata.xml b/media-plugins/vdr-channelblocker/metadata.xml
index b9c00d0..7b718b6 100644
--- a/media-plugins/vdr-channelblocker/metadata.xml
+++ b/media-plugins/vdr-channelblocker/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-cinebars/metadata.xml b/media-plugins/vdr-cinebars/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-cinebars/metadata.xml
+++ b/media-plugins/vdr-cinebars/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-coverviewer/metadata.xml b/media-plugins/vdr-coverviewer/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-coverviewer/metadata.xml
+++ b/media-plugins/vdr-coverviewer/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-cpumon/metadata.xml b/media-plugins/vdr-cpumon/metadata.xml
index b9c00d0..7b718b6 100644
--- a/media-plugins/vdr-cpumon/metadata.xml
+++ b/media-plugins/vdr-cpumon/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-decruft/metadata.xml b/media-plugins/vdr-decruft/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-decruft/metadata.xml
+++ b/media-plugins/vdr-decruft/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-devstatus/metadata.xml b/media-plugins/vdr-devstatus/metadata.xml
index 1d6580f..6b00253 100644
--- a/media-plugins/vdr-devstatus/metadata.xml
+++ b/media-plugins/vdr-devstatus/metadata.xml
@@ -7,4 +7,3 @@
     <name>Gentoo VDR Project</name>
   </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-dummydevice/metadata.xml b/media-plugins/vdr-dummydevice/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-dummydevice/metadata.xml
+++ b/media-plugins/vdr-dummydevice/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-duplicates/metadata.xml b/media-plugins/vdr-duplicates/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-duplicates/metadata.xml
+++ b/media-plugins/vdr-duplicates/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-dvd/metadata.xml b/media-plugins/vdr-dvd/metadata.xml
index 3c31aa0..bdc2d42 100644
--- a/media-plugins/vdr-dvd/metadata.xml
+++ b/media-plugins/vdr-dvd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>media-tv</herd>

diff --git a/media-plugins/vdr-epgsearch/metadata.xml b/media-plugins/vdr-epgsearch/metadata.xml
index 256c709..a5a8c51 100644
--- a/media-plugins/vdr-epgsearch/metadata.xml
+++ b/media-plugins/vdr-epgsearch/metadata.xml
@@ -15,4 +15,3 @@
 	<flag name="tre">Add support for unlimited fuzzy searching with help of <pkg>dev-libs/tre</pkg> library</flag>
 </use>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-exec/metadata.xml b/media-plugins/vdr-exec/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-exec/metadata.xml
+++ b/media-plugins/vdr-exec/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-femon/metadata.xml b/media-plugins/vdr-femon/metadata.xml
index 8614b9d..ac95271 100644
--- a/media-plugins/vdr-femon/metadata.xml
+++ b/media-plugins/vdr-femon/metadata.xml
@@ -8,4 +8,3 @@
 	</maintainer>
 	<longdescription>vdr Plugin: DVB Frontend Status Monitor (signal strengt/noise)</longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-fepg/metadata.xml b/media-plugins/vdr-fepg/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-fepg/metadata.xml
+++ b/media-plugins/vdr-fepg/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-filebrowser/metadata.xml b/media-plugins/vdr-filebrowser/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-filebrowser/metadata.xml
+++ b/media-plugins/vdr-filebrowser/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-fritzbox/metadata.xml b/media-plugins/vdr-fritzbox/metadata.xml
index b9c00d0..7b718b6 100644
--- a/media-plugins/vdr-fritzbox/metadata.xml
+++ b/media-plugins/vdr-fritzbox/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-graphtft/metadata.xml b/media-plugins/vdr-graphtft/metadata.xml
index d676578..3e10421 100644
--- a/media-plugins/vdr-graphtft/metadata.xml
+++ b/media-plugins/vdr-graphtft/metadata.xml
@@ -7,11 +7,11 @@
 		<name>Gentoo VDR Project</name>
     </maintainer>
 	<use>
-		<flag name='graphtft-fe'>Install external x11 remote frontend</flag>
-		<flag name='theme_avp'>graphTFT Alien vs. Predato theme</flag>
-		<flag name='theme_deepblue'>graphTFT default theme</flag>
-		<flag name='theme_deeppurple'>graphTFT Deep Purple theme</flag>
-		<flag name='theme_poetter'>graphTFT Poetter theme</flag>
-		<flag name='touchscreen'>Enable Touchscreen support</flag>
+		<flag name="graphtft-fe">Install external x11 remote frontend</flag>
+		<flag name="theme_avp">graphTFT Alien vs. Predato theme</flag>
+		<flag name="theme_deepblue">graphTFT default theme</flag>
+		<flag name="theme_deeppurple">graphTFT Deep Purple theme</flag>
+		<flag name="theme_poetter">graphTFT Poetter theme</flag>
+		<flag name="touchscreen">Enable Touchscreen support</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-plugins/vdr-iptv/metadata.xml b/media-plugins/vdr-iptv/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-iptv/metadata.xml
+++ b/media-plugins/vdr-iptv/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-joystick/metadata.xml b/media-plugins/vdr-joystick/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-joystick/metadata.xml
+++ b/media-plugins/vdr-joystick/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-launcher/metadata.xml b/media-plugins/vdr-launcher/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-launcher/metadata.xml
+++ b/media-plugins/vdr-launcher/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-live/metadata.xml b/media-plugins/vdr-live/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-live/metadata.xml
+++ b/media-plugins/vdr-live/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-mailbox/metadata.xml b/media-plugins/vdr-mailbox/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-mailbox/metadata.xml
+++ b/media-plugins/vdr-mailbox/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-markad/metadata.xml b/media-plugins/vdr-markad/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-markad/metadata.xml
+++ b/media-plugins/vdr-markad/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-mlist/metadata.xml b/media-plugins/vdr-mlist/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-mlist/metadata.xml
+++ b/media-plugins/vdr-mlist/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-mount/metadata.xml b/media-plugins/vdr-mount/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-mount/metadata.xml
+++ b/media-plugins/vdr-mount/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-music/metadata.xml b/media-plugins/vdr-music/metadata.xml
index 8360ea6..20dc06c 100644
--- a/media-plugins/vdr-music/metadata.xml
+++ b/media-plugins/vdr-music/metadata.xml
@@ -7,8 +7,7 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 <use>
-	<flag name='graphtft'>Enable support for
+	<flag name="graphtft">Enable support for
 		<pkg>media-plugins/vdr-graphtft</pkg></flag>
 </use>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-newsticker/metadata.xml b/media-plugins/vdr-newsticker/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-newsticker/metadata.xml
+++ b/media-plugins/vdr-newsticker/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-osdpip/metadata.xml b/media-plugins/vdr-osdpip/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-osdpip/metadata.xml
+++ b/media-plugins/vdr-osdpip/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-osdserver/metadata.xml b/media-plugins/vdr-osdserver/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-osdserver/metadata.xml
+++ b/media-plugins/vdr-osdserver/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-peer/metadata.xml b/media-plugins/vdr-peer/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-peer/metadata.xml
+++ b/media-plugins/vdr-peer/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-permashift/metadata.xml b/media-plugins/vdr-permashift/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-permashift/metadata.xml
+++ b/media-plugins/vdr-permashift/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-picselshow/metadata.xml b/media-plugins/vdr-picselshow/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-picselshow/metadata.xml
+++ b/media-plugins/vdr-picselshow/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-pilot/metadata.xml b/media-plugins/vdr-pilot/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-pilot/metadata.xml
+++ b/media-plugins/vdr-pilot/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-pilotskin/metadata.xml b/media-plugins/vdr-pilotskin/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-pilotskin/metadata.xml
+++ b/media-plugins/vdr-pilotskin/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-prefermenu/metadata.xml b/media-plugins/vdr-prefermenu/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-prefermenu/metadata.xml
+++ b/media-plugins/vdr-prefermenu/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-proxy/metadata.xml b/media-plugins/vdr-proxy/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-proxy/metadata.xml
+++ b/media-plugins/vdr-proxy/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-pvr350/metadata.xml b/media-plugins/vdr-pvr350/metadata.xml
index 520eec8..b228325 100644
--- a/media-plugins/vdr-pvr350/metadata.xml
+++ b/media-plugins/vdr-pvr350/metadata.xml
@@ -7,8 +7,7 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 <use>
-	<flag name='yaepg'>Enables full support for the output format of
+	<flag name="yaepg">Enables full support for the output format of
 		<pkg>media-plugins/vdr-yaepg</pkg></flag>
 </use>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-pvrinput/metadata.xml b/media-plugins/vdr-pvrinput/metadata.xml
index bb6229e..26edd48 100644
--- a/media-plugins/vdr-pvrinput/metadata.xml
+++ b/media-plugins/vdr-pvrinput/metadata.xml
@@ -10,4 +10,3 @@
 		Plugin to use a PVR* card as input device for VDR	
 	</longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-quicktimer/metadata.xml b/media-plugins/vdr-quicktimer/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-quicktimer/metadata.xml
+++ b/media-plugins/vdr-quicktimer/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-radiolist/metadata.xml b/media-plugins/vdr-radiolist/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-radiolist/metadata.xml
+++ b/media-plugins/vdr-radiolist/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-recstatus/metadata.xml b/media-plugins/vdr-recstatus/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-recstatus/metadata.xml
+++ b/media-plugins/vdr-recstatus/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-remote/metadata.xml b/media-plugins/vdr-remote/metadata.xml
index 12de1a6..8bd006c 100644
--- a/media-plugins/vdr-remote/metadata.xml
+++ b/media-plugins/vdr-remote/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-rotor/metadata.xml b/media-plugins/vdr-rotor/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-rotor/metadata.xml
+++ b/media-plugins/vdr-rotor/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-rssreader/metadata.xml b/media-plugins/vdr-rssreader/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-rssreader/metadata.xml
+++ b/media-plugins/vdr-rssreader/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-satip/metadata.xml b/media-plugins/vdr-satip/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-satip/metadata.xml
+++ b/media-plugins/vdr-satip/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-scheduler/metadata.xml b/media-plugins/vdr-scheduler/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-scheduler/metadata.xml
+++ b/media-plugins/vdr-scheduler/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-screenshot/metadata.xml b/media-plugins/vdr-screenshot/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-screenshot/metadata.xml
+++ b/media-plugins/vdr-screenshot/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-serial/metadata.xml b/media-plugins/vdr-serial/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-serial/metadata.xml
+++ b/media-plugins/vdr-serial/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-skincurses/metadata.xml b/media-plugins/vdr-skincurses/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-skincurses/metadata.xml
+++ b/media-plugins/vdr-skincurses/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-sleeptimer/metadata.xml b/media-plugins/vdr-sleeptimer/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-sleeptimer/metadata.xml
+++ b/media-plugins/vdr-sleeptimer/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-sndctl/metadata.xml b/media-plugins/vdr-sndctl/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-sndctl/metadata.xml
+++ b/media-plugins/vdr-sndctl/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-solitaire/metadata.xml b/media-plugins/vdr-solitaire/metadata.xml
index b9c00d0..7b718b6 100644
--- a/media-plugins/vdr-solitaire/metadata.xml
+++ b/media-plugins/vdr-solitaire/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-spider/metadata.xml b/media-plugins/vdr-spider/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-spider/metadata.xml
+++ b/media-plugins/vdr-spider/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-suspendoutput/metadata.xml b/media-plugins/vdr-suspendoutput/metadata.xml
index b9c00d0..7b718b6 100644
--- a/media-plugins/vdr-suspendoutput/metadata.xml
+++ b/media-plugins/vdr-suspendoutput/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-systeminfo/metadata.xml b/media-plugins/vdr-systeminfo/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-systeminfo/metadata.xml
+++ b/media-plugins/vdr-systeminfo/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-ttxtsubs/metadata.xml b/media-plugins/vdr-ttxtsubs/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-ttxtsubs/metadata.xml
+++ b/media-plugins/vdr-ttxtsubs/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-vcd/metadata.xml b/media-plugins/vdr-vcd/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-vcd/metadata.xml
+++ b/media-plugins/vdr-vcd/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-vdrmanager/metadata.xml b/media-plugins/vdr-vdrmanager/metadata.xml
index 2eaf325..957b9a1 100644
--- a/media-plugins/vdr-vdrmanager/metadata.xml
+++ b/media-plugins/vdr-vdrmanager/metadata.xml
@@ -10,4 +10,3 @@
 		<flag name="stream">Add support for streaming Video to Android client</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-videosystem/metadata.xml b/media-plugins/vdr-videosystem/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-videosystem/metadata.xml
+++ b/media-plugins/vdr-videosystem/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-vodcatcher/metadata.xml b/media-plugins/vdr-vodcatcher/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-vodcatcher/metadata.xml
+++ b/media-plugins/vdr-vodcatcher/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-wapd/metadata.xml b/media-plugins/vdr-wapd/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-wapd/metadata.xml
+++ b/media-plugins/vdr-wapd/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-weatherng/metadata.xml b/media-plugins/vdr-weatherng/metadata.xml
index 0e65e6e..3b68ca7 100644
--- a/media-plugins/vdr-weatherng/metadata.xml
+++ b/media-plugins/vdr-weatherng/metadata.xml
@@ -11,6 +11,6 @@
 		Show weahter data for your City.
 	</longdescription>
 	<use>
-		<flag name='dxr3'>enables lower osd color depth for dxr3 cards</flag>
+		<flag name="dxr3">enables lower osd color depth for dxr3 cards</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-plugins/vdr-wirbelscan/metadata.xml b/media-plugins/vdr-wirbelscan/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-wirbelscan/metadata.xml
+++ b/media-plugins/vdr-wirbelscan/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-xineliboutput/metadata.xml b/media-plugins/vdr-xineliboutput/metadata.xml
index d0cf10c..cea235f 100644
--- a/media-plugins/vdr-xineliboutput/metadata.xml
+++ b/media-plugins/vdr-xineliboutput/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>media-tv</herd>

diff --git a/media-plugins/vdr-zaphistory/metadata.xml b/media-plugins/vdr-zaphistory/metadata.xml
index d1b88e6..905c548 100644
--- a/media-plugins/vdr-zaphistory/metadata.xml
+++ b/media-plugins/vdr-zaphistory/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-plugins/vdr-zappilot/metadata.xml b/media-plugins/vdr-zappilot/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-plugins/vdr-zappilot/metadata.xml
+++ b/media-plugins/vdr-zappilot/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-radio/ax25-tools/metadata.xml b/media-radio/ax25-tools/metadata.xml
index c0e910e..39e9066 100644
--- a/media-radio/ax25-tools/metadata.xml
+++ b/media-radio/ax25-tools/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Thomas Beierlein</name>
 	</maintainer>
 	<use>
-		<flag name='X'>Enable some X based configuration tools.</flag>
+		<flag name="X">Enable some X based configuration tools.</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-radio/fldigi/metadata.xml b/media-radio/fldigi/metadata.xml
index 83e507b..0b8afaf 100644
--- a/media-radio/fldigi/metadata.xml
+++ b/media-radio/fldigi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-radio/flrig/metadata.xml b/media-radio/flrig/metadata.xml
index ec0480b..835c76c 100644
--- a/media-radio/flrig/metadata.xml
+++ b/media-radio/flrig/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Thomas Beierlein</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-radio/radiotray/metadata.xml b/media-radio/radiotray/metadata.xml
index 3a9f2bc..258766c 100644
--- a/media-radio/radiotray/metadata.xml
+++ b/media-radio/radiotray/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-radio/tucnak2/metadata.xml b/media-radio/tucnak2/metadata.xml
index 762649e..c38877c 100644
--- a/media-radio/tucnak2/metadata.xml
+++ b/media-radio/tucnak2/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Thomas Beierlein</name>
 	</maintainer>
 	<use>
-		<flag name='ftdi'>Enable support for FTDI USB chips</flag>
-		<flag name='hamlib'>Enables support by the Hamlib amateur radio 
+		<flag name="ftdi">Enable support for FTDI USB chips</flag>
+		<flag name="hamlib">Enables support by the Hamlib amateur radio 
 		rig control library to get/set frequency and mode of the  ham radio</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-sound/a2jmidid/metadata.xml b/media-sound/a2jmidid/metadata.xml
index b6dce26..9c64e0e 100644
--- a/media-sound/a2jmidid/metadata.xml
+++ b/media-sound/a2jmidid/metadata.xml
@@ -12,4 +12,3 @@
 		<name>Jouni Rinne</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-sound/abcde/metadata.xml b/media-sound/abcde/metadata.xml
index 00db7c7..02333a8 100644
--- a/media-sound/abcde/metadata.xml
+++ b/media-sound/abcde/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<herd>sound</herd>
 	<use>
-		<flag name='id3tag'>Support ID3, ID3v2 tagging of audio files</flag>
-		<flag name='mac'>Enable support for Monkey's Audio files</flag>
-		<flag name='normalize'>Add support for normalizing audio file volume levels</flag>
-		<flag name='opus'>Support opus encoding using opusenc</flag>
-		<flag name='replaygain'>Support for Replay Gain metadata, for relative volume adjustment</flag>
+		<flag name="id3tag">Support ID3, ID3v2 tagging of audio files</flag>
+		<flag name="mac">Enable support for Monkey's Audio files</flag>
+		<flag name="normalize">Add support for normalizing audio file volume levels</flag>
+		<flag name="opus">Support opus encoding using opusenc</flag>
+		<flag name="replaygain">Support for Replay Gain metadata, for relative volume adjustment</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-sound/abcmidi/metadata.xml b/media-sound/abcmidi/metadata.xml
index 16a5795..b67060c 100644
--- a/media-sound/abcmidi/metadata.xml
+++ b/media-sound/abcmidi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>

diff --git a/media-sound/asunder/metadata.xml b/media-sound/asunder/metadata.xml
index 0daab18..21e8ec2 100644
--- a/media-sound/asunder/metadata.xml
+++ b/media-sound/asunder/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>sound</herd>
 <use>
-  <flag name='mac'>Support for creation of Monkey's Audio files (APE)</flag>
-  <flag name='opus'>Support for creation of Opus files</flag>
+  <flag name="mac">Support for creation of Monkey's Audio files (APE)</flag>
+  <flag name="opus">Support for creation of Opus files</flag>
 </use>
 </pkgmetadata>

diff --git a/media-sound/audicle/metadata.xml b/media-sound/audicle/metadata.xml
index 46de6f0..1da582d 100644
--- a/media-sound/audicle/metadata.xml
+++ b/media-sound/audicle/metadata.xml
@@ -10,4 +10,3 @@
 		runtime environment
 	</longdescription>
 </pkgmetadata>
-

diff --git a/media-sound/baudline/metadata.xml b/media-sound/baudline/metadata.xml
index 67c501e..73b0a83 100644
--- a/media-sound/baudline/metadata.xml
+++ b/media-sound/baudline/metadata.xml
@@ -9,4 +9,3 @@
 Baudline is a time-frequency browser designed for scientific visualization of the spectral domain.  Signal analysis is performed by Fourier, correlation, and raster transforms that create colorful spectrograms with vibrant detail.  Conduct test and measurement experiments with the built in function generator, or play back audio files with a multitude of effects and filters.  The baudline signal analyzer combines fast digital signal processing, versatile high speed displays, and continuous capture tools for hunting down and studying elusive signal characteristics.
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-sound/cmix/metadata.xml b/media-sound/cmix/metadata.xml
index 4505d60..eccafa9 100644
--- a/media-sound/cmix/metadata.xml
+++ b/media-sound/cmix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>

diff --git a/media-sound/cmus/metadata.xml b/media-sound/cmus/metadata.xml
index f25fd5a..5851341 100644
--- a/media-sound/cmus/metadata.xml
+++ b/media-sound/cmus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sound</herd>

diff --git a/media-sound/easytag/metadata.xml b/media-sound/easytag/metadata.xml
index 9ba357e..5a1b546 100644
--- a/media-sound/easytag/metadata.xml
+++ b/media-sound/easytag/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<herd>sound</herd>
 	<use>
-		<flag name='opus'>Enable support for <pkg>media-libs/opus</pkg> and <pkg>media-libs/opusfile</pkg> (opus audio codec)</flag>
-		<flag name='gtk2'>Enable GTK+:2 support and disable default GTK+:3 support</flag>
-		<flag name='gtk3'>Enable GTK+:3 support (default) and disable GTK+:2 support</flag>
+		<flag name="opus">Enable support for <pkg>media-libs/opus</pkg> and <pkg>media-libs/opusfile</pkg> (opus audio codec)</flag>
+		<flag name="gtk2">Enable GTK+:2 support and disable default GTK+:3 support</flag>
+		<flag name="gtk3">Enable GTK+:3 support (default) and disable GTK+:2 support</flag>
 	</use>
 	<longdescription>a utility for viewing and editing tags for MP3, MP2, FLAC, AAC, MP4 and OGG files. It features a simple and attractive GTK+ interface</longdescription>
 </pkgmetadata>

diff --git a/media-sound/entagged-tageditor/metadata.xml b/media-sound/entagged-tageditor/metadata.xml
index b4a1240..d996167 100644
--- a/media-sound/entagged-tageditor/metadata.xml
+++ b/media-sound/entagged-tageditor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/media-sound/flack/metadata.xml b/media-sound/flack/metadata.xml
index 86cfb5b..926971b 100644
--- a/media-sound/flack/metadata.xml
+++ b/media-sound/flack/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>

diff --git a/media-sound/fluid-soundfont/metadata.xml b/media-sound/fluid-soundfont/metadata.xml
index 6ccc15e..4c753d6 100644
--- a/media-sound/fluid-soundfont/metadata.xml
+++ b/media-sound/fluid-soundfont/metadata.xml
@@ -15,4 +15,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-sound/freebirth/metadata.xml b/media-sound/freebirth/metadata.xml
index 33401c0..d9ad748 100644
--- a/media-sound/freebirth/metadata.xml
+++ b/media-sound/freebirth/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>

diff --git a/media-sound/google-musicmanager/metadata.xml b/media-sound/google-musicmanager/metadata.xml
index 5a0d1e7..e94526a 100644
--- a/media-sound/google-musicmanager/metadata.xml
+++ b/media-sound/google-musicmanager/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Christoph Junghans</name>
 	</maintainer>
 	<use>
-		<flag name='log'>Enables advanced logging through <pkg>dev-libs/log4cxx</pkg></flag>
+		<flag name="log">Enables advanced logging through <pkg>dev-libs/log4cxx</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/media-sound/gpodder/metadata.xml b/media-sound/gpodder/metadata.xml
index 95d4e38..bf727c4 100644
--- a/media-sound/gpodder/metadata.xml
+++ b/media-sound/gpodder/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <herd>sound</herd>
   <use>
-    <flag name='webkit'>Enable the webkit rendering engine for HTML episode shownotes</flag>
+    <flag name="webkit">Enable the webkit rendering engine for HTML episode shownotes</flag>
   </use>
 </pkgmetadata>

diff --git a/media-sound/id3ted/metadata.xml b/media-sound/id3ted/metadata.xml
index 9506ae1..ae573a6 100644
--- a/media-sound/id3ted/metadata.xml
+++ b/media-sound/id3ted/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>sound</herd>
 </pkgmetadata>
-

diff --git a/media-sound/jack-rack/metadata.xml b/media-sound/jack-rack/metadata.xml
index 5419d50..c4d8e2d 100644
--- a/media-sound/jack-rack/metadata.xml
+++ b/media-sound/jack-rack/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proaudio</herd>

diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
index 456baec..3455b86 100644
--- a/media-sound/kid3/metadata.xml
+++ b/media-sound/kid3/metadata.xml
@@ -4,7 +4,7 @@
   <herd>kde</herd>
   <herd>sound</herd>
   <use>
-    <flag name='acoustid'>Enable support for acoustic fingerprinting plugin using
+    <flag name="acoustid">Enable support for acoustic fingerprinting plugin using
       (<pkg>media-libs/chromaprint</pkg>)</flag>
 	<flag name="phonon">Enable sound support via <pkg>media-libs/phonon</pkg> or <pkg>dev-qt/qtphonon</pkg></flag>
   </use>

diff --git a/media-sound/lmms/metadata.xml b/media-sound/lmms/metadata.xml
index d3252e4..076791f 100644
--- a/media-sound/lmms/metadata.xml
+++ b/media-sound/lmms/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proaudio</herd>

diff --git a/media-sound/miniaudicle/metadata.xml b/media-sound/miniaudicle/metadata.xml
index ac5c422..90d20a8 100644
--- a/media-sound/miniaudicle/metadata.xml
+++ b/media-sound/miniaudicle/metadata.xml
@@ -9,4 +9,3 @@
 		audio programming language
 	</longdescription>
 </pkgmetadata>
-

diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 213c0e5..8d08bbb 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proaudio</herd>

diff --git a/media-sound/mp3unicode/metadata.xml b/media-sound/mp3unicode/metadata.xml
index 4cce0e4..d620a24 100644
--- a/media-sound/mp3unicode/metadata.xml
+++ b/media-sound/mp3unicode/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>

diff --git a/media-sound/mumble/metadata.xml b/media-sound/mumble/metadata.xml
index 1e264d9..ef9d695 100644
--- a/media-sound/mumble/metadata.xml
+++ b/media-sound/mumble/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-sound/murmur/metadata.xml b/media-sound/murmur/metadata.xml
index c3cf346..1200d06 100644
--- a/media-sound/murmur/metadata.xml
+++ b/media-sound/murmur/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-sound/musescore/metadata.xml b/media-sound/musescore/metadata.xml
index 2e93e39..d6612ec 100644
--- a/media-sound/musescore/metadata.xml
+++ b/media-sound/musescore/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>

diff --git a/media-sound/ncmpcpp/metadata.xml b/media-sound/ncmpcpp/metadata.xml
index 9a964f3..26ee4d9 100644
--- a/media-sound/ncmpcpp/metadata.xml
+++ b/media-sound/ncmpcpp/metadata.xml
@@ -10,9 +10,9 @@
 		<name>Alex Alexander</name>
 	</maintainer>
 	<use>
-		<flag name='clock'>Enable clock screen</flag>
-		<flag name='outputs'>Enable outputs screen</flag>
-		<flag name='visualizer'>Enable visualizer screen with sound wave/frequency
+		<flag name="clock">Enable clock screen</flag>
+		<flag name="outputs">Enable outputs screen</flag>
+		<flag name="visualizer">Enable visualizer screen with sound wave/frequency
 			spectrum modes</flag>
 	</use>
 	<longdescription lang="en">

diff --git a/media-sound/ogg2mp3/metadata.xml b/media-sound/ogg2mp3/metadata.xml
index 73b5b3c..c1af6c1 100644
--- a/media-sound/ogg2mp3/metadata.xml
+++ b/media-sound/ogg2mp3/metadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
   <herd>sound</herd>
   <herd>proxy-maintainers</herd>

diff --git a/media-sound/patchage/metadata.xml b/media-sound/patchage/metadata.xml
index 081cbd6..2f46d3c 100644
--- a/media-sound/patchage/metadata.xml
+++ b/media-sound/patchage/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
   <herd>proaudio</herd>
   <use>
-    <flag name='jack-dbus'>Use Jack via D-Bus instead of libjack</flag>
-    <flag name='session'>Include experimental Jack session management
+    <flag name="jack-dbus">Use Jack via D-Bus instead of libjack</flag>
+    <flag name="session">Include experimental Jack session management
       (save/restore) support</flag>
   </use>
   <longdescription lang="en">

diff --git a/media-sound/picard/metadata.xml b/media-sound/picard/metadata.xml
index cce6e75..3e7045f 100644
--- a/media-sound/picard/metadata.xml
+++ b/media-sound/picard/metadata.xml
@@ -7,6 +7,6 @@
   tagger for MusicBrainz, with a focus on album oriented tagging as opposed to
   track based tagging and cross platform compatibility.</longdescription>
 <use>
-  <flag name='acoustid'>Use media-libs/chromaprint for acoustic fingerprinting</flag>
+  <flag name="acoustid">Use media-libs/chromaprint for acoustic fingerprinting</flag>
 </use>
 </pkgmetadata>

diff --git a/media-sound/pms/metadata.xml b/media-sound/pms/metadata.xml
index d2eb8d6..00948a1 100644
--- a/media-sound/pms/metadata.xml
+++ b/media-sound/pms/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-sound/pnmixer/metadata.xml b/media-sound/pnmixer/metadata.xml
index 39a15f4..d67fe79 100644
--- a/media-sound/pnmixer/metadata.xml
+++ b/media-sound/pnmixer/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Julian Ospald</name>
 	</maintainer>
 	<natural-name>PNMixer</natural-name>
-	<longdescription lang='en'>
+	<longdescription lang="en">
 		PNMixer is a simple mixer application designed to run in your system
 		tray. It integrates nicely into desktop environments that don't have
 		a panel that supports applets, and therefore can't run a mixer applet.
@@ -46,11 +46,11 @@
 		<changelog>https://github.com/nicklan/pnmixer/releases</changelog>
 		<doc lang="en">https://github.com/nicklan/pnmixer/wiki</doc>
 		<remote-id type="github">nicklan/pnmixer</remote-id>
-		<maintainer status='active'>
+		<maintainer status="active">
 			<email>hasufell@gentoo.org</email>
 			<name>Julian Ospald</name>
 		</maintainer>
-		<maintainer status='active'>
+		<maintainer status="active">
 			<email>elboulangero@gmail.com</email>
 			<name>El Boulangero</name>
 		</maintainer>

diff --git a/media-sound/podcatcher/metadata.xml b/media-sound/podcatcher/metadata.xml
index 11f794c..c7e80b8 100644
--- a/media-sound/podcatcher/metadata.xml
+++ b/media-sound/podcatcher/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sound</herd>

diff --git a/media-sound/protux/metadata.xml b/media-sound/protux/metadata.xml
index c766d89..f5ceb67 100644
--- a/media-sound/protux/metadata.xml
+++ b/media-sound/protux/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proaudio</herd>

diff --git a/media-sound/pulseaudio/metadata.xml b/media-sound/pulseaudio/metadata.xml
index 2bc5264..11ddd79 100644
--- a/media-sound/pulseaudio/metadata.xml
+++ b/media-sound/pulseaudio/metadata.xml
@@ -64,7 +64,7 @@
     <flag name="xen">
       Builds a special paravirtualized module for running in a Xen guest.
     </flag>
-    <flag name='systemd'>
+    <flag name="systemd">
       Build with <pkg>sys-apps/systemd</pkg> support to replace standalone
       ConsoleKit.
     </flag>

diff --git a/media-sound/qsampler/metadata.xml b/media-sound/qsampler/metadata.xml
index b995f03..fcd3400 100644
--- a/media-sound/qsampler/metadata.xml
+++ b/media-sound/qsampler/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sound</herd>

diff --git a/media-sound/qtmpc/metadata.xml b/media-sound/qtmpc/metadata.xml
index 721dd1c..a23f444 100644
--- a/media-sound/qtmpc/metadata.xml
+++ b/media-sound/qtmpc/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>kde</herd>
 </pkgmetadata>
-

diff --git a/media-sound/quodlibet/metadata.xml b/media-sound/quodlibet/metadata.xml
index 54acacd..6b9595c 100644
--- a/media-sound/quodlibet/metadata.xml
+++ b/media-sound/quodlibet/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-sound/rip/metadata.xml b/media-sound/rip/metadata.xml
index 74533d4..93a666f 100644
--- a/media-sound/rip/metadata.xml
+++ b/media-sound/rip/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>

diff --git a/media-sound/scmpc/metadata.xml b/media-sound/scmpc/metadata.xml
index fb7ec4a..fcc6fe9 100644
--- a/media-sound/scmpc/metadata.xml
+++ b/media-sound/scmpc/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Christoph Mende</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-sound/shnflacverify/metadata.xml b/media-sound/shnflacverify/metadata.xml
index cd16bf6..7589313 100644
--- a/media-sound/shnflacverify/metadata.xml
+++ b/media-sound/shnflacverify/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-sound/shoutcast-search/metadata.xml b/media-sound/shoutcast-search/metadata.xml
index c85742a..3239b7b 100644
--- a/media-sound/shoutcast-search/metadata.xml
+++ b/media-sound/shoutcast-search/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>

diff --git a/media-sound/sndpeek/metadata.xml b/media-sound/sndpeek/metadata.xml
index 278cb63..0aef688 100644
--- a/media-sound/sndpeek/metadata.xml
+++ b/media-sound/sndpeek/metadata.xml
@@ -6,4 +6,3 @@
 		real-time audio visualization
 	</longdescription>
 </pkgmetadata>
-

diff --git a/media-sound/splay/metadata.xml b/media-sound/splay/metadata.xml
index 4482850..a60a876 100644
--- a/media-sound/splay/metadata.xml
+++ b/media-sound/splay/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sound</herd>

diff --git a/media-sound/spotify/metadata.xml b/media-sound/spotify/metadata.xml
index 2829164..0cc64f1 100644
--- a/media-sound/spotify/metadata.xml
+++ b/media-sound/spotify/metadata.xml
@@ -11,4 +11,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-sound/tomahawk/metadata.xml b/media-sound/tomahawk/metadata.xml
index 55e1aa0..bec753f 100644
--- a/media-sound/tomahawk/metadata.xml
+++ b/media-sound/tomahawk/metadata.xml
@@ -11,4 +11,3 @@
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/media-sound/vdramgw/metadata.xml b/media-sound/vdramgw/metadata.xml
index b9c00d0..7b718b6 100644
--- a/media-sound/vdramgw/metadata.xml
+++ b/media-sound/vdramgw/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-sound/wildmidi/metadata.xml b/media-sound/wildmidi/metadata.xml
index 05909c5..263a40c 100644
--- a/media-sound/wildmidi/metadata.xml
+++ b/media-sound/wildmidi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-sound/xwax/metadata.xml b/media-sound/xwax/metadata.xml
index bc38d78..545a18a 100644
--- a/media-sound/xwax/metadata.xml
+++ b/media-sound/xwax/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
 	<herd>sound</herd>
 	<use>
-		<flag name='alsa'>Adds support for ALSA audio input/output.</flag>
-		<flag name='jack'>Adds support for audio input/output via the JACK Audio Connection Kit.</flag>
-		<flag name='oss'>Adds support for OSS (open sound system) audio input/output.</flag>
-		<flag name='cdda'>Sets runtime dependencies to support decoding audio from a compact disc.</flag>
-		<flag name='mp3'>Sets runtime dependencies to support decoding MP3 audio.</flag>
-		<flag name='fallback'>Sets runtime dependencies to support decoding "other" audio files.</flag>
+		<flag name="alsa">Adds support for ALSA audio input/output.</flag>
+		<flag name="jack">Adds support for audio input/output via the JACK Audio Connection Kit.</flag>
+		<flag name="oss">Adds support for OSS (open sound system) audio input/output.</flag>
+		<flag name="cdda">Sets runtime dependencies to support decoding audio from a compact disc.</flag>
+		<flag name="mp3">Sets runtime dependencies to support decoding MP3 audio.</flag>
+		<flag name="fallback">Sets runtime dependencies to support decoding "other" audio files.</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-tv/dvbstream/metadata.xml b/media-tv/dvbstream/metadata.xml
index 57ad5ee..d95d55a 100644
--- a/media-tv/dvbstream/metadata.xml
+++ b/media-tv/dvbstream/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>media-tv</herd>

diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
index 41825e8..a05dcb6 100644
--- a/media-tv/kodi/metadata.xml
+++ b/media-tv/kodi/metadata.xml
@@ -4,24 +4,24 @@
 <herd>xbox</herd>
 <herd>video</herd>
 <use>
- <flag name='airplay'>enable AirPlay support</flag>
- <flag name='bluray'>Enable playback of Blu-ray filesystems</flag>
- <flag name='cec'>Enable support for HDMI-CEC devices via libcec</flag>
- <flag name='fishbmc'>Enable fishBMC visualization plugin</flag>
- <flag name='gles'>Enable support for GLES</flag>
- <flag name='goom'>Enable GOOM visualization plugin</flag>
- <flag name='midi'>Support MIDI files</flag>
- <flag name='nfs'>Enable NFS client support</flag>
- <flag name='projectm'>Enable projectM visualization plugin</flag>
- <flag name='pvr'>Enable MythTV support</flag>
- <flag name='rtmp'>Enable Real Time Messaging Protocol using librtmp</flag>
- <flag name='rsxs'>Enable really slick X screensavers</flag>
- <flag name='sftp'>Support browsing files over SFTP</flag>
- <flag name='spectrum'>Enable spectrum visualization plugin</flag>
- <flag name='texturepacker'>Support packing skin textures</flag>
- <flag name='waveform'>Enable waveform visualization plugin</flag>
- <flag name='webserver'>Enable internal webserver</flag>
- <flag name='xrandr'>Support X randr extension</flag>
+ <flag name="airplay">enable AirPlay support</flag>
+ <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
+ <flag name="cec">Enable support for HDMI-CEC devices via libcec</flag>
+ <flag name="fishbmc">Enable fishBMC visualization plugin</flag>
+ <flag name="gles">Enable support for GLES</flag>
+ <flag name="goom">Enable GOOM visualization plugin</flag>
+ <flag name="midi">Support MIDI files</flag>
+ <flag name="nfs">Enable NFS client support</flag>
+ <flag name="projectm">Enable projectM visualization plugin</flag>
+ <flag name="pvr">Enable MythTV support</flag>
+ <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
+ <flag name="rsxs">Enable really slick X screensavers</flag>
+ <flag name="sftp">Support browsing files over SFTP</flag>
+ <flag name="spectrum">Enable spectrum visualization plugin</flag>
+ <flag name="texturepacker">Support packing skin textures</flag>
+ <flag name="waveform">Enable waveform visualization plugin</flag>
+ <flag name="webserver">Enable internal webserver</flag>
+ <flag name="xrandr">Support X randr extension</flag>
 </use>
 <upstream>
  <bugs-to>http://trac.kodi.tv/</bugs-to>

diff --git a/media-tv/linuxtv-dvb-firmware/metadata.xml b/media-tv/linuxtv-dvb-firmware/metadata.xml
index 740fefd..a6b9e38 100644
--- a/media-tv/linuxtv-dvb-firmware/metadata.xml
+++ b/media-tv/linuxtv-dvb-firmware/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>media-tv</herd>
 </pkgmetadata>
-

diff --git a/media-tv/me-tv/metadata.xml b/media-tv/me-tv/metadata.xml
index 056e935..07a130c 100644
--- a/media-tv/me-tv/metadata.xml
+++ b/media-tv/me-tv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>media-tv</herd>

diff --git a/media-tv/shoutcast2vdr/metadata.xml b/media-tv/shoutcast2vdr/metadata.xml
index d1b88e6..905c548 100644
--- a/media-tv/shoutcast2vdr/metadata.xml
+++ b/media-tv/shoutcast2vdr/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-tv/tvbrowser/metadata.xml b/media-tv/tvbrowser/metadata.xml
index 87bd0a7..a4609f4 100644
--- a/media-tv/tvbrowser/metadata.xml
+++ b/media-tv/tvbrowser/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>java</herd>

diff --git a/media-tv/tvheadend/metadata.xml b/media-tv/tvheadend/metadata.xml
index 154ca4b..dc0fc18 100644
--- a/media-tv/tvheadend/metadata.xml
+++ b/media-tv/tvheadend/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/media-tv/tvmovie2vdr/metadata.xml b/media-tv/tvmovie2vdr/metadata.xml
index b9c00d0..7b718b6 100644
--- a/media-tv/tvmovie2vdr/metadata.xml
+++ b/media-tv/tvmovie2vdr/metadata.xml
@@ -7,4 +7,3 @@
 		<name>Gentoo VDR Project</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/media-tv/xbmc/metadata.xml b/media-tv/xbmc/metadata.xml
index f753e5f..6cbfa2d 100644
--- a/media-tv/xbmc/metadata.xml
+++ b/media-tv/xbmc/metadata.xml
@@ -4,21 +4,21 @@
 <herd>xbox</herd>
 <herd>video</herd>
 <use>
- <flag name='airplay'>enable AirPlay support</flag>
- <flag name='bluray'>Enable playback of Blu-ray filesystems</flag>
- <flag name='cec'>Enable support for HDMI-CEC devices via libcec</flag>
- <flag name='fishbmc'>Enable fishBMC visualization plugin</flag>
- <flag name='gles'>Enable support for GLES</flag>
- <flag name='goom'>Enable GOOM visualization plugin</flag>
- <flag name='midi'>Support MIDI files</flag>
- <flag name='nfs'>Enable NFS client support</flag>
- <flag name='projectm'>Enable projectM visualization plugin</flag>
- <flag name='pvr'>Enable MythTV support</flag>
- <flag name='rtmp'>Enable Real Time Messaging Protocol using librtmp</flag>
- <flag name='rsxs'>Enable really slick X screensavers</flag>
- <flag name='sftp'>Support browsing files over SFTP</flag>
- <flag name='webserver'>Enable internal webserver</flag>
- <flag name='xrandr'>Support X randr extension</flag>
+ <flag name="airplay">enable AirPlay support</flag>
+ <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
+ <flag name="cec">Enable support for HDMI-CEC devices via libcec</flag>
+ <flag name="fishbmc">Enable fishBMC visualization plugin</flag>
+ <flag name="gles">Enable support for GLES</flag>
+ <flag name="goom">Enable GOOM visualization plugin</flag>
+ <flag name="midi">Support MIDI files</flag>
+ <flag name="nfs">Enable NFS client support</flag>
+ <flag name="projectm">Enable projectM visualization plugin</flag>
+ <flag name="pvr">Enable MythTV support</flag>
+ <flag name="rtmp">Enable Real Time Messaging Protocol using librtmp</flag>
+ <flag name="rsxs">Enable really slick X screensavers</flag>
+ <flag name="sftp">Support browsing files over SFTP</flag>
+ <flag name="webserver">Enable internal webserver</flag>
+ <flag name="xrandr">Support X randr extension</flag>
 </use>
 <upstream>
  <bugs-to>http://trac.kodi.tv/</bugs-to>

diff --git a/media-video/aravis/metadata.xml b/media-video/aravis/metadata.xml
index 32f225f..2c30643 100644
--- a/media-video/aravis/metadata.xml
+++ b/media-video/aravis/metadata.xml
@@ -7,13 +7,13 @@
   </maintainer>
 
   <use>
-    <flag name='X'>
+    <flag name="X">
       Build the GTK+-based video viewer for aravis. This requires
       GStreamer and a few plugins but technically not the GST plugin
       for aravis.
     </flag>
 
-    <flag name='gstreamer'>
+    <flag name="gstreamer">
       Build the GStreamer plugin for aravis, but not the video viewer.
     </flag>
   </use>

diff --git a/media-video/arista/metadata.xml b/media-video/arista/metadata.xml
index b8c8bd5..19b380c 100644
--- a/media-video/arista/metadata.xml
+++ b/media-video/arista/metadata.xml
@@ -10,4 +10,3 @@
 		media files for a specified device.</flag>
   </use>
 </pkgmetadata>
-

diff --git a/media-video/atomicparsley-wez/metadata.xml b/media-video/atomicparsley-wez/metadata.xml
index ddfe6ea..fba78be 100644
--- a/media-video/atomicparsley-wez/metadata.xml
+++ b/media-video/atomicparsley-wez/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>

diff --git a/media-video/bbtools/metadata.xml b/media-video/bbtools/metadata.xml
index 421b924..f26a52c 100644
--- a/media-video/bbtools/metadata.xml
+++ b/media-video/bbtools/metadata.xml
@@ -14,4 +14,3 @@ bbvinfo: an MPEG-1 or MPEG-2 video stream analyzer
 bbainfo: an MPEG-1 audio stream analyzer
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-video/cheese/metadata.xml b/media-video/cheese/metadata.xml
index d9b68e4..4b9fd4d 100644
--- a/media-video/cheese/metadata.xml
+++ b/media-video/cheese/metadata.xml
@@ -7,4 +7,3 @@
 		effects, and lets you share the fun with others.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/media-video/dvd9to5/metadata.xml b/media-video/dvd9to5/metadata.xml
index 6c50827..4f753aa 100644
--- a/media-video/dvd9to5/metadata.xml
+++ b/media-video/dvd9to5/metadata.xml
@@ -9,4 +9,3 @@
 A program to rip double layer discs (9gig) to single layer discs (5 gig).
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-video/dvdrip/metadata.xml b/media-video/dvdrip/metadata.xml
index 56992d0..4fd94f1 100644
--- a/media-video/dvdrip/metadata.xml
+++ b/media-video/dvdrip/metadata.xml
@@ -6,7 +6,7 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='fping'>Enables fping support for cluster rendering</flag>
-    <flag name='subtitles'>Enables support for subtitle ripping</flag>
+    <flag name="fping">Enables fping support for cluster rendering</flag>
+    <flag name="subtitles">Enables support for subtitle ripping</flag>
   </use>
 </pkgmetadata>

diff --git a/media-video/ffdiaporama/metadata.xml b/media-video/ffdiaporama/metadata.xml
index 3271eed..93804e1 100644
--- a/media-video/ffdiaporama/metadata.xml
+++ b/media-video/ffdiaporama/metadata.xml
@@ -43,8 +43,7 @@ The following options are available:
     - Possible formats for rendering : avi, mpg, mp4, mkv
 	</longdescription>
 	<use>
-		<flag name='openclipart'>Support openslipart database</flag>
-		<flag name='texturemate'>Install extra backgrounds</flag>
+		<flag name="openclipart">Support openslipart database</flag>
+		<flag name="texturemate">Install extra backgrounds</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/media-video/ffmpegthumbnailer/metadata.xml b/media-video/ffmpegthumbnailer/metadata.xml
index 5025327..3d57994 100644
--- a/media-video/ffmpegthumbnailer/metadata.xml
+++ b/media-video/ffmpegthumbnailer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>

diff --git a/media-video/frameworks/metadata.xml b/media-video/frameworks/metadata.xml
index 8ced8df..8f10bed 100644
--- a/media-video/frameworks/metadata.xml
+++ b/media-video/frameworks/metadata.xml
@@ -9,4 +9,3 @@
 A small frame capture utiliy compatible with v4l usefull especially for doing stop motion animations.
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-video/gnome-mplayer/metadata.xml b/media-video/gnome-mplayer/metadata.xml
index e77a792..6c6f1e6 100644
--- a/media-video/gnome-mplayer/metadata.xml
+++ b/media-video/gnome-mplayer/metadata.xml
@@ -6,7 +6,7 @@
     <email>media-video@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='dconf'>Enable support for <pkg>gnome-base/dconf</pkg></flag>
-    <flag name='gda'>Enable support for <pkg>gnome-extra/libgda</pkg></flag>
+    <flag name="dconf">Enable support for <pkg>gnome-base/dconf</pkg></flag>
+    <flag name="gda">Enable support for <pkg>gnome-extra/libgda</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
index 8e23f5e..023e6b8 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/media-video/harvid/metadata.xml b/media-video/harvid/metadata.xml
index 4102580..a4f3bfb 100644
--- a/media-video/harvid/metadata.xml
+++ b/media-video/harvid/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>

diff --git a/media-video/mjpg-streamer/metadata.xml b/media-video/mjpg-streamer/metadata.xml
index a460c04..bdf42c9 100644
--- a/media-video/mjpg-streamer/metadata.xml
+++ b/media-video/mjpg-streamer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/media-video/mkclean/metadata.xml b/media-video/mkclean/metadata.xml
index 4a87588..b41d036 100644
--- a/media-video/mkclean/metadata.xml
+++ b/media-video/mkclean/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>

diff --git a/media-video/mkvalidator/metadata.xml b/media-video/mkvalidator/metadata.xml
index aed7ede..65315e9 100644
--- a/media-video/mkvalidator/metadata.xml
+++ b/media-video/mkvalidator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>

diff --git a/media-video/motiontrack/metadata.xml b/media-video/motiontrack/metadata.xml
index 69453ff..f793f53 100644
--- a/media-video/motiontrack/metadata.xml
+++ b/media-video/motiontrack/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>

diff --git a/media-video/mplay-sh/metadata.xml b/media-video/mplay-sh/metadata.xml
index 5f9f146..4399dba 100644
--- a/media-video/mplay-sh/metadata.xml
+++ b/media-video/mplay-sh/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-video/parole/metadata.xml b/media-video/parole/metadata.xml
index 9731eba..7314cb0 100644
--- a/media-video/parole/metadata.xml
+++ b/media-video/parole/metadata.xml
@@ -6,6 +6,6 @@
 		<name>XFCE Team</name>
 	</maintainer>
 	<use>
-		<flag name='clutter'>Compile in Clutter GTK+ support</flag>
+		<flag name="clutter">Compile in Clutter GTK+ support</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-video/pgcedit/metadata.xml b/media-video/pgcedit/metadata.xml
index b290225..0b5dc87 100644
--- a/media-video/pgcedit/metadata.xml
+++ b/media-video/pgcedit/metadata.xml
@@ -5,6 +5,6 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='video'>Add support for video preview</flag>
+		<flag name="video">Add support for video preview</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-video/projectx/metadata.xml b/media-video/projectx/metadata.xml
index 89831f6..5301530 100644
--- a/media-video/projectx/metadata.xml
+++ b/media-video/projectx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>video</herd>

diff --git a/media-video/rtmpdump/metadata.xml b/media-video/rtmpdump/metadata.xml
index 8d4ecfc..2dd8427 100644
--- a/media-video/rtmpdump/metadata.xml
+++ b/media-video/rtmpdump/metadata.xml
@@ -6,10 +6,9 @@
 <name>Markos Chandras</name>
 </maintainer>
 <use>
-	<flag name='gnutls'>Use GnuTLS library instead of the default OpenSSL</flag>
-	<flag name='polarssl'>Use PolarSSL library instead of the default OpenSSL</flag>
+	<flag name="gnutls">Use GnuTLS library instead of the default OpenSSL</flag>
+	<flag name="polarssl">Use PolarSSL library instead of the default OpenSSL</flag>
 </use>
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-video/stk11xx/metadata.xml b/media-video/stk11xx/metadata.xml
index d5541b7..7f4ff83 100644
--- a/media-video/stk11xx/metadata.xml
+++ b/media-video/stk11xx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/media-video/subtitleeditor/metadata.xml b/media-video/subtitleeditor/metadata.xml
index 58bbb44..1d70fc9 100644
--- a/media-video/subtitleeditor/metadata.xml
+++ b/media-video/subtitleeditor/metadata.xml
@@ -10,4 +10,3 @@
 Subtitle Editor is a GTK+2 tool to edit subtitles for GNU/Linux/*BSD. It can be used for new subtitles or as a tool to transform, edit, correct and refine existing subtitle. This program also shows sound waves, which makes it easier to synchronise subtitles to voices.
 </longdescription>
 </pkgmetadata>
-

diff --git a/media-video/tsmuxer/metadata.xml b/media-video/tsmuxer/metadata.xml
index bdb0715..37f3133 100644
--- a/media-video/tsmuxer/metadata.xml
+++ b/media-video/tsmuxer/metadata.xml
@@ -9,6 +9,6 @@
 		SmartCONTENT, content preparation solution.
 	</longdescription>
 	<use>
-		<flag name='qt4'>Installs tsMuxerGUI (needs Qt4)</flag>
+		<flag name="qt4">Installs tsMuxerGUI (needs Qt4)</flag>
 	</use>
 </pkgmetadata>

diff --git a/media-video/ushare/metadata.xml b/media-video/ushare/metadata.xml
index b5ccf28..ef6953b 100644
--- a/media-video/ushare/metadata.xml
+++ b/media-video/ushare/metadata.xml
@@ -6,6 +6,6 @@
 	<name>Markos Chandras</name>
 </maintainer>
 <use>
-	<flag name='dlna'>Add DLNA (<pkg>media-libs/libdlna</pkg>) support</flag>
+	<flag name="dlna">Add DLNA (<pkg>media-libs/libdlna</pkg>) support</flag>
 </use>
 </pkgmetadata>

diff --git a/media-video/vdr/metadata.xml b/media-video/vdr/metadata.xml
index 9929be8..9ffa7fd 100644
--- a/media-video/vdr/metadata.xml
+++ b/media-video/vdr/metadata.xml
@@ -21,7 +21,7 @@
 		<flag name="menuselection">adds support for menu hotkeys of double digits</flag>
 		<flag name="naludump">Removes NALU fill data from h.264-Streams of TS files</flag>
 		<flag name="permashift">permanent timeshift by recording live TV on hard disk, need plugin <pkg>media-plugins/vdr-vdr-permashift</pkg></flag>
-		<flag name="permashift_v1">permanent timeshift by recording live TV on RAM, need plugin >=mediaplugins/vdr-permashift-1</flag>
+		<flag name="permashift_v1">permanent timeshift by recording live TV on RAM, need plugin &gt;=mediaplugins/vdr-permashift-1</flag>
 		<flag name="pinplugin">Support for <pkg>media-plugins/vdr-pin</pkg></flag>
 		<flag name="resumereset">rreset resume of EOF</flag>
 		<flag name="rotor">Enable support for plugin <pkg>media-plugins/vdr-rotor</pkg> for dish-positioner.</flag>

diff --git a/media-video/vdrsync/metadata.xml b/media-video/vdrsync/metadata.xml
index ba74a54..40d504a 100644
--- a/media-video/vdrsync/metadata.xml
+++ b/media-video/vdrsync/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/media-video/vstrip/metadata.xml b/media-video/vstrip/metadata.xml
index 58cae4f..51e7075 100644
--- a/media-video/vstrip/metadata.xml
+++ b/media-video/vstrip/metadata.xml
@@ -9,4 +9,3 @@
 A program to divide a non encrypted vob by individiual chapters
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-analyzer/2ping/metadata.xml b/net-analyzer/2ping/metadata.xml
index 873423b..04d57fd 100644
--- a/net-analyzer/2ping/metadata.xml
+++ b/net-analyzer/2ping/metadata.xml
@@ -9,6 +9,6 @@
 		A bi-directional ping utility
 	</longdescription>
 	<use>
-		<flag name='server'>Install the server init scripts.</flag>
+		<flag name="server">Install the server init scripts.</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-analyzer/angst/metadata.xml b/net-analyzer/angst/metadata.xml
index ddc6d84..7c99397 100644
--- a/net-analyzer/angst/metadata.xml
+++ b/net-analyzer/angst/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>

diff --git a/net-analyzer/barnyard2/metadata.xml b/net-analyzer/barnyard2/metadata.xml
index fa875be..4c392ce 100644
--- a/net-analyzer/barnyard2/metadata.xml
+++ b/net-analyzer/barnyard2/metadata.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-    <herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
-    <maintainer>
-        <email>patrick@gentoo.org</email>
-        <name>Patrick Lauer</name>
-        <description>Maintainer</description>
-    </maintainer>
-    <maintainer>
-        <email>jason.r.wallace@gmail.com</email>
-        <name>Jason Wallace</name>
-        <description>Proxy maintainer. CC him on bugs</description>
-    </maintainer>
-    <longdescription>
-		Barnyard2 is a fork of the original barnyard project (which is no longer under development).
-		Barnyard2 is an open source interpreter for Snort unified2 binary output files. Its primary
-		use is allowing Snort to write to disk in an efficient manner and leaving the task of 
-		parsing binary data into various formats to a separate process that will not cause Snort to
-		miss network traffic. Barnyard2 is under active development and continues to adapt based on 
-		user feedback.
-    </longdescription>
-    <upstream>
-        <maintainer>
-            <email>dev@securixlive.com</email>
-            <name>Securixlive</name>
-        </maintainer>
-        <doc>http://www.securixlive.com/barnyard2/docs/index.php</doc>
-        <bugs-to>mailto:dev@securixlive.com</bugs-to>
-    </upstream>
-	<use>
-		<flag name='gre'>Enable GRE support</flag>
-		<flag name='mpls'>Enable support for mpls networks</flag>
-	</use>
-</pkgmetadata>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+    <herd>netmon</herd>
+	<herd>proxy-maintainers</herd>
+    <maintainer>
+        <email>patrick@gentoo.org</email>
+        <name>Patrick Lauer</name>
+        <description>Maintainer</description>
+    </maintainer>
+    <maintainer>
+        <email>jason.r.wallace@gmail.com</email>
+        <name>Jason Wallace</name>
+        <description>Proxy maintainer. CC him on bugs</description>
+    </maintainer>
+    <longdescription>
+		Barnyard2 is a fork of the original barnyard project (which is no longer under development).
+		Barnyard2 is an open source interpreter for Snort unified2 binary output files. Its primary
+		use is allowing Snort to write to disk in an efficient manner and leaving the task of 
+		parsing binary data into various formats to a separate process that will not cause Snort to
+		miss network traffic. Barnyard2 is under active development and continues to adapt based on 
+		user feedback.
+    </longdescription>
+    <upstream>
+        <maintainer>
+            <email>dev@securixlive.com</email>
+            <name>Securixlive</name>
+        </maintainer>
+        <doc>http://www.securixlive.com/barnyard2/docs/index.php</doc>
+        <bugs-to>mailto:dev@securixlive.com</bugs-to>
+    </upstream>
+	<use>
+		<flag name="gre">Enable GRE support</flag>
+		<flag name="mpls">Enable support for mpls networks</flag>
+	</use>
+</pkgmetadata>

diff --git a/net-analyzer/bmon/metadata.xml b/net-analyzer/bmon/metadata.xml
index 0d2cfd4..690ee39 100644
--- a/net-analyzer/bmon/metadata.xml
+++ b/net-analyzer/bmon/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>

diff --git a/net-analyzer/bwm-ng/metadata.xml b/net-analyzer/bwm-ng/metadata.xml
index 6927b1f..dabf967 100644
--- a/net-analyzer/bwm-ng/metadata.xml
+++ b/net-analyzer/bwm-ng/metadata.xml
@@ -5,7 +5,7 @@
   <email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='csv'>Enable csv output</flag>
-<flag name='html'>Enable html output</flag>
+<flag name="csv">Enable csv output</flag>
+<flag name="html">Enable html output</flag>
 </use>
 </pkgmetadata>

diff --git a/net-analyzer/cacti-spine/metadata.xml b/net-analyzer/cacti-spine/metadata.xml
index 18ad940..10fe1e4 100644
--- a/net-analyzer/cacti-spine/metadata.xml
+++ b/net-analyzer/cacti-spine/metadata.xml
@@ -11,4 +11,3 @@
 		Spine makes sense for your installation.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/net-analyzer/cacti/metadata.xml b/net-analyzer/cacti/metadata.xml
index dc57807..e678dff 100644
--- a/net-analyzer/cacti/metadata.xml
+++ b/net-analyzer/cacti/metadata.xml
@@ -12,6 +12,6 @@
 		devices.
 	</longdescription>
 	<use>
-		<flag name='doc'>install html documentation</flag>
+		<flag name="doc">install html documentation</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-analyzer/chaosreader/metadata.xml b/net-analyzer/chaosreader/metadata.xml
index 7a0a346..98ec254 100644
--- a/net-analyzer/chaosreader/metadata.xml
+++ b/net-analyzer/chaosreader/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-analyzer/cloudshark/metadata.xml b/net-analyzer/cloudshark/metadata.xml
index 5fcbf8e..4b6b681 100644
--- a/net-analyzer/cloudshark/metadata.xml
+++ b/net-analyzer/cloudshark/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-analyzer/fail2ban/metadata.xml b/net-analyzer/fail2ban/metadata.xml
index f55cac0..c978e6a 100644
--- a/net-analyzer/fail2ban/metadata.xml
+++ b/net-analyzer/fail2ban/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>netmon</herd>

diff --git a/net-analyzer/fping/metadata.xml b/net-analyzer/fping/metadata.xml
index 59f49f0..c954443 100644
--- a/net-analyzer/fping/metadata.xml
+++ b/net-analyzer/fping/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>

diff --git a/net-analyzer/goaccess/metadata.xml b/net-analyzer/goaccess/metadata.xml
index 166b8c7..d11be92 100644
--- a/net-analyzer/goaccess/metadata.xml
+++ b/net-analyzer/goaccess/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-analyzer/gr-fosphor/metadata.xml b/net-analyzer/gr-fosphor/metadata.xml
index 192bccb..f72d3dc 100644
--- a/net-analyzer/gr-fosphor/metadata.xml
+++ b/net-analyzer/gr-fosphor/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<herd>radio</herd>
 	<use>
-		<flag name='glfw'>enable GLFW based interface</flag>
+		<flag name="glfw">enable GLFW based interface</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-analyzer/gsm-receiver/metadata.xml b/net-analyzer/gsm-receiver/metadata.xml
index c1b4dee..19e2def 100644
--- a/net-analyzer/gsm-receiver/metadata.xml
+++ b/net-analyzer/gsm-receiver/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>radio</herd>
 </pkgmetadata>
-

diff --git a/net-analyzer/gspoof/metadata.xml b/net-analyzer/gspoof/metadata.xml
index 5eb5554..4ce3449 100644
--- a/net-analyzer/gspoof/metadata.xml
+++ b/net-analyzer/gspoof/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-analyzer/hping/metadata.xml b/net-analyzer/hping/metadata.xml
index 9ca15ca..03aa50b 100644
--- a/net-analyzer/hping/metadata.xml
+++ b/net-analyzer/hping/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>netmon</herd>
 </pkgmetadata>
-

diff --git a/net-analyzer/httping/metadata.xml b/net-analyzer/httping/metadata.xml
index c1f6c14..286e8d9 100644
--- a/net-analyzer/httping/metadata.xml
+++ b/net-analyzer/httping/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-<flag name='tfo'>Enable support for TCP Fast Open</flag>
+<flag name="tfo">Enable support for TCP Fast Open</flag>
 </use>
 </pkgmetadata>

diff --git a/net-analyzer/icinga-web/metadata.xml b/net-analyzer/icinga-web/metadata.xml
index 273bfa6..f2e0b4f 100644
--- a/net-analyzer/icinga-web/metadata.xml
+++ b/net-analyzer/icinga-web/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-analyzer/icinga/metadata.xml b/net-analyzer/icinga/metadata.xml
index 209fa65..ebbec98 100644
--- a/net-analyzer/icinga/metadata.xml
+++ b/net-analyzer/icinga/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<longdescription lang="en">A rebuild of nagios from the ground up</longdescription>

diff --git a/net-analyzer/icinga2/metadata.xml b/net-analyzer/icinga2/metadata.xml
index c2818ba..4e11ea2 100644
--- a/net-analyzer/icinga2/metadata.xml
+++ b/net-analyzer/icinga2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-analyzer/ipband/metadata.xml b/net-analyzer/ipband/metadata.xml
index dd948e6..99a0919 100644
--- a/net-analyzer/ipband/metadata.xml
+++ b/net-analyzer/ipband/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>

diff --git a/net-analyzer/ipv6-toolkit/metadata.xml b/net-analyzer/ipv6-toolkit/metadata.xml
index 57d5f52..2266b6e 100644
--- a/net-analyzer/ipv6-toolkit/metadata.xml
+++ b/net-analyzer/ipv6-toolkit/metadata.xml
@@ -9,4 +9,3 @@
 		The SI6 Networks' IPv6 toolkit is a set of IPv6 security/trouble-shooting tools, that can send arbitrary IPv6-based packets.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/net-analyzer/monitoring-plugins/metadata.xml b/net-analyzer/monitoring-plugins/metadata.xml
index 097b712..7ea1123 100644
--- a/net-analyzer/monitoring-plugins/metadata.xml
+++ b/net-analyzer/monitoring-plugins/metadata.xml
@@ -13,23 +13,23 @@
       <description>Secondary maintainer. Please CC on bugs.</description>
   </maintainer>
   <use>
-    <flag name='dns'>
+    <flag name="dns">
       Install <pkg>net-dns/bind-tools</pkg> required for monitoring
       DNS servers. Disabling the flag does not remove any plugins.
     </flag>
-    <flag name='game'>
+    <flag name="game">
       Install <pkg>games-util/qstat</pkg> required for monitoring FPS
       servers. Disabling the flag does not remove any plugins.
     </flag>
-    <flag name='fping'>
+    <flag name="fping">
       Install <pkg>net-analyzer/fping</pkg> required for fancy ping
       monitoring. Disabling the flag does not remove any plugins.
     </flag>
-    <flag name='ssh'>
+    <flag name="ssh">
       Install <pkg>net-misc/openssh</pkg> required for monitoring SSH
       servers. Disabling the flag does not remove any plugins.
     </flag>
-    <flag name='snmp'>
+    <flag name="snmp">
       Install <pkg>dev-perl/Net-SNMP</pkg> and
       <pkg>net-analyzer/net-snmp</pkg> required for monitoring SNMP
       values. Disabling the flag does not remove any plugins.

diff --git a/net-analyzer/munin/metadata.xml b/net-analyzer/munin/metadata.xml
index 5ad5c8d..503344e 100644
--- a/net-analyzer/munin/metadata.xml
+++ b/net-analyzer/munin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sysadmin</herd>

diff --git a/net-analyzer/nagios-check_linux_bonding/metadata.xml b/net-analyzer/nagios-check_linux_bonding/metadata.xml
index 4128863..0101892 100644
--- a/net-analyzer/nagios-check_linux_bonding/metadata.xml
+++ b/net-analyzer/nagios-check_linux_bonding/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Johann Schmitz (ercpe)</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-analyzer/nagios-plugins-snmp/metadata.xml b/net-analyzer/nagios-plugins-snmp/metadata.xml
index fad986e..f54283e 100644
--- a/net-analyzer/nagios-plugins-snmp/metadata.xml
+++ b/net-analyzer/nagios-plugins-snmp/metadata.xml
@@ -14,4 +14,3 @@
   <herd>proxy-maintainers</herd>
   <herd>sysadmin</herd>
 </pkgmetadata>
-

diff --git a/net-analyzer/nagios-plugins/metadata.xml b/net-analyzer/nagios-plugins/metadata.xml
index 89d2fa5..2eba13d 100644
--- a/net-analyzer/nagios-plugins/metadata.xml
+++ b/net-analyzer/nagios-plugins/metadata.xml
@@ -19,26 +19,25 @@
   <herd>proxy-maintainers</herd>
   <herd>sysadmin</herd>
   <use>
-    <flag name='nagios-dns'>
+    <flag name="nagios-dns">
       Install <pkg>net-dns/bind-tools</pkg> required for monitoring
       DNS servers. Disabling the flag does not remove any plugin file.
     </flag>
-    <flag name='nagios-game'>
+    <flag name="nagios-game">
       Install <pkg>games-util/qstat</pkg> required for monitoring FPS
       servers. Disabling the flag does not remove any plugin file.
     </flag>
-    <flag name='nagios-ping'>
+    <flag name="nagios-ping">
       Install <pkg>net-analyzer/fping</pkg> required for fancy ping
       monitoring. Disabling the flag does not remove any plugin file.
     </flag>
-    <flag name='ssh'>
+    <flag name="ssh">
       Install <pkg>net-misc/openssh</pkg> required for monitoring SSH
       servers. Disabling the flag does not remove any plugin file.
     </flag>
-    <flag name='snmp' restrict='&gt;=net-analyzer/nagios-plugins-1.4.16-r1'>
+    <flag name="snmp" restrict="&gt;=net-analyzer/nagios-plugins-1.4.16-r1">
       Install <pkg>dev-perl/Net-SNMP</pkg> required for monitoring
       SNMP values. Disabling the flag does not remove any plugin file.
     </flag>
   </use>
 </pkgmetadata>
-

diff --git a/net-analyzer/ncrack/metadata.xml b/net-analyzer/ncrack/metadata.xml
index 77d8e75..69859c5 100644
--- a/net-analyzer/ncrack/metadata.xml
+++ b/net-analyzer/ncrack/metadata.xml
@@ -11,4 +11,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-analyzer/net-snmp/metadata.xml b/net-analyzer/net-snmp/metadata.xml
index b503064..f80008f 100644
--- a/net-analyzer/net-snmp/metadata.xml
+++ b/net-analyzer/net-snmp/metadata.xml
@@ -9,7 +9,7 @@
 <flag name="pci">Use libpci (from <pkg>sys-apps/pciutils</pkg>) to look up network interface description. This feature is only available on Linux.</flag>
 <flag name="rpm">Enable monitoring of <pkg>app-arch/rpm</pkg>. This flag requires the bzip2 and zlib flags to be enabled as well.</flag>
 <flag name="ucd-compat">Build UCD compatibility library. Increases significantly the install size.</flag>
-<flag name='smux'>Enable support for the legacy smux protocol (superseded by agentx)</flag>
+<flag name="smux">Enable support for the legacy smux protocol (superseded by agentx)</flag>
 </use>
 <upstream>
 <remote-id type="sourceforge">net-snmp</remote-id>

diff --git a/net-analyzer/netcat6/metadata.xml b/net-analyzer/netcat6/metadata.xml
index 0c72002..c10568f 100644
--- a/net-analyzer/netcat6/metadata.xml
+++ b/net-analyzer/netcat6/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>

diff --git a/net-analyzer/netperf/metadata.xml b/net-analyzer/netperf/metadata.xml
index 9f51ead..a1ef8d5 100644
--- a/net-analyzer/netperf/metadata.xml
+++ b/net-analyzer/netperf/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-<flag name='demo'>Emit interim results during the run. May affect results</flag>
-<flag name='sctp'>Include tests to measure SCTP performance</flag>
+<flag name="demo">Emit interim results during the run. May affect results</flag>
+<flag name="sctp">Include tests to measure SCTP performance</flag>
 </use>
 </pkgmetadata>

diff --git a/net-analyzer/netsniff-ng/metadata.xml b/net-analyzer/netsniff-ng/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-analyzer/netsniff-ng/metadata.xml
+++ b/net-analyzer/netsniff-ng/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-analyzer/netwatch/metadata.xml b/net-analyzer/netwatch/metadata.xml
index 16276bd..9eaa421 100644
--- a/net-analyzer/netwatch/metadata.xml
+++ b/net-analyzer/netwatch/metadata.xml
@@ -7,4 +7,3 @@
 <name>Markos Chandras</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-analyzer/pchar/metadata.xml b/net-analyzer/pchar/metadata.xml
index 1c7ac55..15fef34 100644
--- a/net-analyzer/pchar/metadata.xml
+++ b/net-analyzer/pchar/metadata.xml
@@ -12,7 +12,6 @@ latency, and loss of links along an end-to-end path through the
 Internet.  pchar works in both IPv4 and IPv6 networks.
 </longdescription>
 <use>
-	<flag name='pcap'>Use the <pkg>net-libs/libpcap</pkg> library</flag>
+	<flag name="pcap">Use the <pkg>net-libs/libpcap</pkg> library</flag>
 </use>
 </pkgmetadata>
-

diff --git a/net-analyzer/pinger/metadata.xml b/net-analyzer/pinger/metadata.xml
index 56ad93e..5eb21ec 100644
--- a/net-analyzer/pinger/metadata.xml
+++ b/net-analyzer/pinger/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-<flag name='gtk2'>Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk:2</pkg></flag>
-<flag name='gtk3'>Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk:3</pkg></flag>
+<flag name="gtk2">Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk:2</pkg></flag>
+<flag name="gtk3">Install the gtkpinger GUI utility based on <pkg>x11-libs/gtk:3</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/net-analyzer/pmacct/metadata.xml b/net-analyzer/pmacct/metadata.xml
index 8249714..e7682c9 100644
--- a/net-analyzer/pmacct/metadata.xml
+++ b/net-analyzer/pmacct/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-<flag name='geoipv2'>Add support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
-<flag name='64bit'>Use 64bit counters instead of 32bit ones</flag>
-<flag name='mongodb'>Add support for mongodb backend</flag>
-<flag name='ulog'>Enable support for ULOG in older kernels (deprecated)</flag>
+<flag name="geoipv2">Add support for GeoIP2 through <pkg>dev-libs/libmaxminddb</pkg></flag>
+<flag name="64bit">Use 64bit counters instead of 32bit ones</flag>
+<flag name="mongodb">Add support for mongodb backend</flag>
+<flag name="ulog">Enable support for ULOG in older kernels (deprecated)</flag>
 </use>
 </pkgmetadata>

diff --git a/net-analyzer/ripe-atlas-tools/metadata.xml b/net-analyzer/ripe-atlas-tools/metadata.xml
index ceaef6d..0bfa612 100644
--- a/net-analyzer/ripe-atlas-tools/metadata.xml
+++ b/net-analyzer/ripe-atlas-tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-analyzer/rrdtool/metadata.xml b/net-analyzer/rrdtool/metadata.xml
index 2b0a73c..b184b8e 100644
--- a/net-analyzer/rrdtool/metadata.xml
+++ b/net-analyzer/rrdtool/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-<flag name='graph'>Enable support for graphing functions</flag>
-<flag name='rados'>Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
-<flag name='rrdcgi'>Build rrdcgi support</flag>
+<flag name="graph">Enable support for graphing functions</flag>
+<flag name="rados">Enable support for librados from <pkg>sys-cluster/ceph</pkg></flag>
+<flag name="rrdcgi">Build rrdcgi support</flag>
 </use>
 </pkgmetadata>

diff --git a/net-analyzer/sancp/metadata.xml b/net-analyzer/sancp/metadata.xml
index a28ee98..c6bd536 100644
--- a/net-analyzer/sancp/metadata.xml
+++ b/net-analyzer/sancp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>

diff --git a/net-analyzer/scanlogd/metadata.xml b/net-analyzer/scanlogd/metadata.xml
index f0cc2f6..d65c0f3 100644
--- a/net-analyzer/scanlogd/metadata.xml
+++ b/net-analyzer/scanlogd/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-<flag name='nids'>Use <pkg>net-libs/libnids</pkg> for packet capturing</flag>
-<flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for packet capturing</flag>
+<flag name="nids">Use <pkg>net-libs/libnids</pkg> for packet capturing</flag>
+<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for packet capturing</flag>
 </use>
 </pkgmetadata>

diff --git a/net-analyzer/sguil-client/metadata.xml b/net-analyzer/sguil-client/metadata.xml
index 38e3121..32d7038 100644
--- a/net-analyzer/sguil-client/metadata.xml
+++ b/net-analyzer/sguil-client/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>netmon</herd>

diff --git a/net-analyzer/sguil-sensor/metadata.xml b/net-analyzer/sguil-sensor/metadata.xml
index 38e3121..32d7038 100644
--- a/net-analyzer/sguil-sensor/metadata.xml
+++ b/net-analyzer/sguil-sensor/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>netmon</herd>

diff --git a/net-analyzer/sguil-server/metadata.xml b/net-analyzer/sguil-server/metadata.xml
index 38e3121..32d7038 100644
--- a/net-analyzer/sguil-server/metadata.xml
+++ b/net-analyzer/sguil-server/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>netmon</herd>

diff --git a/net-analyzer/smokeping/metadata.xml b/net-analyzer/smokeping/metadata.xml
index 71b3ad2..28e51fa 100644
--- a/net-analyzer/smokeping/metadata.xml
+++ b/net-analyzer/smokeping/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-<flag name='dig'>Install <pkg>net-dns/bind-tools</pkg> for dig functionality</flag>
-<flag name='echoping'>Install <pkg>net-analyzer/echoping</pkg> for echoping functionality</flag>
-<flag name='telnet'>Install <pkg>dev-perl/Net-Telnet</pkg> for telnet functionality</flag>
-<flag name='ssh'>Install ssh functionality</flag>
+<flag name="dig">Install <pkg>net-dns/bind-tools</pkg> for dig functionality</flag>
+<flag name="echoping">Install <pkg>net-analyzer/echoping</pkg> for echoping functionality</flag>
+<flag name="telnet">Install <pkg>dev-perl/Net-Telnet</pkg> for telnet functionality</flag>
+<flag name="ssh">Install ssh functionality</flag>
 </use>
 </pkgmetadata>

diff --git a/net-analyzer/snort/metadata.xml b/net-analyzer/snort/metadata.xml
index 084698b..a4a3e5c 100644
--- a/net-analyzer/snort/metadata.xml
+++ b/net-analyzer/snort/metadata.xml
@@ -1,136 +1,136 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>netmon</herd>
-	<herd>proxy-maintainers</herd>
-	<maintainer>
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-		<description>Maintainer</description>
-	</maintainer>
-	<maintainer>
-		<email>jason.r.wallace@gmail.com</email>
-		<name>Jason Wallace</name>
-		<description>Proxy maintainer. CC him on bugs</description>
-	</maintainer>
-	<longdescription>
-		Snort is an open source network intrusion prevention and detection
-		system (IDS/IPS) developed by Sourcefire. Combining the benefits of
-		signature, protocol, and anomaly-based inspection, Snort is the most
-		widely deployed IDS/IPS technology worldwide. With millions of downloads
-		and approximately 300,000 registered users, Snort has become the de facto 
-		standard for IPS.
-	</longdescription>
-	<upstream>
-		<maintainer>
-			<email>snort-team@sourcefire.com</email>
-			<name>Snort Team</name>
-		</maintainer>
-		<changelog>http://www.snort.org/snort-downloads</changelog>
-		<doc>http://www.snort.org/docs</doc>
-		<bugs-to>http://www.snort.org/snort-downloads/submit-a-bug/</bugs-to>
-	</upstream>
-	<use>
-		<flag name='control-socket'>
-			Enables Snort's control socket.
-		</flag>
-		<flag name='dynamicplugin'>
-			Enable ability to dynamically load preprocessors, detection engine,
-			and rules library. This is required if you want to use shared 
-			object (SO) snort rules.
-		</flag>
-		<flag name='file-inspect'>
-			Enables extended file inspection capabilities.
-		</flag>
-		<flag name='gre'>
-			Enable support for inspecting and processing Generic Routing 
-			Encapsulation (GRE) packet headders. Only needed if you are
-			monitoring GRE tunnels.
-		</flag>
-		<flag name='high-availability'>
-			Enables high-availability state sharing.
-		</flag>
-		<flag name='inline-init-failopen'>
-			Enables support to allow traffic to pass (fail-open) through
-			inline deployments while snort is starting and not ready to begin
-			inspecting traffic. If this option is not enabled, network
-			traffic will not pass (fail-closed) until snort has fully started
-			and is ready to perform packet inspection.
-		</flag>
-		<flag name='linux-smp-stats'>
-			Enable accurate statistics reporting through /proc on systems with
-			multipule processors.
-		</flag>
-		<flag name='mpls'>
-			Enables support for processing and inspecting Multiprotocol Label 
-			Switching MPLS network network traffic. Only needed if you are
-			monitoring an MPLS network.
-		</flag>
-		<flag name='non-ether-decoders'>
-			Enable decoding of non-ethernet protocols such as TokenRing, FDDI,
-			IPX, etc.
-		</flag>
-		<flag name='perfprofiling'>
-			Enables support for preprocessor and rule performance profiling 
-			using the perfmonitor preprocessor.
-		</flag>
-		<flag name='ppm'>
-			Enables support for setting per rule or per packet latency limits.
-			Helps protect against introducing network latency with inline 
-			deployments.
-		</flag>
-		<flag name='react'>
-			Enables support for the react rule keyword. Supports interception,
-			termination, and redirection of HTTP connections.
-		</flag>
-		<flag name='shared-rep'>
-			Enables the use of shared memory for the Reputation Preprocessor
-			(Only available on Linux systems)
-		</flag>
-		<flag name='side-channel'>
-			Enables Snort's the side channel.
-		</flag>
-		<flag name='sourcefire'>
-			Enables Sourcefire specific build options, which include
-			--enable-perfprofiling and --enable-ppm.
-		</flag>
-		<flag name='targetbased'>
-			Enables support in snort for using a host attibute XML file 
-			(attribute_table.dtd). This file needs to be created by the user
-			and should define the IP address, operating system, and services
-			for all hosts on the monitored network. This is cumbersome, but
-			can improve intrusion detection accuracy.
-		</flag>
-		<flag name='reload-error-restart'>
-			Enables support for completely restarting snort if an error is 
-			detected durring a reload.
-		</flag>
-		<flag name='zlib'>
-			Enables HTTP inspection of compressed web traffic. Requires 
-			dynamicplugin be enabled.
-		</flag>
-		<flag name='active-response'>
-			Enables support for automatically sending TCP resets and ICMP 
-			unreachable messages to terminate connections. Used with inline
-			deployments.
-		</flag>
-		<flag name='normalizer'>
-			Enables support for normalizing packets in inline deployments to
-			help minimize the chances of detection evasion.
-		</flag>
-		<flag name='flexresp3'>
-			Enables support for new flexable response preprocessor for enabling
-			connection tearing for inline deployments. Replaces flexresp and 
-			flexresp2.
-		</flag>
-		<flag name='paf'>
-			Enables support for Protocol Aware Flushing. This allows Snort to
-			statefully scan a stream and reassemble a complete protocol data
-			unit regardless of segmentation.
-		</flag>
-		<flag name='large-pcap-64bit'>
-			Allows Snort to read pcap files that are larger than 2 GB. ONLY
-			VALID FOR 64bit SYSTEMS!
-		</flag>
-	</use>
-</pkgmetadata>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>netmon</herd>
+	<herd>proxy-maintainers</herd>
+	<maintainer>
+		<email>patrick@gentoo.org</email>
+		<name>Patrick Lauer</name>
+		<description>Maintainer</description>
+	</maintainer>
+	<maintainer>
+		<email>jason.r.wallace@gmail.com</email>
+		<name>Jason Wallace</name>
+		<description>Proxy maintainer. CC him on bugs</description>
+	</maintainer>
+	<longdescription>
+		Snort is an open source network intrusion prevention and detection
+		system (IDS/IPS) developed by Sourcefire. Combining the benefits of
+		signature, protocol, and anomaly-based inspection, Snort is the most
+		widely deployed IDS/IPS technology worldwide. With millions of downloads
+		and approximately 300,000 registered users, Snort has become the de facto 
+		standard for IPS.
+	</longdescription>
+	<upstream>
+		<maintainer>
+			<email>snort-team@sourcefire.com</email>
+			<name>Snort Team</name>
+		</maintainer>
+		<changelog>http://www.snort.org/snort-downloads</changelog>
+		<doc>http://www.snort.org/docs</doc>
+		<bugs-to>http://www.snort.org/snort-downloads/submit-a-bug/</bugs-to>
+	</upstream>
+	<use>
+		<flag name="control-socket">
+			Enables Snort's control socket.
+		</flag>
+		<flag name="dynamicplugin">
+			Enable ability to dynamically load preprocessors, detection engine,
+			and rules library. This is required if you want to use shared 
+			object (SO) snort rules.
+		</flag>
+		<flag name="file-inspect">
+			Enables extended file inspection capabilities.
+		</flag>
+		<flag name="gre">
+			Enable support for inspecting and processing Generic Routing 
+			Encapsulation (GRE) packet headders. Only needed if you are
+			monitoring GRE tunnels.
+		</flag>
+		<flag name="high-availability">
+			Enables high-availability state sharing.
+		</flag>
+		<flag name="inline-init-failopen">
+			Enables support to allow traffic to pass (fail-open) through
+			inline deployments while snort is starting and not ready to begin
+			inspecting traffic. If this option is not enabled, network
+			traffic will not pass (fail-closed) until snort has fully started
+			and is ready to perform packet inspection.
+		</flag>
+		<flag name="linux-smp-stats">
+			Enable accurate statistics reporting through /proc on systems with
+			multipule processors.
+		</flag>
+		<flag name="mpls">
+			Enables support for processing and inspecting Multiprotocol Label 
+			Switching MPLS network network traffic. Only needed if you are
+			monitoring an MPLS network.
+		</flag>
+		<flag name="non-ether-decoders">
+			Enable decoding of non-ethernet protocols such as TokenRing, FDDI,
+			IPX, etc.
+		</flag>
+		<flag name="perfprofiling">
+			Enables support for preprocessor and rule performance profiling 
+			using the perfmonitor preprocessor.
+		</flag>
+		<flag name="ppm">
+			Enables support for setting per rule or per packet latency limits.
+			Helps protect against introducing network latency with inline 
+			deployments.
+		</flag>
+		<flag name="react">
+			Enables support for the react rule keyword. Supports interception,
+			termination, and redirection of HTTP connections.
+		</flag>
+		<flag name="shared-rep">
+			Enables the use of shared memory for the Reputation Preprocessor
+			(Only available on Linux systems)
+		</flag>
+		<flag name="side-channel">
+			Enables Snort's the side channel.
+		</flag>
+		<flag name="sourcefire">
+			Enables Sourcefire specific build options, which include
+			--enable-perfprofiling and --enable-ppm.
+		</flag>
+		<flag name="targetbased">
+			Enables support in snort for using a host attibute XML file 
+			(attribute_table.dtd). This file needs to be created by the user
+			and should define the IP address, operating system, and services
+			for all hosts on the monitored network. This is cumbersome, but
+			can improve intrusion detection accuracy.
+		</flag>
+		<flag name="reload-error-restart">
+			Enables support for completely restarting snort if an error is 
+			detected durring a reload.
+		</flag>
+		<flag name="zlib">
+			Enables HTTP inspection of compressed web traffic. Requires 
+			dynamicplugin be enabled.
+		</flag>
+		<flag name="active-response">
+			Enables support for automatically sending TCP resets and ICMP 
+			unreachable messages to terminate connections. Used with inline
+			deployments.
+		</flag>
+		<flag name="normalizer">
+			Enables support for normalizing packets in inline deployments to
+			help minimize the chances of detection evasion.
+		</flag>
+		<flag name="flexresp3">
+			Enables support for new flexable response preprocessor for enabling
+			connection tearing for inline deployments. Replaces flexresp and 
+			flexresp2.
+		</flag>
+		<flag name="paf">
+			Enables support for Protocol Aware Flushing. This allows Snort to
+			statefully scan a stream and reassemble a complete protocol data
+			unit regardless of segmentation.
+		</flag>
+		<flag name="large-pcap-64bit">
+			Allows Snort to read pcap files that are larger than 2 GB. ONLY
+			VALID FOR 64bit SYSTEMS!
+		</flag>
+	</use>
+</pkgmetadata>

diff --git a/net-analyzer/symon/metadata.xml b/net-analyzer/symon/metadata.xml
index 00d90d6..3e0971b 100644
--- a/net-analyzer/symon/metadata.xml
+++ b/net-analyzer/symon/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<herd>netmon</herd>
 	<use>
-		<flag name='perl'>Enables a generic perl symux client</flag>
-		<flag name='symon'>Enables the system monitor. Offers no functionality
+		<flag name="perl">Enables a generic perl symux client</flag>
+		<flag name="symon">Enables the system monitor. Offers no functionality
 		but monitoring and forwarding of measured data</flag>
-		<flag name='symux'>Enables the multiplexer which stores incoming symon
+		<flag name="symux">Enables the multiplexer which stores incoming symon
 		streams on disk in RRD (<pkg>net-analyzer/rrdtool</pkg>) files</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-analyzer/tcpdump/metadata.xml b/net-analyzer/tcpdump/metadata.xml
index 7858770..9ec6ed4 100644
--- a/net-analyzer/tcpdump/metadata.xml
+++ b/net-analyzer/tcpdump/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-	<flag name='smi'>Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag>
-	<flag name='drop-root'>Drop privileges to tcpdump:tcpdump when run as root</flag>
+	<flag name="smi">Build with <pkg>net-libs/libsmi</pkg> to load MIBs on the fly to decode SNMP packets</flag>
+	<flag name="drop-root">Drop privileges to tcpdump:tcpdump when run as root</flag>
 </use>
 </pkgmetadata>

diff --git a/net-analyzer/tcpreplay/metadata.xml b/net-analyzer/tcpreplay/metadata.xml
index 35145f6..d098016 100644
--- a/net-analyzer/tcpreplay/metadata.xml
+++ b/net-analyzer/tcpreplay/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>netmon</herd>

diff --git a/net-analyzer/testssl/metadata.xml b/net-analyzer/testssl/metadata.xml
index 6aca467..c858951 100644
--- a/net-analyzer/testssl/metadata.xml
+++ b/net-analyzer/testssl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-analyzer/thc-ipv6/metadata.xml b/net-analyzer/thc-ipv6/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-analyzer/thc-ipv6/metadata.xml
+++ b/net-analyzer/thc-ipv6/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-analyzer/traceproto/metadata.xml b/net-analyzer/traceproto/metadata.xml
index 3562dbf..da78704 100644
--- a/net-analyzer/traceproto/metadata.xml
+++ b/net-analyzer/traceproto/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>

diff --git a/net-analyzer/w3af/metadata.xml b/net-analyzer/w3af/metadata.xml
index 754512a..7095e0e 100644
--- a/net-analyzer/w3af/metadata.xml
+++ b/net-analyzer/w3af/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-analyzer/wapiti/metadata.xml b/net-analyzer/wapiti/metadata.xml
index ce6c6fb..62cf68d 100644
--- a/net-analyzer/wapiti/metadata.xml
+++ b/net-analyzer/wapiti/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-analyzer/wireshark/metadata.xml b/net-analyzer/wireshark/metadata.xml
index 9b808bb..b80d8aa 100644
--- a/net-analyzer/wireshark/metadata.xml
+++ b/net-analyzer/wireshark/metadata.xml
@@ -25,16 +25,16 @@
 	plain text 
 </longdescription>
 <use>
-<flag name='adns'>Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
-<flag name='androiddump'>Install androiddump</flag>
-<flag name='crypt'>Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
-<flag name='doc-pdf'>Build documentation in pdf format (US and a4 paper sizes)</flag>
-<flag name='gtk3'>Build the wireshark executable with a GTK+ UI version 3.</flag>
-<flag name='netlink'>Use <pkg>dev-libs/libnl</pkg></flag>
-<flag name='pcap'>Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
-<flag name='qt4'>Build the wireshark executable with an experimental Qt UI instead of GTK+.</flag>
-<flag name='sbc'>Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
-<flag name='smi'>Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
-<flag name='tfshark'>Install tfshark</flag>
+<flag name="adns">Use the GNU <pkg>net-dns/c-ares</pkg> library to resolve DNS names</flag>
+<flag name="androiddump">Install androiddump</flag>
+<flag name="crypt">Use <pkg>dev-libs/libgcrypt</pkg> to decrypt traffic</flag>
+<flag name="doc-pdf">Build documentation in pdf format (US and a4 paper sizes)</flag>
+<flag name="gtk3">Build the wireshark executable with a GTK+ UI version 3.</flag>
+<flag name="netlink">Use <pkg>dev-libs/libnl</pkg></flag>
+<flag name="pcap">Use <pkg>net-libs/libpcap</pkg> for network packet capturing (build dumpcap, rawshark)</flag>
+<flag name="qt4">Build the wireshark executable with an experimental Qt UI instead of GTK+.</flag>
+<flag name="sbc">Use <pkg>media-libs/sbc</pkg> for playing back SBC encoded packets</flag>
+<flag name="smi">Use <pkg>net-libs/libsmi</pkg> to resolve numeric OIDs into human readable format</flag>
+<flag name="tfshark">Install tfshark</flag>
 </use>
 </pkgmetadata>

diff --git a/net-analyzer/zabbix/metadata.xml b/net-analyzer/zabbix/metadata.xml
index 9e9161b..80fa589 100644
--- a/net-analyzer/zabbix/metadata.xml
+++ b/net-analyzer/zabbix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-analyzer/zmap/metadata.xml b/net-analyzer/zmap/metadata.xml
index 4bf4325..29e6ec5 100644
--- a/net-analyzer/zmap/metadata.xml
+++ b/net-analyzer/zmap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-dialup/capi4k-utils/metadata.xml b/net-dialup/capi4k-utils/metadata.xml
index 6ba78ea..3ba465e 100644
--- a/net-dialup/capi4k-utils/metadata.xml
+++ b/net-dialup/capi4k-utils/metadata.xml
@@ -10,8 +10,8 @@
 		number of ISDN devices.
 	</longdescription>
 	<use>
-		<flag name='fax'>Install capi-fax demo programs</flag>
-		<flag name='pppd'>Installs pppdcapiplugin modules</flag>
-		<flag name='rcapid'>Installs rcapid daemon</flag>
+		<flag name="fax">Install capi-fax demo programs</flag>
+		<flag name="pppd">Installs pppdcapiplugin modules</flag>
+		<flag name="rcapid">Installs rcapid daemon</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-dialup/cutecom/metadata.xml b/net-dialup/cutecom/metadata.xml
index 631c63e..e386f7f 100644
--- a/net-dialup/cutecom/metadata.xml
+++ b/net-dialup/cutecom/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-dialup</herd>

diff --git a/net-dialup/freeradius-client/metadata.xml b/net-dialup/freeradius-client/metadata.xml
index 1c0b9d8..946cd15 100644
--- a/net-dialup/freeradius-client/metadata.xml
+++ b/net-dialup/freeradius-client/metadata.xml
@@ -9,8 +9,8 @@ records, a utility allowing to send RADIUS AAA requests from command
 line or from shell scripts and a utility to query the status of a (Merit)
 RADIUS server.</longdescription>
 <use>
-	<flag name='scp'>Add service type hints derived from username
+	<flag name="scp">Add service type hints derived from username
 	prefix</flag>
-	<flag name='shadow'>Enable shadow password support</flag>
+	<flag name="shadow">Enable shadow password support</flag>
 </use>
 </pkgmetadata>

diff --git a/net-dialup/freeradius/metadata.xml b/net-dialup/freeradius/metadata.xml
index 381ec90..74768f5 100644
--- a/net-dialup/freeradius/metadata.xml
+++ b/net-dialup/freeradius/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>net-dialup</herd>
   <use>
-    <flag name='pcap'>
+    <flag name="pcap">
       Build the RADIUS sniffer which requires <pkg>net-libs/libpcap</pkg>.
     </flag>
   </use>

diff --git a/net-dialup/mgetty/metadata.xml b/net-dialup/mgetty/metadata.xml
index 54960da..a8ca975 100644
--- a/net-dialup/mgetty/metadata.xml
+++ b/net-dialup/mgetty/metadata.xml
@@ -5,7 +5,7 @@
 <longdescription>Suite of programs that allows you to take full advantage of your voice/fax modem.
 mgetty is capable of handling data, fax and voice calls without interfering with outgoing calls.</longdescription>
 <use>
-	<flag name='fax'>Enables fax support</flag>
-	<flag name='fidonet'>Enables FidoNet support</flag>
+	<flag name="fax">Enables fax support</flag>
+	<flag name="fidonet">Enables FidoNet support</flag>
 </use>
 </pkgmetadata>

diff --git a/net-dialup/minicom/metadata.xml b/net-dialup/minicom/metadata.xml
index f68afd2..a27512a 100644
--- a/net-dialup/minicom/metadata.xml
+++ b/net-dialup/minicom/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>embedded</herd>

diff --git a/net-dialup/ppp-scripts/metadata.xml b/net-dialup/ppp-scripts/metadata.xml
index a34223d..756ddd4 100644
--- a/net-dialup/ppp-scripts/metadata.xml
+++ b/net-dialup/ppp-scripts/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-dialup</herd>

diff --git a/net-dialup/ppp/metadata.xml b/net-dialup/ppp/metadata.xml
index eaaa21b..f7d263a 100644
--- a/net-dialup/ppp/metadata.xml
+++ b/net-dialup/ppp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-dialup/tkvoice/metadata.xml b/net-dialup/tkvoice/metadata.xml
index 30ff1ae..539a4f3 100644
--- a/net-dialup/tkvoice/metadata.xml
+++ b/net-dialup/tkvoice/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-dialup</herd>

diff --git a/net-dialup/ueagle-atm/metadata.xml b/net-dialup/ueagle-atm/metadata.xml
index a8d7ab3..14b1904 100644
--- a/net-dialup/ueagle-atm/metadata.xml
+++ b/net-dialup/ueagle-atm/metadata.xml
@@ -3,5 +3,5 @@
 <pkgmetadata>
 	<herd>net-dialup</herd>
 	<longdescription>Firmware and configuration instructions for ADI 930/Eagle USB ADSL Modem driver
-available in kernels >= 2.6.16.</longdescription>
+available in kernels &gt;= 2.6.16.</longdescription>
 </pkgmetadata>

diff --git a/net-dialup/ueagle4-atm/metadata.xml b/net-dialup/ueagle4-atm/metadata.xml
index ba54a50..917ca85 100644
--- a/net-dialup/ueagle4-atm/metadata.xml
+++ b/net-dialup/ueagle4-atm/metadata.xml
@@ -3,5 +3,5 @@
 <pkgmetadata>
 	<herd>net-dialup</herd>
 	<longdescription>Firmware and configuration instructions for Eagle USB E4 ADSL Modem driver
-available in kernels >= 2.6.16.</longdescription>
+available in kernels &gt;= 2.6.16.</longdescription>
 </pkgmetadata>

diff --git a/net-dns/avahi/metadata.xml b/net-dns/avahi/metadata.xml
index 7c85892..4583b1f 100644
--- a/net-dns/avahi/metadata.xml
+++ b/net-dns/avahi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-dns/dnsmasq/metadata.xml b/net-dns/dnsmasq/metadata.xml
index 7d417df..28a74b6 100644
--- a/net-dns/dnsmasq/metadata.xml
+++ b/net-dns/dnsmasq/metadata.xml
@@ -6,13 +6,13 @@
 <name>Patrick McLean</name>
 </maintainer>
 <use>
-	<flag name='auth-dns'>Add support for acting as an authorative DNS server.</flag>
-	<flag name='conntrack'>Add support for Linux conntrack connection marking.</flag>
-	<flag name='dhcp-tools'>Install extra command line tools for manually managing DHCP leases.</flag>
-	<flag name='dhcp'>Enable support for acting as a DHCP server.</flag>
-	<flag name='dnssec'>Enable support DNSSEC validation and caching.</flag>
-	<flag name='script'>Enable support for calling scripts when leases change.</flag>
-	<flag name='tftp'>Enables built in TFTP server for netbooting.</flag>
+	<flag name="auth-dns">Add support for acting as an authorative DNS server.</flag>
+	<flag name="conntrack">Add support for Linux conntrack connection marking.</flag>
+	<flag name="dhcp-tools">Install extra command line tools for manually managing DHCP leases.</flag>
+	<flag name="dhcp">Enable support for acting as a DHCP server.</flag>
+	<flag name="dnssec">Enable support DNSSEC validation and caching.</flag>
+	<flag name="script">Enable support for calling scripts when leases change.</flag>
+	<flag name="tftp">Enables built in TFTP server for netbooting.</flag>
 </use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:thekelleys:dnsmasq</remote-id>

diff --git a/net-dns/dnssec-check/metadata.xml b/net-dns/dnssec-check/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-dns/dnssec-check/metadata.xml
+++ b/net-dns/dnssec-check/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-dns/dnssec-lookup/metadata.xml b/net-dns/dnssec-lookup/metadata.xml
index a3a94e2..4baa1d9 100644
--- a/net-dns/dnssec-lookup/metadata.xml
+++ b/net-dns/dnssec-lookup/metadata.xml
@@ -12,4 +12,3 @@
 	or fails DNSSEC validation (red).
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-dns/dnssec-nodes/metadata.xml b/net-dns/dnssec-nodes/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-dns/dnssec-nodes/metadata.xml
+++ b/net-dns/dnssec-nodes/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-dns/dnssec-system-tray/metadata.xml b/net-dns/dnssec-system-tray/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-dns/dnssec-system-tray/metadata.xml
+++ b/net-dns/dnssec-system-tray/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-dns/dnssec-tools/metadata.xml b/net-dns/dnssec-tools/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-dns/dnssec-tools/metadata.xml
+++ b/net-dns/dnssec-tools/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-dns/dnssec-validator/metadata.xml b/net-dns/dnssec-validator/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-dns/dnssec-validator/metadata.xml
+++ b/net-dns/dnssec-validator/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-dns/hesinfo/metadata.xml b/net-dns/hesinfo/metadata.xml
index e8b6c80..0f4d275 100644
--- a/net-dns/hesinfo/metadata.xml
+++ b/net-dns/hesinfo/metadata.xml
@@ -7,4 +7,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-dns/ldns-utils/metadata.xml b/net-dns/ldns-utils/metadata.xml
index b2c0747..9b4d0a8 100644
--- a/net-dns/ldns-utils/metadata.xml
+++ b/net-dns/ldns-utils/metadata.xml
@@ -12,8 +12,8 @@
   packets.
   </longdescription>
   <use>
-    <flag name='dane'>Enable DNS-based Authentication of Named Entities (DANE) support</flag>
-    <flag name='ecdsa'>Enable ECDSA support</flag>
-    <flag name='gost'>Enable GOST support</flag>
+    <flag name="dane">Enable DNS-based Authentication of Named Entities (DANE) support</flag>
+    <flag name="ecdsa">Enable ECDSA support</flag>
+    <flag name="gost">Enable GOST support</flag>
   </use>
 </pkgmetadata>

diff --git a/net-dns/maradns/metadata.xml b/net-dns/maradns/metadata.xml
index 0057a2e..41687fa 100644
--- a/net-dns/maradns/metadata.xml
+++ b/net-dns/maradns/metadata.xml
@@ -5,6 +5,6 @@
 <email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <use>
-  <flag name='authonly'>Allows one to build only authoritative DNS server</flag>
+  <flag name="authonly">Allows one to build only authoritative DNS server</flag>
 </use>
 </pkgmetadata>

diff --git a/net-dns/mydns/metadata.xml b/net-dns/mydns/metadata.xml
index 64ae6d9..4413a51 100644
--- a/net-dns/mydns/metadata.xml
+++ b/net-dns/mydns/metadata.xml
@@ -5,8 +5,8 @@
 		<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>
+		<flag name="alias">Enable David Phillips aliasing</flag>
+		<flag name="status">Enable the STATUS opcode to check server status</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">mydns-ng</remote-id>

diff --git a/net-dns/namecoin-qt/metadata.xml b/net-dns/namecoin-qt/metadata.xml
index 836400d..daa2625 100644
--- a/net-dns/namecoin-qt/metadata.xml
+++ b/net-dns/namecoin-qt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-dns/namecoind/metadata.xml b/net-dns/namecoind/metadata.xml
index 836400d..daa2625 100644
--- a/net-dns/namecoind/metadata.xml
+++ b/net-dns/namecoind/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml
index 7a19ab5..50e414a 100644
--- a/net-dns/nsd/metadata.xml
+++ b/net-dns/nsd/metadata.xml
@@ -13,22 +13,22 @@
 		<description>proxy-maintainer, please CC on bugs</description>
 	</maintainer>
 	<use>
-		<flag name='bind8-stats'>Enables BIND8 like NSTATS and XSTATS</flag>
-		<flag name='libevent'>Use libevent or libev, useful when zone
+		<flag name="bind8-stats">Enables BIND8 like NSTATS and XSTATS</flag>
+		<flag name="libevent">Use libevent or libev, useful when zone
 			count is high</flag>
-		<flag name='minimal-responses'>If minimal responses are disabled,
+		<flag name="minimal-responses">If minimal responses are disabled,
 			responses are more likely to get truncated, resulting in TCP
 			fallback</flag>
-		<flag name='nsec3'>Enable NSEC3 support</flag>
-		<flag name='ratelimit'>Enables ratelimiting, based on query name,
+		<flag name="nsec3">Enable NSEC3 support</flag>
+		<flag name="ratelimit">Enables ratelimiting, based on query name,
 			type and source</flag>
-		<flag name='root-server'>Configure NSD as a root server</flag>
-		<flag name='runtime-checks'>Enable runtime checks, this could lead 
+		<flag name="root-server">Configure NSD as a root server</flag>
+		<flag name="runtime-checks">Enable runtime checks, this could lead 
 			to a reduced service level</flag>
-		<flag name='munin'>
+		<flag name="munin">
 			Install a plugin for <pkg>net-analyzer/munin</pkg> to graph
 			statistical data from nsd.</flag>
-		<flag name='zone-stats'>Enable per-zone statistics logging, this 
+		<flag name="zone-stats">Enable per-zone statistics logging, this 
 			could lead to a reduced service level</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-dns/opendnssec/metadata.xml b/net-dns/opendnssec/metadata.xml
index 90d860c..9b97f9a 100644
--- a/net-dns/opendnssec/metadata.xml
+++ b/net-dns/opendnssec/metadata.xml
@@ -5,12 +5,11 @@
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='auditor'>Enables auditing capabilities for OpenDNSSEC</flag>
-		<flag name='eppclient'>Enables support for automatic submission of DNSSEC keys to an upstream epp server</flag>
-		<flag name='signer'>Enables signing capabilities for OpenDNSSEC</flag>
-		<flag name='opensc'>Enables support for storing DNSSEC keys through a <pkg>dev-libs/opensc</pkg> PKCS#11 interface</flag>
-		<flag name='softhsm'>Enables support for storing DNSSEC keys in a <pkg>dev-libs/softhsm</pkg> PKCS#11 object</flag>
-		<flag name='external-hsm'>Enables support for storing DNSSEC keys through an arbitrary non-portage PKCS#11 interface, specified through an environment variable</flag>
+		<flag name="auditor">Enables auditing capabilities for OpenDNSSEC</flag>
+		<flag name="eppclient">Enables support for automatic submission of DNSSEC keys to an upstream epp server</flag>
+		<flag name="signer">Enables signing capabilities for OpenDNSSEC</flag>
+		<flag name="opensc">Enables support for storing DNSSEC keys through a <pkg>dev-libs/opensc</pkg> PKCS#11 interface</flag>
+		<flag name="softhsm">Enables support for storing DNSSEC keys in a <pkg>dev-libs/softhsm</pkg> PKCS#11 object</flag>
+		<flag name="external-hsm">Enables support for storing DNSSEC keys through an arbitrary non-portage PKCS#11 interface, specified through an environment variable</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-dns/pdns/metadata.xml b/net-dns/pdns/metadata.xml
index ec7b58d..6e98fc5 100644
--- a/net-dns/pdns/metadata.xml
+++ b/net-dns/pdns/metadata.xml
@@ -12,13 +12,13 @@ only nameserver. It is written from scratch and conforms to all relevant DNS
 standards documents. Furthermore, PowerDNS interfaces with almost any database.
 </longdescription>
 <use>
-	<flag name='botan'>Make it possible to use the <pkg>dev-libs/botan</pkg> library for crypto-related stuff (like DNSSec) which can be significantly faster than PolarSSL.</flag>
-	<flag name='cryptopp'>Make it possible to use the <pkg>dev-libs/crypto++</pkg> library for crypto-related stuff (like DNSSec) which can be significantly faster than PolarSSL.</flag>
-	<flag name='mydns'>Making it possible to use a MyDNS MySQL database with PowerDNS (not recommended for new deployments).</flag>
-	<flag name='opendbx'>Use a database supported by <pkg>dev-db/opendbx</pkg> as backend.</flag>
-	<flag name='remote'>Use a generic socket or pipe as a backend (via JSON RPC requests).</flag>
-	<flag name='remote-http'>Enable remote connections to HTTP as backends (via RESTful JSON requests).</flag>
-	<flag name='tinydns'>Use a TinyDNS CDB database as backend.</flag>
-	<flag name='tools'>Build optional tools (dnsscan, dnsscope, etc..).</flag>
+	<flag name="botan">Make it possible to use the <pkg>dev-libs/botan</pkg> library for crypto-related stuff (like DNSSec) which can be significantly faster than PolarSSL.</flag>
+	<flag name="cryptopp">Make it possible to use the <pkg>dev-libs/crypto++</pkg> library for crypto-related stuff (like DNSSec) which can be significantly faster than PolarSSL.</flag>
+	<flag name="mydns">Making it possible to use a MyDNS MySQL database with PowerDNS (not recommended for new deployments).</flag>
+	<flag name="opendbx">Use a database supported by <pkg>dev-db/opendbx</pkg> as backend.</flag>
+	<flag name="remote">Use a generic socket or pipe as a backend (via JSON RPC requests).</flag>
+	<flag name="remote-http">Enable remote connections to HTTP as backends (via RESTful JSON requests).</flag>
+	<flag name="tinydns">Use a TinyDNS CDB database as backend.</flag>
+	<flag name="tools">Build optional tools (dnsscan, dnsscope, etc..).</flag>
 </use>
 </pkgmetadata>

diff --git a/net-dns/pdnsd/metadata.xml b/net-dns/pdnsd/metadata.xml
index 796f427..9996eab 100644
--- a/net-dns/pdnsd/metadata.xml
+++ b/net-dns/pdnsd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-dialup</herd>
@@ -13,11 +13,11 @@
     networking).
   </longdescription>
   <use>
-    <flag name='isdn'>
+    <flag name="isdn">
       Linux-only: check status of ippp interfaces with ISDN-specific
       system calls.
     </flag>
-    <flag name='urandom'>
+    <flag name="urandom">
       Linux-only: use /dev/urandom (pseudo-random number generation)
       instead of the default use of random() PRNG.
     </flag>

diff --git a/net-dns/resolvconf-symlink/metadata.xml b/net-dns/resolvconf-symlink/metadata.xml
index 6f4ca86..281ad5a 100644
--- a/net-dns/resolvconf-symlink/metadata.xml
+++ b/net-dns/resolvconf-symlink/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<use>
-		<flag name='symlink'>Actually replace /etc/resolv.conf with a
+		<flag name="symlink">Actually replace /etc/resolv.conf with a
 			symlink. Without this flag, the ebuild is a no-op.</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-dns/sheerdns/metadata.xml b/net-dns/sheerdns/metadata.xml
index c8897a3..319bf47 100644
--- a/net-dns/sheerdns/metadata.xml
+++ b/net-dns/sheerdns/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>

diff --git a/net-dns/unbound/metadata.xml b/net-dns/unbound/metadata.xml
index 75f7246..3c419c0 100644
--- a/net-dns/unbound/metadata.xml
+++ b/net-dns/unbound/metadata.xml
@@ -23,8 +23,8 @@
   as a server, but are linked into an application) are easily possible.
   </longdescription>
   <use>
-    <flag name='dnstap'>Enable dnstap support</flag>
-	<flag name='ecdsa'>Enable ECDSA support</flag>
-    <flag name='gost'>Enable GOST support</flag>
+    <flag name="dnstap">Enable dnstap support</flag>
+	<flag name="ecdsa">Enable ECDSA support</flag>
+    <flag name="gost">Enable GOST support</flag>
   </use>
 </pkgmetadata>

diff --git a/net-dns/updatedd/metadata.xml b/net-dns/updatedd/metadata.xml
index 1076258..bb187b4 100644
--- a/net-dns/updatedd/metadata.xml
+++ b/net-dns/updatedd/metadata.xml
@@ -4,5 +4,5 @@
 <maintainer>
   <email>maintainer-needed@gentoo.org</email>
 </maintainer>
-<longdescription></longdescription>
+<longdescription/>
 </pkgmetadata>

diff --git a/net-firewall/arno-iptables-firewall/metadata.xml b/net-firewall/arno-iptables-firewall/metadata.xml
index 5a526d1..2491879 100644
--- a/net-firewall/arno-iptables-firewall/metadata.xml
+++ b/net-firewall/arno-iptables-firewall/metadata.xml
@@ -7,6 +7,6 @@
 	<name>Ferenc Erki</name>
 </maintainer>
 <use>
-	<flag name='plugins'>Install optional plugins</flag>
+	<flag name="plugins">Install optional plugins</flag>
 </use>
 </pkgmetadata>

diff --git a/net-firewall/ebtables/metadata.xml b/net-firewall/ebtables/metadata.xml
index 0464212..fd59ecd 100644
--- a/net-firewall/ebtables/metadata.xml
+++ b/net-firewall/ebtables/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>base-system</herd>
 	<use>
-		<flag name='perl'>Install the ebtables-save script which uses perl</flag>
+		<flag name="perl">Install the ebtables-save script which uses perl</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">ebtables</remote-id>

diff --git a/net-firewall/firehol/metadata.xml b/net-firewall/firehol/metadata.xml
index 3f70b7d..befdfb4 100644
--- a/net-firewall/firehol/metadata.xml
+++ b/net-firewall/firehol/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index 773fdd8..94ccf54 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/metadata.xml
@@ -12,7 +12,6 @@
 	</maintainer>
 	<herd>virtualization</herd>
 	<use>
-		<flag name='gui'>Builds and installs GUI configurator and GTK+ applet</flag>
+		<flag name="gui">Builds and installs GUI configurator and GTK+ applet</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-firewall/fwipsec/metadata.xml b/net-firewall/fwipsec/metadata.xml
index 51370bb..5de94b6 100644
--- a/net-firewall/fwipsec/metadata.xml
+++ b/net-firewall/fwipsec/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml
index ebd02a7..76e1b58 100644
--- a/net-firewall/iptables/metadata.xml
+++ b/net-firewall/iptables/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='conntrack'>Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag>
-	<flag name='netlink'>Build against libnfnetlink which enables the nfnl_osf util</flag>
-	<flag name='nftables'>Support nftables kernel interface</flag>
-	<flag name='pcap'>Build against <pkg>net-libs/libpcap</pkg> which enables the nfbpf_compile util</flag>
+	<flag name="conntrack">Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag>
+	<flag name="netlink">Build against libnfnetlink which enables the nfnl_osf util</flag>
+	<flag name="nftables">Support nftables kernel interface</flag>
+	<flag name="pcap">Build against <pkg>net-libs/libpcap</pkg> which enables the nfbpf_compile util</flag>
 </use>
 <longdescription>
   iptables is the userspace command line program used to set up, maintain, and

diff --git a/net-firewall/itval/metadata.xml b/net-firewall/itval/metadata.xml
index 57cf75d..4a3f959 100644
--- a/net-firewall/itval/metadata.xml
+++ b/net-firewall/itval/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>

diff --git a/net-firewall/nufw/metadata.xml b/net-firewall/nufw/metadata.xml
index 983d419..b44aca5 100644
--- a/net-firewall/nufw/metadata.xml
+++ b/net-firewall/nufw/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>netmon</herd>
 <use>
-<flag name='nfconntrack'>Use netfilter_conntrack</flag>
-<flag name='nfqueue'>Use NFQUEUE instead of QUEUE</flag>
-<flag name='pam_nuauth'>Add support for pam nufw from PAM</flag>
-<flag name='plaintext'>Add support for authentication with plaintext files</flag>
+<flag name="nfconntrack">Use netfilter_conntrack</flag>
+<flag name="nfqueue">Use NFQUEUE instead of QUEUE</flag>
+<flag name="pam_nuauth">Add support for pam nufw from PAM</flag>
+<flag name="plaintext">Add support for authentication with plaintext files</flag>
 </use>
 </pkgmetadata>

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

diff --git a/net-firewall/shapecfg/metadata.xml b/net-firewall/shapecfg/metadata.xml
index cb5b3b6..7793538 100644
--- a/net-firewall/shapecfg/metadata.xml
+++ b/net-firewall/shapecfg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-fs/cvmfs/metadata.xml b/net-fs/cvmfs/metadata.xml
index d374ec7..71dbd98 100644
--- a/net-fs/cvmfs/metadata.xml
+++ b/net-fs/cvmfs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-fs/openafs/metadata.xml b/net-fs/openafs/metadata.xml
index 043fbdf..12670c7 100644
--- a/net-fs/openafs/metadata.xml
+++ b/net-fs/openafs/metadata.xml
@@ -12,7 +12,7 @@
 	<description>please CC on bugs</description>
 </maintainer>
 <use>
-	<flag name='modules'>Build libafs kernel module. Disable only if you know
+	<flag name="modules">Build libafs kernel module. Disable only if you know
 	what you're doing: without this module OpenAFS client will not work.</flag>
 </use>
 </pkgmetadata>

diff --git a/net-ftp/frox/metadata.xml b/net-ftp/frox/metadata.xml
index a52713b..349948f 100644
--- a/net-ftp/frox/metadata.xml
+++ b/net-ftp/frox/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>proxy-maintainers</herd>

diff --git a/net-ftp/lftp/metadata.xml b/net-ftp/lftp/metadata.xml
index ea034fa..7f024e1 100644
--- a/net-ftp/lftp/metadata.xml
+++ b/net-ftp/lftp/metadata.xml
@@ -6,8 +6,8 @@
   <name>Jeroen Roovers</name>
 </maintainer>
 <use>
-<flag name='convert-mozilla-cookies'>Install the convert-mozilla-cookies script and its run-time dependencies</flag>
-<flag name='openssl'>Use <pkg>dev-libs/openssl</pkg> for SSL connections</flag>
-<flag name='verify-file'>Install the verify-file script and its run-time dependencies</flag>
+<flag name="convert-mozilla-cookies">Install the convert-mozilla-cookies script and its run-time dependencies</flag>
+<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for SSL connections</flag>
+<flag name="verify-file">Install the verify-file script and its run-time dependencies</flag>
 </use>
 </pkgmetadata>

diff --git a/net-ftp/pure-ftpd/metadata.xml b/net-ftp/pure-ftpd/metadata.xml
index b4871d9..6a6ebeb 100644
--- a/net-ftp/pure-ftpd/metadata.xml
+++ b/net-ftp/pure-ftpd/metadata.xml
@@ -8,19 +8,19 @@
 </maintainer>
 <longdescription>Free (BSD), secure, production-quality and standard-conformant FTP server based upon Troll-FTPd. It doesn't provide useless bells and whistles, but focuses on efficiency and ease of use.</longdescription>
 <use>
-	<flag name='anondel'>Permit anonymous to delete files</flag>
-	<flag name='anonperm'>Permit anonymous to change file permissions</flag>
-	<flag name='anonren'>Permit anonymous to rename files</flag>
-	<flag name='anonres'>Permit anonymous to resume file transfers</flag>
-	<flag name='charconv'>Enables charset conversion</flag>
-	<flag name='implicittls'>Enable TLS on Port 990</flag>
-	<flag name='noiplog'>Disables logging of IP addresses</flag>
-	<flag name='paranoidmsg'>Display paranoid messages instead of normal
+	<flag name="anondel">Permit anonymous to delete files</flag>
+	<flag name="anonperm">Permit anonymous to change file permissions</flag>
+	<flag name="anonren">Permit anonymous to rename files</flag>
+	<flag name="anonres">Permit anonymous to resume file transfers</flag>
+	<flag name="charconv">Enables charset conversion</flag>
+	<flag name="implicittls">Enable TLS on Port 990</flag>
+	<flag name="noiplog">Disables logging of IP addresses</flag>
+	<flag name="paranoidmsg">Display paranoid messages instead of normal
 		ones</flag>
-	<flag name='resolveids'>Resolve UIDs/GIDs</flag>
-	<flag name='sysquota'>Enables system quota support (needs sys-fs/quota)
+	<flag name="resolveids">Resolve UIDs/GIDs</flag>
+	<flag name="sysquota">Enables system quota support (needs sys-fs/quota)
 		</flag>
-	<flag name='vchroot'>Enable support for virtual chroot (possible security
+	<flag name="vchroot">Enable support for virtual chroot (possible security
 		risk)</flag>
 </use>
 </pkgmetadata>

diff --git a/net-im/bitlbee/metadata.xml b/net-im/bitlbee/metadata.xml
index e8e57b5..facd33f 100644
--- a/net-im/bitlbee/metadata.xml
+++ b/net-im/bitlbee/metadata.xml
@@ -10,13 +10,13 @@
 		<name>Tim Harder</name>
 	</maintainer>
 	<use>
-		<flag name='libevent'>Use libevent for event handling</flag>
-		<flag name='nss'>Use NSS for SSL support in MSN and Jabber</flag>
-		<flag name='otr'>Enable support for encrypted conversations</flag>
-		<flag name='plugins'>Enable support for plugins</flag>
-		<flag name='purple'>Use libpurple instead of the built-in IM protocol support</flag>
-		<flag name='skype'>Enable Skype support</flag>
-		<flag name='twitter'>Enable Twitter protocol support</flag>
+		<flag name="libevent">Use libevent for event handling</flag>
+		<flag name="nss">Use NSS for SSL support in MSN and Jabber</flag>
+		<flag name="otr">Enable support for encrypted conversations</flag>
+		<flag name="plugins">Enable support for plugins</flag>
+		<flag name="purple">Use libpurple instead of the built-in IM protocol support</flag>
+		<flag name="skype">Enable Skype support</flag>
+		<flag name="twitter">Enable Twitter protocol support</flag>
 	</use>
 	<longdescription>
 		Bitlbee as an IRC to IM gateway. It provides an irc server that allows

diff --git a/net-im/centerim/metadata.xml b/net-im/centerim/metadata.xml
index 2efcddf..174a114 100644
--- a/net-im/centerim/metadata.xml
+++ b/net-im/centerim/metadata.xml
@@ -6,9 +6,9 @@
 	<description>Primary Maintainer</description>
 </maintainer>
 <use>
-	<flag name='gadu'>Enable support for the Gadu-Gadu protocol</flag>
-	<flag name='irc'>Enable support for the IRC protocol</flag>
-	<flag name='lj'>Enable support for the LiveJournal weblog system</flag>
-	<flag name='otr'>Enable encrypted conversations</flag>
+	<flag name="gadu">Enable support for the Gadu-Gadu protocol</flag>
+	<flag name="irc">Enable support for the IRC protocol</flag>
+	<flag name="lj">Enable support for the LiveJournal weblog system</flag>
+	<flag name="otr">Enable encrypted conversations</flag>
 </use>
 </pkgmetadata>

diff --git a/net-im/climm/metadata.xml b/net-im/climm/metadata.xml
index 923f5d9..c5c9e3a 100644
--- a/net-im/climm/metadata.xml
+++ b/net-im/climm/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>net-im</herd>
 <use>
-	<flag name='otr'>Enable encrypted conversations</flag>
+	<flag name="otr">Enable encrypted conversations</flag>
 </use>
 </pkgmetadata>

diff --git a/net-im/dianara/metadata.xml b/net-im/dianara/metadata.xml
index 27e2dbc..49dad4e 100644
--- a/net-im/dianara/metadata.xml
+++ b/net-im/dianara/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-im/ekg2/metadata.xml b/net-im/ekg2/metadata.xml
index 9235b33..81cd10f 100644
--- a/net-im/ekg2/metadata.xml
+++ b/net-im/ekg2/metadata.xml
@@ -8,26 +8,26 @@
 
 	<use>
 		<!-- 0.3* flags -->
-		<flag name='gif' restrict='=net-im/ekg2-0.3*'>
+		<flag name="gif" restrict="=net-im/ekg2-0.3*">
 			GIF token support for Gadu-Gadu protocol.</flag>
-		<flag name='gnutls'>Enable SSL/TLS support through GnuTLS
+		<flag name="gnutls">Enable SSL/TLS support through GnuTLS
 			for the plugins supporting it. If 'ssl' is enabled too, GnuTLS will
 			be preferred where possible (and OpenSSL will be used
 			elsewhere).</flag>
-		<flag name='jpeg'>JPEG token support for Gadu-Gadu protocol.</flag>
-		<flag name='ssl' restrict='=net-im/ekg2-0.3*'>
+		<flag name="jpeg">JPEG token support for Gadu-Gadu protocol.</flag>
+		<flag name="ssl" restrict="=net-im/ekg2-0.3*">
 			Enable the complete SSL/TLS support through OpenSSL.
 			This also enables the 'sim' plugin which relies on OpenSSL.</flag>
-		<flag name='oracle'>Support logging messages into Oracle database.</flag>
+		<flag name="oracle">Support logging messages into Oracle database.</flag>
 
 		<!-- common and modern flags -->
-		<flag name='gadu'>Enable Gadu-Gadu protocol support (requires
+		<flag name="gadu">Enable Gadu-Gadu protocol support (requires
 			<pkg>net-libs/libgadu</pkg>).</flag>
-		<flag name='gpg'>Enable jabber message encryption through
+		<flag name="gpg">Enable jabber message encryption through
 			<pkg>app-crypt/gpgme</pkg>.</flag>
-		<flag name='minimal'>Disable building extra plugins with no additional
+		<flag name="minimal">Disable building extra plugins with no additional
 			deps.</flag>
-		<flag name='openssl'>Support encryption in sim plugin, using OpenSSL.</flag>
-		<flag name='sqlite'>Support logging messages into SQLite3 database.</flag>
+		<flag name="openssl">Support encryption in sim plugin, using OpenSSL.</flag>
+		<flag name="sqlite">Support logging messages into SQLite3 database.</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-im/jabberd2/metadata.xml b/net-im/jabberd2/metadata.xml
index f26a8ec..ec73f0b 100644
--- a/net-im/jabberd2/metadata.xml
+++ b/net-im/jabberd2/metadata.xml
@@ -3,13 +3,13 @@
 <pkgmetadata>
 	<herd>net-im</herd>
 	<use>
-		<flag name='experimental'>Enable experimental features such
+		<flag name="experimental">Enable experimental features such
 			as TLS Everywhere.</flag>
-		<flag name='memdebug'>Enable nad and pool debug.
+		<flag name="memdebug">Enable nad and pool debug.
 			Requires USE="debug" to be set.</flag>
-		<flag name='websocket'>Enable WebSocket support on C2S port.</flag>
+		<flag name="websocket">Enable WebSocket support on C2S port.</flag>
 	</use>
 	<upstream>
-		<remote-id type='github'>jabberd2/jabberd2</remote-id>
+		<remote-id type="github">jabberd2/jabberd2</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-im/licq/metadata.xml b/net-im/licq/metadata.xml
index ffc9012..ab808db 100644
--- a/net-im/licq/metadata.xml
+++ b/net-im/licq/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-im</herd>

diff --git a/net-im/minbif/metadata.xml b/net-im/minbif/metadata.xml
index e96e35b..91f4e72 100644
--- a/net-im/minbif/metadata.xml
+++ b/net-im/minbif/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-im/psi/metadata.xml b/net-im/psi/metadata.xml
index b75b844..a21f6d0 100644
--- a/net-im/psi/metadata.xml
+++ b/net-im/psi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-im</herd>

diff --git a/net-im/psimedia/metadata.xml b/net-im/psimedia/metadata.xml
index c30d109..55991f0 100644
--- a/net-im/psimedia/metadata.xml
+++ b/net-im/psimedia/metadata.xml
@@ -8,6 +8,6 @@
   <name>Nikoli</name>
 </maintainer>
 <use>
-	<flag name='demo'>build simple test application for the PsiMedia system</flag>
+	<flag name="demo">build simple test application for the PsiMedia system</flag>
 </use>
 </pkgmetadata>

diff --git a/net-im/qtwitter/metadata.xml b/net-im/qtwitter/metadata.xml
index 3c9437f..3cbebd8 100644
--- a/net-im/qtwitter/metadata.xml
+++ b/net-im/qtwitter/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
   <herd>qt</herd>
 </pkgmetadata>
-

diff --git a/net-im/telepathy-connection-managers/metadata.xml b/net-im/telepathy-connection-managers/metadata.xml
index 49b41d2..ce896eb 100644
--- a/net-im/telepathy-connection-managers/metadata.xml
+++ b/net-im/telepathy-connection-managers/metadata.xml
@@ -3,14 +3,14 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-  <flag name='gadu'>Enable Gadu Gadu protocol support.</flag>
-  <flag name='irc'>Enable Internet Relay Chat (IRC) support.</flag>
-  <flag name='meanwhile'>Enable meanwhile support for Sametime protocol.</flag>
-  <flag name='sip'>Enable SIP/SIMPLE messaging and calling.</flag>
-  <flag name='sipe'>Enable Sip Exchange Protocol.</flag>
-  <flag name='steam'>Enable Steam Chat support.</flag>
-  <flag name='xmpp'>Enable XMPP protocol handler (this is also Google Talk).</flag>
-  <flag name='yahoo'>Enable Yahoo! messaging support.</flag>
-  <flag name='zeroconf'>Enable Link-Local Messaging via the zeroconf or Bonjour protocol.</flag>
+  <flag name="gadu">Enable Gadu Gadu protocol support.</flag>
+  <flag name="irc">Enable Internet Relay Chat (IRC) support.</flag>
+  <flag name="meanwhile">Enable meanwhile support for Sametime protocol.</flag>
+  <flag name="sip">Enable SIP/SIMPLE messaging and calling.</flag>
+  <flag name="sipe">Enable Sip Exchange Protocol.</flag>
+  <flag name="steam">Enable Steam Chat support.</flag>
+  <flag name="xmpp">Enable XMPP protocol handler (this is also Google Talk).</flag>
+  <flag name="yahoo">Enable Yahoo! messaging support.</flag>
+  <flag name="zeroconf">Enable Link-Local Messaging via the zeroconf or Bonjour protocol.</flag>
 </use>
 </pkgmetadata>

diff --git a/net-im/tkabber/metadata.xml b/net-im/tkabber/metadata.xml
index 6b3ba82..c5f8c72 100644
--- a/net-im/tkabber/metadata.xml
+++ b/net-im/tkabber/metadata.xml
@@ -4,6 +4,6 @@
 <herd>net-im</herd>
 <longdescription>Tkabber is a Free and Open Source client for the Jabber instant messaging system. It's writen in Tcl/Tk, and works on many platforms.</longdescription>
 <use>
-	<flag name='plugins'>Enables installation the extra plugins</flag>
+	<flag name="plugins">Enables installation the extra plugins</flag>
 </use>
 </pkgmetadata>

diff --git a/net-irc/atheme-services/metadata.xml b/net-irc/atheme-services/metadata.xml
index 204e958..eefa09b 100644
--- a/net-irc/atheme-services/metadata.xml
+++ b/net-irc/atheme-services/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-irc</herd>
@@ -12,9 +12,9 @@
     <description>Co-maintainer</description>
   </maintainer>
   <use>
-    <flag name='cracklib'>Enable nickserv/cracklib module for enforcing strong account passwords</flag>
-		<flag name='largenet'>Enable support/tweaks for large networks</flag>
-		<flag name='ldap'>Enable ldap-backed authentication module</flag>
-		<flag name='perl'>Install a perl module which wraps around the services' XML-RPC interface</flag>
+    <flag name="cracklib">Enable nickserv/cracklib module for enforcing strong account passwords</flag>
+		<flag name="largenet">Enable support/tweaks for large networks</flag>
+		<flag name="ldap">Enable ldap-backed authentication module</flag>
+		<flag name="perl">Install a perl module which wraps around the services' XML-RPC interface</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-irc/hexchat/metadata.xml b/net-irc/hexchat/metadata.xml
index 1ec52d6..09408e6 100644
--- a/net-irc/hexchat/metadata.xml
+++ b/net-irc/hexchat/metadata.xml
@@ -12,28 +12,28 @@
 		<description>Proxy maintainer. CC him on bugs</description>
 	</maintainer>
 	<use>
-		<flag name='ntlm'>Enable NTLM authentication</flag>
-		<flag name='libcanberra'>Enable sound event support using
+		<flag name="ntlm">Enable NTLM authentication</flag>
+		<flag name="libcanberra">Enable sound event support using
 			<pkg>media-libs/libcanberra</pkg></flag>
-		<flag name='libproxy'>Enable proxy support.</flag>
-		<flag name='plugins'>Enable plugin support and installs some
+		<flag name="libproxy">Enable proxy support.</flag>
+		<flag name="plugins">Enable plugin support and installs some
 			built-in plugins</flag>
-		<flag name='plugin-checksum'>Build Checksum plugin
+		<flag name="plugin-checksum">Build Checksum plugin
 			(needs plugins)</flag>
-	    <flag name='plugin-doat'>Build Do At plugin (needs plugins)</flag>
-		<flag name='plugin-fishlim'>Build FiSHLiM plugin (needs plugins
+	    <flag name="plugin-doat">Build Do At plugin (needs plugins)</flag>
+		<flag name="plugin-fishlim">Build FiSHLiM plugin (needs plugins
 			)</flag>
-		<flag name='plugin-sysinfo'>Build SysInfo plugin (needs plugins)
+		<flag name="plugin-sysinfo">Build SysInfo plugin (needs plugins)
 		</flag>
-		<flag name='theme-manager'>Build the theme manager (mono)</flag>
+		<flag name="theme-manager">Build the theme manager (mono)</flag>
 	</use>
 	<upstream>
-		<maintainer status='active'>
+		<maintainer status="active">
 			<email>tingping@fedoraproject.org</email>
 			<name>TingPing</name>
 		</maintainer>
 		<bugs-to>https://github.com/hexchat/hexchat/issues</bugs-to>
-		<doc lang='en'>http://hexchat.readthedocs.org/en/latest</doc>
-		<remote-id type='github'>hexchat/hexchat</remote-id>
+		<doc lang="en">http://hexchat.readthedocs.org/en/latest</doc>
+		<remote-id type="github">hexchat/hexchat</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-irc/kvirc/metadata.xml b/net-irc/kvirc/metadata.xml
index 2d09bff..8c436c2 100644
--- a/net-irc/kvirc/metadata.xml
+++ b/net-irc/kvirc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-irc/ngircd/metadata.xml b/net-irc/ngircd/metadata.xml
index 3bca316..9f4b167 100644
--- a/net-irc/ngircd/metadata.xml
+++ b/net-irc/ngircd/metadata.xml
@@ -9,6 +9,6 @@
 		<description>Proxied maintainer; set to assignee in all bugs</description>
 	</maintainer>
 	<use>
-		<flag name='ident'>Enables support for <pkg>net-libs/libident</pkg></flag>
+		<flag name="ident">Enables support for <pkg>net-libs/libident</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/net-irc/psybnc/metadata.xml b/net-irc/psybnc/metadata.xml
index 84d7ff4..5a33ac0 100644
--- a/net-irc/psybnc/metadata.xml
+++ b/net-irc/psybnc/metadata.xml
@@ -7,9 +7,9 @@
 		<name>Bjarke Istrup Pedersen</name>
 	</maintainer>
 	<use>
-		<flag name='oidentd'>Adds support for oidentd</flag>
-		<flag name='scripting'>Adds scripting support</flag>
-		<flag name='multinetwork'>Adds support for multiple networks</flag>
+		<flag name="oidentd">Adds support for oidentd</flag>
+		<flag name="scripting">Adds scripting support</flag>
+		<flag name="multinetwork">Adds support for multiple networks</flag>
 	</use>
 	<longdescription>psyBNC is a multi-user and multi-server gateway to IRC networks</longdescription>
 </pkgmetadata>

diff --git a/net-irc/quassel/metadata.xml b/net-irc/quassel/metadata.xml
index 2703085..6155014 100644
--- a/net-irc/quassel/metadata.xml
+++ b/net-irc/quassel/metadata.xml
@@ -42,7 +42,7 @@
 			the client.
 		</flag>
 		<flag name="crypt">
-			Support core->network per-channel and per-query blowfish
+			Support core-&gt;network per-channel and per-query blowfish
 			encryption via <pkg>app-crypt/qca:2</pkg>.
 		</flag>
 	</use>

diff --git a/net-irc/unrealircd/metadata.xml b/net-irc/unrealircd/metadata.xml
index 7a29853..255310e 100644
--- a/net-irc/unrealircd/metadata.xml
+++ b/net-irc/unrealircd/metadata.xml
@@ -11,15 +11,15 @@
 		<name>Jeff Horelick</name>
 	</maintainer>
 	<use>
-		<flag name='class-nofakelag'>Enable an unsupported class::options flag called “nofakelag” allowing you to grant fakelag exemption to normal user (instead of just opers).</flag>
-		<flag name='extban-stacking'>Enable extended channel bans (such as +b ~c: and +b ~n:) to contain other extended bans instead of just hostmasks.</flag>
-		<flag name='prefixaq'>Enable chanadmin and chanowner prefixes</flag>
-		<flag name='showlistmodes'>Support displaying channel modes during compilation</flag>
-		<flag name='operoverride-verify'>Enable requiring opers to invite themselves to +s/+p channels</flag>
-		<flag name='operoverride'>Enable OperOverride extension</flag>
-		<flag name='usermod'>Enable /set* and /chg* commands</flag>
-		<flag name='showlistmodes'>Support displaying channel modes in /list</flag>
-		<flag name='shunnotices'>Enable notifying a user when un-shunned</flag>
-		<flag name='topicisnuhost'>Enable displaying nick!user@host as topic setter</flag>
+		<flag name="class-nofakelag">Enable an unsupported class::options flag called “nofakelag” allowing you to grant fakelag exemption to normal user (instead of just opers).</flag>
+		<flag name="extban-stacking">Enable extended channel bans (such as +b ~c: and +b ~n:) to contain other extended bans instead of just hostmasks.</flag>
+		<flag name="prefixaq">Enable chanadmin and chanowner prefixes</flag>
+		<flag name="showlistmodes">Support displaying channel modes during compilation</flag>
+		<flag name="operoverride-verify">Enable requiring opers to invite themselves to +s/+p channels</flag>
+		<flag name="operoverride">Enable OperOverride extension</flag>
+		<flag name="usermod">Enable /set* and /chg* commands</flag>
+		<flag name="showlistmodes">Support displaying channel modes in /list</flag>
+		<flag name="shunnotices">Enable notifying a user when un-shunned</flag>
+		<flag name="topicisnuhost">Enable displaying nick!user@host as topic setter</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-libs/NativeThread/metadata.xml b/net-libs/NativeThread/metadata.xml
index fed3658..266fe13 100644
--- a/net-libs/NativeThread/metadata.xml
+++ b/net-libs/NativeThread/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-libs/aqbanking/metadata.xml b/net-libs/aqbanking/metadata.xml
index 73fd1d7..3a602d8 100644
--- a/net-libs/aqbanking/metadata.xml
+++ b/net-libs/aqbanking/metadata.xml
@@ -4,7 +4,7 @@
   <maintainer>
     <email>hanno@gentoo.org</email></maintainer>
   <use>
-    <flag name='chipcard'>Enable support for DDV/RSA-chipcards</flag>
-    <flag name='ebics'>Enable support for Electronic Banking Internet Communication Standard (EBICS)</flag>
+    <flag name="chipcard">Enable support for DDV/RSA-chipcards</flag>
+    <flag name="ebics">Enable support for Electronic Banking Internet Communication Standard (EBICS)</flag>
   </use>
 </pkgmetadata>

diff --git a/net-libs/c-client/metadata.xml b/net-libs/c-client/metadata.xml
index 20b3256..2156c37 100644
--- a/net-libs/c-client/metadata.xml
+++ b/net-libs/c-client/metadata.xml
@@ -4,9 +4,9 @@
     <herd>net-mail</herd>
 	<use>
 		<flag name="doc">Install RFCs related to IMAP</flag>
-		<flag name='topal'>Enable support for <pkg>net-mail/topal</pkg>
+		<flag name="topal">Enable support for <pkg>net-mail/topal</pkg>
 		for use with <pkg>mail-client/alpine</pkg></flag>
-		<flag name='chappa'>Enable Eduardo Chappa's patches for use with
+		<flag name="chappa">Enable Eduardo Chappa's patches for use with
 		<pkg>mail-client/alpine</pkg> (mainly adds support for maildir)</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-libs/daq/metadata.xml b/net-libs/daq/metadata.xml
index 8775292..9ddd533 100644
--- a/net-libs/daq/metadata.xml
+++ b/net-libs/daq/metadata.xml
@@ -1,36 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>proxy-maintainers</herd>
-<maintainer>
-  <email>jason.r.wallace@gmail.com</email>
-  <name>Jason Wallace</name>
-</maintainer>
-<maintainer>
-  <email>patrick@gentoo.org</email>
-  <name>Patrick Lauer</name>
-</maintainer>
-<herd>netmon</herd>
-<longdescription>Data Acquisition library, for packet I/O with Snort 2.9 and later</longdescription>
-<use>
-	<flag name='afpacket'>
-		Build the AFPacket data acquisition module. Functions similar to the PCAP 
-		module but with better performance. Snort can run unprivileged when using 
-		this module. AFpacket supports both inline and passive modes.
-	</flag>
-	<flag name='dump'>Build the Dump data acquisition module. The dump DAQ
-		allows you to test the various inline mode features available in
-		2.9 Snort like injection and normalization.
-	</flag>
-	<flag name='pcap'>Build the PCAP data acquisition module.</flag>
-	<flag name='nfq'>
-		Build the NFQ data acquisition module. NFQ is the new way to process iptables 
-		packets for inline deployments. Snort can not run unprivileged when using this module.
-	</flag>
-	<flag name='ipq'>
-		Build the IPQ data acquisition module. IPQ is the old way to process iptables
-		packets for inline deployments. Snort can not run unprivileged when using this module.
-	</flag>
-</use>
-</pkgmetadata>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+  <email>jason.r.wallace@gmail.com</email>
+  <name>Jason Wallace</name>
+</maintainer>
+<maintainer>
+  <email>patrick@gentoo.org</email>
+  <name>Patrick Lauer</name>
+</maintainer>
+<herd>netmon</herd>
+<longdescription>Data Acquisition library, for packet I/O with Snort 2.9 and later</longdescription>
+<use>
+	<flag name="afpacket">
+		Build the AFPacket data acquisition module. Functions similar to the PCAP 
+		module but with better performance. Snort can run unprivileged when using 
+		this module. AFpacket supports both inline and passive modes.
+	</flag>
+	<flag name="dump">Build the Dump data acquisition module. The dump DAQ
+		allows you to test the various inline mode features available in
+		2.9 Snort like injection and normalization.
+	</flag>
+	<flag name="pcap">Build the PCAP data acquisition module.</flag>
+	<flag name="nfq">
+		Build the NFQ data acquisition module. NFQ is the new way to process iptables 
+		packets for inline deployments. Snort can not run unprivileged when using this module.
+	</flag>
+	<flag name="ipq">
+		Build the IPQ data acquisition module. IPQ is the old way to process iptables
+		packets for inline deployments. Snort can not run unprivileged when using this module.
+	</flag>
+</use>
+</pkgmetadata>

diff --git a/net-libs/gsnmp/metadata.xml b/net-libs/gsnmp/metadata.xml
index 9ca15ca..03aa50b 100644
--- a/net-libs/gsnmp/metadata.xml
+++ b/net-libs/gsnmp/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>netmon</herd>
 </pkgmetadata>
-

diff --git a/net-libs/hubbub/metadata.xml b/net-libs/hubbub/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-libs/hubbub/metadata.xml
+++ b/net-libs/hubbub/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-libs/iax/metadata.xml b/net-libs/iax/metadata.xml
index 34479ae..0ee1ef3 100644
--- a/net-libs/iax/metadata.xml
+++ b/net-libs/iax/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <maintainer><email>chainsaw@gentoo.org</email></maintainer>
 	<use>
-		<flag name='snomhack'>Use slower memset for SNOM phoneem</flag>
+		<flag name="snomhack">Use slower memset for SNOM phoneem</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-libs/iojs/metadata.xml b/net-libs/iojs/metadata.xml
index 7038ab4..35d280f 100644
--- a/net-libs/iojs/metadata.xml
+++ b/net-libs/iojs/metadata.xml
@@ -20,8 +20,8 @@
 		<bugs-to>https://github.com/iojs/io.js/issues</bugs-to>
 	</upstream>
 	<use>
-		<flag name='bundled-libs'>Use bundled libs instead of system libs</flag>
-		<flag name='npm'>Enable NPM package manager</flag>
-		<flag name='snapshot'>Enable snapshot creation for faster startup</flag>
+		<flag name="bundled-libs">Use bundled libs instead of system libs</flag>
+		<flag name="npm">Enable NPM package manager</flag>
+		<flag name="snapshot">Enable snapshot creation for faster startup</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-libs/ldns/metadata.xml b/net-libs/ldns/metadata.xml
index 6452981..6d01f3a 100644
--- a/net-libs/ldns/metadata.xml
+++ b/net-libs/ldns/metadata.xml
@@ -12,8 +12,8 @@
   packets.
   </longdescription>
   <use>
-    <flag name='dane'>Enable DNS-based Authentication of Named Entities (DANE) support</flag>
-    <flag name='ecdsa'>Enable ECDSA support</flag>
-    <flag name='gost'>Enable GOST support</flag>
+    <flag name="dane">Enable DNS-based Authentication of Named Entities (DANE) support</flag>
+    <flag name="ecdsa">Enable ECDSA support</flag>
+    <flag name="gost">Enable GOST support</flag>
   </use>
 </pkgmetadata>

diff --git a/net-libs/libbitcoinconsensus/metadata.xml b/net-libs/libbitcoinconsensus/metadata.xml
index 52b62db..9afdd38 100644
--- a/net-libs/libbitcoinconsensus/metadata.xml
+++ b/net-libs/libbitcoinconsensus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-libs/libbtbb/metadata.xml b/net-libs/libbtbb/metadata.xml
index ef7765b..51bee8c 100644
--- a/net-libs/libbtbb/metadata.xml
+++ b/net-libs/libbtbb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-libs/libdom/metadata.xml b/net-libs/libdom/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-libs/libdom/metadata.xml
+++ b/net-libs/libdom/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-libs/libeXosip/metadata.xml b/net-libs/libeXosip/metadata.xml
index f3711a3..aed8a34 100644
--- a/net-libs/libeXosip/metadata.xml
+++ b/net-libs/libeXosip/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
-  <flag name='srv'>enable support for SRV records DNS queries</flag>
+  <flag name="srv">enable support for SRV records DNS queries</flag>
 </use>
 </pkgmetadata>

diff --git a/net-libs/libetpan/metadata.xml b/net-libs/libetpan/metadata.xml
index 9dcc4c5..a9c325b 100644
--- a/net-libs/libetpan/metadata.xml
+++ b/net-libs/libetpan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-mail</herd>

diff --git a/net-libs/libgsasl/metadata.xml b/net-libs/libgsasl/metadata.xml
index b11afc2..a0231ac 100644
--- a/net-libs/libgsasl/metadata.xml
+++ b/net-libs/libgsasl/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>net-mail</herd>
 <use>
-	<flag name='gcrypt'>Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto</flag>
-	<flag name='ntlm'>Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg></flag>
+	<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto</flag>
+	<flag name="ntlm">Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/net-libs/libhubbub/metadata.xml b/net-libs/libhubbub/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-libs/libhubbub/metadata.xml
+++ b/net-libs/libhubbub/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-libs/libinfinity/metadata.xml b/net-libs/libinfinity/metadata.xml
index e3f8eb8..15c13dc 100644
--- a/net-libs/libinfinity/metadata.xml
+++ b/net-libs/libinfinity/metadata.xml
@@ -6,7 +6,7 @@
     <name>Tiziano Müller</name>
   </maintainer>
   <use>
-    <flag name='server'>
+    <flag name="server">
       Build and install the server binary including init.d/conf.d-scripts.
       Needed if you want to host an infinote server for gobby.
     </flag>

diff --git a/net-libs/libmicrohttpd/metadata.xml b/net-libs/libmicrohttpd/metadata.xml
index e486bb8..540a00f 100644
--- a/net-libs/libmicrohttpd/metadata.xml
+++ b/net-libs/libmicrohttpd/metadata.xml
@@ -6,8 +6,7 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
-		<flag name='messages'>enable error messages</flag>
-		<flag name='epoll'>use epoll() system call</flag>
+		<flag name="messages">enable error messages</flag>
+		<flag name="epoll">use epoll() system call</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-libs/libmirisdr/metadata.xml b/net-libs/libmirisdr/metadata.xml
index 044f121..631cfab 100644
--- a/net-libs/libmirisdr/metadata.xml
+++ b/net-libs/libmirisdr/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-libs/libmnl/metadata.xml b/net-libs/libmnl/metadata.xml
index b301c63..4fc2859 100644
--- a/net-libs/libmnl/metadata.xml
+++ b/net-libs/libmnl/metadata.xml
@@ -10,4 +10,3 @@
 	avoid re-inventing the wheel.
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-libs/libnetfilter_cttimeout/metadata.xml b/net-libs/libnetfilter_cttimeout/metadata.xml
index 9ca15ca..03aa50b 100644
--- a/net-libs/libnetfilter_cttimeout/metadata.xml
+++ b/net-libs/libnetfilter_cttimeout/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>netmon</herd>
 </pkgmetadata>
-

diff --git a/net-libs/libnftnl/metadata.xml b/net-libs/libnftnl/metadata.xml
index 905b54e..48a9f11 100644
--- a/net-libs/libnftnl/metadata.xml
+++ b/net-libs/libnftnl/metadata.xml
@@ -10,4 +10,3 @@
 	<flag name="json">Supports parsing of JSON</flag>
 </use>
 </pkgmetadata>
-

diff --git a/net-libs/libosmo-abis/metadata.xml b/net-libs/libosmo-abis/metadata.xml
index c1b4dee..19e2def 100644
--- a/net-libs/libosmo-abis/metadata.xml
+++ b/net-libs/libosmo-abis/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>radio</herd>
 </pkgmetadata>
-

diff --git a/net-libs/libosmo-dsp/metadata.xml b/net-libs/libosmo-dsp/metadata.xml
index 044f121..631cfab 100644
--- a/net-libs/libosmo-dsp/metadata.xml
+++ b/net-libs/libosmo-dsp/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-libs/libosmocore/metadata.xml b/net-libs/libosmocore/metadata.xml
index a3b7887..79f195b 100644
--- a/net-libs/libosmocore/metadata.xml
+++ b/net-libs/libosmocore/metadata.xml
@@ -3,8 +3,7 @@
 <pkgmetadata>
 	<herd>radio</herd>
 	<use>
-		<flag name='embedded'>Build for embedded use and disable unsupported features</flag>
-		<flag name='pcsc-lite'>Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
+		<flag name="embedded">Build for embedded use and disable unsupported features</flag>
+		<flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg></flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-libs/libpcap/metadata.xml b/net-libs/libpcap/metadata.xml
index 5455c0b..ceb9f2c 100644
--- a/net-libs/libpcap/metadata.xml
+++ b/net-libs/libpcap/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
   <herd>netmon</herd>
   <use>
-    <flag name='netlink'>
+    <flag name="netlink">
       Use <pkg>dev-libs/libnl</pkg> to put wireless interfaces in monitor mode.
     </flag>
-    <flag name='canusb'>
+    <flag name="canusb">
       Use <pkg>virtual/libusb</pkg> to support Controller Area Network over USB (CAN USB)
     </flag>
   </use>

diff --git a/net-libs/librsync/metadata.xml b/net-libs/librsync/metadata.xml
index f9c3947..cf0ec76 100644
--- a/net-libs/librsync/metadata.xml
+++ b/net-libs/librsync/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-libs/libsrtp/metadata.xml b/net-libs/libsrtp/metadata.xml
index 9d26e66..46b4326 100644
--- a/net-libs/libsrtp/metadata.xml
+++ b/net-libs/libsrtp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>chromium</herd>

diff --git a/net-libs/libssh/metadata.xml b/net-libs/libssh/metadata.xml
index 61a522f..9ff8b99 100644
--- a/net-libs/libssh/metadata.xml
+++ b/net-libs/libssh/metadata.xml
@@ -4,12 +4,12 @@
 <herd>netmon</herd>
 <herd>kde</herd>
 <use>
-  <flag name='gcrypt'>Prefer <pkg>dev-libs/libgcrypt</pkg> over
+  <flag name="gcrypt">Prefer <pkg>dev-libs/libgcrypt</pkg> over
     <pkg>dev-libs/openssl</pkg> for encryption</flag>
-  <flag name='gssapi'>Enable gssapi support</flag>
-  <flag name='pcap'>Build with PCAP output support</flag>
-  <flag name='sftp'>Build with SFTP support</flag>
-  <flag name='ssh1'>Build with SSH1 support</flag>
-  <flag name='server'>Build with SSH server support</flag>
+  <flag name="gssapi">Enable gssapi support</flag>
+  <flag name="pcap">Build with PCAP output support</flag>
+  <flag name="sftp">Build with SFTP support</flag>
+  <flag name="ssh1">Build with SSH1 support</flag>
+  <flag name="server">Build with SSH server support</flag>
 </use>
 </pkgmetadata>

diff --git a/net-libs/libvncserver/metadata.xml b/net-libs/libvncserver/metadata.xml
index cbcedc8..c0da6a7 100644
--- a/net-libs/libvncserver/metadata.xml
+++ b/net-libs/libvncserver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-libs/nativebiginteger/metadata.xml b/net-libs/nativebiginteger/metadata.xml
index fed3658..266fe13 100644
--- a/net-libs/nativebiginteger/metadata.xml
+++ b/net-libs/nativebiginteger/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-libs/nodejs/metadata.xml b/net-libs/nodejs/metadata.xml
index 4dbbc90..850a8ee 100644
--- a/net-libs/nodejs/metadata.xml
+++ b/net-libs/nodejs/metadata.xml
@@ -11,7 +11,7 @@
 		<name>Patrick Lauer</name>
 	</maintainer>
 	<use>
-	<flag name='npm'>Enable NPM package manager</flag>
-	<flag name='snapshot'>Enable snapshot creation for faster startup</flag>
+	<flag name="npm">Enable NPM package manager</flag>
+	<flag name="snapshot">Enable snapshot creation for faster startup</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-libs/onion/metadata.xml b/net-libs/onion/metadata.xml
index 711ffd1..05a96ca 100644
--- a/net-libs/onion/metadata.xml
+++ b/net-libs/onion/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-libs/openmq-cclient/metadata.xml b/net-libs/openmq-cclient/metadata.xml
index dd4cd93..231b533 100644
--- a/net-libs/openmq-cclient/metadata.xml
+++ b/net-libs/openmq-cclient/metadata.xml
@@ -16,4 +16,3 @@
 		These ebuilds install the c-client library only.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/net-libs/ortp/metadata.xml b/net-libs/ortp/metadata.xml
index caea1a2..3428192 100644
--- a/net-libs/ortp/metadata.xml
+++ b/net-libs/ortp/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <maintainer><email>chainsaw@gentoo.org</email></maintainer>
 	<use>
-		<flag name='ntp-timestamp'>Turn on NTP timestamping on received packet</flag>
-		<flag name='srtp'>Add support for Secure RTP</flag>
-		<flag name='zrtp'>Add support for ZRTP key negotiation</flag>
+		<flag name="ntp-timestamp">Turn on NTP timestamping on received packet</flag>
+		<flag name="srtp">Add support for Secure RTP</flag>
+		<flag name="zrtp">Add support for ZRTP key negotiation</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-libs/phodav/metadata.xml b/net-libs/phodav/metadata.xml
index a8b26c1..38087ff 100644
--- a/net-libs/phodav/metadata.xml
+++ b/net-libs/phodav/metadata.xml
@@ -4,6 +4,6 @@
   <herd>gnome</herd>
   <herd>virtualization</herd>
   <use>
-	  <flag name='spice'>Install the spice-webdavd guest agent</flag>
+	  <flag name="spice">Install the spice-webdavd guest agent</flag>
   </use>
 </pkgmetadata>

diff --git a/net-libs/polarssl/metadata.xml b/net-libs/polarssl/metadata.xml
index 807a874..34c9f42 100644
--- a/net-libs/polarssl/metadata.xml
+++ b/net-libs/polarssl/metadata.xml
@@ -13,6 +13,6 @@
 			Warning: the HAVEGE random generator is not suitable for
 			virtualized environments
 		</flag>
-		<flag name='programs'>Build PolarSSL programs</flag>
+		<flag name="programs">Build PolarSSL programs</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-libs/ripe-atlas-sagan/metadata.xml b/net-libs/ripe-atlas-sagan/metadata.xml
index 5f5dcbc..3eba6ff 100644
--- a/net-libs/ripe-atlas-sagan/metadata.xml
+++ b/net-libs/ripe-atlas-sagan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-libs/telepathy-qt/metadata.xml b/net-libs/telepathy-qt/metadata.xml
index 1e6e071..ee4ec0b 100644
--- a/net-libs/telepathy-qt/metadata.xml
+++ b/net-libs/telepathy-qt/metadata.xml
@@ -4,6 +4,6 @@
 	<herd>qt</herd>
 	<herd>kde</herd>
 	<use>
-		<flag name='farstream'>Enable support for audio/video calls via farstream</flag>
+		<flag name="farstream">Enable support for audio/video calls via farstream</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml
index b49dc03..f3d154b 100644
--- a/net-libs/webkit-gtk/metadata.xml
+++ b/net-libs/webkit-gtk/metadata.xml
@@ -4,9 +4,9 @@
   <herd>gnome</herd>
   <use>
   	<flag name="coverage">Enable code coverage support</flag>
-	<flag name='egl'>Enable EGL support.</flag>
+	<flag name="egl">Enable EGL support.</flag>
         <flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag>
-	<flag name='gles2'>Enable GLESv2 support.</flag>
+	<flag name="gles2">Enable GLESv2 support.</flag>
 	<flag name="libsecret">Enable libsecret support to store login credentials</flag>
 	<flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag>
   </use>

diff --git a/net-mail/Freemail/metadata.xml b/net-mail/Freemail/metadata.xml
index fed3658..266fe13 100644
--- a/net-mail/Freemail/metadata.xml
+++ b/net-mail/Freemail/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Thomas Sachau (Tommy[D])</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-mail/autorespond/metadata.xml b/net-mail/autorespond/metadata.xml
index e9258b4..b163611 100644
--- a/net-mail/autorespond/metadata.xml
+++ b/net-mail/autorespond/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>net-mail</herd>

diff --git a/net-mail/mhonarc-gentoo/metadata.xml b/net-mail/mhonarc-gentoo/metadata.xml
index 8b5f73e..a9d2858 100644
--- a/net-mail/mhonarc-gentoo/metadata.xml
+++ b/net-mail/mhonarc-gentoo/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Theo Chatzimichos</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-mail/mhonarc/metadata.xml b/net-mail/mhonarc/metadata.xml
index 4c7471d..940fde8 100644
--- a/net-mail/mhonarc/metadata.xml
+++ b/net-mail/mhonarc/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>net-mail</herd>
 </pkgmetadata>
-

diff --git a/net-mail/mu/metadata.xml b/net-mail/mu/metadata.xml
index 29276fd..7c7b1c9 100644
--- a/net-mail/mu/metadata.xml
+++ b/net-mail/mu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-mail</herd>

diff --git a/net-mail/sendEmail/metadata.xml b/net-mail/sendEmail/metadata.xml
index bff87ba..a9c09ef 100644
--- a/net-mail/sendEmail/metadata.xml
+++ b/net-mail/sendEmail/metadata.xml
@@ -12,4 +12,3 @@ SendEmail is written in Perl and is unique in that it requires NO SPECIAL
 MODULES. It has a straight forward interface, making it very easy to use.
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-mail/vqadmin/metadata.xml b/net-mail/vqadmin/metadata.xml
index 9f3a417..f2812da 100644
--- a/net-mail/vqadmin/metadata.xml
+++ b/net-mail/vqadmin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer>

diff --git a/net-misc/aria2/metadata.xml b/net-misc/aria2/metadata.xml
index d1101e9..1079971 100644
--- a/net-misc/aria2/metadata.xml
+++ b/net-misc/aria2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-misc/badvpn/metadata.xml b/net-misc/badvpn/metadata.xml
index e8f7e85..500e275 100644
--- a/net-misc/badvpn/metadata.xml
+++ b/net-misc/badvpn/metadata.xml
@@ -12,7 +12,7 @@
         </maintainer>
         <doc lang="en">https://code.google.com/p/badvpn/w/list</doc>
 		<bugs-to>https://github.com/ambrop72/badvpn/issues</bugs-to>
-		<remote-id type='github'>ambrop72/badvpn</remote-id>
+		<remote-id type="github">ambrop72/badvpn</remote-id>
 		<remote-id type="google-code">badvpn</remote-id>
 	</upstream>
 	<use>
@@ -38,4 +38,3 @@
 		like tun2socks and NCD.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/net-misc/batctl/metadata.xml b/net-misc/batctl/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-misc/batctl/metadata.xml
+++ b/net-misc/batctl/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-misc/batman-adv/metadata.xml b/net-misc/batman-adv/metadata.xml
index 91ea9df..e9ea16a 100644
--- a/net-misc/batman-adv/metadata.xml
+++ b/net-misc/batman-adv/metadata.xml
@@ -12,4 +12,3 @@
 	<flag name="mcast">B.A.T.M.A.N. multicast optimizations</flag>
 </use>
 </pkgmetadata>
-

diff --git a/net-misc/bfgminer/metadata.xml b/net-misc/bfgminer/metadata.xml
index ef981de..49d6f9a 100644
--- a/net-misc/bfgminer/metadata.xml
+++ b/net-misc/bfgminer/metadata.xml
@@ -10,46 +10,46 @@
 		<name>Luke Dashjr</name>
 	</maintainer>
 	<use>
-		<flag name='adl'>Enable support for controlling fans and overclocking on AMD cards with AMD Display Library</flag>
-		<flag name='antminer'>Enable support for mining with AntMiner U1 sticks</flag>
-		<flag name='avalon'>Enable support for mining with Avalon 1 ASIC modules</flag>
-		<flag name='avalonmm'>Enable support for mining with Avalon 2/3 ASIC modules</flag>
-		<flag name='bifury'>Enable support for mining with Bi*fury USB sticks</flag>
-		<flag name='bitforce'>Enable support for mining with ButterFly Labs BitFORCE ASICs and/or FPGAs</flag>
-		<flag name='bfsb'>Enable support for mining on BFSB host Raspberry Pi</flag>
-		<flag name='bfx'>Enable support for mining with BFx2 USB sticks</flag>
-		<flag name='bigpic'>Enable support for mining with Big Picture Mining USB sticks (Red/BlueFury, BF1, etc)</flag>
-		<flag name='bitfury'>Enable support for mining with 55nm Bitfury-based devices</flag>
-		<flag name='cointerra'>Enable support for mining with CoinTerra TerraMiner.</flag>
-		<flag name='cpumining'>Enable support for mining with CPUs</flag>
-		<flag name='drillbit'>Enable support for mining with Drillbit boards</flag>
-		<flag name='dualminer'>Enable support for mining with DualMiner USB sticks</flag>
-		<flag name='gridseed'>Enable support for mining with 5-chip GridSeed orbs</flag>
-		<flag name='hashbuster'>Enable support for mining with HashBuster nano boards</flag>
-		<flag name='hashbuster2'>Enable support for mining with HashBuster micro boards</flag>
-		<flag name='hashfast'>Enable support for mining with HashFast devices</flag>
-		<flag name='icarus'>Enable support for mining with Icarus-compatible devices (including Block Erupter Sapphire ASICs)</flag>
-		<flag name='jingtian'>Enable support for mining on JingTian boards via SPI/GPIO</flag>
-		<flag name='keccak'>Enable support for mining with Keccak miners</flag>
-		<flag name='klondike'>Enable support for mining with Klondike USB miners</flag>
-		<flag name='libusb'>Use libusb</flag>
-		<flag name='littlefury'>Enable support for mining with LittleFury USB sticks</flag>
-		<flag name='metabank'>Enable support for mining on Metabank host Raspberry Pi</flag>
-		<flag name='minion'>Enable support for mining on minion chips via SPI (BlackArrow Prospero)</flag>
-		<flag name='modminer'>Enable support for mining with ModMiner FPGAs</flag>
-		<flag name='nanofury'>Enable support for mining with NanoFury USB sticks</flag>
-		<flag name='opencl'>Enable support for mining with OpenCL-capable devices (GPUs)</flag>
-		<flag name='proxy'>Enable support for virtual proxy device</flag>
-		<flag name='proxy_getwork'>Enable proxy support for getwork protocol (often used with Block Erupter Blades)</flag>
-		<flag name='proxy_stratum'>Enable proxy support for stratum protocol</flag>
-		<flag name='rockminer'>Enable support for mining with RockMiner devices</flag>
-		<flag name='screen'>Provide start-bfgminer.sh script to launch BFGMiner in app-misc/screen</flag>
-		<flag name='scrypt'>Enable support for scrypt mining algorithm</flag>
-		<flag name='sha256d'>Enable support for SHA256d mining algorithm</flag>
-		<flag name='twinfury'>Enable support for mining with Twinfury USB sticks</flag>
-		<flag name='udev-broad-rules'>Enable broader udev rules that may match non-mining devices</flag>
-		<flag name='x6500'>Enable support for mining with X6500 FPGAs</flag>
-		<flag name='zeusminer'>Enable support for mining with ZeusMiner units</flag>
-		<flag name='ztex'>Enable support for mining with Ztex FPGAs</flag>
+		<flag name="adl">Enable support for controlling fans and overclocking on AMD cards with AMD Display Library</flag>
+		<flag name="antminer">Enable support for mining with AntMiner U1 sticks</flag>
+		<flag name="avalon">Enable support for mining with Avalon 1 ASIC modules</flag>
+		<flag name="avalonmm">Enable support for mining with Avalon 2/3 ASIC modules</flag>
+		<flag name="bifury">Enable support for mining with Bi*fury USB sticks</flag>
+		<flag name="bitforce">Enable support for mining with ButterFly Labs BitFORCE ASICs and/or FPGAs</flag>
+		<flag name="bfsb">Enable support for mining on BFSB host Raspberry Pi</flag>
+		<flag name="bfx">Enable support for mining with BFx2 USB sticks</flag>
+		<flag name="bigpic">Enable support for mining with Big Picture Mining USB sticks (Red/BlueFury, BF1, etc)</flag>
+		<flag name="bitfury">Enable support for mining with 55nm Bitfury-based devices</flag>
+		<flag name="cointerra">Enable support for mining with CoinTerra TerraMiner.</flag>
+		<flag name="cpumining">Enable support for mining with CPUs</flag>
+		<flag name="drillbit">Enable support for mining with Drillbit boards</flag>
+		<flag name="dualminer">Enable support for mining with DualMiner USB sticks</flag>
+		<flag name="gridseed">Enable support for mining with 5-chip GridSeed orbs</flag>
+		<flag name="hashbuster">Enable support for mining with HashBuster nano boards</flag>
+		<flag name="hashbuster2">Enable support for mining with HashBuster micro boards</flag>
+		<flag name="hashfast">Enable support for mining with HashFast devices</flag>
+		<flag name="icarus">Enable support for mining with Icarus-compatible devices (including Block Erupter Sapphire ASICs)</flag>
+		<flag name="jingtian">Enable support for mining on JingTian boards via SPI/GPIO</flag>
+		<flag name="keccak">Enable support for mining with Keccak miners</flag>
+		<flag name="klondike">Enable support for mining with Klondike USB miners</flag>
+		<flag name="libusb">Use libusb</flag>
+		<flag name="littlefury">Enable support for mining with LittleFury USB sticks</flag>
+		<flag name="metabank">Enable support for mining on Metabank host Raspberry Pi</flag>
+		<flag name="minion">Enable support for mining on minion chips via SPI (BlackArrow Prospero)</flag>
+		<flag name="modminer">Enable support for mining with ModMiner FPGAs</flag>
+		<flag name="nanofury">Enable support for mining with NanoFury USB sticks</flag>
+		<flag name="opencl">Enable support for mining with OpenCL-capable devices (GPUs)</flag>
+		<flag name="proxy">Enable support for virtual proxy device</flag>
+		<flag name="proxy_getwork">Enable proxy support for getwork protocol (often used with Block Erupter Blades)</flag>
+		<flag name="proxy_stratum">Enable proxy support for stratum protocol</flag>
+		<flag name="rockminer">Enable support for mining with RockMiner devices</flag>
+		<flag name="screen">Provide start-bfgminer.sh script to launch BFGMiner in app-misc/screen</flag>
+		<flag name="scrypt">Enable support for scrypt mining algorithm</flag>
+		<flag name="sha256d">Enable support for SHA256d mining algorithm</flag>
+		<flag name="twinfury">Enable support for mining with Twinfury USB sticks</flag>
+		<flag name="udev-broad-rules">Enable broader udev rules that may match non-mining devices</flag>
+		<flag name="x6500">Enable support for mining with X6500 FPGAs</flag>
+		<flag name="zeusminer">Enable support for mining with ZeusMiner units</flag>
+		<flag name="ztex">Enable support for mining with Ztex FPGAs</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-misc/bird/metadata.xml b/net-misc/bird/metadata.xml
index f117080..7803cdb 100644
--- a/net-misc/bird/metadata.xml
+++ b/net-misc/bird/metadata.xml
@@ -5,4 +5,4 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/net-misc/cfengine/metadata.xml b/net-misc/cfengine/metadata.xml
index b0f5eef..4efd698 100644
--- a/net-misc/cfengine/metadata.xml
+++ b/net-misc/cfengine/metadata.xml
@@ -10,7 +10,7 @@
 	<maintainer>
 		<email>mschiff@gentoo.org</email>
 		<name>Marc Schiffbauer</name>
-		<description>cfengine >2.x only</description>
+		<description>cfengine &gt;2.x only</description>
 	</maintainer>
 	<use>
 		<flag name="html">Install HTML documentation</flag>

diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
index a962274..99f83c6 100644
--- a/net-misc/chrony/metadata.xml
+++ b/net-misc/chrony/metadata.xml
@@ -18,12 +18,12 @@ Chrony はコンピュータのシステム・クロックの精度を保つた
 な接続でも機能します。
 </longdescription>
 <use>
-<flag name='cmdmon'>Support for command and monitoring</flag>
-<flag name='ntp'>Support for the Network Time Protocol (NTP)</flag>
-<flag name='phc'>Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface</flag>
-<flag name='pps'>Support for the Linux Pulse Per Second (PPS) interface</flag>
-<flag name='refclock'>Support for reference clocks</flag>
-<flag name='rtc'>Support for the Linux Real Time Clock interface</flag>
-<flag name='adns'>Support for asynchronous DNS</flag>
+<flag name="cmdmon">Support for command and monitoring</flag>
+<flag name="ntp">Support for the Network Time Protocol (NTP)</flag>
+<flag name="phc">Support for the PTP (Precision Time Protocol) Hardware Clock (PHC) interface</flag>
+<flag name="pps">Support for the Linux Pulse Per Second (PPS) interface</flag>
+<flag name="refclock">Support for reference clocks</flag>
+<flag name="rtc">Support for the Linux Real Time Clock interface</flag>
+<flag name="adns">Support for asynchronous DNS</flag>
 </use>
 </pkgmetadata>

diff --git a/net-misc/clusterssh/metadata.xml b/net-misc/clusterssh/metadata.xml
index 8c75682..fc61ef0 100644
--- a/net-misc/clusterssh/metadata.xml
+++ b/net-misc/clusterssh/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cluster</herd>

diff --git a/net-misc/connman-gtk/metadata.xml b/net-misc/connman-gtk/metadata.xml
index 800472e..0094001 100644
--- a/net-misc/connman-gtk/metadata.xml
+++ b/net-misc/connman-gtk/metadata.xml
@@ -6,10 +6,10 @@
 		<name>Julian Ospald</name>
 	</maintainer>
 	<use>
-		<flag name='openconnect'>Support easier authentication to AnyConnect VPNs</flag>
+		<flag name="openconnect">Support easier authentication to AnyConnect VPNs</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/jgke/connman-gtk/issues</bugs-to>
-		<remote-id type='github'>jgke/connman-gtk</remote-id>
+		<remote-id type="github">jgke/connman-gtk</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-misc/connman-ui/metadata.xml b/net-misc/connman-ui/metadata.xml
index 5dfdbac..349fc14 100644
--- a/net-misc/connman-ui/metadata.xml
+++ b/net-misc/connman-ui/metadata.xml
@@ -21,6 +21,6 @@
 	</longdescription>
 	<upstream>
 		<bugs-to>https://github.com/tbursztyka/connman-ui/issues</bugs-to>
-		<remote-id type='github'>tbursztyka/connman-ui</remote-id>
+		<remote-id type="github">tbursztyka/connman-ui</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/net-misc/dhcp/metadata.xml b/net-misc/dhcp/metadata.xml
index 9ee6944..a2fff71 100644
--- a/net-misc/dhcp/metadata.xml
+++ b/net-misc/dhcp/metadata.xml
@@ -5,8 +5,8 @@
 	<longdescription lang="en">The ISC DHCP client/server package.</longdescription>
 	<longdescription lang="ja">ISC DHCP クライアント/サーバ・パッケージです。</longdescription>
 	<use>
-		<flag name='client'>Install the dhclient program</flag>
-		<flag name='server'>Install the dhcpd and dhcrelay programs</flag>
+		<flag name="client">Install the dhclient program</flag>
+		<flag name="server">Install the dhcpd and dhcrelay programs</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:isc:dhcp</remote-id>

diff --git a/net-misc/dnetstats/metadata.xml b/net-misc/dnetstats/metadata.xml
index 46f151f..dc439f7 100644
--- a/net-misc/dnetstats/metadata.xml
+++ b/net-misc/dnetstats/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>qt</herd>
 </pkgmetadata>
-

diff --git a/net-misc/dropbox-cli/metadata.xml b/net-misc/dropbox-cli/metadata.xml
index 11d49ae..bebd69f 100644
--- a/net-misc/dropbox-cli/metadata.xml
+++ b/net-misc/dropbox-cli/metadata.xml
@@ -5,4 +5,3 @@
 		<email>grozin@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-misc/fatrat/metadata.xml b/net-misc/fatrat/metadata.xml
index 6bf0b58..6a8f28d 100644
--- a/net-misc/fatrat/metadata.xml
+++ b/net-misc/fatrat/metadata.xml
@@ -9,7 +9,7 @@
     FatRat is an open source download manager for Linux.
   </longdescription>
   <use>
-    <flag name='bittorrent'>Use the bittorrent protocol via net-libs/rb_libtorrent.</flag>
-    <flag name='webinterface'>Enable builtin webinterface.</flag>
+    <flag name="bittorrent">Use the bittorrent protocol via net-libs/rb_libtorrent.</flag>
+    <flag name="webinterface">Enable builtin webinterface.</flag>
   </use>
 </pkgmetadata>

diff --git a/net-misc/gcap/metadata.xml b/net-misc/gcap/metadata.xml
index e96e35b..91f4e72 100644
--- a/net-misc/gcap/metadata.xml
+++ b/net-misc/gcap/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-misc/gsasl/metadata.xml b/net-misc/gsasl/metadata.xml
index e80fb1b..4a94c4a 100644
--- a/net-misc/gsasl/metadata.xml
+++ b/net-misc/gsasl/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<herd>net-mail</herd>
 <use>
-<flag name='gcrypt'>
+<flag name="gcrypt">
 	Use <pkg>dev-libs/libgcrypt</pkg> for low-level crypto
 </flag>
-<flag name='ntlm'>
+<flag name="ntlm">
 	Add support for Microsoft's NTLM mechanism using <pkg>net-libs/libntlm</pkg>
 </flag>
 </use>

diff --git a/net-misc/hotot/metadata.xml b/net-misc/hotot/metadata.xml
index efce513..e4fbb03 100644
--- a/net-misc/hotot/metadata.xml
+++ b/net-misc/hotot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-misc/httpie/metadata.xml b/net-misc/httpie/metadata.xml
index fd770ec..fe7a82b 100644
--- a/net-misc/httpie/metadata.xml
+++ b/net-misc/httpie/metadata.xml
@@ -17,4 +17,3 @@
 		<remote-id type="pypi">httpie</remote-id>
 	</upstream>
 </pkgmetadata>
-

diff --git a/net-misc/iperf/metadata.xml b/net-misc/iperf/metadata.xml
index 34a9d85..0ebec19 100644
--- a/net-misc/iperf/metadata.xml
+++ b/net-misc/iperf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>netmon</herd>

diff --git a/net-misc/iprange/metadata.xml b/net-misc/iprange/metadata.xml
index f3ea32c..7f679d6 100644
--- a/net-misc/iprange/metadata.xml
+++ b/net-misc/iprange/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-misc/ipsc/metadata.xml b/net-misc/ipsc/metadata.xml
index fa29b94..184e679 100644
--- a/net-misc/ipsc/metadata.xml
+++ b/net-misc/ipsc/metadata.xml
@@ -6,5 +6,5 @@
     <name>Tony Vroon</name>
     <description>This LINX engineer favourite is actively maintained.</description>
 </maintainer>
-<longdescription></longdescription>
+<longdescription/>
 </pkgmetadata>

diff --git a/net-misc/ipsorcery/metadata.xml b/net-misc/ipsorcery/metadata.xml
index 1076258..bb187b4 100644
--- a/net-misc/ipsorcery/metadata.xml
+++ b/net-misc/ipsorcery/metadata.xml
@@ -4,5 +4,5 @@
 <maintainer>
   <email>maintainer-needed@gentoo.org</email>
 </maintainer>
-<longdescription></longdescription>
+<longdescription/>
 </pkgmetadata>

diff --git a/net-misc/iputils/metadata.xml b/net-misc/iputils/metadata.xml
index f71e2c5..b3de8ae 100644
--- a/net-misc/iputils/metadata.xml
+++ b/net-misc/iputils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>base-system</herd>

diff --git a/net-misc/ipx-utils/metadata.xml b/net-misc/ipx-utils/metadata.xml
index 2e90b80..d9cd2ca 100644
--- a/net-misc/ipx-utils/metadata.xml
+++ b/net-misc/ipx-utils/metadata.xml
@@ -5,4 +5,3 @@
 <email>maintainer-needed@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-misc/isatapd/metadata.xml b/net-misc/isatapd/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-misc/isatapd/metadata.xml
+++ b/net-misc/isatapd/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-misc/jlj/metadata.xml b/net-misc/jlj/metadata.xml
index bd9d594..c75a312 100644
--- a/net-misc/jlj/metadata.xml
+++ b/net-misc/jlj/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Default Assignee for Orphaned Packages</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-misc/jumpgate/metadata.xml b/net-misc/jumpgate/metadata.xml
index a531328..3cc3c26 100644
--- a/net-misc/jumpgate/metadata.xml
+++ b/net-misc/jumpgate/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-misc/knock/metadata.xml b/net-misc/knock/metadata.xml
index 5842314..ce6fe16 100644
--- a/net-misc/knock/metadata.xml
+++ b/net-misc/knock/metadata.xml
@@ -6,6 +6,6 @@
 	<name>Michael Weber</name>
   </maintainer>
   <use>
-    <flag name='server'>Installs the knockd server daemon.</flag>
+    <flag name="server">Installs the knockd server daemon.</flag>
   </use>
 </pkgmetadata>

diff --git a/net-misc/l7-filter-userspace/metadata.xml b/net-misc/l7-filter-userspace/metadata.xml
index 2ed48da..48d2efa 100644
--- a/net-misc/l7-filter-userspace/metadata.xml
+++ b/net-misc/l7-filter-userspace/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-misc/lanmap/metadata.xml b/net-misc/lanmap/metadata.xml
index 9ca15ca..03aa50b 100644
--- a/net-misc/lanmap/metadata.xml
+++ b/net-misc/lanmap/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>netmon</herd>
 </pkgmetadata>
-

diff --git a/net-misc/lcr/metadata.xml b/net-misc/lcr/metadata.xml
index 71c2d67..843e423 100644
--- a/net-misc/lcr/metadata.xml
+++ b/net-misc/lcr/metadata.xml
@@ -12,4 +12,3 @@
 		<flag name="gsmhr">Support for GSM HR codec using reference code (very slow)</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-misc/libteam/metadata.xml b/net-misc/libteam/metadata.xml
index 289fe5f..f70b8cc 100644
--- a/net-misc/libteam/metadata.xml
+++ b/net-misc/libteam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>maintainer-needed</herd>

diff --git a/net-misc/lldpd/metadata.xml b/net-misc/lldpd/metadata.xml
index 1234234..cf1e276 100644
--- a/net-misc/lldpd/metadata.xml
+++ b/net-misc/lldpd/metadata.xml
@@ -19,17 +19,16 @@ lldpd also implements CDP (Cisco Discovery Protocol), FDP (Foundry Discovery Pro
 	With the help of lldpd, you can get a map of your network. You may also want to look at Wiremaps or NetDisco which are a web application that helps you to see what is connected to where.
 	</longdescription>
 	<use>
-		<flag name='cdp'>Enable Cisco Discovery Protocol</flag>
-		<flag name='graph'>Create dot graphs in documentations</flag>
-		<flag name='dot1'>Enable Dot1 extension (VLAN stuff)</flag>
-		<flag name='dot3'>Enable Dot3 extension (PHY stuff)</flag>
-		<flag name='edp'>Enable Extreme Discovery Protocol</flag>
-		<flag name='fdp'>Enable Foundry Discovery Protocol</flag>
-		<flag name='jansson'>Enable JSON output via Jansson</flag>
-		<flag name='json-c'>Enable JSON output via json-c</flag>
-		<flag name='lldpmed'>Enable LLDP-MED extension</flag>
-		<flag name='sonmp'>Enable SynOptics Network Management</flag>
-		<flag name='snmp'>Enable the use of SNMP</flag>
+		<flag name="cdp">Enable Cisco Discovery Protocol</flag>
+		<flag name="graph">Create dot graphs in documentations</flag>
+		<flag name="dot1">Enable Dot1 extension (VLAN stuff)</flag>
+		<flag name="dot3">Enable Dot3 extension (PHY stuff)</flag>
+		<flag name="edp">Enable Extreme Discovery Protocol</flag>
+		<flag name="fdp">Enable Foundry Discovery Protocol</flag>
+		<flag name="jansson">Enable JSON output via Jansson</flag>
+		<flag name="json-c">Enable JSON output via json-c</flag>
+		<flag name="lldpmed">Enable LLDP-MED extension</flag>
+		<flag name="sonmp">Enable SynOptics Network Management</flag>
+		<flag name="snmp">Enable the use of SNMP</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-misc/mediatomb/metadata.xml b/net-misc/mediatomb/metadata.xml
index 01a25a2..10c0a3d 100644
--- a/net-misc/mediatomb/metadata.xml
+++ b/net-misc/mediatomb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>video</herd>

diff --git a/net-misc/mico/metadata.xml b/net-misc/mico/metadata.xml
index 67ce74d..ce47791 100644
--- a/net-misc/mico/metadata.xml
+++ b/net-misc/mico/metadata.xml
@@ -13,4 +13,3 @@
 		user-friendliness, and its full standard-compliance.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/net-misc/minidlna/metadata.xml b/net-misc/minidlna/metadata.xml
index 9f19b86..469acd8 100644
--- a/net-misc/minidlna/metadata.xml
+++ b/net-misc/minidlna/metadata.xml
@@ -14,4 +14,3 @@
 	<flag name="readynas">Enable readynas branding</flag>
 </use>
 </pkgmetadata>
-

diff --git a/net-misc/miredo/metadata.xml b/net-misc/miredo/metadata.xml
index 91437cd..abf93b9 100644
--- a/net-misc/miredo/metadata.xml
+++ b/net-misc/miredo/metadata.xml
@@ -15,4 +15,3 @@ components of the Teredo specification (client, relay and server). It is
 meant to provide IPv6 connectivity even from behind NAT devices.
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-misc/mosh/metadata.xml b/net-misc/mosh/metadata.xml
index 3cfe38c..5f54860 100644
--- a/net-misc/mosh/metadata.xml
+++ b/net-misc/mosh/metadata.xml
@@ -28,4 +28,3 @@ Mosh is a remote terminal application that supports:
 	<bugs-to>https://github.com/keithw/mosh/issues</bugs-to>
 </upstream>
 </pkgmetadata>
-

diff --git a/net-misc/nat-traverse/metadata.xml b/net-misc/nat-traverse/metadata.xml
index 1f8942c..c07b37e 100644
--- a/net-misc/nat-traverse/metadata.xml
+++ b/net-misc/nat-traverse/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-misc/ncp/metadata.xml b/net-misc/ncp/metadata.xml
index a91e4fc..acde6b5 100644
--- a/net-misc/ncp/metadata.xml
+++ b/net-misc/ncp/metadata.xml
@@ -10,4 +10,3 @@
 </longdescription>
 <use><flag name="diet">Compile against <pkg>dev-libs/dietlibc</pkg></flag></use>
 </pkgmetadata>
-

diff --git a/net-misc/ndisc6/metadata.xml b/net-misc/ndisc6/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-misc/ndisc6/metadata.xml
+++ b/net-misc/ndisc6/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-misc/ofono/metadata.xml b/net-misc/ofono/metadata.xml
index e8ee020..920e54d 100644
--- a/net-misc/ofono/metadata.xml
+++ b/net-misc/ofono/metadata.xml
@@ -18,4 +18,3 @@
     <flag name="tools">Enable testing tools</flag>
   </use>        
 </pkgmetadata>
-

diff --git a/net-misc/openconnect/metadata.xml b/net-misc/openconnect/metadata.xml
index f07fd2d..46c8876 100644
--- a/net-misc/openconnect/metadata.xml
+++ b/net-misc/openconnect/metadata.xml
@@ -15,9 +15,8 @@
 		<description>Proxied maintainer. Copy on bugs.</description>
 	</maintainer>
 	<use>
-		<flag name='gssapi'>Build GSSAPI support.</flag>
-		<flag name='java'>Build JNI bindings using jni.h</flag>
-		<flag name='libproxy'>Enable proxy support.</flag>
+		<flag name="gssapi">Build GSSAPI support.</flag>
+		<flag name="java">Build JNI bindings using jni.h</flag>
+		<flag name="libproxy">Enable proxy support.</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-misc/openvswitch/metadata.xml b/net-misc/openvswitch/metadata.xml
index 5086e50..c346b73 100644
--- a/net-misc/openvswitch/metadata.xml
+++ b/net-misc/openvswitch/metadata.xml
@@ -9,7 +9,7 @@
 </maintainer>
 <herd>virtualization</herd>
 <use>
-	<flag name='monitor'>Build the Python and GUI dependent monitor applications</flag>
-	<flag name='pyside'>Use <pkg>dev-python/pyside</pkg> instead of <pkg>dev-python/PyQt4</pkg> for Python/Qt-bindings when building with USE=monitor.</flag>
+	<flag name="monitor">Build the Python and GUI dependent monitor applications</flag>
+	<flag name="pyside">Use <pkg>dev-python/pyside</pkg> instead of <pkg>dev-python/PyQt4</pkg> for Python/Qt-bindings when building with USE=monitor.</flag>
 </use>
 </pkgmetadata>

diff --git a/net-misc/proxytunnel/metadata.xml b/net-misc/proxytunnel/metadata.xml
index 17149b2..1cd6962 100644
--- a/net-misc/proxytunnel/metadata.xml
+++ b/net-misc/proxytunnel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-misc/putty/metadata.xml b/net-misc/putty/metadata.xml
index 2f19caa..c700245 100644
--- a/net-misc/putty/metadata.xml
+++ b/net-misc/putty/metadata.xml
@@ -13,6 +13,6 @@
 		things not provided by ssh in an xterm.
 	</longdescription>
 	<use>
-		<flag name='gtk'>Build the PuTTY client which requires <pkg>x11-libs/gtk+:2</pkg>. Otherwise only the CLI tools puttygen, plink, pscp and psftp will be built.</flag>
+		<flag name="gtk">Build the PuTTY client which requires <pkg>x11-libs/gtk+:2</pkg>. Otherwise only the CLI tools puttygen, plink, pscp and psftp will be built.</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-misc/rabbitmq-server/metadata.xml b/net-misc/rabbitmq-server/metadata.xml
index 323870c..17ee492 100644
--- a/net-misc/rabbitmq-server/metadata.xml
+++ b/net-misc/rabbitmq-server/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Ultrabug</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-misc/rancid/metadata.xml b/net-misc/rancid/metadata.xml
index 6d26af1..c6694bd 100644
--- a/net-misc/rancid/metadata.xml
+++ b/net-misc/rancid/metadata.xml
@@ -13,4 +13,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-misc/rdesktop/metadata.xml b/net-misc/rdesktop/metadata.xml
index 5c63e86..c18fe09 100644
--- a/net-misc/rdesktop/metadata.xml
+++ b/net-misc/rdesktop/metadata.xml
@@ -11,7 +11,7 @@ An open source client for Windows NT Terminal Server and Windows 2000/2003 Termi
   <use>
     <flag name="kerberos">Enable CredSPP support + Kerberos authentication with <pkg>net-libs/libgssglue</pkg></flag>
     <flag name="pcsc-lite">Enable smartcard support with <pkg>sys-apps/pcsc-lite</pkg> driver</flag>
-	<flag name='xrandr'>Enable XRandR window extension support</flag>
+	<flag name="xrandr">Enable XRandR window extension support</flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">rdesktop</remote-id>

diff --git a/net-misc/remmina/metadata.xml b/net-misc/remmina/metadata.xml
index c8d1052..ab0b675 100644
--- a/net-misc/remmina/metadata.xml
+++ b/net-misc/remmina/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-misc/rsync/metadata.xml b/net-misc/rsync/metadata.xml
index 5230c3b..0ae013f 100644
--- a/net-misc/rsync/metadata.xml
+++ b/net-misc/rsync/metadata.xml
@@ -6,6 +6,6 @@
 		<remote-id type="cpe">cpe:/a:samba:rsync</remote-id>
 	</upstream>
 	<use>
-		<flag name="stunnel">Provide helper scripts for using rsync via >=net-misc/stunnel-4</flag>
+		<flag name="stunnel">Provide helper scripts for using rsync via &gt;=net-misc/stunnel-4</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-misc/samplicator/metadata.xml b/net-misc/samplicator/metadata.xml
index e2cc8bc..d2670ae 100644
--- a/net-misc/samplicator/metadata.xml
+++ b/net-misc/samplicator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-misc/slimrat/metadata.xml b/net-misc/slimrat/metadata.xml
index 0084f03..36ddf56 100644
--- a/net-misc/slimrat/metadata.xml
+++ b/net-misc/slimrat/metadata.xml
@@ -7,6 +7,6 @@
 		<name>Premysl Vohnout</name>
 	</maintainer>
 	<use>
-		<flag name='X'>Install also GUI client</flag>
+		<flag name="X">Install also GUI client</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-misc/sparkleshare/metadata.xml b/net-misc/sparkleshare/metadata.xml
index e9f1667..ac65bf7 100644
--- a/net-misc/sparkleshare/metadata.xml
+++ b/net-misc/sparkleshare/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>

diff --git a/net-misc/spice-gtk/metadata.xml b/net-misc/spice-gtk/metadata.xml
index 0cc04d7..97267d7 100644
--- a/net-misc/spice-gtk/metadata.xml
+++ b/net-misc/spice-gtk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>virtualization</herd>

diff --git a/net-misc/stargazer/metadata.xml b/net-misc/stargazer/metadata.xml
index f4e2ab0..4c2255b 100644
--- a/net-misc/stargazer/metadata.xml
+++ b/net-misc/stargazer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-misc/termpkg/metadata.xml b/net-misc/termpkg/metadata.xml
index 7bbee52..08ef7ee 100644
--- a/net-misc/termpkg/metadata.xml
+++ b/net-misc/termpkg/metadata.xml
@@ -10,7 +10,7 @@
 		serves many serial ports.
 	</longdescription>
 	<use>
-		<flag name='uucp'>
+		<flag name="uucp">
 			Adds support for uucp style device locking
 		</flag>
 	</use>

diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 5626964..44af312 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-misc/tinc/metadata.xml b/net-misc/tinc/metadata.xml
index 8f358f8..02e09c3 100644
--- a/net-misc/tinc/metadata.xml
+++ b/net-misc/tinc/metadata.xml
@@ -14,7 +14,7 @@
 		<flag name="gcrypt">Add support for encrypted log files using <pkg>dev-libs/libgcrypt</pkg></flag>
 		<flag name="gui">Add GUI support, using <pkg>dev-python/wxpython</pkg></flag>
 		<flag name="openssl">Using <pkg>dev-libs/openssl</pkg> for cryptography-related functions</flag>
-		<flag name='uml'> Enable support for User Mode Linux Sockets</flag>
-		<flag name='vde'> Enable Virtual Distributed Ethernet (VDE) based networking</flag>
+		<flag name="uml"> Enable support for User Mode Linux Sockets</flag>
+		<flag name="vde"> Enable Virtual Distributed Ethernet (VDE) based networking</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-misc/tor/metadata.xml b/net-misc/tor/metadata.xml
index dc1abd8..66d3dc2 100644
--- a/net-misc/tor/metadata.xml
+++ b/net-misc/tor/metadata.xml
@@ -6,12 +6,12 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
-		<flag name='bufferevents'>Use libevent's buffered IO implementation (unstable, buggy)</flag>
-		<flag name='stats'>Enable tracking of how much of each kind of resource we download</flag>
-		<flag name='nat-pmp'>Enable NAT Port Mapping Protocol</flag>
-		<flag name='scrypt'>Use <pkg>app-crypt/libscrypt</pkg> for the scrypt algorithm</flag>
-		<flag name='tor-hardening'>Compile tor with hardening on vanilla compilers/linkers</flag>
-		<flag name='transparent-proxy'>Enable transparent proxying</flag>
-		<flag name='web'>Build a tor2web service instead of a tor client</flag>
+		<flag name="bufferevents">Use libevent's buffered IO implementation (unstable, buggy)</flag>
+		<flag name="stats">Enable tracking of how much of each kind of resource we download</flag>
+		<flag name="nat-pmp">Enable NAT Port Mapping Protocol</flag>
+		<flag name="scrypt">Use <pkg>app-crypt/libscrypt</pkg> for the scrypt algorithm</flag>
+		<flag name="tor-hardening">Compile tor with hardening on vanilla compilers/linkers</flag>
+		<flag name="transparent-proxy">Enable transparent proxying</flag>
+		<flag name="web">Build a tor2web service instead of a tor client</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-misc/ttytter/metadata.xml b/net-misc/ttytter/metadata.xml
index 5e3a61a..77bb27a 100644
--- a/net-misc/ttytter/metadata.xml
+++ b/net-misc/ttytter/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-misc/udpxy/metadata.xml b/net-misc/udpxy/metadata.xml
index 146fd52..59e410f 100644
--- a/net-misc/udpxy/metadata.xml
+++ b/net-misc/udpxy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-misc/usbip/metadata.xml b/net-misc/usbip/metadata.xml
index 8a9b49e..ca5f18f 100644
--- a/net-misc/usbip/metadata.xml
+++ b/net-misc/usbip/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-misc/vrrpd/metadata.xml b/net-misc/vrrpd/metadata.xml
index 4deef3b..9b12c9d 100644
--- a/net-misc/vrrpd/metadata.xml
+++ b/net-misc/vrrpd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/net-misc/wget/metadata.xml b/net-misc/wget/metadata.xml
index 9c89911..87ab6aa 100644
--- a/net-misc/wget/metadata.xml
+++ b/net-misc/wget/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
  <herd>base-system</herd>
 <use>
- <flag name='ntlm'>Enable support for NTLM (Windows-based) authorization</flag>
- <flag name='uuid'>Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
+ <flag name="ntlm">Enable support for NTLM (Windows-based) authorization</flag>
+ <flag name="uuid">Generate UUIDs for the WARC (Web ARChive file format) using libuuid; otherwise use a simple RNG (random number generator)</flag>
 </use>
 <upstream>
  <remote-id type="cpe">cpe:/a:gnu:wget</remote-id>

diff --git a/net-misc/xrdp/metadata.xml b/net-misc/xrdp/metadata.xml
index 7ad52bd..a86e4fb 100644
--- a/net-misc/xrdp/metadata.xml
+++ b/net-misc/xrdp/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Michał Górny</name>
 	</maintainer>
 	<use>
-		<flag name='fuse'>Enable clipboard file / device redirection via <pkg>sys-fs/fuse</pkg></flag>
+		<flag name="fuse">Enable clipboard file / device redirection via <pkg>sys-fs/fuse</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/net-misc/yaydl/metadata.xml b/net-misc/yaydl/metadata.xml
index 9db41b2..051c9f7 100644
--- a/net-misc/yaydl/metadata.xml
+++ b/net-misc/yaydl/metadata.xml
@@ -8,4 +8,3 @@
 		<flag name="soundextract">Extract the soundtracks of the downloaded videos</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-misc/youtube-viewer/metadata.xml b/net-misc/youtube-viewer/metadata.xml
index 8bfc8bf..9af01fd 100644
--- a/net-misc/youtube-viewer/metadata.xml
+++ b/net-misc/youtube-viewer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-nds/389-ds-base/metadata.xml b/net-nds/389-ds-base/metadata.xml
index 4733000..1b75600 100644
--- a/net-nds/389-ds-base/metadata.xml
+++ b/net-nds/389-ds-base/metadata.xml
@@ -6,17 +6,17 @@
 </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>
-	<flag name='dna'>Enable dna (distributed numeric assignment ) plugin -  to
+	<flag name="pam-passthru">Enable pam-passthru plugin - for simple and fast system services used in ldap</flag>
+	<flag name="dna">Enable dna (distributed numeric assignment ) plugin -  to
 		automatically assign unique uid numbers to new user entries as they are created.</flag>
-	<flag name='presence'>Enable presence plugin - non-stabdart syntax
+	<flag name="presence">Enable presence plugin - non-stabdart syntax
 		validation</flag>
-	<flag name='bitwise'>Enable bitwise plugin - supported data in raw/bitwise
+	<flag name="bitwise">Enable bitwise plugin - supported data in raw/bitwise
 		format</flag>
-	 <flag name='autobind'>Enable auto bind over unix domain socket (LDAPI)
+	 <flag name="autobind">Enable auto bind over unix domain socket (LDAPI)
 		 support</flag>
-	 <flag name='auto-dn-suffix'>Enable auto bind with auto dn suffix over unix
+	 <flag name="auto-dn-suffix">Enable auto bind with auto dn suffix over unix
 	 domain socket (LDAPI) support</flag>
-	 <flag name='ldapi'>Enable LDAP over unix domain socket (LDAPI) support</flag>
+	 <flag name="ldapi">Enable LDAP over unix domain socket (LDAPI) support</flag>
 </use>
 </pkgmetadata>

diff --git a/net-nds/gosa-core/metadata.xml b/net-nds/gosa-core/metadata.xml
index 11f7ed9..d2a782c 100644
--- a/net-nds/gosa-core/metadata.xml
+++ b/net-nds/gosa-core/metadata.xml
@@ -6,8 +6,8 @@
 		<name>Tiziano Müller</name>
 	</maintainer>
 	<use>
-		<flag name='mail'>Manage mail accounts and servers with gosa.</flag>
-		<flag name='samba'>Manage samba accounts with gosa.</flag>
+		<flag name="mail">Manage mail accounts and servers with gosa.</flag>
+		<flag name="samba">Manage samba accounts with gosa.</flag>
 	</use>
 	<upstream>
 		<changelog>http://oss.gonicus.de/pub/gosa/Changelog</changelog>

diff --git a/net-nds/openldap/metadata.xml b/net-nds/openldap/metadata.xml
index 3008482..b10db0a 100644
--- a/net-nds/openldap/metadata.xml
+++ b/net-nds/openldap/metadata.xml
@@ -6,12 +6,12 @@
         <email>ldap-bugs@gentoo.org</email>
     </maintainer>
 	<use> 
-		<flag name='experimental'>Enable experimental backend options</flag>
-		<flag name='kinit'>Enable support for kerberos init</flag>
-		<flag name='odbc'>Enable ODBC and SQL backend options</flag>
-		<flag name='overlays'>Enable contributed OpenLDAP overlays</flag>
-		<flag name='smbkrb5passwd'>Enable overlay for syncing ldap, unix and
+		<flag name="experimental">Enable experimental backend options</flag>
+		<flag name="kinit">Enable support for kerberos init</flag>
+		<flag name="odbc">Enable ODBC and SQL backend options</flag>
+		<flag name="overlays">Enable contributed OpenLDAP overlays</flag>
+		<flag name="smbkrb5passwd">Enable overlay for syncing ldap, unix and
 			lanman passwords</flag>
-		<flag name='minimal'>Build libraries &amp; userspace tools only. Does not install any server code.</flag>
+		<flag name="minimal">Build libraries &amp; userspace tools only. Does not install any server code.</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-nds/shelldap/metadata.xml b/net-nds/shelldap/metadata.xml
index bfad85b..7027b2b 100644
--- a/net-nds/shelldap/metadata.xml
+++ b/net-nds/shelldap/metadata.xml
@@ -18,4 +18,3 @@
 		site-wide and individual configs, and it's fun to say.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/net-nds/tac_plus/metadata.xml b/net-nds/tac_plus/metadata.xml
index 152c826..81e0a9a 100644
--- a/net-nds/tac_plus/metadata.xml
+++ b/net-nds/tac_plus/metadata.xml
@@ -6,8 +6,8 @@
           <name>Tony Vroon</name>
   </maintainer>
   <use>
-	  <flag name='finger'>Adds support for checking user counts via fingering
+	  <flag name="finger">Adds support for checking user counts via fingering
 		  the NAS</flag>
-	  <flag name='maxsess'>Enforce a limit on maximum sessions per user</flag>
+	  <flag name="maxsess">Enforce a limit on maximum sessions per user</flag>
   </use>
 </pkgmetadata>

diff --git a/net-news/liferea/metadata.xml b/net-news/liferea/metadata.xml
index 57b2fcb..f559e94 100644
--- a/net-news/liferea/metadata.xml
+++ b/net-news/liferea/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-nntp/hellanzb/metadata.xml b/net-nntp/hellanzb/metadata.xml
index 12beccf..f91da9d 100644
--- a/net-nntp/hellanzb/metadata.xml
+++ b/net-nntp/hellanzb/metadata.xml
@@ -15,4 +15,3 @@
 		etc. is taken care of by hellanzb.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/net-nntp/inn/metadata.xml b/net-nntp/inn/metadata.xml
index 93a1582..9b3ffff 100644
--- a/net-nntp/inn/metadata.xml
+++ b/net-nntp/inn/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>net-news</herd>
 <use>
-	<flag name='innkeywords'>Enable automatic keyword generation support</flag>
-	<flag name='inntaggedhash'>Use tagged hash table for history (disables large
+	<flag name="innkeywords">Enable automatic keyword generation support</flag>
+	<flag name="inntaggedhash">Use tagged hash table for history (disables large
 		file support)</flag>
 </use>
 </pkgmetadata>

diff --git a/net-nntp/kwooty/metadata.xml b/net-nntp/kwooty/metadata.xml
index 4ddb71d..b741437 100644
--- a/net-nntp/kwooty/metadata.xml
+++ b/net-nntp/kwooty/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>

diff --git a/net-nntp/nzbget/metadata.xml b/net-nntp/nzbget/metadata.xml
index 02b27e1..22a02f2 100644
--- a/net-nntp/nzbget/metadata.xml
+++ b/net-nntp/nzbget/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-news</herd>

diff --git a/net-nntp/slrn/metadata.xml b/net-nntp/slrn/metadata.xml
index e47329d..72b6f50 100644
--- a/net-nntp/slrn/metadata.xml
+++ b/net-nntp/slrn/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>net-news</herd>

diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 65301ea..3472024 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 <herd>net-news</herd>
 <use>
-<flag name='cancel-locks'>Enable Cancel-Lock header functionality (also enables USE=evil)</flag>
-<flag name='evil'>Let tin generate a message ID</flag>
-<flag name='forgery'>Cancel messages posted from a different account</flag>
-<flag name='gpg'>Enable <pkg>app-crypt/gpg</pkg> support</flag>
-<flag name='etiquette'>Enable the display off posting etiquettes</flag>
+<flag name="cancel-locks">Enable Cancel-Lock header functionality (also enables USE=evil)</flag>
+<flag name="evil">Let tin generate a message ID</flag>
+<flag name="forgery">Cancel messages posted from a different account</flag>
+<flag name="gpg">Enable <pkg>app-crypt/gpg</pkg> support</flag>
+<flag name="etiquette">Enable the display off posting etiquettes</flag>
 </use>
 </pkgmetadata>

diff --git a/net-nntp/ubh/metadata.xml b/net-nntp/ubh/metadata.xml
index c72b6f7..fd9005c 100644
--- a/net-nntp/ubh/metadata.xml
+++ b/net-nntp/ubh/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-p2p/bitcoin-cli/metadata.xml b/net-p2p/bitcoin-cli/metadata.xml
index 7c46b52..0b7af7b 100644
--- a/net-p2p/bitcoin-cli/metadata.xml
+++ b/net-p2p/bitcoin-cli/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index f3f7dd6..94e1a89 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index b14e04d..960bbf1 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-p2p/bitcoinxt-qt/metadata.xml b/net-p2p/bitcoinxt-qt/metadata.xml
index bc63087..ad8039b 100644
--- a/net-p2p/bitcoinxt-qt/metadata.xml
+++ b/net-p2p/bitcoinxt-qt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-p2p/bitcoinxtd/metadata.xml b/net-p2p/bitcoinxtd/metadata.xml
index 0dda46d..3d4fb25 100644
--- a/net-p2p/bitcoinxtd/metadata.xml
+++ b/net-p2p/bitcoinxtd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/net-p2p/deluge/metadata.xml b/net-p2p/deluge/metadata.xml
index 1699295..40f4cb0 100644
--- a/net-p2p/deluge/metadata.xml
+++ b/net-p2p/deluge/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>net-p2p</herd>
 <use>
-	<flag name='setproctitle'>Install dependencies needed for beautifying
+	<flag name="setproctitle">Install dependencies needed for beautifying
 		the process name</flag>
-	<flag name='webinterface'>Install dependencies needed for the web
+	<flag name="webinterface">Install dependencies needed for the web
 		interface</flag>
 </use>
 </pkgmetadata>

diff --git a/net-p2p/fms/metadata.xml b/net-p2p/fms/metadata.xml
index 6c6e72a..f3900fd 100644
--- a/net-p2p/fms/metadata.xml
+++ b/net-p2p/fms/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<herd>net-p2p</herd>
 	<use>
-		<flag name='frost'>Add support for frost boards</flag>
+		<flag name="frost">Add support for frost boards</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-p2p/litecoind/metadata.xml b/net-p2p/litecoind/metadata.xml
index bc7a1fd..8e84df8 100644
--- a/net-p2p/litecoind/metadata.xml
+++ b/net-p2p/litecoind/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="logrotate">Use app-admin/logrotate for rotating logs</flag>
-		<flag name='wallet'>Enable wallet support</flag>
+		<flag name="wallet">Enable wallet support</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">litecoin-project/litecoin</remote-id>

diff --git a/net-p2p/transmission/metadata.xml b/net-p2p/transmission/metadata.xml
index 5d6d934..a311068 100644
--- a/net-p2p/transmission/metadata.xml
+++ b/net-p2p/transmission/metadata.xml
@@ -11,7 +11,7 @@
     <name>Samuli Suominen</name>
   </maintainer>
   <use>
-    <flag name='lightweight'>Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
-    <flag name='xfs'>Enable XFS filesystem capabilities by using <pkg>sys-fs/xfsprogs</pkg> headers (in building of fdlimit(.c))</flag>
+    <flag name="lightweight">Optimize transmission for low-resource systems (smaller cache size, prefer unencrypted peer connections, etc.)</flag>
+    <flag name="xfs">Enable XFS filesystem capabilities by using <pkg>sys-fs/xfsprogs</pkg> headers (in building of fdlimit(.c))</flag>
   </use>
 </pkgmetadata>

diff --git a/net-p2p/vuze-coreplugins/metadata.xml b/net-p2p/vuze-coreplugins/metadata.xml
index 79fe2fe..432ebc5 100644
--- a/net-p2p/vuze-coreplugins/metadata.xml
+++ b/net-p2p/vuze-coreplugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>java</herd>

diff --git a/net-print/cups-filters/metadata.xml b/net-print/cups-filters/metadata.xml
index dec732c..791a496 100644
--- a/net-print/cups-filters/metadata.xml
+++ b/net-print/cups-filters/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>printing</herd>
   <use>
-  <flag name='foomatic'>
+  <flag name="foomatic">
      Build the included foomatic-rip printer driver. Strongly recommended.
   </flag>
   </use>

diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index bc19bfa..21c1b4c 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -3,13 +3,13 @@
 <pkgmetadata>
   <herd>printing</herd>
   <use>
-    <flag name='lprng-compat'>
+    <flag name="lprng-compat">
       Do not install lp... binaries so cups and lprng can coexist.
     </flag>
-    <flag name='python'>
+    <flag name="python">
       Add support for the Python interpeter in the web server CGIs.
     </flag>
-    <flag name='java'>
+    <flag name="java">
       Add support for the Java interpeter in the web server CGIs.
     </flag>
   </use>

diff --git a/net-print/splix/metadata.xml b/net-print/splix/metadata.xml
index 2de9595..4e6e5d7 100644
--- a/net-print/splix/metadata.xml
+++ b/net-print/splix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>printing</herd>

diff --git a/net-proxy/adzapper/metadata.xml b/net-proxy/adzapper/metadata.xml
index a5a2642..79c3065 100644
--- a/net-proxy/adzapper/metadata.xml
+++ b/net-proxy/adzapper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-proxy/cntlm/metadata.xml b/net-proxy/cntlm/metadata.xml
index 5e2e967..ca30a2e 100644
--- a/net-proxy/cntlm/metadata.xml
+++ b/net-proxy/cntlm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-proxy/dnsproxy/metadata.xml b/net-proxy/dnsproxy/metadata.xml
index a2bd924..621ca73 100644
--- a/net-proxy/dnsproxy/metadata.xml
+++ b/net-proxy/dnsproxy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>

diff --git a/net-proxy/havp/metadata.xml b/net-proxy/havp/metadata.xml
index 547d258..3648287 100644
--- a/net-proxy/havp/metadata.xml
+++ b/net-proxy/havp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>

diff --git a/net-proxy/rejik/metadata.xml b/net-proxy/rejik/metadata.xml
index 0565908..8dacd71 100644
--- a/net-proxy/rejik/metadata.xml
+++ b/net-proxy/rejik/metadata.xml
@@ -6,6 +6,6 @@
     <name>Sergey Popov</name>
   </maintainer>
   <use>
-    <flag name='banlists'>Install upstream provided simple banlists</flag>
+    <flag name="banlists">Install upstream provided simple banlists</flag>
   </use>
 </pkgmetadata>

diff --git a/net-proxy/sshproxy/metadata.xml b/net-proxy/sshproxy/metadata.xml
index c9fdb78..95ecbb5 100644
--- a/net-proxy/sshproxy/metadata.xml
+++ b/net-proxy/sshproxy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
@@ -17,6 +17,6 @@ open one port for each server. What you can do is open the sshproxy port and set
 external user to it's own desktop, or create groups of users allowed to connect to your DMZ servers.
 </longdescription>
 <use>
-	<flag name='client-only'>Install only the client wrappers</flag>
+	<flag name="client-only">Install only the client wrappers</flag>
 </use>
 </pkgmetadata>

diff --git a/net-proxy/tayga/metadata.xml b/net-proxy/tayga/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/net-proxy/tayga/metadata.xml
+++ b/net-proxy/tayga/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/net-proxy/tinyproxy/metadata.xml b/net-proxy/tinyproxy/metadata.xml
index 32a47aa..c16fce9 100644
--- a/net-proxy/tinyproxy/metadata.xml
+++ b/net-proxy/tinyproxy/metadata.xml
@@ -4,10 +4,10 @@
 <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>
-	<flag name='reverse-proxy'>Enable reverse proxying</flag>
-	<flag name='transparent-proxy'>Enable transparent proxying</flag>
-	<flag name='upstream-proxy'>Enable upstream proxying</flag>
-	<flag name='xtinyproxy-header'>Include the X-Tinyproxy header</flag>
+	<flag name="filter-proxy">Enable filtering of domains/URLS</flag>
+	<flag name="reverse-proxy">Enable reverse proxying</flag>
+	<flag name="transparent-proxy">Enable transparent proxying</flag>
+	<flag name="upstream-proxy">Enable upstream proxying</flag>
+	<flag name="xtinyproxy-header">Include the X-Tinyproxy header</flag>
 </use>
 </pkgmetadata>

diff --git a/net-voip/ekiga/metadata.xml b/net-voip/ekiga/metadata.xml
index de67681..c10fb43 100644
--- a/net-voip/ekiga/metadata.xml
+++ b/net-voip/ekiga/metadata.xml
@@ -12,4 +12,3 @@
 		<flag name="xcap">Enable XML Configuration Access Protocal</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-voip/linphone/metadata.xml b/net-voip/linphone/metadata.xml
index 961ea83..b657d11 100644
--- a/net-voip/linphone/metadata.xml
+++ b/net-voip/linphone/metadata.xml
@@ -6,12 +6,12 @@
 		<name>Andrew Savchenko</name>
 	</maintainer>
 	<use>
-		<flag name='assistant'>Turn on assistant compiling
+		<flag name="assistant">Turn on assistant compiling
 			(needs gtk enabled)</flag>
-		<flag name='gsm-nonstandard'>Support non-standard GSM frequencies
+		<flag name="gsm-nonstandard">Support non-standard GSM frequencies
 		</flag>
-		<flag name='sqlite'>Turn on compilation of message storage</flag>
-		<flag name='tools'>Compile tools</flag>
-		<flag name='video'>Enable video support (display/capture)</flag>
+		<flag name="sqlite">Turn on compilation of message storage</flag>
+		<flag name="tools">Compile tools</flag>
+		<flag name="video">Enable video support (display/capture)</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-voip/telepathy-gabble/metadata.xml b/net-voip/telepathy-gabble/metadata.xml
index e301005..610f8c7 100644
--- a/net-voip/telepathy-gabble/metadata.xml
+++ b/net-voip/telepathy-gabble/metadata.xml
@@ -6,4 +6,3 @@
 	<flag name="plugins">Enable plugin loader</flag>
 </use>
 </pkgmetadata>
-

diff --git a/net-voip/telepathy-salut/metadata.xml b/net-voip/telepathy-salut/metadata.xml
index f29a757..c4c8827 100644
--- a/net-voip/telepathy-salut/metadata.xml
+++ b/net-voip/telepathy-salut/metadata.xml
@@ -10,4 +10,3 @@
 		A link-local XMPP connection manager for Telepathy.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/net-voip/yate/metadata.xml b/net-voip/yate/metadata.xml
index 58e94f3..00b85ca 100644
--- a/net-voip/yate/metadata.xml
+++ b/net-voip/yate/metadata.xml
@@ -22,4 +22,3 @@
 		<flag name="h323">use OpenH323</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-wireless/ap-utils/metadata.xml b/net-wireless/ap-utils/metadata.xml
index c4c1308..0200143 100644
--- a/net-wireless/ap-utils/metadata.xml
+++ b/net-wireless/ap-utils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-wireless/chirp/metadata.xml b/net-wireless/chirp/metadata.xml
index 50b2373..0500f0e 100644
--- a/net-wireless/chirp/metadata.xml
+++ b/net-wireless/chirp/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-wireless/crda/metadata.xml b/net-wireless/crda/metadata.xml
index 784df93..525e296 100644
--- a/net-wireless/crda/metadata.xml
+++ b/net-wireless/crda/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<use>
-		<flag name='gcrypt'>Use libgcrypt instead of openssl for key checking</flag>
+		<flag name="gcrypt">Use libgcrypt instead of openssl for key checking</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-wireless/gnuradio/metadata.xml b/net-wireless/gnuradio/metadata.xml
index a9d64fb..ee76e3f 100644
--- a/net-wireless/gnuradio/metadata.xml
+++ b/net-wireless/gnuradio/metadata.xml
@@ -3,26 +3,25 @@
 <pkgmetadata>
 	<herd>radio</herd>
 	<use>
-		<flag name='analog'>enable analog signal processing blocks</flag>
-		<flag name='atsc'>enable ATSC (HDTV) transmitter and receiver blocks</flag>
-		<flag name='audio'>enable blocks to connect to audio sources (mic-in) and sinks (speaker-out) ports on a computer</flag>
-		<flag name='channels'>enable channel mode blocks</flag>
-		<flag name='digital'>enable digital signal processing blocks</flag>
-		<flag name='dtv'>enable digital tv signal processing blocks</flag>
-		<flag name='fcd'>enable Funcube Dongle source block</flag>
-		<flag name='fec'>enable block for convolutional encoding using the CCSDS standard polynomial ("Voyager")</flag>
-		<flag name='filter'>enable filter signal processing blocks</flag>
-		<flag name='grc'>enable GNU Radio Companion graphical tool to design signal processing flow graphs</flag>
-		<flag name='log'>enable logging to console and files</flag>
-		<flag name='noaa'>enable NOAA POES HRPT receiver blocks</flag>
-		<flag name='pager'>enable pager signal processing blocks</flag>
-		<flag name='performance-counters'>enable block performance counters</flag>
-		<flag name='trellis'>enable trellis blocks for FSM</flag>
-		<flag name='uhd'>install UHD source and sink blocks</flag>
-		<flag name='utils'>install scripts to enable viewing and analysis of files produced by flow graphs</flag>
-		<flag name='vocoder'>enable blocks for audio voice encoders</flag>
-		<flag name='wavelet'>enable wavelet signal processing blocks</flag>
-		<flag name='zeromq'>enable zeromq message passing blocks</flag>
+		<flag name="analog">enable analog signal processing blocks</flag>
+		<flag name="atsc">enable ATSC (HDTV) transmitter and receiver blocks</flag>
+		<flag name="audio">enable blocks to connect to audio sources (mic-in) and sinks (speaker-out) ports on a computer</flag>
+		<flag name="channels">enable channel mode blocks</flag>
+		<flag name="digital">enable digital signal processing blocks</flag>
+		<flag name="dtv">enable digital tv signal processing blocks</flag>
+		<flag name="fcd">enable Funcube Dongle source block</flag>
+		<flag name="fec">enable block for convolutional encoding using the CCSDS standard polynomial ("Voyager")</flag>
+		<flag name="filter">enable filter signal processing blocks</flag>
+		<flag name="grc">enable GNU Radio Companion graphical tool to design signal processing flow graphs</flag>
+		<flag name="log">enable logging to console and files</flag>
+		<flag name="noaa">enable NOAA POES HRPT receiver blocks</flag>
+		<flag name="pager">enable pager signal processing blocks</flag>
+		<flag name="performance-counters">enable block performance counters</flag>
+		<flag name="trellis">enable trellis blocks for FSM</flag>
+		<flag name="uhd">install UHD source and sink blocks</flag>
+		<flag name="utils">install scripts to enable viewing and analysis of files produced by flow graphs</flag>
+		<flag name="vocoder">enable blocks for audio voice encoders</flag>
+		<flag name="wavelet">enable wavelet signal processing blocks</flag>
+		<flag name="zeromq">enable zeromq message passing blocks</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-wireless/gr-baz/metadata.xml b/net-wireless/gr-baz/metadata.xml
index 429b14a..2b0770b 100644
--- a/net-wireless/gr-baz/metadata.xml
+++ b/net-wireless/gr-baz/metadata.xml
@@ -9,9 +9,8 @@
 <longdescription lang="en">
 </longdescription>
 <use>
-	<flag name='armadillo'>install MUSIC DOA estimator block</flag>
-	<flag name='rtlsdr'>install rtlsdr source block</flag>
-	<flag name='uhd'>install UHD aware blocks</flag>
+	<flag name="armadillo">install MUSIC DOA estimator block</flag>
+	<flag name="rtlsdr">install rtlsdr source block</flag>
+	<flag name="uhd">install UHD aware blocks</flag>
 </use>
 </pkgmetadata>
-

diff --git a/net-wireless/gr-iqbal/metadata.xml b/net-wireless/gr-iqbal/metadata.xml
index 044f121..631cfab 100644
--- a/net-wireless/gr-iqbal/metadata.xml
+++ b/net-wireless/gr-iqbal/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-wireless/gr-osmosdr/metadata.xml b/net-wireless/gr-osmosdr/metadata.xml
index 6635169..4f3bb1d 100644
--- a/net-wireless/gr-osmosdr/metadata.xml
+++ b/net-wireless/gr-osmosdr/metadata.xml
@@ -12,4 +12,3 @@
 	<flag name="uhd">Build with Ettus Research USRP Hardware Driver support</flag>
 </use>
 </pkgmetadata>
-

diff --git a/net-wireless/gr-scan/metadata.xml b/net-wireless/gr-scan/metadata.xml
index c1b4dee..19e2def 100644
--- a/net-wireless/gr-scan/metadata.xml
+++ b/net-wireless/gr-scan/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>radio</herd>
 </pkgmetadata>
-

diff --git a/net-wireless/hidclient/metadata.xml b/net-wireless/hidclient/metadata.xml
index 5fcbf8e..4b6b681 100644
--- a/net-wireless/hidclient/metadata.xml
+++ b/net-wireless/hidclient/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-wireless/hostapd/metadata.xml b/net-wireless/hostapd/metadata.xml
index ff83262..7a78b14 100644
--- a/net-wireless/hostapd/metadata.xml
+++ b/net-wireless/hostapd/metadata.xml
@@ -11,11 +11,11 @@
 		RADIUS Authentication client, RADIUS Accounting client
 	</longdescription>
 	<use>
-		<flag name='crda'>Add CRDA support</flag>
-		<flag name='logwatch'>Install support files for 
+		<flag name="crda">Add CRDA support</flag>
+		<flag name="logwatch">Install support files for 
 			<pkg>sys-app/logwatch</pkg></flag>
-		<flag name='netlink'>Adding support for using netlink to create VLANs</flag>
-		<flag name='sqlite'>Adding sqlite support</flag>
-		<flag name='wps'>Add support for Wi-Fi Protected Setup</flag>
+		<flag name="netlink">Adding support for using netlink to create VLANs</flag>
+		<flag name="sqlite">Adding sqlite support</flag>
+		<flag name="wps">Add support for Wi-Fi Protected Setup</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-wireless/kismet-ubertooth/metadata.xml b/net-wireless/kismet-ubertooth/metadata.xml
index 96459ee..3029736 100644
--- a/net-wireless/kismet-ubertooth/metadata.xml
+++ b/net-wireless/kismet-ubertooth/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-wireless/lorcon-old/metadata.xml b/net-wireless/lorcon-old/metadata.xml
index 5fcbf8e..4b6b681 100644
--- a/net-wireless/lorcon-old/metadata.xml
+++ b/net-wireless/lorcon-old/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-wireless/lorcon/metadata.xml b/net-wireless/lorcon/metadata.xml
index 5fcbf8e..4b6b681 100644
--- a/net-wireless/lorcon/metadata.xml
+++ b/net-wireless/lorcon/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-wireless/mdk/metadata.xml b/net-wireless/mdk/metadata.xml
index 2e6865b..10ea341 100644
--- a/net-wireless/mdk/metadata.xml
+++ b/net-wireless/mdk/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Rick Farina</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-wireless/multimode/metadata.xml b/net-wireless/multimode/metadata.xml
index 50b2373..0500f0e 100644
--- a/net-wireless/multimode/metadata.xml
+++ b/net-wireless/multimode/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/net-wireless/neard/metadata.xml b/net-wireless/neard/metadata.xml
index 4c62f47..483f2a8 100644
--- a/net-wireless/neard/metadata.xml
+++ b/net-wireless/neard/metadata.xml
@@ -6,6 +6,6 @@
  <description>fix what you like</description>
 </maintainer>
 <use>
- <flag name='tools'>build and install extra helper utilities</flag>
+ <flag name="tools">build and install extra helper utilities</flag>
 </use>
 </pkgmetadata>

diff --git a/net-wireless/openbsc/metadata.xml b/net-wireless/openbsc/metadata.xml
index 12594d5..00beeae 100644
--- a/net-wireless/openbsc/metadata.xml
+++ b/net-wireless/openbsc/metadata.xml
@@ -6,4 +6,3 @@
 		<flag name="gprs">Support GPRS via OpenGGSN</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-wireless/openggsn/metadata.xml b/net-wireless/openggsn/metadata.xml
index c1b4dee..19e2def 100644
--- a/net-wireless/openggsn/metadata.xml
+++ b/net-wireless/openggsn/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>radio</herd>
 </pkgmetadata>
-

diff --git a/net-wireless/osmobts/metadata.xml b/net-wireless/osmobts/metadata.xml
index c1b4dee..19e2def 100644
--- a/net-wireless/osmobts/metadata.xml
+++ b/net-wireless/osmobts/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>radio</herd>
 </pkgmetadata>
-

diff --git a/net-wireless/osmocom-bb/metadata.xml b/net-wireless/osmocom-bb/metadata.xml
index 27f6a80..96d1c991 100644
--- a/net-wireless/osmocom-bb/metadata.xml
+++ b/net-wireless/osmocom-bb/metadata.xml
@@ -6,4 +6,3 @@
 		<flag name="transmit">Enable transmission capabilities.</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/net-wireless/rfkill/metadata.xml b/net-wireless/rfkill/metadata.xml
index 6fb6456..a196cc4 100644
--- a/net-wireless/rfkill/metadata.xml
+++ b/net-wireless/rfkill/metadata.xml
@@ -10,4 +10,3 @@
 		<name> Rick Farina</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/net-wireless/rtl-sdr/metadata.xml b/net-wireless/rtl-sdr/metadata.xml
index c1b4dee..19e2def 100644
--- a/net-wireless/rtl-sdr/metadata.xml
+++ b/net-wireless/rtl-sdr/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>radio</herd>
 </pkgmetadata>
-

diff --git a/net-wireless/ubertooth/metadata.xml b/net-wireless/ubertooth/metadata.xml
index 454cb78..afe153c 100644
--- a/net-wireless/ubertooth/metadata.xml
+++ b/net-wireless/ubertooth/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/net-wireless/wireless-regdb/metadata.xml b/net-wireless/wireless-regdb/metadata.xml
index 01ff6b9..59dda37 100644
--- a/net-wireless/wireless-regdb/metadata.xml
+++ b/net-wireless/wireless-regdb/metadata.xml
@@ -13,4 +13,3 @@
 		Regulatory rules database for wireless network cards
 	</longdescription>
 </pkgmetadata>
-

diff --git a/net-wireless/wireless-tools/metadata.xml b/net-wireless/wireless-tools/metadata.xml
index 338d98e..90830d6 100644
--- a/net-wireless/wireless-tools/metadata.xml
+++ b/net-wireless/wireless-tools/metadata.xml
@@ -11,7 +11,7 @@
 		Wireless Extensions (almost all recent IEEE 802.11a/b/g drivers).
 	</longdescription>
 	<use>
-		<flag name='multicall'>Build the most commonly used tools as one
+		<flag name="multicall">Build the most commonly used tools as one
 			binary</flag>
 	</use>
 </pkgmetadata>

diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml
index 07be80f..fd0f2c9 100644
--- a/net-wireless/wpa_supplicant/metadata.xml
+++ b/net-wireless/wpa_supplicant/metadata.xml
@@ -10,17 +10,17 @@
 		<name>Rick Farina</name>
 	</maintainer>
 	<use>
-		<flag name='ap'>Add support for access point mode</flag>
-		<flag name='eap-sim'>Add support for EAP-SIM authentication algorithm</flag>
-		<flag name='fasteap'>Add support for FAST-EAP authentication algorithm</flag>
-		<flag name='hs2-0'>Add support for 802.11u and Passpoint for HotSpot 2.0</flag>
-		<flag name='p2p'>Add support for Wi-Fi Direct mode</flag>
-		<flag name='ps3'>Add support for ps3 hypervisor driven gelic wifi</flag>
-		<flag name='tdls'>Add support for Tunneled Direct Link Setup (802.11z)</flag>
-		<flag name='uncommon-eap-types'>Add support for GPSK, SAKE, GPSK_SHA256, IKEV2 and EKE</flag>
-		<flag name='wps'>Add support for Wi-Fi Protected Setup</flag>
-		<flag name='wimax'>Add support for Wimax EAP-PEER authentication algorithm</flag>
-		<flag name='smartcard'>Add support for smartcards</flag>
+		<flag name="ap">Add support for access point mode</flag>
+		<flag name="eap-sim">Add support for EAP-SIM authentication algorithm</flag>
+		<flag name="fasteap">Add support for FAST-EAP authentication algorithm</flag>
+		<flag name="hs2-0">Add support for 802.11u and Passpoint for HotSpot 2.0</flag>
+		<flag name="p2p">Add support for Wi-Fi Direct mode</flag>
+		<flag name="ps3">Add support for ps3 hypervisor driven gelic wifi</flag>
+		<flag name="tdls">Add support for Tunneled Direct Link Setup (802.11z)</flag>
+		<flag name="uncommon-eap-types">Add support for GPSK, SAKE, GPSK_SHA256, IKEV2 and EKE</flag>
+		<flag name="wps">Add support for Wi-Fi Protected Setup</flag>
+		<flag name="wimax">Add support for Wimax EAP-PEER authentication algorithm</flag>
+		<flag name="smartcard">Add support for smartcards</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:wpa_supplicant:wpa_supplicant</remote-id>

diff --git a/net-wireless/yatebts/metadata.xml b/net-wireless/yatebts/metadata.xml
index 06a0a1f..8b4f680 100644
--- a/net-wireless/yatebts/metadata.xml
+++ b/net-wireless/yatebts/metadata.xml
@@ -9,4 +9,3 @@
 		<flag name="bladerf">Build bladeRF transceiver</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/ros-meta/audio_common/metadata.xml b/ros-meta/audio_common/metadata.xml
index 11ebb41..052c64d 100644
--- a/ros-meta/audio_common/metadata.xml
+++ b/ros-meta/audio_common/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/bond_core/metadata.xml b/ros-meta/bond_core/metadata.xml
index 500c8eb..6c2a82d 100644
--- a/ros-meta/bond_core/metadata.xml
+++ b/ros-meta/bond_core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/calibration/metadata.xml b/ros-meta/calibration/metadata.xml
index 11ffa23..b5f28dc 100644
--- a/ros-meta/calibration/metadata.xml
+++ b/ros-meta/calibration/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/common_msgs/metadata.xml b/ros-meta/common_msgs/metadata.xml
index 2d3b5cc..7c144cf 100644
--- a/ros-meta/common_msgs/metadata.xml
+++ b/ros-meta/common_msgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/common_tutorials/metadata.xml b/ros-meta/common_tutorials/metadata.xml
index 38abe1f..9263625 100644
--- a/ros-meta/common_tutorials/metadata.xml
+++ b/ros-meta/common_tutorials/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/desktop/metadata.xml b/ros-meta/desktop/metadata.xml
index 8a1e01b..eca6af8 100644
--- a/ros-meta/desktop/metadata.xml
+++ b/ros-meta/desktop/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/desktop_full/metadata.xml b/ros-meta/desktop_full/metadata.xml
index 8a1e01b..eca6af8 100644
--- a/ros-meta/desktop_full/metadata.xml
+++ b/ros-meta/desktop_full/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/diagnostics/metadata.xml b/ros-meta/diagnostics/metadata.xml
index 7403d8e..d20e2ad 100644
--- a/ros-meta/diagnostics/metadata.xml
+++ b/ros-meta/diagnostics/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/driver_common/metadata.xml b/ros-meta/driver_common/metadata.xml
index 9e7fdee..8b58827 100644
--- a/ros-meta/driver_common/metadata.xml
+++ b/ros-meta/driver_common/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/executive_smach/metadata.xml b/ros-meta/executive_smach/metadata.xml
index df9f6c9..cad98c8 100644
--- a/ros-meta/executive_smach/metadata.xml
+++ b/ros-meta/executive_smach/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/gazebo_ros_pkgs/metadata.xml b/ros-meta/gazebo_ros_pkgs/metadata.xml
index 2cda806..4026599 100644
--- a/ros-meta/gazebo_ros_pkgs/metadata.xml
+++ b/ros-meta/gazebo_ros_pkgs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/geographic_info/metadata.xml b/ros-meta/geographic_info/metadata.xml
index 15ed56b..e4634a0 100644
--- a/ros-meta/geographic_info/metadata.xml
+++ b/ros-meta/geographic_info/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/geometry/metadata.xml b/ros-meta/geometry/metadata.xml
index 2d8e130..85acac4 100644
--- a/ros-meta/geometry/metadata.xml
+++ b/ros-meta/geometry/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/geometry_experimental/metadata.xml b/ros-meta/geometry_experimental/metadata.xml
index 51f204d..0b847ee 100644
--- a/ros-meta/geometry_experimental/metadata.xml
+++ b/ros-meta/geometry_experimental/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/geometry_tutorials/metadata.xml b/ros-meta/geometry_tutorials/metadata.xml
index c02c459..00483fc 100644
--- a/ros-meta/geometry_tutorials/metadata.xml
+++ b/ros-meta/geometry_tutorials/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/hector_localization/metadata.xml b/ros-meta/hector_localization/metadata.xml
index 017b917..19aa8ea 100644
--- a/ros-meta/hector_localization/metadata.xml
+++ b/ros-meta/hector_localization/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/hector_slam/metadata.xml b/ros-meta/hector_slam/metadata.xml
index d3cf71e..3851ae3 100644
--- a/ros-meta/hector_slam/metadata.xml
+++ b/ros-meta/hector_slam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/image_common/metadata.xml b/ros-meta/image_common/metadata.xml
index b01f287..abd895f 100644
--- a/ros-meta/image_common/metadata.xml
+++ b/ros-meta/image_common/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/image_pipeline/metadata.xml b/ros-meta/image_pipeline/metadata.xml
index 90c35a2..8c79df0 100644
--- a/ros-meta/image_pipeline/metadata.xml
+++ b/ros-meta/image_pipeline/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/image_transport_plugins/metadata.xml b/ros-meta/image_transport_plugins/metadata.xml
index 97c7091..1d01ac4 100644
--- a/ros-meta/image_transport_plugins/metadata.xml
+++ b/ros-meta/image_transport_plugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/imu_pipeline/metadata.xml b/ros-meta/imu_pipeline/metadata.xml
index 59d1d9e..c821843 100644
--- a/ros-meta/imu_pipeline/metadata.xml
+++ b/ros-meta/imu_pipeline/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/laser_pipeline/metadata.xml b/ros-meta/laser_pipeline/metadata.xml
index 41b326c..afbfb65 100644
--- a/ros-meta/laser_pipeline/metadata.xml
+++ b/ros-meta/laser_pipeline/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/mavros/metadata.xml b/ros-meta/mavros/metadata.xml
index 0dd0fc3..56ebbac 100644
--- a/ros-meta/mavros/metadata.xml
+++ b/ros-meta/mavros/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/navigation/metadata.xml b/ros-meta/navigation/metadata.xml
index 8694432..d7ed477 100644
--- a/ros-meta/navigation/metadata.xml
+++ b/ros-meta/navigation/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/nodelet_core/metadata.xml b/ros-meta/nodelet_core/metadata.xml
index 33bcb0c..66af76f 100644
--- a/ros-meta/nodelet_core/metadata.xml
+++ b/ros-meta/nodelet_core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/perception/metadata.xml b/ros-meta/perception/metadata.xml
index 8a1e01b..eca6af8 100644
--- a/ros-meta/perception/metadata.xml
+++ b/ros-meta/perception/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/perception_pcl/metadata.xml b/ros-meta/perception_pcl/metadata.xml
index 3fbdb8f..a3b5c3d 100644
--- a/ros-meta/perception_pcl/metadata.xml
+++ b/ros-meta/perception_pcl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/pr2_common/metadata.xml b/ros-meta/pr2_common/metadata.xml
index 88a4cd6..6efd828 100644
--- a/ros-meta/pr2_common/metadata.xml
+++ b/ros-meta/pr2_common/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/qt_gui_core/metadata.xml b/ros-meta/qt_gui_core/metadata.xml
index 2d88111..894d892 100644
--- a/ros-meta/qt_gui_core/metadata.xml
+++ b/ros-meta/qt_gui_core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/robot/metadata.xml b/ros-meta/robot/metadata.xml
index 8a1e01b..eca6af8 100644
--- a/ros-meta/robot/metadata.xml
+++ b/ros-meta/robot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/robot_model/metadata.xml b/ros-meta/robot_model/metadata.xml
index b2ab0e6..0724a71 100644
--- a/ros-meta/robot_model/metadata.xml
+++ b/ros-meta/robot_model/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/ros/metadata.xml b/ros-meta/ros/metadata.xml
index d0c10cf..55c0da5 100644
--- a/ros-meta/ros/metadata.xml
+++ b/ros-meta/ros/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/ros_base/metadata.xml b/ros-meta/ros_base/metadata.xml
index 8a1e01b..eca6af8 100644
--- a/ros-meta/ros_base/metadata.xml
+++ b/ros-meta/ros_base/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/ros_comm/metadata.xml b/ros-meta/ros_comm/metadata.xml
index bcf2b81..39c5513 100644
--- a/ros-meta/ros_comm/metadata.xml
+++ b/ros-meta/ros_comm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/ros_control/metadata.xml b/ros-meta/ros_control/metadata.xml
index 2b50e8a..f4a590e 100644
--- a/ros-meta/ros_control/metadata.xml
+++ b/ros-meta/ros_control/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/ros_core/metadata.xml b/ros-meta/ros_core/metadata.xml
index 8a1e01b..eca6af8 100644
--- a/ros-meta/ros_core/metadata.xml
+++ b/ros-meta/ros_core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/ros_tutorials/metadata.xml b/ros-meta/ros_tutorials/metadata.xml
index 1360d75..53c74b5 100644
--- a/ros-meta/ros_tutorials/metadata.xml
+++ b/ros-meta/ros_tutorials/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/rosbridge_suite/metadata.xml b/ros-meta/rosbridge_suite/metadata.xml
index d548185..c655f4f 100644
--- a/ros-meta/rosbridge_suite/metadata.xml
+++ b/ros-meta/rosbridge_suite/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/roscpp_core/metadata.xml b/ros-meta/roscpp_core/metadata.xml
index d41b871..c6d73fb 100644
--- a/ros-meta/roscpp_core/metadata.xml
+++ b/ros-meta/roscpp_core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/rosserial/metadata.xml b/ros-meta/rosserial/metadata.xml
index 853c4a1..662b791 100644
--- a/ros-meta/rosserial/metadata.xml
+++ b/ros-meta/rosserial/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/rqt/metadata.xml b/ros-meta/rqt/metadata.xml
index 1274b6f..1590eb6 100644
--- a/ros-meta/rqt/metadata.xml
+++ b/ros-meta/rqt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/rqt_common_plugins/metadata.xml b/ros-meta/rqt_common_plugins/metadata.xml
index 36b263a..0d4f8cd 100644
--- a/ros-meta/rqt_common_plugins/metadata.xml
+++ b/ros-meta/rqt_common_plugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/rqt_robot_plugins/metadata.xml b/ros-meta/rqt_robot_plugins/metadata.xml
index 28fc5ef..07e852f 100644
--- a/ros-meta/rqt_robot_plugins/metadata.xml
+++ b/ros-meta/rqt_robot_plugins/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/simulators/metadata.xml b/ros-meta/simulators/metadata.xml
index 8a1e01b..eca6af8 100644
--- a/ros-meta/simulators/metadata.xml
+++ b/ros-meta/simulators/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/slam_gmapping/metadata.xml b/ros-meta/slam_gmapping/metadata.xml
index 2787121..6680cdd 100644
--- a/ros-meta/slam_gmapping/metadata.xml
+++ b/ros-meta/slam_gmapping/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/unique_identifier/metadata.xml b/ros-meta/unique_identifier/metadata.xml
index b274068..709a6b5 100644
--- a/ros-meta/unique_identifier/metadata.xml
+++ b/ros-meta/unique_identifier/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/vision_opencv/metadata.xml b/ros-meta/vision_opencv/metadata.xml
index 266dc38..08c6dc2 100644
--- a/ros-meta/vision_opencv/metadata.xml
+++ b/ros-meta/vision_opencv/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/vision_visp/metadata.xml b/ros-meta/vision_visp/metadata.xml
index f279d19..b1bdd1b 100644
--- a/ros-meta/vision_visp/metadata.xml
+++ b/ros-meta/vision_visp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/visualization_tutorials/metadata.xml b/ros-meta/visualization_tutorials/metadata.xml
index e1ee206..1fb9369 100644
--- a/ros-meta/visualization_tutorials/metadata.xml
+++ b/ros-meta/visualization_tutorials/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/ros-meta/viz/metadata.xml b/ros-meta/viz/metadata.xml
index 8a1e01b..eca6af8 100644
--- a/ros-meta/viz/metadata.xml
+++ b/ros-meta/viz/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ros</herd>

diff --git a/sci-astronomy/cpl/metadata.xml b/sci-astronomy/cpl/metadata.xml
index 87845cb..8967e69 100644
--- a/sci-astronomy/cpl/metadata.xml
+++ b/sci-astronomy/cpl/metadata.xml
@@ -15,7 +15,7 @@
   external dependencies.
 </longdescription>
 <use>
-  <flag name='gasgano'>
+  <flag name="gasgano">
     Enable support for <pkg>sci-astronomy/gasgano</pkg> file organizer
   </flag>
 </use>

diff --git a/sci-astronomy/predict/metadata.xml b/sci-astronomy/predict/metadata.xml
index 90f9a65..d18483f 100644
--- a/sci-astronomy/predict/metadata.xml
+++ b/sci-astronomy/predict/metadata.xml
@@ -9,9 +9,9 @@
   or optical observation of satellites.
 </longdescription>
 <use>
-  <flag name='xforms'>Add a "map" client which uses the
+  <flag name="xforms">Add a "map" client which uses the
     <pkg>x11-libs/xforms</pkg> library for its GUI</flag>
-  <flag name='xplanet'>Project predict data onto world maps generated by
+  <flag name="xplanet">Project predict data onto world maps generated by
     <pkg>x11-misc/xplanet</pkg> / <pkg>x11-misc/xearth</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/sci-biology/biogrep/metadata.xml b/sci-biology/biogrep/metadata.xml
index cfb97be..d464821 100644
--- a/sci-biology/biogrep/metadata.xml
+++ b/sci-biology/biogrep/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>sci-biology</herd>
 </pkgmetadata>
-

diff --git a/sci-biology/biopandas/metadata.xml b/sci-biology/biopandas/metadata.xml
index 9924f08..c2ee060 100644
--- a/sci-biology/biopandas/metadata.xml
+++ b/sci-biology/biopandas/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/clustalw-mpi/metadata.xml b/sci-biology/clustalw-mpi/metadata.xml
index 905eba1..ab97061 100644
--- a/sci-biology/clustalw-mpi/metadata.xml
+++ b/sci-biology/clustalw-mpi/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>sci-biology</herd>
 <use>
-  <flag name='mpi_njtree'>Use MPI (as opposed to serial) code for computing
+  <flag name="mpi_njtree">Use MPI (as opposed to serial) code for computing
     neighbor-joining trees</flag>
-  <flag name='static_pairalign'>Use static (as opposed to dynamic) scheduling
+  <flag name="static_pairalign">Use static (as opposed to dynamic) scheduling
     for pair alignments</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-biology/embassy-cbstools/metadata.xml b/sci-biology/embassy-cbstools/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-cbstools/metadata.xml
+++ b/sci-biology/embassy-cbstools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-clustalomega/metadata.xml b/sci-biology/embassy-clustalomega/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-clustalomega/metadata.xml
+++ b/sci-biology/embassy-clustalomega/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-domainatrix/metadata.xml b/sci-biology/embassy-domainatrix/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-domainatrix/metadata.xml
+++ b/sci-biology/embassy-domainatrix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-domalign/metadata.xml b/sci-biology/embassy-domalign/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-domalign/metadata.xml
+++ b/sci-biology/embassy-domalign/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-domsearch/metadata.xml b/sci-biology/embassy-domsearch/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-domsearch/metadata.xml
+++ b/sci-biology/embassy-domsearch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-esim4/metadata.xml b/sci-biology/embassy-esim4/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-esim4/metadata.xml
+++ b/sci-biology/embassy-esim4/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-hmmer/metadata.xml b/sci-biology/embassy-hmmer/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-hmmer/metadata.xml
+++ b/sci-biology/embassy-hmmer/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-iprscan/metadata.xml b/sci-biology/embassy-iprscan/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-iprscan/metadata.xml
+++ b/sci-biology/embassy-iprscan/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-meme/metadata.xml b/sci-biology/embassy-meme/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-meme/metadata.xml
+++ b/sci-biology/embassy-meme/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-phylipnew/metadata.xml b/sci-biology/embassy-phylipnew/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-phylipnew/metadata.xml
+++ b/sci-biology/embassy-phylipnew/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-signature/metadata.xml b/sci-biology/embassy-signature/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-signature/metadata.xml
+++ b/sci-biology/embassy-signature/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-structure/metadata.xml b/sci-biology/embassy-structure/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-structure/metadata.xml
+++ b/sci-biology/embassy-structure/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-topo/metadata.xml b/sci-biology/embassy-topo/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-topo/metadata.xml
+++ b/sci-biology/embassy-topo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy-vienna/metadata.xml b/sci-biology/embassy-vienna/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy-vienna/metadata.xml
+++ b/sci-biology/embassy-vienna/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/embassy/metadata.xml b/sci-biology/embassy/metadata.xml
index 34f0987..fbd4705 100644
--- a/sci-biology/embassy/metadata.xml
+++ b/sci-biology/embassy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/emboss/metadata.xml b/sci-biology/emboss/metadata.xml
index c3676a8..8d209e2 100644
--- a/sci-biology/emboss/metadata.xml
+++ b/sci-biology/emboss/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/gatk/metadata.xml b/sci-biology/gatk/metadata.xml
index 989cb76..154ecb1 100644
--- a/sci-biology/gatk/metadata.xml
+++ b/sci-biology/gatk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-biology</herd>

diff --git a/sci-biology/picard/metadata.xml b/sci-biology/picard/metadata.xml
index b881cc8..84dc210 100644
--- a/sci-biology/picard/metadata.xml
+++ b/sci-biology/picard/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-biology</herd>

diff --git a/sci-calculators/galculator/metadata.xml b/sci-calculators/galculator/metadata.xml
index bbf9145..f6131cf 100644
--- a/sci-calculators/galculator/metadata.xml
+++ b/sci-calculators/galculator/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>

diff --git a/sci-calculators/transcalc/metadata.xml b/sci-calculators/transcalc/metadata.xml
index 36e1229..6242740 100644
--- a/sci-calculators/transcalc/metadata.xml
+++ b/sci-calculators/transcalc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>sci</herd>

diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml
index d9728cf..ffe44fb 100644
--- a/sci-calculators/units/metadata.xml
+++ b/sci-calculators/units/metadata.xml
@@ -6,6 +6,6 @@
 <name>Jeroen Roovers</name>
 </maintainer>
 <use>
-<flag name='units_cur'>Install the units_cur python script that updates currencies</flag>
+<flag name="units_cur">Install the units_cur python script that updates currencies</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-chemistry/apbs/metadata.xml b/sci-chemistry/apbs/metadata.xml
index 1da0a75..f74d006 100644
--- a/sci-chemistry/apbs/metadata.xml
+++ b/sci-chemistry/apbs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>

diff --git a/sci-chemistry/ghemical/metadata.xml b/sci-chemistry/ghemical/metadata.xml
index 631ea73..a14165c 100644
--- a/sci-chemistry/ghemical/metadata.xml
+++ b/sci-chemistry/ghemical/metadata.xml
@@ -10,7 +10,7 @@ included. Geometry optimization, molecular dynamics and a large set of
 visualization tools are currently available.
 </longdescription>
 <use>
-  <flag name='openbabel'>Use <pkg>sci-chemistry/openbabel</pkg> for file
+  <flag name="openbabel">Use <pkg>sci-chemistry/openbabel</pkg> for file
     conversions</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-chemistry/gperiodic/metadata.xml b/sci-chemistry/gperiodic/metadata.xml
index 4d96890..3fd04c6 100644
--- a/sci-chemistry/gperiodic/metadata.xml
+++ b/sci-chemistry/gperiodic/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-chemistry</herd>

diff --git a/sci-chemistry/hollow/metadata.xml b/sci-chemistry/hollow/metadata.xml
index ee146b1..2a7e5e8 100644
--- a/sci-chemistry/hollow/metadata.xml
+++ b/sci-chemistry/hollow/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>

diff --git a/sci-chemistry/molequeue/metadata.xml b/sci-chemistry/molequeue/metadata.xml
index cfb3f11..f106c9b 100644
--- a/sci-chemistry/molequeue/metadata.xml
+++ b/sci-chemistry/molequeue/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>

diff --git a/sci-chemistry/mopac7/metadata.xml b/sci-chemistry/mopac7/metadata.xml
index b24d5a3..ae48044 100644
--- a/sci-chemistry/mopac7/metadata.xml
+++ b/sci-chemistry/mopac7/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>

diff --git a/sci-chemistry/prody/metadata.xml b/sci-chemistry/prody/metadata.xml
index be692ea..4fa312d 100644
--- a/sci-chemistry/prody/metadata.xml
+++ b/sci-chemistry/prody/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>

diff --git a/sci-chemistry/pymol-apbs-plugin/metadata.xml b/sci-chemistry/pymol-apbs-plugin/metadata.xml
index ec4b35c..49049e1 100644
--- a/sci-chemistry/pymol-apbs-plugin/metadata.xml
+++ b/sci-chemistry/pymol-apbs-plugin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>

diff --git a/sci-chemistry/votca-csg/metadata.xml b/sci-chemistry/votca-csg/metadata.xml
index 7133e6c..5b8236a 100644
--- a/sci-chemistry/votca-csg/metadata.xml
+++ b/sci-chemistry/votca-csg/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-chemistry</herd>

diff --git a/sci-chemistry/votca-csgapps/metadata.xml b/sci-chemistry/votca-csgapps/metadata.xml
index b902a03..e68af23 100644
--- a/sci-chemistry/votca-csgapps/metadata.xml
+++ b/sci-chemistry/votca-csgapps/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-chemistry</herd>

diff --git a/sci-electronics/geda-xgsch2pcb/metadata.xml b/sci-electronics/geda-xgsch2pcb/metadata.xml
index 55a84c4..4e046eb 100644
--- a/sci-electronics/geda-xgsch2pcb/metadata.xml
+++ b/sci-electronics/geda-xgsch2pcb/metadata.xml
@@ -12,4 +12,3 @@
 		``gsch2pcb``.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/sci-electronics/geda/metadata.xml b/sci-electronics/geda/metadata.xml
index d8f1c8c..aac1202 100644
--- a/sci-electronics/geda/metadata.xml
+++ b/sci-electronics/geda/metadata.xml
@@ -16,7 +16,6 @@
 		netlisting, bill of materials generation, and many other features.
 	</longdescription>
 	<use>
-		<flag name='stroke'>enable mouse gesture support</flag>
+		<flag name="stroke">enable mouse gesture support</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/sci-electronics/gnetman/metadata.xml b/sci-electronics/gnetman/metadata.xml
index 47f3f10..1d035ec 100644
--- a/sci-electronics/gnetman/metadata.xml
+++ b/sci-electronics/gnetman/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-electronics</herd>

diff --git a/sci-electronics/gplcver/metadata.xml b/sci-electronics/gplcver/metadata.xml
index 28daaf9..ee65e16 100644
--- a/sci-electronics/gplcver/metadata.xml
+++ b/sci-electronics/gplcver/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-electronics</herd>

diff --git a/sci-electronics/gresistor/metadata.xml b/sci-electronics/gresistor/metadata.xml
index 5e3a61a..77bb27a 100644
--- a/sci-electronics/gresistor/metadata.xml
+++ b/sci-electronics/gresistor/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/sci-electronics/kicad/metadata.xml b/sci-electronics/kicad/metadata.xml
index 742bd19..83b3769 100644
--- a/sci-electronics/kicad/metadata.xml
+++ b/sci-electronics/kicad/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/sci-electronics/osqoop/metadata.xml b/sci-electronics/osqoop/metadata.xml
index 8a50685..243b1ca 100644
--- a/sci-electronics/osqoop/metadata.xml
+++ b/sci-electronics/osqoop/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sci-electronics/plcedit/metadata.xml b/sci-electronics/plcedit/metadata.xml
index d5f9562..447fa9b 100644
--- a/sci-electronics/plcedit/metadata.xml
+++ b/sci-electronics/plcedit/metadata.xml
@@ -9,4 +9,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/sci-electronics/pulseview/metadata.xml b/sci-electronics/pulseview/metadata.xml
index 9ec6e5e..9b1f097 100644
--- a/sci-electronics/pulseview/metadata.xml
+++ b/sci-electronics/pulseview/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>dev-embedded</herd>
 <use>
- <flag name='decode'>Enable decoding of protocols while capturing</flag>
+ <flag name="decode">Enable decoding of protocols while capturing</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-electronics/quartus-prime-lite/metadata.xml b/sci-electronics/quartus-prime-lite/metadata.xml
index 42ed446..ffd48dc 100644
--- a/sci-electronics/quartus-prime-lite/metadata.xml
+++ b/sci-electronics/quartus-prime-lite/metadata.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>
 	<maintainer>

diff --git a/sci-electronics/sigrok-cli/metadata.xml b/sci-electronics/sigrok-cli/metadata.xml
index 9ec6e5e..9b1f097 100644
--- a/sci-electronics/sigrok-cli/metadata.xml
+++ b/sci-electronics/sigrok-cli/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>dev-embedded</herd>
 <use>
- <flag name='decode'>Enable decoding of protocols while capturing</flag>
+ <flag name="decode">Enable decoding of protocols while capturing</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-electronics/splat/metadata.xml b/sci-electronics/splat/metadata.xml
index e8f8307..1e01843 100644
--- a/sci-electronics/splat/metadata.xml
+++ b/sci-electronics/splat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-electronics</herd>
@@ -10,7 +10,7 @@
   broadcasting.
   </longdescription>
   <use>
-  	<flag name = 'hires'>Builds additional high resolution application 
+  	<flag name="hires">Builds additional high resolution application 
 	'rfsplat-hd'. </flag>
   </use>
 </pkgmetadata>

diff --git a/sci-geosciences/cdat-lite/metadata.xml b/sci-geosciences/cdat-lite/metadata.xml
index 0744b87..4d570de 100644
--- a/sci-geosciences/cdat-lite/metadata.xml
+++ b/sci-geosciences/cdat-lite/metadata.xml
@@ -6,4 +6,3 @@
 	<name>Julian Ospald</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/sci-geosciences/congen/metadata.xml b/sci-geosciences/congen/metadata.xml
index 0744b87..4d570de 100644
--- a/sci-geosciences/congen/metadata.xml
+++ b/sci-geosciences/congen/metadata.xml
@@ -6,4 +6,3 @@
 	<name>Julian Ospald</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/sci-geosciences/gmapcatcher/metadata.xml b/sci-geosciences/gmapcatcher/metadata.xml
index 6ae1418..f671fec 100644
--- a/sci-geosciences/gmapcatcher/metadata.xml
+++ b/sci-geosciences/gmapcatcher/metadata.xml
@@ -8,4 +8,3 @@
 		<description>Maintainer, assign bugs to him</description>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/sci-geosciences/googleearth/metadata.xml b/sci-geosciences/googleearth/metadata.xml
index 3bbd22b..b476985 100644
--- a/sci-geosciences/googleearth/metadata.xml
+++ b/sci-geosciences/googleearth/metadata.xml
@@ -5,6 +5,6 @@
 		<email>mschiff@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='bundled-libs'>Use bundled libraries.</flag>
+		<flag name="bundled-libs">Use bundled libraries.</flag>
 	</use>
 </pkgmetadata>

diff --git a/sci-geosciences/gshhs-data/metadata.xml b/sci-geosciences/gshhs-data/metadata.xml
index 668362a..2a17d73 100644
--- a/sci-geosciences/gshhs-data/metadata.xml
+++ b/sci-geosciences/gshhs-data/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-geosciences</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   GSHHS is a high-resolution shoreline data set amalgamated from two
   databases in the public domain. The data have undergone extensive
   processing and are free of internal inconsistencies such as erratic

diff --git a/sci-geosciences/gshhs/metadata.xml b/sci-geosciences/gshhs/metadata.xml
index 64ad637..963cd26 100644
--- a/sci-geosciences/gshhs/metadata.xml
+++ b/sci-geosciences/gshhs/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-geosciences</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   GSHHS is a high-resolution shoreline data set amalgamated from two
   databases in the public domain.  This package contains access
   software and routines to facilitate decimation based on a standard

diff --git a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml b/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
index e96e35b..91f4e72 100644
--- a/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
+++ b/sci-geosciences/harmonics-dwf-free-noncomm/metadata.xml
@@ -5,4 +5,3 @@
 		<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 e96e35b..91f4e72 100644
--- a/sci-geosciences/harmonics-dwf-free/metadata.xml
+++ b/sci-geosciences/harmonics-dwf-free/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/sci-geosciences/laszip/metadata.xml b/sci-geosciences/laszip/metadata.xml
index de7129f..89f1b96 100644
--- a/sci-geosciences/laszip/metadata.xml
+++ b/sci-geosciences/laszip/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-geosciences</herd>

diff --git a/sci-geosciences/libtcd/metadata.xml b/sci-geosciences/libtcd/metadata.xml
index e96e35b..91f4e72 100644
--- a/sci-geosciences/libtcd/metadata.xml
+++ b/sci-geosciences/libtcd/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/sci-geosciences/mapnik/metadata.xml b/sci-geosciences/mapnik/metadata.xml
index 03b5eab..ff0b4f5 100644
--- a/sci-geosciences/mapnik/metadata.xml
+++ b/sci-geosciences/mapnik/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>sci-geosciences</herd>

diff --git a/sci-geosciences/opencpn/metadata.xml b/sci-geosciences/opencpn/metadata.xml
index 14f829c..5fc3e52 100644
--- a/sci-geosciences/opencpn/metadata.xml
+++ b/sci-geosciences/opencpn/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-geosciences</herd>

diff --git a/sci-geosciences/osm2pgsql/metadata.xml b/sci-geosciences/osm2pgsql/metadata.xml
index 7d0c03d..922b6a8 100644
--- a/sci-geosciences/osm2pgsql/metadata.xml
+++ b/sci-geosciences/osm2pgsql/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>sci-geosciences</herd>

diff --git a/sci-geosciences/swmm/metadata.xml b/sci-geosciences/swmm/metadata.xml
index e96e35b..91f4e72 100644
--- a/sci-geosciences/swmm/metadata.xml
+++ b/sci-geosciences/swmm/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/sci-geosciences/xtide/metadata.xml b/sci-geosciences/xtide/metadata.xml
index 208d779..32bef51 100644
--- a/sci-geosciences/xtide/metadata.xml
+++ b/sci-geosciences/xtide/metadata.xml
@@ -5,7 +5,6 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='gps'>Use <pkg>sci-geosciences/gpsd</pkg></flag>
+		<flag name="gps">Use <pkg>sci-geosciences/gpsd</pkg></flag>
 	</use>
 </pkgmetadata>
-

diff --git a/sci-libs/coinor-clp/metadata.xml b/sci-libs/coinor-clp/metadata.xml
index 8c7fb98..c9bc581 100644
--- a/sci-libs/coinor-clp/metadata.xml
+++ b/sci-libs/coinor-clp/metadata.xml
@@ -10,11 +10,11 @@
   linear mathematical optimization problems.
 </longdescription>
 <use>
-  <flag name='glpk'>Enable GNU Linear Programming Kit
+  <flag name="glpk">Enable GNU Linear Programming Kit
   <pkg>sci-mathematics/glpk</pkg> support</flag>
-  <flag name='metis'>Enable partitioning with
+  <flag name="metis">Enable partitioning with
   <pkg>sci-libs/metis</pkg></flag>
-  <flag name='mumps'>Enable <pkg>sci-libs/mumps</pkg> support</flag>
-  <flag name='sparse'>Enable support for sparse matrix with <pkg>sci-libs/cholmod</pkg></flag>
+  <flag name="mumps">Enable <pkg>sci-libs/mumps</pkg> support</flag>
+  <flag name="sparse">Enable support for sparse matrix with <pkg>sci-libs/cholmod</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/sci-libs/coinor-osi/metadata.xml b/sci-libs/coinor-osi/metadata.xml
index 3bcaa06..fd3d4a3 100644
--- a/sci-libs/coinor-osi/metadata.xml
+++ b/sci-libs/coinor-osi/metadata.xml
@@ -9,7 +9,7 @@
   solver library's MIP solver.
 </longdescription>
 <use>
-  <flag name='glpk'>Enable GNU Linear Programming Kit
+  <flag name="glpk">Enable GNU Linear Programming Kit
   <pkg>sci-mathematics/glpk</pkg> support</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-libs/coinor-symphony/metadata.xml b/sci-libs/coinor-symphony/metadata.xml
index 4940c67..1ff830e 100644
--- a/sci-libs/coinor-symphony/metadata.xml
+++ b/sci-libs/coinor-symphony/metadata.xml
@@ -12,7 +12,7 @@
  Infrastructurefor Operations Research).
 </longdescription>
 <use>
-  <flag name='glpk'>Enable GNU Linear Programming Kit
+  <flag name="glpk">Enable GNU Linear Programming Kit
   <pkg>sci-mathematics/glpk</pkg> support</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-libs/freesteam/metadata.xml b/sci-libs/freesteam/metadata.xml
index d71ebe0..61f447e 100644
--- a/sci-libs/freesteam/metadata.xml
+++ b/sci-libs/freesteam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/sci-libs/gerris/metadata.xml b/sci-libs/gerris/metadata.xml
index 7a3fef7..71694d7 100644
--- a/sci-libs/gerris/metadata.xml
+++ b/sci-libs/gerris/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>

diff --git a/sci-libs/gts/metadata.xml b/sci-libs/gts/metadata.xml
index a4d09bd..8b3d37b 100644
--- a/sci-libs/gts/metadata.xml
+++ b/sci-libs/gts/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>

diff --git a/sci-libs/ignition-math/metadata.xml b/sci-libs/ignition-math/metadata.xml
index d3079ed..b792de0 100644
--- a/sci-libs/ignition-math/metadata.xml
+++ b/sci-libs/ignition-math/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sci-libs/lemon/metadata.xml b/sci-libs/lemon/metadata.xml
index 1a144a8..9251a3b 100644
--- a/sci-libs/lemon/metadata.xml
+++ b/sci-libs/lemon/metadata.xml
@@ -16,7 +16,7 @@
 <use>
   <flag name="coin">Enable the <pkg>coinor-clp</pkg> and
   <pkg>coinor-cbc</pkg> graph algorithms</flag>
-  <flag name='glpk'>Enable GNU Linear Programming Kit
+  <flag name="glpk">Enable GNU Linear Programming Kit
   <pkg>sci-mathematics/glpk</pkg> support</flag>
   <flag name="tools">Build additional tools</flag>
   <flag name="coin">Enable the <pkg>coinor-clp</pkg> and

diff --git a/sci-libs/libcore/metadata.xml b/sci-libs/libcore/metadata.xml
index 316dc3d..e55bb9c 100644
--- a/sci-libs/libcore/metadata.xml
+++ b/sci-libs/libcore/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-geosciences</herd>
-<longdescription lang='en'>  
+<longdescription lang="en">  
   The Core Library is a collection of C/C++ classes for exact
   computation with real algebraic numbers.
   It embodies our precision-driven approach and is 

diff --git a/sci-libs/libghemical/metadata.xml b/sci-libs/libghemical/metadata.xml
index e94fba7..26e9c2e 100644
--- a/sci-libs/libghemical/metadata.xml
+++ b/sci-libs/libghemical/metadata.xml
@@ -10,9 +10,9 @@ included. Geometry optimization, molecular dynamics and a large set of
 visualization tools are currently available.
 </longdescription>
 <use>
-  <flag name='mopac7'>Use <pkg>sci-chemistry/mopac7</pkg> for semi-empirical
+  <flag name="mopac7">Use <pkg>sci-chemistry/mopac7</pkg> for semi-empirical
     calculations</flag>
-  <flag name='mpqc'>Use <pkg>sci-chemistry/mpqc</pkg> for quantum-mechanical
+  <flag name="mpqc">Use <pkg>sci-chemistry/mpqc</pkg> for quantum-mechanical
     calculations</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-libs/libsigrok/metadata.xml b/sci-libs/libsigrok/metadata.xml
index 34522af..f1e6b40 100644
--- a/sci-libs/libsigrok/metadata.xml
+++ b/sci-libs/libsigrok/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>dev-embedded</herd>
 <use>
- <flag name='ftdi'>Enable drivers that need libftdi</flag>
- <flag name='parport'>Enable drivers that are parallel (IEEE1284) based</flag>
- <flag name='serial'>Enable drivers that are serial (RS232) based</flag>
+ <flag name="ftdi">Enable drivers that need libftdi</flag>
+ <flag name="parport">Enable drivers that are parallel (IEEE1284) based</flag>
+ <flag name="serial">Enable drivers that are serial (RS232) based</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-libs/libsigrokdecode/metadata.xml b/sci-libs/libsigrokdecode/metadata.xml
index 253e7c3..9211408 100644
--- a/sci-libs/libsigrokdecode/metadata.xml
+++ b/sci-libs/libsigrokdecode/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>dev-embedded</herd>

diff --git a/sci-libs/libspatialindex/metadata.xml b/sci-libs/libspatialindex/metadata.xml
index 0744b87..4d570de 100644
--- a/sci-libs/libspatialindex/metadata.xml
+++ b/sci-libs/libspatialindex/metadata.xml
@@ -6,4 +6,3 @@
 	<name>Julian Ospald</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/sci-libs/mumps/metadata.xml b/sci-libs/mumps/metadata.xml
index 3aa8aad..477ae66 100644
--- a/sci-libs/mumps/metadata.xml
+++ b/sci-libs/mumps/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   MUltifrontal Massively Parallel sparse direct Solver implements a
   direct solver for large sparse linear systems, with a particular
   focus on symmetric positive definite matrices. It can operate on

diff --git a/sci-libs/naga/metadata.xml b/sci-libs/naga/metadata.xml
index ce4f93d..92a8c87 100644
--- a/sci-libs/naga/metadata.xml
+++ b/sci-libs/naga/metadata.xml
@@ -9,4 +9,3 @@
 	Simplified Java NIO asynchronous sockets
 	</longdescription>
 </pkgmetadata>
-

diff --git a/sci-libs/netcdf-cxx/metadata.xml b/sci-libs/netcdf-cxx/metadata.xml
index e565992..3a0a93b 100644
--- a/sci-libs/netcdf-cxx/metadata.xml
+++ b/sci-libs/netcdf-cxx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>

diff --git a/sci-libs/openfoam/metadata.xml b/sci-libs/openfoam/metadata.xml
index fbc54b0..3a8af9d 100644
--- a/sci-libs/openfoam/metadata.xml
+++ b/sci-libs/openfoam/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>

diff --git a/sci-libs/pymmlib/metadata.xml b/sci-libs/pymmlib/metadata.xml
index 8a4f731..90592c4 100644
--- a/sci-libs/pymmlib/metadata.xml
+++ b/sci-libs/pymmlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>

diff --git a/sci-libs/silo/metadata.xml b/sci-libs/silo/metadata.xml
index ec7712e..fa5dbb1 100644
--- a/sci-libs/silo/metadata.xml
+++ b/sci-libs/silo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cluster</herd>

diff --git a/sci-libs/spooles/metadata.xml b/sci-libs/spooles/metadata.xml
index 38223c0..0277d17 100644
--- a/sci-libs/spooles/metadata.xml
+++ b/sci-libs/spooles/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   SPOOLES is a library for solving sparse real and complex linear
   systems of equations, written in the C language using object
   oriented design. At present, there is the following functionality:

diff --git a/sci-libs/spqr/metadata.xml b/sci-libs/spqr/metadata.xml
index ed49aa2..0e64eda 100644
--- a/sci-libs/spqr/metadata.xml
+++ b/sci-libs/spqr/metadata.xml
@@ -10,8 +10,8 @@
   peak performance of a multicore computer.
 </longdescription>
 <use>
-  <flag name='metis'>Use <pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg> for partitioning</flag>
-  <flag name='tbb'>Enable multithreading with the Intel Threads
+  <flag name="metis">Use <pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg> for partitioning</flag>
+  <flag name="tbb">Enable multithreading with the Intel Threads
   Building Block <pkg>dev-cpp/tbb</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/sci-libs/starparse/metadata.xml b/sci-libs/starparse/metadata.xml
index fc06755..e5a76f1 100644
--- a/sci-libs/starparse/metadata.xml
+++ b/sci-libs/starparse/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>

diff --git a/sci-libs/suitesparse/metadata.xml b/sci-libs/suitesparse/metadata.xml
index 196e8de..6b28fdf 100644
--- a/sci-libs/suitesparse/metadata.xml
+++ b/sci-libs/suitesparse/metadata.xml
@@ -28,6 +28,6 @@
 <use>
   <flag name="cuda">Enable nvidia cuda toolkit for speeding up computations</flag>
   <flag name="metis">Enable the Partition module to cholmod using <pkg>sci-libs/metis</pkg></flag>
-  <flag name='tbb'>Enable multithreading with the Intel Threads Building Block <pkg>dev-cpp/tbb</pkg></flag>
+  <flag name="tbb">Enable multithreading with the Intel Threads Building Block <pkg>dev-cpp/tbb</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/sci-libs/vecmath-objectclub/metadata.xml b/sci-libs/vecmath-objectclub/metadata.xml
index 1be81e8..a65ad7d 100644
--- a/sci-libs/vecmath-objectclub/metadata.xml
+++ b/sci-libs/vecmath-objectclub/metadata.xml
@@ -16,4 +16,3 @@
   decomposition are also there.
 </longdescription>
 </pkgmetadata>
-

diff --git a/sci-libs/votca-tools/metadata.xml b/sci-libs/votca-tools/metadata.xml
index c6b65ec..761707b 100644
--- a/sci-libs/votca-tools/metadata.xml
+++ b/sci-libs/votca-tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-chemistry</herd>

diff --git a/sci-mathematics/agda/metadata.xml b/sci-mathematics/agda/metadata.xml
index 11b2cbc..3be3c51 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -10,8 +10,8 @@
   inductive definitions, module structures and a class hierarchy mechanism.
 </longdescription>
 <use>
-  <flag name='cpphs'>Use cpphs instead of cpp.</flag>
-  <flag name='epic'>Add support for the epic compiler.</flag>
-  <flag name='stdlib'>Install the standard library.</flag>
+  <flag name="cpphs">Use cpphs instead of cpp.</flag>
+  <flag name="epic">Add support for the epic compiler.</flag>
+  <flag name="stdlib">Install the standard library.</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-mathematics/calc/metadata.xml b/sci-mathematics/calc/metadata.xml
index 1909ee5..fc39076 100644
--- a/sci-mathematics/calc/metadata.xml
+++ b/sci-mathematics/calc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-mathematics</herd>

diff --git a/sci-mathematics/cvc3/metadata.xml b/sci-mathematics/cvc3/metadata.xml
index fd176a8..2f5473a 100644
--- a/sci-mathematics/cvc3/metadata.xml
+++ b/sci-mathematics/cvc3/metadata.xml
@@ -6,7 +6,7 @@
   <name>Mark Wright</name>
 </maintainer>
 <herd>sci-mathematics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 CVC3 is an automatic theorem prover for Satisfiability Modulo Theories
 (SMT) problems. It can be used to prove the validity (or, dually, the
 satisfiability) of first-order formulas in a large number of built-in
@@ -32,9 +32,9 @@ and has a wide variety of features including:
         purposes (see license).
 </longdescription>
 <use>
-  <flag name='isabelle'>Add integration support for the Isabelle/HOL
+  <flag name="isabelle">Add integration support for the Isabelle/HOL
   theorem prover.</flag>
-  <flag name='zchaff'>Use the SAT solver zchaff whose copyright is
+  <flag name="zchaff">Use the SAT solver zchaff whose copyright is
   owned by Princeton University and is more restrictive (see zchaff
   license).
   </flag>

diff --git a/sci-mathematics/e/metadata.xml b/sci-mathematics/e/metadata.xml
index 215faaa..775fe11 100644
--- a/sci-mathematics/e/metadata.xml
+++ b/sci-mathematics/e/metadata.xml
@@ -6,7 +6,7 @@
   <name>Mark Wright</name>
 </maintainer>
 <herd>sci-mathematics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 E is a theorem prover for full first-order logic with equality. It
 accepts a problem specification, typically consisting of a number of
 first-order clauses or formulas, and a conjecture, again either in
@@ -26,7 +26,7 @@ most powerful and friendly reasoning systems for first-order
 logic. The prover has successfully participated in many competitions.
 </longdescription>
 <use>
-  <flag name='isabelle'>Add integration support for the Isabelle/HOL
+  <flag name="isabelle">Add integration support for the Isabelle/HOL
   theorem prover.</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-mathematics/flint/metadata.xml b/sci-mathematics/flint/metadata.xml
index 98dccf2..c327261 100644
--- a/sci-mathematics/flint/metadata.xml
+++ b/sci-mathematics/flint/metadata.xml
@@ -6,11 +6,11 @@
 		<name>Patrick Lauer</name>
 	</maintainer>
 	<upstream>
-		<remote-id type='github'>wbhart/flint2</remote-id>
+		<remote-id type="github">wbhart/flint2</remote-id>
 	</upstream>
 	<use>
-		<flag name='gc'>Enable garbage collection
+		<flag name="gc">Enable garbage collection
 			support via <pkg>dev-libs/boehm-gc</pkg></flag>
-		<flag name='ntl'>Build NTL interface</flag>
+		<flag name="ntl">Build NTL interface</flag>
 	</use>
 </pkgmetadata>

diff --git a/sci-mathematics/gmm/metadata.xml b/sci-mathematics/gmm/metadata.xml
index bf6dfb4..0c5f9be 100644
--- a/sci-mathematics/gmm/metadata.xml
+++ b/sci-mathematics/gmm/metadata.xml
@@ -4,7 +4,7 @@
 <maintainer>
   <email>amynka@gentoo.org</email>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
   Gmm++ is a generic C++ template library for sparse, dense and
   skyline matrices. It is built as a set of generic algorithms (mult,
   add, copy, sub-matrices, dense and sparse solvers ...) for any

diff --git a/sci-mathematics/isabelle/metadata.xml b/sci-mathematics/isabelle/metadata.xml
index 4128540..986ebca 100644
--- a/sci-mathematics/isabelle/metadata.xml
+++ b/sci-mathematics/isabelle/metadata.xml
@@ -5,7 +5,7 @@
   <email>gienah@gentoo.org</email>
 </maintainer>
 <herd>sci-mathematics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 Isabelle is a generic proof assistant. It allows mathematical
 formulas to be expressed in a formal language and provides tools
 for proving those formulas in a logical calculus. The main
@@ -15,29 +15,29 @@ correctness of computer hardware or software and proving
 properties of computer languages and protocols.
 </longdescription>
 <use>
-  <flag name='Pure'>Pure is the basis for all object-logics.</flag>
-  <flag name='FOL'>FOL (Many-sorted First-Order Logic) provides basic
+  <flag name="Pure">Pure is the basis for all object-logics.</flag>
+  <flag name="FOL">FOL (Many-sorted First-Order Logic) provides basic
   classical and intuitionistic first-order logic. It is polymorphic.</flag>
-  <flag name='HOL'>(Higher-Order Logic) is a version of classical higher-order
+  <flag name="HOL">(Higher-Order Logic) is a version of classical higher-order
   logic resembling that of the HOL System.</flag>
-  <flag name='ZF'>ZF (Set Theory) offers a formulation of Zermelo-Fraenkel
+  <flag name="ZF">ZF (Set Theory) offers a formulation of Zermelo-Fraenkel
   set theory on top of FOL.</flag>
-  <flag name='CCL'>CCL (Classical Computational Logic)</flag>
-  <flag name='CTT'>CTT (Constructive Type Theory) is an extensional version
+  <flag name="CCL">CCL (Classical Computational Logic)</flag>
+  <flag name="CTT">CTT (Constructive Type Theory) is an extensional version
   of Martin-Löf's Type Theory.</flag>
-  <flag name='Cube'>Cube (The Lambda Cube)</flag>
-  <flag name='FOLP'>FOLP (FOL with Proof Terms)</flag>
-  <flag name='LCF'>LCF (Logic of Computable Functions)</flag>
-  <flag name='Sequents'>Sequents (first-order, modal and linear logics)</flag>
-  <flag name='graphbrowsing'>Generate theory browsing information,
+  <flag name="Cube">Cube (The Lambda Cube)</flag>
+  <flag name="FOLP">FOLP (FOL with Proof Terms)</flag>
+  <flag name="LCF">LCF (Logic of Computable Functions)</flag>
+  <flag name="Sequents">Sequents (first-order, modal and linear logics)</flag>
+  <flag name="graphbrowsing">Generate theory browsing information,
   including HTML documents that show a theory's definition, the
   theorems proved in its ML file and the relationship with its
   ancestors and descendants.</flag>
-  <flag name='ledit'>Use ledit for the isabelle tty line editor</flag> 
-  <flag name='readline'>Use readline (rlwrap) for the isabelle tty line
+  <flag name="ledit">Use ledit for the isabelle tty line editor</flag> 
+  <flag name="readline">Use readline (rlwrap) for the isabelle tty line
   editor</flag> 
-  <flag name='proofgeneral'>Add support for the
+  <flag name="proofgeneral">Add support for the
   <pkg>app-emacs/proofgeneral</pkg> proof assistant front end.</flag>
-  <flag name='pide'>Build Isabelle/jEdit Prover IDE (PIDE).</flag> 
+  <flag name="pide">Build Isabelle/jEdit Prover IDE (PIDE).</flag> 
 </use>
 </pkgmetadata>

diff --git a/sci-mathematics/kodkodi/metadata.xml b/sci-mathematics/kodkodi/metadata.xml
index bcd7cbb..4ad0f77 100644
--- a/sci-mathematics/kodkodi/metadata.xml
+++ b/sci-mathematics/kodkodi/metadata.xml
@@ -6,11 +6,11 @@
   <name>Mark Wright</name>
 </maintainer>
 <herd>sci-mathematics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 A text front-end for the Kodkod Java library.
 </longdescription>
 <use>
-  <flag name='isabelle'>Add integration support for the Isabelle/HOL
+  <flag name="isabelle">Add integration support for the Isabelle/HOL
   theorem prover.</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-mathematics/lpsolve/metadata.xml b/sci-mathematics/lpsolve/metadata.xml
index a738782..c295c6a 100644
--- a/sci-mathematics/lpsolve/metadata.xml
+++ b/sci-mathematics/lpsolve/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>office</herd>

diff --git a/sci-mathematics/msieve/metadata.xml b/sci-mathematics/msieve/metadata.xml
index de9a8b3..2d98b05 100644
--- a/sci-mathematics/msieve/metadata.xml
+++ b/sci-mathematics/msieve/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/sci-mathematics/octave-epstk/metadata.xml b/sci-mathematics/octave-epstk/metadata.xml
index 1e986b2..ca87607 100644
--- a/sci-mathematics/octave-epstk/metadata.xml
+++ b/sci-mathematics/octave-epstk/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-mathematics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   The epsTk package provides, via a set of functions for octave, a
   toolkit to create powerful encapsulated postscript (.eps) graphs. Most 2D
   scientific graphics functions are written. The generated .eps-files are very

diff --git a/sci-mathematics/p9m4/metadata.xml b/sci-mathematics/p9m4/metadata.xml
index 037c455..fca0847 100644
--- a/sci-mathematics/p9m4/metadata.xml
+++ b/sci-mathematics/p9m4/metadata.xml
@@ -5,7 +5,7 @@
   <email>gienah@gentoo.org</email>
 </maintainer>
 <herd>sci-mathematics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   This is a Graphical User Interface for Prover9 and Mace4.
   Prover9 is an automated theorem prover for first-order and
   equational logic, and Mace4 searches for finite models and

diff --git a/sci-mathematics/qtoctave/metadata.xml b/sci-mathematics/qtoctave/metadata.xml
index 19eb759..e6e6096 100644
--- a/sci-mathematics/qtoctave/metadata.xml
+++ b/sci-mathematics/qtoctave/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci-mathematics</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   Besides offering an attractive front-end to GNU Octave, an
   environment for numerical computation highly compatible with MATLAB,
   QtOctave currently also features matrix data entry and display and

diff --git a/sci-mathematics/relational/metadata.xml b/sci-mathematics/relational/metadata.xml
index 1d78188..76975b5 100644
--- a/sci-mathematics/relational/metadata.xml
+++ b/sci-mathematics/relational/metadata.xml
@@ -5,4 +5,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/sci-mathematics/rw/metadata.xml b/sci-mathematics/rw/metadata.xml
index 2487e63..6d7ddb6 100644
--- a/sci-mathematics/rw/metadata.xml
+++ b/sci-mathematics/rw/metadata.xml
@@ -23,6 +23,6 @@
   </longdescription>
 
   <use>
-    <flag name='executable'>Build the 'rw' program.</flag>
+    <flag name="executable">Build the 'rw' program.</flag>
   </use>
 </pkgmetadata>

diff --git a/sci-mathematics/snns/metadata.xml b/sci-mathematics/snns/metadata.xml
index ac4f219..6dbaed3 100644
--- a/sci-mathematics/snns/metadata.xml
+++ b/sci-mathematics/snns/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-mathematics</herd>

diff --git a/sci-mathematics/yacas/metadata.xml b/sci-mathematics/yacas/metadata.xml
index d45ad6c..f234ff9 100644
--- a/sci-mathematics/yacas/metadata.xml
+++ b/sci-mathematics/yacas/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-mathematics</herd>

diff --git a/sci-mathematics/yafu/metadata.xml b/sci-mathematics/yafu/metadata.xml
index d98fdc9..8a94e31 100644
--- a/sci-mathematics/yafu/metadata.xml
+++ b/sci-mathematics/yafu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/sci-misc/fitsverify/metadata.xml b/sci-misc/fitsverify/metadata.xml
index 0398d6d..ea6495c 100644
--- a/sci-misc/fitsverify/metadata.xml
+++ b/sci-misc/fitsverify/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   fitsverify is a computer program that rigorously checks whether a
   FITS format data file conforms to all the requirements defined in
   the FITS (Flexible Image Transport System) standard document.

diff --git a/sci-misc/nco/metadata.xml b/sci-misc/nco/metadata.xml
index c13bc9d..d3f07d7 100644
--- a/sci-misc/nco/metadata.xml
+++ b/sci-misc/nco/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>

diff --git a/sci-physics/espresso++/metadata.xml b/sci-physics/espresso++/metadata.xml
index 2f202fc..35cad87 100644
--- a/sci-physics/espresso++/metadata.xml
+++ b/sci-physics/espresso++/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>sci-physics</herd>

diff --git a/sci-physics/hepmc/metadata.xml b/sci-physics/hepmc/metadata.xml
index 5733312..8b0128a 100644
--- a/sci-physics/hepmc/metadata.xml
+++ b/sci-physics/hepmc/metadata.xml
@@ -19,7 +19,7 @@
   Reference: M. Dobbs and J.B. Hansen, Comput. Phys. Commun. 134 (2001)41. 
 </longdescription>
 <use>
-  <flag name='gev'>Build with GeV instead of default MeV for momentum units</flag>
-  <flag name='cm'>Build with cm instead of default mm for length units</flag>
+  <flag name="gev">Build with GeV instead of default MeV for momentum units</flag>
+  <flag name="cm">Build with cm instead of default mm for length units</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/hoomd-blue/metadata.xml b/sci-physics/hoomd-blue/metadata.xml
index 89ca638..ace26cb 100644
--- a/sci-physics/hoomd-blue/metadata.xml
+++ b/sci-physics/hoomd-blue/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci-chemistry</herd>

diff --git a/sci-physics/lhapdf/metadata.xml b/sci-physics/lhapdf/metadata.xml
index 6631173..52920e3 100644
--- a/sci-physics/lhapdf/metadata.xml
+++ b/sci-physics/lhapdf/metadata.xml
@@ -16,6 +16,6 @@
   installation of LHAPDF.
 </longdescription>
 <use>
-  <flag name='octave'>Add bindings for <pkg>sci-mathematics/octave</pkg></flag> 
+  <flag name="octave">Add bindings for <pkg>sci-mathematics/octave</pkg></flag> 
 </use>
 </pkgmetadata>

diff --git a/sci-physics/meep/metadata.xml b/sci-physics/meep/metadata.xml
index 17865fb..8672513 100644
--- a/sci-physics/meep/metadata.xml
+++ b/sci-physics/meep/metadata.xml
@@ -9,6 +9,6 @@
   eigenmode package.
 </longdescription>
 <use>
-  <flag name='mpb'>Enable build against <pkg>sci-physics/mpb</pkg></flag>
+  <flag name="mpb">Enable build against <pkg>sci-physics/mpb</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/sassena/metadata.xml b/sci-physics/sassena/metadata.xml
index fb807da..b0d4622 100644
--- a/sci-physics/sassena/metadata.xml
+++ b/sci-physics/sassena/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sci-physics/thepeg/metadata.xml b/sci-physics/thepeg/metadata.xml
index 60bfa04..35a029d 100644
--- a/sci-physics/thepeg/metadata.xml
+++ b/sci-physics/thepeg/metadata.xml
@@ -13,12 +13,12 @@
   of the toolkit and which can be used by any event generator model.
 </longdescription>
 <use>
-  <flag name='c++11'>Build ThePEG using the C++11 standard.
+  <flag name="c++11">Build ThePEG using the C++11 standard.
   Experimental feature, not for production use.</flag>
-  <flag name='fastjet'>Adds support for <pkg>sci-physics/fastjet</pkg></flag>
-  <flag name='hepmc'>Adds support for High Energy Physics Monte Carlo
+  <flag name="fastjet">Adds support for <pkg>sci-physics/fastjet</pkg></flag>
+  <flag name="hepmc">Adds support for High Energy Physics Monte Carlo
 	  Generators <pkg>sci-physics/hepmc</pkg></flag>
-  <flag name='lhapdf'>Adds support for <pkg>sci-physics/lhapdf</pkg></flag>
-  <flag name='rivet'>Adds support for <pkg>sci-physics/rivet</pkg></flag>
+  <flag name="lhapdf">Adds support for <pkg>sci-physics/lhapdf</pkg></flag>
+  <flag name="rivet">Adds support for <pkg>sci-physics/rivet</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/sci-physics/yoda/metadata.xml b/sci-physics/yoda/metadata.xml
index b221b3a..04e893c 100644
--- a/sci-physics/yoda/metadata.xml
+++ b/sci-physics/yoda/metadata.xml
@@ -11,6 +11,6 @@
 </longdescription>
 <use>
   <flag name="c++11"> Build using the C++11 standard</flag>
-  <flag name='root'>Adds support for <pkg>sci-physics/root</pkg></flag>
+  <flag name="root">Adds support for <pkg>sci-physics/root</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/sci-visualization/gfsview/metadata.xml b/sci-visualization/gfsview/metadata.xml
index 31724cd..af5db25 100644
--- a/sci-visualization/gfsview/metadata.xml
+++ b/sci-visualization/gfsview/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>sci</herd>

diff --git a/sci-visualization/opendx-samples/metadata.xml b/sci-visualization/opendx-samples/metadata.xml
index 8d2b82e..4129594 100644
--- a/sci-visualization/opendx-samples/metadata.xml
+++ b/sci-visualization/opendx-samples/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   This package contains examples of scripts and networks for the
   OpenDX Data Explorer. They are referenced in the OpenDX tutorial,
   but can also be used stand-alone to browse and investigate.

diff --git a/sci-visualization/opendx/metadata.xml b/sci-visualization/opendx/metadata.xml
index 0105237..9090326 100644
--- a/sci-visualization/opendx/metadata.xml
+++ b/sci-visualization/opendx/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
   The Open Data Explorer brings together dynamic computational
   and rendering tools in a dynamic, programmable framework that
   enables users to rapidly create visualizations of highly complex
@@ -15,9 +15,9 @@
   chemistry, and engineering analysis.
 </longdescription>
 <use>
-  <flag name='cdf'>Add support for <pkg>sci-libs/cdf</pkg> data exchange
+  <flag name="cdf">Add support for <pkg>sci-libs/cdf</pkg> data exchange
     format</flag>
-  <flag name='hdf'>Add support for the Hierarchical Data Format
+  <flag name="hdf">Add support for the Hierarchical Data Format
     (<pkg>sci-libs/hdf</pkg>)</flag>
 </use>
 </pkgmetadata>

diff --git a/sci-visualization/visit/metadata.xml b/sci-visualization/visit/metadata.xml
index e21bd2f..faf3870 100644
--- a/sci-visualization/visit/metadata.xml
+++ b/sci-visualization/visit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <longdescription>

diff --git a/sec-policy/selinux-base-policy/metadata.xml b/sec-policy/selinux-base-policy/metadata.xml
index 50877f7..238d5b6 100644
--- a/sec-policy/selinux-base-policy/metadata.xml
+++ b/sec-policy/selinux-base-policy/metadata.xml
@@ -10,6 +10,6 @@
 		There is no extra policy in this package.
 	</longdescription>
 	<use>
-		<flag name='unconfined'>Enable support for the unconfined SELinux policy module</flag>
+		<flag name="unconfined">Enable support for the unconfined SELinux policy module</flag>
 	</use>
 </pkgmetadata>

diff --git a/sec-policy/selinux-base/metadata.xml b/sec-policy/selinux-base/metadata.xml
index 9493edb..d7a6e8a 100644
--- a/sec-policy/selinux-base/metadata.xml
+++ b/sec-policy/selinux-base/metadata.xml
@@ -10,9 +10,9 @@
 		There is no extra policy in this package.
 	</longdescription>
 	<use>
-		<flag name='peer_perms'>Enable the labeled networking peer permissions (SELinux policy capability).</flag>
-		<flag name='open_perms'>Enable the open permissions for file object classes (SELinux policy capability).</flag>
-		<flag name='ubac'>Enable User Based Access Control (UBAC) in the SELinux policy</flag>
-		<flag name='unconfined'>Enable support for the unconfined SELinux module</flag>
+		<flag name="peer_perms">Enable the labeled networking peer permissions (SELinux policy capability).</flag>
+		<flag name="open_perms">Enable the open permissions for file object classes (SELinux policy capability).</flag>
+		<flag name="ubac">Enable User Based Access Control (UBAC) in the SELinux policy</flag>
+		<flag name="unconfined">Enable support for the unconfined SELinux module</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-apps/acl/metadata.xml b/sys-apps/acl/metadata.xml
index 073edc4..0b6d87b 100644
--- a/sys-apps/acl/metadata.xml
+++ b/sys-apps/acl/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='nfs'>add support for NFS acls</flag>
+	<flag name="nfs">add support for NFS acls</flag>
 </use>
 <upstream>
-	<remote-id type='cpe'>cpe:/a:xfs:acl</remote-id>
+	<remote-id type="cpe">cpe:/a:xfs:acl</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/arrayprobe/metadata.xml b/sys-apps/arrayprobe/metadata.xml
index b2d9802..f73c417 100644
--- a/sys-apps/arrayprobe/metadata.xml
+++ b/sys-apps/arrayprobe/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-apps/attr/metadata.xml b/sys-apps/attr/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/attr/metadata.xml
+++ b/sys-apps/attr/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/baselayout-prefix/metadata.xml b/sys-apps/baselayout-prefix/metadata.xml
index ab2f5b1..f2106b2 100644
--- a/sys-apps/baselayout-prefix/metadata.xml
+++ b/sys-apps/baselayout-prefix/metadata.xml
@@ -5,6 +5,6 @@
 		<email>prefix@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='prefix-chaining'>install in a chained Prefix environment</flag>
+		<flag name="prefix-chaining">install in a chained Prefix environment</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-apps/baselayout/metadata.xml b/sys-apps/baselayout/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/baselayout/metadata.xml
+++ b/sys-apps/baselayout/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/byld/metadata.xml b/sys-apps/byld/metadata.xml
index 6f8e77e..9652057 100644
--- a/sys-apps/byld/metadata.xml
+++ b/sys-apps/byld/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>byld</remote-id>
+	<remote-id type="sourceforge">byld</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/cciss_vol_status/metadata.xml b/sys-apps/cciss_vol_status/metadata.xml
index 43e3ec8..c69ecae 100644
--- a/sys-apps/cciss_vol_status/metadata.xml
+++ b/sys-apps/cciss_vol_status/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
 	<email>chainsaw@gentoo.org</email>
 </maintainer>
 <upstream>
-	<remote-id type='sourceforge'>cciss</remote-id>
+	<remote-id type="sourceforge">cciss</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/cinit/metadata.xml b/sys-apps/cinit/metadata.xml
index e96e35b..91f4e72 100644
--- a/sys-apps/cinit/metadata.xml
+++ b/sys-apps/cinit/metadata.xml
@@ -5,4 +5,3 @@
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/sys-apps/collectl/metadata.xml b/sys-apps/collectl/metadata.xml
index fc53e7e..bace822 100644
--- a/sys-apps/collectl/metadata.xml
+++ b/sys-apps/collectl/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>collectl</remote-id>
+	<remote-id type="sourceforge">collectl</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/coreutils/metadata.xml b/sys-apps/coreutils/metadata.xml
index cdf7134..b9f0e00 100644
--- a/sys-apps/coreutils/metadata.xml
+++ b/sys-apps/coreutils/metadata.xml
@@ -1,13 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='hostname'>Build the hostname program</flag>
-	<flag name='kill'>Build the kill program</flag>
-	<flag name='multicall'>Build all tools into a single `coreutils` program akin to busybox to save space</flag>
+	<flag name="hostname">Build the hostname program</flag>
+	<flag name="kill">Build the kill program</flag>
+	<flag name="multicall">Build all tools into a single `coreutils` program akin to busybox to save space</flag>
 </use>
 <upstream>
-	<remote-id type='cpe'>cpe:/a:gnu:coreutils</remote-id>
+	<remote-id type="cpe">cpe:/a:gnu:coreutils</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/cracklib-words/metadata.xml b/sys-apps/cracklib-words/metadata.xml
index 3d1bb00..9514382 100644
--- a/sys-apps/cracklib-words/metadata.xml
+++ b/sys-apps/cracklib-words/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>cracklib</remote-id>
-	<remote-id type='github'>cracklib/cracklib</remote-id>
+	<remote-id type="sourceforge">cracklib</remote-id>
+	<remote-id type="github">cracklib/cracklib</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/dbus/metadata.xml b/sys-apps/dbus/metadata.xml
index 70f327c..6562398 100644
--- a/sys-apps/dbus/metadata.xml
+++ b/sys-apps/dbus/metadata.xml
@@ -6,7 +6,7 @@
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='systemd'>Build with <pkg>sys-apps/systemd</pkg> at_console support</flag>
+		<flag name="systemd">Build with <pkg>sys-apps/systemd</pkg> at_console support</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:freedesktop:dbus</remote-id>

diff --git a/sys-apps/debianutils/metadata.xml b/sys-apps/debianutils/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/debianutils/metadata.xml
+++ b/sys-apps/debianutils/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/diffutils/metadata.xml b/sys-apps/diffutils/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/diffutils/metadata.xml
+++ b/sys-apps/diffutils/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/dmapi/metadata.xml b/sys-apps/dmapi/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/dmapi/metadata.xml
+++ b/sys-apps/dmapi/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/dmidecode/metadata.xml b/sys-apps/dmidecode/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/dmidecode/metadata.xml
+++ b/sys-apps/dmidecode/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/dnotify/metadata.xml b/sys-apps/dnotify/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/dnotify/metadata.xml
+++ b/sys-apps/dnotify/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/ed/metadata.xml b/sys-apps/ed/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/ed/metadata.xml
+++ b/sys-apps/ed/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/elfix/metadata.xml b/sys-apps/elfix/metadata.xml
index 8702450..00af802 100644
--- a/sys-apps/elfix/metadata.xml
+++ b/sys-apps/elfix/metadata.xml
@@ -7,7 +7,7 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
-		<flag name='xtpax'>Enable XATTR_PAX_FLAGS support.</flag>
-		<flag name='ptpax'>Enable PT_PAX_FLAGS support.</flag>
+		<flag name="xtpax">Enable XATTR_PAX_FLAGS support.</flag>
+		<flag name="ptpax">Enable PT_PAX_FLAGS support.</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-apps/entropy-server/metadata.xml b/sys-apps/entropy-server/metadata.xml
index 7a9ce41..30ac43e 100644
--- a/sys-apps/entropy-server/metadata.xml
+++ b/sys-apps/entropy-server/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Fabio Erculiani</name>
 	</maintainer>
 	<use>
-		<flag name='matter'>Pull in app-admin/matter</flag>
+		<flag name="matter">Pull in app-admin/matter</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/sys-apps/entropy/metadata.xml b/sys-apps/entropy/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/sys-apps/entropy/metadata.xml
+++ b/sys-apps/entropy/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/sys-apps/ethtool/metadata.xml b/sys-apps/ethtool/metadata.xml
index 2c21203..5977c7f 100644
--- a/sys-apps/ethtool/metadata.xml
+++ b/sys-apps/ethtool/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 	ethtool is a Linux utility for controlling network drivers and hardware,
 	particularly for wired Ethernet devices. It can be used to:
 		* Get identification and diagnostic information

diff --git a/sys-apps/fakeroot/metadata.xml b/sys-apps/fakeroot/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/fakeroot/metadata.xml
+++ b/sys-apps/fakeroot/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/fbset/metadata.xml b/sys-apps/fbset/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/fbset/metadata.xml
+++ b/sys-apps/fbset/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml
index a6a3666..d05cbc0 100644
--- a/sys-apps/file/metadata.xml
+++ b/sys-apps/file/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>

diff --git a/sys-apps/findutils/metadata.xml b/sys-apps/findutils/metadata.xml
index 7c26dcc..b51f27a 100644
--- a/sys-apps/findutils/metadata.xml
+++ b/sys-apps/findutils/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='cpe'>cpe:/a:gnu:findutils</remote-id>
+	<remote-id type="cpe">cpe:/a:gnu:findutils</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/firejail/metadata.xml b/sys-apps/firejail/metadata.xml
index 7198188..46539b9 100644
--- a/sys-apps/firejail/metadata.xml
+++ b/sys-apps/firejail/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-apps/fwcrv/metadata.xml b/sys-apps/fwcrv/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/fwcrv/metadata.xml
+++ b/sys-apps/fwcrv/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/gawk/metadata.xml b/sys-apps/gawk/metadata.xml
index 8136e13..e88fa58 100644
--- a/sys-apps/gawk/metadata.xml
+++ b/sys-apps/gawk/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='mpfr'>use mpfr for high precision arithmetic (-M / --bignum)</flag>
+	<flag name="mpfr">use mpfr for high precision arithmetic (-M / --bignum)</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/gentoo-functions/metadata.xml b/sys-apps/gentoo-functions/metadata.xml
index b00ac3f..39f028c 100644
--- a/sys-apps/gentoo-functions/metadata.xml
+++ b/sys-apps/gentoo-functions/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
@@ -8,11 +8,11 @@
 <maintainer>
 	<email>blueness@gentoo.org</email>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 	This package contains base shell functions which are required by
 	all Gentoo systems.
 </longdescription>
 <upstream>
-	<remote-id type='github'>gentoo/gentoo-functions</remote-id>
+	<remote-id type="github">gentoo/gentoo-functions</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/gnome-disk-utility/metadata.xml b/sys-apps/gnome-disk-utility/metadata.xml
index 7ec8ee7..35d2907 100644
--- a/sys-apps/gnome-disk-utility/metadata.xml
+++ b/sys-apps/gnome-disk-utility/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name='fat'>Include FAT16/FAT32 support
+	<flag name="fat">Include FAT16/FAT32 support
 		(<pkg>sys-fs/dosfstools</pkg>)</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/grep/metadata.xml b/sys-apps/grep/metadata.xml
index a35e93d..0343844 100644
--- a/sys-apps/grep/metadata.xml
+++ b/sys-apps/grep/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='cpe'>cpe:/a:gnu:grep</remote-id>
+	<remote-id type="cpe">cpe:/a:gnu:grep</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/groff/metadata.xml b/sys-apps/groff/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/groff/metadata.xml
+++ b/sys-apps/groff/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/gscanbus/metadata.xml b/sys-apps/gscanbus/metadata.xml
index d77a1c1..4972d3e 100644
--- a/sys-apps/gscanbus/metadata.xml
+++ b/sys-apps/gscanbus/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>gscanbus.berlios</remote-id>
+	<remote-id type="sourceforge">gscanbus.berlios</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/hbaapi/metadata.xml b/sys-apps/hbaapi/metadata.xml
index 1530e08..fd5f3b8 100644
--- a/sys-apps/hbaapi/metadata.xml
+++ b/sys-apps/hbaapi/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>hbaapi</remote-id>
+	<remote-id type="sourceforge">hbaapi</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/hdparm/metadata.xml b/sys-apps/hdparm/metadata.xml
index b95f8a6..8adcecd 100644
--- a/sys-apps/hdparm/metadata.xml
+++ b/sys-apps/hdparm/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>hdparm</remote-id>
+	<remote-id type="sourceforge">hdparm</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/heirloom-tools/metadata.xml b/sys-apps/heirloom-tools/metadata.xml
index 2c5a6b4..c594f04 100644
--- a/sys-apps/heirloom-tools/metadata.xml
+++ b/sys-apps/heirloom-tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-apps/help2man/metadata.xml b/sys-apps/help2man/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/help2man/metadata.xml
+++ b/sys-apps/help2man/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/hprofile/metadata.xml b/sys-apps/hprofile/metadata.xml
index d4d904c..b0be569 100644
--- a/sys-apps/hprofile/metadata.xml
+++ b/sys-apps/hprofile/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='github'>tokiclover/hprofile</remote-id>
+	<remote-id type="github">tokiclover/hprofile</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/hwdata-gentoo/metadata.xml b/sys-apps/hwdata-gentoo/metadata.xml
index 0138540..1ac2ea9 100644
--- a/sys-apps/hwdata-gentoo/metadata.xml
+++ b/sys-apps/hwdata-gentoo/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>livecd</herd>
 <use>
-	<flag name='binary-drivers'>Adds support for ATI/NVIDIA binary
+	<flag name="binary-drivers">Adds support for ATI/NVIDIA binary
 		drivers</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/hwids/metadata.xml b/sys-apps/hwids/metadata.xml
index ab5f996..be6e379 100644
--- a/sys-apps/hwids/metadata.xml
+++ b/sys-apps/hwids/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
@@ -12,12 +12,12 @@
 	<email>floppym@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='net'>Install the oui.txt and iab.txt databases</flag>
-	<flag name='pci'>Install the pci.ids database</flag>
-	<flag name='usb'>Install the usb.ids database</flag>
-	<flag name='udev'>Install hwdb.d rules for udev</flag>
+	<flag name="net">Install the oui.txt and iab.txt databases</flag>
+	<flag name="pci">Install the pci.ids database</flag>
+	<flag name="usb">Install the usb.ids database</flag>
+	<flag name="udev">Install hwdb.d rules for udev</flag>
 </use>
 <upstream>
-	<remote-id type='github'>gentoo/hwids</remote-id>
+	<remote-id type="github">gentoo/hwids</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/hwloc/metadata.xml b/sys-apps/hwloc/metadata.xml
index 1c247ac..fbf6b30 100644
--- a/sys-apps/hwloc/metadata.xml
+++ b/sys-apps/hwloc/metadata.xml
@@ -11,11 +11,11 @@
   hardware so as to exploit it accordingly and efficiently.
 </longdescription>
 <use>
-  <flag name='cuda'>Enable CUDA device discovery</flag>
-  <flag name='gl'>Enable GL display device discovery (NVCtrl)</flag>
-  <flag name='numa'>Add support for numa memory allocation</flag>
-  <flag name='opencl'>Enable OpenCL device discovery (AMD only)</flag>
-  <flag name='pci'>Enable PCI device discovery using libpci</flag>
-  <flag name='plugins'>Build hwloc components as plugins so that the hwloc core library does not directly depend on their dependencies (for instance the libpci library)</flag>
+  <flag name="cuda">Enable CUDA device discovery</flag>
+  <flag name="gl">Enable GL display device discovery (NVCtrl)</flag>
+  <flag name="numa">Add support for numa memory allocation</flag>
+  <flag name="opencl">Enable OpenCL device discovery (AMD only)</flag>
+  <flag name="pci">Enable PCI device discovery using libpci</flag>
+  <flag name="plugins">Build hwloc components as plugins so that the hwloc core library does not directly depend on their dependencies (for instance the libpci library)</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/ifplugd/metadata.xml b/sys-apps/ifplugd/metadata.xml
index 5b8948b..f3597af 100644
--- a/sys-apps/ifplugd/metadata.xml
+++ b/sys-apps/ifplugd/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 	Brings up/down ethernet ports automatically with cable detection
 </longdescription>
 </pkgmetadata>

diff --git a/sys-apps/input-utils/metadata.xml b/sys-apps/input-utils/metadata.xml
index 5821467..9ffb53b 100644
--- a/sys-apps/input-utils/metadata.xml
+++ b/sys-apps/input-utils/metadata.xml
@@ -16,4 +16,3 @@ list the input devices known to the kernel, show the input events that are
 received by a device, and query or modify keyboard maps.
 </longdescription>
 </pkgmetadata>
-

diff --git a/sys-apps/install-xattr/metadata.xml b/sys-apps/install-xattr/metadata.xml
index 4bb0995..8221a72 100644
--- a/sys-apps/install-xattr/metadata.xml
+++ b/sys-apps/install-xattr/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-apps/iotools/metadata.xml b/sys-apps/iotools/metadata.xml
index 8c8fbb1..570e267 100644
--- a/sys-apps/iotools/metadata.xml
+++ b/sys-apps/iotools/metadata.xml
@@ -5,6 +5,6 @@
  <email>vapier@gentoo.org</email>
 </maintainer>
 <use>
- <flag name='make-symlinks'>Generate sub-command symlinks to iotools -- note that a lot are simple like "xor"</flag>
+ <flag name="make-symlinks">Generate sub-command symlinks to iotools -- note that a lot are simple like "xor"</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
index 5d4e2b0..3a1e60d 100644
--- a/sys-apps/iproute2/metadata.xml
+++ b/sys-apps/iproute2/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='berkdb'>build programs that use berkdb (just arpd)</flag>
-	<flag name='iptables'>include support for iptables filtering</flag>
-	<flag name='minimal'>only install ip and tc programs</flag>
+	<flag name="berkdb">build programs that use berkdb (just arpd)</flag>
+	<flag name="iptables">include support for iptables filtering</flag>
+	<flag name="minimal">only install ip and tc programs</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/irqbalance/metadata.xml b/sys-apps/irqbalance/metadata.xml
index 506515c..2d6ba73 100644
--- a/sys-apps/irqbalance/metadata.xml
+++ b/sys-apps/irqbalance/metadata.xml
@@ -1,12 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='numa'>Support balancing IRQs across NUMA nodes</flag>
+	<flag name="numa">Support balancing IRQs across NUMA nodes</flag>
 </use>
 <upstream>
-	<remote-id type='google-code'>irqbalance</remote-id>
-	<remote-id type='github'>Irqbalance/irqbalance</remote-id>
+	<remote-id type="google-code">irqbalance</remote-id>
+	<remote-id type="github">Irqbalance/irqbalance</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/isapnptools/metadata.xml b/sys-apps/isapnptools/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/isapnptools/metadata.xml
+++ b/sys-apps/isapnptools/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/iucode_tool/metadata.xml b/sys-apps/iucode_tool/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/iucode_tool/metadata.xml
+++ b/sys-apps/iucode_tool/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml
index 200afaa..f862d25 100644
--- a/sys-apps/kbd/metadata.xml
+++ b/sys-apps/kbd/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='freshmeat'>kbd</remote-id>
+	<remote-id type="freshmeat">kbd</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/keyutils/metadata.xml b/sys-apps/keyutils/metadata.xml
index 36d7f8d..115f26a 100644
--- a/sys-apps/keyutils/metadata.xml
+++ b/sys-apps/keyutils/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-apps/kmod/metadata.xml b/sys-apps/kmod/metadata.xml
index 98fac0d..879bcfc 100644
--- a/sys-apps/kmod/metadata.xml
+++ b/sys-apps/kmod/metadata.xml
@@ -1,13 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
 	<email>udev-bugs@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='lzma'>Enable support for XZ compressed modules</flag>
-	<flag name='tools'>Install module loading/unloading tools.</flag>
-	<flag name='zlib'>Enable support for gzipped modules</flag>
+	<flag name="lzma">Enable support for XZ compressed modules</flag>
+	<flag name="tools">Install module loading/unloading tools.</flag>
+	<flag name="zlib">Enable support for gzipped modules</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/lcdsplash/metadata.xml b/sys-apps/lcdsplash/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/lcdsplash/metadata.xml
+++ b/sys-apps/lcdsplash/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/lcdtest/metadata.xml b/sys-apps/lcdtest/metadata.xml
index 9477e17..69fdf49 100644
--- a/sys-apps/lcdtest/metadata.xml
+++ b/sys-apps/lcdtest/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <herd>proxy-maintainers</herd>

diff --git a/sys-apps/lcdutils/metadata.xml b/sys-apps/lcdutils/metadata.xml
index 02914d7..391e435 100644
--- a/sys-apps/lcdutils/metadata.xml
+++ b/sys-apps/lcdutils/metadata.xml
@@ -11,4 +11,3 @@
 		Provides utilities for Cobalt Microserver systems to write to the LCD and read button input
 	</longdescription>
 </pkgmetadata>
-

diff --git a/sys-apps/less/metadata.xml b/sys-apps/less/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/less/metadata.xml
+++ b/sys-apps/less/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/logwatch/metadata.xml b/sys-apps/logwatch/metadata.xml
index e472bfe..7ece2d9 100644
--- a/sys-apps/logwatch/metadata.xml
+++ b/sys-apps/logwatch/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>logwatch</remote-id>
+	<remote-id type="sourceforge">logwatch</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/lshw/metadata.xml b/sys-apps/lshw/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/lshw/metadata.xml
+++ b/sys-apps/lshw/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/magneto-core/metadata.xml b/sys-apps/magneto-core/metadata.xml
index 54af5bb..084e4ee 100644
--- a/sys-apps/magneto-core/metadata.xml
+++ b/sys-apps/magneto-core/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Fabio Erculiani</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/sys-apps/makedev/metadata.xml b/sys-apps/makedev/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/makedev/metadata.xml
+++ b/sys-apps/makedev/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/man-db/metadata.xml b/sys-apps/man-db/metadata.xml
index 8f8f5c9..77ec25b 100644
--- a/sys-apps/man-db/metadata.xml
+++ b/sys-apps/man-db/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='manpager'>Enable manpager wrapper for colorizing output</flag>
+	<flag name="manpager">Enable manpager wrapper for colorizing output</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/man-pages-posix/metadata.xml b/sys-apps/man-pages-posix/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/man-pages-posix/metadata.xml
+++ b/sys-apps/man-pages-posix/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/man-pages/metadata.xml b/sys-apps/man-pages/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/man-pages/metadata.xml
+++ b/sys-apps/man-pages/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/man/metadata.xml b/sys-apps/man/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/man/metadata.xml
+++ b/sys-apps/man/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/mawk/metadata.xml b/sys-apps/mawk/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/mawk/metadata.xml
+++ b/sys-apps/mawk/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/memtest86+/metadata.xml b/sys-apps/memtest86+/metadata.xml
index 551e3ce..b7d0c5d 100644
--- a/sys-apps/memtest86+/metadata.xml
+++ b/sys-apps/memtest86+/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='serial'>Compile with serial console support</flag>
-	<flag name='floppy'>Install a script to create floppy disks containing memtest86+ binaries.</flag>
+	<flag name="serial">Compile with serial console support</flag>
+	<flag name="floppy">Install a script to create floppy disks containing memtest86+ binaries.</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/memtest86/metadata.xml b/sys-apps/memtest86/metadata.xml
index 97af1f5..501bf34 100644
--- a/sys-apps/memtest86/metadata.xml
+++ b/sys-apps/memtest86/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='serial'>Compile with serial console support</flag>
+	<flag name="serial">Compile with serial console support</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/memtester/metadata.xml b/sys-apps/memtester/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/memtester/metadata.xml
+++ b/sys-apps/memtester/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/microcode-ctl/metadata.xml b/sys-apps/microcode-ctl/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/microcode-ctl/metadata.xml
+++ b/sys-apps/microcode-ctl/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/microcode-data/metadata.xml b/sys-apps/microcode-data/metadata.xml
index e44fc55..31da8f5 100644
--- a/sys-apps/microcode-data/metadata.xml
+++ b/sys-apps/microcode-data/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='initramfs'>install a small initramfs for use with CONFIG_MICROCODE_EARLY</flag>
-	<flag name='monolithic'>install the large text microcode.dat (used by older kernels via microcode_ctl)</flag>
-	<flag name='split-ucode'>install the split binary ucode files (used by the kernel directly)</flag>
+	<flag name="initramfs">install a small initramfs for use with CONFIG_MICROCODE_EARLY</flag>
+	<flag name="monolithic">install the large text microcode.dat (used by older kernels via microcode_ctl)</flag>
+	<flag name="split-ucode">install the split binary ucode files (used by the kernel directly)</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/minised/metadata.xml b/sys-apps/minised/metadata.xml
index 79a14fa..80f59b5 100644
--- a/sys-apps/minised/metadata.xml
+++ b/sys-apps/minised/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>embedded</herd>
 <herd>base-system</herd>

diff --git a/sys-apps/miscfiles/metadata.xml b/sys-apps/miscfiles/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/miscfiles/metadata.xml
+++ b/sys-apps/miscfiles/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/mlocate/metadata.xml b/sys-apps/mlocate/metadata.xml
index 0238058..a6e25f0 100644
--- a/sys-apps/mlocate/metadata.xml
+++ b/sys-apps/mlocate/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-apps/modutils/metadata.xml b/sys-apps/modutils/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/modutils/metadata.xml
+++ b/sys-apps/modutils/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/moreutils/metadata.xml b/sys-apps/moreutils/metadata.xml
index c788db5..60bdaf8 100644
--- a/sys-apps/moreutils/metadata.xml
+++ b/sys-apps/moreutils/metadata.xml
@@ -10,6 +10,6 @@
 	<name>Tim Harder</name>
 </maintainer>
 <use>
-	<flag name='perl'>Install scripts written in Perl</flag>
+	<flag name="perl">Install scripts written in Perl</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/mtree/metadata.xml b/sys-apps/mtree/metadata.xml
index 2ba8491..8823935 100644
--- a/sys-apps/mtree/metadata.xml
+++ b/sys-apps/mtree/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='github'>archiecobbs/mtree-port</remote-id>
+	<remote-id type="github">archiecobbs/mtree-port</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/nawk/metadata.xml b/sys-apps/nawk/metadata.xml
index c7d905c..1db5b5c 100644
--- a/sys-apps/nawk/metadata.xml
+++ b/sys-apps/nawk/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-apps/net-tools/metadata.xml b/sys-apps/net-tools/metadata.xml
index 8ba2926..870f1d0 100644
--- a/sys-apps/net-tools/metadata.xml
+++ b/sys-apps/net-tools/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='arp'>build the arp and rarp tools (for manipulating the ARP cache)</flag>
-	<flag name='hostname'>build the hostname and dnsdomainname tools</flag>
-	<flag name='old-output'>use old ifconfig output style (useful for when new output breaks scripts)</flag>
-	<flag name='plipconfig'>build the plipconfig tool (for working with old PLIP hardware)</flag>
-	<flag name='slattach'>build the slattach tool (for working with old serial ports)</flag>
+	<flag name="arp">build the arp and rarp tools (for manipulating the ARP cache)</flag>
+	<flag name="hostname">build the hostname and dnsdomainname tools</flag>
+	<flag name="old-output">use old ifconfig output style (useful for when new output breaks scripts)</flag>
+	<flag name="plipconfig">build the plipconfig tool (for working with old PLIP hardware)</flag>
+	<flag name="slattach">build the slattach tool (for working with old serial ports)</flag>
 </use>
 <upstream>
-	<remote-id type='sourceforge'>net-tools</remote-id>
+	<remote-id type="sourceforge">net-tools</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/netboot-base/metadata.xml b/sys-apps/netboot-base/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/netboot-base/metadata.xml
+++ b/sys-apps/netboot-base/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/netkit-base/metadata.xml b/sys-apps/netkit-base/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/netkit-base/metadata.xml
+++ b/sys-apps/netkit-base/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/openrc/metadata.xml b/sys-apps/openrc/metadata.xml
index a146c17..fd42ddb 100644
--- a/sys-apps/openrc/metadata.xml
+++ b/sys-apps/openrc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>openrc</herd>

diff --git a/sys-apps/paludis/metadata.xml b/sys-apps/paludis/metadata.xml
index 8c4fd0d..d606948 100644
--- a/sys-apps/paludis/metadata.xml
+++ b/sys-apps/paludis/metadata.xml
@@ -13,9 +13,9 @@
     <flag name="pbins">Enable binary package support. Adds dependency upon
           <pkg>app-arch/libarchive</pkg></flag>
     <flag name="pink">Use a less boring colourscheme than the default</flag>
-    <flag name='search-index'>Enable cave search --index. Requires
+    <flag name="search-index">Enable cave search --index. Requires
           <pkg>dev-db/sqlite</pkg>.</flag>
-    <flag name='xml'>Build xml things for metadata.xml and GLSA support
+    <flag name="xml">Build xml things for metadata.xml and GLSA support
           (needs <pkg>dev-libs/libxml2</pkg>).</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-apps/pciutils/metadata.xml b/sys-apps/pciutils/metadata.xml
index 4e85ba8..b1fff3c 100644
--- a/sys-apps/pciutils/metadata.xml
+++ b/sys-apps/pciutils/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='dns'>Enable support for querying the central database of PCI IDs using DNS</flag>
-	<flag name='kmod'>Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
-	<flag name='zlib'>Support compressed pci.ids database</flag>
+	<flag name="dns">Enable support for querying the central database of PCI IDs using DNS</flag>
+	<flag name="kmod">Enable <pkg>sys-apps/kmod</pkg> support for the -k switch in lspci command</flag>
+	<flag name="zlib">Support compressed pci.ids database</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/pcmciautils/metadata.xml b/sys-apps/pcmciautils/metadata.xml
index eb1b6a8..8d780b7 100644
--- a/sys-apps/pcmciautils/metadata.xml
+++ b/sys-apps/pcmciautils/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 <use>
-	<flag name='staticsocket'>Add support for static sockets</flag>
+	<flag name="staticsocket">Add support for static sockets</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml
index d4fe6b8..b7272f7 100644
--- a/sys-apps/pcsc-lite/metadata.xml
+++ b/sys-apps/pcsc-lite/metadata.xml
@@ -7,21 +7,21 @@
   </longdescription>
 
   <use>
-    <flag name='libusb' restrict="&gt;=sys-apps/pcsc-lite-1.8.0">
+    <flag name="libusb" restrict="&gt;=sys-apps/pcsc-lite-1.8.0">
       Use <pkg>dev-libs/libusb</pkg> detection to hotplug new
       smartcard readers. This flag should only be enabled if you're
       running a non-Linux kernel or you don't want to use
       <pkg>sys-fs/udev</pkg>.
     </flag>
 
-    <flag name='udev'>
+    <flag name="udev">
       Use <pkg>sys-fs/udev</pkg> rules to handle devices' permissions
       and hotplug support. Unless you know what you're doing do not
       disable this flag on Linux kernels. This is provided as an
       option for completeness.
     </flag>
 
-    <flag name='policykit'>
+    <flag name="policykit">
       Uses <pkg>sys-auth/polkit</pkg> to restrict access to smartcard readers or
       smartcars to given users.
     </flag>

diff --git a/sys-apps/pcsc-tools/metadata.xml b/sys-apps/pcsc-tools/metadata.xml
index c6a0532..b36423b 100644
--- a/sys-apps/pcsc-tools/metadata.xml
+++ b/sys-apps/pcsc-tools/metadata.xml
@@ -5,6 +5,6 @@
   <longdescription>User tools for PC/SC SmartCard access (including pcsc_scan and the gscriptor GUI).</longdescription>
 
   <use>
-    <flag name='network-cron'>Monthly cronjob the update-smartcard_list script</flag>
+    <flag name="network-cron">Monthly cronjob the update-smartcard_list script</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-apps/pyrenamer/metadata.xml b/sys-apps/pyrenamer/metadata.xml
index 9ac1055..035f8af 100644
--- a/sys-apps/pyrenamer/metadata.xml
+++ b/sys-apps/pyrenamer/metadata.xml
@@ -6,6 +6,6 @@
 	<name>Markos Chandras</name>
 </maintainer>
 	<use>
-		<flag name='music'>Enable support for renaming music</flag>
+		<flag name="music">Enable support for renaming music</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-apps/qdiskusage/metadata.xml b/sys-apps/qdiskusage/metadata.xml
index 1d78188..76975b5 100644
--- a/sys-apps/qdiskusage/metadata.xml
+++ b/sys-apps/qdiskusage/metadata.xml
@@ -5,4 +5,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/sys-apps/qingy/metadata.xml b/sys-apps/qingy/metadata.xml
index dc41c4f..9a95f04 100644
--- a/sys-apps/qingy/metadata.xml
+++ b/sys-apps/qingy/metadata.xml
@@ -1,12 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='consolekit'>Enable native consolekit support</flag>
-	<flag name='opensslcrypt'>Encrypt communications between qingy and its GUI using <pkg>dev-libs/openssl</pkg></flag>
+	<flag name="consolekit">Enable native consolekit support</flag>
+	<flag name="opensslcrypt">Encrypt communications between qingy and its GUI using <pkg>dev-libs/openssl</pkg></flag>
 </use>
 <upstream>
-	<remote-id type='sourceforge'>qingy</remote-id>
+	<remote-id type="sourceforge">qingy</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/raidutils/metadata.xml b/sys-apps/raidutils/metadata.xml
index a05cc35..95b12ff 100644
--- a/sys-apps/raidutils/metadata.xml
+++ b/sys-apps/raidutils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/sys-apps/razercfg/metadata.xml b/sys-apps/razercfg/metadata.xml
index 98006ec..6147ada 100644
--- a/sys-apps/razercfg/metadata.xml
+++ b/sys-apps/razercfg/metadata.xml
@@ -15,8 +15,8 @@ commandline tool; and "qrazercfg", a QT4 based graphical device configuration
 tool.
 </longdescription>
 <use>
-	<flag name='pm-utils'>Installs the pm-utils hooks for suspend/resume and
+	<flag name="pm-utils">Installs the pm-utils hooks for suspend/resume and
 		requires <pkg>sys-power/pm-utils</pkg></flag>
-	<flag name='qt4'>Installs a qt UI. Requires <pkg>dev-python/pyside</pkg></flag>
+	<flag name="qt4">Installs a qt UI. Requires <pkg>dev-python/pyside</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/readahead-list/metadata.xml b/sys-apps/readahead-list/metadata.xml
index 1887e6f..b314bee 100644
--- a/sys-apps/readahead-list/metadata.xml
+++ b/sys-apps/readahead-list/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-apps/rename/metadata.xml b/sys-apps/rename/metadata.xml
index 43a7af5..a3f7d00 100644
--- a/sys-apps/rename/metadata.xml
+++ b/sys-apps/rename/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>rename</remote-id>
+	<remote-id type="sourceforge">rename</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/rescan-scsi-bus/metadata.xml b/sys-apps/rescan-scsi-bus/metadata.xml
index 36d7f8d..115f26a 100644
--- a/sys-apps/rescan-scsi-bus/metadata.xml
+++ b/sys-apps/rescan-scsi-bus/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-apps/rigo-daemon/metadata.xml b/sys-apps/rigo-daemon/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/sys-apps/rigo-daemon/metadata.xml
+++ b/sys-apps/rigo-daemon/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/sys-apps/rng-tools/metadata.xml b/sys-apps/rng-tools/metadata.xml
index 79e3319..5119823 100644
--- a/sys-apps/rng-tools/metadata.xml
+++ b/sys-apps/rng-tools/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <herd>proxy-maintainers</herd>
@@ -12,6 +12,6 @@
 	<description>Proxy maintainer, CC him on bugs.</description>
 </maintainer>
 <upstream>
-	<remote-id type='sourceforge'>gkernel</remote-id>
+	<remote-id type="sourceforge">gkernel</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/sdparm/metadata.xml b/sys-apps/sdparm/metadata.xml
index c98623d..a9c5573 100644
--- a/sys-apps/sdparm/metadata.xml
+++ b/sys-apps/sdparm/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 	Utility to output and modify parameters on a SCSI device, like hdparm.
 </longdescription>
 </pkgmetadata>

diff --git a/sys-apps/sed/metadata.xml b/sys-apps/sed/metadata.xml
index 4289897..2dbbb3b 100644
--- a/sys-apps/sed/metadata.xml
+++ b/sys-apps/sed/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>sed</remote-id>
+	<remote-id type="sourceforge">sed</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/setserial/metadata.xml b/sys-apps/setserial/metadata.xml
index 0685d1c..0ad0b26 100644
--- a/sys-apps/setserial/metadata.xml
+++ b/sys-apps/setserial/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>setserial</remote-id>
+	<remote-id type="sourceforge">setserial</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/sg3_utils/metadata.xml b/sys-apps/sg3_utils/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/sg3_utils/metadata.xml
+++ b/sys-apps/sg3_utils/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/shadow/metadata.xml b/sys-apps/shadow/metadata.xml
index bfa4890..aed121a 100644
--- a/sys-apps/shadow/metadata.xml
+++ b/sys-apps/shadow/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <herd>pam</herd> <!-- only for USE=pam -->
 <upstream>
-	<remote-id type='cpe'>cpe:/a:debian:shadow</remote-id>
+	<remote-id type="cpe">cpe:/a:debian:shadow</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml
index 4243bf9..451606b 100644
--- a/sys-apps/smartmontools/metadata.xml
+++ b/sys-apps/smartmontools/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='minimal'>Do not install the monitoring daemon and associated scripts.</flag>
+	<flag name="minimal">Do not install the monitoring daemon and associated scripts.</flag>
 </use>
 <upstream>
-	<remote-id type='sourceforge'>smartmontools</remote-id>
+	<remote-id type="sourceforge">smartmontools</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/syscriptor/metadata.xml b/sys-apps/syscriptor/metadata.xml
index 40dd6af..66d681f 100644
--- a/sys-apps/syscriptor/metadata.xml
+++ b/sys-apps/syscriptor/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>syscriptor</remote-id>
+	<remote-id type="sourceforge">syscriptor</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/syslog-notify/metadata.xml b/sys-apps/syslog-notify/metadata.xml
index 5e3a61a..77bb27a 100644
--- a/sys-apps/syslog-notify/metadata.xml
+++ b/sys-apps/syslog-notify/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/sysvinit/metadata.xml
+++ b/sys-apps/sysvinit/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/tcp-wrappers/metadata.xml b/sys-apps/tcp-wrappers/metadata.xml
index cd9cfcc..354c390 100644
--- a/sys-apps/tcp-wrappers/metadata.xml
+++ b/sys-apps/tcp-wrappers/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='netgroups'>
+	<flag name="netgroups">
 		Support matching NIS (host) netgroup names via the @netgroup syntax
 		(if you don't know what this means, you most likely do not need it)
 	</flag>

diff --git a/sys-apps/texinfo/metadata.xml b/sys-apps/texinfo/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/texinfo/metadata.xml
+++ b/sys-apps/texinfo/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/timer_entropyd/metadata.xml b/sys-apps/timer_entropyd/metadata.xml
index 8470912..4886a60 100644
--- a/sys-apps/timer_entropyd/metadata.xml
+++ b/sys-apps/timer_entropyd/metadata.xml
@@ -10,6 +10,6 @@
     <email>flameeyes@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='debug'>Enable printf debugging and logging to the syslog at DEBUG level</flag>
+    <flag name="debug">Enable printf debugging and logging to the syslog at DEBUG level</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-apps/tuxonice-userui/metadata.xml b/sys-apps/tuxonice-userui/metadata.xml
index 5fdec1d..5f216ff 100644
--- a/sys-apps/tuxonice-userui/metadata.xml
+++ b/sys-apps/tuxonice-userui/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<herd>proxy-maintainers</herd>
 	<use>
-		<flag name='fbsplash'>Add support for framebuffer splash</flag>
+		<flag name="fbsplash">Add support for framebuffer splash</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-apps/ucspi-proxy/metadata.xml b/sys-apps/ucspi-proxy/metadata.xml
index f2d8f19..2b14dbd 100644
--- a/sys-apps/ucspi-proxy/metadata.xml
+++ b/sys-apps/ucspi-proxy/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 This package contains a proxy program that passes data back and forth
 between two connections set up by a UCSPI server and a UCSPI client.
 </longdescription>

diff --git a/sys-apps/ucspi-unix/metadata.xml b/sys-apps/ucspi-unix/metadata.xml
index 590ac8f..ada679e 100644
--- a/sys-apps/ucspi-unix/metadata.xml
+++ b/sys-apps/ucspi-unix/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 This package contains UNIX domain socket client and server programs that
 conform to UCSPI, the UNIX Client-Server Program Interface.
 </longdescription>

diff --git a/sys-apps/ultracopier/metadata.xml b/sys-apps/ultracopier/metadata.xml
index e8b6c80..0f4d275 100644
--- a/sys-apps/ultracopier/metadata.xml
+++ b/sys-apps/ultracopier/metadata.xml
@@ -7,4 +7,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/sys-apps/usb_modeswitch/metadata.xml b/sys-apps/usb_modeswitch/metadata.xml
index 0104876..af365e2 100644
--- a/sys-apps/usb_modeswitch/metadata.xml
+++ b/sys-apps/usb_modeswitch/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>freedesktop</herd>
   <use>
-    <flag name='jimtcl'>Use <pkg>dev-lang/jimtcl</pkg> instead of <pkg>dev-lang/tcl</pkg> for smaller memory footprint</flag>
+    <flag name="jimtcl">Use <pkg>dev-lang/jimtcl</pkg> instead of <pkg>dev-lang/tcl</pkg> for smaller memory footprint</flag>
   </use>
   <maintainer>
     <email>rafaelmartins@gentoo.org</email>

diff --git a/sys-apps/usbredir/metadata.xml b/sys-apps/usbredir/metadata.xml
index 7b3b205..87124c2 100644
--- a/sys-apps/usbredir/metadata.xml
+++ b/sys-apps/usbredir/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <herd>qemu</herd>

diff --git a/sys-apps/usbutils/metadata.xml b/sys-apps/usbutils/metadata.xml
index b600503..c781cc1 100644
--- a/sys-apps/usbutils/metadata.xml
+++ b/sys-apps/usbutils/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>linux-usb</remote-id>
+	<remote-id type="sourceforge">linux-usb</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/usermode-utilities/metadata.xml b/sys-apps/usermode-utilities/metadata.xml
index e6117fe..94b9a43 100644
--- a/sys-apps/usermode-utilities/metadata.xml
+++ b/sys-apps/usermode-utilities/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-apps/utempter/metadata.xml b/sys-apps/utempter/metadata.xml
index 12f6cb3..23c2cea 100644
--- a/sys-apps/utempter/metadata.xml
+++ b/sys-apps/utempter/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <herd>x11</herd>

diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index cdf5dc7..bb39138 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -1,21 +1,21 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='caps'>build setpriv helper (run programs with diff capabilities)</flag>
-	<flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag>
-	<flag name='cytune'>build cytune for Cyclades-Z multiport serial cards</flag>
-	<flag name='fdformat'>build fdformat (floppy disk format)</flag>
-	<flag name='kill'>build the kill program</flag>
-	<flag name='pam'>build runuser helper</flag>
-	<flag name='suid'>
+	<flag name="caps">build setpriv helper (run programs with diff capabilities)</flag>
+	<flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag>
+	<flag name="cytune">build cytune for Cyclades-Z multiport serial cards</flag>
+	<flag name="fdformat">build fdformat (floppy disk format)</flag>
+	<flag name="kill">build the kill program</flag>
+	<flag name="pam">build runuser helper</flag>
+	<flag name="suid">
 		install mount/umount as setuid so non-root users may mount/umount devices,
 		and wall/write as setgid so non-root users can notify other users
 	</flag>
-	<flag name='tty-helpers'>install the mesg/wall/write tools for talking to local users</flag>
+	<flag name="tty-helpers">install the mesg/wall/write tools for talking to local users</flag>
 </use>
 <upstream>
-	<remote-id type='cpe'>cpe:/a:andries_brouwer:util-linux</remote-id>
+	<remote-id type="cpe">cpe:/a:andries_brouwer:util-linux</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/v86d/metadata.xml b/sys-apps/v86d/metadata.xml
index 9c1506a..12b8ec3 100644
--- a/sys-apps/v86d/metadata.xml
+++ b/sys-apps/v86d/metadata.xml
@@ -5,6 +5,6 @@
 	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='x86emu'>Use x86emu for Video BIOS calls</flag>
+	<flag name="x86emu">Use x86emu for Video BIOS calls</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-apps/watchdog/metadata.xml b/sys-apps/watchdog/metadata.xml
index fd0cd20..01cea5d 100644
--- a/sys-apps/watchdog/metadata.xml
+++ b/sys-apps/watchdog/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='nfs'>enable support for checking nfs mounts</flag>
+	<flag name="nfs">enable support for checking nfs mounts</flag>
 </use>
 <upstream>
-	<remote-id type='sourceforge'>watchdog</remote-id>
+	<remote-id type="sourceforge">watchdog</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-apps/which/metadata.xml b/sys-apps/which/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/which/metadata.xml
+++ b/sys-apps/which/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-apps/x86info/metadata.xml b/sys-apps/x86info/metadata.xml
index 36d7f8d..115f26a 100644
--- a/sys-apps/x86info/metadata.xml
+++ b/sys-apps/x86info/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-apps/xinetd/metadata.xml b/sys-apps/xinetd/metadata.xml
index 189b874..62a2aca 100644
--- a/sys-apps/xinetd/metadata.xml
+++ b/sys-apps/xinetd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>base-system</herd>

diff --git a/sys-apps/xmbmon/metadata.xml b/sys-apps/xmbmon/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-apps/xmbmon/metadata.xml
+++ b/sys-apps/xmbmon/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-auth/fingerprint-gui/metadata.xml b/sys-auth/fingerprint-gui/metadata.xml
index ffe2eae..3a30931 100644
--- a/sys-auth/fingerprint-gui/metadata.xml
+++ b/sys-auth/fingerprint-gui/metadata.xml
@@ -9,4 +9,3 @@
 	<flag name="upekbsapi">Add UPEK BSAPI drivers for identify functions on some readers</flag>
 </use>
 </pkgmetadata>
-

diff --git a/sys-auth/libnss-mysql/metadata.xml b/sys-auth/libnss-mysql/metadata.xml
index 6ddfcc5..ddc62a9 100644
--- a/sys-auth/libnss-mysql/metadata.xml
+++ b/sys-auth/libnss-mysql/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>mysql</herd>

diff --git a/sys-auth/oath-toolkit/metadata.xml b/sys-auth/oath-toolkit/metadata.xml
index bed671b..c09b1c0 100644
--- a/sys-auth/oath-toolkit/metadata.xml
+++ b/sys-auth/oath-toolkit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-auth/pam-script/metadata.xml b/sys-auth/pam-script/metadata.xml
index 2203c61..eb66282 100644
--- a/sys-auth/pam-script/metadata.xml
+++ b/sys-auth/pam-script/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-auth/pam_mktemp/metadata.xml b/sys-auth/pam_mktemp/metadata.xml
index d7c694d..1cafb2c 100644
--- a/sys-auth/pam_mktemp/metadata.xml
+++ b/sys-auth/pam_mktemp/metadata.xml
@@ -6,6 +6,6 @@
 <email>swegener@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='prevent-removal'>If supported, set EXT2_APPEND_FL on /tmp/.private to prevent temporary directories from being removed</flag>
+<flag name="prevent-removal">If supported, set EXT2_APPEND_FL on /tmp/.private to prevent temporary directories from being removed</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-auth/pam_radius/metadata.xml b/sys-auth/pam_radius/metadata.xml
index d8930ed..5cd8bc9 100644
--- a/sys-auth/pam_radius/metadata.xml
+++ b/sys-auth/pam_radius/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>pam</herd>

diff --git a/sys-auth/passwdqc/metadata.xml b/sys-auth/passwdqc/metadata.xml
index 501cdc0..23134a2 100644
--- a/sys-auth/passwdqc/metadata.xml
+++ b/sys-auth/passwdqc/metadata.xml
@@ -6,7 +6,7 @@
 	<email>pam-bugs@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='utils'>Install pwqcheck and pwqgen helper utilities</flag>
+	<flag name="utils">Install pwqcheck and pwqgen helper utilities</flag>
 </use>
 <longdescription>
 	Password strength checking for PAM aware password changing programs. This is an alternative to the default cracklib.

diff --git a/sys-auth/polkit/metadata.xml b/sys-auth/polkit/metadata.xml
index d553f2f..8e318bf 100644
--- a/sys-auth/polkit/metadata.xml
+++ b/sys-auth/polkit/metadata.xml
@@ -6,6 +6,6 @@
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='systemd'>Use <pkg>sys-apps/systemd</pkg> instead of <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
+		<flag name="systemd">Use <pkg>sys-apps/systemd</pkg> instead of <pkg>sys-auth/consolekit</pkg> for session tracking</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-auth/sssd/metadata.xml b/sys-auth/sssd/metadata.xml
index fb608a0..1e16afa 100644
--- a/sys-auth/sssd/metadata.xml
+++ b/sys-auth/sssd/metadata.xml
@@ -9,11 +9,11 @@
 	<flag name="acl"> Build and use the cifsidmap plugin</flag>
 	<flag name="augeas">Build internal configuration library</flag>
 	<flag name="locator">Install sssd's Kerberos plugin</flag>
-	<flag name='netlink'>Add support for netlink protocol via <pkg>dev-libs/libnl</pkg></flag>
-	<flag name='nfsv4'>Add support for the nfsv4 idmapd plugin provided by <pkg>net-libs/libnfsidmap</pkg></flag>
-	<flag name='manpages'>Build man pages with <pkg>dev-libs/libxslt</pkg></flag>
-	<flag name='autofs'>Build helper to let <pkg>net-fs/autofs</pkg> use sssd provided information</flag>
-	<flag name='ssh'>Build helper to let <pkg>net-misc/openssh</pkg> use sssd provided information</flag>
-	<flag name='sudo'>Build helper to let <pkg>app-admin/sudo</pkg> use sssd provided information</flag>
+	<flag name="netlink">Add support for netlink protocol via <pkg>dev-libs/libnl</pkg></flag>
+	<flag name="nfsv4">Add support for the nfsv4 idmapd plugin provided by <pkg>net-libs/libnfsidmap</pkg></flag>
+	<flag name="manpages">Build man pages with <pkg>dev-libs/libxslt</pkg></flag>
+	<flag name="autofs">Build helper to let <pkg>net-fs/autofs</pkg> use sssd provided information</flag>
+	<flag name="ssh">Build helper to let <pkg>net-misc/openssh</pkg> use sssd provided information</flag>
+	<flag name="sudo">Build helper to let <pkg>app-admin/sudo</pkg> use sssd provided information</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-auth/thinkfinger/metadata.xml b/sys-auth/thinkfinger/metadata.xml
index 7bfe364..b641a54 100644
--- a/sys-auth/thinkfinger/metadata.xml
+++ b/sys-auth/thinkfinger/metadata.xml
@@ -14,5 +14,5 @@
 <upstream>
 	<remote-id type="sourceforge">ThinkFinger</remote-id>
 </upstream>
-<longdescription></longdescription>
+<longdescription/>
 </pkgmetadata>

diff --git a/sys-block/aoetools/metadata.xml b/sys-block/aoetools/metadata.xml
index ab8548a..58108bc 100644
--- a/sys-block/aoetools/metadata.xml
+++ b/sys-block/aoetools/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>aoetools</remote-id>
+	<remote-id type="sourceforge">aoetools</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-block/buffer/metadata.xml b/sys-block/buffer/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-block/buffer/metadata.xml
+++ b/sys-block/buffer/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-block/di/metadata.xml b/sys-block/di/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-block/di/metadata.xml
+++ b/sys-block/di/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-block/eject/metadata.xml b/sys-block/eject/metadata.xml
index 08e54e0..4025f1e 100644
--- a/sys-block/eject/metadata.xml
+++ b/sys-block/eject/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>eject</remote-id>
+	<remote-id type="sourceforge">eject</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-block/endpoint/metadata.xml b/sys-block/endpoint/metadata.xml
index 637b63e..6cce605 100644
--- a/sys-block/endpoint/metadata.xml
+++ b/sys-block/endpoint/metadata.xml
@@ -1,12 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 	Endpoint turns a Linux machine with one or more firewire cards into an SBP-2
 	device. The advantage is that you can use any file or device the linux
 	machine supports as storage, and that multiple clients can sit on separate
 	buses so they can get the full bandwidth of the bus.
 </longdescription>
 </pkgmetadata>
-

diff --git a/sys-block/fwdl/metadata.xml b/sys-block/fwdl/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-block/fwdl/metadata.xml
+++ b/sys-block/fwdl/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-block/gpart/metadata.xml b/sys-block/gpart/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-block/gpart/metadata.xml
+++ b/sys-block/gpart/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-block/iscsitarget/metadata.xml b/sys-block/iscsitarget/metadata.xml
index a07487e..2170159 100644
--- a/sys-block/iscsitarget/metadata.xml
+++ b/sys-block/iscsitarget/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
@@ -7,6 +7,6 @@
 	<description>Primary maintainer</description>
 </maintainer>
 <upstream>
-	<remote-id type='sourceforge'>iscsitarget</remote-id>
+	<remote-id type="sourceforge">iscsitarget</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-block/mbuffer/metadata.xml b/sys-block/mbuffer/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-block/mbuffer/metadata.xml
+++ b/sys-block/mbuffer/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-block/mtx/metadata.xml b/sys-block/mtx/metadata.xml
index 7bb6fd4..982d204 100644
--- a/sys-block/mtx/metadata.xml
+++ b/sys-block/mtx/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>mtx</remote-id>
+	<remote-id type="sourceforge">mtx</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-block/nbd/metadata.xml b/sys-block/nbd/metadata.xml
index cb24ee3..3c1ceb9 100644
--- a/sys-block/nbd/metadata.xml
+++ b/sys-block/nbd/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>nbd</remote-id>
+	<remote-id type="sourceforge">nbd</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-block/noflushd/metadata.xml b/sys-block/noflushd/metadata.xml
index 27c91de..2cca6b1 100644
--- a/sys-block/noflushd/metadata.xml
+++ b/sys-block/noflushd/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>noflushd</remote-id>
+	<remote-id type="sourceforge">noflushd</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-block/open-iscsi/metadata.xml b/sys-block/open-iscsi/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-block/open-iscsi/metadata.xml
+++ b/sys-block/open-iscsi/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-block/partimage/metadata.xml b/sys-block/partimage/metadata.xml
index d0e029d..330915a 100644
--- a/sys-block/partimage/metadata.xml
+++ b/sys-block/partimage/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='nologin'>Do not include login support when connecting partimaged</flag>
+	<flag name="nologin">Do not include login support when connecting partimaged</flag>
 </use>
 <upstream>
-	<remote-id type='sourceforge'>partimage</remote-id>
+	<remote-id type="sourceforge">partimage</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-block/qla-fc-firmware/metadata.xml b/sys-block/qla-fc-firmware/metadata.xml
index a76bc01..28df89f 100644
--- a/sys-block/qla-fc-firmware/metadata.xml
+++ b/sys-block/qla-fc-firmware/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 	QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards.
 	This package contains snapshots of firmware releases from the QLogic FTP server. 
 </longdescription>

diff --git a/sys-block/rts5229/metadata.xml b/sys-block/rts5229/metadata.xml
index 6ab6ec0..05beba9 100644
--- a/sys-block/rts5229/metadata.xml
+++ b/sys-block/rts5229/metadata.xml
@@ -9,4 +9,3 @@
 		PCIE RTS5229 card reader driver for Linux.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/sys-block/rts_pstor/metadata.xml b/sys-block/rts_pstor/metadata.xml
index f7ecccc..a2d3c65 100644
--- a/sys-block/rts_pstor/metadata.xml
+++ b/sys-block/rts_pstor/metadata.xml
@@ -9,4 +9,3 @@
 		PCIE RTS5209 card reader driver for Linux.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/sys-block/smp_utils/metadata.xml b/sys-block/smp_utils/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-block/smp_utils/metadata.xml
+++ b/sys-block/smp_utils/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-block/tapecat/metadata.xml b/sys-block/tapecat/metadata.xml
index 938ef35..a1bcb6b 100644
--- a/sys-block/tapecat/metadata.xml
+++ b/sys-block/tapecat/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <herd>app-backup</herd>

diff --git a/sys-block/tgt/metadata.xml b/sys-block/tgt/metadata.xml
index 281c294..d6e2f86 100644
--- a/sys-block/tgt/metadata.xml
+++ b/sys-block/tgt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cluster</herd>

diff --git a/sys-block/thin-provisioning-tools/metadata.xml b/sys-block/thin-provisioning-tools/metadata.xml
index 705b75d..80a86e7 100644
--- a/sys-block/thin-provisioning-tools/metadata.xml
+++ b/sys-block/thin-provisioning-tools/metadata.xml
@@ -1,14 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
 	<email>robbat2@gentoo.org</email>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 A suite of tools for thin provisioning on Linux.
 </longdescription>
 <upstream>
-	<remote-id type='github'>jthornber/thin-provisioning-tools</remote-id>
+	<remote-id type="github">jthornber/thin-provisioning-tools</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-block/vblade/metadata.xml b/sys-block/vblade/metadata.xml
index ab8548a..58108bc 100644
--- a/sys-block/vblade/metadata.xml
+++ b/sys-block/vblade/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>aoetools</remote-id>
+	<remote-id type="sourceforge">aoetools</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-boot/aboot/metadata.xml b/sys-boot/aboot/metadata.xml
index 2fd316f..02243bf 100644
--- a/sys-boot/aboot/metadata.xml
+++ b/sys-boot/aboot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>alpha</herd>

diff --git a/sys-boot/arcload/metadata.xml b/sys-boot/arcload/metadata.xml
index 776ed4f..497ed4e 100644
--- a/sys-boot/arcload/metadata.xml
+++ b/sys-boot/arcload/metadata.xml
@@ -6,4 +6,3 @@
 		ARCLoad - SGI Multi-bootloader.  Able to bootload many different SGI Systems.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/sys-boot/colo/metadata.xml b/sys-boot/colo/metadata.xml
index ff9c798..5d6bc77 100644
--- a/sys-boot/colo/metadata.xml
+++ b/sys-boot/colo/metadata.xml
@@ -11,4 +11,3 @@
 		COLO is CObalt Linux lOader - a Modern Bootloader for Cobalt MIPS machines.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/sys-boot/efibootmgr/metadata.xml b/sys-boot/efibootmgr/metadata.xml
index 58f5d97..f68d59a 100644
--- a/sys-boot/efibootmgr/metadata.xml
+++ b/sys-boot/efibootmgr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-boot/getdvhoff/metadata.xml b/sys-boot/getdvhoff/metadata.xml
index cf342cc..f10ea09 100644
--- a/sys-boot/getdvhoff/metadata.xml
+++ b/sys-boot/getdvhoff/metadata.xml
@@ -11,4 +11,3 @@
 		getdvhoff - Utility for use on LiveCDs to calculate offset of the ext2 partition for losetup
 	</longdescription>
 </pkgmetadata>
-

diff --git a/sys-boot/grub/metadata.xml b/sys-boot/grub/metadata.xml
index 77314da..5bf866f 100644
--- a/sys-boot/grub/metadata.xml
+++ b/sys-boot/grub/metadata.xml
@@ -1,32 +1,32 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<maintainer restrict='&gt;=sys-boot/grub-2'>
+<maintainer restrict="&gt;=sys-boot/grub-2">
 	<email>floppym@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='device-mapper'>
+	<flag name="device-mapper">
 		Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg>
 	</flag>
-	<flag name='efiemu'>
+	<flag name="efiemu">
 		Build and install the efiemu runtimes
 	</flag>
-	<flag name='fonts'>Build and install fonts for the gfxterm module</flag>
-	<flag name='mount'>
+	<flag name="fonts">Build and install fonts for the gfxterm module</flag>
+	<flag name="mount">
 		Build and install the grub-mount utility
 	</flag>
-	<flag name='libzfs'>
+	<flag name="libzfs">
 		Enable support for <pkg>sys-fs/zfs</pkg>
 	</flag>
-	<flag name='multislot'>
+	<flag name="multislot">
 		Allow concurrent installation of <pkg>sys-boot/grub:0</pkg> and
 		<pkg>sys-boot/grub:2</pkg> by renaming all programs.
 	</flag>
-	<flag name='themes'>Build and install GRUB themes (starfield)</flag>
-	<flag name='truetype'>Build and install grub-mkfont conversion utility</flag>
+	<flag name="themes">Build and install GRUB themes (starfield)</flag>
+	<flag name="truetype">Build and install grub-mkfont conversion utility</flag>
 </use>
 <upstream>
-	<remote-id type='sourceforge'>dejavu</remote-id>
+	<remote-id type="sourceforge">dejavu</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-boot/lilo/metadata.xml b/sys-boot/lilo/metadata.xml
index 44fefae..e8bab65 100644
--- a/sys-boot/lilo/metadata.xml
+++ b/sys-boot/lilo/metadata.xml
@@ -1,13 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
 	<email>chainsaw@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='device-mapper'>Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
-	<flag name='minimal'>Do not install the dolilo helper script</flag>
-	<flag name='pxeserial'>Avoid character echo on PXE serial console</flag>
+	<flag name="device-mapper">Enable support for device-mapper from <pkg>sys-fs/lvm2</pkg></flag>
+	<flag name="minimal">Do not install the dolilo helper script</flag>
+	<flag name="pxeserial">Avoid character echo on PXE serial console</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-boot/mbr-gpt/metadata.xml b/sys-boot/mbr-gpt/metadata.xml
index 36d7f8d..115f26a 100644
--- a/sys-boot/mbr-gpt/metadata.xml
+++ b/sys-boot/mbr-gpt/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-boot/raincoat/metadata.xml b/sys-boot/raincoat/metadata.xml
index caf98de..2ee5fe3 100644
--- a/sys-boot/raincoat/metadata.xml
+++ b/sys-boot/raincoat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>xbox</herd>

diff --git a/sys-boot/sgibootcd/metadata.xml b/sys-boot/sgibootcd/metadata.xml
index cd70548..2ca8323 100644
--- a/sys-boot/sgibootcd/metadata.xml
+++ b/sys-boot/sgibootcd/metadata.xml
@@ -11,4 +11,3 @@
 		sgibootcd - Creates a burnable CD image for SGI LiveCDs
 	</longdescription>
 </pkgmetadata>
-

diff --git a/sys-boot/syslinux/metadata.xml b/sys-boot/syslinux/metadata.xml
index 356cc45..1f7983c 100644
--- a/sys-boot/syslinux/metadata.xml
+++ b/sys-boot/syslinux/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-boot/systemrescuecd-x86-grub/metadata.xml b/sys-boot/systemrescuecd-x86-grub/metadata.xml
index 5a7f238..a1e4df1 100644
--- a/sys-boot/systemrescuecd-x86-grub/metadata.xml
+++ b/sys-boot/systemrescuecd-x86-grub/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-cluster/classads/metadata.xml b/sys-cluster/classads/metadata.xml
index 4ef9419..67a96e6 100644
--- a/sys-cluster/classads/metadata.xml
+++ b/sys-cluster/classads/metadata.xml
@@ -5,7 +5,7 @@
 <maintainer>
   <email>bicatali@gentoo.org</email>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
   Classified Advertisements (classads) are the lingua franca of
   Condor. They are used for describing jobs, workstations, and other
   resources. They are exchanged by Condor processes to schedule

diff --git a/sys-cluster/drbd-utils/metadata.xml b/sys-cluster/drbd-utils/metadata.xml
index cbfbad5..5c77092 100644
--- a/sys-cluster/drbd-utils/metadata.xml
+++ b/sys-cluster/drbd-utils/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<herd>cluster</herd>
 	<use>
-  		<flag name='xen'>Enable Xen integration</flag>
-		<flag name='pacemaker'>Enable Pacemaker integration</flag>
-		<flag name='heartbeat'>Enable Heartbeat integration</flag>
+  		<flag name="xen">Enable Xen integration</flag>
+		<flag name="pacemaker">Enable Pacemaker integration</flag>
+		<flag name="heartbeat">Enable Heartbeat integration</flag>
 	</use>
 	<longdescription>
 		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts 

diff --git a/sys-cluster/drbd/metadata.xml b/sys-cluster/drbd/metadata.xml
index cbfbad5..5c77092 100644
--- a/sys-cluster/drbd/metadata.xml
+++ b/sys-cluster/drbd/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 	<herd>cluster</herd>
 	<use>
-  		<flag name='xen'>Enable Xen integration</flag>
-		<flag name='pacemaker'>Enable Pacemaker integration</flag>
-		<flag name='heartbeat'>Enable Heartbeat integration</flag>
+  		<flag name="xen">Enable Xen integration</flag>
+		<flag name="pacemaker">Enable Pacemaker integration</flag>
+		<flag name="heartbeat">Enable Heartbeat integration</flag>
 	</use>
 	<longdescription>
 		The user space tools to control, configure the DRBD driver, as well as integration programs and scripts 

diff --git a/sys-cluster/lspbs/metadata.xml b/sys-cluster/lspbs/metadata.xml
index 1bd8462..54532ab 100644
--- a/sys-cluster/lspbs/metadata.xml
+++ b/sys-cluster/lspbs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>cluster</herd>

diff --git a/sys-cluster/ocfs/metadata.xml b/sys-cluster/ocfs/metadata.xml
index 48af055..4c8ea30 100644
--- a/sys-cluster/ocfs/metadata.xml
+++ b/sys-cluster/ocfs/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>cluster</herd>
 <use>
-	<flag name='aio'>Add aio support</flag>
+	<flag name="aio">Add aio support</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-cluster/openmpi/metadata.xml b/sys-cluster/openmpi/metadata.xml
index e0d91cd..3206bdd 100644
--- a/sys-cluster/openmpi/metadata.xml
+++ b/sys-cluster/openmpi/metadata.xml
@@ -6,14 +6,14 @@
 		<email>jsbronder@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='cma'>Enable the CMA (Cross Memory Attach) MCA</flag>
-		<flag name='cuda'>Add GPU direct support</flag>
-		<flag name='heterogeneous'>Enable features required for heterogeneous
+		<flag name="cma">Enable the CMA (Cross Memory Attach) MCA</flag>
+		<flag name="cuda">Add GPU direct support</flag>
+		<flag name="heterogeneous">Enable features required for heterogeneous
 		platform support</flag>
-		<flag name='romio'>Build the ROMIO MPI-IO component</flag>
-		<flag name='mpi-threads'>Enable MPI_THREAD_MULTIPLE</flag>
-		<flag name='numa'>Enable numactl to allow binding processes to CPUs</flag>
-		<flag name='vt'>Enable bundled VampirTrace support</flag>
+		<flag name="romio">Build the ROMIO MPI-IO component</flag>
+		<flag name="mpi-threads">Enable MPI_THREAD_MULTIPLE</flag>
+		<flag name="numa">Enable numactl to allow binding processes to CPUs</flag>
+		<flag name="vt">Enable bundled VampirTrace support</flag>
 		<flag name="pbs">Add support for the Portable Batch System (PBS)</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-cluster/slurm/metadata.xml b/sys-cluster/slurm/metadata.xml
index e805a2a..eecc130 100644
--- a/sys-cluster/slurm/metadata.xml
+++ b/sys-cluster/slurm/metadata.xml
@@ -6,10 +6,10 @@
 		<email>alexxy@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='maui'>Enable maui scheduler support</flag>
-		<flag name='munge'>Enable authentication via munge</flag>
-		<flag name='multiple-slurmd'>Allow multiple slurmd to run</flag>
-		<flag name='ypbind'>Enable ypbind based auth</flag>
-		<flag name='torque'>Enable perl scripts that emulates pbs (qstat, qsub etc.)</flag>
+		<flag name="maui">Enable maui scheduler support</flag>
+		<flag name="munge">Enable authentication via munge</flag>
+		<flag name="multiple-slurmd">Allow multiple slurmd to run</flag>
+		<flag name="ypbind">Enable ypbind based auth</flag>
+		<flag name="torque">Enable perl scripts that emulates pbs (qstat, qsub etc.)</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-cluster/vzctl/metadata.xml b/sys-cluster/vzctl/metadata.xml
index 95759dc..0f3a8f8 100644
--- a/sys-cluster/vzctl/metadata.xml
+++ b/sys-cluster/vzctl/metadata.xml
@@ -8,8 +8,8 @@
 		<description>Primary maintainer, assign bugs to him</description>
 	</maintainer>
 	<use>
-		<flag name='ploop'>Add support for ploop devices via <pkg>sys-cluster/ploop</pkg></flag>
-		<flag name='vzmigrate'>Add support for container migration</flag>
+		<flag name="ploop">Add support for ploop devices via <pkg>sys-cluster/ploop</pkg></flag>
+		<flag name="vzmigrate">Add support for container migration</flag>
 	</use>
 	<upstream>
 		<maintainer status="active">

diff --git a/sys-devel/autoconf-archive/metadata.xml b/sys-devel/autoconf-archive/metadata.xml
index 63fe7b3..dbe8ae6 100644
--- a/sys-devel/autoconf-archive/metadata.xml
+++ b/sys-devel/autoconf-archive/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-devel/autoconf-wrapper/metadata.xml b/sys-devel/autoconf-wrapper/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-devel/autoconf-wrapper/metadata.xml
+++ b/sys-devel/autoconf-wrapper/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-devel/autoconf/metadata.xml b/sys-devel/autoconf/metadata.xml
index c03ef2d..266cecc 100644
--- a/sys-devel/autoconf/metadata.xml
+++ b/sys-devel/autoconf/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='multislot'>Allow for multiple versions to be installed at once</flag>
+	<flag name="multislot">Allow for multiple versions to be installed at once</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-devel/autogen/metadata.xml b/sys-devel/autogen/metadata.xml
index 8402ea8..382f96a 100644
--- a/sys-devel/autogen/metadata.xml
+++ b/sys-devel/autogen/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>toolchain</herd>
 <use>
- <flag name='libopts'>install the libopts tarball (a few packages want this for developing)</flag>
+ <flag name="libopts">install the libopts tarball (a few packages want this for developing)</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-devel/automake-wrapper/metadata.xml b/sys-devel/automake-wrapper/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-devel/automake-wrapper/metadata.xml
+++ b/sys-devel/automake-wrapper/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-devel/automake/metadata.xml b/sys-devel/automake/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-devel/automake/metadata.xml
+++ b/sys-devel/automake/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-devel/bc/metadata.xml b/sys-devel/bc/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-devel/bc/metadata.xml
+++ b/sys-devel/bc/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-devel/bin86/metadata.xml b/sys-devel/bin86/metadata.xml
index 57a0443..169096d 100644
--- a/sys-devel/bin86/metadata.xml
+++ b/sys-devel/bin86/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <!--
@@ -7,6 +7,6 @@
 	yourself, and send me (boo) a mail telling me that you've done so.
 -->
 <upstream>
-	<remote-id type='github'>lkundrak/dev86</remote-id>
+	<remote-id type="github">lkundrak/dev86</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-devel/binutils-hppa64/metadata.xml b/sys-devel/binutils-hppa64/metadata.xml
index f275792..5707572 100644
--- a/sys-devel/binutils-hppa64/metadata.xml
+++ b/sys-devel/binutils-hppa64/metadata.xml
@@ -6,7 +6,7 @@
 binutils for 64bit kernel on hppa.
 </longdescription>
 <use>
-	<flag name='multislot'>Allow for multiple versions of binutils to be emerged at once for same CTARGET</flag>
-	<flag name='multitarget'>Adds support to binutils for cross compiling (does not work with gas)</flag>
+	<flag name="multislot">Allow for multiple versions of binutils to be emerged at once for same CTARGET</flag>
+	<flag name="multitarget">Adds support to binutils for cross compiling (does not work with gas)</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-devel/binutils/metadata.xml b/sys-devel/binutils/metadata.xml
index fe53b78..3589084 100644
--- a/sys-devel/binutils/metadata.xml
+++ b/sys-devel/binutils/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>toolchain</herd>
 <use>
-<flag name='multislot'>Allow for multiple versions of binutils to be emerged at once for same CTARGET</flag>
-<flag name='multitarget'>Adds support to binutils for cross compiling (does not work with gas)</flag>
+<flag name="multislot">Allow for multiple versions of binutils to be emerged at once for same CTARGET</flag>
+<flag name="multitarget">Adds support to binutils for cross compiling (does not work with gas)</flag>
 </use>
 <upstream>
 <remote-id type="cpe">cpe:/a:gnu:binutils</remote-id>

diff --git a/sys-devel/bison/metadata.xml b/sys-devel/bison/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-devel/bison/metadata.xml
+++ b/sys-devel/bison/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-devel/cons/metadata.xml b/sys-devel/cons/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-devel/cons/metadata.xml
+++ b/sys-devel/cons/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-devel/flex/metadata.xml b/sys-devel/flex/metadata.xml
index dd48366..19a94b8 100644
--- a/sys-devel/flex/metadata.xml
+++ b/sys-devel/flex/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>flex</remote-id>
+	<remote-id type="sourceforge">flex</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-devel/gcc/metadata.xml b/sys-devel/gcc/metadata.xml
index 2e74979..cc55123 100644
--- a/sys-devel/gcc/metadata.xml
+++ b/sys-devel/gcc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>toolchain</herd>

diff --git a/sys-devel/gdb/metadata.xml b/sys-devel/gdb/metadata.xml
index 688bfcb..13175e4 100644
--- a/sys-devel/gdb/metadata.xml
+++ b/sys-devel/gdb/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
 <herd>toolchain</herd>
 <use>
- <flag name='client'>Install the main "gdb" program (most people want this)</flag>
- <flag name='lzma'>Support lzma compression in ELF debug info</flag>
- <flag name='multitarget'>Support all known targets in one gdb binary</flag>
- <flag name='python'>Enable support for the new internal scripting language, as well as extended pretty printers</flag>
- <flag name='server'>Install the "gdbserver" program (useful for embedded/remote targets)</flag>
+ <flag name="client">Install the main "gdb" program (most people want this)</flag>
+ <flag name="lzma">Support lzma compression in ELF debug info</flag>
+ <flag name="multitarget">Support all known targets in one gdb binary</flag>
+ <flag name="python">Enable support for the new internal scripting language, as well as extended pretty printers</flag>
+ <flag name="server">Install the "gdbserver" program (useful for embedded/remote targets)</flag>
 </use>
 <upstream>
  <remote-id type="cpe">cpe:/a:gnu:gdb</remote-id>

diff --git a/sys-devel/gettext/metadata.xml b/sys-devel/gettext/metadata.xml
index 2941d57..41b3658 100644
--- a/sys-devel/gettext/metadata.xml
+++ b/sys-devel/gettext/metadata.xml
@@ -1,13 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='cvs'>
+	<flag name="cvs">
 		When running `autopoint`, use cvs to store the internal development files;
 		this requires cvs at runtime, but will be faster/smaller than raw archives
 	</flag>
-	<flag name='git'>
+	<flag name="git">
 		When running `autopoint`, use git to store the internal development files;
 		this requires git at runtime, but will be faster/smaller than raw archives
 	</flag>

diff --git a/sys-devel/gnuconfig/metadata.xml b/sys-devel/gnuconfig/metadata.xml
index 6509a6c..d07918b 100644
--- a/sys-devel/gnuconfig/metadata.xml
+++ b/sys-devel/gnuconfig/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 Updated config.{sub,guess} files from upstream cvs to properly detect various system types.
 </longdescription>
 </pkgmetadata>

diff --git a/sys-devel/heirloom-devtools/metadata.xml b/sys-devel/heirloom-devtools/metadata.xml
index e54dd15..deea656 100644
--- a/sys-devel/heirloom-devtools/metadata.xml
+++ b/sys-devel/heirloom-devtools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-devel/kgcc64/metadata.xml b/sys-devel/kgcc64/metadata.xml
index b97a1e0..fdf55d4 100644
--- a/sys-devel/kgcc64/metadata.xml
+++ b/sys-devel/kgcc64/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 <herd>toolchain</herd>
 <use>
-<flag name='multislot'>Allow for SLOTs to include minor version (eg. 3.3.4 instead
+<flag name="multislot">Allow for SLOTs to include minor version (eg. 3.3.4 instead
 of just 3.3)</flag>
 <flag name="regression-test">Run the testsuite and install the results (requires FEATURES=test)</flag>
 </use>
 </pkgmetadata>
-

diff --git a/sys-devel/libtool/metadata.xml b/sys-devel/libtool/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-devel/libtool/metadata.xml
+++ b/sys-devel/libtool/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-devel/llvm/metadata.xml b/sys-devel/llvm/metadata.xml
index 53210f7..d38e6b7 100644
--- a/sys-devel/llvm/metadata.xml
+++ b/sys-devel/llvm/metadata.xml
@@ -15,14 +15,14 @@
    3. A compiler infrastructure - LLVM is also a collection of source code that implements the language and compilation strategy. The primary components of the LLVM infrastructure are a GCC-based C and C++ front-end, a link-time optimization framework with a growing set of global and interprocedural analyses and transformations, static back-ends for many popular (and some obscure) architectures, a back-end which emits portable C code, and a Just-In-Time compilers for several architectures.
    4. LLVM does not imply things that you would expect from a high-level virtual machine. It does not require garbage collection or run-time code generation (In fact, LLVM makes a great static compiler!). Note that optional LLVM components can be used to build high-level virtual machines and other systems that need these services.</longdescription>
 	<use>
-		<flag name='clang'>Build the clang C/C++ compiler</flag>
-		<flag name='cmake'>Enable cmake support (experimental)</flag>
-		<flag name='doc'>Build and install the HTML documentation and regenerate the man pages</flag>
-		<flag name='gold'>Build the gold linker plugin</flag>
-		<flag name='lldb'>Build the lldb debugger</flag>
-		<flag name='multitarget'>Build all host targets (default: host only)</flag>
-		<flag name='ncurses'>Support querying terminal properties using ncurses' terminfo</flag>
-		<flag name='static-analyzer'>Install the Clang static analyzer (requires USE=clang)</flag>
-		<flag name='udis86'>Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag>
+		<flag name="clang">Build the clang C/C++ compiler</flag>
+		<flag name="cmake">Enable cmake support (experimental)</flag>
+		<flag name="doc">Build and install the HTML documentation and regenerate the man pages</flag>
+		<flag name="gold">Build the gold linker plugin</flag>
+		<flag name="lldb">Build the lldb debugger</flag>
+		<flag name="multitarget">Build all host targets (default: host only)</flag>
+		<flag name="ncurses">Support querying terminal properties using ncurses' terminfo</flag>
+		<flag name="static-analyzer">Install the Clang static analyzer (requires USE=clang)</flag>
+		<flag name="udis86">Enable support for <pkg>dev-libs/udis86</pkg> disassembler library</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-devel/m4/metadata.xml b/sys-devel/m4/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-devel/m4/metadata.xml
+++ b/sys-devel/m4/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-devel/make/metadata.xml b/sys-devel/make/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-devel/make/metadata.xml
+++ b/sys-devel/make/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-devel/patch/metadata.xml b/sys-devel/patch/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-devel/patch/metadata.xml
+++ b/sys-devel/patch/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-devel/remake/metadata.xml b/sys-devel/remake/metadata.xml
index cbcda7a..40a2d8a 100644
--- a/sys-devel/remake/metadata.xml
+++ b/sys-devel/remake/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>bashdb</remote-id>
+	<remote-id type="sourceforge">bashdb</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-devel/smatch/metadata.xml b/sys-devel/smatch/metadata.xml
index 00d57fa..1ac6ac5 100644
--- a/sys-devel/smatch/metadata.xml
+++ b/sys-devel/smatch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kernel-misc</herd>

diff --git a/sys-devel/sparse/metadata.xml b/sys-devel/sparse/metadata.xml
index 8dcee38..acfc7ff 100644
--- a/sys-devel/sparse/metadata.xml
+++ b/sys-devel/sparse/metadata.xml
@@ -4,12 +4,12 @@
   <herd>kernel-misc</herd>
   <herd>toolchain</herd>
   <use>
-    <flag name='gtk'>
+    <flag name="gtk">
       Build the test-inspect utility (requires
       <pkg>x11-libs/gtk+</pkg> version 2)
     </flag>
-	<flag name='llvm'>Build the sparse-llvm utility</flag>
-    <flag name='xml'>
+	<flag name="llvm">Build the sparse-llvm utility</flag>
+    <flag name="xml">
       Build the c2xml utility (requires <pkg>dev-libs/libxml2</pkg>).
     </flag>
   </use>

diff --git a/sys-firmware/b43-firmware/metadata.xml b/sys-firmware/b43-firmware/metadata.xml
index 5fcbf8e..4b6b681 100644
--- a/sys-firmware/b43-firmware/metadata.xml
+++ b/sys-firmware/b43-firmware/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/sys-firmware/b43legacy-firmware/metadata.xml b/sys-firmware/b43legacy-firmware/metadata.xml
index 5fcbf8e..4b6b681 100644
--- a/sys-firmware/b43legacy-firmware/metadata.xml
+++ b/sys-firmware/b43legacy-firmware/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/sys-firmware/bluez-firmware/metadata.xml b/sys-firmware/bluez-firmware/metadata.xml
index cdc20a7..b385da8 100644
--- a/sys-firmware/bluez-firmware/metadata.xml
+++ b/sys-firmware/bluez-firmware/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-firmware/ipw2100-firmware/metadata.xml b/sys-firmware/ipw2100-firmware/metadata.xml
index cf90d7b..0bb0e15 100644
--- a/sys-firmware/ipw2100-firmware/metadata.xml
+++ b/sys-firmware/ipw2100-firmware/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-firmware/ipw2200-firmware/metadata.xml b/sys-firmware/ipw2200-firmware/metadata.xml
index 33d6ef0..76add1e 100644
--- a/sys-firmware/ipw2200-firmware/metadata.xml
+++ b/sys-firmware/ipw2200-firmware/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-firmware/ipxe/metadata.xml b/sys-firmware/ipxe/metadata.xml
index 0e634e2..fefbe45 100644
--- a/sys-firmware/ipxe/metadata.xml
+++ b/sys-firmware/ipxe/metadata.xml
@@ -6,12 +6,12 @@
 <name>Doug Goldstein</name>
 </maintainer>
 <use>
-	<flag name='iso'>Build a bootable ISO for using PXE</flag>
-	<flag name='lkrn'>Build a linux kernel bootable file for using with grub/etc...</flag>
-	<flag name='usb'>Build a bootable USB image for using PXE</flag>
-	<flag name='undi'>Build a Universal Network Device Interface driver
+	<flag name="iso">Build a bootable ISO for using PXE</flag>
+	<flag name="lkrn">Build a linux kernel bootable file for using with grub/etc...</flag>
+	<flag name="usb">Build a bootable USB image for using PXE</flag>
+	<flag name="undi">Build a Universal Network Device Interface driver
 		chainloading your existing PXE NIC into iPXE</flag>
-	<flag name='qemu'>Build the required PXE ROM images for <pkg>app-emulation/qemu</pkg> and <pkg>app-emulation/qemu-kvm</pkg></flag>
-	<flag name='vmware'>Build the PXE ROM images that VMWare uses</flag>
+	<flag name="qemu">Build the required PXE ROM images for <pkg>app-emulation/qemu</pkg> and <pkg>app-emulation/qemu-kvm</pkg></flag>
+	<flag name="vmware">Build the PXE ROM images that VMWare uses</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml b/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml
index ebddf58..82df239 100644
--- a/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml
+++ b/sys-firmware/iwl3160-7260-bt-ucode/metadata.xml
@@ -7,7 +7,7 @@
     please consider bumping sys-firmware/iwl3160-ucode and 
     sys-firmware/iwl7260-ucode as well.</description>
   </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 Firmware for Intel (R) Wireless 3160, 7260, 7265 Bluetooth.
 </longdescription>
 </pkgmetadata>

diff --git a/sys-firmware/seabios/metadata.xml b/sys-firmware/seabios/metadata.xml
index 9da40e6..0c7c585 100644
--- a/sys-firmware/seabios/metadata.xml
+++ b/sys-firmware/seabios/metadata.xml
@@ -8,8 +8,7 @@
 		<name>Doug Goldstein</name>
 	</maintainer>
 	<use>
-		<flag name='binary'>Use official upstream pre-built binaries</flag>
-		<flag name='seavgabios'>Include SeaVGABIOS binaries (replacement for vgabios)</flag>
+		<flag name="binary">Use official upstream pre-built binaries</flag>
+		<flag name="seavgabios">Include SeaVGABIOS binaries (replacement for vgabios)</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/sys-firmware/sgabios/metadata.xml b/sys-firmware/sgabios/metadata.xml
index c2e3412..ab3fa2a 100644
--- a/sys-firmware/sgabios/metadata.xml
+++ b/sys-firmware/sgabios/metadata.xml
@@ -7,4 +7,3 @@
 	</maintainer>
 	<herd>qemu</herd>
 </pkgmetadata>
-

diff --git a/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml b/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml
index fa2c363..2f1e0cd 100644
--- a/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml
+++ b/sys-firmware/sigrok-firmware-fx2lafw/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>dev-embedded</herd>
 <use>
- <flag name='binary'>Use official upstream pre-built binaries</flag>
+ <flag name="binary">Use official upstream pre-built binaries</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-firmware/vgabios/metadata.xml b/sys-firmware/vgabios/metadata.xml
index 5ff1b92..c15323f 100644
--- a/sys-firmware/vgabios/metadata.xml
+++ b/sys-firmware/vgabios/metadata.xml
@@ -7,6 +7,6 @@
 	</maintainer>
 	<herd>qemu</herd>
 	<use>
-		<flag name='binary'>Use official upstream pre-built binaries (only default and cirrus images)</flag>
+		<flag name="binary">Use official upstream pre-built binaries (only default and cirrus images)</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-freebsd/boot0/metadata.xml b/sys-freebsd/boot0/metadata.xml
index 42e7fdc..3c2bff9 100644
--- a/sys-freebsd/boot0/metadata.xml
+++ b/sys-freebsd/boot0/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>bsd</herd>
   <use>
-    <flag name='tftp'>Enable PXE/TFTP boot support.</flag>
-    <flag name='zfs'>Enable booting on ZFS filesystems.</flag>
+    <flag name="tftp">Enable PXE/TFTP boot support.</flag>
+    <flag name="zfs">Enable booting on ZFS filesystems.</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-freebsd/freebsd-lib/metadata.xml b/sys-freebsd/freebsd-lib/metadata.xml
index db852e6..a8bb745 100644
--- a/sys-freebsd/freebsd-lib/metadata.xml
+++ b/sys-freebsd/freebsd-lib/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
   <herd>bsd</herd>
   <use>
-    <flag name='hesiod'>Enable support for net-dns/hesiod</flag>
-    <flag name='netware'>
+    <flag name="hesiod">Enable support for net-dns/hesiod</flag>
+    <flag name="netware">
       Build libraries and tools to work with NetWare protocols (IPX
       and NCP).
     </flag>
-    <flag name='zfs'>Enable ZFS support.</flag>
+    <flag name="zfs">Enable ZFS support.</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-freebsd/freebsd-rescue/metadata.xml b/sys-freebsd/freebsd-rescue/metadata.xml
index 853f9f1..d292982 100644
--- a/sys-freebsd/freebsd-rescue/metadata.xml
+++ b/sys-freebsd/freebsd-rescue/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>bsd</herd>
   <use>
-    <flag name='zfs'>Enable ZFS support.</flag>
-    <flag name='netware'> Build tools to work with NetWare protocols (IPX and NCP).</flag>
+    <flag name="zfs">Enable ZFS support.</flag>
+    <flag name="netware"> Build tools to work with NetWare protocols (IPX and NCP).</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-freebsd/freebsd-sbin/metadata.xml b/sys-freebsd/freebsd-sbin/metadata.xml
index f0b8ec2..0c76683 100644
--- a/sys-freebsd/freebsd-sbin/metadata.xml
+++ b/sys-freebsd/freebsd-sbin/metadata.xml
@@ -3,13 +3,13 @@
 <pkgmetadata>
   <herd>bsd</herd>
   <use>
-    <flag name='ipfilter'>
+    <flag name="ipfilter">
       Build tools to administer the ipfilter firewall.
     </flag>
-    <flag name='pf'>
+    <flag name="pf">
       Build tools to administer the PF firewall.
     </flag>
-    <flag name='netware'>
+    <flag name="netware">
       Build libraries and tools to work with NetWare protocols (IPX
       and NCP).
     </flag>

diff --git a/sys-freebsd/freebsd-share/metadata.xml b/sys-freebsd/freebsd-share/metadata.xml
index 56d1001..14db355 100644
--- a/sys-freebsd/freebsd-share/metadata.xml
+++ b/sys-freebsd/freebsd-share/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>bsd</herd>
   <use>
-	<flag name='isdn'>Enable ISDN support</flag>
-    <flag name='zfs'>Enable ZFS support.</flag>
+	<flag name="isdn">Enable ISDN support</flag>
+    <flag name="zfs">Enable ZFS support.</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-freebsd/freebsd-sources/metadata.xml b/sys-freebsd/freebsd-sources/metadata.xml
index dfe9547..e8793d1 100644
--- a/sys-freebsd/freebsd-sources/metadata.xml
+++ b/sys-freebsd/freebsd-sources/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>bsd</herd>
   <use>
-    <flag name='build-kernel'>Build and install a kernel (recommended).</flag>
-    <flag name='dtrace'>Enable DTrace support.</flag>
-    <flag name='zfs'>Enable ZFS support.</flag>
+    <flag name="build-kernel">Build and install a kernel (recommended).</flag>
+    <flag name="dtrace">Enable DTrace support.</flag>
+    <flag name="zfs">Enable ZFS support.</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-freebsd/freebsd-ubin/metadata.xml b/sys-freebsd/freebsd-ubin/metadata.xml
index 825b3e0..c0670fc 100644
--- a/sys-freebsd/freebsd-ubin/metadata.xml
+++ b/sys-freebsd/freebsd-ubin/metadata.xml
@@ -3,19 +3,19 @@
 <pkgmetadata>
   <herd>bsd</herd>
   <use>
-    <flag name='audit'>
+    <flag name="audit">
       Build auditing tools.
     </flag>
-    <flag name='netware'>
+    <flag name="netware">
       Build libraries and tools to work with NetWare protocols (IPX
       and NCP).
     </flag>
-	<flag name='ar'>
+	<flag name="ar">
 	  Build FreeBSD's ar and ranlib replacements based on libarchive. The
 	  toolchain will still use binutils' version but you can play with it.
 	  They have been renamed to freebsd-ar and freebsd-ranlib not to collide
 	  with binutils.
 	</flag>
-    <flag name='zfs'>Enable ZFS support (for fstat actually).</flag>
+    <flag name="zfs">Enable ZFS support (for fstat actually).</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-freebsd/freebsd-usbin/metadata.xml b/sys-freebsd/freebsd-usbin/metadata.xml
index 77bc580..89b41c1 100644
--- a/sys-freebsd/freebsd-usbin/metadata.xml
+++ b/sys-freebsd/freebsd-usbin/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
   <herd>bsd</herd>
   <use>
-    <flag name='floppy'>Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).</flag>
-    <flag name='audit'>
+    <flag name="floppy">Enable floppy disk utilities (fdcontrol, fdformat, fdread, fdwrite).</flag>
+    <flag name="audit">
       Build auditing tools.
     </flag>
-    <flag name='netware'>
+    <flag name="netware">
       Build libraries and tools to work with NetWare protocols (IPX
       and NCP).
     </flag>

diff --git a/sys-fs/autorun/metadata.xml b/sys-fs/autorun/metadata.xml
index c3b0990..8bcffd6 100644
--- a/sys-fs/autorun/metadata.xml
+++ b/sys-fs/autorun/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>autorun</remote-id>
+	<remote-id type="sourceforge">autorun</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index 132b20e..9f887dd 100644
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -10,7 +10,7 @@
     <name>Sergei Trofimovich</name>
   </maintainer>
   <use>
-    <flag name='convert'>Build ext2 conversion utility (btrfs-convert)</flag>
-	<flag name='static'>Build static binaries in addition to the dynamic ones</flag>
+    <flag name="convert">Build ext2 conversion utility (btrfs-convert)</flag>
+	<flag name="static">Build static binaries in addition to the dynamic ones</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-fs/cramfs/metadata.xml b/sys-fs/cramfs/metadata.xml
index a2d1105..b63efc3 100644
--- a/sys-fs/cramfs/metadata.xml
+++ b/sys-fs/cramfs/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>cramfs</remote-id>
+	<remote-id type="sourceforge">cramfs</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index e674745..1dbe202 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -1,17 +1,17 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='gcrypt'>Use <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag>
-	<flag name='kernel'>Use kernel crypto backend (mainly for embedded systems)</flag>
-	<flag name='nettle'>Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
-	<flag name='openssl'>Use <pkg>dev-libs/openssl</pkg> crypto backend</flag>
-	<flag name='pwquality'>Use <pkg>dev-libs/libpwquality</pkg> for password quality checking</flag>
-	<flag name='urandom'>Use /dev/urandom instead of /dev/random</flag>
-	<flag name='reencrypt'>Build cryptsetup-reencrypt</flag>
+	<flag name="gcrypt">Use <pkg>dev-libs/libgcrypt</pkg> crypto backend</flag>
+	<flag name="kernel">Use kernel crypto backend (mainly for embedded systems)</flag>
+	<flag name="nettle">Use <pkg>dev-libs/nettle</pkg> crypto backend</flag>
+	<flag name="openssl">Use <pkg>dev-libs/openssl</pkg> crypto backend</flag>
+	<flag name="pwquality">Use <pkg>dev-libs/libpwquality</pkg> for password quality checking</flag>
+	<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
+	<flag name="reencrypt">Build cryptsetup-reencrypt</flag>
 </use>
 <upstream>
-	<remote-id type='google-code'>cryptsetup</remote-id>
+	<remote-id type="google-code">cryptsetup</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/dd-rescue/metadata.xml b/sys-fs/dd-rescue/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/dd-rescue/metadata.xml
+++ b/sys-fs/dd-rescue/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/devfsd/metadata.xml b/sys-fs/devfsd/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/devfsd/metadata.xml
+++ b/sys-fs/devfsd/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/diskdev_cmds/metadata.xml b/sys-fs/diskdev_cmds/metadata.xml
index e2ceeff..13d6b39 100644
--- a/sys-fs/diskdev_cmds/metadata.xml
+++ b/sys-fs/diskdev_cmds/metadata.xml
@@ -11,4 +11,3 @@ HFS+ Filesytstem tools (mkfs.hfsplus and fsck.hfsplus), ported from Apple's
 versions.
 </longdescription>
 </pkgmetadata>
-

diff --git a/sys-fs/dmg2img/metadata.xml b/sys-fs/dmg2img/metadata.xml
index f7d12d1..18b0796 100644
--- a/sys-fs/dmg2img/metadata.xml
+++ b/sys-fs/dmg2img/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
 	<email>josejx@gentoo.org</email>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 	dmg2img is an application that can convert .dmg files, popular on Mac OSX
 	systems, to HFS+ disk images, suitable for mounting on Linux systems.
 </longdescription>

diff --git a/sys-fs/dmraid/metadata.xml b/sys-fs/dmraid/metadata.xml
index e357fd8..d7a7024 100644
--- a/sys-fs/dmraid/metadata.xml
+++ b/sys-fs/dmraid/metadata.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<use>
-		<flag name='dietlibc'>Compile against <pkg>dev-libs/dietlibc</pkg></flag>
-		<flag name='intel_led'>Enable Intel LED support</flag>
-		<flag name='klibc'>Compile against <pkg>dev-libs/klibc</pkg></flag>
-		<flag name='led'>Enable LED support</flag>
-		<flag name='mini'>Create a minimal binary suitable for early boot environments</flag>
+		<flag name="dietlibc">Compile against <pkg>dev-libs/dietlibc</pkg></flag>
+		<flag name="intel_led">Enable Intel LED support</flag>
+		<flag name="klibc">Compile against <pkg>dev-libs/klibc</pkg></flag>
+		<flag name="led">Enable LED support</flag>
+		<flag name="mini">Create a minimal binary suitable for early boot environments</flag>
 	</use>
 	<maintainer>
 		<email>axs@gentoo.org</email>

diff --git a/sys-fs/dosfstools/metadata.xml b/sys-fs/dosfstools/metadata.xml
index 9c4024b..232be8c 100644
--- a/sys-fs/dosfstools/metadata.xml
+++ b/sys-fs/dosfstools/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='github'>dosfstools/dosfstools</remote-id>
+	<remote-id type="github">dosfstools/dosfstools</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/e2fsprogs/metadata.xml b/sys-fs/e2fsprogs/metadata.xml
index e12e683..3f0c2e1 100644
--- a/sys-fs/e2fsprogs/metadata.xml
+++ b/sys-fs/e2fsprogs/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='cpe'>cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
-	<remote-id type='sourceforge'>e2fsprogs</remote-id>
+	<remote-id type="cpe">cpe:/a:ext2_filesystems_utilities:e2fsprogs</remote-id>
+	<remote-id type="sourceforge">e2fsprogs</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/e2tools/metadata.xml b/sys-fs/e2tools/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/e2tools/metadata.xml
+++ b/sys-fs/e2tools/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/e4rat/metadata.xml b/sys-fs/e4rat/metadata.xml
index efc8a22..b380d54 100644
--- a/sys-fs/e4rat/metadata.xml
+++ b/sys-fs/e4rat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-fs/exfat-utils/metadata.xml b/sys-fs/exfat-utils/metadata.xml
index bfe6631..f64d26d 100644
--- a/sys-fs/exfat-utils/metadata.xml
+++ b/sys-fs/exfat-utils/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
@@ -9,7 +9,7 @@
 	<email>floppym@gentoo.org</email>
 </maintainer>
 <upstream>
-	<remote-id type='google-code'>exfat</remote-id>
-	<remote-id type='github'>relan/exfat</remote-id>
+	<remote-id type="google-code">exfat</remote-id>
+	<remote-id type="github">relan/exfat</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/extundelete/metadata.xml b/sys-fs/extundelete/metadata.xml
index 71eea01..4e12c04 100644
--- a/sys-fs/extundelete/metadata.xml
+++ b/sys-fs/extundelete/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
 	<email>ssuominen@gentoo.org</email>
 </maintainer>
 <upstream>
-	<remote-id type='sourceforge'>extundelete</remote-id>
+	<remote-id type="sourceforge">extundelete</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/f2fs-tools/metadata.xml b/sys-fs/f2fs-tools/metadata.xml
index bb3e8c2..35420ad 100644
--- a/sys-fs/f2fs-tools/metadata.xml
+++ b/sys-fs/f2fs-tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-fs/fuse-exfat/metadata.xml b/sys-fs/fuse-exfat/metadata.xml
index bfe6631..f64d26d 100644
--- a/sys-fs/fuse-exfat/metadata.xml
+++ b/sys-fs/fuse-exfat/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
@@ -9,7 +9,7 @@
 	<email>floppym@gentoo.org</email>
 </maintainer>
 <upstream>
-	<remote-id type='google-code'>exfat</remote-id>
-	<remote-id type='github'>relan/exfat</remote-id>
+	<remote-id type="google-code">exfat</remote-id>
+	<remote-id type="github">relan/exfat</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/fuseiso/metadata.xml b/sys-fs/fuseiso/metadata.xml
index b6f40af..9e127fd 100644
--- a/sys-fs/fuseiso/metadata.xml
+++ b/sys-fs/fuseiso/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/sys-fs/inotify-tools/metadata.xml b/sys-fs/inotify-tools/metadata.xml
index 7a33171..2ad6ea7 100644
--- a/sys-fs/inotify-tools/metadata.xml
+++ b/sys-fs/inotify-tools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-fs/jdiskreport-bin/metadata.xml b/sys-fs/jdiskreport-bin/metadata.xml
index da3a594..9df3e92 100644
--- a/sys-fs/jdiskreport-bin/metadata.xml
+++ b/sys-fs/jdiskreport-bin/metadata.xml
@@ -8,4 +8,3 @@
 		files and folders.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/sys-fs/jfsutils/metadata.xml b/sys-fs/jfsutils/metadata.xml
index 6752839..22dc510 100644
--- a/sys-fs/jfsutils/metadata.xml
+++ b/sys-fs/jfsutils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-fs/lde/metadata.xml b/sys-fs/lde/metadata.xml
index cc3cfd6..5c165c2 100644
--- a/sys-fs/lde/metadata.xml
+++ b/sys-fs/lde/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>lde</remote-id>
+	<remote-id type="sourceforge">lde</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/lsscsi/metadata.xml b/sys-fs/lsscsi/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/lsscsi/metadata.xml
+++ b/sys-fs/lsscsi/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/lufs/metadata.xml b/sys-fs/lufs/metadata.xml
index ef76d02..e5e3de0 100644
--- a/sys-fs/lufs/metadata.xml
+++ b/sys-fs/lufs/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>lufs</remote-id>
+	<remote-id type="sourceforge">lufs</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index 74f768f..38ccd53 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -11,12 +11,12 @@
 		<description>Upstream Maintainer (please CC on bugs)</description>
 	</maintainer>
 	<use>
-		<flag name='clvm'>Allow users to build clustered lvm2</flag>
-		<flag name='cman'>Cman support for clustered lvm</flag>
-		<flag name='lvm1'>Allow users to build lvm2 with lvm1 support</flag>
-		<flag name='lvm2create_initrd'>Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag>
-		<flag name='thin'>Support for thin volumes</flag>
-		<flag name='device-mapper-only'>Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag>
+		<flag name="clvm">Allow users to build clustered lvm2</flag>
+		<flag name="cman">Cman support for clustered lvm</flag>
+		<flag name="lvm1">Allow users to build lvm2 with lvm1 support</flag>
+		<flag name="lvm2create_initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag>
+		<flag name="thin">Support for thin volumes</flag>
+		<flag name="device-mapper-only">Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/a:heinz_mauelshagen:lvm2</remote-id>

diff --git a/sys-fs/mdadm/metadata.xml b/sys-fs/mdadm/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/mdadm/metadata.xml
+++ b/sys-fs/mdadm/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/mtd-utils/metadata.xml b/sys-fs/mtd-utils/metadata.xml
index 125f41e..d79031d 100644
--- a/sys-fs/mtd-utils/metadata.xml
+++ b/sys-fs/mtd-utils/metadata.xml
@@ -6,4 +6,3 @@
 	<email>robbat2@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
-

diff --git a/sys-fs/mtools/metadata.xml b/sys-fs/mtools/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/mtools/metadata.xml
+++ b/sys-fs/mtools/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/mtpfs/metadata.xml b/sys-fs/mtpfs/metadata.xml
index 086187b..7197e39 100644
--- a/sys-fs/mtpfs/metadata.xml
+++ b/sys-fs/mtpfs/metadata.xml
@@ -16,6 +16,6 @@
 		as playlist and meta information support for MP3 players.
 	</longdescription>
 	<use>
-		<flag name='mad'>Enable handling of MP3's metadata</flag>
+		<flag name="mad">Enable handling of MP3's metadata</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-fs/multipath-tools/metadata.xml b/sys-fs/multipath-tools/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/multipath-tools/metadata.xml
+++ b/sys-fs/multipath-tools/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/nilfs-utils/metadata.xml b/sys-fs/nilfs-utils/metadata.xml
index 8773774..2575f13 100644
--- a/sys-fs/nilfs-utils/metadata.xml
+++ b/sys-fs/nilfs-utils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml
index 9f6d59b..439306d 100644
--- a/sys-fs/ntfs3g/metadata.xml
+++ b/sys-fs/ntfs3g/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
@@ -8,7 +8,7 @@
 <maintainer>
 	<email>ssuominen@gentoo.org</email>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 The ntfs-3g driver is an open source, GPL licensed, third generation Linux 
 NTFS driver for 32-bit, little-endian architectures which was implemented 
 by the Linux-NTFS project. It provides full read-write access to NTFS, 
@@ -16,14 +16,14 @@ excluding access to encrypted files, writing compressed files, changing
 file ownership, access right.
 </longdescription>
 <use>
-	<flag name='external-fuse'>
+	<flag name="external-fuse">
 		Use external FUSE library instead of internal one. Must be disabled
 		for unprivileged mounting to work.
 	</flag>
-	<flag name='ntfsdecrypt'>Build and install the ntfsdecrypt application.</flag>
-	<flag name='ntfsprogs'>Include internal version of ntfsprogs.</flag>
+	<flag name="ntfsdecrypt">Build and install the ntfsdecrypt application.</flag>
+	<flag name="ntfsprogs">Include internal version of ntfsprogs.</flag>
 </use>
 <upstream>
-	<remote-id type='cpe'>cpe:/a:ntfs-3g:ntfs-3g</remote-id>
+	<remote-id type="cpe">cpe:/a:ntfs-3g:ntfs-3g</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/ocfs2-tools/metadata.xml b/sys-fs/ocfs2-tools/metadata.xml
index 8c121b2..9260f8b 100644
--- a/sys-fs/ocfs2-tools/metadata.xml
+++ b/sys-fs/ocfs2-tools/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>cluster</herd>
 <use>
-	<flag name='external'>Enable external locking</flag>
+	<flag name="external">Enable external locking</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-fs/progsreiserfs/metadata.xml b/sys-fs/progsreiserfs/metadata.xml
index c529daf..24a11a7 100644
--- a/sys-fs/progsreiserfs/metadata.xml
+++ b/sys-fs/progsreiserfs/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-fs/quota/metadata.xml b/sys-fs/quota/metadata.xml
index 2374242..c9834ef 100644
--- a/sys-fs/quota/metadata.xml
+++ b/sys-fs/quota/metadata.xml
@@ -1,12 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='netlink'>Compile daemon receiving quota messages via netlink</flag>
-	<flag name='rpc'>Enable quota interaction via RPC</flag>
+	<flag name="netlink">Compile daemon receiving quota messages via netlink</flag>
+	<flag name="rpc">Enable quota interaction via RPC</flag>
 </use>
 <upstream>
-	<remote-id type='sourceforge'>linuxquota</remote-id>
+	<remote-id type="sourceforge">linuxquota</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/quotatool/metadata.xml b/sys-fs/quotatool/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/quotatool/metadata.xml
+++ b/sys-fs/quotatool/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/redirfs/metadata.xml b/sys-fs/redirfs/metadata.xml
index 32e5834..99436f5 100644
--- a/sys-fs/redirfs/metadata.xml
+++ b/sys-fs/redirfs/metadata.xml
@@ -4,7 +4,7 @@
 <maintainer>
   <email>bicatali@gentoo.org</email>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
   The RedirFS or redirecting file system is a layer between
   virtual file system switch (VFS) and file system drivers. It is
   implemented as an out-of-kernel module for Linux and it provides

diff --git a/sys-fs/reiser4progs/metadata.xml b/sys-fs/reiser4progs/metadata.xml
index 9b1c3ca..83d74e1 100644
--- a/sys-fs/reiser4progs/metadata.xml
+++ b/sys-fs/reiser4progs/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 This is a library for reiser4 filesystem access and manipulation.
 </longdescription>
 <upstream>
-	<remote-id type='sourceforge'>reiser4</remote-id>
+	<remote-id type="sourceforge">reiser4</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/reiserfsprogs/metadata.xml b/sys-fs/reiserfsprogs/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/reiserfsprogs/metadata.xml
+++ b/sys-fs/reiserfsprogs/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/static-dev/metadata.xml b/sys-fs/static-dev/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/static-dev/metadata.xml
+++ b/sys-fs/static-dev/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/sysfsutils/metadata.xml b/sys-fs/sysfsutils/metadata.xml
index 365a4d6..0777cf3 100644
--- a/sys-fs/sysfsutils/metadata.xml
+++ b/sys-fs/sysfsutils/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
 	<email>gregkh@gentoo.org</email>
 </maintainer>
 <upstream>
-	<remote-id type='sourceforge'>linux-diag</remote-id>
+	<remote-id type="sourceforge">linux-diag</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/udftools/metadata.xml b/sys-fs/udftools/metadata.xml
index 7416e3f..16604bf 100644
--- a/sys-fs/udftools/metadata.xml
+++ b/sys-fs/udftools/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>linux-udf</remote-id>
+	<remote-id type="sourceforge">linux-udf</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index f6f88f4..87de231 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -6,10 +6,10 @@
 		<email>freedesktop-bugs@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='cryptsetup'>Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
-		<flag name='gptfdisk'>Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</flag>
-		<flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
-		<flag name='remote-access'>Control whether connections from other clients over LAN are allowed</flag>
-		<flag name='systemd'>Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
+		<flag name="cryptsetup">Enable <pkg>sys-fs/cryptsetup</pkg> support</flag>
+		<flag name="gptfdisk">Pull in <pkg>sys-apps/gptfdisk</pkg> for sgdisk command as used by partitioning functionality</flag>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+		<flag name="remote-access">Control whether connections from other clients over LAN are allowed</flag>
+		<flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-fs/xfsdump/metadata.xml b/sys-fs/xfsdump/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/xfsdump/metadata.xml
+++ b/sys-fs/xfsdump/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/xfsprogs/metadata.xml b/sys-fs/xfsprogs/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-fs/xfsprogs/metadata.xml
+++ b/sys-fs/xfsprogs/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-fs/zerofree/metadata.xml b/sys-fs/zerofree/metadata.xml
index 984946d..e3687fa 100644
--- a/sys-fs/zerofree/metadata.xml
+++ b/sys-fs/zerofree/metadata.xml
@@ -9,4 +9,3 @@
 		zerofree is a small utility designed to zero-out the free space on a filesystem.  It is especially useful for guests on a virtual machine before compacting their disk images.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/sys-infiniband/ofed/metadata.xml b/sys-infiniband/ofed/metadata.xml
index ccfad5e..069bacc 100644
--- a/sys-infiniband/ofed/metadata.xml
+++ b/sys-infiniband/ofed/metadata.xml
@@ -3,15 +3,15 @@
 <pkgmetadata>
 	<herd>cluster</herd>
 	<use>
-		<flag name='compat-dapl'>Add support for DAPL v1.2 abstraction layer</flag>
-		<flag name='dapl'>Add support for DAPL abstraction layer</flag>
-		<flag name='diags'>Add dignostic tools for infiniband</flag>
-		<flag name='ibacm'>Add support for userspace pre-connection services</flag>
-		<flag name='mstflint'>Tools to burn Mellanox firmware</flag>
-		<flag name='opensm'>Add OpenSM - Subnet manager for infiniband</flag>
-		<flag name='perftest'>Add perftest utils</flag>
-		<flag name='qperf'>Add rdma tests</flag>
-		<flag name='sdp'>Add SDP tools</flag>
+		<flag name="compat-dapl">Add support for DAPL v1.2 abstraction layer</flag>
+		<flag name="dapl">Add support for DAPL abstraction layer</flag>
+		<flag name="diags">Add dignostic tools for infiniband</flag>
+		<flag name="ibacm">Add support for userspace pre-connection services</flag>
+		<flag name="mstflint">Tools to burn Mellanox firmware</flag>
+		<flag name="opensm">Add OpenSM - Subnet manager for infiniband</flag>
+		<flag name="perftest">Add perftest utils</flag>
+		<flag name="qperf">Add rdma tests</flag>
+		<flag name="sdp">Add SDP tools</flag>
 		<flag name="srp">Suport for userspace part for srp initiator</flag>
     	<flag name="rds">Tools to manage rds sockets</flag>
   </use>

diff --git a/sys-kernel/ck-sources/metadata.xml b/sys-kernel/ck-sources/metadata.xml
index a57973b..0ca2da0 100644
--- a/sys-kernel/ck-sources/metadata.xml
+++ b/sys-kernel/ck-sources/metadata.xml
@@ -5,14 +5,14 @@
     <email>yngwin@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='bfsonly'>BFS by itself vs the full ck patchset</flag>
-    <flag name='experimental'>Allow experimental code. Can break or degrade
+    <flag name="bfsonly">BFS by itself vs the full ck patchset</flag>
+    <flag name="experimental">Allow experimental code. Can break or degrade
       performance. (UNSUPPORTED)
     </flag>
-    <flag name='urwlocks'>Use upgradable read/write locks in place of the grq
+    <flag name="urwlocks">Use upgradable read/write locks in place of the grq
       spinlock. (EXPERIMENTAL)
     </flag>
-    <flag name='deblob'>Remove binary blobs from kernel sources to provide
+    <flag name="deblob">Remove binary blobs from kernel sources to provide
       libre license compliance.
     </flag>
   </use>

diff --git a/sys-kernel/genkernel-next/metadata.xml b/sys-kernel/genkernel-next/metadata.xml
index 5a51271..d86f398 100644
--- a/sys-kernel/genkernel-next/metadata.xml
+++ b/sys-kernel/genkernel-next/metadata.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-
 <pkgmetadata>
 <maintainer>
 	<email>lxnay@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='cryptsetup'>Enable support for Luks disk enrcyption using <pkg>sys-fs/cryptsetup</pkg></flag>
-	<flag name='dmraid'>Enable support for DMRAID (include dmraid dependency)</flag>
-	<flag name='gpg'>Enable support for GPG (include gnupg dependency)</flag>
-	<flag name='iscsi'>Enable support for open-iscsi (include open-iscsi dependency)</flag>
-	<flag name='mdadm'>Enable support for mdadm (include mdadm dependency)</flag>
-	<flag name='plymouth'>Enable support for Plymouth (include Plymouth dependency)</flag>
+	<flag name="cryptsetup">Enable support for Luks disk enrcyption using <pkg>sys-fs/cryptsetup</pkg></flag>
+	<flag name="dmraid">Enable support for DMRAID (include dmraid dependency)</flag>
+	<flag name="gpg">Enable support for GPG (include gnupg dependency)</flag>
+	<flag name="iscsi">Enable support for open-iscsi (include open-iscsi dependency)</flag>
+	<flag name="mdadm">Enable support for mdadm (include mdadm dependency)</flag>
+	<flag name="plymouth">Enable support for Plymouth (include Plymouth dependency)</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-kernel/gentoo-sources/metadata.xml b/sys-kernel/gentoo-sources/metadata.xml
index c824b6b..423d383 100644
--- a/sys-kernel/gentoo-sources/metadata.xml
+++ b/sys-kernel/gentoo-sources/metadata.xml
@@ -3,9 +3,9 @@
 <pkgmetadata>
 <herd>kernel</herd>
 <use>
-  <flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
-  <flag name='experimental'>Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".</flag>
-  <flag name='kdbus'>Apply the kdbus patch. This also requires the "experimental" use flag.</flag>
+  <flag name="deblob">Remove binary blobs from kernel sources to provide libre license compliance.</flag>
+  <flag name="experimental">Apply experimental patches; for more information, see "https://wiki.gentoo.org/wiki/Project:Kernel/Experimental".</flag>
+  <flag name="kdbus">Apply the kdbus patch. This also requires the "experimental" use flag.</flag>
 </use>
 <upstream>
   <remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>

diff --git a/sys-kernel/hardened-sources/metadata.xml b/sys-kernel/hardened-sources/metadata.xml
index 6ed4877..a1e0392 100644
--- a/sys-kernel/hardened-sources/metadata.xml
+++ b/sys-kernel/hardened-sources/metadata.xml
@@ -12,6 +12,6 @@
 		patch from http://www.grsecurity.net, which also includes PaX.
 	</longdescription>
 	<use>
-		<flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
+		<flag name="deblob">Remove binary blobs from kernel sources to provide libre license compliance.</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-kernel/linux-docs/metadata.xml b/sys-kernel/linux-docs/metadata.xml
index 6251e1f..344ae0f 100644
--- a/sys-kernel/linux-docs/metadata.xml
+++ b/sys-kernel/linux-docs/metadata.xml
@@ -6,6 +6,6 @@
 		<email>mpagano@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='html'>Install HTML documentation</flag>
+		<flag name="html">Install HTML documentation</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-kernel/linux-firmware/metadata.xml b/sys-kernel/linux-firmware/metadata.xml
index dcf83e7..4823b62 100644
--- a/sys-kernel/linux-firmware/metadata.xml
+++ b/sys-kernel/linux-firmware/metadata.xml
@@ -15,6 +15,6 @@
 	<name>Rick Farina</name>
 </maintainer>
 <use>
-	<flag name='savedconfig'>Allows individual selection of firmware files</flag>
+	<flag name="savedconfig">Allows individual selection of firmware files</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-kernel/mips-sources/metadata.xml b/sys-kernel/mips-sources/metadata.xml
index 3cc12ff..45452f1 100644
--- a/sys-kernel/mips-sources/metadata.xml
+++ b/sys-kernel/mips-sources/metadata.xml
@@ -11,10 +11,10 @@
 		mips-sources are git snapshots from the Linux-Mips.org git server for MIPS-Based machines
 	</longdescription>
 	<use>
-		<flag name='cobalt'>Enables support for Cobalt Microserver hardware (Qube2/RaQ2)</flag>
-		<flag name='ip27'>Enables support for SGI Origin (IP27)</flag>
-		<flag name='ip28'>Enables support for SGI Indigo2 Impact R10000	(IP28)</flag>
-		<flag name='ip30'>Enables support for SGI Octane (IP30,	'Speedracer')</flag>
+		<flag name="cobalt">Enables support for Cobalt Microserver hardware (Qube2/RaQ2)</flag>
+		<flag name="ip27">Enables support for SGI Origin (IP27)</flag>
+		<flag name="ip28">Enables support for SGI Indigo2 Impact R10000	(IP28)</flag>
+		<flag name="ip30">Enables support for SGI Octane (IP30,	'Speedracer')</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>

diff --git a/sys-kernel/pf-sources/metadata.xml b/sys-kernel/pf-sources/metadata.xml
index 0e10e17..04c22a1 100644
--- a/sys-kernel/pf-sources/metadata.xml
+++ b/sys-kernel/pf-sources/metadata.xml
@@ -10,8 +10,8 @@
 		<name>Markos Chandras</name>
 	</maintainer>
 	<use>
-		<flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
-		<flag name='experimental'>Apply patches that are considered experimental. For more information,
+		<flag name="deblob">Remove binary blobs from kernel sources to provide libre license compliance.</flag>
+		<flag name="experimental">Apply patches that are considered experimental. For more information,
 			check out the ChangeLog or the ebuild that interests you.</flag>
 	</use>
 	<upstream>

diff --git a/sys-kernel/rt-sources/metadata.xml b/sys-kernel/rt-sources/metadata.xml
index b82b40d..9e8400d 100644
--- a/sys-kernel/rt-sources/metadata.xml
+++ b/sys-kernel/rt-sources/metadata.xml
@@ -14,7 +14,7 @@
 		Real-time patchset for the Linux Kernel
 	</longdescription>
 	<use>
-	  <flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
+	  <flag name="deblob">Remove binary blobs from kernel sources to provide libre license compliance.</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>

diff --git a/sys-kernel/vserver-sources/metadata.xml b/sys-kernel/vserver-sources/metadata.xml
index e067c04..05cda02 100644
--- a/sys-kernel/vserver-sources/metadata.xml
+++ b/sys-kernel/vserver-sources/metadata.xml
@@ -9,7 +9,7 @@
 		processes contained within.
 	</longdescription>
 	<use>
-	  	<flag name='deblob'>Remove binary blobs from kernel sources to provide libre license compliance.</flag>
+	  	<flag name="deblob">Remove binary blobs from kernel sources to provide libre license compliance.</flag>
 	</use>
 	<upstream>
 		<remote-id type="cpe">cpe:/o:linux:linux_kernel</remote-id>

diff --git a/sys-libs/binutils-libs/metadata.xml b/sys-libs/binutils-libs/metadata.xml
index 6b306ca..9005ddc 100644
--- a/sys-libs/binutils-libs/metadata.xml
+++ b/sys-libs/binutils-libs/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>toolchain</herd>
 <use>
-	<flag name='64-bit-bfd'>Support 64-bit targets even on 32-bit hosts (is ignored on 64-bit hosts)</flag>
-	<flag name='multitarget'>Enable all possible targets in libbfd</flag>
+	<flag name="64-bit-bfd">Support 64-bit targets even on 32-bit hosts (is ignored on 64-bit hosts)</flag>
+	<flag name="multitarget">Enable all possible targets in libbfd</flag>
 </use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:gnu:binutils</remote-id>

diff --git a/sys-libs/cracklib/metadata.xml b/sys-libs/cracklib/metadata.xml
index 3d1bb00..9514382 100644
--- a/sys-libs/cracklib/metadata.xml
+++ b/sys-libs/cracklib/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>cracklib</remote-id>
-	<remote-id type='github'>cracklib/cracklib</remote-id>
+	<remote-id type="sourceforge">cracklib</remote-id>
+	<remote-id type="github">cracklib/cracklib</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-libs/db/metadata.xml b/sys-libs/db/metadata.xml
index 2a90f89..dabfe3f 100644
--- a/sys-libs/db/metadata.xml
+++ b/sys-libs/db/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <longdescription>
@@ -11,7 +11,7 @@ logging, shared memory caching and database recovery. DB supports C, C++, Java,
 and Perl APIs. DB is available for a wide variety of UNIX platforms as well as
 Windows NT and Windows '95 (MSVC 4, 5 and 6).
 </longdescription>
-<longdescription lang='nl'>
+<longdescription lang="nl">
 De Berkeley Database is een programmatische toolkit
 die embedded database support verzorg voor en traditionele en client/server
 applicaties. Berkeley DB bevat b+tree, rij, uitgebreide lineaire hashing, vaste
@@ -21,6 +21,6 @@ Perl API's. DB is beschikbaar voor veel UNIX platformen en
 Windows.
 </longdescription>
 <use>
-	<flag name='rpc'>Enable rpc client/server</flag>
+	<flag name="rpc">Enable rpc client/server</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-libs/e2fsprogs-libs/metadata.xml b/sys-libs/e2fsprogs-libs/metadata.xml
index 53c2f64..d687bd7 100644
--- a/sys-libs/e2fsprogs-libs/metadata.xml
+++ b/sys-libs/e2fsprogs-libs/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>e2fsprogs</remote-id>
+	<remote-id type="sourceforge">e2fsprogs</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-libs/freeipmi/metadata.xml b/sys-libs/freeipmi/metadata.xml
index 3ab012f..a95aa78 100644
--- a/sys-libs/freeipmi/metadata.xml
+++ b/sys-libs/freeipmi/metadata.xml
@@ -4,7 +4,7 @@
   <herd>sysadmin</herd>
 
   <use>
-    <flag name='nagios'>
+    <flag name="nagios">
       Install a nagios plugin to check sensors' status.
     </flag>
   </use>

diff --git a/sys-libs/gdbm/metadata.xml b/sys-libs/gdbm/metadata.xml
index e5a9582..e58e63d 100644
--- a/sys-libs/gdbm/metadata.xml
+++ b/sys-libs/gdbm/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='berkdb'>enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
-	<flag name='exporter'>enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9</flag>
+	<flag name="berkdb">enable compatibility layer for UNIX-like dbm and ndbm interfaces</flag>
+	<flag name="exporter">enable gdbmexport binary for exporting data from gdbm-1.8 databases into gdbm-1.9</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-libs/glibc/metadata.xml b/sys-libs/glibc/metadata.xml
index a113d43..d8e8789 100644
--- a/sys-libs/glibc/metadata.xml
+++ b/sys-libs/glibc/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
 <herd>toolchain</herd>
 <use>
- <flag name='debug'>When USE=hardened, allow fortify/stack violations to dump core (SIGABRT) and not kill self (SIGKILL)</flag>
- <flag name='gd'>build memusage and memusagestat tools</flag>
- <flag name='nscd'>Build, and enable support for, the Name Service Cache Daemon</flag>
- <flag name='suid'>Make internal pt_chown helper setuid -- not needed if using Linux and have /dev/pts mounted with gid=5</flag>
- <flag name='systemtap'>enable systemtap static probe points</flag>
+ <flag name="debug">When USE=hardened, allow fortify/stack violations to dump core (SIGABRT) and not kill self (SIGKILL)</flag>
+ <flag name="gd">build memusage and memusagestat tools</flag>
+ <flag name="nscd">Build, and enable support for, the Name Service Cache Daemon</flag>
+ <flag name="suid">Make internal pt_chown helper setuid -- not needed if using Linux and have /dev/pts mounted with gid=5</flag>
+ <flag name="systemtap">enable systemtap static probe points</flag>
 </use>
 <upstream>
  <remote-id type="cpe">cpe:/a:gnu:glibc</remote-id>

diff --git a/sys-libs/gpm/metadata.xml b/sys-libs/gpm/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-libs/gpm/metadata.xml
+++ b/sys-libs/gpm/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-libs/itx-bind/metadata.xml b/sys-libs/itx-bind/metadata.xml
index 4dfff39..0e6d7c3 100644
--- a/sys-libs/itx-bind/metadata.xml
+++ b/sys-libs/itx-bind/metadata.xml
@@ -10,4 +10,3 @@
 		is linked into a shared library, wrapping some symbols to more common names
 </longdescription>
 </pkgmetadata>
-

diff --git a/sys-libs/lib-compat/metadata.xml b/sys-libs/lib-compat/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-libs/lib-compat/metadata.xml
+++ b/sys-libs/lib-compat/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-libs/libaal/metadata.xml b/sys-libs/libaal/metadata.xml
index 3b27564..981ae41 100644
--- a/sys-libs/libaal/metadata.xml
+++ b/sys-libs/libaal/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <longdescription>
@@ -7,6 +7,6 @@ This is a library, that provides application abstraction mechanism.
 It includes device abstraction, libc independence code, etc.
 </longdescription>
 <upstream>
-	<remote-id type='sourceforge'>reiser4</remote-id>
+	<remote-id type="sourceforge">reiser4</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-libs/libavc1394/metadata.xml b/sys-libs/libavc1394/metadata.xml
index c65005e..e860325 100644
--- a/sys-libs/libavc1394/metadata.xml
+++ b/sys-libs/libavc1394/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>libavc1394</remote-id>
+	<remote-id type="sourceforge">libavc1394</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-libs/libcap-ng/metadata.xml b/sys-libs/libcap-ng/metadata.xml
index b1eb865..036748e 100644
--- a/sys-libs/libcap-ng/metadata.xml
+++ b/sys-libs/libcap-ng/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <longdescription>

diff --git a/sys-libs/libcap/metadata.xml b/sys-libs/libcap/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-libs/libcap/metadata.xml
+++ b/sys-libs/libcap/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-libs/libcxx/metadata.xml b/sys-libs/libcxx/metadata.xml
index 578f810..1d3cd13 100644
--- a/sys-libs/libcxx/metadata.xml
+++ b/sys-libs/libcxx/metadata.xml
@@ -12,4 +12,3 @@
 	  <flag name="libcxxrt">Build on top of <pkg>sys-libs/libcxxrt</pkg> instead of gcc's libsupc++ (avoids depending on gcc).</flag>
   </use>
 </pkgmetadata>
-

diff --git a/sys-libs/libhugetlbfs/metadata.xml b/sys-libs/libhugetlbfs/metadata.xml
index 63e8fba..9dcec14 100644
--- a/sys-libs/libhugetlbfs/metadata.xml
+++ b/sys-libs/libhugetlbfs/metadata.xml
@@ -1,12 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='perl'>Install the cpupcstat tool and some perl modules</flag>
+	<flag name="perl">Install the cpupcstat tool and some perl modules</flag>
 </use>
 <upstream>
-	<remote-id type='github'>libhugetlbfs/libhugetlbfs</remote-id>
-	<remote-id type='sourceforge'>libhugetlbfs</remote-id>
+	<remote-id type="github">libhugetlbfs/libhugetlbfs</remote-id>
+	<remote-id type="sourceforge">libhugetlbfs</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-libs/libieee1284/metadata.xml b/sys-libs/libieee1284/metadata.xml
index d73d544..648ebda 100644
--- a/sys-libs/libieee1284/metadata.xml
+++ b/sys-libs/libieee1284/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>libieee1284</remote-id>
+	<remote-id type="sourceforge">libieee1284</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-libs/libraw1394/metadata.xml b/sys-libs/libraw1394/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-libs/libraw1394/metadata.xml
+++ b/sys-libs/libraw1394/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-libs/libseccomp/metadata.xml b/sys-libs/libseccomp/metadata.xml
index 60001fa..fc9e739 100644
--- a/sys-libs/libseccomp/metadata.xml
+++ b/sys-libs/libseccomp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-libs/libtermcap-compat/metadata.xml b/sys-libs/libtermcap-compat/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-libs/libtermcap-compat/metadata.xml
+++ b/sys-libs/libtermcap-compat/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-libs/libunwind/metadata.xml b/sys-libs/libunwind/metadata.xml
index 808179f..4c7b538 100644
--- a/sys-libs/libunwind/metadata.xml
+++ b/sys-libs/libunwind/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>toolchain</herd>
 	<use>
-		<flag name='debug-frame'>Adds support for DWARF .debug_frame section: Use the information from this section if available</flag>
-		<flag name='libatomic'>Use libatomic instead of builtin atomic operations</flag>
+		<flag name="debug-frame">Adds support for DWARF .debug_frame section: Use the information from this section if available</flag>
+		<flag name="libatomic">Use libatomic instead of builtin atomic operations</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-libs/libutempter/metadata.xml b/sys-libs/libutempter/metadata.xml
index 12f6cb3..23c2cea 100644
--- a/sys-libs/libutempter/metadata.xml
+++ b/sys-libs/libutempter/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <herd>x11</herd>

diff --git a/sys-libs/libvpd/metadata.xml b/sys-libs/libvpd/metadata.xml
index bb26852..ec717b7 100644
--- a/sys-libs/libvpd/metadata.xml
+++ b/sys-libs/libvpd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>ppc64</herd>

diff --git a/sys-libs/lrmi/metadata.xml b/sys-libs/lrmi/metadata.xml
index 5a6e7b1..51e8d40 100644
--- a/sys-libs/lrmi/metadata.xml
+++ b/sys-libs/lrmi/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>lrmi</remote-id>
+	<remote-id type="sourceforge">lrmi</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-libs/ncurses/metadata.xml b/sys-libs/ncurses/metadata.xml
index c11de62..f5459e5 100644
--- a/sys-libs/ncurses/metadata.xml
+++ b/sys-libs/ncurses/metadata.xml
@@ -1,14 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='ada'>Add bindings for the ADA programming language</flag>
-	<flag name='tinfo'>
+	<flag name="ada">Add bindings for the ADA programming language</flag>
+	<flag name="tinfo">
 		Build curses library (libncurses) sep from the low-level terminfo
 		library (libtinfo) -- usually needed only for binary packages -- but
 		it is binary compatible in either mode
 	</flag>
-	<flag name='trace'>Enable test trace() support in ncurses calls</flag>
+	<flag name="trace">Enable test trace() support in ncurses calls</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-libs/nss-db/metadata.xml b/sys-libs/nss-db/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-libs/nss-db/metadata.xml
+++ b/sys-libs/nss-db/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-libs/pwdb/metadata.xml b/sys-libs/pwdb/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-libs/pwdb/metadata.xml
+++ b/sys-libs/pwdb/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-libs/readline/metadata.xml b/sys-libs/readline/metadata.xml
index cb211eb..656aeda 100644
--- a/sys-libs/readline/metadata.xml
+++ b/sys-libs/readline/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='utils'>Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
+	<flag name="utils">Install rlfe (ReadLine Front-End) helper tool -- a wrapper program for making any stdin use readline</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-libs/suacomp/metadata.xml b/sys-libs/suacomp/metadata.xml
index e528d0d..599c064 100644
--- a/sys-libs/suacomp/metadata.xml
+++ b/sys-libs/suacomp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/sys-libs/timezone-data/metadata.xml b/sys-libs/timezone-data/metadata.xml
index 96d5c97..7aaccf9 100644
--- a/sys-libs/timezone-data/metadata.xml
+++ b/sys-libs/timezone-data/metadata.xml
@@ -7,7 +7,7 @@
     <name>Dirkjan Ochtman</name>
   </maintainer>
   <use>
-    <flag name='leaps_timezone'>
+    <flag name="leaps_timezone">
       Install the set of "right" timezones; these timezones include leap seconds
       when counting seconds since the epoch (while POSIX does not) as they are
       based on the TAI (International Atomic Time) clock

diff --git a/sys-libs/uclibc/metadata.xml b/sys-libs/uclibc/metadata.xml
index c616c63..df545f8 100644
--- a/sys-libs/uclibc/metadata.xml
+++ b/sys-libs/uclibc/metadata.xml
@@ -20,11 +20,11 @@ systems with support for alpha, ARM, cris, i386, i960, h8300, m68k, mips/mipsel,
 SH, SPARC, and v850 processors.
 </longdescription>
 <use>
-	<flag name='rpc'>Enable sun nis/rpc support (you should use libtirpc though)</flag>
-	<flag name='ssp'>Force the use of ssp to be built into a hardened uclibc setup</flag>
-	<flag name='savedconfig'>Adds support for user defined configs</flag>
-	<flag name='uclibc-compat'>Build uclibc with backwards compatible
+	<flag name="rpc">Enable sun nis/rpc support (you should use libtirpc though)</flag>
+	<flag name="ssp">Force the use of ssp to be built into a hardened uclibc setup</flag>
+	<flag name="savedconfig">Adds support for user defined configs</flag>
+	<flag name="uclibc-compat">Build uclibc with backwards compatible
 		options</flag>
-	<flag name='wordexp'>Add support for word expansion (wordexp.h)</flag>
+	<flag name="wordexp">Add support for word expansion (wordexp.h)</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-libs/zlib/metadata.xml b/sys-libs/zlib/metadata.xml
index 0b0bdfe..8b66de8 100644
--- a/sys-libs/zlib/metadata.xml
+++ b/sys-libs/zlib/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='minizip'>include the minizip library for quick and dirty zip extraction</flag>
+	<flag name="minizip">include the minizip library for quick and dirty zip extraction</flag>
 </use>
 <upstream>
-	<remote-id type='cpe'>cpe:/a:gnu:zlib</remote-id>
+	<remote-id type="cpe">cpe:/a:gnu:zlib</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-power/apcupsd/metadata.xml b/sys-power/apcupsd/metadata.xml
index 23aba6e..c9ae750 100644
--- a/sys-power/apcupsd/metadata.xml
+++ b/sys-power/apcupsd/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>
 	<email>mattm@gentoo.org</email>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 Apcupsd can be used for power mangement and controlling most of 
 APC's UPS models on Unix and Windows machines. Apcupsd works with 
 most of APC's Smart-UPS models as well as most simple signalling 
@@ -17,6 +17,6 @@ expires, or runtime expires based on internal APC calculations
 determined by power consumption rates.
 </longdescription>
 <upstream>
-	<remote-id type='sourceforge'>apcupsd</remote-id>
+	<remote-id type="sourceforge">apcupsd</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-power/athcool/metadata.xml b/sys-power/athcool/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-power/athcool/metadata.xml
+++ b/sys-power/athcool/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-power/cpupower/metadata.xml b/sys-power/cpupower/metadata.xml
index 8278d75..e2278cd 100644
--- a/sys-power/cpupower/metadata.xml
+++ b/sys-power/cpupower/metadata.xml
@@ -11,6 +11,6 @@
 		<name>Mike Gilbert</name>
 	</maintainer>
 	<use>
-		<flag name='cpufreq_bench'>Build and install the cpufreq_bench binary</flag>
+		<flag name="cpufreq_bench">Build and install the cpufreq_bench binary</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-power/nvram-reboot/metadata.xml b/sys-power/nvram-reboot/metadata.xml
index 83c747b..bf74ec1 100644
--- a/sys-power/nvram-reboot/metadata.xml
+++ b/sys-power/nvram-reboot/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>nvram-wakeup</remote-id>
+	<remote-id type="sourceforge">nvram-wakeup</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-power/nvram-wakeup/metadata.xml b/sys-power/nvram-wakeup/metadata.xml
index 83c747b..bf74ec1 100644
--- a/sys-power/nvram-wakeup/metadata.xml
+++ b/sys-power/nvram-wakeup/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>nvram-wakeup</remote-id>
+	<remote-id type="sourceforge">nvram-wakeup</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-process/acct/metadata.xml b/sys-process/acct/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-process/acct/metadata.xml
+++ b/sys-process/acct/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-process/atop/metadata.xml b/sys-process/atop/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-process/atop/metadata.xml
+++ b/sys-process/atop/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-process/criu/metadata.xml b/sys-process/criu/metadata.xml
index 4ff189c..e130e31 100644
--- a/sys-process/criu/metadata.xml
+++ b/sys-process/criu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>virtualization</herd>
@@ -7,6 +7,6 @@
 		<name>Yixun Lan</name>
 	</maintainer>
 	<use>
-		<flag name='setproctitle'>Make process titles of service workers to be more verbose</flag>
+		<flag name="setproctitle">Make process titles of service workers to be more verbose</flag>
 	</use>
 </pkgmetadata>

diff --git a/sys-process/cronie/metadata.xml b/sys-process/cronie/metadata.xml
index 79ee246..bf18845 100644
--- a/sys-process/cronie/metadata.xml
+++ b/sys-process/cronie/metadata.xml
@@ -14,7 +14,7 @@
   And why cronie? See http://www.urbandictionary.com/define.php?term=cronie
   </longdescription>
   <use>
-    <flag name='anacron'>Install the periodic anacron command scheduler.</flag>
-    <flag name='inotify'>Enable inotify filesystem monitoring support.</flag>
+    <flag name="anacron">Install the periodic anacron command scheduler.</flag>
+    <flag name="inotify">Enable inotify filesystem monitoring support.</flag>
   </use>
 </pkgmetadata>

diff --git a/sys-process/daemontools-encore/metadata.xml b/sys-process/daemontools-encore/metadata.xml
index 62e73b9..484c664 100644
--- a/sys-process/daemontools-encore/metadata.xml
+++ b/sys-process/daemontools-encore/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
-<longdescription lang='en'>
+<longdescription lang="en">
 daemontools-encore is a collection of tools for managing UNIX services.
 It is derived from the public-domain release of daemontools by 
 D. J. Bernstein.

diff --git a/sys-process/daemontools/metadata.xml b/sys-process/daemontools/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-process/daemontools/metadata.xml
+++ b/sys-process/daemontools/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-process/latencytop/metadata.xml b/sys-process/latencytop/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-process/latencytop/metadata.xml
+++ b/sys-process/latencytop/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-process/lsof/metadata.xml b/sys-process/lsof/metadata.xml
index 92c6d7b..b640cdb 100644
--- a/sys-process/lsof/metadata.xml
+++ b/sys-process/lsof/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='rpc'>support looking up RPC service info</flag>
+	<flag name="rpc">support looking up RPC service info</flag>
 </use>
 </pkgmetadata>

diff --git a/sys-process/numactl/metadata.xml b/sys-process/numactl/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-process/numactl/metadata.xml
+++ b/sys-process/numactl/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-process/numad/metadata.xml b/sys-process/numad/metadata.xml
index 93c6a36..00600de 100644
--- a/sys-process/numad/metadata.xml
+++ b/sys-process/numad/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
index f841e54..aba64f7 100644
--- a/sys-process/procps/metadata.xml
+++ b/sys-process/procps/metadata.xml
@@ -1,13 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <use>
-	<flag name='kill'>Build the kill program</flag>
-	<flag name='modern-top'>Enables new startup defaults of top. Keeps old defaults if disabled</flag>
-	<flag name='ncurses'>Build programs that use ncurses: top, slabtop, watch</flag>
+	<flag name="kill">Build the kill program</flag>
+	<flag name="modern-top">Enables new startup defaults of top. Keeps old defaults if disabled</flag>
+	<flag name="ncurses">Build programs that use ncurses: top, slabtop, watch</flag>
 </use>
 <upstream>
-	<remote-id type='sourceforge'>procps</remote-id>
+	<remote-id type="sourceforge">procps</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-process/psmisc/metadata.xml b/sys-process/psmisc/metadata.xml
index 9ef0e84..499f880 100644
--- a/sys-process/psmisc/metadata.xml
+++ b/sys-process/psmisc/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <upstream>
-	<remote-id type='sourceforge'>psmisc</remote-id>
+	<remote-id type="sourceforge">psmisc</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/sys-process/runit/metadata.xml b/sys-process/runit/metadata.xml
index daf629a..ba4336d 100644
--- a/sys-process/runit/metadata.xml
+++ b/sys-process/runit/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 <maintainer>

diff --git a/sys-process/supervise-scripts/metadata.xml b/sys-process/supervise-scripts/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-process/supervise-scripts/metadata.xml
+++ b/sys-process/supervise-scripts/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-process/time/metadata.xml b/sys-process/time/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-process/time/metadata.xml
+++ b/sys-process/time/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/sys-process/watchpid/metadata.xml b/sys-process/watchpid/metadata.xml
index 261fd29..96a2d58 100644
--- a/sys-process/watchpid/metadata.xml
+++ b/sys-process/watchpid/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
 </pkgmetadata>

diff --git a/virtual/freedesktop-icon-theme/metadata.xml b/virtual/freedesktop-icon-theme/metadata.xml
index c5d1395..00b0f88 100644
--- a/virtual/freedesktop-icon-theme/metadata.xml
+++ b/virtual/freedesktop-icon-theme/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/virtual/imap-c-client/metadata.xml b/virtual/imap-c-client/metadata.xml
index 9416f79..51f94e3 100644
--- a/virtual/imap-c-client/metadata.xml
+++ b/virtual/imap-c-client/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>net-mail</herd>
 </pkgmetadata>
-

diff --git a/virtual/krb5/metadata.xml b/virtual/krb5/metadata.xml
index 9cc2325..5ae9375 100644
--- a/virtual/krb5/metadata.xml
+++ b/virtual/krb5/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>kerberos</herd>
 </pkgmetadata>
-

diff --git a/virtual/mda/metadata.xml b/virtual/mda/metadata.xml
index c508d21..10fe7e7 100644
--- a/virtual/mda/metadata.xml
+++ b/virtual/mda/metadata.xml
@@ -4,4 +4,3 @@
 <herd>net-mail</herd>
 <herd>qmail</herd>
 </pkgmetadata>
-

diff --git a/virtual/mpi/metadata.xml b/virtual/mpi/metadata.xml
index 3badea1..68315d1 100644
--- a/virtual/mpi/metadata.xml
+++ b/virtual/mpi/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>cluster</herd>
 	<use>
-		<flag name='romio'>Enable romio, a high-performance portable MPI-IO</flag>
+		<flag name="romio">Enable romio, a high-performance portable MPI-IO</flag>
 	</use>
 </pkgmetadata>

diff --git a/virtual/mta/metadata.xml b/virtual/mta/metadata.xml
index c508d21..10fe7e7 100644
--- a/virtual/mta/metadata.xml
+++ b/virtual/mta/metadata.xml
@@ -4,4 +4,3 @@
 <herd>net-mail</herd>
 <herd>qmail</herd>
 </pkgmetadata>
-

diff --git a/virtual/mysql/metadata.xml b/virtual/mysql/metadata.xml
index 0ea2af6..2624f38 100644
--- a/virtual/mysql/metadata.xml
+++ b/virtual/mysql/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <herd>mysql</herd>
   <use>
-    <flag name='embedded'>Build embedded server (libmysqld)</flag>
+    <flag name="embedded">Build embedded server (libmysqld)</flag>
   </use>
 </pkgmetadata>

diff --git a/virtual/podofo-build/metadata.xml b/virtual/podofo-build/metadata.xml
index ca9c461..70a9ca9 100644
--- a/virtual/podofo-build/metadata.xml
+++ b/virtual/podofo-build/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <maintainer><email>zmedico@gentoo.org</email></maintainer>
 <use>
-	<flag name='boost'>Add support for boost</flag>
+	<flag name="boost">Add support for boost</flag>
 </use>
 </pkgmetadata>

diff --git a/www-apache/mod_authn_sasl/metadata.xml b/www-apache/mod_authn_sasl/metadata.xml
index f7d3c4d..a384843 100644
--- a/www-apache/mod_authn_sasl/metadata.xml
+++ b/www-apache/mod_authn_sasl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/www-apache/mod_nss/metadata.xml b/www-apache/mod_nss/metadata.xml
index 1508bf7..428ce81 100644
--- a/www-apache/mod_nss/metadata.xml
+++ b/www-apache/mod_nss/metadata.xml
@@ -5,6 +5,6 @@
         <email>lxnay@gentoo.org</email>
 </maintainer>
 <use>
-	<flag name='ecc'>enable Elliptical Curve Cyptography</flag>
+	<flag name="ecc">enable Elliptical Curve Cyptography</flag>
 </use>
 </pkgmetadata>

diff --git a/www-apache/mod_python/metadata.xml b/www-apache/mod_python/metadata.xml
index 3ebe14c..7c99704 100644
--- a/www-apache/mod_python/metadata.xml
+++ b/www-apache/mod_python/metadata.xml
@@ -14,7 +14,7 @@
 	</longdescription>
 	<longdescription lang="ja">
 		Mod_PythonはウェブサーバーにPythonインタープリタを埋め込むApacheモジュールです。
-		Mod_PythonはPython言語のウェブベース・アプリケーションを従来のCGIよりも何倍も高>
+		Mod_PythonはPython言語のウェブベース・アプリケーションを従来のCGIよりも何倍も高&gt;
 		速に走らせることができ、データデータベースのコネクション保持に関するより高度なア
 		クセス機能やヒット間の他のデータやApache内部へのアクセス機能を持ちます。
 	</longdescription>

diff --git a/www-apache/mod_security/metadata.xml b/www-apache/mod_security/metadata.xml
index 5d11120..98313ed 100644
--- a/www-apache/mod_security/metadata.xml
+++ b/www-apache/mod_security/metadata.xml
@@ -6,19 +6,19 @@
     <name>Diego E. Pettenò</name>
   </maintainer>
   <use>
-    <flag name='geoip'>
+    <flag name="geoip">
       Configure ModSecurity to query the GeoIP database from MaxMind,
       provided by <pkg>dev-libs/geoip</pkg>. This flag only controls
       the default configuration, as the GeoIP query code is part of
       ModSecurity's source code.
     </flag>
 
-    <flag name='curl'>
+    <flag name="curl">
       Build the ModSecurity Audit Log Collector (mlogc) that depends
       on <pkg>net-misc/curl</pkg>.
     </flag>
 
-    <flag name='jit'>
+    <flag name="jit">
       Add support for the PCRE Just-in-Time optimisation, as enabled
       by <pkg>dev-libs/libpcre</pkg> with jit USE flag enabled. Might
       not be available on hardened systems.

diff --git a/www-apache/mod_slotlimit/metadata.xml b/www-apache/mod_slotlimit/metadata.xml
index 491315d..5cb9bda 100644
--- a/www-apache/mod_slotlimit/metadata.xml
+++ b/www-apache/mod_slotlimit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/www-apache/mod_tidy/metadata.xml b/www-apache/mod_tidy/metadata.xml
index fd253aa..d9410da 100644
--- a/www-apache/mod_tidy/metadata.xml
+++ b/www-apache/mod_tidy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/www-apache/mod_xml2enc/metadata.xml b/www-apache/mod_xml2enc/metadata.xml
index 2d6c34c..91f4e72 100644
--- a/www-apache/mod_xml2enc/metadata.xml
+++ b/www-apache/mod_xml2enc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/www-apache/modsec-flameeyes/metadata.xml b/www-apache/modsec-flameeyes/metadata.xml
index 0da5fd9..a8b5113 100644
--- a/www-apache/modsec-flameeyes/metadata.xml
+++ b/www-apache/modsec-flameeyes/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/www-apache/passenger/metadata.xml b/www-apache/passenger/metadata.xml
index ea0ec8e..76734ee 100644
--- a/www-apache/passenger/metadata.xml
+++ b/www-apache/passenger/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/www-apps/ampache/metadata.xml b/www-apps/ampache/metadata.xml
index db86fee..06b574e 100644
--- a/www-apps/ampache/metadata.xml
+++ b/www-apps/ampache/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Kristian Fiskerstrand</name>
 	</maintainer>
 	<use>
-		<flag name='transcode'>Install optional dependencies for transcoding support</flag>
+		<flag name="transcode">Install optional dependencies for transcoding support</flag>
 	</use>
 </pkgmetadata>

diff --git a/www-apps/bitten/metadata.xml b/www-apps/bitten/metadata.xml
index 10dc24f..cb24426 100644
--- a/www-apps/bitten/metadata.xml
+++ b/www-apps/bitten/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 	<herd>python</herd>
 	<use>
-  		<flag name='server'>Install master instance that integrates itself with Trac</flag>
+  		<flag name="server">Install master instance that integrates itself with Trac</flag>
 	</use>
 </pkgmetadata>

diff --git a/www-apps/cgisysinfo/metadata.xml b/www-apps/cgisysinfo/metadata.xml
index 4b0a8a6..93c5862 100644
--- a/www-apps/cgisysinfo/metadata.xml
+++ b/www-apps/cgisysinfo/metadata.xml
@@ -14,4 +14,3 @@
 	server.
   </longdescription>
 </pkgmetadata>
-

diff --git a/www-apps/cgit/metadata.xml b/www-apps/cgit/metadata.xml
index 2866727..65409f2 100644
--- a/www-apps/cgit/metadata.xml
+++ b/www-apps/cgit/metadata.xml
@@ -19,4 +19,3 @@
 		<flag name="jit">If the lua flag is enabled, jit uses LuaJIT instead of vanilla Lua</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/www-apps/drupal/metadata.xml b/www-apps/drupal/metadata.xml
index 318cc2f..c9bd514 100644
--- a/www-apps/drupal/metadata.xml
+++ b/www-apps/drupal/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>web-apps</herd>
 <use>
-	<flag name='accelerator'>Add dependency on a php accelerator</flag>
-	<flag name='uploadprogress'>Install <pkg>dev-php/pecl-uploadprogress</pkg> package</flag>
+	<flag name="accelerator">Add dependency on a php accelerator</flag>
+	<flag name="uploadprogress">Install <pkg>dev-php/pecl-uploadprogress</pkg> package</flag>
 </use>
 </pkgmetadata>

diff --git a/www-apps/gitit/metadata.xml b/www-apps/gitit/metadata.xml
index acf3c3e..2231213 100644
--- a/www-apps/gitit/metadata.xml
+++ b/www-apps/gitit/metadata.xml
@@ -8,8 +8,8 @@
 	<longdescription>
 		Gitit is a wiki backed by a git, darcs, or mercurial
 		filestore.  Pages and uploaded files can be modified either
-		directly via the VCS&#39;s command-line tools or through
-		the wiki&#39;s web interface. Pandoc is used for markup
+		directly via the VCS's command-line tools or through
+		the wiki's web interface. Pandoc is used for markup
 		processing, so pages may be written in
 		(extended) markdown, reStructuredText, LaTeX, HTML,
 		or literate Haskell, and exported in ten different
@@ -20,7 +20,7 @@
 		
 		* plugins: dynamically loaded page
 		transformations written in Haskell (see
-		&quot;Network.Gitit.Interface&quot;)
+		"Network.Gitit.Interface")
 		
 		* conversion of TeX math to MathML for display in
 		web browsers
@@ -30,7 +30,7 @@
 		
 		* Atom feeds (site-wide and per-page)
 		
-		* a library, &quot;Network.Gitit&quot;, that makes it simple
+		* a library, "Network.Gitit", that makes it simple
 		to include a gitit wiki in any happstack application
 		
 		You can see a running demo at &lt;http://gitit.net&gt;.
@@ -38,7 +38,7 @@
 		For usage information:  @gitit --help@
 	</longdescription>
 	<use>
-		<flag name='network-uri'>Get Network.URI from the network-uri package.</flag>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 		<flag name="plugins">enables optional plugin runtime loader</flag>
 	</use>
 </pkgmetadata>

diff --git a/www-apps/hiawatha-monitor/metadata.xml b/www-apps/hiawatha-monitor/metadata.xml
index 38e7165..0711f64 100644
--- a/www-apps/hiawatha-monitor/metadata.xml
+++ b/www-apps/hiawatha-monitor/metadata.xml
@@ -5,6 +5,6 @@
 		<email>hasufell@gentoo.org</email>
 	</maintainer>
 	<upstream>
-		<remote-id type='github'>hsleisink/monitor</remote-id>
+		<remote-id type="github">hsleisink/monitor</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/www-apps/horde-passwd/metadata.xml b/www-apps/horde-passwd/metadata.xml
index b3c1823..25b7fa5 100644
--- a/www-apps/horde-passwd/metadata.xml
+++ b/www-apps/horde-passwd/metadata.xml
@@ -13,7 +13,7 @@ command for smb/cifs password support, servuftp, vmailmgr, vpopmail, and
 sql passwords.
 </longdescription>
 <use>
-	<flag name='clearpasswd'>Enables cleartext password storage in the vpopmail
+	<flag name="clearpasswd">Enables cleartext password storage in the vpopmail
 		files</flag>
 </use>
 </pkgmetadata>

diff --git a/www-apps/novnc/metadata.xml b/www-apps/novnc/metadata.xml
index dbdca42..2ae80b4 100644
--- a/www-apps/novnc/metadata.xml
+++ b/www-apps/novnc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/www-apps/otrs/metadata.xml b/www-apps/otrs/metadata.xml
index 9e582f6..5a5ec12 100644
--- a/www-apps/otrs/metadata.xml
+++ b/www-apps/otrs/metadata.xml
@@ -12,4 +12,3 @@
 	<flag name="mod_perl">Provide all dependencies for use of mod_perl instead of cgi</flag>
   </use>
 </pkgmetadata>
-

diff --git a/www-apps/redmine/metadata.xml b/www-apps/redmine/metadata.xml
index 3f9c418..4ca85ba 100644
--- a/www-apps/redmine/metadata.xml
+++ b/www-apps/redmine/metadata.xml
@@ -11,7 +11,6 @@
 <longdescription lang="en">
 </longdescription>
 <use>
-  <flag name='passenger'>Enable support for <pkg>www-apache/passenger</pkg></flag>
+  <flag name="passenger">Enable support for <pkg>www-apache/passenger</pkg></flag>
 </use>
 </pkgmetadata>
-

diff --git a/www-apps/rocketwiki-lqfb/metadata.xml b/www-apps/rocketwiki-lqfb/metadata.xml
index bfa841b..90aa25b 100644
--- a/www-apps/rocketwiki-lqfb/metadata.xml
+++ b/www-apps/rocketwiki-lqfb/metadata.xml
@@ -9,4 +9,3 @@
 RocketWiki is a small parser written in Haskell which translates a wiki dialect to HTML. It uses Parsec, a monadic parser combinator library. The compressed source code of RocketWiki has a size of only 5162 bytes.
 </longdescription>
 </pkgmetadata>
-

diff --git a/www-apps/roundup/metadata.xml b/www-apps/roundup/metadata.xml
index e75835f..c512aab 100644
--- a/www-apps/roundup/metadata.xml
+++ b/www-apps/roundup/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>web-apps</herd>

diff --git a/www-apps/trac-downloads/metadata.xml b/www-apps/trac-downloads/metadata.xml
index 4e77b4b..73999ad 100644
--- a/www-apps/trac-downloads/metadata.xml
+++ b/www-apps/trac-downloads/metadata.xml
@@ -6,4 +6,3 @@
     <name>Rafael G. Martins</name>
   </maintainer>
 </pkgmetadata>
-

diff --git a/www-apps/trac-mercurial/metadata.xml b/www-apps/trac-mercurial/metadata.xml
index 344f9b5..a490fe2 100644
--- a/www-apps/trac-mercurial/metadata.xml
+++ b/www-apps/trac-mercurial/metadata.xml
@@ -10,4 +10,3 @@
     <name>Dirkjan Ochtman</name>
   </maintainer>
 </pkgmetadata>
-

diff --git a/www-apps/trac-tags/metadata.xml b/www-apps/trac-tags/metadata.xml
index 4e77b4b..73999ad 100644
--- a/www-apps/trac-tags/metadata.xml
+++ b/www-apps/trac-tags/metadata.xml
@@ -6,4 +6,3 @@
     <name>Rafael G. Martins</name>
   </maintainer>
 </pkgmetadata>
-

diff --git a/www-apps/venus/metadata.xml b/www-apps/venus/metadata.xml
index 6b3fc62..88181d6 100644
--- a/www-apps/venus/metadata.xml
+++ b/www-apps/venus/metadata.xml
@@ -11,4 +11,3 @@
    <flag name="redland">Enable support for Redland RDF</flag>
  </use>
 </pkgmetadata>
-

diff --git a/www-apps/websvn/metadata.xml b/www-apps/websvn/metadata.xml
index e6d124b..48e0113 100644
--- a/www-apps/websvn/metadata.xml
+++ b/www-apps/websvn/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>web-apps</herd>

diff --git a/www-client/dwb/metadata.xml b/www-client/dwb/metadata.xml
index e02388c..23e1ccd 100644
--- a/www-client/dwb/metadata.xml
+++ b/www-client/dwb/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/www-client/elinks/metadata.xml b/www-client/elinks/metadata.xml
index 6ee34d0..0648c35 100644
--- a/www-client/elinks/metadata.xml
+++ b/www-client/elinks/metadata.xml
@@ -7,11 +7,11 @@
 		<name>Kevin Faulkner</name>
 	</maintainer>
 	<use>
-		<flag name='bittorrent'>Enable support for the BitTorrent protocol</flag>
-		<flag name='finger'>Enable support for the finger protocol</flag>
-		<flag name='gc'>Enable garbage collection support via <pkg>dev-libs/boehm-gc</pkg></flag>
-		<flag name='gopher'>Enable support for the gopher protocol</flag>
-		<flag name='mouse'>Make elinks to grab all mouse events</flag>
-		<flag name='xml'>Enable support for bookmarks via <pkg>dev-libs/expat</pkg></flag>
+		<flag name="bittorrent">Enable support for the BitTorrent protocol</flag>
+		<flag name="finger">Enable support for the finger protocol</flag>
+		<flag name="gc">Enable garbage collection support via <pkg>dev-libs/boehm-gc</pkg></flag>
+		<flag name="gopher">Enable support for the gopher protocol</flag>
+		<flag name="mouse">Make elinks to grab all mouse events</flag>
+		<flag name="xml">Enable support for bookmarks via <pkg>dev-libs/expat</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/www-client/midori/metadata.xml b/www-client/midori/metadata.xml
index bb27af6..f25e1a5 100644
--- a/www-client/midori/metadata.xml
+++ b/www-client/midori/metadata.xml
@@ -6,9 +6,9 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='deprecated'>Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag>
-    <flag name='granite'>Enable support for the elementary library <pkg>dev-libs/granite</pkg></flag>
-    <flag name='zeitgeist'>Add support for Zeitgeist event tracking system</flag>
-    <flag name='webkit2'>Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
+    <flag name="deprecated">Enable GTK+-2 instead of GTK+-3 because of external plugins like adobe-flash</flag>
+    <flag name="granite">Enable support for the elementary library <pkg>dev-libs/granite</pkg></flag>
+    <flag name="zeitgeist">Add support for Zeitgeist event tracking system</flag>
+    <flag name="webkit2">Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag>
   </use>
 </pkgmetadata>

diff --git a/www-client/netsurf/metadata.xml b/www-client/netsurf/metadata.xml
index 207a83b..6c8a244 100644
--- a/www-client/netsurf/metadata.xml
+++ b/www-client/netsurf/metadata.xml
@@ -10,11 +10,11 @@
 </upstream>
 <use>
 	<flag name="bmp">BMP bitmap image support (media-libs/libnsbmp)</flag>
-	<flag name="fbcon_frontend_able" >Use framebuffer frontend able</flag>
+	<flag name="fbcon_frontend_able">Use framebuffer frontend able</flag>
 	<flag name="fbcon_frontend_linux">Use framebuffer frontend linux</flag>
-	<flag name="fbcon_frontend_sdl"  >Use framebuffer frontend sdl</flag>
-	<flag name="fbcon_frontend_vnc"  >Use framebuffer frontend vnc</flag>
-	<flag name="fbcon_frontend_x"    >Use framebuffer frontend X</flag>
+	<flag name="fbcon_frontend_sdl">Use framebuffer frontend sdl</flag>
+	<flag name="fbcon_frontend_vnc">Use framebuffer frontend vnc</flag>
+	<flag name="fbcon_frontend_x">Use framebuffer frontend X</flag>
 	<flag name="pdf-writer">PDF output support (media-libs/libharu)</flag>
 	<flag name="rosprite">RISC OS Sprite bitmap image support (media-libs/librosprite)</flag>
 	<flag name="svgtiny">SVG image support via media-libs/svgatiny instead of gnome-base/librsvg</flag>
@@ -25,4 +25,3 @@ NetSurf is a free, open source web browser. It is written in C, has its own layo
 Whether you want to check your webmail, read the news or post to discussion forums, NetSurf is your lightweight gateway to the world wide web. Actively developed, NetSurf is continually evolving and improving.
 </longdescription>
 </pkgmetadata>
-

diff --git a/www-client/opera/metadata.xml b/www-client/opera/metadata.xml
index 30de8e3..89759c5 100644
--- a/www-client/opera/metadata.xml
+++ b/www-client/opera/metadata.xml
@@ -11,7 +11,7 @@ version runs on GNU/Linux and FreeBSD. Versions for Macintosh and
 Windows are also available.
 </longdescription>
 <use>
-<flag name='gtk'>Install support libraries and runtime dependencies to support GTK+/GNOME desktop integration</flag>
-<flag name='kde'>Install support libraries and runtime dependencies to support KDE desktop integration</flag>
+<flag name="gtk">Install support libraries and runtime dependencies to support GTK+/GNOME desktop integration</flag>
+<flag name="kde">Install support libraries and runtime dependencies to support KDE desktop integration</flag>
 </use>
 </pkgmetadata>

diff --git a/www-client/otter/metadata.xml b/www-client/otter/metadata.xml
index dba01c3..ee6b46c 100644
--- a/www-client/otter/metadata.xml
+++ b/www-client/otter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/www-client/phantomjs/metadata.xml b/www-client/phantomjs/metadata.xml
index 1cf1aa6..9a71161 100644
--- a/www-client/phantomjs/metadata.xml
+++ b/www-client/phantomjs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/www-client/qutebrowser/metadata.xml b/www-client/qutebrowser/metadata.xml
index 1dff51e..153583f 100644
--- a/www-client/qutebrowser/metadata.xml
+++ b/www-client/qutebrowser/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/www-client/ripe-atlas-cousteau/metadata.xml b/www-client/ripe-atlas-cousteau/metadata.xml
index bcaec78..7359238 100644
--- a/www-client/ripe-atlas-cousteau/metadata.xml
+++ b/www-client/ripe-atlas-cousteau/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/www-client/seamonkey/metadata.xml b/www-client/seamonkey/metadata.xml
index 92bd7e5..0277699 100644
--- a/www-client/seamonkey/metadata.xml
+++ b/www-client/seamonkey/metadata.xml
@@ -7,8 +7,8 @@
     <name>Lars Wendler</name>
   </maintainer>
 <use>
-	<flag name='chatzilla'>Build Mozilla's IRC client (default on)</flag>
-	<flag name='custom-optimization'>Fine-tune custom compiler
+	<flag name="chatzilla">Build Mozilla's IRC client (default on)</flag>
+	<flag name="custom-optimization">Fine-tune custom compiler
 		optimizations (-Os, -O0, -O1, -O2, -O3)</flag>
 	<flag name="gmp-autoupdate">Allow Gecko Media Plugins (binary blobs) to be automatically
 		downloaded and kept up-to-date in user profiles</flag>
@@ -17,7 +17,7 @@
 		Allows for greater stability in case of plugin crashes</flag>
 	<flag name="jemalloc3">Enable or disable jemalloc3 
 		(forced-on when supported prior to 38.0)</flag>
-	<flag name='roaming'>Build roaming extension support (default on)</flag>
+	<flag name="roaming">Build roaming extension support (default on)</flag>
 	<flag name="system-cairo">Use the system-wide <pkg>x11-libs/cairo</pkg>
 		Use system cairo instead of bundled.</flag>
 	<flag name="system-icu">Use the sytem-wide <pkg>dev-libs/icu</pkg>
@@ -26,7 +26,7 @@
 		Use system jpeg instead of bundled.</flag>
 	<flag name="system-libvpx">Use the system-wide <pkg>media-libs/libvpx</pkg>
 		instead of bundled.</flag>
-	<flag name='system-sqlite'>Use the system-wide <pkg>dev-db/sqlite</pkg>
+	<flag name="system-sqlite">Use the system-wide <pkg>dev-db/sqlite</pkg>
 		installation with secure-delete enabled</flag>
 </use>
 </pkgmetadata>

diff --git a/www-client/surf/metadata.xml b/www-client/surf/metadata.xml
index a30445e..01875f9 100644
--- a/www-client/surf/metadata.xml
+++ b/www-client/surf/metadata.xml
@@ -5,6 +5,6 @@
 <email>jer@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='savedconfig'>Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
+<flag name="savedconfig">Without a saved config.h, this package depends on <pkg>net-misc/curl</pkg> and <pkg>x11-terms/st</pkg> for a default download mechanism</flag>
 </use>
 </pkgmetadata>

diff --git a/www-client/xombrero/metadata.xml b/www-client/xombrero/metadata.xml
index 4e77b4b..73999ad 100644
--- a/www-client/xombrero/metadata.xml
+++ b/www-client/xombrero/metadata.xml
@@ -6,4 +6,3 @@
     <name>Rafael G. Martins</name>
   </maintainer>
 </pkgmetadata>
-

diff --git a/www-misc/fcgiwrap/metadata.xml b/www-misc/fcgiwrap/metadata.xml
index 64a2484..308bf11 100644
--- a/www-misc/fcgiwrap/metadata.xml
+++ b/www-misc/fcgiwrap/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/www-misc/monitorix/metadata.xml b/www-misc/monitorix/metadata.xml
index 2f125e4..19095cb 100644
--- a/www-misc/monitorix/metadata.xml
+++ b/www-misc/monitorix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>
@@ -8,10 +8,10 @@
     A lightweight system monitoring tool.
   </longdescription>
   <use>
-    <flag name='apcupsd'>Make use of a daemon that controls APC UPSes with <pkg>sys-power/apcupsd</pkg>.</flag>
-    <flag name='hddtemp'>Use SMART to monitor the temperature of hard drives with <pkg>app-admin/hddtemp</pkg>.</flag>
-    <flag name='httpd'>Enables the CGI webserver with any package that satisfies <pkg>virtual/httpd-cgi</pkg>.</flag>
-    <flag name='lm_sensors'>Additional hardware mnitoring sensors with <pkg>sys-apps/lm_sensors</pkg>.</flag>
-    <flag name='postfix'>Analyze postfix logs with <pkg>net-mail/pflogsumm</pkg>.</flag>
+    <flag name="apcupsd">Make use of a daemon that controls APC UPSes with <pkg>sys-power/apcupsd</pkg>.</flag>
+    <flag name="hddtemp">Use SMART to monitor the temperature of hard drives with <pkg>app-admin/hddtemp</pkg>.</flag>
+    <flag name="httpd">Enables the CGI webserver with any package that satisfies <pkg>virtual/httpd-cgi</pkg>.</flag>
+    <flag name="lm_sensors">Additional hardware mnitoring sensors with <pkg>sys-apps/lm_sensors</pkg>.</flag>
+    <flag name="postfix">Analyze postfix logs with <pkg>net-mail/pflogsumm</pkg>.</flag>
   </use>
 </pkgmetadata>

diff --git a/www-misc/xxv/metadata.xml b/www-misc/xxv/metadata.xml
index a1e5d37..081681d 100644
--- a/www-misc/xxv/metadata.xml
+++ b/www-misc/xxv/metadata.xml
@@ -13,7 +13,7 @@
 		und zu steuern.
 	</longdescription>
 	<use>
-		<flag name='themes'>Enable more themes via
+		<flag name="themes">Enable more themes via
 			<pkg>x11-themes/xxv-skins</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/www-plugins/adobe-flash/metadata.xml b/www-plugins/adobe-flash/metadata.xml
index 772ac99..fda74fd 100644
--- a/www-plugins/adobe-flash/metadata.xml
+++ b/www-plugins/adobe-flash/metadata.xml
@@ -6,6 +6,6 @@
 <email>jer@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='kde'>Install a KCM plugin for configuring flash player preferences</flag>
+<flag name="kde">Install a KCM plugin for configuring flash player preferences</flag>
 </use>
 </pkgmetadata>

diff --git a/www-plugins/gnash/metadata.xml b/www-plugins/gnash/metadata.xml
index 9461ad4..1c26a53 100644
--- a/www-plugins/gnash/metadata.xml
+++ b/www-plugins/gnash/metadata.xml
@@ -6,16 +6,16 @@
 	  <name>Chí-Thanh Christopher Nguyễn</name>
 	</maintainer>
 	<use>
-	  <flag name='agg'>Rendering based on the Anti-Grain Geometry Rendering Engine library</flag>
-	  <flag name='cygnal'>Enable building of the cygnal server</flag>
-	  <flag name='dump'>Enable dump output module for creating video from SWF</flag>
-	  <flag name='egl'>Enable EGL support for the OpenVG, OpenGL and X11 renderers</flag>
-	  <flag name='gconf'>Enable GConf configuration backend</flag>
-	  <flag name='harden'>Enable upstream recommended hardening build flags (may conflict with system ones)</flag>
-	  <flag name='jemalloc'>Use dev-libs/jemalloc for allocations</flag>
-	  <flag name='openvg'>Rendering based on the OpenVG graphics acceleration API</flag>
-	  <flag name='sdl-sound'>Enable SDL audio output for the standalone player</flag>
-	  <flag name='ssh'>Enable using SSH for network authentication in libnet</flag>
-	  <flag name='ssl'>Enable directly using OpenSSL in libnet (not needed for nsplugin ssl support)</flag>
+	  <flag name="agg">Rendering based on the Anti-Grain Geometry Rendering Engine library</flag>
+	  <flag name="cygnal">Enable building of the cygnal server</flag>
+	  <flag name="dump">Enable dump output module for creating video from SWF</flag>
+	  <flag name="egl">Enable EGL support for the OpenVG, OpenGL and X11 renderers</flag>
+	  <flag name="gconf">Enable GConf configuration backend</flag>
+	  <flag name="harden">Enable upstream recommended hardening build flags (may conflict with system ones)</flag>
+	  <flag name="jemalloc">Use dev-libs/jemalloc for allocations</flag>
+	  <flag name="openvg">Rendering based on the OpenVG graphics acceleration API</flag>
+	  <flag name="sdl-sound">Enable SDL audio output for the standalone player</flag>
+	  <flag name="ssh">Enable using SSH for network authentication in libnet</flag>
+	  <flag name="ssl">Enable directly using OpenSSL in libnet (not needed for nsplugin ssl support)</flag>
 	</use>
 </pkgmetadata>

diff --git a/www-plugins/lightspark/metadata.xml b/www-plugins/lightspark/metadata.xml
index afc6137..7d2db2c 100644
--- a/www-plugins/lightspark/metadata.xml
+++ b/www-plugins/lightspark/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/www-plugins/nspluginwrapper/metadata.xml b/www-plugins/nspluginwrapper/metadata.xml
index 195e988..0c34d49 100644
--- a/www-plugins/nspluginwrapper/metadata.xml
+++ b/www-plugins/nspluginwrapper/metadata.xml
@@ -7,4 +7,3 @@
   <name>Patrick McLean</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/www-plugins/pipelight/metadata.xml b/www-plugins/pipelight/metadata.xml
index 72db370..a81d71d 100644
--- a/www-plugins/pipelight/metadata.xml
+++ b/www-plugins/pipelight/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/www-servers/apache/metadata.xml b/www-servers/apache/metadata.xml
index be4e71c..4d8c6e7 100644
--- a/www-servers/apache/metadata.xml
+++ b/www-servers/apache/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>
@@ -12,26 +12,26 @@
 		provides HTTP services in sync with the current HTTP standards.
 	</longdescription>
 	<use>
-		<flag name='alpn'>Enable support for Application-Layer Protocol Negotiation (ALPN) in TLS.  Needed by HTTP/2.0.</flag>
-		<flag name='suexec'>Install suexec with apache</flag>
-		<flag name='static'>Link in apache2 modules statically rather then plugins</flag>
-		<flag name='apache2_modules_access_compat'>Group authorizations based on host (name or IP address). Available as a compatibility module with previous versions.</flag>
-		<flag name='apache2_modules_authn_core'>Provides core authentication capabilities common to all authentication providers (functionality provided by authn_alias in previous versions).</flag>
-		<flag name='apache2_modules_authz_core'>Provides core authorization capabilities to various authorization/authorization modules, such as authn_file and authz_user.</flag>
-		<flag name='apache2_modules_authz_dbd'>Provides authorization capabilities via SQL database so that authenticated users can be allowed or denied access to portions of the web site by group membership.</flag>
-		<flag name='apache2_modules_cache_disk'>Disk based storage module for the HTTP caching filter (similar to mem_cache in previous versions).</flag>
-		<flag name='apache2_modules_http2'>Enable http2/alpn module</flag>
-		<flag name='apache2_modules_lbmethod_byrequests'>Request counting load balancer scheduler algorithm for proxy_balancer.</flag>
-		<flag name='apache2_modules_lbmethod_bytraffic'>Weighted traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
-		<flag name='apache2_modules_lbmethod_bybusyness'>Pending request counting load balancer scheduler algorithm for proxy_balancer.</flag>
-		<flag name='apache2_modules_lbmethod_heartbeat'>Heartbeat traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
-		<flag name='apache2_modules_macro'>Macros for the Apache config file.</flag>
-		<flag name='apache2_modules_slotmem_shm'>Slot-based shared memory provider.</flag>
-		<flag name='apache2_modules_socache_shmcb'>A shared object cache provider using a high-performance cyclic buffer inside a shared memory segment.</flag>
-		<flag name='apache2_modules_unixd'>Basic (required) security for Unix-family platforms.</flag>
-		<flag name='apache2_modules_proxy_fcgi'>FCGI support module for mod_proxy.</flag>
-		<flag name='apache2_modules_proxy_wstunnel'>Provides support for the tunnelling of web socket connections to a backend websockets server.</flag>
-		<flag name='apache2_modules_ratelimit'>Ratelimit module for transfer rate management</flag>
-		<flag name='apache2_modules_remoteip'>Remotip module for logging</flag>
+		<flag name="alpn">Enable support for Application-Layer Protocol Negotiation (ALPN) in TLS.  Needed by HTTP/2.0.</flag>
+		<flag name="suexec">Install suexec with apache</flag>
+		<flag name="static">Link in apache2 modules statically rather then plugins</flag>
+		<flag name="apache2_modules_access_compat">Group authorizations based on host (name or IP address). Available as a compatibility module with previous versions.</flag>
+		<flag name="apache2_modules_authn_core">Provides core authentication capabilities common to all authentication providers (functionality provided by authn_alias in previous versions).</flag>
+		<flag name="apache2_modules_authz_core">Provides core authorization capabilities to various authorization/authorization modules, such as authn_file and authz_user.</flag>
+		<flag name="apache2_modules_authz_dbd">Provides authorization capabilities via SQL database so that authenticated users can be allowed or denied access to portions of the web site by group membership.</flag>
+		<flag name="apache2_modules_cache_disk">Disk based storage module for the HTTP caching filter (similar to mem_cache in previous versions).</flag>
+		<flag name="apache2_modules_http2">Enable http2/alpn module</flag>
+		<flag name="apache2_modules_lbmethod_byrequests">Request counting load balancer scheduler algorithm for proxy_balancer.</flag>
+		<flag name="apache2_modules_lbmethod_bytraffic">Weighted traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
+		<flag name="apache2_modules_lbmethod_bybusyness">Pending request counting load balancer scheduler algorithm for proxy_balancer.</flag>
+		<flag name="apache2_modules_lbmethod_heartbeat">Heartbeat traffic counting load balancer scheduler algorithm for proxy_balancer.</flag>
+		<flag name="apache2_modules_macro">Macros for the Apache config file.</flag>
+		<flag name="apache2_modules_slotmem_shm">Slot-based shared memory provider.</flag>
+		<flag name="apache2_modules_socache_shmcb">A shared object cache provider using a high-performance cyclic buffer inside a shared memory segment.</flag>
+		<flag name="apache2_modules_unixd">Basic (required) security for Unix-family platforms.</flag>
+		<flag name="apache2_modules_proxy_fcgi">FCGI support module for mod_proxy.</flag>
+		<flag name="apache2_modules_proxy_wstunnel">Provides support for the tunnelling of web socket connections to a backend websockets server.</flag>
+		<flag name="apache2_modules_ratelimit">Ratelimit module for transfer rate management</flag>
+		<flag name="apache2_modules_remoteip">Remotip module for logging</flag>
 	</use>
 </pkgmetadata>

diff --git a/www-servers/fnord/metadata.xml b/www-servers/fnord/metadata.xml
index 5122b87..ddfa03c 100644
--- a/www-servers/fnord/metadata.xml
+++ b/www-servers/fnord/metadata.xml
@@ -5,6 +5,6 @@
 	<email>maintainer-needed@gentoo.org</email>
 </maintainer>
 	<use>
-		<flag name='auth'>Enable HTTP authentication support</flag>
+		<flag name="auth">Enable HTTP authentication support</flag>
 	</use>
 </pkgmetadata>

diff --git a/www-servers/hiawatha/metadata.xml b/www-servers/hiawatha/metadata.xml
index 653494f..c6c4933 100644
--- a/www-servers/hiawatha/metadata.xml
+++ b/www-servers/hiawatha/metadata.xml
@@ -6,17 +6,17 @@
 		<name>Julian Ospald</name>
 	</maintainer>
 	<use>
-		<flag name='cache'>Enable caching of content</flag>
-		<flag name='monitor'>Pull in www-apps/hiawatha-monitor</flag>
-		<flag name='rewrite'>Enable the rewrite toolkit</flag>
-		<flag name='ssl'>Enable TLS support via
+		<flag name="cache">Enable caching of content</flag>
+		<flag name="monitor">Pull in www-apps/hiawatha-monitor</flag>
+		<flag name="rewrite">Enable the rewrite toolkit</flag>
+		<flag name="ssl">Enable TLS support via
 			<pkg>net-libs/mbedtls</pkg></flag>
-		<flag name='tomahawk'>Enable Tomahawk control server</flag>
-		<flag name='xslt'>Enable XSLT support.
+		<flag name="tomahawk">Enable Tomahawk control server</flag>
+		<flag name="xslt">Enable XSLT support.
 			This is also needed for directory listings</flag>
-		<flag name='rproxy'>Enable reverse proxy support</flag>
+		<flag name="rproxy">Enable reverse proxy support</flag>
 	</use>
 	<upstream>
-		<remote-id type='github'>hsleisink/hiawatha</remote-id>
+		<remote-id type="github">hsleisink/hiawatha</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml
index c2f3a89..bed90f8 100644
--- a/www-servers/lighttpd/metadata.xml
+++ b/www-servers/lighttpd/metadata.xml
@@ -18,13 +18,12 @@
 		for every server that is suffering load problems.
 	</longdescription>
 	<use>
-		<flag name='libev'>Enable fdevent handler</flag>
-		<flag name='memcache'>Enable memcache support for mod_cml and
+		<flag name="libev">Enable fdevent handler</flag>
+		<flag name="memcache">Enable memcache support for mod_cml and
 			mod_trigger_b4_dl</flag>
-		<flag name='mmap'>Use mmap with files owned by lighttpd. This is a dangerous option as it may allow local users to trigger SIGBUS crashes.</flag>
-		<flag name='rrdtool'>Enable rrdtool support via mod_rrdtool</flag>
-		<flag name='uploadprogress'>Apply experimental patch for upload progress module</flag>
-		<flag name='webdav'>Enable webdav properties</flag>
+		<flag name="mmap">Use mmap with files owned by lighttpd. This is a dangerous option as it may allow local users to trigger SIGBUS crashes.</flag>
+		<flag name="rrdtool">Enable rrdtool support via mod_rrdtool</flag>
+		<flag name="uploadprogress">Apply experimental patch for upload progress module</flag>
+		<flag name="webdav">Enable webdav properties</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/www-servers/nginx/metadata.xml b/www-servers/nginx/metadata.xml
index ba59838..92d30e8 100644
--- a/www-servers/nginx/metadata.xml
+++ b/www-servers/nginx/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>proxy-maintainers</herd>

diff --git a/www-servers/pound/metadata.xml b/www-servers/pound/metadata.xml
index f6ffacd..6599521 100644
--- a/www-servers/pound/metadata.xml
+++ b/www-servers/pound/metadata.xml
@@ -12,7 +12,7 @@
   distributed under the GPL - no warranty, it's free to use, copy and give away.
 </longdescription>
 <use>
-	  <flag name='dynscaler'>Enable dynamic rescaling of back-end
+	  <flag name="dynscaler">Enable dynamic rescaling of back-end
 		  priorities</flag>
 </use>
 </pkgmetadata>

diff --git a/www-servers/resin/metadata.xml b/www-servers/resin/metadata.xml
index 3447822..56bd1ef 100644
--- a/www-servers/resin/metadata.xml
+++ b/www-servers/resin/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
   <herd>java</herd>
   <use>
-	  <flag name='admin'>Enable Resin admin webapp</flag>
+	  <flag name="admin">Enable Resin admin webapp</flag>
   </use>
 </pkgmetadata>

diff --git a/www-servers/tomcat/metadata.xml b/www-servers/tomcat/metadata.xml
index 6f8636c..e194d23 100644
--- a/www-servers/tomcat/metadata.xml
+++ b/www-servers/tomcat/metadata.xml
@@ -9,7 +9,7 @@
     Sun under the Java Community Process.
   </longdescription>
   <use>
-    <flag name='extra-webapps'>Build also the docs and examples webapp</flag>
+    <flag name="extra-webapps">Build also the docs and examples webapp</flag>
 	<flag name="websockets">Builds websockets api and implementation (requires java 7)</flag>
   </use>
 </pkgmetadata>

diff --git a/x11-apps/amlc/metadata.xml b/x11-apps/amlc/metadata.xml
index e1679d1..1f92389 100644
--- a/x11-apps/amlc/metadata.xml
+++ b/x11-apps/amlc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>desktop-misc</herd>

diff --git a/x11-apps/ardesia/metadata.xml b/x11-apps/ardesia/metadata.xml
index 8d1462d..f6ea1cf 100644
--- a/x11-apps/ardesia/metadata.xml
+++ b/x11-apps/ardesia/metadata.xml
@@ -28,4 +28,3 @@ record it and share on the network.
 	<remote-id type="google-code">https://code.google.com/p/ardesia</remote-id>
 </upstream>
 </pkgmetadata>
-

diff --git a/x11-apps/intel-gpu-tools/metadata.xml b/x11-apps/intel-gpu-tools/metadata.xml
index fe76944..4aa3a79 100644
--- a/x11-apps/intel-gpu-tools/metadata.xml
+++ b/x11-apps/intel-gpu-tools/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>x11</herd>
 <use>
- <flag name='python'>Install python based register dumper utilities</flag>
- <flag name='test-programs'>Install test programs for DRM driver development</flag>
- <flag name='unwind'>Provide automatic stack traces on test failures</flag>
+ <flag name="python">Install python based register dumper utilities</flag>
+ <flag name="test-programs">Install test programs for DRM driver development</flag>
+ <flag name="unwind">Provide automatic stack traces on test failures</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml
index 9d2f919..96a5661 100644
--- a/x11-apps/mesa-progs/metadata.xml
+++ b/x11-apps/mesa-progs/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>x11</herd>

diff --git a/x11-apps/xdm/metadata.xml b/x11-apps/xdm/metadata.xml
index 7582fba..de17c4b 100644
--- a/x11-apps/xdm/metadata.xml
+++ b/x11-apps/xdm/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
   <herd>x11</herd>
   <use>
-    <flag name='consolekit'>Enable native <pkg>sys-auth/consolekit</pkg> support</flag>
-    <flag name='xdm-auth'>Enable XDM-AUTHENTICATION-1 support</flag>
+    <flag name="consolekit">Enable native <pkg>sys-auth/consolekit</pkg> support</flag>
+    <flag name="xdm-auth">Enable XDM-AUTHENTICATION-1 support</flag>
   </use>
 </pkgmetadata>

diff --git a/x11-apps/xdpyinfo/metadata.xml b/x11-apps/xdpyinfo/metadata.xml
index 1400b5f..358dd30 100644
--- a/x11-apps/xdpyinfo/metadata.xml
+++ b/x11-apps/xdpyinfo/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>x11</herd>
 <use>
-	<flag name='dmx'>Builds support for Distributed Multiheaded X
+	<flag name="dmx">Builds support for Distributed Multiheaded X
 		<pkg>x11-base/xorg-server</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml
index f64433c..d4002ef 100644
--- a/x11-apps/xinit/metadata.xml
+++ b/x11-apps/xinit/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>x11</herd>
 	<use>
-		<flag name='minimal'>
+		<flag name="minimal">
 			Control dependencies on legacy apps (xterm, twm, ...). Safe to
 			enable if you use a modern desktop environment.
 		</flag>

diff --git a/x11-apps/xkbset/metadata.xml b/x11-apps/xkbset/metadata.xml
index 03b143f..72531ee 100644
--- a/x11-apps/xkbset/metadata.xml
+++ b/x11-apps/xkbset/metadata.xml
@@ -5,6 +5,6 @@
 <email>jer@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='tk'>Install the <pkg>dev-perl/perl-tk</pkg> based xkbset-gui utility</flag>
+<flag name="tk">Install the <pkg>dev-perl/perl-tk</pkg> based xkbset-gui utility</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-base/xorg-server/metadata.xml b/x11-base/xorg-server/metadata.xml
index 25f1e04..fef28b6 100644
--- a/x11-base/xorg-server/metadata.xml
+++ b/x11-base/xorg-server/metadata.xml
@@ -3,15 +3,15 @@
 <pkgmetadata>
 <herd>x11</herd>
 <use>
-	<flag name='dmx'>Build the Distributed Multiheaded X server</flag>
-	<flag name='glamor'>Enable Glamor OpenGL 2D acceleration</flag>
-	<flag name='kdrive'>Build the kdrive X servers</flag>
-	<flag name='tslib'>Build with tslib support for touchscreen devices</flag>
-	<flag name='unwind'>Enable libunwind usage for backtraces</flag>
-	<flag name='xnest'>Build the Xnest server</flag>
-	<flag name='xephyr'>Build the Xephyr server</flag>
-	<flag name='xorg'>Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
-	<flag name='xvfb'>Build the Xvfb server</flag>
+	<flag name="dmx">Build the Distributed Multiheaded X server</flag>
+	<flag name="glamor">Enable Glamor OpenGL 2D acceleration</flag>
+	<flag name="kdrive">Build the kdrive X servers</flag>
+	<flag name="tslib">Build with tslib support for touchscreen devices</flag>
+	<flag name="unwind">Enable libunwind usage for backtraces</flag>
+	<flag name="xnest">Build the Xnest server</flag>
+	<flag name="xephyr">Build the Xephyr server</flag>
+	<flag name="xorg">Build the Xorg X server (HIGHLY RECOMMENDED)</flag>
+	<flag name="xvfb">Build the Xvfb server</flag>
 </use>
 <upstream>
 	<remote-id type="cpe">cpe:/a:x.org:xorg-server</remote-id>

diff --git a/x11-drivers/ati-drivers/metadata.xml b/x11-drivers/ati-drivers/metadata.xml
index 5aa11eb..41b5fc7 100644
--- a/x11-drivers/ati-drivers/metadata.xml
+++ b/x11-drivers/ati-drivers/metadata.xml
@@ -12,11 +12,11 @@
 		<description>Proxy maintainer, CC him on bugs.</description>
 	</maintainer>
 	<use>
-		<flag name='qt4'>
+		<flag name="qt4">
 			Install qt4 dependent optional tools (e.g Catalyst Control Panel)
 		</flag>
-		<flag name='modules'>Build the kernel modules</flag>
-		<flag name='gdm-hack'>Do a potentially dangerous binary search and replace to fix gdm compatibility</flag>
-		<flag name='pax_kernel'>Enable pax kernel specific patches</flag>
+		<flag name="modules">Build the kernel modules</flag>
+		<flag name="gdm-hack">Do a potentially dangerous binary search and replace to fix gdm compatibility</flag>
+		<flag name="pax_kernel">Enable pax kernel specific patches</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-drivers/nvidia-drivers/metadata.xml b/x11-drivers/nvidia-drivers/metadata.xml
index aea6d76..d0ad097 100644
--- a/x11-drivers/nvidia-drivers/metadata.xml
+++ b/x11-drivers/nvidia-drivers/metadata.xml
@@ -11,13 +11,13 @@ you will need to keep in mind that the major versions represent these different
 branches.
 </longdescription>
 <use>
-	<flag name='driver'>Install the kernel driver module</flag>
-	<flag name='X'>Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
-	<flag name='gtk2'>Install nvidia-settings with support for GTK+ 2</flag>
-	<flag name='gtk3'>Install nvidia-settings with support for GTK+ 3</flag>
-	<flag name='kms'>Enable support for kernel mode setting (KMS)</flag>
-	<flag name='pax_kernel'>PaX patches from the PaX project</flag> 
-	<flag name='tools'>Install additional tools such as nvidia-settings</flag>
-	<flag name='uvm'>Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs</flag>
+	<flag name="driver">Install the kernel driver module</flag>
+	<flag name="X">Install the X.org driver, OpenGL libraries, XvMC libraries, and VDPAU libraries</flag>
+	<flag name="gtk2">Install nvidia-settings with support for GTK+ 2</flag>
+	<flag name="gtk3">Install nvidia-settings with support for GTK+ 3</flag>
+	<flag name="kms">Enable support for kernel mode setting (KMS)</flag>
+	<flag name="pax_kernel">PaX patches from the PaX project</flag> 
+	<flag name="tools">Install additional tools such as nvidia-settings</flag>
+	<flag name="uvm">Install the Unified Memory kernel module (nvidia-uvm) for sharing memory between CPU and GPU in CUDA programs</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-drivers/xf86-video-ivtv/metadata.xml b/x11-drivers/xf86-video-ivtv/metadata.xml
index 34b6832..9815514 100644
--- a/x11-drivers/xf86-video-ivtv/metadata.xml
+++ b/x11-drivers/xf86-video-ivtv/metadata.xml
@@ -9,4 +9,3 @@
 	X.Org driver for TV-out on ivtv cards
 </longdescription>
 </pkgmetadata>
-

diff --git a/x11-libs/compiz-bcop/metadata.xml b/x11-libs/compiz-bcop/metadata.xml
index 94ed9f8..b8c820e 100644
--- a/x11-libs/compiz-bcop/metadata.xml
+++ b/x11-libs/compiz-bcop/metadata.xml
@@ -7,4 +7,3 @@ BCOP is a code generator that provides an easy way to handle plugin options by
 generating parts of the plugin code directly from the xml metadata file. 
 </longdescription>
 </pkgmetadata>
-

diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
index 754b3e4..b77585c 100644
--- a/x11-libs/fltk/metadata.xml
+++ b/x11-libs/fltk/metadata.xml
@@ -10,6 +10,6 @@
   can be used to create applications.
 </longdescription>
 <use>
-  <flag name='games'>Builds and installs some extra games</flag>
+  <flag name="games">Builds and installs some extra games</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-libs/fox-wrapper/metadata.xml b/x11-libs/fox-wrapper/metadata.xml
index 5506476..00c1680 100644
--- a/x11-libs/fox-wrapper/metadata.xml
+++ b/x11-libs/fox-wrapper/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Matti Bickel</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/x11-libs/glamor/metadata.xml b/x11-libs/glamor/metadata.xml
index a83e1d5..a61f711 100644
--- a/x11-libs/glamor/metadata.xml
+++ b/x11-libs/glamor/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>x11</herd>
 <use>
-	<flag name='gles'>Build glamor based on gles2</flag>
+	<flag name="gles">Build glamor based on gles2</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-libs/goffice/metadata.xml b/x11-libs/goffice/metadata.xml
index cbc0c75..dd40472 100644
--- a/x11-libs/goffice/metadata.xml
+++ b/x11-libs/goffice/metadata.xml
@@ -7,4 +7,3 @@
 		on top of GLib and Gtk+ and used by software such as Gnumeric.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/x11-libs/gtkmathview/metadata.xml b/x11-libs/gtkmathview/metadata.xml
index f373264..9ca29e5 100644
--- a/x11-libs/gtkmathview/metadata.xml
+++ b/x11-libs/gtkmathview/metadata.xml
@@ -3,8 +3,8 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name='mathml'>Install additional fonts for proper mathml
+	<flag name="mathml">Install additional fonts for proper mathml
 	support.</flag>
-	<flag name='t1lib'>Enable <pkg>media-libs/t1lib</pkg> support</flag>
+	<flag name="t1lib">Enable <pkg>media-libs/t1lib</pkg> support</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-libs/libGLw/metadata.xml b/x11-libs/libGLw/metadata.xml
index 73efd9e..dd4783e 100644
--- a/x11-libs/libGLw/metadata.xml
+++ b/x11-libs/libGLw/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>x11</herd>

diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
index 92b2156..ff58990 100644
--- a/x11-libs/libdrm/metadata.xml
+++ b/x11-libs/libdrm/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>x11</herd>
 <use>
-<flag name='libkms'>Enable building of libkms, a library for applications to interface with KMS</flag>
-<flag name='valgrind'>Compile in valgrind memory hints</flag>
+<flag name="libkms">Enable building of libkms, a library for applications to interface with KMS</flag>
+<flag name="valgrind">Compile in valgrind memory hints</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-libs/libfm-extra/metadata.xml b/x11-libs/libfm-extra/metadata.xml
index 1282859..68e9716 100644
--- a/x11-libs/libfm-extra/metadata.xml
+++ b/x11-libs/libfm-extra/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>lxde</herd>

diff --git a/x11-libs/libfm/metadata.xml b/x11-libs/libfm/metadata.xml
index bb31022..82f76ad 100644
--- a/x11-libs/libfm/metadata.xml
+++ b/x11-libs/libfm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>lxde</herd>

diff --git a/x11-libs/libgxim/metadata.xml b/x11-libs/libgxim/metadata.xml
index 79a6bda..09b23c2 100644
--- a/x11-libs/libgxim/metadata.xml
+++ b/x11-libs/libgxim/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>cjk</herd>

diff --git a/x11-libs/librfm/metadata.xml b/x11-libs/librfm/metadata.xml
index a4f8b1f..5e8c74a 100644
--- a/x11-libs/librfm/metadata.xml
+++ b/x11-libs/librfm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-libs/libtinynotify-cli/metadata.xml b/x11-libs/libtinynotify-cli/metadata.xml
index 36d26ca..72c0c93 100644
--- a/x11-libs/libtinynotify-cli/metadata.xml
+++ b/x11-libs/libtinynotify-cli/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-libs/libtinynotify-systemwide/metadata.xml b/x11-libs/libtinynotify-systemwide/metadata.xml
index 2e9cde8..1f4e7dc 100644
--- a/x11-libs/libtinynotify-systemwide/metadata.xml
+++ b/x11-libs/libtinynotify-systemwide/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-libs/libtinynotify/metadata.xml b/x11-libs/libtinynotify/metadata.xml
index a4ea36e..cf997f0 100644
--- a/x11-libs/libtinynotify/metadata.xml
+++ b/x11-libs/libtinynotify/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
index 59caf21..2d8e058 100644
--- a/x11-libs/libva-intel-driver/metadata.xml
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -11,6 +11,6 @@
 	<name>Emil Karlson</name>
   </maintainer>
 	<use>
-		<flag name='drm'>Enables VA/DRM API support.</flag>
+		<flag name="drm">Enables VA/DRM API support.</flag>
     </use>
 </pkgmetadata>

diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml
index 8aef4bb..b62a54c 100644
--- a/x11-libs/libva/metadata.xml
+++ b/x11-libs/libva/metadata.xml
@@ -6,7 +6,7 @@
     <name>Alexis Ballier</name>
   </maintainer>
 	<use>
-		<flag name='egl'>Enables EGL support.</flag>
-		<flag name='drm'>Enables VA/DRM API support.</flag>
+		<flag name="egl">Enables EGL support.</flag>
+		<flag name="drm">Enables VA/DRM API support.</flag>
     </use>
 </pkgmetadata>

diff --git a/x11-libs/libxklavier/metadata.xml b/x11-libs/libxklavier/metadata.xml
index 91a5284..1d2462d 100644
--- a/x11-libs/libxklavier/metadata.xml
+++ b/x11-libs/libxklavier/metadata.xml
@@ -6,6 +6,6 @@
     <email>freedesktop-bugs@gentoo.org</email>
   </maintainer>
   <use>
-    <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
   </use>
 </pkgmetadata>

diff --git a/x11-libs/xosd/metadata.xml b/x11-libs/xosd/metadata.xml
index a85f24f..e1022f0 100644
--- a/x11-libs/xosd/metadata.xml
+++ b/x11-libs/xosd/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-misc/Xorgautoconfig/metadata.xml b/x11-misc/Xorgautoconfig/metadata.xml
index e5db48e..e6b7521 100644
--- a/x11-misc/Xorgautoconfig/metadata.xml
+++ b/x11-misc/Xorgautoconfig/metadata.xml
@@ -10,4 +10,3 @@
 An X.org auto configuration tool for PPC machines.
 </longdescription>
 </pkgmetadata>
-

diff --git a/x11-misc/albert/metadata.xml b/x11-misc/albert/metadata.xml
index 2fd2095..9cc8d12 100644
--- a/x11-misc/albert/metadata.xml
+++ b/x11-misc/albert/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-misc/autocutsel/metadata.xml b/x11-misc/autocutsel/metadata.xml
index 373a239..de3e31e 100644
--- a/x11-misc/autocutsel/metadata.xml
+++ b/x11-misc/autocutsel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>

diff --git a/x11-misc/bblaunch/metadata.xml b/x11-misc/bblaunch/metadata.xml
index bc57cbb..1ea7ce4 100644
--- a/x11-misc/bblaunch/metadata.xml
+++ b/x11-misc/bblaunch/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/x11-misc/bmpanel/metadata.xml b/x11-misc/bmpanel/metadata.xml
index 87d6ece..039e038 100644
--- a/x11-misc/bmpanel/metadata.xml
+++ b/x11-misc/bmpanel/metadata.xml
@@ -5,7 +5,7 @@
 		<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>
+		<flag name="libev">Use the libev event loop interface</flag>
+		<flag name="libevent">Use the libevent event loop interface</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-misc/calise/metadata.xml b/x11-misc/calise/metadata.xml
index c41d747..bcc862b 100644
--- a/x11-misc/calise/metadata.xml
+++ b/x11-misc/calise/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/x11-misc/cdm/metadata.xml b/x11-misc/cdm/metadata.xml
index 1574d2c..a3cbec1 100644
--- a/x11-misc/cdm/metadata.xml
+++ b/x11-misc/cdm/metadata.xml
@@ -5,7 +5,7 @@
   <email>gienah@gentoo.org</email>
   <name>Mark Wright</name>
 </maintainer>
-<longdescription lang='en'>
+<longdescription lang="en">
 CDM is a minimalistic, yet full-featured replacement for
 login-managers like slim, kdm, gdm and qingy that provides a fast,
 dialog-based login system without the overhead of the X Window System
@@ -14,6 +14,6 @@ dependencies, yet supports multiple users/sessions and can start
 virtually any DE/WM.
 </longdescription>
 <use> 
-  <flag name='consolekit'>Enable native consolekit support</flag>
+  <flag name="consolekit">Enable native consolekit support</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-misc/devilspie2/metadata.xml b/x11-misc/devilspie2/metadata.xml
index 9360f35..7312250 100644
--- a/x11-misc/devilspie2/metadata.xml
+++ b/x11-misc/devilspie2/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>desktop-misc</herd>
 </pkgmetadata>
-

diff --git a/x11-misc/e16keyedit/metadata.xml b/x11-misc/e16keyedit/metadata.xml
index 222e63a..2e3907c 100644
--- a/x11-misc/e16keyedit/metadata.xml
+++ b/x11-misc/e16keyedit/metadata.xml
@@ -1,11 +1,11 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <longdescription>
 This is a standalone keybindings editor for enlightenment version 0.16.
 </longdescription>
 <upstream>
-	<remote-id type='sourceforge'>enlightenment</remote-id>
+	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml
index c8e8ac1..ac83800 100644
--- a/x11-misc/e16menuedit2/metadata.xml
+++ b/x11-misc/e16menuedit2/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <upstream>
-	<remote-id type='sourceforge'>enlightenment</remote-id>
+	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/x11-misc/fbdesk/metadata.xml b/x11-misc/fbdesk/metadata.xml
index 16fd7f4..a9a6a2b 100644
--- a/x11-misc/fbdesk/metadata.xml
+++ b/x11-misc/fbdesk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-misc/fbpager/metadata.xml b/x11-misc/fbpager/metadata.xml
index 2deafa5..c1e80b6 100644
--- a/x11-misc/fbpager/metadata.xml
+++ b/x11-misc/fbpager/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <maintainer><email>maintainer-needed@gentoo.org</email></maintainer>
 	<use>
-		<flag name='xrender'>Enable transparency support via
+		<flag name="xrender">Enable transparency support via
 			<pkg>x11-libs/libXrender</pkg></flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-misc/fireflies/metadata.xml b/x11-misc/fireflies/metadata.xml
index ec03305..230e5d1 100644
--- a/x11-misc/fireflies/metadata.xml
+++ b/x11-misc/fireflies/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <herd>desktop-misc</herd>

diff --git a/x11-misc/fpm2/metadata.xml b/x11-misc/fpm2/metadata.xml
index 5e3a61a..77bb27a 100644
--- a/x11-misc/fpm2/metadata.xml
+++ b/x11-misc/fpm2/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/x11-misc/growl-for-linux/metadata.xml b/x11-misc/growl-for-linux/metadata.xml
index b28c030..a32d58e 100644
--- a/x11-misc/growl-for-linux/metadata.xml
+++ b/x11-misc/growl-for-linux/metadata.xml
@@ -8,4 +8,3 @@
     Growl For Linux is Linux-compatible of Growl. Growl is a notification system for Mac OS X.
   </longdescription>
 </pkgmetadata>
-

diff --git a/x11-misc/gtkdialog/metadata.xml b/x11-misc/gtkdialog/metadata.xml
index 03bfd68..0bbea4d 100644
--- a/x11-misc/gtkdialog/metadata.xml
+++ b/x11-misc/gtkdialog/metadata.xml
@@ -15,7 +15,7 @@ provided.
 <remote-id type="google-code">gtkdialog</remote-id>
 </upstream>
 <use>
-<flag name='glade'>Enable support for <pkg>gnome-base/libglade</pkg></flag>
-<flag name='vte'>Enable support for <pkg>x11-libs/vte</pkg></flag>
+<flag name="glade">Enable support for <pkg>gnome-base/libglade</pkg></flag>
+<flag name="vte">Enable support for <pkg>x11-libs/vte</pkg></flag>
 </use>
 </pkgmetadata>

diff --git a/x11-misc/iconbox/metadata.xml b/x11-misc/iconbox/metadata.xml
index be913d7..c1bd756 100644
--- a/x11-misc/iconbox/metadata.xml
+++ b/x11-misc/iconbox/metadata.xml
@@ -10,4 +10,3 @@ window appears, an application is started by clicking on the respective icon.
 Afterward, the iconbox window disappears. 
 </longdescription>
 </pkgmetadata>
-

diff --git a/x11-misc/imwheel/metadata.xml b/x11-misc/imwheel/metadata.xml
index 08b47d2..da024bc 100644
--- a/x11-misc/imwheel/metadata.xml
+++ b/x11-misc/imwheel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>

diff --git a/x11-misc/ipager/metadata.xml b/x11-misc/ipager/metadata.xml
index 6cfe0bd..3e5005e 100644
--- a/x11-misc/ipager/metadata.xml
+++ b/x11-misc/ipager/metadata.xml
@@ -8,4 +8,3 @@
 		A themeable desktop pager for fluxbox and other window managers.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/x11-misc/launchy/metadata.xml b/x11-misc/launchy/metadata.xml
index fb7ec4a..fcc6fe9 100644
--- a/x11-misc/launchy/metadata.xml
+++ b/x11-misc/launchy/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Christoph Mende</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/x11-misc/magneto-gtk/metadata.xml b/x11-misc/magneto-gtk/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/x11-misc/magneto-gtk/metadata.xml
+++ b/x11-misc/magneto-gtk/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/x11-misc/magneto-gtk3/metadata.xml b/x11-misc/magneto-gtk3/metadata.xml
index 187f7a7..1d85f7e 100644
--- a/x11-misc/magneto-gtk3/metadata.xml
+++ b/x11-misc/magneto-gtk3/metadata.xml
@@ -8,4 +8,3 @@
 	<use>
 	</use>
 </pkgmetadata>
-

diff --git a/x11-misc/nts/metadata.xml b/x11-misc/nts/metadata.xml
index 5f46ada..67c744f 100644
--- a/x11-misc/nts/metadata.xml
+++ b/x11-misc/nts/metadata.xml
@@ -13,4 +13,3 @@
 		can be filtered in various ways.
 	</longdescription>
 </pkgmetadata>
-

diff --git a/x11-misc/obtheme/metadata.xml b/x11-misc/obtheme/metadata.xml
index 9360f35..7312250 100644
--- a/x11-misc/obtheme/metadata.xml
+++ b/x11-misc/obtheme/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 	<herd>desktop-misc</herd>
 </pkgmetadata>
-

diff --git a/x11-misc/openbox-menu/metadata.xml b/x11-misc/openbox-menu/metadata.xml
index 2e19c0f..fafd300 100644
--- a/x11-misc/openbox-menu/metadata.xml
+++ b/x11-misc/openbox-menu/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-misc</herd>

diff --git a/x11-misc/pcmanfm-qt/metadata.xml b/x11-misc/pcmanfm-qt/metadata.xml
index 9a2f4a1..716a047 100644
--- a/x11-misc/pcmanfm-qt/metadata.xml
+++ b/x11-misc/pcmanfm-qt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>lxqt</herd>

diff --git a/x11-misc/pcmanfm/metadata.xml b/x11-misc/pcmanfm/metadata.xml
index 5ceea9c..3522b15 100644
--- a/x11-misc/pcmanfm/metadata.xml
+++ b/x11-misc/pcmanfm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>lxde</herd>

diff --git a/x11-misc/peksystray/metadata.xml b/x11-misc/peksystray/metadata.xml
index 00bc271..a7d80a1 100644
--- a/x11-misc/peksystray/metadata.xml
+++ b/x11-misc/peksystray/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-misc/quitcount/metadata.xml b/x11-misc/quitcount/metadata.xml
index 88c4ea3..ecca240 100644
--- a/x11-misc/quitcount/metadata.xml
+++ b/x11-misc/quitcount/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/x11-misc/screengrab/metadata.xml b/x11-misc/screengrab/metadata.xml
index 8b08170..2c3e781 100644
--- a/x11-misc/screengrab/metadata.xml
+++ b/x11-misc/screengrab/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>qt</herd>

diff --git a/x11-misc/seetxt/metadata.xml b/x11-misc/seetxt/metadata.xml
index 1ac6473..b64f58b 100644
--- a/x11-misc/seetxt/metadata.xml
+++ b/x11-misc/seetxt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-misc/sent/metadata.xml b/x11-misc/sent/metadata.xml
index c52c56b..ae6622f 100644
--- a/x11-misc/sent/metadata.xml
+++ b/x11-misc/sent/metadata.xml
@@ -6,6 +6,6 @@
 <name>Jeroen Roovers</name>
 </maintainer>
 <use>
-<flag name='savedconfig'>Without a saved config.h, this package depends on <pkg>media-gfx/farbfeld</pkg> for image conversions</flag>
+<flag name="savedconfig">Without a saved config.h, this package depends on <pkg>media-gfx/farbfeld</pkg> for image conversions</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-misc/set_opacity/metadata.xml b/x11-misc/set_opacity/metadata.xml
index 5653aaf..6e94119 100644
--- a/x11-misc/set_opacity/metadata.xml
+++ b/x11-misc/set_opacity/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/x11-misc/shutter/metadata.xml b/x11-misc/shutter/metadata.xml
index 0cde073..441dd42 100644
--- a/x11-misc/shutter/metadata.xml
+++ b/x11-misc/shutter/metadata.xml
@@ -13,4 +13,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/x11-misc/spacefm/metadata.xml b/x11-misc/spacefm/metadata.xml
index f8b04f9..e6898d6 100644
--- a/x11-misc/spacefm/metadata.xml
+++ b/x11-misc/spacefm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-misc/sprop/metadata.xml b/x11-misc/sprop/metadata.xml
index 704d8f9..ef0483f 100644
--- a/x11-misc/sprop/metadata.xml
+++ b/x11-misc/sprop/metadata.xml
@@ -6,4 +6,3 @@
 <name>Jeroen Roovers</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-misc/sselp/metadata.xml b/x11-misc/sselp/metadata.xml
index d6e0a0f..08ca0a5 100644
--- a/x11-misc/sselp/metadata.xml
+++ b/x11-misc/sselp/metadata.xml
@@ -7,4 +7,3 @@
 <name>Jeroen Roovers</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-misc/sw-notify-send/metadata.xml b/x11-misc/sw-notify-send/metadata.xml
index 36d26ca..72c0c93 100644
--- a/x11-misc/sw-notify-send/metadata.xml
+++ b/x11-misc/sw-notify-send/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-misc/tabbed/metadata.xml b/x11-misc/tabbed/metadata.xml
index d6e0a0f..08ca0a5 100644
--- a/x11-misc/tabbed/metadata.xml
+++ b/x11-misc/tabbed/metadata.xml
@@ -7,4 +7,3 @@
 <name>Jeroen Roovers</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-misc/vdpauinfo/metadata.xml b/x11-misc/vdpauinfo/metadata.xml
index e8b7c34..a445a73 100644
--- a/x11-misc/vdpauinfo/metadata.xml
+++ b/x11-misc/vdpauinfo/metadata.xml
@@ -6,4 +6,3 @@
 		<name>Doug Goldstein</name>
 	</maintainer>
 </pkgmetadata>
-

diff --git a/x11-misc/winswitch/metadata.xml b/x11-misc/winswitch/metadata.xml
index 475f302..752124f 100644
--- a/x11-misc/winswitch/metadata.xml
+++ b/x11-misc/winswitch/metadata.xml
@@ -10,4 +10,3 @@
 	<bugs-to>https://winswitch.org/trac/report</bugs-to>
 </upstream>
 </pkgmetadata>
-

diff --git a/x11-misc/wmname/metadata.xml b/x11-misc/wmname/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/x11-misc/wmname/metadata.xml
+++ b/x11-misc/wmname/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-misc/x11vnc/metadata.xml b/x11-misc/x11vnc/metadata.xml
index a9e6e83..c5d0849 100644
--- a/x11-misc/x11vnc/metadata.xml
+++ b/x11-misc/x11vnc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/x11-misc/xdialog/metadata.xml b/x11-misc/xdialog/metadata.xml
index 91ed741..40838bc 100644
--- a/x11-misc/xdialog/metadata.xml
+++ b/x11-misc/xdialog/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>desktop-misc</herd>
 </pkgmetadata>
-

diff --git a/x11-misc/xdiskusage/metadata.xml b/x11-misc/xdiskusage/metadata.xml
index 2e78621..e4f009e 100644
--- a/x11-misc/xdiskusage/metadata.xml
+++ b/x11-misc/xdiskusage/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <herd>desktop-misc</herd>

diff --git a/x11-misc/xearth/metadata.xml b/x11-misc/xearth/metadata.xml
index 0e92f14..2518313 100644
--- a/x11-misc/xearth/metadata.xml
+++ b/x11-misc/xearth/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
         <herd>desktop-misc</herd>
 </pkgmetadata>
-

diff --git a/x11-misc/xmobar/metadata.xml b/x11-misc/xmobar/metadata.xml
index e4837ee..007f343 100644
--- a/x11-misc/xmobar/metadata.xml
+++ b/x11-misc/xmobar/metadata.xml
@@ -6,9 +6,9 @@
 		<email>haskell@gentoo.org</email>
 	</maintainer>
 	<use>
-		<flag name='mpd'>Support mpd plugin</flag>
-		<flag name='mpris'>Enables MPRIS v1, v2  support</flag>
-		<flag name='timezone'>Enables localized date support</flag>
+		<flag name="mpd">Support mpd plugin</flag>
+		<flag name="mpris">Enables MPRIS v1, v2  support</flag>
+		<flag name="timezone">Enables localized date support</flag>
 	</use>
 	<longdescription>
 		Xmobar is a minimalistic text based status bar.

diff --git a/x11-misc/xscreensaver/metadata.xml b/x11-misc/xscreensaver/metadata.xml
index 2e1f101..5f7839b 100644
--- a/x11-misc/xscreensaver/metadata.xml
+++ b/x11-misc/xscreensaver/metadata.xml
@@ -9,7 +9,7 @@
     </maintainer>
   </upstream>
   <use>
-    <flag name='gdm'>Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
-    <flag name='new-login'>Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>) or kdmctl (<pkg>kde-base/kdm</pkg>)</flag>
+    <flag name="gdm">Use gdmflexiserver from <pkg>gnome-base/gdm</pkg> instead of <pkg>x11-misc/lightdm</pkg></flag>
+    <flag name="new-login">Enable user switching support using gdmflexiserver (<pkg>x11-misc/lightdm</pkg>) or kdmctl (<pkg>kde-base/kdm</pkg>)</flag>
   </use>
 </pkgmetadata>

diff --git a/x11-misc/xssstate/metadata.xml b/x11-misc/xssstate/metadata.xml
index d6e0a0f..08ca0a5 100644
--- a/x11-misc/xssstate/metadata.xml
+++ b/x11-misc/xssstate/metadata.xml
@@ -7,4 +7,3 @@
 <name>Jeroen Roovers</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-misc/xwinwrap/metadata.xml b/x11-misc/xwinwrap/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/x11-misc/xwinwrap/metadata.xml
+++ b/x11-misc/xwinwrap/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-plugins/bfm/metadata.xml b/x11-plugins/bfm/metadata.xml
index 1462325..0e1f5fa 100644
--- a/x11-plugins/bfm/metadata.xml
+++ b/x11-plugins/bfm/metadata.xml
@@ -8,7 +8,7 @@
 </maintainer>
 
 <use>
-	<flag name='gkrellm'>Enable building of <pkg>app-admin/gkrellm</pkg>
+	<flag name="gkrellm">Enable building of <pkg>app-admin/gkrellm</pkg>
 		module</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-plugins/compiz-plugins-extra/metadata.xml b/x11-plugins/compiz-plugins-extra/metadata.xml
index 907c491..3cde455 100644
--- a/x11-plugins/compiz-plugins-extra/metadata.xml
+++ b/x11-plugins/compiz-plugins-extra/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>desktop-effects</herd>
 <longdescription lang="en">
->Package with several compiz-fusion plugins:
+&gt;Package with several compiz-fusion plugins:
 addhelper, bench, crashhandler, cubecaps, cubereflex, extrawm, fadedesktop, firepaint, gears,
 goto-viewport, group, mblur, reflex, scalefilter, showdesktop, splash, trailfocus, widget.
 </longdescription>
@@ -14,4 +14,3 @@ goto-viewport, group, mblur, reflex, scalefilter, showdesktop, splash, trailfocu
     </flag>
   </use>
 </pkgmetadata>
-

diff --git a/x11-plugins/desklet-ImageSlideShow/metadata.xml b/x11-plugins/desklet-ImageSlideShow/metadata.xml
index 687d5ef..1420c98 100644
--- a/x11-plugins/desklet-ImageSlideShow/metadata.xml
+++ b/x11-plugins/desklet-ImageSlideShow/metadata.xml
@@ -13,4 +13,3 @@
 		</maintainer>
 	</upstream>
 </pkgmetadata>
-

diff --git a/x11-plugins/desklet-SlideShow/metadata.xml b/x11-plugins/desklet-SlideShow/metadata.xml
index 9e90bea..2d7f97b 100644
--- a/x11-plugins/desklet-SlideShow/metadata.xml
+++ b/x11-plugins/desklet-SlideShow/metadata.xml
@@ -13,4 +13,3 @@
 		</maintainer>
 	</upstream>
 </pkgmetadata>
-

diff --git a/x11-plugins/echievements/metadata.xml b/x11-plugins/echievements/metadata.xml
index 71cdd72..99165ad 100644
--- a/x11-plugins/echievements/metadata.xml
+++ b/x11-plugins/echievements/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>

diff --git a/x11-plugins/epplets/metadata.xml b/x11-plugins/epplets/metadata.xml
index 487ff7f..55f8757 100644
--- a/x11-plugins/epplets/metadata.xml
+++ b/x11-plugins/epplets/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <longdescription>
@@ -10,6 +10,6 @@ epplets, including CPU monitors, clocks, a mail checker, mixers, a
 slideshow, a URL grabber, a panel-like toolbar, and more.
 </longdescription>
 <upstream>
-	<remote-id type='sourceforge'>enlightenment</remote-id>
+	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/x11-plugins/hexchat-javascript/metadata.xml b/x11-plugins/hexchat-javascript/metadata.xml
index ce4ef9a..e3d9ae3 100644
--- a/x11-plugins/hexchat-javascript/metadata.xml
+++ b/x11-plugins/hexchat-javascript/metadata.xml
@@ -6,12 +6,12 @@
 		<name>Julian Ospald</name>
 	</maintainer>
 	<upstream>
-		<maintainer status='active'>
+		<maintainer status="active">
 			<email>tingping@fedoraproject.org</email>
 			<name>TingPing</name>
 		</maintainer>
 		<bugs-to>https://github.com/TingPing/hexchat-javascript/issues</bugs-to>
-		<doc lang='en'>https://github.com/TingPing/hexchat-javascript/wiki</doc>
-		<remote-id type='github'>TingPing/hexchat-javascript</remote-id>
+		<doc lang="en">https://github.com/TingPing/hexchat-javascript/wiki</doc>
+		<remote-id type="github">TingPing/hexchat-javascript</remote-id>
 	</upstream>
 </pkgmetadata>

diff --git a/x11-plugins/pidgin-led-notification/metadata.xml b/x11-plugins/pidgin-led-notification/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/x11-plugins/pidgin-led-notification/metadata.xml
+++ b/x11-plugins/pidgin-led-notification/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-plugins/qled/metadata.xml b/x11-plugins/qled/metadata.xml
index 5e3a61a..77bb27a 100644
--- a/x11-plugins/qled/metadata.xml
+++ b/x11-plugins/qled/metadata.xml
@@ -8,4 +8,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/x11-plugins/tomboy-reminder/metadata.xml b/x11-plugins/tomboy-reminder/metadata.xml
index a09f4a5..9500449 100644
--- a/x11-plugins/tomboy-reminder/metadata.xml
+++ b/x11-plugins/tomboy-reminder/metadata.xml
@@ -5,4 +5,3 @@
 	<longdescription lang="en">
 	</longdescription>
 </pkgmetadata>
-

diff --git a/x11-plugins/vicious/metadata.xml b/x11-plugins/vicious/metadata.xml
index d607863..3fd76ee 100644
--- a/x11-plugins/vicious/metadata.xml
+++ b/x11-plugins/vicious/metadata.xml
@@ -13,4 +13,3 @@
 		<flag name="contrib">Install extra widgets, some for less common hardware, some contributed by Vicious users.</flag>
 	</use>
 </pkgmetadata>
-

diff --git a/x11-plugins/wmbio/metadata.xml b/x11-plugins/wmbio/metadata.xml
index 5d7864a..3717223 100644
--- a/x11-plugins/wmbio/metadata.xml
+++ b/x11-plugins/wmbio/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-dock</herd>

diff --git a/x11-plugins/wmfire/metadata.xml b/x11-plugins/wmfire/metadata.xml
index 7433588..42b9183 100644
--- a/x11-plugins/wmfire/metadata.xml
+++ b/x11-plugins/wmfire/metadata.xml
@@ -13,6 +13,6 @@ fire, possibly according to how much load the system is experiencing, or from a
 number somewhere in a file. wmfire requires very little CPU.
 </longdescription>
 <use>
-	<flag name='session'>Enable session management</flag>
+	<flag name="session">Enable session management</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-plugins/wmsysmon/metadata.xml b/x11-plugins/wmsysmon/metadata.xml
index 6b0f712..628e3b6 100644
--- a/x11-plugins/wmsysmon/metadata.xml
+++ b/x11-plugins/wmsysmon/metadata.xml
@@ -8,7 +8,7 @@
 </maintainer>
 
 <use>
-	<flag name='high-ints'>Enable support for monitoring 24 interrupts. Useful
+	<flag name="high-ints">Enable support for monitoring 24 interrupts. Useful
 		on SMP machines</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-terms/aterm/metadata.xml b/x11-terms/aterm/metadata.xml
index d2e368a..8fc8c26 100644
--- a/x11-terms/aterm/metadata.xml
+++ b/x11-terms/aterm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-terms/eterm/metadata.xml b/x11-terms/eterm/metadata.xml
index 988e7d9..c6b8570 100644
--- a/x11-terms/eterm/metadata.xml
+++ b/x11-terms/eterm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-terms/hanterm/metadata.xml b/x11-terms/hanterm/metadata.xml
index d137f43..fbc6117 100644
--- a/x11-terms/hanterm/metadata.xml
+++ b/x11-terms/hanterm/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 <herd>cjk</herd>
 <use>
-	<flag name='utempter'>Records user logins. Useful on multi-user
+	<flag name="utempter">Records user logins. Useful on multi-user
 		systems</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-terms/terminology/metadata.xml b/x11-terms/terminology/metadata.xml
index f2069a7..b501a20 100644
--- a/x11-terms/terminology/metadata.xml
+++ b/x11-terms/terminology/metadata.xml
@@ -1,9 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <maintainer>
 	<email>sera@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-terms/valaterm/metadata.xml b/x11-terms/valaterm/metadata.xml
index 98bcbae..c2d8655 100644
--- a/x11-terms/valaterm/metadata.xml
+++ b/x11-terms/valaterm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/x11-themes/bespin/metadata.xml b/x11-themes/bespin/metadata.xml
index a38b762..196dab9 100644
--- a/x11-themes/bespin/metadata.xml
+++ b/x11-themes/bespin/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>kde</herd>

diff --git a/x11-themes/clearlooks-phenix/metadata.xml b/x11-themes/clearlooks-phenix/metadata.xml
index 4c8b53e..c0e6480 100644
--- a/x11-themes/clearlooks-phenix/metadata.xml
+++ b/x11-themes/clearlooks-phenix/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/x11-themes/ethemes/metadata.xml b/x11-themes/ethemes/metadata.xml
index c8e8ac1..ac83800 100644
--- a/x11-themes/ethemes/metadata.xml
+++ b/x11-themes/ethemes/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <upstream>
-	<remote-id type='sourceforge'>enlightenment</remote-id>
+	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/x11-themes/experience/metadata.xml b/x11-themes/experience/metadata.xml
index 3c39be2..76f8779 100644
--- a/x11-themes/experience/metadata.xml
+++ b/x11-themes/experience/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>gnome</herd>

diff --git a/x11-themes/gentoo-artwork/metadata.xml b/x11-themes/gentoo-artwork/metadata.xml
index 8683b47..9becedd 100644
--- a/x11-themes/gentoo-artwork/metadata.xml
+++ b/x11-themes/gentoo-artwork/metadata.xml
@@ -5,9 +5,9 @@
 	<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>
-	<flag name='lilo'>Install extra <pkg>sys-boot/lilo</pkg> themes</flag>
-	<flag name='pixmaps'>Install pixmaps</flag>
+	<flag name="grub">Install extra <pkg>sys-boot/grub</pkg> themes</flag>
+	<flag name="icons">Install icons</flag>
+	<flag name="lilo">Install extra <pkg>sys-boot/lilo</pkg> themes</flag>
+	<flag name="pixmaps">Install pixmaps</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-themes/gnome-colors-common/metadata.xml b/x11-themes/gnome-colors-common/metadata.xml
index c421ccf..72f3ce1 100644
--- a/x11-themes/gnome-colors-common/metadata.xml
+++ b/x11-themes/gnome-colors-common/metadata.xml
@@ -6,4 +6,4 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/x11-themes/gnome-colors-themes/metadata.xml b/x11-themes/gnome-colors-themes/metadata.xml
index c421ccf..72f3ce1 100644
--- a/x11-themes/gnome-colors-themes/metadata.xml
+++ b/x11-themes/gnome-colors-themes/metadata.xml
@@ -6,4 +6,4 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/x11-themes/gtk-engines-quartz/metadata.xml b/x11-themes/gtk-engines-quartz/metadata.xml
index dfd678b..87bca60 100644
--- a/x11-themes/gtk-engines-quartz/metadata.xml
+++ b/x11-themes/gtk-engines-quartz/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>prefix</herd>

diff --git a/x11-themes/noia/metadata.xml b/x11-themes/noia/metadata.xml
index 6222792..8d1e86a 100644
--- a/x11-themes/noia/metadata.xml
+++ b/x11-themes/noia/metadata.xml
@@ -3,4 +3,3 @@
 <pkgmetadata>
 <herd>kde</herd>
 </pkgmetadata>
-

diff --git a/x11-themes/redhat-artwork/metadata.xml b/x11-themes/redhat-artwork/metadata.xml
index f7a0168..b0b7dd2 100644
--- a/x11-themes/redhat-artwork/metadata.xml
+++ b/x11-themes/redhat-artwork/metadata.xml
@@ -3,11 +3,11 @@
 <pkgmetadata>
 <herd>desktop-misc</herd>
 <use>
-<flag name='audacious'>Install <pkg>media-sound/audacious</pkg> theme</flag>
-<flag name='cursors'>Install Bluecurve cursors</flag>
-<flag name='gdm'>Install Bluecurve <pkg>gnome-base/gdm</pkg> theme</flag>
-<flag name='icons'>Install Bluecurve icons</flag>
-<flag name='kdm'>Install Bluecurve <pkg>kde-base/kdm</pkg> theme</flag>
-<flag name='nautilus'>Install Bluecurve <pkg>gnome-base/nautilus</pkg> icons</flag>
+<flag name="audacious">Install <pkg>media-sound/audacious</pkg> theme</flag>
+<flag name="cursors">Install Bluecurve cursors</flag>
+<flag name="gdm">Install Bluecurve <pkg>gnome-base/gdm</pkg> theme</flag>
+<flag name="icons">Install Bluecurve icons</flag>
+<flag name="kdm">Install Bluecurve <pkg>kde-base/kdm</pkg> theme</flag>
+<flag name="nautilus">Install Bluecurve <pkg>gnome-base/nautilus</pkg> icons</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-themes/shiki-colors/metadata.xml b/x11-themes/shiki-colors/metadata.xml
index c421ccf..72f3ce1 100644
--- a/x11-themes/shiki-colors/metadata.xml
+++ b/x11-themes/shiki-colors/metadata.xml
@@ -6,4 +6,4 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>

diff --git a/x11-themes/skinenigmang-logos/metadata.xml b/x11-themes/skinenigmang-logos/metadata.xml
index 73526be..cf0f793 100644
--- a/x11-themes/skinenigmang-logos/metadata.xml
+++ b/x11-themes/skinenigmang-logos/metadata.xml
@@ -7,7 +7,7 @@
 			<name>Gentoo VDR Project</name>
 		</maintainer>
 		<use>
-			<flag name='dxr3'>Install logos for lower osd color depth on dxr3
+			<flag name="dxr3">Install logos for lower osd color depth on dxr3
 				cards</flag>
 		</use>
 </pkgmetadata>

diff --git a/x11-themes/tactile/metadata.xml b/x11-themes/tactile/metadata.xml
index 4cd51bb..1385936 100644
--- a/x11-themes/tactile/metadata.xml
+++ b/x11-themes/tactile/metadata.xml
@@ -14,4 +14,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/x11-themes/tactile3/metadata.xml b/x11-themes/tactile3/metadata.xml
index 4cd51bb..1385936 100644
--- a/x11-themes/tactile3/metadata.xml
+++ b/x11-themes/tactile3/metadata.xml
@@ -14,4 +14,3 @@
 <longdescription lang="en">
 </longdescription>
 </pkgmetadata>
-

diff --git a/x11-themes/vdrgraphtft-avp/metadata.xml b/x11-themes/vdrgraphtft-avp/metadata.xml
index 5f9f146..4399dba 100644
--- a/x11-themes/vdrgraphtft-avp/metadata.xml
+++ b/x11-themes/vdrgraphtft-avp/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-themes/vdrgraphtft-deepblue/metadata.xml b/x11-themes/vdrgraphtft-deepblue/metadata.xml
index 5f9f146..4399dba 100644
--- a/x11-themes/vdrgraphtft-deepblue/metadata.xml
+++ b/x11-themes/vdrgraphtft-deepblue/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-themes/vdrgraphtft-deeppurple/metadata.xml b/x11-themes/vdrgraphtft-deeppurple/metadata.xml
index 5f9f146..4399dba 100644
--- a/x11-themes/vdrgraphtft-deeppurple/metadata.xml
+++ b/x11-themes/vdrgraphtft-deeppurple/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-themes/vdrgraphtft-poetter/metadata.xml b/x11-themes/vdrgraphtft-poetter/metadata.xml
index 5f9f146..4399dba 100644
--- a/x11-themes/vdrgraphtft-poetter/metadata.xml
+++ b/x11-themes/vdrgraphtft-poetter/metadata.xml
@@ -7,4 +7,3 @@
 <name>Gentoo VDR Project</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-themes/wm-icons/metadata.xml b/x11-themes/wm-icons/metadata.xml
index 7483d42..ff5adc5 100644
--- a/x11-themes/wm-icons/metadata.xml
+++ b/x11-themes/wm-icons/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
     <maintainer>

diff --git a/x11-wm/afterstep/metadata.xml b/x11-wm/afterstep/metadata.xml
index 4a5fb75..f06b35b 100644
--- a/x11-wm/afterstep/metadata.xml
+++ b/x11-wm/afterstep/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/x11-wm/echinus/metadata.xml b/x11-wm/echinus/metadata.xml
index bc2c871..5285033 100644
--- a/x11-wm/echinus/metadata.xml
+++ b/x11-wm/echinus/metadata.xml
@@ -7,6 +7,6 @@
 		<name>Nico R. Wohlgemuth</name>
 	</maintainer>
 	<use>
-		<flag name='xrandr'>Enable support for multihead configuration</flag>
+		<flag name="xrandr">Enable support for multihead configuration</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index d044760..46f7522 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -1,75 +1,75 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
-	<flag name='pango'>Enable pango font rendering</flag>
-	<flag name='xrandr'>Enable support for the X xrandr extension</flag>
-	<flag name='udev'>Use sys-fs/udev to determine available devices</flag>
-	<flag name='ukit'>Use upower/udisks to automount devices</flag>
-	<flag name='enlightenment_modules_access'>Accessibility module designed to improve ease of use for the vision impaired and the blind</flag>
-	<flag name='enlightenment_modules_appmenu'>Gadget that hold the toolbar of the foreground application</flag>
-	<flag name='enlightenment_modules_backlight'>Backlight control slider gadget</flag>
-	<flag name='enlightenment_modules_battery'>A gadget to visualize your battery status</flag>
-	<flag name='enlightenment_modules_bluez4'>Configure Bluetooth devices</flag>
-	<flag name='enlightenment_modules_clock'>Nice clock gadget to show current time</flag>
-	<flag name='enlightenment_modules_connman'>Control Wifi and wired networks as a user</flag>
-	<flag name='enlightenment_modules_contact'>Enable the contact module</flag>
-	<flag name='enlightenment_modules_cpufreq'>Gadget to monitor and change the CPU frequency</flag>
-	<flag name='enlightenment_modules_everything'>The run command module provides an application launcher dialog</flag>
-	<flag name='enlightenment_modules_fileman'>Enlightenment's integrated file manager</flag>
-	<flag name='enlightenment_modules_fileman-opinfo'>Can be placed on the desktop or in a shelf</flag>
-	<flag name='enlightenment_modules_gadman'>Module to manage gadgets on the desktop</flag>
-	<flag name='enlightenment_modules_geolocation'>Geolocation</flag>
-	<flag name='enlightenment_modules_ibar'>Iconic application launcher</flag>
-	<flag name='enlightenment_modules_ibox'>A home for your iconified applications</flag>
-	<flag name='enlightenment_modules_illume2'>Illume2 - next generation of illume - special WM mode for embedded devices and set of plugins with same purpose</flag>
-	<flag name='enlightenment_modules_lokker'>Screen locker</flag>
-	<flag name='enlightenment_modules_mixer'>A module to provide a mixer for changing volume</flag>
-	<flag name='enlightenment_modules_msgbus'>DBus Extension</flag>
-	<flag name='enlightenment_modules_music-control'>Control your music in your shelf</flag>
-	<flag name='enlightenment_modules_notification'>notification-daemon alternative. Popup if an event occur</flag>
-	<flag name='enlightenment_modules_packagekit'>Package manager integration</flag>
-	<flag name='enlightenment_modules_pager'>Gadget to allow you to visualize your virtual desktops and the windows they contain</flag>
-	<flag name='enlightenment_modules_pager-plain'>A simpler desktop pager</flag>
-	<flag name='enlightenment_modules_policy-mobile'></flag>
-	<flag name='enlightenment_modules_quickaccess'>Enlightenment Quickaccess Launcher</flag>
-	<flag name='enlightenment_modules_shot'>Simple screenshot+save/upload module</flag>
-	<flag name='enlightenment_modules_start'>Enlightenment's 'Start' button equivalent</flag>
-	<flag name='enlightenment_modules_syscon'>This module provides a unified popup dialog for all the system actions in Enlightenment</flag>
-	<flag name='enlightenment_modules_systray'>system tray that hold applications icons like Skype, Pidgin, Kopete and others</flag>
-	<flag name='enlightenment_modules_tasks'>Gadget to allow you to switch tasks</flag>
-	<flag name='enlightenment_modules_teamwork'>Enable teamwork module</flag>
-	<flag name='enlightenment_modules_temperature'>Temperature monitor</flag>
-	<flag name='enlightenment_modules_tiling'>Positions/resizes your windows tilingly</flag>
-	<flag name='enlightenment_modules_winlist'>A module to show the list of client applications presently running</flag>
-	<flag name='enlightenment_modules_wizard'>First Run Wizard</flag>
-	<flag name='enlightenment_modules_wl-desktop-shell'>Enlightenment Wayland Desktop Shell</flag>
-	<flag name='enlightenment_modules_wl-drm'>Wayland DRM (Direct Rendering Manager) compositing module</flag>
-	<flag name='enlightenment_modules_wl-screenshot'>Enlightenment Wayland Screenshot module</flag>
-	<flag name='enlightenment_modules_wl-text-input'>Wayland text input support</flag>
-	<flag name='enlightenment_modules_wl-weekeyboard'>Wayland virtual keyboard</flag>
-	<flag name='enlightenment_modules_wl-wl'>Wayland-in-Wayland module</flag>
-	<flag name='enlightenment_modules_wl-x11'>Wayland-in-X11 module</flag>
-	<flag name='enlightenment_modules_xkbswitch'>Keyboard layout configuration and switcher</flag>
-	<flag name='enlightenment_modules_xwayland'>X/Wayland integration</flag>
-	<flag name='enlightenment_modules_conf'>Settings Panel</flag>
-	<flag name='enlightenment_modules_conf-applications'>Allows configuration of Ibar, Restart, and Startup applications</flag>
-	<flag name='enlightenment_modules_conf-bindings'>Input Control Settings</flag>
-	<flag name='enlightenment_modules_conf-comp'>Configure default dialog properties</flag>
-	<flag name='enlightenment_modules_conf-dialogs'>Configure default dialog properties</flag>
-	<flag name='enlightenment_modules_conf-display'>Used to configure your screen</flag>
-	<flag name='enlightenment_modules_conf-interaction'>Configure Mouse and Touch input</flag>
-	<flag name='enlightenment_modules_conf-intl'>Used to select a default language</flag>
-	<flag name='enlightenment_modules_conf-menus'>Configures menu behavior</flag>
-	<flag name='enlightenment_modules_conf-paths'>Specifies the Enlightenment search paths and default directories</flag>
-	<flag name='enlightenment_modules_conf-performance'>Used to configure certain performance related items as frame rates and cache settings</flag>
-	<flag name='enlightenment_modules_conf-randr'>Used to configure your screen's resolution</flag>
-	<flag name='enlightenment_modules_conf-shelves'>Shelf configuration dialog</flag>
-	<flag name='enlightenment_modules_conf-theme'>Used to configure your theme preferences</flag>
-	<flag name='enlightenment_modules_conf-wallpaper2'>Used to configure your theme preferences</flag>
-	<flag name='enlightenment_modules_conf-window-manipulation'>Configures window raise, resistance, and maximize policies</flag>
-	<flag name='enlightenment_modules_conf-window-remembers'>Delete existing window remembers</flag>
+	<flag name="pango">Enable pango font rendering</flag>
+	<flag name="xrandr">Enable support for the X xrandr extension</flag>
+	<flag name="udev">Use sys-fs/udev to determine available devices</flag>
+	<flag name="ukit">Use upower/udisks to automount devices</flag>
+	<flag name="enlightenment_modules_access">Accessibility module designed to improve ease of use for the vision impaired and the blind</flag>
+	<flag name="enlightenment_modules_appmenu">Gadget that hold the toolbar of the foreground application</flag>
+	<flag name="enlightenment_modules_backlight">Backlight control slider gadget</flag>
+	<flag name="enlightenment_modules_battery">A gadget to visualize your battery status</flag>
+	<flag name="enlightenment_modules_bluez4">Configure Bluetooth devices</flag>
+	<flag name="enlightenment_modules_clock">Nice clock gadget to show current time</flag>
+	<flag name="enlightenment_modules_connman">Control Wifi and wired networks as a user</flag>
+	<flag name="enlightenment_modules_contact">Enable the contact module</flag>
+	<flag name="enlightenment_modules_cpufreq">Gadget to monitor and change the CPU frequency</flag>
+	<flag name="enlightenment_modules_everything">The run command module provides an application launcher dialog</flag>
+	<flag name="enlightenment_modules_fileman">Enlightenment's integrated file manager</flag>
+	<flag name="enlightenment_modules_fileman-opinfo">Can be placed on the desktop or in a shelf</flag>
+	<flag name="enlightenment_modules_gadman">Module to manage gadgets on the desktop</flag>
+	<flag name="enlightenment_modules_geolocation">Geolocation</flag>
+	<flag name="enlightenment_modules_ibar">Iconic application launcher</flag>
+	<flag name="enlightenment_modules_ibox">A home for your iconified applications</flag>
+	<flag name="enlightenment_modules_illume2">Illume2 - next generation of illume - special WM mode for embedded devices and set of plugins with same purpose</flag>
+	<flag name="enlightenment_modules_lokker">Screen locker</flag>
+	<flag name="enlightenment_modules_mixer">A module to provide a mixer for changing volume</flag>
+	<flag name="enlightenment_modules_msgbus">DBus Extension</flag>
+	<flag name="enlightenment_modules_music-control">Control your music in your shelf</flag>
+	<flag name="enlightenment_modules_notification">notification-daemon alternative. Popup if an event occur</flag>
+	<flag name="enlightenment_modules_packagekit">Package manager integration</flag>
+	<flag name="enlightenment_modules_pager">Gadget to allow you to visualize your virtual desktops and the windows they contain</flag>
+	<flag name="enlightenment_modules_pager-plain">A simpler desktop pager</flag>
+	<flag name="enlightenment_modules_policy-mobile"/>
+	<flag name="enlightenment_modules_quickaccess">Enlightenment Quickaccess Launcher</flag>
+	<flag name="enlightenment_modules_shot">Simple screenshot+save/upload module</flag>
+	<flag name="enlightenment_modules_start">Enlightenment's 'Start' button equivalent</flag>
+	<flag name="enlightenment_modules_syscon">This module provides a unified popup dialog for all the system actions in Enlightenment</flag>
+	<flag name="enlightenment_modules_systray">system tray that hold applications icons like Skype, Pidgin, Kopete and others</flag>
+	<flag name="enlightenment_modules_tasks">Gadget to allow you to switch tasks</flag>
+	<flag name="enlightenment_modules_teamwork">Enable teamwork module</flag>
+	<flag name="enlightenment_modules_temperature">Temperature monitor</flag>
+	<flag name="enlightenment_modules_tiling">Positions/resizes your windows tilingly</flag>
+	<flag name="enlightenment_modules_winlist">A module to show the list of client applications presently running</flag>
+	<flag name="enlightenment_modules_wizard">First Run Wizard</flag>
+	<flag name="enlightenment_modules_wl-desktop-shell">Enlightenment Wayland Desktop Shell</flag>
+	<flag name="enlightenment_modules_wl-drm">Wayland DRM (Direct Rendering Manager) compositing module</flag>
+	<flag name="enlightenment_modules_wl-screenshot">Enlightenment Wayland Screenshot module</flag>
+	<flag name="enlightenment_modules_wl-text-input">Wayland text input support</flag>
+	<flag name="enlightenment_modules_wl-weekeyboard">Wayland virtual keyboard</flag>
+	<flag name="enlightenment_modules_wl-wl">Wayland-in-Wayland module</flag>
+	<flag name="enlightenment_modules_wl-x11">Wayland-in-X11 module</flag>
+	<flag name="enlightenment_modules_xkbswitch">Keyboard layout configuration and switcher</flag>
+	<flag name="enlightenment_modules_xwayland">X/Wayland integration</flag>
+	<flag name="enlightenment_modules_conf">Settings Panel</flag>
+	<flag name="enlightenment_modules_conf-applications">Allows configuration of Ibar, Restart, and Startup applications</flag>
+	<flag name="enlightenment_modules_conf-bindings">Input Control Settings</flag>
+	<flag name="enlightenment_modules_conf-comp">Configure default dialog properties</flag>
+	<flag name="enlightenment_modules_conf-dialogs">Configure default dialog properties</flag>
+	<flag name="enlightenment_modules_conf-display">Used to configure your screen</flag>
+	<flag name="enlightenment_modules_conf-interaction">Configure Mouse and Touch input</flag>
+	<flag name="enlightenment_modules_conf-intl">Used to select a default language</flag>
+	<flag name="enlightenment_modules_conf-menus">Configures menu behavior</flag>
+	<flag name="enlightenment_modules_conf-paths">Specifies the Enlightenment search paths and default directories</flag>
+	<flag name="enlightenment_modules_conf-performance">Used to configure certain performance related items as frame rates and cache settings</flag>
+	<flag name="enlightenment_modules_conf-randr">Used to configure your screen's resolution</flag>
+	<flag name="enlightenment_modules_conf-shelves">Shelf configuration dialog</flag>
+	<flag name="enlightenment_modules_conf-theme">Used to configure your theme preferences</flag>
+	<flag name="enlightenment_modules_conf-wallpaper2">Used to configure your theme preferences</flag>
+	<flag name="enlightenment_modules_conf-window-manipulation">Configures window raise, resistance, and maximize policies</flag>
+	<flag name="enlightenment_modules_conf-window-remembers">Delete existing window remembers</flag>
 </use>
 <longdescription>
 Enlightenment is a completely themeable, highly configurable Window Manager for 
@@ -114,6 +114,6 @@ Enlightenment Features:
 * Graphical on-line help.
 </longdescription>
 <upstream>
-	<remote-id type='sourceforge'>enlightenment</remote-id>
+	<remote-id type="sourceforge">enlightenment</remote-id>
 </upstream>
 </pkgmetadata>

diff --git a/x11-wm/evilwm/metadata.xml b/x11-wm/evilwm/metadata.xml
index 722f36c..cc1d791 100644
--- a/x11-wm/evilwm/metadata.xml
+++ b/x11-wm/evilwm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/x11-wm/fluxbox/metadata.xml b/x11-wm/fluxbox/metadata.xml
index dc1e894..b28784b 100644
--- a/x11-wm/fluxbox/metadata.xml
+++ b/x11-wm/fluxbox/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-wm/goomwwm/metadata.xml b/x11-wm/goomwwm/metadata.xml
index 704d8f9..ef0483f 100644
--- a/x11-wm/goomwwm/metadata.xml
+++ b/x11-wm/goomwwm/metadata.xml
@@ -6,4 +6,3 @@
 <name>Jeroen Roovers</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-wm/icewm/metadata.xml b/x11-wm/icewm/metadata.xml
index 9605bdb..86ceccd 100644
--- a/x11-wm/icewm/metadata.xml
+++ b/x11-wm/icewm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer>

diff --git a/x11-wm/matchbox-common/metadata.xml b/x11-wm/matchbox-common/metadata.xml
index ad51fb7..0f45a91 100644
--- a/x11-wm/matchbox-common/metadata.xml
+++ b/x11-wm/matchbox-common/metadata.xml
@@ -3,6 +3,6 @@
 <pkgmetadata>
 <herd>gpe</herd>
 <use>
-	<flag name='pda'>Support for pda folders</flag>
+	<flag name="pda">Support for pda folders</flag>
 </use>
 </pkgmetadata>

diff --git a/x11-wm/notion/metadata.xml b/x11-wm/notion/metadata.xml
index cb09576..653526d 100644
--- a/x11-wm/notion/metadata.xml
+++ b/x11-wm/notion/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>proxy-maintainers</herd>

diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
index b2f7fe6..3aa0a23 100644
--- a/x11-wm/openbox/metadata.xml
+++ b/x11-wm/openbox/metadata.xml
@@ -11,7 +11,7 @@
 	 <flag name="xdg">Install the python xdg files for xdg autostart</flag>
   </use>
   <upstream>
-    <maintainer status='active'>
+    <maintainer status="active">
       <email>danakj@orodu.net</email>
       <name>Dana Jansens</name>
     </maintainer>

diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml
index 6746a3d..ffd0128 100644
--- a/x11-wm/pekwm/metadata.xml
+++ b/x11-wm/pekwm/metadata.xml
@@ -18,7 +18,7 @@
 		support, pixmap theming, and dynamic menus.
 	</longdescription>	
 	<use>
-		<flag name='contrib'>Install optional extras in the documentation directory</flag>
-		<flag name='themes'>Install additional themes</flag>
+		<flag name="contrib">Install optional extras in the documentation directory</flag>
+		<flag name="themes">Install additional themes</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-wm/sithwm/metadata.xml b/x11-wm/sithwm/metadata.xml
index efe9e6e..028bcb6 100644
--- a/x11-wm/sithwm/metadata.xml
+++ b/x11-wm/sithwm/metadata.xml
@@ -10,4 +10,3 @@
 	<bugs-to>http://sourceforge.net/tracker/?group_id=175787</bugs-to>
 </upstream>
 </pkgmetadata>
-

diff --git a/x11-wm/spectrwm/metadata.xml b/x11-wm/spectrwm/metadata.xml
index 59acc2c..5b80fb9 100644
--- a/x11-wm/spectrwm/metadata.xml
+++ b/x11-wm/spectrwm/metadata.xml
@@ -6,4 +6,3 @@
 <name>Michael Weber</name>
 </maintainer>
 </pkgmetadata>
-

diff --git a/x11-wm/stumpwm/metadata.xml b/x11-wm/stumpwm/metadata.xml
index 8be5c16..3191f5e 100644
--- a/x11-wm/stumpwm/metadata.xml
+++ b/x11-wm/stumpwm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer>

diff --git a/x11-wm/subtle/metadata.xml b/x11-wm/subtle/metadata.xml
index bf1ba89..0d523be 100644
--- a/x11-wm/subtle/metadata.xml
+++ b/x11-wm/subtle/metadata.xml
@@ -20,7 +20,7 @@
 		current active view.
 	</longdescription>
 	<use>
-		<flag name='xrandr'>Enable support for the X RandR extension</flag>
-		<flag name='xtest'>Enable support for the XTest extension</flag>
+		<flag name="xrandr">Enable support for the X RandR extension</flag>
+		<flag name="xtest">Enable support for the XTest extension</flag>
 	</use>
 </pkgmetadata>

diff --git a/x11-wm/windowmaker/metadata.xml b/x11-wm/windowmaker/metadata.xml
index ddcce78..a1c7b30 100644
--- a/x11-wm/windowmaker/metadata.xml
+++ b/x11-wm/windowmaker/metadata.xml
@@ -6,7 +6,7 @@
 		<flag name="modelock">Enable XKB language status lock support. README
 			says: "If you don't know what it is you probably don't need
 			it."</flag>
-		<flag name='xrandr'>Enable XRandR window extension support</flag>
+		<flag name="xrandr">Enable XRandR window extension support</flag>
 		<flag name="vdesktop">Enable dynamic virtual desktop (conflicts with
 			software that works on the edges of the screen)</flag>
 		<flag name="webp">Enables WebP image format support using <pkg>media-libs/libwebp</pkg></flag>

diff --git a/x11-wm/wmfs/metadata.xml b/x11-wm/wmfs/metadata.xml
index 5abc59f..6bffabd 100644
--- a/x11-wm/wmfs/metadata.xml
+++ b/x11-wm/wmfs/metadata.xml
@@ -5,7 +5,7 @@
 <email>jer@gentoo.org</email>
 </maintainer>
 <use>
-<flag name='imlib2'>Enable image support through <pkg>media-libs/imlib2</pkg></flag>
+<flag name="imlib2">Enable image support through <pkg>media-libs/imlib2</pkg></flag>
 </use>
 <upstream>
 <remote-id type="github">xorg62/wmfs</remote-id>

diff --git a/x11-wm/wmii/metadata.xml b/x11-wm/wmii/metadata.xml
index 874e3ab..2740a4d 100644
--- a/x11-wm/wmii/metadata.xml
+++ b/x11-wm/wmii/metadata.xml
@@ -11,4 +11,3 @@
     system.
   </longdescription>
 </pkgmetadata>
-

diff --git a/x11-wm/xmonad-contrib/metadata.xml b/x11-wm/xmonad-contrib/metadata.xml
index c1b67d9..a6f9a08 100644
--- a/x11-wm/xmonad-contrib/metadata.xml
+++ b/x11-wm/xmonad-contrib/metadata.xml
@@ -10,13 +10,13 @@
 		a tiling window manager for X.
 		
 		For an introduction to building, configuring and using xmonad
-		extensions, see &quot;XMonad.Doc&quot;. In particular:
+		extensions, see "XMonad.Doc". In particular:
 		
-		&quot;XMonad.Doc.Configuring&quot;, a guide to configuring xmonad
+		"XMonad.Doc.Configuring", a guide to configuring xmonad
 		
-		&quot;XMonad.Doc.Extending&quot;, using the contributed extensions library
+		"XMonad.Doc.Extending", using the contributed extensions library
 		
-		&quot;XMonad.Doc.Developing&quot;, introduction to xmonad internals and writing
+		"XMonad.Doc.Developing", introduction to xmonad internals and writing
 		your own extensions.
 		
 	</longdescription>

diff --git a/x11-wm/xmonad/metadata.xml b/x11-wm/xmonad/metadata.xml
index c547123..68b3928 100644
--- a/x11-wm/xmonad/metadata.xml
+++ b/x11-wm/xmonad/metadata.xml
@@ -3,7 +3,7 @@
 <pkgmetadata>
 	<herd>haskell</herd>
 	<use>
-		<flag name='default-term'>Pull terminal specified in default xmonad config
+		<flag name="default-term">Pull terminal specified in default xmonad config
 			to be a bit less hostile by default.</flag>
 		<flag name="no-autorepeat-keys">Allow ignoring of keyboard autorepeat.</flag>
 	</use>

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index e5c0aae..6ef263e 100644
--- a/x11-wm/xpra/metadata.xml
+++ b/x11-wm/xpra/metadata.xml
@@ -9,15 +9,15 @@
 	<bugs-to>https://www.xpra.org/trac/report</bugs-to>
 </upstream>
 <use>
-	<flag name='client'>Build client-side code</flag>
-	<flag name='server'>Build server-side code</flag>
-	<flag name='clipboard'>Enable clipboard support</flag>
-	<flag name='rencode'>Enable rencode support</flag>
-	<flag name='vpx'>Enable vpx image format support</flag>
-	<flag name='webp'>Enable webp image format support</flag>
-	<flag name='csc'>Enable csc softscaler support</flag>
-	<flag name='dec_av'>Enable dec_avcodec support</flag>
-	<flag name='dec_av2'>Enable dec_avcodec2 support</flag>
-	<flag name='x265'>Enable x265 support</flag>
+	<flag name="client">Build client-side code</flag>
+	<flag name="server">Build server-side code</flag>
+	<flag name="clipboard">Enable clipboard support</flag>
+	<flag name="rencode">Enable rencode support</flag>
+	<flag name="vpx">Enable vpx image format support</flag>
+	<flag name="webp">Enable webp image format support</flag>
+	<flag name="csc">Enable csc softscaler support</flag>
+	<flag name="dec_av">Enable dec_avcodec support</flag>
+	<flag name="dec_av2">Enable dec_avcodec2 support</flag>
+	<flag name="x265">Enable x265 support</flag>
 </use>
 </pkgmetadata>

diff --git a/xfce-base/libxfce4ui/metadata.xml b/xfce-base/libxfce4ui/metadata.xml
index d263871..f1aab24 100644
--- a/xfce-base/libxfce4ui/metadata.xml
+++ b/xfce-base/libxfce4ui/metadata.xml
@@ -6,7 +6,7 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='glade'>Build support for Glade 3's GtkBuilder implementation</flag>
-    <flag name='gtk3'>Enable gtk3 support</flag>
+    <flag name="glade">Build support for Glade 3's GtkBuilder implementation</flag>
+    <flag name="gtk3">Enable gtk3 support</flag>
   </use>
 </pkgmetadata>

diff --git a/xfce-base/xfce4-settings/metadata.xml b/xfce-base/xfce4-settings/metadata.xml
index 3583954..019e9f3 100644
--- a/xfce-base/xfce4-settings/metadata.xml
+++ b/xfce-base/xfce4-settings/metadata.xml
@@ -6,8 +6,8 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='libinput'>Enable libinput Xorg driver (<pkg>x11-drivers/xf86-input-libinput</pkg>) support</flag>
-    <flag name='libcanberra'>Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
-    <flag name='xklavier'>Enable keyboard layout selection support using <pkg>x11-libs/libxklavier</pkg></flag>
+    <flag name="libinput">Enable libinput Xorg driver (<pkg>x11-drivers/xf86-input-libinput</pkg>) support</flag>
+    <flag name="libcanberra">Enable sound event support using <pkg>media-libs/libcanberra</pkg></flag>
+    <flag name="xklavier">Enable keyboard layout selection support using <pkg>x11-libs/libxklavier</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/xfce-base/xfdesktop/metadata.xml b/xfce-base/xfdesktop/metadata.xml
index 41d0864..8c5bc8e 100644
--- a/xfce-base/xfdesktop/metadata.xml
+++ b/xfce-base/xfdesktop/metadata.xml
@@ -6,6 +6,6 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='thunar'>Build support for desktop icons (for example, launchers and folders)</flag>
+    <flag name="thunar">Build support for desktop icons (for example, launchers and folders)</flag>
   </use>
 </pkgmetadata>

diff --git a/xfce-extra/tumbler/metadata.xml b/xfce-extra/tumbler/metadata.xml
index 4836a65..581a2ca 100644
--- a/xfce-extra/tumbler/metadata.xml
+++ b/xfce-extra/tumbler/metadata.xml
@@ -6,6 +6,6 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='odf'>Enable support for .odf thumbnailers by using <pkg>gnome-extra/libgsf</pkg></flag>
+    <flag name="odf">Enable support for .odf thumbnailers by using <pkg>gnome-extra/libgsf</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/xfce-extra/xfce4-clipman-plugin/metadata.xml b/xfce-extra/xfce4-clipman-plugin/metadata.xml
index 7eada00..41ca5fa 100644
--- a/xfce-extra/xfce4-clipman-plugin/metadata.xml
+++ b/xfce-extra/xfce4-clipman-plugin/metadata.xml
@@ -6,6 +6,6 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='qrcode'>Enable support for <pkg>media-gfx/qrencode</pkg></flag>
+    <flag name="qrcode">Enable support for <pkg>media-gfx/qrencode</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/xfce-extra/xfce4-mixer/metadata.xml b/xfce-extra/xfce4-mixer/metadata.xml
index ec535fc..8c5f878 100644
--- a/xfce-extra/xfce4-mixer/metadata.xml
+++ b/xfce-extra/xfce4-mixer/metadata.xml
@@ -6,6 +6,6 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='keybinder'>Enable shortcut support using <pkg>dev-libs/keybinder</pkg></flag>
+    <flag name="keybinder">Enable shortcut support using <pkg>dev-libs/keybinder</pkg></flag>
   </use>
 </pkgmetadata>

diff --git a/xfce-extra/xfce4-mpc-plugin/metadata.xml b/xfce-extra/xfce4-mpc-plugin/metadata.xml
index f66c5c9..e44cf1b 100644
--- a/xfce-extra/xfce4-mpc-plugin/metadata.xml
+++ b/xfce-extra/xfce4-mpc-plugin/metadata.xml
@@ -6,6 +6,6 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='libmpd'>Build using <pkg>media-libs/libmpd</pkg> backend, instead of native fallback which is preferred</flag>
+    <flag name="libmpd">Build using <pkg>media-libs/libmpd</pkg> backend, instead of native fallback which is preferred</flag>
   </use>
 </pkgmetadata>

diff --git a/xfce-extra/xfce4-power-manager/metadata.xml b/xfce-extra/xfce4-power-manager/metadata.xml
index a09362f..b56d612 100644
--- a/xfce-extra/xfce4-power-manager/metadata.xml
+++ b/xfce-extra/xfce4-power-manager/metadata.xml
@@ -6,6 +6,6 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='lxpanel'>Build the applet for <pkg>lxde-base/lxpanel</pkg>, you can set XFCE_PLUGINS="" if you don't want the Xfce dependencies.</flag>
+    <flag name="lxpanel">Build the applet for <pkg>lxde-base/lxpanel</pkg>, you can set XFCE_PLUGINS="" if you don't want the Xfce dependencies.</flag>
   </use>
 </pkgmetadata>

diff --git a/xfce-extra/xfce4-taskmanager/metadata.xml b/xfce-extra/xfce4-taskmanager/metadata.xml
index 878ef7e..9cae46d 100644
--- a/xfce-extra/xfce4-taskmanager/metadata.xml
+++ b/xfce-extra/xfce4-taskmanager/metadata.xml
@@ -6,7 +6,7 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-	  <flag name='gksu'>Build against <pkg>x11-libs/libgksu</pkg> to provide "Run as root" option in the application's menu</flag>
-	  <flag name='gtk3'>Use GTK+3 instead of GTK+2</flag>
+	  <flag name="gksu">Build against <pkg>x11-libs/libgksu</pkg> to provide "Run as root" option in the application's menu</flag>
+	  <flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
   </use>
 </pkgmetadata>

diff --git a/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml b/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml
index 4c8f3cc..bd4bb73 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml
+++ b/xfce-extra/xfce4-whiskermenu-plugin/metadata.xml
@@ -9,7 +9,7 @@
 		<email>hasufell@gentoo.org</email>
 		<name>Julian Ospald</name>
 	</maintainer>
-	<longdescription lang='en'>
+	<longdescription lang="en">
 		Whisker Menu is an alternate application launcher for Xfce.
 		When you open it you are shown a list of applications you have
 		marked as favorites. You can browse through all of your installed
@@ -33,7 +33,7 @@
 		installed on your computer).
 	</longdescription>
 	<upstream>
-		<maintainer status='active'>
+		<maintainer status="active">
 			<email>graeme@gottcode.org</email>
 			<name>Graeme Gott</name>
 		</maintainer>
@@ -43,7 +43,7 @@
 		<changelog>
 			http://gottcode.org/xfce4-whiskermenu-plugin/#releasenotes
 		</changelog>
-		<remote-id type='github'>
+		<remote-id type="github">
 			gottcode/xfce4-whiskermenu-plugin
 		</remote-id>
 	</upstream>

diff --git a/xfce-extra/xfswitch-plugin/metadata.xml b/xfce-extra/xfswitch-plugin/metadata.xml
index bd3bfaf..b7b5d25 100644
--- a/xfce-extra/xfswitch-plugin/metadata.xml
+++ b/xfce-extra/xfswitch-plugin/metadata.xml
@@ -6,8 +6,8 @@
     <name>XFCE Team</name>
   </maintainer>
   <use>
-    <flag name='gdm'>Compatibility with <pkg>gnome-base/gdm</pkg> only</flag>
-    <flag name='lightdm'>Compatibility with <pkg>x11-misc/lightdm</pkg> only</flag>
-    <flag name='lxdm'>Compatibility with <pkg>lxde-base/lxdm</pkg> only</flag>
+    <flag name="gdm">Compatibility with <pkg>gnome-base/gdm</pkg> only</flag>
+    <flag name="lightdm">Compatibility with <pkg>x11-misc/lightdm</pkg> only</flag>
+    <flag name="lxdm">Compatibility with <pkg>lxde-base/lxdm</pkg> only</flag>
   </use>
 </pkgmetadata>


^ 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: dev-java/jboss-logging/, dev-libs/starpu/, sys-fs/dd-rescue/, dev-ros/rqt_topic/, 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