Cleanup remote IDs

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

43 files changed, 68 insertions, 74 deletions

diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml
index 9c376182e..140530ac3 100644
--- a/sci-libs/armadillo/metadata.xml
+++ b/sci-libs/armadillo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -16,7 +16,7 @@
   combine several operations into one and reduce (or eliminate) the
   need for temporaries. This is accomplished through recursive
   templates and template meta-programming.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="atlas">
     Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and
diff --git a/sci-libs/asl/metadata.xml b/sci-libs/asl/metadata.xml
index 7170c1d21..406d94b4d 100644
--- a/sci-libs/asl/metadata.xml
+++ b/sci-libs/asl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
@@ -27,7 +27,7 @@ fields: computational fluid dynamics, virtual sensing, industrial
 process data validation and reconciliation, image-guided surgery,
 computer-aided engineering, design space exploration, crystallography,
 etc.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="matlab">Matlab support with <pkg>sci-libs/matio</pkg></flag>
   </use>
diff --git a/sci-libs/atlas/metadata.xml b/sci-libs/atlas/metadata.xml
index 79b47d5ae..5fffffdf1 100644
--- a/sci-libs/atlas/metadata.xml
+++ b/sci-libs/atlas/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -12,7 +12,7 @@
   Subroutines (BLAS) for both c and F77 interfaces. It can also build
   a subset of the linear algebra routine LAPACK library or the full
   LAPACK using the reference LAPACK from Netlib.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="deprecated">Build deprecated routines</flag>
     <flag name="generic">Build atlas assuming a fairly generic architecture (sse2 for x86, core2 for amd64)</flag>
diff --git a/sci-libs/cgnstools/metadata.xml b/sci-libs/cgnstools/metadata.xml
index b0a18c553..2f9d93947 100644
--- a/sci-libs/cgnstools/metadata.xml
+++ b/sci-libs/cgnstools/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/clblas/metadata.xml b/sci-libs/clblas/metadata.xml
index cad01ed8b..7a91a3efe 100644
--- a/sci-libs/clblas/metadata.xml
+++ b/sci-libs/clblas/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/clfft/metadata.xml b/sci-libs/clfft/metadata.xml
index b331d3e41..659e5bb01 100644
--- a/sci-libs/clfft/metadata.xml
+++ b/sci-libs/clfft/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sci-libs/clrng/metadata.xml b/sci-libs/clrng/metadata.xml
index 261dee59c..c6c675038 100644
--- a/sci-libs/clrng/metadata.xml
+++ b/sci-libs/clrng/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/dealii/metadata.xml b/sci-libs/dealii/metadata.xml
index d00e3daa5..056a02aab 100644
--- a/sci-libs/dealii/metadata.xml
+++ b/sci-libs/dealii/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sci-libs/elmer-eio/metadata.xml b/sci-libs/elmer-eio/metadata.xml
index 74cf8e43e..cab7f518f 100644
--- a/sci-libs/elmer-eio/metadata.xml
+++ b/sci-libs/elmer-eio/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -6,6 +6,6 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="sourceforge">elmerfem.svn</remote-id>
+    <remote-id type="sourceforge">svn</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/elmer-hutiter/metadata.xml b/sci-libs/elmer-hutiter/metadata.xml
index 74cf8e43e..cab7f518f 100644
--- a/sci-libs/elmer-hutiter/metadata.xml
+++ b/sci-libs/elmer-hutiter/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -6,6 +6,6 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="sourceforge">elmerfem.svn</remote-id>
+    <remote-id type="sourceforge">svn</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/framewave/metadata.xml b/sci-libs/framewave/metadata.xml
index 51caca683..ca9638e58 100644
--- a/sci-libs/framewave/metadata.xml
+++ b/sci-libs/framewave/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-libs/geom/metadata.xml b/sci-libs/geom/metadata.xml
index d322fedbb..1c94e0081 100644
--- a/sci-libs/geom/metadata.xml
+++ b/sci-libs/geom/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-libs/ghmm/metadata.xml b/sci-libs/ghmm/metadata.xml
index e6d6c6c89..985e58deb 100644
--- a/sci-libs/ghmm/metadata.xml
+++ b/sci-libs/ghmm/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/htslib/metadata.xml b/sci-libs/htslib/metadata.xml
index 5b953af48..49735ee17 100644
--- a/sci-libs/htslib/metadata.xml
+++ b/sci-libs/htslib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/io_lib/metadata.xml b/sci-libs/io_lib/metadata.xml
index a88279ec5..9012caf9b 100644
--- a/sci-libs/io_lib/metadata.xml
+++ b/sci-libs/io_lib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -10,7 +10,7 @@
   general purpose trace file (and Experiment File) reading interface. The
   programmer simply calls the (eg) read_reading to create a "Read" C structure
   with the data loaded into memory.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="sourceforge">staden</remote-id>
   </upstream>
diff --git a/sci-libs/itk/metadata.xml b/sci-libs/itk/metadata.xml
index 85453b5c2..b7fbbe52f 100644
--- a/sci-libs/itk/metadata.xml
+++ b/sci-libs/itk/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -12,7 +12,7 @@
   Insight Segmentation and Registration Toolkit (ITK) is a library
   that provides developers with an extensive suite of tools for image
   analysis.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="itkv3compat">Enable compatibility with ITK version 3</flag>
     <flag name="review">Enable compilation of methods under review</flag>
diff --git a/sci-libs/k3match/metadata.xml b/sci-libs/k3match/metadata.xml
index 9165eac65..8e26a7cc2 100644
--- a/sci-libs/k3match/metadata.xml
+++ b/sci-libs/k3match/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
@@ -9,7 +9,4 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <upstream>
-    <remote-id type="github">pschella/k3match</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/lapackpp/metadata.xml b/sci-libs/lapackpp/metadata.xml
index b3d88baf7..af87df9d1 100644
--- a/sci-libs/lapackpp/metadata.xml
+++ b/sci-libs/lapackpp/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -15,8 +15,8 @@
   include all of the capabilities of original f77 LAPACK. Emphasis is
   given to routines for solving linear systems consisting of non-symmetric
   matrices, symmetric positive definite systems, and solving linear
-  least-square systems. 
-</longdescription>
+  least-square systems.
+  </longdescription>
   <upstream>
     <remote-id type="sourceforge">lapackpp</remote-id>
   </upstream>
diff --git a/sci-libs/libcgnsoo/metadata.xml b/sci-libs/libcgnsoo/metadata.xml
index b501da7f8..9954178df 100644
--- a/sci-libs/libcgnsoo/metadata.xml
+++ b/sci-libs/libcgnsoo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
diff --git a/sci-libs/libmaus/metadata.xml b/sci-libs/libmaus/metadata.xml
index 1541e62b3..daa058d7d 100644
--- a/sci-libs/libmaus/metadata.xml
+++ b/sci-libs/libmaus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -13,7 +13,7 @@ I/O classes (single byte and UTF-8)
 	text indexing classes (suffix and LCP array, fulltext and minute (FM), ...)
 	BAM sequence alignment files input/output (simple and collating)
 	and many lower level support classes.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="github">gt1/libmaus</remote-id>
   </upstream>
diff --git a/sci-libs/libmaus2/metadata.xml b/sci-libs/libmaus2/metadata.xml
index 1541e62b3..daa058d7d 100644
--- a/sci-libs/libmaus2/metadata.xml
+++ b/sci-libs/libmaus2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -13,7 +13,7 @@ I/O classes (single byte and UTF-8)
 	text indexing classes (suffix and LCP array, fulltext and minute (FM), ...)
 	BAM sequence alignment files input/output (simple and collating)
 	and many lower level support classes.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="github">gt1/libmaus</remote-id>
   </upstream>
diff --git a/sci-libs/libsc/metadata.xml b/sci-libs/libsc/metadata.xml
index 21ede2e1f..eb239a19e 100644
--- a/sci-libs/libsc/metadata.xml
+++ b/sci-libs/libsc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sci-libs/libsufr/metadata.xml b/sci-libs/libsufr/metadata.xml
index b3a575f0a..77b842c6e 100644
--- a/sci-libs/libsufr/metadata.xml
+++ b/sci-libs/libsufr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sci-libs/lwpr/metadata.xml b/sci-libs/lwpr/metadata.xml
index d7f4e4aad..3ddf78275 100644
--- a/sci-libs/lwpr/metadata.xml
+++ b/sci-libs/lwpr/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -13,7 +13,7 @@
   regressions in selected directions in input space. A locally
   weighted variant of Partial Least Squares (PLS) is employed for
   doing the dimensionality reduction.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="octave">Add <pkg>sci-mathematics/octave</pkg> support</flag>
   </use>
diff --git a/sci-libs/matc/metadata.xml b/sci-libs/matc/metadata.xml
index 271c39301..9a3b4d3ec 100644
--- a/sci-libs/matc/metadata.xml
+++ b/sci-libs/matc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="github">ElmerCSC/elmerfem</remote-id>
-    <remote-id type="sourceforge">elmerfem.svn</remote-id>
+    <remote-id type="sourceforge">svn</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/nibabel/metadata.xml b/sci-libs/nibabel/metadata.xml
index 776617edf..be9e6a4cc 100644
--- a/sci-libs/nibabel/metadata.xml
+++ b/sci-libs/nibabel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sci-libs/nipy/metadata.xml b/sci-libs/nipy/metadata.xml
index 511564029..940d59042 100644
--- a/sci-libs/nipy/metadata.xml
+++ b/sci-libs/nipy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
@@ -11,7 +11,7 @@
   </maintainer>
   <longdescription lang="en">
 	NIPY is a python project for analysis of structural and functional neuroimaging data.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="pypi">nipy</remote-id>
   </upstream>
diff --git a/sci-libs/nipype/metadata.xml b/sci-libs/nipype/metadata.xml
index 8e5a54081..f63021cf6 100644
--- a/sci-libs/nipype/metadata.xml
+++ b/sci-libs/nipype/metadata.xml
@@ -22,7 +22,7 @@
 	in a high-level language and addressing limitations of existing pipeline systems.
   </longdescription>
   <upstream>
-    <remote-id type="sourceforge">nipy</remote-id>
     <remote-id type="github">nipy/nipype</remote-id>
+    <remote-id type="sourceforge">nipy</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-libs/o2scl/metadata.xml b/sci-libs/o2scl/metadata.xml
index 15261a796..a4a37b48d 100644
--- a/sci-libs/o2scl/metadata.xml
+++ b/sci-libs/o2scl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -11,7 +11,7 @@
   GSL and CERNLIB and two sub-libraries: thermodynamics of ideal and
   nearly-ideal particles with quantum statistics and e quations of
   state for finite density relevant for neutron stars.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="sourceforge">o2scl</remote-id>
   </upstream>
diff --git a/sci-libs/openblas/metadata.xml b/sci-libs/openblas/metadata.xml
index 2bf0b4229..1f64b9df9 100644
--- a/sci-libs/openblas/metadata.xml
+++ b/sci-libs/openblas/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/p4est/metadata.xml b/sci-libs/p4est/metadata.xml
index 35ac42b01..a7e30547b 100644
--- a/sci-libs/p4est/metadata.xml
+++ b/sci-libs/p4est/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
diff --git a/sci-libs/pagmo/metadata.xml b/sci-libs/pagmo/metadata.xml
index 23ef3708a..744582709 100644
--- a/sci-libs/pagmo/metadata.xml
+++ b/sci-libs/pagmo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/pg2plplot/metadata.xml b/sci-libs/pg2plplot/metadata.xml
index a5b8e410d..30b426c5c 100644
--- a/sci-libs/pg2plplot/metadata.xml
+++ b/sci-libs/pg2plplot/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
@@ -12,7 +12,7 @@
   <longdescription>
   PG2PLplot is code intended to help the transition from Fortran code
   linked against PGPlot to linking it against PLplot.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="sourceforge">pg2plplot</remote-id>
   </upstream>
diff --git a/sci-libs/pydicom/metadata.xml b/sci-libs/pydicom/metadata.xml
index 8d1c81632..b38f42e10 100644
--- a/sci-libs/pydicom/metadata.xml
+++ b/sci-libs/pydicom/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/rdkit/metadata.xml b/sci-libs/rdkit/metadata.xml
index e612e1080..92af8f7f1 100644
--- a/sci-libs/rdkit/metadata.xml
+++ b/sci-libs/rdkit/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sci-libs/scikits_image/metadata.xml b/sci-libs/scikits_image/metadata.xml
index 8e05ce394..f88372407 100644
--- a/sci-libs/scikits_image/metadata.xml
+++ b/sci-libs/scikits_image/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -10,13 +10,10 @@
   algorithms for use with Python and NumPy. While SciPy’s ndimage
   provides low-level manipulation, scikits.image centres around
   algorithms and applications.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="freeimage">Enable support for image i/o via
-  <pkg>media-libs/freeimage</pkg></flag>
+    <pkg>media-libs/freeimage</pkg></flag>
     <flag name="pyamg">Enable support for algebraic solvers via <pkg>dev-python/pyamg</pkg></flag>
   </use>
-  <upstream>
-    <remote-id type="pypi">scikit-image</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/spglib/metadata.xml b/sci-libs/spglib/metadata.xml
index 4623ab68c..a37ff6fea 100644
--- a/sci-libs/spglib/metadata.xml
+++ b/sci-libs/spglib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
@@ -13,6 +13,6 @@
 		Spglib is a C library for finding and handling crystal symmetries.
 	</longdescription>
 	<upstream>
-		<remote-id type="sourceforge">spglib</remote-id>
+		<remote-id type="sourceforge">downloads</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/starparse/metadata.xml b/sci-libs/starparse/metadata.xml
index 62e9e440f..1aad99e72 100644
--- a/sci-libs/starparse/metadata.xml
+++ b/sci-libs/starparse/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/symengine/metadata.xml b/sci-libs/symengine/metadata.xml
index 398b34ee0..59ecfed71 100644
--- a/sci-libs/symengine/metadata.xml
+++ b/sci-libs/symengine/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
@@ -12,7 +12,7 @@
   <upstream>
     <remote-id type="github">sympy/symengine</remote-id>
   </upstream>
-<use>
-	<flag name="boost">Add support for boost (<pkg>dev-libs/boost</pkg>)</flag>
-</use>
+  <use>
+    <flag name="boost">Add support for boost (<pkg>dev-libs/boost</pkg>)</flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/vxl/metadata.xml b/sci-libs/vxl/metadata.xml
index 861740f90..ddb4bcd85 100644
--- a/sci-libs/vxl/metadata.xml
+++ b/sci-libs/vxl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/sci-libs/wannier90/metadata.xml b/sci-libs/wannier90/metadata.xml
index 425b19557..ad1510a0c 100644
--- a/sci-libs/wannier90/metadata.xml
+++ b/sci-libs/wannier90/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
@@ -16,7 +16,7 @@
 	as well as its packaging into the Debian and Ubuntu distributions.
 	</longdescription>
 	<upstream>
-	<doc>http://www.wannier.org/</doc>
-	<remote-id type="launchpad">wannier90</remote-id>
+		<doc>http://www.wannier.org/</doc>
+		<remote-id type="launchpad">wannier90</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sci-libs/xraylib/metadata.xml b/sci-libs/xraylib/metadata.xml
index bac49d7d6..afbaa48db 100644
--- a/sci-libs/xraylib/metadata.xml
+++ b/sci-libs/xraylib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/sci-libs/zarja/metadata.xml b/sci-libs/zarja/metadata.xml
index e13004628..65abbc3a1 100644
--- a/sci-libs/zarja/metadata.xml
+++ b/sci-libs/zarja/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -9,7 +9,7 @@
   Zarja is open-source library that allows to make multi-agent
   simulations on graphs. Its functionality was proved in Classical or
   Quantum mechanical models.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="sourceforge">zarja</remote-id>
   </upstream>