Cleanup remote IDs

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

68 files changed, 81 insertions, 135 deletions

diff --git a/dev-python/PeakUtils/metadata.xml b/dev-python/PeakUtils/metadata.xml
index a4c17d458..32d3251d5 100644
--- a/dev-python/PeakUtils/metadata.xml
+++ b/dev-python/PeakUtils/metadata.xml
@@ -13,7 +13,7 @@
     increase the resolution of the peak detection.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">PeakUtils</remote-id>
     <remote-id type="bitbucket">lucashnegri/peakutils</remote-id>
+    <remote-id type="pypi">PeakUtils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/PyVISA-py/metadata.xml b/dev-python/PyVISA-py/metadata.xml
index be11d627d..26acc9198 100644
--- a/dev-python/PyVISA-py/metadata.xml
+++ b/dev-python/PyVISA-py/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
@@ -14,7 +14,7 @@
     Instrument Software Architecture" (VISA) in pure Python.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">PyVISA-py</remote-id>
     <remote-id type="github">hgrecco/pyvisa-py</remote-id>
+    <remote-id type="pypi">PyVISA-py</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/PyVISA/metadata.xml b/dev-python/PyVISA/metadata.xml
index c7529e22f..19e1a51ca 100644
--- a/dev-python/PyVISA/metadata.xml
+++ b/dev-python/PyVISA/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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">
@@ -15,7 +15,7 @@
     test equipment via GPIB, RS232, Ethernet or USB.
   </longdescription>
   <upstream>
+    <remote-id type="github">hgrecco/pyvisa-py</remote-id>
     <remote-id type="pypi">PyVISA</remote-id>
-    <remote-id type="github">hgrecco/pyvisa</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/RecSQL/metadata.xml b/dev-python/RecSQL/metadata.xml
index c0ad26b50..355e9a516 100644
--- a/dev-python/RecSQL/metadata.xml
+++ b/dev-python/RecSQL/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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">orbeckst/RecSQL</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-python/arrayfire-python/metadata.xml b/dev-python/arrayfire-python/metadata.xml
index 18b1016e2..12f0d0584 100644
--- a/dev-python/arrayfire-python/metadata.xml
+++ b/dev-python/arrayfire-python/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/astropy-helpers/metadata.xml b/dev-python/astropy-helpers/metadata.xml
index 9dffe2edc..68d40928a 100644
--- a/dev-python/astropy-helpers/metadata.xml
+++ b/dev-python/astropy-helpers/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 @@
 		that may be used by other projects.
 	</longdescription>
   <upstream>
-    <remote-id type="pypi">astropy-helpers</remote-id>
     <remote-id type="github">astropy/astropy-helpers</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/astroquery/metadata.xml b/dev-python/astroquery/metadata.xml
index 224276aae..84e169547 100644
--- a/dev-python/astroquery/metadata.xml
+++ b/dev-python/astroquery/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 @@
 		to support many services with a uniform API.
 	</longdescription>
   <upstream>
-    <remote-id type="pypi">astroquery</remote-id>
     <remote-id type="github">astropy/astroquery</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/brewer2mpl/metadata.xml b/dev-python/brewer2mpl/metadata.xml
index 4f2cd15bf..42211a68b 100644
--- a/dev-python/brewer2mpl/metadata.xml
+++ b/dev-python/brewer2mpl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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">
@@ -16,7 +16,7 @@
     ships with brewer2mpl so no internet connection is required.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">brewer2mpl</remote-id>
     <remote-id type="github">jiffyclub/brewer2mpl</remote-id>
+    <remote-id type="pypi">brewer2mpl</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/ccdproc/metadata.xml b/dev-python/ccdproc/metadata.xml
index a254a5734..e634ec8d8 100644
--- a/dev-python/ccdproc/metadata.xml
+++ b/dev-python/ccdproc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 @@
 		and bad pixel tracking through the reduction steps.
 	</longdescription>
   <upstream>
-    <remote-id type="pypi">ccdproc</remote-id>
     <remote-id type="github">astropy/ccdproc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/coards/metadata.xml b/dev-python/coards/metadata.xml
index 34578d15d..77d8a36e7 100644
--- a/dev-python/coards/metadata.xml
+++ b/dev-python/coards/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/dijitso/metadata.xml b/dev-python/dijitso/metadata.xml
index 489293405..cb17acf08 100644
--- a/dev-python/dijitso/metadata.xml
+++ b/dev-python/dijitso/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 @@
 		library, and thus do not need wrapping in a nice Python interface.
 	</longdescription>
 	<upstream>
-		<remote-id type="bitbucket">fenics-project/ffc</remote-id>
-		<remote-id type="launchpad">ffc</remote-id>
+		<remote-id type="bitbucket">fenics-project/dijitso</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/dimensionful/metadata.xml b/dev-python/dimensionful/metadata.xml
index 310bd052e..c156f9144 100644
--- a/dev-python/dimensionful/metadata.xml
+++ b/dev-python/dimensionful/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/ffc/metadata.xml b/dev-python/ffc/metadata.xml
index c18ab8720..35bb1f59e 100644
--- a/dev-python/ffc/metadata.xml
+++ b/dev-python/ffc/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 +15,5 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="bitbucket">fenics-project/ffc</remote-id>
-		<remote-id type="launchpad">ffc</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ffnet/metadata.xml b/dev-python/ffnet/metadata.xml
index 81dcc789e..84e07f038 100644
--- a/dev-python/ffnet/metadata.xml
+++ b/dev-python/ffnet/metadata.xml
@@ -13,7 +13,6 @@
     <flag name="matplotlib">Use matplotlib for drawing</flag>
   </use>
   <upstream>
-    <remote-id type="github">mrkwjc/ffnet</remote-id>
     <remote-id type="pypi">ffnet</remote-id>
     <remote-id type="sourceforge">ffnet</remote-id>
   </upstream>
diff --git a/dev-python/ffnetui/metadata.xml b/dev-python/ffnetui/metadata.xml
index 50cd8d0c5..fe996f826 100644
--- a/dev-python/ffnetui/metadata.xml
+++ b/dev-python/ffnetui/metadata.xml
@@ -9,7 +9,6 @@
   GUI for ffnet - feed forward neural network for python
   </longdescription>
   <upstream>
-    <remote-id type="github">mrkwjc/ffnetui</remote-id>
     <remote-id type="pypi">ffnetui</remote-id>
     <remote-id type="sourceforge">ffnet</remote-id>
   </upstream>
diff --git a/dev-python/fiat/metadata.xml b/dev-python/fiat/metadata.xml
index c28ae4e03..c3aad9140 100644
--- a/dev-python/fiat/metadata.xml
+++ b/dev-python/fiat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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">
@@ -17,6 +17,5 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="bitbucket">fenics-project/fiat</remote-id>
-		<remote-id type="launchpad">fiat</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/gammapy/metadata.xml b/dev-python/gammapy/metadata.xml
index 413f49bd4..9ab0a8d12 100644
--- a/dev-python/gammapy/metadata.xml
+++ b/dev-python/gammapy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 @@
 		H.E.S.S, and CTA in primarily Galactic plane survey studies.
 	</longdescription>
   <upstream>
-    <remote-id type="pypi">gammapy</remote-id>
     <remote-id type="github">gammapy/gammapy</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/hdf5storage/metadata.xml b/dev-python/hdf5storage/metadata.xml
index 320a9f946..8ce73fe8c 100644
--- a/dev-python/hdf5storage/metadata.xml
+++ b/dev-python/hdf5storage/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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">
@@ -17,7 +17,7 @@
     extension and some extra meta-data.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">hdf5storage</remote-id>
     <remote-id type="github">frejanordsiek/hdf5storage</remote-id>
+    <remote-id type="pypi">hdf5storage</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/imageutils/metadata.xml b/dev-python/imageutils/metadata.xml
index 90af04221..8f422b20a 100644
--- a/dev-python/imageutils/metadata.xml
+++ b/dev-python/imageutils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 @@
 		package before the 1.0 release.
 	</longdescription>
   <upstream>
-    <remote-id type="pypi">imageutils</remote-id>
     <remote-id type="github">astropy/imageutils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/instant/metadata.xml b/dev-python/instant/metadata.xml
index b3c7ae99c..0aa8827a4 100644
--- a/dev-python/instant/metadata.xml
+++ b/dev-python/instant/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 +12,5 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="bitbucket">fenics-project/instant</remote-id>
-		<remote-id type="launchpad">instant</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/ipykernel/metadata.xml b/dev-python/ipykernel/metadata.xml
index 973783bf3..d87bc07db 100644
--- a/dev-python/ipykernel/metadata.xml
+++ b/dev-python/ipykernel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 @@
     This package provides the IPython kernel for Jupyter.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">ipykernel</remote-id>
     <remote-id type="github">ipython/ipykernel</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/ipyparallel/metadata.xml b/dev-python/ipyparallel/metadata.xml
index 47348926e..bd6c5c2e0 100644
--- a/dev-python/ipyparallel/metadata.xml
+++ b/dev-python/ipyparallel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,4 @@
   	Interactive Parallel Computing with IPython.
     ipyparallel is the new home of IPython.parallel.
   </longdescription>
-  <upstream>
-    <remote-id type="pypi">ipyparallel</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-python/ipython_genutils/metadata.xml b/dev-python/ipython_genutils/metadata.xml
index c9deb0b09..52164c08d 100644
--- a/dev-python/ipython_genutils/metadata.xml
+++ b/dev-python/ipython_genutils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 @@
     go away. No packages outside IPython/Jupyter should depend on it.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">ipython_genutils</remote-id>
     <remote-id type="github">ipython/ipython_genutils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/ipywidgets/metadata.xml b/dev-python/ipywidgets/metadata.xml
index 8bc51992f..4495ebb74 100644
--- a/dev-python/ipywidgets/metadata.xml
+++ b/dev-python/ipywidgets/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/jupyter_client/metadata.xml b/dev-python/jupyter_client/metadata.xml
index 53a086c17..fbd1af5b5 100644
--- a/dev-python/jupyter_client/metadata.xml
+++ b/dev-python/jupyter_client/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -11,7 +11,4 @@
     kernels. It also provides the jupyter kernelspec entrypoint for
     installing kernelspecs for use with Jupyter frontends.
   </longdescription>
-  <upstream>
-    <remote-id type="pypi">jupyter_client</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-python/jupyter_console/metadata.xml b/dev-python/jupyter_console/metadata.xml
index 6fc0fef28..a2b19aeaf 100644
--- a/dev-python/jupyter_console/metadata.xml
+++ b/dev-python/jupyter_console/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -9,7 +9,4 @@
     A terminal-based console frontend for Jupyter kernels.
     This code is based on the single-process IPython terminal.
   </longdescription>
-  <upstream>
-    <remote-id type="pypi">jupyter_console</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-python/jupyter_core/metadata.xml b/dev-python/jupyter_core/metadata.xml
index 467bb37a5..88e71aa2c 100644
--- a/dev-python/jupyter_core/metadata.xml
+++ b/dev-python/jupyter_core/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -10,7 +10,4 @@
     This package contains base application classes and configuration
     inhertited by other projects. It doesn't do much on its own.
   </longdescription>
-  <upstream>
-    <remote-id type="pypi">jupyter_core</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-python/matlab_wrapper/metadata.xml b/dev-python/matlab_wrapper/metadata.xml
index bad1f381d..38df0353a 100644
--- a/dev-python/matlab_wrapper/metadata.xml
+++ b/dev-python/matlab_wrapper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
@@ -17,7 +17,7 @@
     as a regular Python module.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">matlab_wrapper</remote-id>
     <remote-id type="github">mrkrd/matlab_wrapper</remote-id>
+    <remote-id type="pypi">matlab_wrapper</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/matplotlib-venn/metadata.xml b/dev-python/matplotlib-venn/metadata.xml
index 8401ce8b5..cae4c83f9 100644
--- a/dev-python/matplotlib-venn/metadata.xml
+++ b/dev-python/matplotlib-venn/metadata.xml
@@ -6,7 +6,6 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">matplotlib-venn</remote-id>
     <remote-id type="pypi">matplotlib-venn</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/matplotlib2tikz/metadata.xml b/dev-python/matplotlib2tikz/metadata.xml
index 9c08eac01..9dc28cbe0 100644
--- a/dev-python/matplotlib2tikz/metadata.xml
+++ b/dev-python/matplotlib2tikz/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 +12,5 @@
 	<longdescription>matplotlib2tikz is a Python tool for converting matplotlib figures into PGFPlots (TikZ) figures like for native inclusion into LaTeX documents. The output of matplotlib2tikz is in PGFPlots, a LaTeX library that sits on top of TikZ and describes graphs in terms of axes, data etc. Consequently, the output of matplotlib2tikz retains more information, can be more easily understood, and is more easily editable than raw TikZ output.</longdescription>
 	<upstream>
 		<remote-id type="github">nschloe/matplotlib2tikz</remote-id>
-		<remote-id type="pypi">matplotlib2tikz</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/matrix2latex/metadata.xml b/dev-python/matrix2latex/metadata.xml
index b8ecd8dc9..e8cce6c4b 100644
--- a/dev-python/matrix2latex/metadata.xml
+++ b/dev-python/matrix2latex/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 +11,6 @@
 		LATeX documents and compile them.
 	</longdescription>
 	<upstream>
-		<remote-id type="github">matrix2latex</remote-id>
+		<remote-id type="github">TheChymera/matrix2latex</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/meshpy/metadata.xml b/dev-python/meshpy/metadata.xml
index d5be6ad0b..18f3e3730 100644
--- a/dev-python/meshpy/metadata.xml
+++ b/dev-python/meshpy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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 @@ also have many other applications ranging from computer graphics to robotics.
 In order to generate these 2D and 3D meshes, MeshPy provides Python interfaces 
 to two well-regarded mesh generators, Triangle by J. Shewchuk and TetGen by 
 Hang Si. Both are included in the package in slightly modified versions.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="pypi">MeshPy</remote-id>
   </upstream>
diff --git a/dev-python/metakernel/metadata.xml b/dev-python/metakernel/metadata.xml
index 98f5e4874..e0c68c929 100644
--- a/dev-python/metakernel/metadata.xml
+++ b/dev-python/metakernel/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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 @@
     parallel and distributed processing, downloads, and much more).
   </longdescription>
   <upstream>
-    <remote-id type="pypi">metakernel</remote-id>
     <remote-id type="github">Calysto/metakernel</remote-id>
+    <remote-id type="pypi">metakernel</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/metakernel_bash/metadata.xml b/dev-python/metakernel_bash/metadata.xml
index 105ab469f..286d590e3 100644
--- a/dev-python/metakernel_bash/metadata.xml
+++ b/dev-python/metakernel_bash/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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 @@
     A Bash kernel for Jupyter/IPython, based on MetaKernel.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">metakernel_bash</remote-id>
     <remote-id type="github">Calysto/metakernel</remote-id>
+    <remote-id type="pypi">metakernel_bash</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/metakernel_python/metadata.xml b/dev-python/metakernel_python/metadata.xml
index 2aed17634..aaf6cb9d7 100644
--- a/dev-python/metakernel_python/metadata.xml
+++ b/dev-python/metakernel_python/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
@@ -9,7 +9,7 @@
     A Python kernel for Jupyter/IPython, based on MetaKernel.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">metakernel_python</remote-id>
     <remote-id type="github">Calysto/metakernel</remote-id>
+    <remote-id type="pypi">metakernel_python</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/nbconvert/metadata.xml b/dev-python/nbconvert/metadata.xml
index 10cd4105e..d9cbf5baa 100644
--- a/dev-python/nbconvert/metadata.xml
+++ b/dev-python/nbconvert/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,4 @@
     Jupyter NBConvert converts Jupyter notebooks to various other
     formats via Jinja templates.
   </longdescription>
-  <upstream>
-    <remote-id type="pypi">nbconvert</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
index b2a229dc3..5a8712352 100644
--- a/dev-python/nbdime/metadata.xml
+++ b/dev-python/nbdime/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,13 +12,9 @@
   <longdescription>
     nbdime provides tools for diffing and merging of Jupyter Notebooks.
   </longdescription>
-  <upstream>
-    <remote-id type="github">jupyter/nbdime</remote-id>
-    <remote-id type="pypi">nbdime</remote-id>
-  </upstream>
   <use>
     <flag name="webtools">
       Install web-based diff and merge tools.
     </flag>
-</use>
+  </use>
 </pkgmetadata>
diff --git a/dev-python/nbformat/metadata.xml b/dev-python/nbformat/metadata.xml
index 6bd91dea5..4788ba53f 100644
--- a/dev-python/nbformat/metadata.xml
+++ b/dev-python/nbformat/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,4 @@
     notebooks. There is also a JSON schema for notebook format
     versions &gt;= 3.
   </longdescription>
-  <upstream>
-    <remote-id type="pypi">nbformat</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-python/newrelic/metadata.xml b/dev-python/newrelic/metadata.xml
index 442e04047..4a7c9adc5 100644
--- a/dev-python/newrelic/metadata.xml
+++ b/dev-python/newrelic/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/notebook/metadata.xml b/dev-python/notebook/metadata.xml
index 2751ca0be..8161170dc 100644
--- a/dev-python/notebook/metadata.xml
+++ b/dev-python/notebook/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/nvidia-ml-py/metadata.xml b/dev-python/nvidia-ml-py/metadata.xml
index 5e6d9d85c..e18e888d9 100644
--- a/dev-python/nvidia-ml-py/metadata.xml
+++ b/dev-python/nvidia-ml-py/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
diff --git a/dev-python/omniorbpy/metadata.xml b/dev-python/omniorbpy/metadata.xml
index f3506b413..d47182280 100644
--- a/dev-python/omniorbpy/metadata.xml
+++ b/dev-python/omniorbpy/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/opal-client/metadata.xml b/dev-python/opal-client/metadata.xml
index 28e2fc558..7aac60648 100644
--- a/dev-python/opal-client/metadata.xml
+++ b/dev-python/opal-client/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="project">
diff --git a/dev-python/pamela/metadata.xml b/dev-python/pamela/metadata.xml
index d1dc0c28b..e55257c75 100644
--- a/dev-python/pamela/metadata.xml
+++ b/dev-python/pamela/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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 @@
     written in pure Python (using ctypes).
   </longdescription>
   <upstream>
-    <remote-id type="pypi">pamela</remote-id>
     <remote-id type="github">minrk/pamela</remote-id>
+    <remote-id type="pypi">pamela</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/photutils/metadata.xml b/dev-python/photutils/metadata.xml
index b5ab4d774..00ee2183b 100644
--- a/dev-python/photutils/metadata.xml
+++ b/dev-python/photutils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 @@
 		centroid and shape parameters, and performing photometry.
 	</longdescription>
   <upstream>
-    <remote-id type="pypi">photutils</remote-id>
     <remote-id type="github">astropy/photutils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pickleshare/metadata.xml b/dev-python/pickleshare/metadata.xml
index 5d8abb4a3..967d08889 100644
--- a/dev-python/pickleshare/metadata.xml
+++ b/dev-python/pickleshare/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,7 +15,6 @@
     governed by PickleShare.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">pickleshare</remote-id>
     <remote-id type="github">pickleshare/pickleshare</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/prettyplotlib/metadata.xml b/dev-python/prettyplotlib/metadata.xml
index 752a7a1ad..615f1b6db 100644
--- a/dev-python/prettyplotlib/metadata.xml
+++ b/dev-python/prettyplotlib/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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">
@@ -7,7 +7,7 @@
   </maintainer>
   <longdescription>
     Python matplotlib-enhancer library which painlessly creates
-    beautiful default matplotlib plots. 
+    beautiful default matplotlib plots.
   </longdescription>
   <upstream>
     <remote-id type="pypi">prettyplotlib</remote-id>
diff --git a/dev-python/prov/metadata.xml b/dev-python/prov/metadata.xml
index df7ac6500..1b4b150fb 100644
--- a/dev-python/prov/metadata.xml
+++ b/dev-python/prov/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/ptyprocess/metadata.xml b/dev-python/ptyprocess/metadata.xml
index 3ff841fbb..ea8694355 100644
--- a/dev-python/ptyprocess/metadata.xml
+++ b/dev-python/ptyprocess/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/pydotplus/metadata.xml b/dev-python/pydotplus/metadata.xml
index 3e56e273a..eb80ef0cd 100644
--- a/dev-python/pydotplus/metadata.xml
+++ b/dev-python/pydotplus/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/pyfftw/metadata.xml b/dev-python/pyfftw/metadata.xml
index 039274847..174e4dbdc 100644
--- a/dev-python/pyfftw/metadata.xml
+++ b/dev-python/pyfftw/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/pyhdf/metadata.xml b/dev-python/pyhdf/metadata.xml
index bc7e4eaea..d38ca85ff 100644
--- a/dev-python/pyhdf/metadata.xml
+++ b/dev-python/pyhdf/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/pylibconfig2/metadata.xml b/dev-python/pylibconfig2/metadata.xml
index ddcf65796..e260b7fe1 100644
--- a/dev-python/pylibconfig2/metadata.xml
+++ b/dev-python/pylibconfig2/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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">
@@ -19,7 +19,7 @@
     only, and represented as a string automatically.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">pylibconfig2</remote-id>
     <remote-id type="github">heinzK1X/pylibconfig2</remote-id>
+    <remote-id type="pypi">pylibconfig2</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pynomo/metadata.xml b/dev-python/pynomo/metadata.xml
index 0ece82028..f365ddf66 100644
--- a/dev-python/pynomo/metadata.xml
+++ b/dev-python/pynomo/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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">
@@ -8,7 +8,7 @@
   Pynomo is a program to create (pdf) nomographs
   (nomograms) using Python interpreter. A nomograph (nomogram) is a
   graphical solution to an equation.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="sourceforge">pynomo</remote-id>
   </upstream>
diff --git a/dev-python/pysolar/metadata.xml b/dev-python/pysolar/metadata.xml
index a7996892d..fe8be1b12 100644
--- a/dev-python/pysolar/metadata.xml
+++ b/dev-python/pysolar/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,9 +11,8 @@
  extremely precise ephemeris calculations, and more. Pysolar can
  calculate the location of the sun or the shading percentage as a
  function of time for a row of 2-axis tracked panels.
-</longdescription>
+  </longdescription>
   <upstream>
-    <remote-id type="pypi">Pysolar</remote-id>
     <remote-id type="github">pingswept/pysolar</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/python-ivi/metadata.xml b/dev-python/python-ivi/metadata.xml
index 9d59c0382..630240a1d 100644
--- a/dev-python/python-ivi/metadata.xml
+++ b/dev-python/python-ivi/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/python-vxi11/metadata.xml b/dev-python/python-vxi11/metadata.xml
index 095fd5346..72510adc7 100644
--- a/dev-python/python-vxi11/metadata.xml
+++ b/dev-python/python-vxi11/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/pythoncgns/metadata.xml b/dev-python/pythoncgns/metadata.xml
index 116c8c0b3..35f35f0b7 100644
--- a/dev-python/pythoncgns/metadata.xml
+++ b/dev-python/pythoncgns/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/pythonqt/metadata.xml b/dev-python/pythonqt/metadata.xml
index e44f1d0fe..364efbdc3 100644
--- a/dev-python/pythonqt/metadata.xml
+++ b/dev-python/pythonqt/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/qtconsole/metadata.xml b/dev-python/qtconsole/metadata.xml
index 83b712f7e..93199c605 100644
--- a/dev-python/qtconsole/metadata.xml
+++ b/dev-python/qtconsole/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,4 @@
     A rich Qt-based console for working with Jupyter kernels,
     supporting rich media output, session export, and more.
   </longdescription>
-  <upstream>
-    <remote-id type="pypi">qtconsole</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-python/snakemake/metadata.xml b/dev-python/snakemake/metadata.xml
index 9fb8f07d6..a21e3edfd 100644
--- a/dev-python/snakemake/metadata.xml
+++ b/dev-python/snakemake/metadata.xml
@@ -10,7 +10,6 @@
     <name>Python</name>
   </maintainer>
   <upstream>
-    <remote-id type="github">dev-python/snakemake</remote-id>
     <remote-id type="bitbucket">johanneskoester/snakemake</remote-id>
     <remote-id type="pypi">snakemake</remote-id>
   </upstream>
diff --git a/dev-python/specutils/metadata.xml b/dev-python/specutils/metadata.xml
index 15cc63844..6e70cb363 100644
--- a/dev-python/specutils/metadata.xml
+++ b/dev-python/specutils/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 @@
 		into a class with special handling of 1D spectra.
 	</longdescription>
   <upstream>
-    <remote-id type="pypi">specutils</remote-id>
     <remote-id type="github">astropy/specutils</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/symengine/metadata.xml b/dev-python/symengine/metadata.xml
index 00019a052..ffc78518d 100644
--- a/dev-python/symengine/metadata.xml
+++ b/dev-python/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">
diff --git a/dev-python/testpath/metadata.xml b/dev-python/testpath/metadata.xml
index cba9cbf64..7183f762d 100644
--- a/dev-python/testpath/metadata.xml
+++ b/dev-python/testpath/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,4 @@
     filesystem, and tools for mocking system commands and recording
     calls to those.
   </longdescription>
-  <upstream>
-    <remote-id type="github">jupyter/testpath</remote-id>
-  </upstream>
 </pkgmetadata>
diff --git a/dev-python/traitlets/metadata.xml b/dev-python/traitlets/metadata.xml
index fa50e6184..a1cab5d48 100644
--- a/dev-python/traitlets/metadata.xml
+++ b/dev-python/traitlets/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 @@
     the config system of IPython and Jupyter.
   </longdescription>
   <upstream>
-    <remote-id type="pypi">traitlets</remote-id>
     <remote-id type="github">ipython/traitlets</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/ufl/metadata.xml b/dev-python/ufl/metadata.xml
index af0327cec..480a531aa 100644
--- a/dev-python/ufl/metadata.xml
+++ b/dev-python/ufl/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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">
@@ -14,6 +14,5 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="bitbucket">fenics-project/ufl</remote-id>
-		<remote-id type="launchpad">ufl</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/viper/metadata.xml b/dev-python/viper/metadata.xml
index 430a78511..18c1efff5 100644
--- a/dev-python/viper/metadata.xml
+++ b/dev-python/viper/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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/dev-python/widgetsnbextension/metadata.xml b/dev-python/widgetsnbextension/metadata.xml
index 9f0544f5e..56daebe56 100644
--- a/dev-python/widgetsnbextension/metadata.xml
+++ b/dev-python/widgetsnbextension/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version="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,6 +10,5 @@
   </longdescription>
   <upstream>
     <remote-id type="pypi">widgetsnbextension</remote-id>
-    <remote-id type="github">ipython/ipywidgets</remote-id>
   </upstream>
 </pkgmetadata>