Adding metadata

18 files changed, 209 insertions, 192 deletions

diff --git a/sci-calculators/bc-gh/metadata.xml b/sci-calculators/bc-gh/metadata.xml
index 63a84825cce2..83cc4b097767 100644
--- a/sci-calculators/bc-gh/metadata.xml
+++ b/sci-calculators/bc-gh/metadata.xml
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>gavin@gavinhoward.com</email>
-  <name>Gavin D. Howard</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
- <longdescription lang="en">
+	<maintainer type="person" proxied="yes">
+		<name>Gavin D. Howard</name>
+		<email>gavin@gavinhoward.com</email>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<maintainer>
+			<name>Gavin D. Howard</name>
+			<email>gavin@gavinhoward.com</email>
+		</maintainer>
+		<bugs-to>https://git.gavinhoward.com/gavin/bc</bugs-to>
+		<doc>https://git.gavinhoward.com/gavin/bc/src/branch/master/manuals</doc>
+		<remote-id type="github">gavinhoward/bc</remote-id>
+	</upstream>
+	<longdescription lang="en">
 	An implementation of POSIX bc and Unix dc with GNU extensions and some of
 	their own extensions. It also removes the dangerous '!' dc command.
 	This bc/dc is especially useful for programmers, with extra math and a
 	larger builtin library with some hardware-oriented print functions.
 	</longdescription>
- <upstream>
-  <maintainer>
-   <email>gavin@gavinhoward.com</email>
-   <name>Gavin D. Howard</name>
-  </maintainer>
-  <bugs-to>https://git.gavinhoward.com/gavin/bc</bugs-to>
-  <doc>https://git.gavinhoward.com/gavin/bc/src/branch/master/manuals</doc>
- </upstream>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>
diff --git a/sci-calculators/calcoo/metadata.xml b/sci-calculators/calcoo/metadata.xml
index da4360c8272a..f34cd8aef98a 100644
--- a/sci-calculators/calcoo/metadata.xml
+++ b/sci-calculators/calcoo/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="sourceforge">calcoo</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-calculators/datamash/metadata.xml b/sci-calculators/datamash/metadata.xml
index d85277ee2bb8..2406eb2dc2a5 100644
--- a/sci-calculators/datamash/metadata.xml
+++ b/sci-calculators/datamash/metadata.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- 
- <use>
-  <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hash routines instead of internal gnulib</flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+  <!-- maintainer-needed -->
+  <use>
+    <flag name="openssl">Use <pkg>dev-libs/openssl</pkg> for hash routines instead of internal gnulib</flag>
+  </use>
+  <upstream>
+    <remote-id type="savannah">datamash</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-calculators/galculator/metadata.xml b/sci-calculators/galculator/metadata.xml
index c9b6b0b24a72..1ef431339099 100644
--- a/sci-calculators/galculator/metadata.xml
+++ b/sci-calculators/galculator/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>gnome@gentoo.org</email>
-  <name>Gentoo GNOME Desktop</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="project">
+		<email>gnome@gentoo.org</email>
+		<name>Gentoo GNOME Desktop</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">galculator/galculator</remote-id>
+		<remote-id type="sourceforge">galculator</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-calculators/hcalc/metadata.xml b/sci-calculators/hcalc/metadata.xml
index da4360c8272a..2c81ceccda44 100644
--- a/sci-calculators/hcalc/metadata.xml
+++ b/sci-calculators/hcalc/metadata.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">jlec/hcalc</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-calculators/hexcalc/metadata.xml b/sci-calculators/hexcalc/metadata.xml
index da4360c8272a..c0cd18916a93 100644
--- a/sci-calculators/hexcalc/metadata.xml
+++ b/sci-calculators/hexcalc/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-calculators/keurocalc/metadata.xml b/sci-calculators/keurocalc/metadata.xml
index 2bd018aef103..a122dbb55f00 100644
--- a/sci-calculators/keurocalc/metadata.xml
+++ b/sci-calculators/keurocalc/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>kde@gentoo.org</email>
-  <name>Gentoo KDE Project</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://bugs.kde.org/</bugs-to>
- </upstream>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://bugs.kde.org/</bugs-to>
+		<remote-id type="kde-invent">utilities/keurocalc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-calculators/orpie/metadata.xml b/sci-calculators/orpie/metadata.xml
index e248c7a1e691..62170d9ebd31 100644
--- a/sci-calculators/orpie/metadata.xml
+++ b/sci-calculators/orpie/metadata.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- <maintainer type="project">
-  <email>ml@gentoo.org</email>
-  <name>ML</name>
- </maintainer>
- <longdescription lang="en">
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>ml@gentoo.org</email>
+		<name>ML</name>
+	</maintainer>
+	<longdescription lang="en">
 		Orpie is a fullscreen RPN calculator for the console. Its operation is
 		similar to that of modern HP calculators, but data entry has been
 		optimized for efficiency on a PC keyboard.
 	</longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<upstream>
+		<remote-id type="github">pelzlpj/orpie</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-calculators/pcalc/metadata.xml b/sci-calculators/pcalc/metadata.xml
index da4360c8272a..1ed292d8bcdf 100644
--- a/sci-calculators/pcalc/metadata.xml
+++ b/sci-calculators/pcalc/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">pcalc</remote-id>
+		<remote-id type="github">vapier/pcalc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-calculators/qalculate-gtk/metadata.xml b/sci-calculators/qalculate-gtk/metadata.xml
index d4f421994063..eca248172b94 100644
--- a/sci-calculators/qalculate-gtk/metadata.xml
+++ b/sci-calculators/qalculate-gtk/metadata.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- <maintainer type="person">
-  <email>csfore@gentoo.org</email>
-  <name>Christopher Fore</name>
- </maintainer>
- <longdescription lang="en">
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
+    <email>csfore@gentoo.org</email>
+    <name>Christopher Fore</name>
+  </maintainer>
+  <longdescription lang="en">
   Qalculate! is a multi-purpose desktop calculator for GNU/Linux. It is
   small and simple to use but with much power and versatility
   underneath.
   </longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+  <upstream>
+    <remote-id type="sourceforge">qalculate</remote-id>
+    <remote-id type="github">Qalculate/qalculate-gtk</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-calculators/qalculate-qt/metadata.xml b/sci-calculators/qalculate-qt/metadata.xml
index 97dc9858e939..ba7527992121 100644
--- a/sci-calculators/qalculate-qt/metadata.xml
+++ b/sci-calculators/qalculate-qt/metadata.xml
@@ -1,22 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>audvare@gmail.com</email>
-  <name>Andrew Udvare</name>
- </maintainer>
- <maintainer type="person">
-  <email>csfore@gentoo.org</email>
-  <name>Christopher Fore</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person" proxied="yes">
+		<email>audvare@gmail.com</email>
+		<name>Andrew Udvare</name>
+	</maintainer>
+	<maintainer type="person" proxied="yes">
+		<email>csfore@gentoo.org</email>
+		<name>Christopher Fore</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">Qalculate/qalculate-qt</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-calculators/speedcrunch/metadata.xml b/sci-calculators/speedcrunch/metadata.xml
index da4360c8272a..22b9bff528cf 100644
--- a/sci-calculators/speedcrunch/metadata.xml
+++ b/sci-calculators/speedcrunch/metadata.xml
@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="google-code">speedcrunch</remote-id>
+    <remote-id type="github">speedcrunch/SpeedCrunch</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/sci-calculators/tiemu/metadata.xml b/sci-calculators/tiemu/metadata.xml
index 6b91e5283df5..09340584d2f9 100644
--- a/sci-calculators/tiemu/metadata.xml
+++ b/sci-calculators/tiemu/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription lang="en">
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		This project aims to develop a fast emulator for the
 		TI89(titanium), 92(+), and V200PLT calculators. This emulator
 		started on the Jonas Minnberg's (X)Tiger emulator which is
 		based on UAE (the Universal Amiga Emulator). It was deeply
 		reworked and improved thus it's very different now.
 	</longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<upstream>
+		<remote-id type="sourceforge">gtktiemu</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-calculators/tilp2/metadata.xml b/sci-calculators/tilp2/metadata.xml
index ccd35f61f8ce..c110deabcfff 100644
--- a/sci-calculators/tilp2/metadata.xml
+++ b/sci-calculators/tilp2/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription lang="en">
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		TiLP is a linking program for Texas Instruments' graphing
 		calculators. It can handle any TI calculator (from TI73 to V200) with
 		any link cable. TiLP has all the functions of a linking program and
 		more.
 	</longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<upstream>
+		<remote-id type="sourceforge">tilp</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-calculators/transcalc/metadata.xml b/sci-calculators/transcalc/metadata.xml
index a20fcda95f92..6c6fde14b843 100644
--- a/sci-calculators/transcalc/metadata.xml
+++ b/sci-calculators/transcalc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription>
+    <maintainer type="project">
+        <email>sci@gentoo.org</email>
+        <name>Gentoo Science Project</name>
+    </maintainer>
+    <longdescription>
     Transcalc is an analysis and synthesis tool for calculating the
     electrical and physical properties of different kinds of RF and
     microwave transmission lines. Transcalc was somewhat inspired by the
@@ -21,6 +21,8 @@
     releases): microstrip, rectangular waveguide, coaxial line, coupled
     microstrip.
     </longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+    <upstream>
+        <remote-id type="sourceforge">transcalc</remote-id>
+        <remote-id type="gitlab">oss-abandonware/sci-calculators/transcalc</remote-id>
+    </upstream>
+</pkgmetadata>
diff --git a/sci-calculators/units/metadata.xml b/sci-calculators/units/metadata.xml
index 9684ca7b9e08..09b6ba2b5614 100644
--- a/sci-calculators/units/metadata.xml
+++ b/sci-calculators/units/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>ceamac@gentoo.org</email>
-  <name>Viorel Munteanu</name>
- </maintainer>
- <upstream>
-  <bugs-to>mailto:adrianm@gnu.org</bugs-to>
- </upstream>
- <use>
-  <flag name="units-cur">Install the units_cur python script that updates currencies</flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person">
+		<email>ceamac@gentoo.org</email>
+		<name>Viorel Munteanu</name>
+	</maintainer>
+	<use>
+		<flag name="units-cur">Install the units_cur python script that updates currencies</flag>
+	</use>
+	<upstream>
+		<remote-id type="savannah">units</remote-id>
+		<bugs-to>mailto:adrianm@gnu.org</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-calculators/wcalc/metadata.xml b/sci-calculators/wcalc/metadata.xml
index 3033bd3d1ab3..84bf30d6c2e3 100644
--- a/sci-calculators/wcalc/metadata.xml
+++ b/sci-calculators/wcalc/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="project">
-  <email>sci@gentoo.org</email>
-  <name>Gentoo Science Project</name>
- </maintainer>
- <longdescription lang="en">
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription lang="en">
 		Wcalc is a very capable calculator. It has standard functions (sin,
 		asin, and sinh for example, in either radians or degrees), many
 		pre-defined constants (pi, e, c, etc.), support for using variables,
@@ -14,6 +14,7 @@
 		expression entry field. It evaluates expressions using the standard
 		order of operations.
 	</longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<upstream>
+		<remote-id type="sourceforge">w-calc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sci-calculators/xsv/metadata.xml b/sci-calculators/xsv/metadata.xml
index ebaa4a00c2cb..001e06dec327 100644
--- a/sci-calculators/xsv/metadata.xml
+++ b/sci-calculators/xsv/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
- <maintainer type="person">
-  <email>zmedico@gentoo.org</email>
-  <name>Zac Medico</name>
- </maintainer>
- <upstream>
-  <changelog>https://github.com/BurntSushi/xsv/commits/master</changelog>
-  <bugs-to>https://github.com/BurntSushi/xsv/issues</bugs-to>
- </upstream>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>https://github.com/BurntSushi/xsv/issues</bugs-to>
+		<changelog>https://github.com/BurntSushi/xsv/commits/master</changelog>
+		<remote-id type="github">BurntSushi/xsv</remote-id>
+	</upstream>
+</pkgmetadata>