8 files changed, 49 insertions, 29 deletions
diff --git a/sci-mathematics/cgal/metadata.xml b/sci-mathematics/cgal/metadata.xml
index 21976378884f..ec85a1dbc69a 100644
--- a/sci-mathematics/cgal/metadata.xml
+++ b/sci-mathematics/cgal/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,9 +17,12 @@
     enclosing circle, and multidimensional query structures.
   * the Support Library which offers interfaces to other packages,
     e.g., for visualisation, and I/O, and other support facilities.
-</longdescription>
+  </longdescription>
   <use>
     <flag name="mpfi">Enable support for multiple recision interval arithmetic via <pkg>sci-libs/mpfi</pkg></flag>
-	<flag name="ntl">Enable support for <pkg>dev-libs/ntl</pkg></flag>
+    <flag name="ntl">Enable support for <pkg>dev-libs/ntl</pkg></flag>
   </use>
+  <upstream>
+    <remote-id type="github">CGAL/cgal</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/geogebra/metadata.xml b/sci-mathematics/geogebra/metadata.xml
index df23db68bf98..5087bdcd1f42 100644
--- a/sci-mathematics/geogebra/metadata.xml
+++ b/sci-mathematics/geogebra/metadata.xml
@@ -1,13 +1,16 @@
-<?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">
-	<email>amynka@gentoo.org</email>
-</maintainer>
-<longdescription lang="en">
+	<maintainer type="person">
+		<email>amynka@gentoo.org</email>
+	</maintainer>
+	<longdescription lang="en">
  GeoGebra is interactive mathematics software for learning and teaching mathematics 
  and science from primary school up to university level. 
  Constructions can be made with points, vectors, segments, lines, polygons, 
  conic sections, inequalities, implicit polynomials and functions.
-</longdescription>
+	</longdescription>
+	<upstream>
+		<remote-id type="github">geogebra/geogebra</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/minisat/metadata.xml b/sci-mathematics/minisat/metadata.xml
index c7c0c8ca6b02..1d99050d0a59 100644
--- a/sci-mathematics/minisat/metadata.xml
+++ b/sci-mathematics/minisat/metadata.xml
@@ -1,12 +1,15 @@
-<?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">
-<email>sci@gentoo.org</email>
-<name>Gentoo Science Project</name>
-</maintainer>
-<use>
-<flag name="extended-solver">Build extended version of SAT solver with
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<use>
+		<flag name="extended-solver">Build extended version of SAT solver with
  additional features.</flag>
-</use>
+	</use>
+	<upstream>
+		<remote-id type="github">niklasso/minisat</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/normaliz/metadata.xml b/sci-mathematics/normaliz/metadata.xml
index 2962ce917fad..6edd7c37997e 100644
--- a/sci-mathematics/normaliz/metadata.xml
+++ b/sci-mathematics/normaliz/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,5 +12,8 @@
   <longdescription lang="en">
 Normaliz is a (command line) tool for computations in affine monoids, vector configurations, lattice polytopes, and
 rational cones.
-</longdescription>
+  </longdescription>
+  <upstream>
+    <remote-id type="github">Normaliz/Normaliz</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/pymc/metadata.xml b/sci-mathematics/pymc/metadata.xml
index d8ee70fc4cc5..0b8c7cb3f0e5 100644
--- a/sci-mathematics/pymc/metadata.xml
+++ b/sci-mathematics/pymc/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,8 +8,9 @@
   <longdescription lang="en">
 PyMC is a python module that implements Bayesian statistical models
 and fitting algorithms, including Markov chain Monte Carlo.
-</longdescription>
+  </longdescription>
   <upstream>
     <remote-id type="github">pymc-devs/pymc</remote-id>
+    <remote-id type="pypi">pymc</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/pymc3/metadata.xml b/sci-mathematics/pymc3/metadata.xml
index d212131b4cd0..4476cda6eeea 100644
--- a/sci-mathematics/pymc3/metadata.xml
+++ b/sci-mathematics/pymc3/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,5 +14,6 @@
   </longdescription>
   <upstream>
     <remote-id type="github">pymc-devs/pymc3</remote-id>
+    <remote-id type="pypi">pymc3</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/relational/metadata.xml b/sci-mathematics/relational/metadata.xml
index 17237689dcfd..e3c73f6f84a6 100644
--- a/sci-mathematics/relational/metadata.xml
+++ b/sci-mathematics/relational/metadata.xml
@@ -1,8 +1,11 @@
-<?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">
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">ltworf/relational</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sci-mathematics/z3/metadata.xml b/sci-mathematics/z3/metadata.xml
index d8a91e5c5dd0..350861622f3d 100644
--- a/sci-mathematics/z3/metadata.xml
+++ b/sci-mathematics/z3/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,11 +12,14 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-<longdescription lang='en'>
+  <longdescription lang="en">
 Z3 is a high-performance theorem prover being developed at Microsoft Research.
-</longdescription>
-<use>
-  <flag name='isabelle'>Add integration support for the Isabelle/HOL
+  </longdescription>
+  <use>
+    <flag name="isabelle">Add integration support for the Isabelle/HOL
   theorem prover.</flag>
-</use>
+  </use>
+  <upstream>
+    <remote-id type="github">Z3Prover/z3</remote-id>
+  </upstream>
 </pkgmetadata>