Adding metadata

23 files changed, 272 insertions, 267 deletions

diff --git a/net-firewall/arno-iptables-firewall/metadata.xml b/net-firewall/arno-iptables-firewall/metadata.xml
index f020ca73be68..8bb444d413cc 100644
--- a/net-firewall/arno-iptables-firewall/metadata.xml
+++ b/net-firewall/arno-iptables-firewall/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>erkiferenc@gmail.com</email>
-  <name>Ferenc Erki</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
- 
- <use>
-  <flag name="plugins">Install optional plugins</flag>
-  <flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person" proxied="yes">
+		<email>erkiferenc@gmail.com</email>
+		<name>Ferenc Erki</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">arno-iptables-firewall/aif</remote-id>
+	</upstream>
+	<use>
+		<flag name="plugins">Install optional plugins</flag>
+		<flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
+	</use>
+</pkgmetadata>
diff --git a/net-firewall/arptables/metadata.xml b/net-firewall/arptables/metadata.xml
index 74d824cbfbd2..f602f773e1ef 100644
--- a/net-firewall/arptables/metadata.xml
+++ b/net-firewall/arptables/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>base-system@gentoo.org</email>
-  <name>Gentoo Base System</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">ebtables</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-firewall/bpfilter/metadata.xml b/net-firewall/bpfilter/metadata.xml
index b5931c84ae50..92b96df8dbb0 100644
--- a/net-firewall/bpfilter/metadata.xml
+++ b/net-firewall/bpfilter/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>chutzpah@gentoo.org</email>
-  <name>Patrick McLean</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">facebook/bpfilter</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-firewall/conntrack-tools/metadata.xml b/net-firewall/conntrack-tools/metadata.xml
index 63e5e36b80cc..d406b96cdb3f 100644
--- a/net-firewall/conntrack-tools/metadata.xml
+++ b/net-firewall/conntrack-tools/metadata.xml
@@ -1,23 +1,22 @@
 <?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>netmon@gentoo.org</email>
-  <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
- <longdescription lang="en">
+<maintainer type="project">
+<email>netmon@gentoo.org</email>
+<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<longdescription lang="en">
 The conntrack-tools are a set of free software userspace tools for Linux that
 allow system administrators interact with the Connection Tracking System, which
 is the module that provides stateful packet inspection for iptables. The
 conntrack-tools are the userspace daemon conntrackd and the command line
 interface conntrack.
 </longdescription>
- <upstream>
-  <remote-id type="cpe">cpe:/a:netfilter:conntrack-tools</remote-id>
- </upstream>
- <use>
-  <flag name="cthelper">Use <pkg>net-libs/libnetfilter_cthelper</pkg> for userspace conntrack helper support</flag>
-  <flag name="cttimeout">Use <pkg>net-libs/libnetfilter_cttimeout</pkg> for conntrack timeout support</flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+<upstream>
+<remote-id type="cpe">cpe:/a:netfilter:conntrack-tools</remote-id>
+</upstream>
+<use>
+<flag name="cthelper">Use <pkg>net-libs/libnetfilter_cthelper</pkg> for userspace conntrack helper support</flag>
+<flag name="cttimeout">Use <pkg>net-libs/libnetfilter_cttimeout</pkg> for conntrack timeout support</flag>
+</use>
+</pkgmetadata>
diff --git a/net-firewall/ebtables/metadata.xml b/net-firewall/ebtables/metadata.xml
index 134a0b1bf215..c14a522a20c5 100644
--- a/net-firewall/ebtables/metadata.xml
+++ b/net-firewall/ebtables/metadata.xml
@@ -1,15 +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="project">
-  <email>base-system@gentoo.org</email>
-  <name>Gentoo Base System</name>
- </maintainer>
- <upstream>
-  <remote-id type="cpe">cpe:/a:netfilter:ebtables</remote-id>
- </upstream>
- <use>
-  <flag name="perl">Install the ebtables-save script which uses perl</flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="perl">Install the ebtables-save script which uses perl</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">ebtables</remote-id>
+		<remote-id type="cpe">cpe:/a:netfilter:ebtables</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-firewall/ferm/metadata.xml b/net-firewall/ferm/metadata.xml
index 2ddedf6c7b36..d8a9ca09036d 100644
--- a/net-firewall/ferm/metadata.xml
+++ b/net-firewall/ferm/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>hydrapolic@gmail.com</email>
-  <name>Tomáš Mózes</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>hydrapolic@gmail.com</email>
+		<name>Tomáš Mózes</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">MaxKellermann/ferm</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-firewall/firehol/metadata.xml b/net-firewall/firehol/metadata.xml
index c4f6dab77f2e..39c0172ebffa 100644
--- a/net-firewall/firehol/metadata.xml
+++ b/net-firewall/firehol/metadata.xml
@@ -1,15 +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>chewi@gentoo.org</email>
-  <name>James Le Cuirot</name>
- </maintainer>
- 
- <use>
-  <flag name="ipset">
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">firehol</remote-id>
+		<remote-id type="github">firehol/firehol</remote-id>
+	</upstream>
+	<use>
+		<flag name="ipset">
 			Use <pkg>net-firewall/ipset</pkg>.
 		</flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	</use>
+</pkgmetadata>
diff --git a/net-firewall/firewalld/metadata.xml b/net-firewall/firewalld/metadata.xml
index e2c6cf8ea18c..d9b61b18aba8 100644
--- a/net-firewall/firewalld/metadata.xml
+++ b/net-firewall/firewalld/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="project">
-  <email>virtualization@gentoo.org</email>
-  <name>Gentoo Virtualization Project</name>
- </maintainer>
- <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="project">
+		<email>virtualization@gentoo.org</email>
+		<name>Gentoo Virtualization Project</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">firewalld/firewalld</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-firewall/fwbuilder/metadata.xml b/net-firewall/fwbuilder/metadata.xml
index 7a420b460d5e..b3c0c85360f5 100644
--- a/net-firewall/fwbuilder/metadata.xml
+++ b/net-firewall/fwbuilder/metadata.xml
@@ -1,6 +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>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">fwbuilder/fwbuilder</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-firewall/fwknop/metadata.xml b/net-firewall/fwknop/metadata.xml
index 184e87b19cbd..7fcf7f01bfbf 100644
--- a/net-firewall/fwknop/metadata.xml
+++ b/net-firewall/fwknop/metadata.xml
@@ -1,25 +1,26 @@
 <?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>hlein@korelogic.com</email>
-  <name>Hank Leininger</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
- 
- <use>
-  <flag name="client">Build fwknop client</flag>
-  <flag name="extras">Install utility scripts and AppArmor policy for fwknopd</flag>
-  <flag name="firewalld">Use <pkg>net-firewall/firewalld</pkg> as the default server backend</flag>
-  <flag name="gdbm">Use <pkg>sys-libs/gdbm</pkg> to store fwknopd digest cache</flag>
-  <flag name="gpg">Enable GPG support via <pkg>app-crypt/gpgme</pkg></flag>
-  <flag name="iptables">Use <pkg>net-firewall/iptables</pkg> as the default server backend</flag>
-  <flag name="nfqueue">Enable UDP-only NFQUEUE server mode (no <pkg>net-libs/libpcap</pkg> dependency)</flag>
-  <flag name="server">Build fwknopd server</flag>
-  <flag name="udp-server">Enable UDP-only server mode (no <pkg>net-libs/libpcap</pkg> dependency)</flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="person" proxied="yes">
+		<email>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="client">Build fwknop client</flag>
+		<flag name="extras">Install utility scripts and AppArmor policy for fwknopd</flag>
+		<flag name="firewalld">Use <pkg>net-firewall/firewalld</pkg> as the default server backend</flag>
+		<flag name="gdbm">Use <pkg>sys-libs/gdbm</pkg> to store fwknopd digest cache</flag>
+		<flag name="gpg">Enable GPG support via <pkg>app-crypt/gpgme</pkg></flag>
+		<flag name="iptables">Use <pkg>net-firewall/iptables</pkg> as the default server backend</flag>
+		<flag name="nfqueue">Enable UDP-only NFQUEUE server mode (no <pkg>net-libs/libpcap</pkg> dependency)</flag>
+		<flag name="server">Build fwknopd server</flag>
+		<flag name="udp-server">Enable UDP-only server mode (no <pkg>net-libs/libpcap</pkg> dependency)</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">mrash/fwknop</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-firewall/ipkungfu/metadata.xml b/net-firewall/ipkungfu/metadata.xml
index 7a420b460d5e..115e9d64a669 100644
--- a/net-firewall/ipkungfu/metadata.xml
+++ b/net-firewall/ipkungfu/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/net-firewall/ipset/metadata.xml b/net-firewall/ipset/metadata.xml
index 7bff4e1e5a22..2538887d06a7 100644
--- a/net-firewall/ipset/metadata.xml
+++ b/net-firewall/ipset/metadata.xml
@@ -1,18 +1,16 @@
 <?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>base-system@gentoo.org</email>
-  <name>Gentoo Base System</name>
- </maintainer>
- <maintainer type="person">
-  <email>robbat2@gentoo.org</email>
-  <name>Robin H. Johnson</name>
- </maintainer>
- <maintainer type="person">
-  <email>mpagano@gentoo.org</email>
-  <name>Mike Pagano</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>mpagano@gentoo.org</email>
+		<name>Mike Pagano</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-firewall/ipt_netflow/metadata.xml b/net-firewall/ipt_netflow/metadata.xml
index 91ec1ef038c5..2721f41f00bb 100644
--- a/net-firewall/ipt_netflow/metadata.xml
+++ b/net-firewall/ipt_netflow/metadata.xml
@@ -1,13 +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="project">
-  <email>netmon@gentoo.org</email>
-  <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
- 
- <use>
-  <flag name="natevents">Netflow NAT translation events (NEL) support</flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<use>
+		<flag name="natevents">Netflow NAT translation events (NEL) support</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">ipt-netflow</remote-id>
+		<remote-id type="github">aabc/ipt-netflow</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-firewall/iptables/metadata.xml b/net-firewall/iptables/metadata.xml
index 225c7e79b933..88c9e1780fc7 100644
--- a/net-firewall/iptables/metadata.xml
+++ b/net-firewall/iptables/metadata.xml
@@ -1,11 +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>base-system@gentoo.org</email>
-  <name>Gentoo Base System</name>
- </maintainer>
- <longdescription>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="conntrack">Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag>
+		<flag name="netlink">Build against libnfnetlink which enables the nfnl_osf util</flag>
+		<flag name="nftables">Support nftables kernel interface</flag>
+		<flag name="pcap">Build against <pkg>net-libs/libpcap</pkg> which enables the nfbpf_compile util</flag>
+	</use>
+	<longdescription>
 		iptables is the userspace command line program used to set up, maintain, and
 		inspect the tables of IPv4 packet filter rules in the Linux kernel. It's a
 		part of packet filtering framework which allows the stateless and stateful
@@ -17,14 +23,7 @@
 		Note that some extensions (e.g. imq and l7filter) are not included into
 		official kernel sources so you have to patch the sources before installation.
 	</longdescription>
- <upstream>
-  <remote-id type="cpe">cpe:/a:netfilter_core_team:iptables</remote-id>
- </upstream>
- <use>
-  <flag name="conntrack">Build against <pkg>net-libs/libnetfilter_conntrack</pkg> when enables the connlabel matcher</flag>
-  <flag name="netlink">Build against libnfnetlink which enables the nfnl_osf util</flag>
-  <flag name="nftables">Support nftables kernel interface</flag>
-  <flag name="pcap">Build against <pkg>net-libs/libpcap</pkg> which enables the nfbpf_compile util</flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<upstream>
+		<remote-id type="cpe">cpe:/a:netfilter_core_team:iptables</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-firewall/lutelwall/metadata.xml b/net-firewall/lutelwall/metadata.xml
index 9561130fc257..7bab277fc604 100644
--- a/net-firewall/lutelwall/metadata.xml
+++ b/net-firewall/lutelwall/metadata.xml
@@ -1,24 +1,22 @@
 <?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>tomek@lutel.pl</email>
-  <name>Tomek Lutelmowski</name>
- </maintainer>
- <maintainer type="project">
-  <email>netmon@gentoo.org</email>
-  <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
- <maintainer type="project">
-  <email>proxy-maint@gentoo.org</email>
-  <name>Proxy Maintainers</name>
- </maintainer>
- <longdescription>
+<maintainer type="person" proxied="yes">
+    <email>tomek@lutel.pl</email>
+    <name>Tomek Lutelmowski</name>
+</maintainer>
+<maintainer type="project">
+    <email>netmon@gentoo.org</email>
+    <name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+<maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+</maintainer>
+<longdescription>
 LutelWall is high-level firewall configuration tool. It uses human-readable and easy 
 to understand configuration to set up Netfilter in most secure way. Its flexibility 
 allows firewall admins build from very simple, single-homed firewalls, to most complex 
 ones - with multiple subnets, DMZ's and traffic redirections.
 </longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+</pkgmetadata>
diff --git a/net-firewall/nfacct/metadata.xml b/net-firewall/nfacct/metadata.xml
index ba5c5d9e9002..d5af4bcfaf13 100644
--- a/net-firewall/nfacct/metadata.xml
+++ b/net-firewall/nfacct/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>netmon@gentoo.org</email>
-  <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/net-firewall/nftables/metadata.xml b/net-firewall/nftables/metadata.xml
index 9fa3e30d1c73..c8347d8c5592 100644
--- a/net-firewall/nftables/metadata.xml
+++ b/net-firewall/nftables/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="project">
-  <email>base-system@gentoo.org</email>
-  <name>Gentoo Base System</name>
- </maintainer>
- <maintainer type="person">
-  <email>prometheanfire@gentoo.org</email>
-  <name>Matthew Thode</name>
- </maintainer>
- 
- <use>
-  <flag name="doc">Create man pages for the package (requires <pkg>app-text/asciidoc</pkg>)</flag>
-  <flag name="json">Enable JSON support via <pkg>dev-libs/jansson</pkg></flag>
-  <flag name="xtables">Add libxtables support to try to automatically translate rules added by iptables-compat</flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<use>
+		<flag name="doc">Create man pages for the package (requires <pkg>app-text/asciidoc</pkg>)</flag>
+		<flag name="json">Enable JSON support via <pkg>dev-libs/jansson</pkg></flag>
+		<flag name="xtables">Add libxtables support to try to automatically translate rules added by iptables-compat</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-firewall/nftlb/metadata.xml b/net-firewall/nftlb/metadata.xml
index b5931c84ae50..6cf207784952 100644
--- a/net-firewall/nftlb/metadata.xml
+++ b/net-firewall/nftlb/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>chutzpah@gentoo.org</email>
-  <name>Patrick McLean</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">relianoid/nftlb</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/net-firewall/psad/metadata.xml b/net-firewall/psad/metadata.xml
index ba5c5d9e9002..dce3f3be66c0 100644
--- a/net-firewall/psad/metadata.xml
+++ b/net-firewall/psad/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>netmon@gentoo.org</email>
-  <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+<maintainer type="project">
+	<email>netmon@gentoo.org</email>
+	<name>Gentoo network monitoring and analysis project</name>
+</maintainer>
+</pkgmetadata>
diff --git a/net-firewall/rtsp-conntrack/metadata.xml b/net-firewall/rtsp-conntrack/metadata.xml
index 7a420b460d5e..7d083248889d 100644
--- a/net-firewall/rtsp-conntrack/metadata.xml
+++ b/net-firewall/rtsp-conntrack/metadata.xml
@@ -1,6 +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>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">maru-sama/rtsp-linux</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-firewall/shorewall/metadata.xml b/net-firewall/shorewall/metadata.xml
index a794fd4155b0..6e9634122307 100644
--- a/net-firewall/shorewall/metadata.xml
+++ b/net-firewall/shorewall/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>netmon@gentoo.org</email>
-  <name>Gentoo network monitoring and analysis project</name>
- </maintainer>
- <longdescription lang="en">
+	<maintainer type="project">
+		<email>netmon@gentoo.org</email>
+		<name>Gentoo network monitoring and analysis project</name>
+	</maintainer>
+	<longdescription lang="en">
 		The Shoreline Firewall, more commonly known as "Shorewall", is high-level tool for configuring Netfilter.
 		You describe your firewall/gateway requirements using entries in a set of configuration files.
 		Shorewall reads those configuration files and with the help of the iptables, iptables-restore, ip and
@@ -18,15 +18,15 @@
 		there is no "Shorewall process" left running in your system. The /usr/sbin/shorewall program can be used at
 		any time to monitor the Netfilter firewall.
 	</longdescription>
- <upstream>
-  <doc lang="en">http://shorewall.net/Documentation_Index.html</doc>
- </upstream>
- <use>
-  <flag name="init">Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces</flag>
-  <flag name="ipv4">Installs everything needed to create a full IPv4 firewall</flag>
-  <flag name="ipv6">Adds the capability to create a full IPv6 firewall (requires <pkg>net-firewall/shorewall</pkg> ipv4 USE flag)</flag>
-  <flag name="lite4">Installs everything needed to just *run* an IPv4 compiled firewall script created with <pkg>net-firewall/shorewall</pkg> ipv4 USE flag</flag>
-  <flag name="lite6">Installs everything needed to just *run* an IPv6 compiled firewall script created with <pkg>net-firewall/shorewall</pkg> ipv6 USE flag</flag>
- </use>
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<upstream>
+		<doc lang="en">http://shorewall.net/Documentation_Index.html</doc>
+		<remote-id type="sourceforge">shorewall</remote-id>
+	</upstream>
+	<use>
+		<flag name="init">Adds the capability to place the firewall in a safe state prior to bringing up the network interfaces</flag>
+		<flag name="ipv4">Installs everything needed to create a full IPv4 firewall</flag>
+		<flag name="ipv6">Adds the capability to create a full IPv6 firewall (requires <pkg>net-firewall/shorewall</pkg> ipv4 USE flag)</flag>
+		<flag name="lite4">Installs everything needed to just *run* an IPv4 compiled firewall script created with <pkg>net-firewall/shorewall</pkg> ipv4 USE flag</flag>
+		<flag name="lite6">Installs everything needed to just *run* an IPv6 compiled firewall script created with <pkg>net-firewall/shorewall</pkg> ipv6 USE flag</flag>
+	</use>
+</pkgmetadata>
diff --git a/net-firewall/ufw/metadata.xml b/net-firewall/ufw/metadata.xml
index 5b62b0de80cf..234912f37f36 100644
--- a/net-firewall/ufw/metadata.xml
+++ b/net-firewall/ufw/metadata.xml
@@ -1,19 +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>
- <longdescription lang="en">
+	<!-- maintainer-needed -->
+	<use>
+		<flag name="examples">Example ufw config files</flag>
+		<flag name="ipv6">IPv6 support for iptables</flag>
+	</use>
+	<longdescription lang="en">
 	The Uncomplicated Firewall (ufw) is a frontend for iptables and is
 	particularly well-suited for host-based firewalls. It provides a framework
 	for managing netfilter, as well as an easy to use command-line interface for
 	manipulating the firewall.
 	</longdescription>
- <upstream>
-  <remote-id type="launchpad">ufw</remote-id>
- </upstream>
- <use>
-  <flag name="examples">Example ufw config files</flag>
-  <flag name="ipv6">IPv6 support for iptables</flag>
- </use>
- <origin>liguros-repo</origin>
- <stabilize-allarches/>
-</pkgmetadata>
\ No newline at end of file
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="launchpad">ufw</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/net-firewall/xtables-addons/metadata.xml b/net-firewall/xtables-addons/metadata.xml
index 439c311cffbc..461cf8e0f052 100644
--- a/net-firewall/xtables-addons/metadata.xml
+++ b/net-firewall/xtables-addons/metadata.xml
@@ -1,7 +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>
- <longdescription>
+	<!-- maintainer-needed -->
+	<longdescription>
 	Xtables-addons is the successor to patch-o-matic(-ng). Likewise, it contains
 	extensions that were not, or are not yet, accepted in the main kernel/iptables
 	packages.
@@ -10,6 +11,8 @@
 	or recompile the kernel, sometimes recompiling iptables is also not needed. But
 	please see the INSTALL file for the minimum requirements of this package.
 	</longdescription>
- 
- <origin>liguros-repo</origin>
-</pkgmetadata>
\ No newline at end of file
+	<upstream>
+		<remote-id type="sourceforge">xtables-addons</remote-id>
+		<remote-id type="codeberg">jengelh/xtables-addons</remote-id>
+	</upstream>
+</pkgmetadata>