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.

56 files changed, 248 insertions, 262 deletions

diff --git a/net-analyzer/2ping/metadata.xml b/net-analyzer/2ping/metadata.xml
index 873423bb6e3c..04d57fdb7b1f 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 ddc6d842ca82..7c9939792b85 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 fa875be301be..4c392ce30487 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 0d2cfd4de584..690ee39c881b 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 6927b1f6ed79..dabf967e7789 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 18ad94010831..10fe1e4fab54 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 dc5780747aad..e678dff1c40b 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 7a0a346c8528..98ec2543b2c9 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 5fcbf8e1851a..4b6b68191d89 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 f55cac0eeaac..c978e6a21a47 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 59f49f012faf..c95444344230 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 166b8c794633..d11be925d378 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 192bccb822ca..f72d3dc7553d 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 c1b4dee070d2..19e2deffdc9d 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 5eb5554b735d..4ce3449e850f 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 9ca15ca788e8..03aa50bab7e3 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 c1f6c147e3a5..286e8d9dbc8a 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 273bfa64d015..f2e0b4f7ce88 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 209fa652c76e..ebbec98ccf81 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 c2818ba34f7a..4e11ea28e600 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 dd948e670d5a..99a09197b3d7 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 57d5f52092fa..2266b6e8735b 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 097b712d35dd..7ea1123efd9f 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 5ad5c8d0f325..503344e28a4a 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 4128863055b4..0101892b674e 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 fad986e477b0..f54283e06f33 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 89d2fa52c72e..2eba13de7b11 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 77d8e7551191..69859c558edb 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 b503064d232f..f80008f94162 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 0c7200267bf4..c10568fa29b9 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 9f51ead35bd7..a1ef8d5871d8 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 59acc2cc580e..5b80fb94c393 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 16276bd54d4c..9eaa421b5d23 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 1c7ac553fb89..15fef34887ef 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 56ad93e19831..5eb21ecd6bfd 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 8249714625ca..e7682c9dd62d 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 ceaef6d0a0f7..0bfa612138f2 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 2b0a73cda253..b184b8ed4be9 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 a28ee98aa544..c6bd53688f03 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 f0cc2f6cce94..d65c0f39012a 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 38e3121baec9..32d7038bdbde 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 38e3121baec9..32d7038bdbde 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 38e3121baec9..32d7038bdbde 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 71b3ad2d71e7..28e51faef9ee 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 084698b246da..a4a3e5c199d8 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 00d90d6efcf9..3e0971b990e0 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 785877034dc5..9ec6ed4d3892 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 35145f6cd8c3..d098016ba67d 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 6aca467cb11d..c858951182ad 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 59acc2cc580e..5b80fb94c393 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 3562dbf0cc59..da78704d1fba 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 754512a6de54..7095e0e64b8f 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 ce6c6fb75680..62cf68d6b70a 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 9b808bbd2895..b80d8aa88139 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 9e9161be1ecc..80fa589453eb 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 4bf43259e07f..29e6ec5f9b73 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>