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.

41 files changed, 164 insertions, 180 deletions

diff --git a/app-admin/bcfg2/metadata.xml b/app-admin/bcfg2/metadata.xml
index 0f2dd7febf21..5647529c2f0b 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 b719686ba39d..9884e7ba092c 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 f1f666f2d33c..6174613a5f6b 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 268c9abc954d..5b48ac87d7e3 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 8edeb0484f3f..e8495ed56464 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 6752c3ce0db6..24847b044406 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 fc4254224b19..77c8c9050b6c 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 278b560d3df8..80b9f4b9041d 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 c3fe5e3083bd..88011241ce9d 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 187f7a710efe..1d85f7e15082 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 66824a4fb790..878ec1961863 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 2c97c584ed1f..98f86492a631 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 a6041c523f54..7be12fba87e1 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 9fe4915f8a5c..fbe43cecfc58 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 434138d285c9..87d50c975d7e 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 d635429c4472..60d78d3a69a3 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 2e90b802bc7c..d9cd2cad66c2 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 8bd21ed586f0..4e8f7c890f48 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 f5967f80f9a8..4370b556e316 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 480394a26751..fbeacea0e583 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 c88633a4288c..f72e6346e5bb 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 187f7a710efe..1d85f7e15082 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 187f7a710efe..1d85f7e15082 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 187f7a710efe..1d85f7e15082 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 e2e74b8fd613..428baa80ceb8 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 93a305eeb2e8..8ce3d934457c 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 fdc73dc12dda..20196e781a7b 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 bf6926ecad82..f60aedb32c1c 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 d3bec776e095..06ed5d761a90 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 187f7a710efe..1d85f7e15082 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 c9106df06540..7d27bc09fbd5 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 0d04c216b673..c980dc4295fb 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 9116d3c7e097..535e864c6bed 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 187f7a710efe..1d85f7e15082 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 b3d8b65eba31..5a2dd624378e 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 bcd5bf7763ec..1cb2f3841556 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 9a5941342391..800262ca17b7 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 bdcb9578b97a..8b8468ce778d 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 71fb9413fd42..173f01fa5443 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 a7076d48dfab..7713699c2452 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 f6828df92fea..b169a5e1bd86 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>