Adding metadata

20 files changed, 207 insertions, 192 deletions

diff --git a/www-misc/awstats/metadata.xml b/www-misc/awstats/metadata.xml
index 46e667ce994d..067a8a70d931 100644
--- a/www-misc/awstats/metadata.xml
+++ b/www-misc/awstats/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>web-apps@gentoo.org</email>
-  <name>Gentoo Webapps</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+<maintainer type="project">
+    <email>web-apps@gentoo.org</email>
+    <name>Gentoo Webapps</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/www-misc/bookmarksync/metadata.xml b/www-misc/bookmarksync/metadata.xml
index f21dc603bade..e6f9a80b4ac5 100644
--- a/www-misc/bookmarksync/metadata.xml
+++ b/www-misc/bookmarksync/metadata.xml
@@ -1,11 +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>
- <longdescription>
+	<!-- maintainer-needed -->
+	<longdescription>
 		bookmarksync is a tool used for synchronizing different bookmark files
 		and types. It preserves current bookmark structures and sorts in new
 		ones correctly in existing directorys or create new one if necessary.
 	</longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<upstream>
+		<remote-id type="sourceforge">booksync</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/buku/metadata.xml b/www-misc/buku/metadata.xml
index 550c4d4b340d..928af8ea8e8f 100644
--- a/www-misc/buku/metadata.xml
+++ b/www-misc/buku/metadata.xml
@@ -1,18 +1,19 @@
 <?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>stkw0@disroot.org</email>
-  <name>David Roman</name>
- </maintainer>
- <maintainer type="person">
-  <email>ajak@gentoo.org</email>
-  <name>John Helmert III</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person" proxied="yes">
+		<email>stkw0@disroot.org</email>
+		<name>David Roman</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>ajak@gentoo.org</email>
+		<name>John Helmert III</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jarun/buku</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/dufs/metadata.xml b/www-misc/dufs/metadata.xml
index f1472c8916fd..6782753fbfc7 100644
--- a/www-misc/dufs/metadata.xml
+++ b/www-misc/dufs/metadata.xml
@@ -1,17 +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="person">
-  <email>ceres@ceressees.dev</email>
-  <name>Ceres Milner</name>
- </maintainer>
- <upstream>
-  <maintainer status="active">
-   <email>sigoden@gmail.com</email>
-   <name>sigoden</name>
-  </maintainer>
-  <changelog>&#xA;&#x9;&#x9;&#x9;https://github.com/sigoden/dufs/blob/main/CHANGELOG.md&#xA;&#x9;&#x9;</changelog>
-  <bugs-to>&#xA;&#x9;&#x9;&#x9;https://github.com/sigoden/dufs/issues&#xA;&#x9;&#x9;</bugs-to>
- </upstream>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person">
+		<email>ceres@ceressees.dev</email>
+		<name>Ceres Milner</name>
+	</maintainer>
+	<upstream>
+		<bugs-to>
+			https://github.com/sigoden/dufs/issues
+		</bugs-to>
+		<changelog>
+			https://github.com/sigoden/dufs/blob/main/CHANGELOG.md
+		</changelog>
+		<maintainer status="active">
+			<name>sigoden</name>
+			<email>sigoden@gmail.com</email>
+		</maintainer>
+		<remote-id type="github">sigoden/dufs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/fcgiwrap/metadata.xml b/www-misc/fcgiwrap/metadata.xml
index d09781c88c34..80826879b8fc 100644
--- a/www-misc/fcgiwrap/metadata.xml
+++ b/www-misc/fcgiwrap/metadata.xml
@@ -1,11 +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>
- <longdescription lang="en">
+<!-- maintainer-needed -->
+	<longdescription lang="en">
 	fcgiwrap is a simple server for running CGI applications over FastCGI. It
 	hopes to provide clean CGI support to Nginx (and other web servers that may
 	need it).
 	</longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<upstream>
+		<remote-id type="github">gnosek/fcgiwrap</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/gitea2rss/metadata.xml b/www-misc/gitea2rss/metadata.xml
index e40a4e8fe372..7de1b9f03581 100644
--- a/www-misc/gitea2rss/metadata.xml
+++ b/www-misc/gitea2rss/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="person">
-  <email>tea+gentoo@cuddleslut.fr</email>
-  <name>tea</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://codeberg.org/tastytea/gitea2rss/issues</bugs-to>
- </upstream>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person">
+		<email>tea+gentoo@cuddleslut.fr</email>
+		<name>tea</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="codeberg">tastytea/gitea2rss</remote-id>
+		<bugs-to>https://codeberg.org/tastytea/gitea2rss/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/kiwix-desktop/metadata.xml b/www-misc/kiwix-desktop/metadata.xml
index 4787336d3f68..0f241fa673ae 100644
--- a/www-misc/kiwix-desktop/metadata.xml
+++ b/www-misc/kiwix-desktop/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="person">
-  <email>stkw0@disroot.org</email>
-  <name>David Roman</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person">
+		<email>stkw0@disroot.org</email>
+		<name>David Roman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kiwix/kiwix-desktop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/libkiwix/metadata.xml b/www-misc/libkiwix/metadata.xml
index 4787336d3f68..feed79976565 100644
--- a/www-misc/libkiwix/metadata.xml
+++ b/www-misc/libkiwix/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="person">
-  <email>stkw0@disroot.org</email>
-  <name>David Roman</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person">
+		<email>stkw0@disroot.org</email>
+		<name>David Roman</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kiwix/libkiwix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/litmus/metadata.xml b/www-misc/litmus/metadata.xml
index 52462e728a0b..8056d64afca7 100644
--- a/www-misc/litmus/metadata.xml
+++ b/www-misc/litmus/metadata.xml
@@ -1,19 +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="person">
-  <email>bertrand@jacquin.bzh</email>
-  <name>Bertrand Jacquin</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
- 
- <use>
-  <flag name="libproxy">Support for automatic proxy configuration management through <pkg>net-libs/libproxy</pkg>.</flag>
-  <flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML</flag>
-  <flag name="pkcs11">Support for PKCS #11 through PaKChoiS (<pkg>dev-libs/pakchois</pkg>).</flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person" proxied="yes">
+		<email>bertrand@jacquin.bzh</email>
+		<name>Bertrand Jacquin</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="libproxy">Support for automatic proxy configuration management through <pkg>net-libs/libproxy</pkg>.</flag>
+		<flag name="libxml2">Use <pkg>dev-libs/libxml2</pkg> to parse XML</flag>
+		<flag name="pkcs11">Support for PKCS #11 through PaKChoiS (<pkg>dev-libs/pakchois</pkg>).</flag>
+	</use>
+</pkgmetadata>
diff --git a/www-misc/logswan/metadata.xml b/www-misc/logswan/metadata.xml
index 3921144a093b..1642e2f30440 100644
--- a/www-misc/logswan/metadata.xml
+++ b/www-misc/logswan/metadata.xml
@@ -1,11 +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="person">
-  <email>xgqt@gentoo.org</email>
-  <name>Maciej Barć</name>
- </maintainer>
- <longdescription>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <longdescription>
     Logswan is a fast Web log analyzer using probabilistic data structures. It
     is targeted at very large log files, typically APIs logs. It has constant
     memory usage regardless of the log file size, and takes approximatively 4MB
@@ -15,9 +16,9 @@
     preferred as they offer better precision. Project design goals include:
     speed, memory-usage efficiency, and keeping the code as simple as possible.
   </longdescription>
- <upstream>
-  <changelog>https://raw.githubusercontent.com/fcambus/logswan/master/ChangeLog</changelog>
-  <bugs-to>https://github.com/fcambus/logswan/issues/</bugs-to>
- </upstream>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+  <upstream>
+    <changelog>https://raw.githubusercontent.com/fcambus/logswan/master/ChangeLog</changelog>
+    <bugs-to>https://github.com/fcambus/logswan/issues/</bugs-to>
+    <remote-id type="github">fcambus/logswan</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/www-misc/mergelog/metadata.xml b/www-misc/mergelog/metadata.xml
index 845517fb85a4..ff9b3e159d55 100644
--- a/www-misc/mergelog/metadata.xml
+++ b/www-misc/mergelog/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>
- <longdescription>
+	<!-- maintainer-needed -->
+	<longdescription>
 	The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
 	</longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<upstream>
+		<remote-id type="sourceforge">mergelog</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/monitorix/metadata.xml b/www-misc/monitorix/metadata.xml
index 858f167dedf0..49c011da6a7b 100644
--- a/www-misc/monitorix/metadata.xml
+++ b/www-misc/monitorix/metadata.xml
@@ -1,14 +1,15 @@
 <?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>dwosky@pm.me</email>
-  <name>Pedro Arizmendi</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Gentoo Proxy Maintainers Project</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person" proxied="yes">
+		<email>dwosky@pm.me</email>
+		<name>Pedro Arizmendi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">mikaku/Monitorix</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/multisort/metadata.xml b/www-misc/multisort/metadata.xml
index 7a420b460d5e..85e4ed814fa2 100644
--- a/www-misc/multisort/metadata.xml
+++ b/www-misc/multisort/metadata.xml
@@ -1,6 +1,5 @@
 <?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>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+<!-- maintainer-needed -->
+</pkgmetadata>
diff --git a/www-misc/profile-sync-daemon/metadata.xml b/www-misc/profile-sync-daemon/metadata.xml
index 9363b531b2d8..3a77851fdf67 100644
--- a/www-misc/profile-sync-daemon/metadata.xml
+++ b/www-misc/profile-sync-daemon/metadata.xml
@@ -1,14 +1,15 @@
 <?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>jeffrey@icurse.nl</email>
-  <name>Jeffrey Lin</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person" proxied="yes">
+		<email>jeffrey@icurse.nl</email>
+		<name>Jeffrey Lin</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">graysky2/profile-sync-daemon</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/quixotic/metadata.xml b/www-misc/quixotic/metadata.xml
index fc27a371aff2..bfec67d9c98d 100644
--- a/www-misc/quixotic/metadata.xml
+++ b/www-misc/quixotic/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="person">
-  <email>sam@gentoo.org</email>
-  <name>Sam James</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">marcus0x62/quixotic</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/urlwatch/metadata.xml b/www-misc/urlwatch/metadata.xml
index 123f509983af..e8d5ed708a49 100644
--- a/www-misc/urlwatch/metadata.xml
+++ b/www-misc/urlwatch/metadata.xml
@@ -1,12 +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>sbraz@gentoo.org</email>
-  <name>Louis Sautier</name>
- </maintainer>
- <upstream>
-  <bugs-to>https://github.com/thp/urlwatch/issues</bugs-to>
- </upstream>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person">
+		<email>sbraz@gentoo.org</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">urlwatch</remote-id>
+		<remote-id type="github">thp/urlwatch</remote-id>
+		<bugs-to>https://github.com/thp/urlwatch/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/vdradmin-am/metadata.xml b/www-misc/vdradmin-am/metadata.xml
index 7d728e2a1033..6cc21dd91e6f 100644
--- a/www-misc/vdradmin-am/metadata.xml
+++ b/www-misc/vdradmin-am/metadata.xml
@@ -1,18 +1,19 @@
 <?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>martin.dummer@gmx.net</email>
-  <name>Martin Dummer</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
- <maintainer type="project">
-  <email>vdr@gentoo.org</email>
-  <name>Gentoo VDR Project</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>vdr@gentoo.org</email>
+		<name>Gentoo VDR Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">vdr-projects/vdradmin-am</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/www-misc/visitors/metadata.xml b/www-misc/visitors/metadata.xml
index 2d93a6e5de87..b85275307d41 100644
--- a/www-misc/visitors/metadata.xml
+++ b/www-misc/visitors/metadata.xml
@@ -1,11 +1,10 @@
 <?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>
- <longdescription>
+	<!-- maintainer-needed -->
+	<longdescription>
 		Visitors is a very fast web log analyzer for Linux, Windows, and other
 		Unix-like operating systems. It takes as input a web server log file, and
 		outputs statistics in form of different types of reports.
 	</longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>
diff --git a/www-misc/waldl/metadata.xml b/www-misc/waldl/metadata.xml
index a10cef544f66..430e960eedd8 100644
--- a/www-misc/waldl/metadata.xml
+++ b/www-misc/waldl/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="person">
-  <email>ceamac@gentoo.org</email>
-  <description>Primary maintainer</description>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+<maintainer type="person">
+	<email>ceamac@gentoo.org</email>
+	<description>Primary maintainer</description>
+</maintainer>
+<upstream>
+	<remote-id type="github">pystardust/waldl</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/www-misc/wyebadblock/metadata.xml b/www-misc/wyebadblock/metadata.xml
index 97b512ec89bd..0b50f160c7da 100644
--- a/www-misc/wyebadblock/metadata.xml
+++ b/www-misc/wyebadblock/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="person">
-  <email>efe.izbudak@metu.edu.tr</email>
-  <name>Efe İzbudak</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person">
+		<email>efe.izbudak@metu.edu.tr</email>
+		<name>Efe İzbudak</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jun7/wyebadblock</remote-id>
+	</upstream>
+</pkgmetadata>