Fix invalid metadata.xml syntax

Signed-off-by: Justin Lecher <jlec@gentoo.org>

37 files changed, 11 insertions, 209 deletions

diff --git a/dev-libs/intel-common/metadata.xml b/dev-libs/intel-common/metadata.xml
index b4d319f36..f880bd7d1 100644
--- a/dev-libs/intel-common/metadata.xml
+++ b/dev-libs/intel-common/metadata.xml
@@ -11,8 +11,6 @@
   </longdescription>
   <use>
     <flag name="compiler">Install the libraries needed for the icc and ifort compilers</flag>
-  </use>
-  <use>
     <flag name="mic">Install the libraries needed for supporting Intel Many Integrated Core (Xeon Phi)</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-biology/blasr/metadata.xml b/sci-biology/blasr/metadata.xml
index 4ef78c30e..004c99555 100644
--- a/sci-biology/blasr/metadata.xml
+++ b/sci-biology/blasr/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/brat/metadata.xml b/sci-biology/brat/metadata.xml
index 4ef78c30e..004c99555 100644
--- a/sci-biology/brat/metadata.xml
+++ b/sci-biology/brat/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/codonw/metadata.xml b/sci-biology/codonw/metadata.xml
index 62420704f..f66d7b796 100644
--- a/sci-biology/codonw/metadata.xml
+++ b/sci-biology/codonw/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/erpin/metadata.xml b/sci-biology/erpin/metadata.xml
index 4ef78c30e..004c99555 100644
--- a/sci-biology/erpin/metadata.xml
+++ b/sci-biology/erpin/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/estscan/metadata.xml b/sci-biology/estscan/metadata.xml
index 462149b9d..d709341c0 100644
--- a/sci-biology/estscan/metadata.xml
+++ b/sci-biology/estscan/metadata.xml
@@ -11,8 +11,6 @@
   </maintainer>
   <use>
     <flag name="icc">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="ifc">Undocumented USE</flag>
   </use>
   <upstream>
diff --git a/sci-biology/fastdnaml/metadata.xml b/sci-biology/fastdnaml/metadata.xml
index 4ef78c30e..004c99555 100644
--- a/sci-biology/fastdnaml/metadata.xml
+++ b/sci-biology/fastdnaml/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/gbrowse/metadata.xml b/sci-biology/gbrowse/metadata.xml
index 6e0ee1949..d0116db4a 100644
--- a/sci-biology/gbrowse/metadata.xml
+++ b/sci-biology/gbrowse/metadata.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-    <description>GBrowse is a generic genome browser.</description>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>
   <longdescription lang="en">
-		GBrowse is a generic genome browser written in perl, could run as CGI, under mod_perl. Something called Apache::Registry should make it faster. It uses mysql or postgres as the storage engine.
+	GBrowse is a generic genome browser written in perl, could run as CGI, 
+	under mod_perl. Something called Apache::Registry should make it faster. 
+	It uses mysql or postgres as the storage engine.
   </longdescription>
   <upstream>
     <remote-id type="sourceforge">gmod</remote-id>
diff --git a/sci-biology/genepop/metadata.xml b/sci-biology/genepop/metadata.xml
index 4ef78c30e..004c99555 100644
--- a/sci-biology/genepop/metadata.xml
+++ b/sci-biology/genepop/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/grappa/metadata.xml b/sci-biology/grappa/metadata.xml
index 525e88d84..8417d1580 100644
--- a/sci-biology/grappa/metadata.xml
+++ b/sci-biology/grappa/metadata.xml
@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="unknown">
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
 	</maintainer>
-	</pkgmetadata>
+</pkgmetadata>
diff --git a/sci-biology/igv/metadata.xml b/sci-biology/igv/metadata.xml
index b95b6d982..661a0adce 100644
--- a/sci-biology/igv/metadata.xml
+++ b/sci-biology/igv/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/mavid/metadata.xml b/sci-biology/mavid/metadata.xml
index 4ef78c30e..004c99555 100644
--- a/sci-biology/mavid/metadata.xml
+++ b/sci-biology/mavid/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/merlin/metadata.xml b/sci-biology/merlin/metadata.xml
index 525e88d84..affa6b40c 100644
--- a/sci-biology/merlin/metadata.xml
+++ b/sci-biology/merlin/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="unknown">
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
diff --git a/sci-biology/miranda/metadata.xml b/sci-biology/miranda/metadata.xml
index 4ef78c30e..004c99555 100644
--- a/sci-biology/miranda/metadata.xml
+++ b/sci-biology/miranda/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/mosaik/metadata.xml b/sci-biology/mosaik/metadata.xml
index 4ef78c30e..004c99555 100644
--- a/sci-biology/mosaik/metadata.xml
+++ b/sci-biology/mosaik/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/mreps/metadata.xml b/sci-biology/mreps/metadata.xml
index 4ef78c30e..004c99555 100644
--- a/sci-biology/mreps/metadata.xml
+++ b/sci-biology/mreps/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/mrfast/metadata.xml b/sci-biology/mrfast/metadata.xml
index eb9e92d07..3d6ede5a4 100644
--- a/sci-biology/mrfast/metadata.xml
+++ b/sci-biology/mrfast/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/mrsfast/metadata.xml b/sci-biology/mrsfast/metadata.xml
index aa16b137f..e27afbabf 100644
--- a/sci-biology/mrsfast/metadata.xml
+++ b/sci-biology/mrsfast/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/ncbi-blast+/metadata.xml b/sci-biology/ncbi-blast+/metadata.xml
index f9db15233..8f9041e1f 100644
--- a/sci-biology/ncbi-blast+/metadata.xml
+++ b/sci-biology/ncbi-blast+/metadata.xml
@@ -11,29 +11,13 @@
   </maintainer>
   <use>
     <flag name="boost">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="cppunit">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="freetype">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="mesa">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="muparser">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="sablotron">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="xerces">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="xalan">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="xslt">Undocumented USE</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-biology/ncbi-tools++/metadata.xml b/sci-biology/ncbi-tools++/metadata.xml
index 157c35a60..27b1bf191 100644
--- a/sci-biology/ncbi-tools++/metadata.xml
+++ b/sci-biology/ncbi-tools++/metadata.xml
@@ -1,39 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
   </maintainer>
   <use>
     <flag name="boost">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="cppunit">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="freetype">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="mesa">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="muparser">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="sablotron">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="xerces">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="xalan">Undocumented USE</flag>
-  </use>
-  <use>
     <flag name="xslt">Undocumented USE</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-biology/quicktree/metadata.xml b/sci-biology/quicktree/metadata.xml
index 4ef78c30e..004c99555 100644
--- a/sci-biology/quicktree/metadata.xml
+++ b/sci-biology/quicktree/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-biology/rnaplex/metadata.xml b/sci-biology/rnaplex/metadata.xml
index 525e88d84..affa6b40c 100644
--- a/sci-biology/rnaplex/metadata.xml
+++ b/sci-biology/rnaplex/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="unknown">
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
diff --git a/sci-biology/signalp/metadata.xml b/sci-biology/signalp/metadata.xml
index 525e88d84..affa6b40c 100644
--- a/sci-biology/signalp/metadata.xml
+++ b/sci-biology/signalp/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="unknown">
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
diff --git a/sci-biology/tmhmm/metadata.xml b/sci-biology/tmhmm/metadata.xml
index 525e88d84..affa6b40c 100644
--- a/sci-biology/tmhmm/metadata.xml
+++ b/sci-biology/tmhmm/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="unknown">
-		<email>weaver@gentoo.org</email>
-		<name>Andrey Kislyuk</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>sci-biology@gentoo.org</email>
 		<name>Gentoo Biology Project</name>
diff --git a/sci-biology/twinscan/metadata.xml b/sci-biology/twinscan/metadata.xml
index 4ef78c30e..004c99555 100644
--- a/sci-biology/twinscan/metadata.xml
+++ b/sci-biology/twinscan/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci-biology@gentoo.org</email>
     <name>Gentoo Biology Project</name>
diff --git a/sci-chemistry/nwchem/metadata.xml b/sci-chemistry/nwchem/metadata.xml
index 7532c37ad..977067693 100644
--- a/sci-chemistry/nwchem/metadata.xml
+++ b/sci-chemistry/nwchem/metadata.xml
@@ -13,32 +13,20 @@
     <flag name="blas">
       Use external BLAS library instead of the internal routines
     </flag>
-  </use>
-  <use>
     <flag name="cuda">
       Enable CUDA GPU support for the Tensor Contraction Engine generated
       methods (CI, MBPT, CC)
     </flag>
-  </use>
-  <use>
     <flag name="int64">
       Use 64 bits integers
     </flag>
-  </use>
-  <use>
     <flag name="lapack">
       Use external LAPACK library instead of the internal routines
     </flag>
-  </use>
-  <use>
     <flag name="mrcc">
       Compile the routines for Multi Reference Coupled Clusters theory
     </flag>
-  </use>
-  <use>
     <flag name="nwchem-tests">Install qa tests data</flag>
-  </use>
-  <use>
     <flag name="scalapack">
       Use external SCALAPACK library
     </flag>
diff --git a/sci-chemistry/rosetta/metadata.xml b/sci-chemistry/rosetta/metadata.xml
index 768f3c0c6..bbd65307d 100644
--- a/sci-chemistry/rosetta/metadata.xml
+++ b/sci-chemistry/rosetta/metadata.xml
@@ -12,6 +12,6 @@
     <flag name="lange">Apply patches from www.csrosetta.org</flag>
   </use>
   <upstream>
-    <bugs-to>general-support@mail.rosettacommons.org</bugs-to>
+    <bugs-to>mailto:general-support@mail.rosettacommons.org</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/bigdft-abi/metadata.xml b/sci-libs/bigdft-abi/metadata.xml
index 1f6b96adf..59ce9fb3d 100644
--- a/sci-libs/bigdft-abi/metadata.xml
+++ b/sci-libs/bigdft-abi/metadata.xml
@@ -14,22 +14,14 @@ to serve as a library for sci-physics/abinit.
 </longdescription>
   <use>
     <flag name="cuda">Enable support for nVidia CUDA</flag>
-  </use>
-  <use>
     <flag name="etsf_io">
       Enable support for reading and writing the European Theoretical
       Spectroscopy facility (ETSF) file format
     </flag>
-  </use>
-  <use>
     <flag name="glib">
       Compile with GLib Object System support
     </flag>
-  </use>
-  <use>
     <flag name="opencl">Enable support for OpenCL GPU acceleration</flag>
-  </use>
-  <use>
     <flag name="scalapack">
       Use ScaLAPACK, a subset of LAPACK routines redesigned for heterogenous computing
     </flag>
diff --git a/sci-libs/ghmm/metadata.xml b/sci-libs/ghmm/metadata.xml
index ab84552b5..e6d6c6c89 100644
--- a/sci-libs/ghmm/metadata.xml
+++ b/sci-libs/ghmm/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>weaver@gentoo.org</email>
-    <name>Andrey Kislyuk</name>
-  </maintainer>
   <maintainer type="project">
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
diff --git a/sci-libs/gsl/metadata.xml b/sci-libs/gsl/metadata.xml
index 88a83b33c..bac5f4993 100644
--- a/sci-libs/gsl/metadata.xml
+++ b/sci-libs/gsl/metadata.xml
@@ -21,8 +21,6 @@
   <use>
     <flag name="cblas-external">Link gsl with external cblas provided by
   (<pkg>virtual/cblas</pkg>) instead of shipped internal version</flag>
-  </use>
-  <use>
     <flag name="int64">Build the 64 bits integer library</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/mkl/metadata.xml b/sci-libs/mkl/metadata.xml
index 8e7ff6cd9..318c9616a 100644
--- a/sci-libs/mkl/metadata.xml
+++ b/sci-libs/mkl/metadata.xml
@@ -15,8 +15,6 @@
 </longdescription>
   <use>
     <flag name="int64">Build the 64 bits integer library</flag>
-  </use>
-  <use>
     <flag name="mic">Install the libraries needed for supporting Intel Many Integrated Core (Xeon Phi)</flag>
   </use>
 </pkgmetadata>
diff --git a/sci-libs/trilinos/metadata.xml b/sci-libs/trilinos/metadata.xml
index d4091382d..93012b990 100644
--- a/sci-libs/trilinos/metadata.xml
+++ b/sci-libs/trilinos/metadata.xml
@@ -27,8 +27,10 @@
 		<flag name="hdf5">Add support for hdf5 (<pkg>sci-libs/hdf5</pkg>)</flag>
 		<flag name="hypre">Add support for hypre (<pkg>sci-libs/hypre</pkg>)</flag>
 		<flag name="matio">Add support for matio (<pkg>sci-libs/matio</pkg>)</flag>
-		<flag name="metis">Add support for metis (<pkg>sci-libs/(par)metis</pkg>)</flag>
-		<flag name="mkl">Add support for mkl (<pkg>sci/libs/mkl</pkg>)</flag>
+		<flag name="metis">
+			Add support for metis (<pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg>)
+		</flag>
+		<flag name="mkl">Add support for mkl (<pkg>sci-libs/mkl</pkg>)</flag>
 		<flag name="mumps">Add support for mumps (<pkg>sci-libs/mumps</pkg>)</flag>
 		<flag name="netcdf">Add support for netcdf (<pkg>sci-libs/netcdf</pkg>)</flag>
 		<flag name="petsc">Add support for petsc (<pkg>sci-mathematics/petsc</pkg>)</flag>
@@ -40,6 +42,6 @@
 		<flag name="taucs">Add support for taucs (<pkg>sci-libs/taucs</pkg>)</flag>
 		<flag name="tbb">Add support for threading building blocks library (<pkg>dev-cpp/tbb</pkg>)</flag>
 		<flag name="tvmet">Add support for tvmet (<pkg>dev-libs/tvmet</pkg>)</flag>
-		<flag name="yaml">Add support for yaml (<pkg>dev-cpp-yaml</pkg>)</flag>
+		<flag name="yaml">Add support for yaml (<pkg>dev-cpp/yaml</pkg>)</flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-physics/abinit/metadata.xml b/sci-physics/abinit/metadata.xml
index b20413581..06b80e82c 100644
--- a/sci-physics/abinit/metadata.xml
+++ b/sci-physics/abinit/metadata.xml
@@ -19,70 +19,40 @@ ABINIT code, different utility programs are provided.
 </longdescription>
   <use>
     <flag name="atompaw">Enable support for atompaw, a Projector Augmented Waves atomic data generator</flag>
-  </use>
-  <use>
     <flag name="bigdft">Enable support for BigDFT, DFT package using wavelet basis set</flag>
-  </use>
-  <use>
     <flag name="cuda">Enable support for nVidia CUDA</flag>
-  </use>
-  <use>
     <flag name="cuda-double">
      Enable support for double precision nVidia CUDA
   </flag>
-  </use>
-  <use>
     <flag name="etsf_io">
       Enable support for reading and writing the European Theoretical
       Spectroscopy facility (ETSF) file format.
     </flag>
-  </use>
-  <use>
     <flag name="fftw-threads">
    Use the threaded (openMP or pthreads) version of <pkg>sci-libs/fftw</pkg>
   </flag>
-  </use>
-  <use>
     <flag name="fftw-mpi">
    Use the MPI version of <pkg>sci-libs/fftw</pkg> (always with either openMP or pthreads too)
   </flag>
-  </use>
-  <use>
     <flag name="fox">Enable support for FoX Fortran XML library</flag>
-  </use>
-  <use>
     <flag name="levmar">
       Enable support for <pkg>sci-libs/levmar</pkg>,
       the Levenberg-Marquardt least-squares optimisation
     </flag>
-  </use>
-  <use>
     <flag name="libabinit">
    Build the libabinit used by <pkg>sci-libs/bigdft</pkg>
    (usage not tested yet, circular dependency not resolved)
   </flag>
-  </use>
-  <use>
     <flag name="libxc">Enable support for libxc, an exchange-correlation potentials library</flag>
-  </use>
-  <use>
     <flag name="lotf">Activate the Learn on The Fly method (LOTF) for Molecular Dynamics</flag>
-  </use>
-  <use>
     <flag name="scalapack">
       Use ScaLAPACK, a subset of LAPACK routines redesigned for heterogenous computing
     </flag>
-  </use>
-  <use>
     <flag name="scripts">Install helper scripts, mostly Python</flag>
-  </use>
-  <use>
     <flag name="vdwxc">
       Activate van der Waals exchange-correlation correction. Since 7.4.0
       no longer optional
     </flag>
-  </use>
-  <use>
     <flag name="wannier">
       Enable support for wannier90, a maximally localized Wannier functions (MLWFs) calculator
     </flag>
diff --git a/sci-physics/atompaw/metadata.xml b/sci-physics/atompaw/metadata.xml
index a0715501c..897bf5233 100644
--- a/sci-physics/atompaw/metadata.xml
+++ b/sci-physics/atompaw/metadata.xml
@@ -10,12 +10,10 @@
 	</maintainer>
 	<use>
 		<flag name="libxc">Enable support for libxc, an exchange-correlation potentials library</flag>
-	</use>
-	<use>
 		<flag name="longplot">
                   Patch the sources to plot functions all over the space considered,
                   not just up to the matching radius plus 50 grid points. May be useless
                   or even harmful.
-                </flag>
+        </flag>
 	</use>
 </pkgmetadata>
diff --git a/sci-physics/bigdft/metadata.xml b/sci-physics/bigdft/metadata.xml
index a687c583b..f3648be71 100644
--- a/sci-physics/bigdft/metadata.xml
+++ b/sci-physics/bigdft/metadata.xml
@@ -10,22 +10,14 @@ BigDFT is a DFT massively parallel electronic structure code (GPL license) using
 </longdescription>
   <use>
     <flag name="cuda">Enable support for nVidia CUDA GPU acceleration</flag>
-  </use>
-  <use>
     <flag name="etsf_io">
       Enable support for reading and writing the European Theoretical
       Spectroscopy facility (ETSF) file format.
     </flag>
-  </use>
-  <use>
     <flag name="glib">
       Compile with GLib Object System support
     </flag>
-  </use>
-  <use>
     <flag name="opencl">Enable support for OpenCL GPU acceleration</flag>
-  </use>
-  <use>
     <flag name="scalapack">
       Use ScaLAPACK, a subset of LAPACK routines redesigned for heterogenous computing
     </flag>
diff --git a/sci-physics/elk/metadata.xml b/sci-physics/elk/metadata.xml
index 9357a9659..7246d7075 100644
--- a/sci-physics/elk/metadata.xml
+++ b/sci-physics/elk/metadata.xml
@@ -12,13 +12,9 @@ Elk is an all-electron full-potential linearised augmented-plane wave (FP-LAPW)
     <flag name="libxc">
    Use sci-libs/libxc library of exchange-correlation functionals by ETSF.
   </flag>
-  </use>
-  <use>
     <flag name="perl">
    Install perl scripts.
   </flag>
-  </use>
-  <use>
     <flag name="python">
    Install python scripts.
   </flag>
diff --git a/sys-cluster/hpl/metadata.xml b/sys-cluster/hpl/metadata.xml
index 6f14b2fb8..f3834ba82 100644
--- a/sys-cluster/hpl/metadata.xml
+++ b/sys-cluster/hpl/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="unknown">
-    <email>tantive@gentoo.org</email>
-    <name>Michael Imhof</name>
-    <description>Release manager, patch manager</description>
-  </maintainer>
   <maintainer type="project">
     <email>cluster@gentoo.org</email>
     <name>Gentoo Cluster Project</name>