Adding metadatav21.1.5

author: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-03-01 00:37:58 +0000
committer: Liguros - Gitlab CI/CD [master] <gitlab@liguros.net> 2021-03-01 00:37:58 +0000
commit: 8ddb1a3d1229412a438971f82d37d518a0223726 (patch)
tree: 83438b5ddb9d23a390f1a3fc505303d3d2223bf2 /dev-ml
parent: 9acab46e1a820daece7b2e631485c157ce2210ad (diff)
download: baldeagleos-repo-21.1.5.tar.gz
baldeagleos-repo-21.1.5.tar.xz
baldeagleos-repo-21.1.5.zip
292 files changed, 2357 insertions, 2125 deletions
diff --git a/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild b/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild
index 7585f81e50ef..0ca71621477e 100644
--- a/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild
+++ b/dev-ml/alcotest/alcotest-1.2.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/alcotest/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/alcotest/metadata.xml b/dev-ml/alcotest/metadata.xml
index 4bbe1ec66737..5dddb68f633f 100644
--- a/dev-ml/alcotest/metadata.xml
+++ b/dev-ml/alcotest/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mirage/alcotest</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mirage/alcotest</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/astring/astring-0.8.5.ebuild b/dev-ml/astring/astring-0.8.5.ebuild
index ed173fbf89e9..0308483a359e 100644
--- a/dev-ml/astring/astring-0.8.5.ebuild
+++ b/dev-ml/astring/astring-0.8.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/astring/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 OCAML_DEP=">=dev-lang/ocaml-4.05.0:="
 BDEPEND="
diff --git a/dev-ml/astring/metadata.xml b/dev-ml/astring/metadata.xml
index f6b0d38f281a..85145d2a5ead 100644
--- a/dev-ml/astring/metadata.xml
+++ b/dev-ml/astring/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">dbuenzli/astring</remote-id>
-		<changelog>https://github.com/dbuenzli/astring/blob/master/CHANGES.md</changelog>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">dbuenzli/astring</remote-id>
+  <changelog>https://github.com/dbuenzli/astring/blob/master/CHANGES.md</changelog>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/async/metadata.xml b/dev-ml/async/metadata.xml
index b5f6401a4539..ae65f186ef8d 100644
--- a/dev-ml/async/metadata.xml
+++ b/dev-ml/async/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/async</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/async</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/async_extra/metadata.xml b/dev-ml/async_extra/metadata.xml
index b9222275c3a1..c171ffb016a3 100644
--- a/dev-ml/async_extra/metadata.xml
+++ b/dev-ml/async_extra/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/async_extra</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/async_extra</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
index 1011c5ca57a4..29ff92d67a6d 100644
--- a/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
+++ b/dev-ml/async_kernel/async_kernel-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/async_kernel/metadata.xml b/dev-ml/async_kernel/metadata.xml
index c8d693fb756d..1340ff9389af 100644
--- a/dev-ml/async_kernel/metadata.xml
+++ b/dev-ml/async_kernel/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/async_kernel</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/async_kernel</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/async_rpc_kernel/metadata.xml b/dev-ml/async_rpc_kernel/metadata.xml
index 840191421805..1e7c82b27383 100644
--- a/dev-ml/async_rpc_kernel/metadata.xml
+++ b/dev-ml/async_rpc_kernel/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
-    <remote-id type="github">janestreet/async_rpc_kernel</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+  <remote-id type="github">janestreet/async_rpc_kernel</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/async_ssl/metadata.xml b/dev-ml/async_ssl/metadata.xml
index c800129a2d12..46709f3075c5 100644
--- a/dev-ml/async_ssl/metadata.xml
+++ b/dev-ml/async_ssl/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/async_ssl</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/async_ssl</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/async_unix/async_unix-0.14.0.ebuild b/dev-ml/async_unix/async_unix-0.14.0.ebuild
index 48c81973ffe4..d6b3d780878c 100644
--- a/dev-ml/async_unix/async_unix-0.14.0.ebuild
+++ b/dev-ml/async_unix/async_unix-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/async_unix/metadata.xml b/dev-ml/async_unix/metadata.xml
index d9a00265fb78..dcc3a41e4781 100644
--- a/dev-ml/async_unix/metadata.xml
+++ b/dev-ml/async_unix/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/async_unix</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/async_unix</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/base/metadata.xml b/dev-ml/base/metadata.xml
index 2d3d3fe848fd..76027134084a 100644
--- a/dev-ml/base/metadata.xml
+++ b/dev-ml/base/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/base</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/base</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild b/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
index 73757c8556a4..986026ae2dd5 100644
--- a/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
+++ b/dev-ml/base_bigstring/base_bigstring-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/base_bigstring/metadata.xml b/dev-ml/base_bigstring/metadata.xml
index 70e661420ebd..456bb1834fdb 100644
--- a/dev-ml/base_bigstring/metadata.xml
+++ b/dev-ml/base_bigstring/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/base_bigstring</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/base_bigstring</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/base_quickcheck/metadata.xml b/dev-ml/base_quickcheck/metadata.xml
index 9859b7303328..456061384a4c 100644
--- a/dev-ml/base_quickcheck/metadata.xml
+++ b/dev-ml/base_quickcheck/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/base_quickcheck</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/base_quickcheck</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/batteries/metadata.xml b/dev-ml/batteries/metadata.xml
index 98e1a6806aaa..769e670b975a 100644
--- a/dev-ml/batteries/metadata.xml
+++ b/dev-ml/batteries/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ocaml-batteries-team/batteries-included</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ocaml-batteries-team/batteries-included</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/bin-prot/metadata.xml b/dev-ml/bin-prot/metadata.xml
index 01f7d1cb2110..c9668a6aacf8 100644
--- a/dev-ml/bin-prot/metadata.xml
+++ b/dev-ml/bin-prot/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/bin_prot</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/bin_prot</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/bin_prot/metadata.xml b/dev-ml/bin_prot/metadata.xml
index 352205a61728..c60fe5759368 100644
--- a/dev-ml/bin_prot/metadata.xml
+++ b/dev-ml/bin_prot/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/bin_prot</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/bin_prot</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/biniou/metadata.xml b/dev-ml/biniou/metadata.xml
index e8bf7a1ab03a..ecccb5c31204 100644
--- a/dev-ml/biniou/metadata.xml
+++ b/dev-ml/biniou/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<name>François-Xavier Carton</name>
-		<email>fx.carton91@gmail.com</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mjambon/biniou</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>fx.carton91@gmail.com</email>
+  <name>François-Xavier Carton</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mjambon/biniou</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/bos/metadata.xml b/dev-ml/bos/metadata.xml
index 2188cca9ee4a..7c9e3af10141 100644
--- a/dev-ml/bos/metadata.xml
+++ b/dev-ml/bos/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">dbuenzli/bos</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">dbuenzli/bos</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/cairo-ocaml/metadata.xml b/dev-ml/cairo-ocaml/metadata.xml
index 0fedfcd6cbf8..4e762da08333 100644
--- a/dev-ml/cairo-ocaml/metadata.xml
+++ b/dev-ml/cairo-ocaml/metadata.xml
@@ -1,16 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
+ <maintainer type="project">
   <email>sci@gentoo.org</email>
   <name>Gentoo Science Project</name>
-</maintainer>
-<longdescription lang="en">
+ </maintainer>
+ <longdescription lang="en">
    This package contains all the development stuff you need to use Cairo in
    your OCaml programs. The folowing backends are supported: PostScript,
    PDF, PNG, In-memory images and X11.
 </longdescription>
-<use>
+ 
+ <use>
   <flag name="pango">Enable support for <pkg>x11-libs/pango</pkg></flag>
-</use>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/cairo2/metadata.xml b/dev-ml/cairo2/metadata.xml
index 1474195572d8..d44cbfaf0201 100644
--- a/dev-ml/cairo2/metadata.xml
+++ b/dev-ml/cairo2/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Chris00/ocaml-cairo</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">Chris00/ocaml-cairo</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/calendar/metadata.xml b/dev-ml/calendar/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/dev-ml/calendar/metadata.xml
+++ b/dev-ml/calendar/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/calendars/metadata.xml b/dev-ml/calendars/metadata.xml
index 78982c1e880f..6cdaeda1b5e5 100644
--- a/dev-ml/calendars/metadata.xml
+++ b/dev-ml/calendars/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">geneweb/calendars</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">geneweb/calendars</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/camlbz2/metadata.xml b/dev-ml/camlbz2/metadata.xml
index a4f6be63adba..bb6e8f3f5b8e 100644
--- a/dev-ml/camlbz2/metadata.xml
+++ b/dev-ml/camlbz2/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/camldbm/metadata.xml b/dev-ml/camldbm/metadata.xml
index 9f27ba42c7de..4f0aab5e579a 100644
--- a/dev-ml/camldbm/metadata.xml
+++ b/dev-ml/camldbm/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/camlidl/metadata.xml b/dev-ml/camlidl/metadata.xml
index 1b2becffa26c..83d00b14c8d4 100644
--- a/dev-ml/camlidl/metadata.xml
+++ b/dev-ml/camlidl/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/camlp4/metadata.xml b/dev-ml/camlp4/metadata.xml
index 110b0d3f8c84..55f72809c283 100644
--- a/dev-ml/camlp4/metadata.xml
+++ b/dev-ml/camlp4/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">camlp4/camlp4</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">camlp4/camlp4</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/camlp5/metadata.xml b/dev-ml/camlp5/metadata.xml
index a0efa42d1bbe..9e4c6fd85bc4 100644
--- a/dev-ml/camlp5/metadata.xml
+++ b/dev-ml/camlp5/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">camlp5/camlp5</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">camlp5/camlp5</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/camlpdf/metadata.xml b/dev-ml/camlpdf/metadata.xml
index f338f6f42e76..9a6b497346a9 100644
--- a/dev-ml/camlpdf/metadata.xml
+++ b/dev-ml/camlpdf/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">johnwhitington/camlpdf</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">johnwhitington/camlpdf</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/camlzip/metadata.xml b/dev-ml/camlzip/metadata.xml
index 5bec2e3de616..7dc1af850a34 100644
--- a/dev-ml/camlzip/metadata.xml
+++ b/dev-ml/camlzip/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">xavierleroy/camlzip</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">xavierleroy/camlzip</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/camomile/camomile-1.0.2.ebuild b/dev-ml/camomile/camomile-1.0.2.ebuild
index ca76723d7189..c387ffaa322d 100644
--- a/dev-ml/camomile/camomile-1.0.2.ebuild
+++ b/dev-ml/camomile/camomile-1.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="LGPL-2"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 # Unbound module errors
diff --git a/dev-ml/camomile/metadata.xml b/dev-ml/camomile/metadata.xml
index 6a4596bff983..7994661ed79f 100644
--- a/dev-ml/camomile/metadata.xml
+++ b/dev-ml/camomile/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>ML</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">yoriyuki/Camomile</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">yoriyuki/Camomile</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/cinaps/metadata.xml b/dev-ml/cinaps/metadata.xml
index b15b69a6000e..b47b57970dd5 100644
--- a/dev-ml/cinaps/metadata.xml
+++ b/dev-ml/cinaps/metadata.xml
@@ -1,15 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml-ppx/cinaps</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml-ppx/cinaps</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/cmdliner/metadata.xml b/dev-ml/cmdliner/metadata.xml
index a4f6be63adba..bb6e8f3f5b8e 100644
--- a/dev-ml/cmdliner/metadata.xml
+++ b/dev-ml/cmdliner/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/configurator/metadata.xml b/dev-ml/configurator/metadata.xml
index 2cebdea92b52..7a38017f35a4 100644
--- a/dev-ml/configurator/metadata.xml
+++ b/dev-ml/configurator/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/configurator</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/configurator</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/core/core-0.14.0-r3.ebuild b/dev-ml/core/core-0.14.0-r3.ebuild
index 1b96bf728cb4..20d82f66a22e 100644
--- a/dev-ml/core/core-0.14.0-r3.ebuild
+++ b/dev-ml/core/core-0.14.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="ocamlopt"
 
 # TODO: Wants quickcheck_deprecated?
diff --git a/dev-ml/core/metadata.xml b/dev-ml/core/metadata.xml
index 8957be334536..fb64848e9557 100644
--- a/dev-ml/core/metadata.xml
+++ b/dev-ml/core/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>ML</name>
-  </maintainer>
-  <longdescription lang="en">
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <longdescription lang="en">
   Core is Jane Street Capital's Ocaml standard library overlay.  It
   provides tail recursive versions of non tail recursive functions in
   the standard library, changes the signature of many of the standard
@@ -14,7 +14,8 @@
   Core_extended adds new functionality, but is only code reviewed on an
   ad-hoc basis.
   </longdescription>
-  <upstream>
-    <remote-id type="github">janestreet/core</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/core</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/core_bench/core_bench-0.14.0.ebuild b/dev-ml/core_bench/core_bench-0.14.0.ebuild
index 50ae29e8e3e6..75efa8af0da0 100644
--- a/dev-ml/core_bench/core_bench-0.14.0.ebuild
+++ b/dev-ml/core_bench/core_bench-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 DEPEND="
diff --git a/dev-ml/core_bench/metadata.xml b/dev-ml/core_bench/metadata.xml
index 9a90d2fb326c..3caf5eb7ae3b 100644
--- a/dev-ml/core_bench/metadata.xml
+++ b/dev-ml/core_bench/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/core_bench</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/core_bench</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/core_extended/metadata.xml b/dev-ml/core_extended/metadata.xml
index 0eed67d03c73..b0a0d230ef70 100644
--- a/dev-ml/core_extended/metadata.xml
+++ b/dev-ml/core_extended/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/core_extended</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/core_extended</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild b/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild
index f96d14558d44..4f8eb73f4ef5 100644
--- a/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild
+++ b/dev-ml/core_kernel/core_kernel-0.14.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 # Wants quickcheck_deprecated for now
diff --git a/dev-ml/core_kernel/metadata.xml b/dev-ml/core_kernel/metadata.xml
index 04ce58761077..c928994f5fd6 100644
--- a/dev-ml/core_kernel/metadata.xml
+++ b/dev-ml/core_kernel/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <longdescription lang="en">
 		Core_kernel is the system-independent part of Core.  It is aimed for
 		cases when the full Core is not available, such as in Javascript.  It
 		provides an overlay on the usual namespace, so the best way to use
@@ -13,7 +13,8 @@
 
 		open Core_kernel.Std
 	</longdescription>
-	<upstream>
-		<remote-id type="github">janestreet/core_kernel</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/core_kernel</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/cppo/cppo-1.6.6.ebuild b/dev-ml/cppo/cppo-1.6.6.ebuild
index 95048ad5e700..48f2d5465146 100644
--- a/dev-ml/cppo/cppo-1.6.6.ebuild
+++ b/dev-ml/cppo/cppo-1.6.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml-community/cppo/archive/v${PV}.tar.gz -> ${P}.t
 
 SLOT="0/${PV}"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ppc ~ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 x86"
 
 IUSE="+ocamlopt"
 
diff --git a/dev-ml/cppo/metadata.xml b/dev-ml/cppo/metadata.xml
index afdbbf102335..c94291d43f39 100644
--- a/dev-ml/cppo/metadata.xml
+++ b/dev-ml/cppo/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml-community/cppo</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml-community/cppo</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/cryptokit/metadata.xml b/dev-ml/cryptokit/metadata.xml
index 27cbaa2e3649..5ac43d429428 100644
--- a/dev-ml/cryptokit/metadata.xml
+++ b/dev-ml/cryptokit/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">xavierleroy/cryptokit</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">xavierleroy/cryptokit</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/csexp/csexp-1.3.2-r1.ebuild b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
index 0ffa23b3d217..dfc8daec3864 100644
--- a/dev-ml/csexp/csexp-1.3.2-r1.ebuild
+++ b/dev-ml/csexp/csexp-1.3.2-r1.ebuild
@@ -16,7 +16,7 @@ IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
 DEPEND="
-	dev-ml/result:=[ocamlopt=]
+	>=dev-ml/result-1.5:=[ocamlopt=]
 "
 RDEPEND="${DEPEND}"
 BDEPEND=""
diff --git a/dev-ml/csexp/metadata.xml b/dev-ml/csexp/metadata.xml
index f197dd418645..7697b8ec8af9 100644
--- a/dev-ml/csexp/metadata.xml
+++ b/dev-ml/csexp/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml-dune/csexp</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml-dune/csexp</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/csv/metadata.xml b/dev-ml/csv/metadata.xml
index aad9c6c4d154..d7ae200a1b95 100644
--- a/dev-ml/csv/metadata.xml
+++ b/dev-ml/csv/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">Chris00/ocaml-csv</remote-id>
-	</upstream>
-	<use>
-		<flag name="lwt">Enables the Lwt-based library for asynchronous operations.</flag>
-	</use>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">Chris00/ocaml-csv</remote-id>
+ </upstream>
+ <use>
+  <flag name="lwt">Enables the Lwt-based library for asynchronous operations.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/cudf/metadata.xml b/dev-ml/cudf/metadata.xml
index e24f3283a006..12fbb287f682 100644
--- a/dev-ml/cudf/metadata.xml
+++ b/dev-ml/cudf/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/deriving/metadata.xml b/dev-ml/deriving/metadata.xml
index c29d7a46bfb0..1de016aa6eba 100644
--- a/dev-ml/deriving/metadata.xml
+++ b/dev-ml/deriving/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">ocsigen/deriving</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ocsigen/deriving</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/dns/dns-1.0.0.ebuild b/dev-ml/dns/dns-1.0.0-r1.ebuild
index 1780cf1361f4..02a29c7096f8 100644
--- a/dev-ml/dns/dns-1.0.0.ebuild
+++ b/dev-ml/dns/dns-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ RDEPEND="
 	>=dev-ml/ocaml-cstruct-3.0.2:=[ppx]
 	dev-ml/ocaml-hashcons:=
 	>=dev-ml/ocaml-ipaddr-2.6.0:=
-	dev-ml/ocaml-re:=
+	dev-ml/re:=
 	>=dev-ml/ocaml-uri-1.7.0:=
 	dev-ml/result:=
 	!dev-ml/odns
diff --git a/dev-ml/dns/metadata.xml b/dev-ml/dns/metadata.xml
index 39ef7ef9f544..ccde89df8b27 100644
--- a/dev-ml/dns/metadata.xml
+++ b/dev-ml/dns/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-   <!-- maintainer-needed -->
-    <upstream>
-        <remote-id type="github">mirage/ocaml-dns</remote-id>
-    </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mirage/ocaml-dns</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild b/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
index e699ea7ea280..49a6fca6c422 100644
--- a/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
+++ b/dev-ml/dose3/dose3-5.0.1_p16-r2.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	>=dev-ml/extlib-1.7.0:=[ocamlopt=]
 	>=dev-ml/ocamlgraph-1.8.6:=[ocamlopt=]
 	<dev-ml/ocamlgraph-1.8.9:=[ocamlopt=]
-	dev-ml/re:=[ocamlopt=]
+	>=dev-ml/re-1.9.0:=[ocamlopt=]
 	parmap? ( dev-ml/parmap:=[ocamlopt=] )
 	zip? ( dev-ml/camlzip:=[ocamlopt=] )
 	bzip2? ( dev-ml/camlbz2:= )
diff --git a/dev-ml/dose3/metadata.xml b/dev-ml/dose3/metadata.xml
index 6a93d78a32ca..2b9a88adee95 100644
--- a/dev-ml/dose3/metadata.xml
+++ b/dev-ml/dose3/metadata.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<use>
-		<flag name="parmap">Adds multi-core CPU support via <pkg>dev-ml/parmap</pkg>.</flag>
-		<flag name="zip">Adds support for handling zip files.</flag>
-		<flag name="rpm4">Adds support for handling rpm4 files.</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="parmap">Adds multi-core CPU support via <pkg>dev-ml/parmap</pkg>.</flag>
+  <flag name="zip">Adds support for handling zip files.</flag>
+  <flag name="rpm4">Adds support for handling rpm4 files.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
index 68e8b1a279f8..a237b2f09a07 100644
--- a/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
+++ b/dev-ml/dune-configurator/dune-configurator-2.8.2-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dune-configurator/metadata.xml b/dev-ml/dune-configurator/metadata.xml
index bae8c45155b7..56bbf5ae480d 100644
--- a/dev-ml/dune-configurator/metadata.xml
+++ b/dev-ml/dune-configurator/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/dune</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/dune</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild b/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
index d895817e0354..0a21e76c0ca5 100644
--- a/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
+++ b/dev-ml/dune-private-libs/dune-private-libs-2.8.2-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/dune-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/dune-private-libs/metadata.xml b/dev-ml/dune-private-libs/metadata.xml
index bae8c45155b7..56bbf5ae480d 100644
--- a/dev-ml/dune-private-libs/metadata.xml
+++ b/dev-ml/dune-private-libs/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/dune</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/dune</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/dune/Manifest b/dev-ml/dune/Manifest
index 5ed8ffceaf46..e2b12e2b1a7a 100644
--- a/dev-ml/dune/Manifest
+++ b/dev-ml/dune/Manifest
@@ -1,3 +1,4 @@
+DIST dune-1.11.4.tar.gz 849090 BLAKE2B 4dace2d998dd00dd8fd51fef6bf0048fd7d0c7941794b4c775f8a1a6c8f694af52ebae2bee17fb531b3f4332fe49167422508a91efcbda61f5420ffee7e89750 SHA512 0afd7ba4d66ba742b6485546d6b7e07096f38f516c12c4fc506a151b6fc97805859d736fee3a0a5dcf8008af0e2a678f1fe7286f6d0a941c999f7d3d5b9a9ccb
 DIST dune-2.1.0.tar.gz 1170295 BLAKE2B 16ee2c34e0183bd255d23410f70001ca008b8e82815f93ad727079da00b8592d219e7664c93bed7b97b3a1e997306d60672b7d6c45fe6dae7371b4025df06722 SHA512 24afb44e458f819dfde3775b76c3ccf43f3fa5d8ce9a14ee9bf6658c1c116f95659c21a9ea208e5711c844fabc661cc434070bce6c9307154d506b6599ffb57f
 DIST dune-2.7.1.tar.gz 1290915 BLAKE2B 85a2dee92d1ead03b43b80742c291f4470dd9e1d843fdb257754c567e2329c101d11b42573da19de537f0d8591ebdacfcaab1099e0f46bdeebcd8421eb1bbcb2 SHA512 b77d0e207263107365e5a6e94423e8ab4ddbab1f920872d915e4014b7cc69915274b53fe946bb4b29dfe3de2bf5573ab3b2bffb4db8eb50b472e7dfb6cab88b7
 DIST dune-2.8.2.tar.gz 1369417 BLAKE2B d846d35675a18abc3ccc57a52574d81a8fb4f082d9935912f035061c1107b47be8752daeb9c49bb2af4877e419a6c8bc30f846db6d773cf5267d3d761272a872 SHA512 fcbe45ea59492517e0868bf1f801c2bd2f3b1b30234e36d789c33e7ee48bd724726beb211697f3820609bbc27923c8c37d7be89dcbd059558014743360f2d0b7
diff --git a/dev-ml/dune/dune-1.11.4.ebuild b/dev-ml/dune/dune-1.11.4.ebuild
new file mode 100644
index 000000000000..e767836ab78c
--- /dev/null
+++ b/dev-ml/dune/dune-1.11.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multiprocessing
+
+DESCRIPTION="A composable build system for OCaml"
+HOMEPAGE="https://github.com/ocaml/dune"
+SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="test"
+
+DEPEND="dev-lang/ocaml"
+RDEPEND="${DEPEND}
+	!dev-ml/jbuilder"
+BDEPEND=""
+
+RESTRICT="test"
+
+src_configure() {
+	ocaml configure.ml --libdir "${EPREFIX}/usr/$(get_libdir)/ocaml" || die
+}
+
+src_install() {
+	default
+	mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF}
+	mv "${D}"/usr/man "${D}"/usr/share/man
+}
diff --git a/dev-ml/dune/dune-2.1.0.ebuild b/dev-ml/dune/dune-2.1.0.ebuild
index ab02564875e1..beec8b498b00 100644
--- a/dev-ml/dune/dune-2.1.0.ebuild
+++ b/dev-ml/dune/dune-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="amd64 arm arm64 x86"
 IUSE="test"
 
-DEPEND="dev-lang/ocaml"
+DEPEND=">=dev-lang/ocaml-4.07:="
 RDEPEND="${DEPEND}
 	!dev-ml/jbuilder"
 BDEPEND=""
diff --git a/dev-ml/dune/dune-2.7.1.ebuild b/dev-ml/dune/dune-2.7.1.ebuild
index da818e9441db..52a9b1648031 100644
--- a/dev-ml/dune/dune-2.7.1.ebuild
+++ b/dev-ml/dune/dune-2.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="test"
 
 DEPEND=">=dev-lang/ocaml-4.08:="
diff --git a/dev-ml/dune/dune-2.8.2.ebuild b/dev-ml/dune/dune-2.8.2.ebuild
index 1a098b5da747..17398ac571ea 100644
--- a/dev-ml/dune/dune-2.8.2.ebuild
+++ b/dev-ml/dune/dune-2.8.2.ebuild
@@ -11,12 +11,23 @@ SRC_URI="https://github.com/ocaml/dune/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-lang/ocaml-4.08:=
-	!dev-ml/jbuilder"
-DEPEND="${RDEPEND}
-	dev-ml/findlib"
+RDEPEND="
+	>=dev-lang/ocaml-4.08:=
+	!dev-ml/jbuilder
+"
+DEPEND="
+	${RDEPEND}
+	dev-ml/findlib
+	test? (
+		dev-ml/core_bench
+		dev-ml/ppx_bench
+		dev-ml/ppx_expect
+	)
+"
 
 QA_FLAGS_IGNORED=/usr/bin/dune
 
diff --git a/dev-ml/dune/metadata.xml b/dev-ml/dune/metadata.xml
index bae8c45155b7..56bbf5ae480d 100644
--- a/dev-ml/dune/metadata.xml
+++ b/dev-ml/dune/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/dune</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/dune</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/duration/duration-0.1.3.ebuild b/dev-ml/duration/duration-0.1.3.ebuild
index e2973f312309..5fef7562f839 100644
--- a/dev-ml/duration/duration-0.1.3.ebuild
+++ b/dev-ml/duration/duration-0.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/hannesm/duration/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/duration/metadata.xml b/dev-ml/duration/metadata.xml
index b73d0d4e9531..8e0d3114b3e1 100644
--- a/dev-ml/duration/metadata.xml
+++ b/dev-ml/duration/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">mirage/alcotest</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">mirage/alcotest</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/easy-format/metadata.xml b/dev-ml/easy-format/metadata.xml
index 8dc07cfbef83..93903835d0c1 100644
--- a/dev-ml/easy-format/metadata.xml
+++ b/dev-ml/easy-format/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">mjambon/easy-format</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">mjambon/easy-format</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/eliom/eliom-6.2.0.ebuild b/dev-ml/eliom/eliom-6.2.0.ebuild
index 85e4b10397fa..db788c56c9b7 100644
--- a/dev-ml/eliom/eliom-6.2.0.ebuild
+++ b/dev-ml/eliom/eliom-6.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/ocsigen/eliom"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/dev-ml/eliom/eliom-9999.ebuild b/dev-ml/eliom/eliom-9999.ebuild
index ed53d47df991..c7ab54375e56 100644
--- a/dev-ml/eliom/eliom-9999.ebuild
+++ b/dev-ml/eliom/eliom-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/ocsigen/eliom"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ocsigen/eliom/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/dev-ml/eliom/metadata.xml b/dev-ml/eliom/metadata.xml
index d15d988283c6..e711eafe3598 100644
--- a/dev-ml/eliom/metadata.xml
+++ b/dev-ml/eliom/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ocsigen/eliom</remote-id>
-	</upstream>
-	<use>
-		<flag name="ppx">Enable PPX syntax extension support.</flag>
-	</use>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ocsigen/eliom</remote-id>
+ </upstream>
+ <use>
+  <flag name="ppx">Enable PPX syntax extension support.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/extlib/extlib-1.7.7.ebuild b/dev-ml/extlib/extlib-1.7.7.ebuild
index 5a65d9cc6947..f7b13872843e 100644
--- a/dev-ml/extlib/extlib-1.7.7.ebuild
+++ b/dev-ml/extlib/extlib-1.7.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ygrek/ocaml-extlib/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc +ocamlopt"
 
 # See bug #704146
diff --git a/dev-ml/extlib/metadata.xml b/dev-ml/extlib/metadata.xml
index f36445f85327..9280dd42762c 100644
--- a/dev-ml/extlib/metadata.xml
+++ b/dev-ml/extlib/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="google-code">ocaml-extlib</remote-id>
-		<remote-id type="github">ygrek/ocaml-extlib</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="google-code">ocaml-extlib</remote-id>
+  <remote-id type="github">ygrek/ocaml-extlib</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/facile/metadata.xml b/dev-ml/facile/metadata.xml
index c4773834c0e1..96ccf0300196 100644
--- a/dev-ml/facile/metadata.xml
+++ b/dev-ml/facile/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-	</pkgmetadata>
+ <maintainer type="project">
+  <email>kde@gentoo.org</email>
+  <name>Gentoo KDE Project</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/fieldslib/metadata.xml b/dev-ml/fieldslib/metadata.xml
index 03041d90ca0d..0533024557f7 100644
--- a/dev-ml/fieldslib/metadata.xml
+++ b/dev-ml/fieldslib/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <longdescription lang="en">
 		This library defines a syntax extension for OCaml using Camlp4 that
 		can be used to define first class values representing record fields,
 		and additional routines, to get and set record fields, iterate and fold
 		over all fields of a record and create new record values.
 	</longdescription>
-	<upstream>
-		<remote-id type="github">janestreet/fieldslib</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/fieldslib</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/findlib/metadata.xml b/dev-ml/findlib/metadata.xml
index 4e251464bf4c..a2a86763e118 100644
--- a/dev-ml/findlib/metadata.xml
+++ b/dev-ml/findlib/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/ocamlfind</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/ocamlfind</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/fmt/fmt-0.8.9.ebuild b/dev-ml/fmt/fmt-0.8.9-r1.ebuild
index b3fecea7226b..426f1c5a7189 100644
--- a/dev-ml/fmt/fmt-0.8.9.ebuild
+++ b/dev-ml/fmt/fmt-0.8.9-r1.ebuild
@@ -11,14 +11,17 @@ SRC_URI="https://erratique.ch/software/fmt/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="dev-ml/result:=[ocamlopt]
+RDEPEND="
+	dev-ml/cmdliner:=[ocamlopt]
 	dev-lang/ocaml:=[ocamlopt]
+	dev-ml/result:=[ocamlopt]
+	dev-ml/stdlib-shims:=[ocamlopt]
 	dev-ml/uchar:=[ocamlopt]
-	dev-ml/cmdliner:=[ocamlopt]"
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	>=dev-ml/topkg-0.9
diff --git a/dev-ml/fmt/metadata.xml b/dev-ml/fmt/metadata.xml
index d2d34c4dda8b..1c7e0a13f879 100644
--- a/dev-ml/fmt/metadata.xml
+++ b/dev-ml/fmt/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">dbuenzli/fmt</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">dbuenzli/fmt</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/fpath/metadata.xml b/dev-ml/fpath/metadata.xml
index 27be7d1c1ae2..fcc282ad516b 100644
--- a/dev-ml/fpath/metadata.xml
+++ b/dev-ml/fpath/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">dbuenzli/fpath</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">dbuenzli/fpath</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/gen/metadata.xml b/dev-ml/gen/metadata.xml
index fb3837d25e60..5692a8b0aeb4 100644
--- a/dev-ml/gen/metadata.xml
+++ b/dev-ml/gen/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">c-cube/gen</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">c-cube/gen</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/graphics/graphics-5.1.1.ebuild b/dev-ml/graphics/graphics-5.1.1.ebuild
index 73c91a7626b9..f4e006b2d5d0 100644
--- a/dev-ml/graphics/graphics-5.1.1.ebuild
+++ b/dev-ml/graphics/graphics-5.1.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/${PN}/releases/download/${PV}/${P}.tbz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="dev-ml/dune-configurator:=[ocamlopt?]
 	>=dev-lang/ocaml-4.09
diff --git a/dev-ml/graphics/metadata.xml b/dev-ml/graphics/metadata.xml
index 9f27ba42c7de..4f0aab5e579a 100644
--- a/dev-ml/graphics/metadata.xml
+++ b/dev-ml/graphics/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/gsl-ocaml/metadata.xml b/dev-ml/gsl-ocaml/metadata.xml
index d7d246046a4d..52c646356d90 100644
--- a/dev-ml/gsl-ocaml/metadata.xml
+++ b/dev-ml/gsl-ocaml/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="bitbucket">mmottl/gsl-ocaml</remote-id>
-    <remote-id type="github">mmottl/gsl-ocaml</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>sci@gentoo.org</email>
+  <name>Gentoo Science Project</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="bitbucket">mmottl/gsl-ocaml</remote-id>
+  <remote-id type="github">mmottl/gsl-ocaml</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/iTeML/metadata.xml b/dev-ml/iTeML/metadata.xml
index 54b0c114ffec..6bb59f9d1a79 100644
--- a/dev-ml/iTeML/metadata.xml
+++ b/dev-ml/iTeML/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">vincent-hugot/iTeML</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">vincent-hugot/iTeML</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/integers/metadata.xml b/dev-ml/integers/metadata.xml
index 7c1e38b98cec..11360e327abe 100644
--- a/dev-ml/integers/metadata.xml
+++ b/dev-ml/integers/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocamllabs/ocaml-integers</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocamllabs/ocaml-integers</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/jane-street-headers/metadata.xml b/dev-ml/jane-street-headers/metadata.xml
index c938bbaf6059..1a0d69952022 100644
--- a/dev-ml/jane-street-headers/metadata.xml
+++ b/dev-ml/jane-street-headers/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/jane-street-headers</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/jane-street-headers</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild b/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild
index 5c6cfedbcc69..b3506058f1fb 100644
--- a/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild
+++ b/dev-ml/jbuilder/jbuilder-1.0_beta14.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-DEPEND="<=dev-lang/ocaml-4.05.0:="
+DEPEND="<dev-lang/ocaml-4.09:="
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND}
 	test? (
diff --git a/dev-ml/jbuilder/metadata.xml b/dev-ml/jbuilder/metadata.xml
index 45dd54a49f28..f888b179735c 100644
--- a/dev-ml/jbuilder/metadata.xml
+++ b/dev-ml/jbuilder/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/jbuilder</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/jbuilder</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/jingoo/metadata.xml b/dev-ml/jingoo/metadata.xml
index 3789f3a63313..1aed200fa25f 100644
--- a/dev-ml/jingoo/metadata.xml
+++ b/dev-ml/jingoo/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">tategakibunko/jingoo</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">tategakibunko/jingoo</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
index 365d5deade15..9614a3a2f5f8 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
@@ -15,7 +15,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 else
 	SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	# Breaks dev-ml/eliom dev-ml/async_js dev-ml/ocsigen-toolkit
-	KEYWORDS=""
 	#KEYWORDS="~amd64"
 fi
 
diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
index c99ea42ab35b..42868202f3a7 100644
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ b/dev-ml/js_of_ocaml/metadata.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="camlp4">Build with camlp4 syntax extensions.</flag>
-		<flag name="deriving">Enable <pkg>dev-ml/deriving</pkg> support for improving the type safety.</flag>
-		<flag name="lwt">Enable <pkg>dev-ml/lwt</pkg> support.</flag>
-		<flag name="ppx">Enables the ppx syntax extension</flag>
-		<flag name="react">Enable functionnal reactive programming support.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ocsigen/js_of_ocaml</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ocsigen/js_of_ocaml</remote-id>
+ </upstream>
+ <use>
+  <flag name="camlp4">Build with camlp4 syntax extensions.</flag>
+  <flag name="deriving">Enable <pkg>dev-ml/deriving</pkg> support for improving the type safety.</flag>
+  <flag name="lwt">Enable <pkg>dev-ml/lwt</pkg> support.</flag>
+  <flag name="ppx">Enables the ppx syntax extension</flag>
+  <flag name="react">Enable functionnal reactive programming support.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/jsonm/metadata.xml b/dev-ml/jsonm/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/dev-ml/jsonm/metadata.xml
+++ b/dev-ml/jsonm/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/jst-config/metadata.xml b/dev-ml/jst-config/metadata.xml
index dfb62d54d092..38e70024fdef 100644
--- a/dev-ml/jst-config/metadata.xml
+++ b/dev-ml/jst-config/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/jst-config</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/jst-config</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/lablgl/metadata.xml b/dev-ml/lablgl/metadata.xml
index 1b2becffa26c..83d00b14c8d4 100644
--- a/dev-ml/lablgl/metadata.xml
+++ b/dev-ml/lablgl/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/lablgtk-sourceview/metadata.xml b/dev-ml/lablgtk-sourceview/metadata.xml
index 856df00497e6..4af490f3586c 100644
--- a/dev-ml/lablgtk-sourceview/metadata.xml
+++ b/dev-ml/lablgtk-sourceview/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
index 5263d118d9fc..3ae74bb94ba0 100644
--- a/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.18.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="https://forge.ocamlcore.org/frs/download.php/1627/${P}.tar.gz"
 LICENSE="LGPL-2.1-with-linking-exception examples? ( lablgtk-examples )"
 
 RDEPEND=">=x11-libs/gtk+-2.10:2
-	>=dev-lang/ocaml-3.10:=[ocamlopt?]
+	<dev-lang/ocaml-4.09:=[ocamlopt?]
 	svg? ( >=gnome-base/librsvg-2.2:2 )
 	glade? ( >=gnome-base/libglade-2.0.1 )
 	gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 )
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 SLOT="2/${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 src_configure() {
 	econf $(use_enable debug) \
diff --git a/dev-ml/lablgtk/metadata.xml b/dev-ml/lablgtk/metadata.xml
index b47954e05bc3..fe664d8ae25f 100644
--- a/dev-ml/lablgtk/metadata.xml
+++ b/dev-ml/lablgtk/metadata.xml
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-<use>
-	<flag name="glade">Enable libglade bindings compilation.</flag>
-	<flag name="gnomecanvas">Enable libgnomecanvas bindings compilation.</flag>
-	<flag name="sourceview">Enable GtkSourceView support</flag>
-</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="glade">Enable libglade bindings compilation.</flag>
+  <flag name="gnomecanvas">Enable libgnomecanvas bindings compilation.</flag>
+  <flag name="sourceview">Enable GtkSourceView support</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/labltk/metadata.xml b/dev-ml/labltk/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/dev-ml/labltk/metadata.xml
+++ b/dev-ml/labltk/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 757ab90ea8c3..5dd701f91d3e 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -1,8 +1,7 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
 DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
-DIST llvmorg-11.1.0-rc1.tar.gz 122793491 BLAKE2B f4777455f5903cffea284eaffd872be6c287c6c1ebbd0c4b5b5473f146d7f5476f3551998a58d3e976ab90cde7b0d05db2b3be97f4e8e2c3474755ff38739268 SHA512 44e281486c44fa1611042ab658b9833a75f9613b7f896863613cfb99de66d13607fb1e9064f42ea3d89ca7951113465a90fd96ca4544262f165f78bd5261f5a8
-DIST llvmorg-11.1.0-rc2.tar.gz 122794772 BLAKE2B ab533f078d9d6c37e27c578866a07896344a0b4cf4ebf6402f4fa490213e017310d1c882bf63e552e99a5b4f6d1d8c01413420713b200bfa6732eff64f3c47a9 SHA512 88d8f1d938f0ba7ec39478d03a35c09a30bea51735276205494265b1061621b3ebcda8ee4211e896783b1b99a377c9fa68046118b0d6cb7fcb7bea1e960f95b7
-DIST llvmorg-11.1.0-rc3.tar.gz 122785838 BLAKE2B d0998219471476be1a1249b3a2444750585a352047d4dc14de6fec87eb3407d0f4b848757340200d3423cb4090554ae033fb4ec3797446e46556fbb566bb77a3 SHA512 b67874cb127f3f929a3796558cdfbf509b384c4247f4936ba08cecf88ca880a167cf67c23d78104b5bab4a98efd9435d1b923deb7ae7367875414e6c896957d1
+DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0-rc1.tar.gz 134164708 BLAKE2B d4261ff7d9586b47f4cfda3d2cda4b76534f9e17fbd5cdb8861895b8eb466021962f4608bfcdeb52f8fce78850a994fd5eda0560f7211e5c8d1ac9330a738a36 SHA512 3d07d013d0705bb99f56898cc55d054d0d95aeb53b3c756cfab80b4c9097cc4935bcea89b9efde2e503a899b9fccf0dacc0073c9991c8ea352755c5ec68a757a
+DIST llvmorg-12.0.0-rc2.tar.gz 134242619 BLAKE2B bb741a311db608fc2ba7eeaab71c5c9f2a430f7fee3f0c5c4334e5c14caa19738d18c87b568de963d57d9b53e808ac412cf8554eca7fcae9ecca65aa4442e197 SHA512 d8f9b3dfeb0fe9b91eb7f49da393784333044db2653373fbb168afd3c8d50f3e3ec7a7b8f44df522d0facafbfe4cfc4d9e2906d19f1e6feb0bdc569b6c10a17d
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc3.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0.ebuild
index b8f1af55b146..02c8e22591db 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc3.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0.ebuild
@@ -18,7 +18,7 @@ ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${PV}"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
 REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
 RESTRICT="!test? ( test )"
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc2.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc2.ebuild
deleted file mode 100644
index b8f1af55b146..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc2.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9,10} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
-	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test ${ALL_LLVM_TARGETS[*]}"
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]"
-for x in "${ALL_LLVM_TARGETS[@]}"; do
-	RDEPEND+="
-		${x}? ( ~sys-devel/llvm-${PV}[${x}] )"
-done
-unset x
-
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-	test? ( dev-ml/ounit )
-	${PYTHON_DEPS}"
-
-LLVM_COMPONENTS=( llvm )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable go bindings
-		-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc1.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc2.ebuild
index b8f1af55b146..3d553b94644d 100644
--- a/dev-ml/llvm-ocaml/llvm-ocaml-11.1.0_rc1.ebuild
+++ b/dev-ml/llvm-ocaml/llvm-ocaml-12.0.0_rc2.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="OCaml bindings for LLVM"
 HOMEPAGE="https://llvm.org/"
 
 # Keep in sync with sys-devel/llvm
-ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC VE )
+ALL_LLVM_EXPERIMENTAL_TARGETS=( ARC CSKY VE )
 ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
 	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore
 	"${ALL_LLVM_EXPERIMENTAL_TARGETS[@]}" )
diff --git a/dev-ml/llvm-ocaml/metadata.xml b/dev-ml/llvm-ocaml/metadata.xml
index 89c4bdb96049..e78b340be213 100644
--- a/dev-ml/llvm-ocaml/metadata.xml
+++ b/dev-ml/llvm-ocaml/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>llvm@gentoo.org</email>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>llvm@gentoo.org</email>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/logs/logs-0.7.0.ebuild b/dev-ml/logs/logs-0.7.0.ebuild
index 2aac17924c5d..6636b9bb1bba 100644
--- a/dev-ml/logs/logs-0.7.0.ebuild
+++ b/dev-ml/logs/logs-0.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/logs/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="javascript +fmt cli +lwt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/logs/metadata.xml b/dev-ml/logs/metadata.xml
index c409d1b308a9..01bf0351b056 100644
--- a/dev-ml/logs/metadata.xml
+++ b/dev-ml/logs/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<use>
-		<flag name="cli">Enables the Logs_cli library that provides command line support for controlling Logs.</flag>
-		<flag name="fmt">Enables the Logs_fmt reporter.</flag>
-		<flag name="lwt">Enables the Logs_lwt library that provides Lwt logging functions.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">dbuenzli/logs</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">dbuenzli/logs</remote-id>
+ </upstream>
+ <use>
+  <flag name="cli">Enables the Logs_cli library that provides command line support for controlling Logs.</flag>
+  <flag name="fmt">Enables the Logs_fmt reporter.</flag>
+  <flag name="lwt">Enables the Logs_lwt library that provides Lwt logging functions.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/lwt/metadata.xml b/dev-ml/lwt/metadata.xml
index 5b7d7469f26d..fcf7ee1deb19 100644
--- a/dev-ml/lwt/metadata.xml
+++ b/dev-ml/lwt/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocsigen/lwt</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocsigen/lwt</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/lwt_react/metadata.xml b/dev-ml/lwt_react/metadata.xml
index e72b88da28f8..6cd65b84ac6a 100644
--- a/dev-ml/lwt_react/metadata.xml
+++ b/dev-ml/lwt_react/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ocsigen/lwt</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ocsigen/lwt</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/lwt_ssl/metadata.xml b/dev-ml/lwt_ssl/metadata.xml
index e72b88da28f8..6cd65b84ac6a 100644
--- a/dev-ml/lwt_ssl/metadata.xml
+++ b/dev-ml/lwt_ssl/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ocsigen/lwt</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ocsigen/lwt</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/macaque/metadata.xml b/dev-ml/macaque/metadata.xml
index 706c8061785e..a669601267e7 100644
--- a/dev-ml/macaque/metadata.xml
+++ b/dev-ml/macaque/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">ocsigen/macaque</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ocsigen/macaque</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/markup/metadata.xml b/dev-ml/markup/metadata.xml
index 41afb4a0fa40..9a9b3e3b3cbe 100644
--- a/dev-ml/markup/metadata.xml
+++ b/dev-ml/markup/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>ML</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">aantron/markup.ml</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">aantron/markup.ml</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/mccs/mccs-1.1.11.ebuild b/dev-ml/mccs/mccs-1.1.11.ebuild
index e1130be194ad..5c08c4fe30df 100644
--- a/dev-ml/mccs/mccs-1.1.11.ebuild
+++ b/dev-ml/mccs/mccs-1.1.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AltGr/ocaml-mccs/archive/${MY_PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/mccs/metadata.xml b/dev-ml/mccs/metadata.xml
index cb477b7c6e26..dc2bd909845d 100644
--- a/dev-ml/mccs/metadata.xml
+++ b/dev-ml/mccs/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">AltGr/ocaml-mccs</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">AltGr/ocaml-mccs</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/menhir/menhir-20190924.ebuild b/dev-ml/menhir/menhir-20190924.ebuild
index d3d173e31dc2..baa2ebb96329 100644
--- a/dev-ml/menhir/menhir-20190924.ebuild
+++ b/dev-ml/menhir/menhir-20190924.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.inria.fr/fpottier/${PN}/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="examples +ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.02:=[ocamlopt?]"
diff --git a/dev-ml/menhir/metadata.xml b/dev-ml/menhir/metadata.xml
index 9f27ba42c7de..4f0aab5e579a 100644
--- a/dev-ml/menhir/metadata.xml
+++ b/dev-ml/menhir/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/merlin-extend/metadata.xml b/dev-ml/merlin-extend/metadata.xml
index 2bb5f122ff9d..4e6f15035c3c 100644
--- a/dev-ml/merlin-extend/metadata.xml
+++ b/dev-ml/merlin-extend/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">let-def/merlin-extend</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">let-def/merlin-extend</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/mirage-clock/metadata.xml b/dev-ml/mirage-clock/metadata.xml
index 6bb533907705..120ce8b69ecf 100644
--- a/dev-ml/mirage-clock/metadata.xml
+++ b/dev-ml/mirage-clock/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mirage/mirage-clock</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mirage/mirage-clock</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild b/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild
index a2d3db044eab..77bdfcf0008f 100644
--- a/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild
+++ b/dev-ml/mirage-clock/mirage-clock-3.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mirage/mirage-clock/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 BDEPEND="dev-ml/dune-configurator"
diff --git a/dev-ml/mmap/metadata.xml b/dev-ml/mmap/metadata.xml
index 3c0ce5319562..7baa57161b20 100644
--- a/dev-ml/mmap/metadata.xml
+++ b/dev-ml/mmap/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">mirage/mmap</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mirage/mmap</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/mtime/metadata.xml b/dev-ml/mtime/metadata.xml
index 430548eaef52..7f7fa8b359d3 100644
--- a/dev-ml/mtime/metadata.xml
+++ b/dev-ml/mtime/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">dbuenzli/mtime</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">dbuenzli/mtime</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/mtime/mtime-1.1.0.ebuild b/dev-ml/mtime/mtime-1.1.0.ebuild
index 1b5b5d48071e..021313a0546e 100644
--- a/dev-ml/mtime/mtime-1.1.0.ebuild
+++ b/dev-ml/mtime/mtime-1.1.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/mtime/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="javascript test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/num/metadata.xml b/dev-ml/num/metadata.xml
index e24f3283a006..12fbb287f682 100644
--- a/dev-ml/num/metadata.xml
+++ b/dev-ml/num/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/num/num-1.3-r1.ebuild b/dev-ml/num/num-1.3-r1.ebuild
index ceaa548dcdef..8559e7e79db0 100644
--- a/dev-ml/num/num-1.3-r1.ebuild
+++ b/dev-ml/num/num-1.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-lang/ocaml-4.09.0:=[ocamlopt]
diff --git a/dev-ml/oasis/metadata.xml b/dev-ml/oasis/metadata.xml
index 7a38bb900964..83d00b14c8d4 100644
--- a/dev-ml/oasis/metadata.xml
+++ b/dev-ml/oasis/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-augeas/metadata.xml b/dev-ml/ocaml-augeas/metadata.xml
index b11b3f0e5dd7..38e4c64c91dd 100644
--- a/dev-ml/ocaml-augeas/metadata.xml
+++ b/dev-ml/ocaml-augeas/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>prometheanfire@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>prometheanfire@gentoo.org</email>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-autoconf/metadata.xml b/dev-ml/ocaml-autoconf/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/dev-ml/ocaml-autoconf/metadata.xml
+++ b/dev-ml/ocaml-autoconf/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-base64/metadata.xml b/dev-ml/ocaml-base64/metadata.xml
index d7028b86416b..8315df78044f 100644
--- a/dev-ml/ocaml-base64/metadata.xml
+++ b/dev-ml/ocaml-base64/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">mirage/ocaml-base64</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">mirage/ocaml-base64</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-cohttp/metadata.xml b/dev-ml/ocaml-cohttp/metadata.xml
index 5671f937b5ea..042f2e779afe 100644
--- a/dev-ml/ocaml-cohttp/metadata.xml
+++ b/dev-ml/ocaml-cohttp/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="async">Enables support for the <pkg>dev-ml/async</pkg> asynchronous execution library.</flag>
-		<flag name="lwt">Enables support for the <pkg>dev-ml/lwt</pkg> cooperative light-weight thread library.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">mirage/ocaml-cohttp</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mirage/ocaml-cohttp</remote-id>
+ </upstream>
+ <use>
+  <flag name="async">Enables support for the <pkg>dev-ml/async</pkg> asynchronous execution library.</flag>
+  <flag name="lwt">Enables support for the <pkg>dev-ml/lwt</pkg> cooperative light-weight thread library.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0.ebuild b/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0-r1.ebuild
index bb00e40e1629..55c330d8b1bb 100644
--- a/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0.ebuild
+++ b/dev-ml/ocaml-cohttp/ocaml-cohttp-0.22.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ KEYWORDS="~amd64"
 IUSE="async javascript +lwt"
 
 DEPEND="
-	dev-ml/ocaml-re:=
+	dev-ml/re:=
 	dev-ml/stringext:=
 	dev-ml/ocaml-uri:=
 	dev-ml/fieldslib:=
diff --git a/dev-ml/ocaml-compiler-libs/metadata.xml b/dev-ml/ocaml-compiler-libs/metadata.xml
index 386b3cb8e9bc..bcf84a82b8ad 100644
--- a/dev-ml/ocaml-compiler-libs/metadata.xml
+++ b/dev-ml/ocaml-compiler-libs/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ocaml-compiler-libs</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ocaml-compiler-libs</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-conduit/metadata.xml b/dev-ml/ocaml-conduit/metadata.xml
index 237f85fa7a95..e0be54683c70 100644
--- a/dev-ml/ocaml-conduit/metadata.xml
+++ b/dev-ml/ocaml-conduit/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">mirage/ocaml-conduit</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">mirage/ocaml-conduit</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-cstruct/metadata.xml b/dev-ml/ocaml-cstruct/metadata.xml
index 498dfd3c0d36..c8ae887dcc90 100644
--- a/dev-ml/ocaml-cstruct/metadata.xml
+++ b/dev-ml/ocaml-cstruct/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-   <!-- maintainer-needed -->
-   <use>
-        <flag name="async">Support for asynchronous execution</flag>
-        <flag name="lwt">Enable threads via lwt</flag>
-        <flag name="ppx">Enable the ppx syntax extension</flag>
-    </use>
-    <upstream>
-        <remote-id type="github">mirage/ocaml-cstruct</remote-id>
-    </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">mirage/ocaml-cstruct</remote-id>
+ </upstream>
+ <use>
+  <flag name="async">Support for asynchronous execution</flag>
+  <flag name="lwt">Enable threads via lwt</flag>
+  <flag name="ppx">Enable the ppx syntax extension</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-ctypes/metadata.xml b/dev-ml/ocaml-ctypes/metadata.xml
index e3a65adc3e77..e827da77f21c 100644
--- a/dev-ml/ocaml-ctypes/metadata.xml
+++ b/dev-ml/ocaml-ctypes/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocamllabs/ocaml-ctypes</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocamllabs/ocaml-ctypes</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-data-notation/metadata.xml b/dev-ml/ocaml-data-notation/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/dev-ml/ocaml-data-notation/metadata.xml
+++ b/dev-ml/ocaml-data-notation/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-dispatch/metadata.xml b/dev-ml/ocaml-dispatch/metadata.xml
index cf004079a542..6b3611313851 100644
--- a/dev-ml/ocaml-dispatch/metadata.xml
+++ b/dev-ml/ocaml-dispatch/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">inhabitedtype/ocaml-dispatch</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">inhabitedtype/ocaml-dispatch</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-doc/metadata.xml b/dev-ml/ocaml-doc/metadata.xml
index 7a38bb900964..83d00b14c8d4 100644
--- a/dev-ml/ocaml-doc/metadata.xml
+++ b/dev-ml/ocaml-doc/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-expat/metadata.xml b/dev-ml/ocaml-expat/metadata.xml
index f91d68f6062b..ef594c0e4456 100644
--- a/dev-ml/ocaml-expat/metadata.xml
+++ b/dev-ml/ocaml-expat/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">whitequark/ocaml-expat</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">whitequark/ocaml-expat</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-expect/metadata.xml b/dev-ml/ocaml-expect/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/dev-ml/ocaml-expect/metadata.xml
+++ b/dev-ml/ocaml-expect/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-fileutils/metadata.xml b/dev-ml/ocaml-fileutils/metadata.xml
index cae1d28b2b3b..e1bbe997e4ec 100644
--- a/dev-ml/ocaml-fileutils/metadata.xml
+++ b/dev-ml/ocaml-fileutils/metadata.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <longdescription>
+ <maintainer type="person">
+  <email>rkitover@gmail.com</email>
+  <name>Rafael Kitover</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
     POSIX-like file manipulation functions inspired by
     GNU coreutils and filename manipulation functions
     for OCaml.
   </longdescription>
-  <maintainer type="person">
-    <email>rkitover@gmail.com</email>
-    <name>Rafael Kitover</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">gildor478/ocaml-fileutils</remote-id>
-  </upstream>
-  <use>
-    <flag name="ocamlopt">
+ <upstream>
+  <remote-id type="github">gildor478/ocaml-fileutils</remote-id>
+ </upstream>
+ <use>
+  <flag name="ocamlopt">
       Whether the OCaml native code compiler is used. Must be set globally and
       match dev-lang/ocaml.
     </flag>
-  </use>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-gettext-camomile/metadata.xml b/dev-ml/ocaml-gettext-camomile/metadata.xml
index 4014d3ca4a80..1e4454241b16 100644
--- a/dev-ml/ocaml-gettext-camomile/metadata.xml
+++ b/dev-ml/ocaml-gettext-camomile/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>rkitover@gmail.com</email>
-    <name>Rafael Kitover</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">gildor478/ocaml-gettext</remote-id>
-  </upstream>
-  <use>
-    <flag name="ocamlopt">
+ <maintainer type="person">
+  <email>rkitover@gmail.com</email>
+  <name>Rafael Kitover</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">gildor478/ocaml-gettext</remote-id>
+ </upstream>
+ <use>
+  <flag name="ocamlopt">
       Whether the OCaml native code compiler is used. Must be set globally and
       match dev-lang/ocaml.
     </flag>
-  </use>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-gettext-stub/metadata.xml b/dev-ml/ocaml-gettext-stub/metadata.xml
index 4014d3ca4a80..1e4454241b16 100644
--- a/dev-ml/ocaml-gettext-stub/metadata.xml
+++ b/dev-ml/ocaml-gettext-stub/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>rkitover@gmail.com</email>
-    <name>Rafael Kitover</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">gildor478/ocaml-gettext</remote-id>
-  </upstream>
-  <use>
-    <flag name="ocamlopt">
+ <maintainer type="person">
+  <email>rkitover@gmail.com</email>
+  <name>Rafael Kitover</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">gildor478/ocaml-gettext</remote-id>
+ </upstream>
+ <use>
+  <flag name="ocamlopt">
       Whether the OCaml native code compiler is used. Must be set globally and
       match dev-lang/ocaml.
     </flag>
-  </use>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-gettext/metadata.xml b/dev-ml/ocaml-gettext/metadata.xml
index 4014d3ca4a80..1e4454241b16 100644
--- a/dev-ml/ocaml-gettext/metadata.xml
+++ b/dev-ml/ocaml-gettext/metadata.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>rkitover@gmail.com</email>
-    <name>Rafael Kitover</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">gildor478/ocaml-gettext</remote-id>
-  </upstream>
-  <use>
-    <flag name="ocamlopt">
+ <maintainer type="person">
+  <email>rkitover@gmail.com</email>
+  <name>Rafael Kitover</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">gildor478/ocaml-gettext</remote-id>
+ </upstream>
+ <use>
+  <flag name="ocamlopt">
       Whether the OCaml native code compiler is used. Must be set globally and
       match dev-lang/ocaml.
     </flag>
-  </use>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-hashcons/metadata.xml b/dev-ml/ocaml-hashcons/metadata.xml
index 445c6d93296f..2c2d04523554 100644
--- a/dev-ml/ocaml-hashcons/metadata.xml
+++ b/dev-ml/ocaml-hashcons/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">backtracking/ocaml-hashcons</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">backtracking/ocaml-hashcons</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-ipaddr/metadata.xml b/dev-ml/ocaml-ipaddr/metadata.xml
index ce6645f0aacc..9356e7307854 100644
--- a/dev-ml/ocaml-ipaddr/metadata.xml
+++ b/dev-ml/ocaml-ipaddr/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">mirage/ocaml-ipaddr</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">mirage/ocaml-ipaddr</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-magic-mime/metadata.xml b/dev-ml/ocaml-magic-mime/metadata.xml
index 2ca30fe9fc35..779e9198a522 100644
--- a/dev-ml/ocaml-magic-mime/metadata.xml
+++ b/dev-ml/ocaml-magic-mime/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">mirage/ocaml-magic-mime</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">mirage/ocaml-magic-mime</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-migrate-parsetree/metadata.xml b/dev-ml/ocaml-migrate-parsetree/metadata.xml
index bf3554de4973..fee8f353a0d5 100644
--- a/dev-ml/ocaml-migrate-parsetree/metadata.xml
+++ b/dev-ml/ocaml-migrate-parsetree/metadata.xml
@@ -1,15 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml-ppx/ocaml-migrate-parsetree</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml-ppx/ocaml-migrate-parsetree</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-re/metadata.xml b/dev-ml/ocaml-re/metadata.xml
index f2a7b592bd52..50d15e4221fb 100644
--- a/dev-ml/ocaml-re/metadata.xml
+++ b/dev-ml/ocaml-re/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">ocaml/ocaml-re</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ocaml/ocaml-re</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-sqlite3/metadata.xml b/dev-ml/ocaml-sqlite3/metadata.xml
index ed2908f25514..fee196d31da6 100644
--- a/dev-ml/ocaml-sqlite3/metadata.xml
+++ b/dev-ml/ocaml-sqlite3/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">mmottl/sqlite3-ocaml</remote-id>
-    <remote-id type="bitbucket">mmottl/sqlite3-ocaml</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">mmottl/sqlite3-ocaml</remote-id>
+  <remote-id type="bitbucket">mmottl/sqlite3-ocaml</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-ssl/metadata.xml b/dev-ml/ocaml-ssl/metadata.xml
index 35f7fc885090..3fa242b5ba2d 100644
--- a/dev-ml/ocaml-ssl/metadata.xml
+++ b/dev-ml/ocaml-ssl/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">savonet</remote-id>
-		<remote-id type="github">savonet/ocaml-ssl</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="sourceforge">savonet</remote-id>
+  <remote-id type="github">savonet/ocaml-ssl</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild
index efafebb5ce0a..b6933117902d 100644
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/savonet/ocaml-ssl"
 
 SLOT="0/${PV}"
 LICENSE="LGPL-2.1"
-KEYWORDS="amd64 ~arm ppc x86"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="doc"
 
 DEPEND="
diff --git a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild
index dfac745fb556..4549118d7636 100644
--- a/dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild
+++ b/dev-ml/ocaml-ssl/ocaml-ssl-0.5.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ RDEPEND="${DEPEND}"
 
 SLOT="0/${PV}"
 LICENSE="LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc x86"
 
 src_install() {
 	dune_src_install
diff --git a/dev-ml/ocaml-uri/metadata.xml b/dev-ml/ocaml-uri/metadata.xml
index c310dca89ba4..7e819d4c77ad 100644
--- a/dev-ml/ocaml-uri/metadata.xml
+++ b/dev-ml/ocaml-uri/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-   <!-- maintainer-needed -->
-    <upstream>
-        <remote-id type="github">mirage/ocaml-uri</remote-id>
-    </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mirage/ocaml-uri</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild b/dev-ml/ocaml-uri/ocaml-uri-1.9.4-r1.ebuild
index bfa2f6bcf832..63708fe6bc1f 100644
--- a/dev-ml/ocaml-uri/ocaml-uri-1.9.4.ebuild
+++ b/dev-ml/ocaml-uri/ocaml-uri-1.9.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-ml/ocaml-re:=
+	dev-ml/re:=
 	dev-ml/sexplib:=
 	dev-ml/ppx_sexp_conv:=
 	dev-ml/ppx_core:=
diff --git a/dev-ml/ocamlbuild/Manifest b/dev-ml/ocamlbuild/Manifest
index 2582af8317bb..bda5a1b64c33 100644
--- a/dev-ml/ocamlbuild/Manifest
+++ b/dev-ml/ocamlbuild/Manifest
@@ -1,3 +1,2 @@
-DIST ocamlbuild-0.10.1.tar.gz 193263 BLAKE2B cee82997a6b691b3df9b92055b74f05af57d7663f5dbb84701e66dffefcfe6ec00c9721e1872d546f2aea9237068e37ba7d94463d0002a8356dd4d84bc1865c0 SHA512 6d74bdce7fe147bf1a5fd570b569925b36b5f443c7251d1c13a0525e3086417b393a768722bf7d4b23a7e3178b0b3c2511499725c5a755d69783b8d555663e3b
 DIST ocamlbuild-0.11.0.tar.gz 195297 BLAKE2B 2d653c402edf58035fa6efb65c99c956fe78efc4759f29c8ddab8263310a5d243d25d37d4c1a4f0699f151afb6d4c6df4c1550f95d6e915963b3d86923877225 SHA512 14bc44cc63b6c99e711658a1145247bad8263632fbb4550238cef15e226a76b83e51b83575a7a96f16b96ec321dedd0ef23f36166c354838aec1922f58179efd
 DIST ocamlbuild-0.14.0.tar.gz 198267 BLAKE2B 355d61ba68e61b9ee18a9fc0fbb9062405f44707b180ca7ad4bfec727ca3d3d2cc08f17be118ca3a4161c7789d975e7f431812e9139d4fde85a1a27ab68c8ac3 SHA512 ae60247396399dfd35644c8c1986ef7679e5a9964df82e3388bfc6dd4c5b88a13d6869a698d14a9ac70dc48e4ce1c003f543c85426d8c862ca31dea37a554b07
diff --git a/dev-ml/ocamlbuild/metadata.xml b/dev-ml/ocamlbuild/metadata.xml
index f4df6bd2b9a9..99b1e742c5b8 100644
--- a/dev-ml/ocamlbuild/metadata.xml
+++ b/dev-ml/ocamlbuild/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/ocamlbuild</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/ocamlbuild</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild b/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
deleted file mode 100644
index d7ee6e34cb09..000000000000
--- a/dev-ml/ocamlbuild/ocamlbuild-0.10.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Generic build tool with built-in rules for building OCaml library and programs"
-HOMEPAGE="https://github.com/ocaml/ocamlbuild"
-SRC_URI="https://github.com/ocaml/ocamlbuild/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="+ocamlopt"
-
-# does not compile with ocaml-4.09 (bug # 708696 and #708872)
-DEPEND="<dev-lang/ocaml-4.09:=[ocamlopt?]"
-RDEPEND="${DEPEND}
-	!<dev-ml/findlib-1.6.1-r1
-"
-
-src_configure() {
-	emake -f configure.make Makefile.config \
-		PREFIX="${EPREFIX}/usr" \
-		BINDIR="${EPREFIX}/usr/bin" \
-		LIBDIR="$(ocamlc -where)" \
-		OCAML_NATIVE=$(usex ocamlopt true false) \
-		OCAML_NATIVE_TOOLS=$(usex ocamlopt true false) \
-		NATDYNLINK=$(usex ocamlopt true false)
-}
-
-src_compile() {
-	emake src/ocamlbuild_config.cmo
-	default
-}
-
-src_install() {
-	emake CHECK_IF_PREINSTALLED=false DESTDIR="${D}" install
-	dodoc Changes
-}
diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml
index 755517efcd9d..59cffa59b1c2 100644
--- a/dev-ml/ocamlgraph/metadata.xml
+++ b/dev-ml/ocamlgraph/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">backtracking/ocamlgraph</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">backtracking/ocamlgraph</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild
index 5813f86bc0fa..7702d4d5882c 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -10,8 +10,8 @@ HOMEPAGE="https://ocamlgraph.lri.fr/index.en.html"
 SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ppc x86"
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+RDEPEND="<=dev-lang/ocaml-4.06:=[ocamlopt?]
 	gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )"
 DEPEND="${RDEPEND}
 	doc? ( dev-tex/hevea dev-ml/ocamlweb )"
diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..9c40d32688e6
--- /dev/null
+++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+DESCRIPTION="O'Caml Graph library"
+HOMEPAGE="https://ocamlgraph.lri.fr/index.en.html"
+SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz"
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+RDEPEND="
+	dev-ml/stdlib-shims:=[ocamlopt?]
+	dev-ml/graphics:=[ocamlopt?]"
+DEPEND="${RDEPEND}"
+IUSE="+ocamlopt"
+
+src_compile() {
+	dune build --only-packages ocamlgraph @install || die
+}
diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild
index 94ed42ce39f0..fe945159d414 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://ocamlgraph.lri.fr/index.en.html"
 SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz"
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 RDEPEND="
 	gtk? ( dev-ml/lablgtk:2=[ocamlopt?,gnomecanvas] )
 	dev-ml/stdlib-shims:=[ocamlopt?]
diff --git a/dev-ml/ocamlify/metadata.xml b/dev-ml/ocamlify/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/dev-ml/ocamlify/metadata.xml
+++ b/dev-ml/ocamlify/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocamlmod/metadata.xml b/dev-ml/ocamlmod/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/dev-ml/ocamlmod/metadata.xml
+++ b/dev-ml/ocamlmod/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocamlnet/metadata.xml b/dev-ml/ocamlnet/metadata.xml
index 0923c7f5f4ff..863e10f3f664 100644
--- a/dev-ml/ocamlnet/metadata.xml
+++ b/dev-ml/ocamlnet/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-<use>
-	<flag name="httpd">Enables net-httpd web server component</flag>
-	<flag name="zip">Enables netzip support to read/write gzip data using object channels</flag>
-</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="httpd">Enables net-httpd web server component</flag>
+  <flag name="zip">Enables netzip support to read/write gzip data using object channels</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild b/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
new file mode 100644
index 000000000000..b344310e4c62
--- /dev/null
+++ b/dev-ml/ocamlnet/ocamlnet-4.1.8-r1.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+MY_P=${P/_beta/test}
+DESCRIPTION="Modules for OCaml application-level Internet protocols"
+HOMEPAGE="https://projects.camlcity.org/projects/ocamlnet.html"
+SRC_URI="http://download.camlcity.org/download/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="ZLIB GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="kerberos tk httpd +ocamlopt +pcre ssl zip"
+RESTRICT="installsources strip"
+
+# the auth-dh compile flag has been disabled as well, since it depends on
+# ocaml-cryptgps, which is not available.
+
+BDEPEND="
+	dev-ml/cppo
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-ml/findlib-1.0
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+	pcre? ( >=dev-ml/pcre-ocaml-5:= )
+	tk? ( dev-ml/labltk:= )
+	ssl? ( net-libs/gnutls:= )
+	kerberos? ( virtual/krb5 )
+	zip? ( dev-ml/camlzip:= )
+"
+DEPEND="${RDEPEND}"
+
+ocamlnet_use_with() {
+	if use $1; then
+		echo "-with-$2"
+	else
+		echo "-without-$2"
+	fi
+}
+
+ocamlnet_use_enable() {
+	if use $1; then
+		echo "-enable-$2"
+	else
+		echo "-disable-$2"
+	fi
+}
+
+src_configure() {
+	./configure \
+		-bindir /usr/bin \
+		-datadir /usr/share/${PN} \
+		$(ocamlnet_use_enable ssl gnutls) \
+		$(ocamlnet_use_enable kerberos gssapi) \
+		$(ocamlnet_use_enable pcre pcre) \
+		$(ocamlnet_use_enable tk tcl) \
+		$(ocamlnet_use_enable zip zip) \
+		$(ocamlnet_use_with httpd nethttpd) \
+		|| die "Error: econf failed!"
+}
+
+src_compile() {
+	emake -j1 all
+	if use ocamlopt; then
+		emake -j1 opt
+	fi
+}
+
+src_install() {
+	findlib_src_install
+}
diff --git a/dev-ml/ocamlsdl/metadata.xml b/dev-ml/ocamlsdl/metadata.xml
index c78ab1795227..558dba98c25d 100644
--- a/dev-ml/ocamlsdl/metadata.xml
+++ b/dev-ml/ocamlsdl/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">ocamlsdl</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="sourceforge">ocamlsdl</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocamlweb/metadata.xml b/dev-ml/ocamlweb/metadata.xml
index e24f3283a006..12fbb287f682 100644
--- a/dev-ml/ocamlweb/metadata.xml
+++ b/dev-ml/ocamlweb/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocplib-endian/metadata.xml b/dev-ml/ocplib-endian/metadata.xml
index 79e925f71327..22aadae30097 100644
--- a/dev-ml/ocplib-endian/metadata.xml
+++ b/dev-ml/ocplib-endian/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">OCamlPro/ocplib-endian</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">OCamlPro/ocplib-endian</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocplib-simplex/metadata.xml b/dev-ml/ocplib-simplex/metadata.xml
index 9a08a32b302f..057070d57763 100644
--- a/dev-ml/ocplib-simplex/metadata.xml
+++ b/dev-ml/ocplib-simplex/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<longdescription lang="en">
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <longdescription lang="en">
 		A library implementing a simplex algorithm, in a functional style,
 		for solving systems of linear inequalities
 	</longdescription>
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/octavius/metadata.xml b/dev-ml/octavius/metadata.xml
index 365c9666dff4..5ec53684ef7b 100644
--- a/dev-ml/octavius/metadata.xml
+++ b/dev-ml/octavius/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml-doc/octavius</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml-doc/octavius</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ocurl/metadata.xml b/dev-ml/ocurl/metadata.xml
index f896efe32475..48775d7de01b 100644
--- a/dev-ml/ocurl/metadata.xml
+++ b/dev-ml/ocurl/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">ygrek/ocurl</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ygrek/ocurl</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/opam-client/metadata.xml b/dev-ml/opam-client/metadata.xml
index 856df00497e6..4af490f3586c 100644
--- a/dev-ml/opam-client/metadata.xml
+++ b/dev-ml/opam-client/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/opam-client/opam-client-2.0.8.ebuild b/dev-ml/opam-client/opam-client-2.0.8.ebuild
index a558d84098a0..80b80d47ceea 100644
--- a/dev-ml/opam-client/opam-client-2.0.8.ebuild
+++ b/dev-ml/opam-client/opam-client-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/opam-core/metadata.xml b/dev-ml/opam-core/metadata.xml
index 856df00497e6..4af490f3586c 100644
--- a/dev-ml/opam-core/metadata.xml
+++ b/dev-ml/opam-core/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/opam-core/opam-core-2.0.7.ebuild b/dev-ml/opam-core/opam-core-2.0.7.ebuild
index 0694c679dc33..8f9c7e998d66 100644
--- a/dev-ml/opam-core/opam-core-2.0.7.ebuild
+++ b/dev-ml/opam-core/opam-core-2.0.7.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-ml/cmdliner:=
 "
 DEPEND="${RDEPEND}
+	dev-ml/dune
 	dev-ml/cppo"
 
 S="${WORKDIR}/opam-${PV/_/-}"
diff --git a/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild b/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
index 3d65cfc5c40c..82521212df1f 100644
--- a/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
+++ b/dev-ml/opam-core/opam-core-2.0.8-r1.ebuild
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 
 RDEPEND="
 	dev-ml/ocamlgraph:=
diff --git a/dev-ml/opam-file-format/metadata.xml b/dev-ml/opam-file-format/metadata.xml
index e96aa44304ad..1e60058e91a5 100644
--- a/dev-ml/opam-file-format/metadata.xml
+++ b/dev-ml/opam-file-format/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam-file-format</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/opam-file-format</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild b/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
index d3cecce14982..fe3328205eeb 100644
--- a/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
+++ b/dev-ml/opam-file-format/opam-file-format-2.1.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ocaml/opam-file-format/archive/${MY_PV}.tar.gz -> ${
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-format/metadata.xml b/dev-ml/opam-format/metadata.xml
index 856df00497e6..4af490f3586c 100644
--- a/dev-ml/opam-format/metadata.xml
+++ b/dev-ml/opam-format/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
index e92ea2cca839..6be6a83ee024 100644
--- a/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
+++ b/dev-ml/opam-format/opam-format-2.0.8-r2.ebuild
@@ -15,7 +15,7 @@ OPAM_INSTALLER="${S}/opam-installer"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/opam-installer/metadata.xml b/dev-ml/opam-installer/metadata.xml
index 856df00497e6..4af490f3586c 100644
--- a/dev-ml/opam-installer/metadata.xml
+++ b/dev-ml/opam-installer/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/opam-repository/metadata.xml b/dev-ml/opam-repository/metadata.xml
index 856df00497e6..4af490f3586c 100644
--- a/dev-ml/opam-repository/metadata.xml
+++ b/dev-ml/opam-repository/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
index c0970787f1db..6916797e551a 100644
--- a/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
+++ b/dev-ml/opam-repository/opam-repository-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/opam-solver/metadata.xml b/dev-ml/opam-solver/metadata.xml
index 856df00497e6..4af490f3586c 100644
--- a/dev-ml/opam-solver/metadata.xml
+++ b/dev-ml/opam-solver/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
index 5dbff3d50da3..6096c02041af 100644
--- a/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
+++ b/dev-ml/opam-solver/opam-solver-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/opam-state/metadata.xml b/dev-ml/opam-state/metadata.xml
index 856df00497e6..4af490f3586c 100644
--- a/dev-ml/opam-state/metadata.xml
+++ b/dev-ml/opam-state/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/opam-state/opam-state-2.0.8.ebuild b/dev-ml/opam-state/opam-state-2.0.8.ebuild
index 32d7d0ee0cc4..d26d1da0bc76 100644
--- a/dev-ml/opam-state/opam-state-2.0.8.ebuild
+++ b/dev-ml/opam-state/opam-state-2.0.8.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 RESTRICT="test"
 
diff --git a/dev-ml/opam/metadata.xml b/dev-ml/opam/metadata.xml
index 856df00497e6..4af490f3586c 100644
--- a/dev-ml/opam/metadata.xml
+++ b/dev-ml/opam/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/opam</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/opam</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/opam/opam-1.3.1-r1.ebuild b/dev-ml/opam/opam-1.3.1-r2.ebuild
index 893229f27620..6808aeccc739 100644
--- a/dev-ml/opam/opam-1.3.1-r1.ebuild
+++ b/dev-ml/opam/opam-1.3.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ fi
 RDEPEND="dev-lang/ocaml:=
 	|| ( net-misc/wget net-misc/curl )
 	dev-ml/extlib:=
-	dev-ml/ocaml-re:=
+	dev-ml/re:=
 	dev-ml/ocamlgraph:=
 	dev-ml/cmdliner:=
 	dev-ml/cudf:=
diff --git a/dev-ml/opam/opam-2.0.8-r1.ebuild b/dev-ml/opam/opam-2.0.8-r1.ebuild
index 430b7c6f50a4..58ba8a867155 100644
--- a/dev-ml/opam/opam-2.0.8-r1.ebuild
+++ b/dev-ml/opam/opam-2.0.8-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/opam-${PV/_/-}"
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/optcomp/metadata.xml b/dev-ml/optcomp/metadata.xml
index c143b4d35ed1..ed8656838dbb 100644
--- a/dev-ml/optcomp/metadata.xml
+++ b/dev-ml/optcomp/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">diml/optcomp</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">diml/optcomp</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ounit/metadata.xml b/dev-ml/ounit/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/dev-ml/ounit/metadata.xml
+++ b/dev-ml/ounit/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ounit2/metadata.xml b/dev-ml/ounit2/metadata.xml
index a7987b4aa43b..7dbc7f67faef 100644
--- a/dev-ml/ounit2/metadata.xml
+++ b/dev-ml/ounit2/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">gildor478/ounit</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">gildor478/ounit</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/parmap/metadata.xml b/dev-ml/parmap/metadata.xml
index 19becceff313..6930c3b03006 100644
--- a/dev-ml/parmap/metadata.xml
+++ b/dev-ml/parmap/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>ML</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rdicosmo/parmap</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">rdicosmo/parmap</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/parsexp/metadata.xml b/dev-ml/parsexp/metadata.xml
index 45889fd58f9d..5aa12ab0d345 100644
--- a/dev-ml/parsexp/metadata.xml
+++ b/dev-ml/parsexp/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/parsexp</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/parsexp</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/parsexp/parsexp-0.14.0.ebuild b/dev-ml/parsexp/parsexp-0.14.0.ebuild
index 044f16848e4a..81764e6b33bc 100644
--- a/dev-ml/parsexp/parsexp-0.14.0.ebuild
+++ b/dev-ml/parsexp/parsexp-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/parsexp/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/patience_diff/metadata.xml b/dev-ml/patience_diff/metadata.xml
index 11578db4e5d5..938526c00fe6 100644
--- a/dev-ml/patience_diff/metadata.xml
+++ b/dev-ml/patience_diff/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/patience_diff</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/patience_diff</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/pcre-ocaml/metadata.xml b/dev-ml/pcre-ocaml/metadata.xml
index f76c701b6740..d45903576944 100644
--- a/dev-ml/pcre-ocaml/metadata.xml
+++ b/dev-ml/pcre-ocaml/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>ML</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mmottl/pcre-ocaml</remote-id>
-    <remote-id type="bitbucket">mmottl/pcre-ocaml</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mmottl/pcre-ocaml</remote-id>
+  <remote-id type="bitbucket">mmottl/pcre-ocaml</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild
index 0b8c8d287e90..65fea205af6a 100644
--- a/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild
+++ b/dev-ml/pcre-ocaml/pcre-ocaml-7.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/pcre-${PV}"
 LICENSE="LGPL-2.1-with-linking-exception"
 IUSE="examples +ocamlopt"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 
 BDEPEND="dev-ml/dune-configurator"
 RDEPEND=">=dev-libs/libpcre-4.5"
diff --git a/dev-ml/pgocaml/metadata.xml b/dev-ml/pgocaml/metadata.xml
index 786f027a3293..a683093e910a 100644
--- a/dev-ml/pgocaml/metadata.xml
+++ b/dev-ml/pgocaml/metadata.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<use>
-		<flag name="camlp4">Enable PG'Ocaml syntax extension.</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="camlp4">Enable PG'Ocaml syntax extension.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/pgocaml/pgocaml-2.3.ebuild b/dev-ml/pgocaml/pgocaml-2.3-r1.ebuild
index 7c17e943c980..d191501107c2 100644
--- a/dev-ml/pgocaml/pgocaml-2.3.ebuild
+++ b/dev-ml/pgocaml/pgocaml-2.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ IUSE="+camlp4 doc"
 
 DEPEND="dev-ml/calendar:=
 	dev-ml/csv:=
-	dev-ml/ocaml-re:=
+	dev-ml/re:=
 	camlp4? ( dev-ml/camlp4:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/ppx_assert/metadata.xml b/dev-ml/ppx_assert/metadata.xml
index b83f7118873b..cdac4d0d9fcd 100644
--- a/dev-ml/ppx_assert/metadata.xml
+++ b/dev-ml/ppx_assert/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_assert</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_assert</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_ast/metadata.xml b/dev-ml/ppx_ast/metadata.xml
index 7479fbd4c5c4..49003e2bb87e 100644
--- a/dev-ml/ppx_ast/metadata.xml
+++ b/dev-ml/ppx_ast/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/ppx_ast</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_ast</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_base/metadata.xml b/dev-ml/ppx_base/metadata.xml
index 9949f15ae8cc..f61535a2d6e2 100644
--- a/dev-ml/ppx_base/metadata.xml
+++ b/dev-ml/ppx_base/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_base</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_base</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_bench/metadata.xml b/dev-ml/ppx_bench/metadata.xml
index 8101d49c7a8c..02d932133ac8 100644
--- a/dev-ml/ppx_bench/metadata.xml
+++ b/dev-ml/ppx_bench/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_bench</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_bench</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_bin_prot/metadata.xml b/dev-ml/ppx_bin_prot/metadata.xml
index 1854dc854561..3474eec7ae3b 100644
--- a/dev-ml/ppx_bin_prot/metadata.xml
+++ b/dev-ml/ppx_bin_prot/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_bin_prot</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_bin_prot</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_cold/metadata.xml b/dev-ml/ppx_cold/metadata.xml
index fce837d2f493..d4c0c8f808f9 100644
--- a/dev-ml/ppx_cold/metadata.xml
+++ b/dev-ml/ppx_cold/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_cold</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_cold</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_compare/metadata.xml b/dev-ml/ppx_compare/metadata.xml
index 3ab5bd7e5b35..57ec16d0d19e 100644
--- a/dev-ml/ppx_compare/metadata.xml
+++ b/dev-ml/ppx_compare/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_compare</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_compare</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_core/metadata.xml b/dev-ml/ppx_core/metadata.xml
index be8727d00044..de456a7b2d31 100644
--- a/dev-ml/ppx_core/metadata.xml
+++ b/dev-ml/ppx_core/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/ppx_core</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_core</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_custom_printf/metadata.xml b/dev-ml/ppx_custom_printf/metadata.xml
index bd8c830ce5d7..d3fcdacc992b 100644
--- a/dev-ml/ppx_custom_printf/metadata.xml
+++ b/dev-ml/ppx_custom_printf/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_custom_printf</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_custom_printf</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_derivers/metadata.xml b/dev-ml/ppx_derivers/metadata.xml
index 60ca2c998ff0..f61c6ba4d3c3 100644
--- a/dev-ml/ppx_derivers/metadata.xml
+++ b/dev-ml/ppx_derivers/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">diml/ppx_derivers</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">diml/ppx_derivers</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_deriving/metadata.xml b/dev-ml/ppx_deriving/metadata.xml
index 196c8d34a1f0..7348a1e8771f 100644
--- a/dev-ml/ppx_deriving/metadata.xml
+++ b/dev-ml/ppx_deriving/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml-ppx/ppx_deriving</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml-ppx/ppx_deriving</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_driver/metadata.xml b/dev-ml/ppx_driver/metadata.xml
index c69342dd5815..f9b225ce4955 100644
--- a/dev-ml/ppx_driver/metadata.xml
+++ b/dev-ml/ppx_driver/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_driver</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_driver</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_enumerate/metadata.xml b/dev-ml/ppx_enumerate/metadata.xml
index 0691d2ad6671..26029f0bad79 100644
--- a/dev-ml/ppx_enumerate/metadata.xml
+++ b/dev-ml/ppx_enumerate/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_enumerate</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_enumerate</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_expect/metadata.xml b/dev-ml/ppx_expect/metadata.xml
index ec7beb371c4d..d0ea2a2f9272 100644
--- a/dev-ml/ppx_expect/metadata.xml
+++ b/dev-ml/ppx_expect/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_expect</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_expect</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild b/dev-ml/ppx_expect/ppx_expect-0.9.0-r1.ebuild
index 3ab20bb348ff..148c1674066c 100644
--- a/dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild
+++ b/dev-ml/ppx_expect/ppx_expect-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,7 +30,7 @@ DEPEND="
 	dev-ml/ppx_variants_conv:=
 	dev-ml/stdio:=
 	dev-ml/ocaml-migrate-parsetree:=
-	dev-ml/ocaml-re:=
+	dev-ml/re:=
 "
 RDEPEND="${DEPEND}"
 DEPEND="${DEPEND} dev-ml/jbuilder"
diff --git a/dev-ml/ppx_fail/metadata.xml b/dev-ml/ppx_fail/metadata.xml
index 35728b324db4..aeb3eb6e1272 100644
--- a/dev-ml/ppx_fail/metadata.xml
+++ b/dev-ml/ppx_fail/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_fail</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_fail</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_fields_conv/metadata.xml b/dev-ml/ppx_fields_conv/metadata.xml
index 06458282b1c0..ee82d7e7e00f 100644
--- a/dev-ml/ppx_fields_conv/metadata.xml
+++ b/dev-ml/ppx_fields_conv/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_fields_conv</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_fields_conv</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_fixed_literal/metadata.xml b/dev-ml/ppx_fixed_literal/metadata.xml
index 257ae7bfeade..1b3b5789eeda 100644
--- a/dev-ml/ppx_fixed_literal/metadata.xml
+++ b/dev-ml/ppx_fixed_literal/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_fixed_literal</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_fixed_literal</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_hash/metadata.xml b/dev-ml/ppx_hash/metadata.xml
index 45d95eaf5e0f..bde7f65dbaca 100644
--- a/dev-ml/ppx_hash/metadata.xml
+++ b/dev-ml/ppx_hash/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_hash</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_hash</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_here/metadata.xml b/dev-ml/ppx_here/metadata.xml
index 24b631f152ae..630574faa3c0 100644
--- a/dev-ml/ppx_here/metadata.xml
+++ b/dev-ml/ppx_here/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_here</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_here</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_inline_test/metadata.xml b/dev-ml/ppx_inline_test/metadata.xml
index b8d06ea426a3..ed1abf87ad62 100644
--- a/dev-ml/ppx_inline_test/metadata.xml
+++ b/dev-ml/ppx_inline_test/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_inline_test</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_inline_test</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_jane/metadata.xml b/dev-ml/ppx_jane/metadata.xml
index 1ad033b289c7..b811a5ad7d04 100644
--- a/dev-ml/ppx_jane/metadata.xml
+++ b/dev-ml/ppx_jane/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_jane</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_jane</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_js_style/metadata.xml b/dev-ml/ppx_js_style/metadata.xml
index 0d5d7a713ab7..6eb6c2a1e5ba 100644
--- a/dev-ml/ppx_js_style/metadata.xml
+++ b/dev-ml/ppx_js_style/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_js_style</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_js_style</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_let/metadata.xml b/dev-ml/ppx_let/metadata.xml
index 94e867485031..6e796456bba5 100644
--- a/dev-ml/ppx_let/metadata.xml
+++ b/dev-ml/ppx_let/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_let</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_let</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_metaquot/metadata.xml b/dev-ml/ppx_metaquot/metadata.xml
index dac500f6bc30..ad16d69851a3 100644
--- a/dev-ml/ppx_metaquot/metadata.xml
+++ b/dev-ml/ppx_metaquot/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_metaquot</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_metaquot</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_module_timer/metadata.xml b/dev-ml/ppx_module_timer/metadata.xml
index b993e4623ddc..aeb635939ac7 100644
--- a/dev-ml/ppx_module_timer/metadata.xml
+++ b/dev-ml/ppx_module_timer/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_module_timer</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_module_timer</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_optcomp/metadata.xml b/dev-ml/ppx_optcomp/metadata.xml
index 30b65cf1fd3a..6f9bdf874800 100644
--- a/dev-ml/ppx_optcomp/metadata.xml
+++ b/dev-ml/ppx_optcomp/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_optcomp</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_optcomp</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_optional/metadata.xml b/dev-ml/ppx_optional/metadata.xml
index 8a58c771030e..b259c0e91a4d 100644
--- a/dev-ml/ppx_optional/metadata.xml
+++ b/dev-ml/ppx_optional/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_optional</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_optional</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_pipebang/metadata.xml b/dev-ml/ppx_pipebang/metadata.xml
index 91b6ab049cba..a890d3b4e1ed 100644
--- a/dev-ml/ppx_pipebang/metadata.xml
+++ b/dev-ml/ppx_pipebang/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_pipebang</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_pipebang</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_sexp_conv/metadata.xml b/dev-ml/ppx_sexp_conv/metadata.xml
index 49e0dac594b0..b30d4195e528 100644
--- a/dev-ml/ppx_sexp_conv/metadata.xml
+++ b/dev-ml/ppx_sexp_conv/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_sexp_conv</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_sexp_conv</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_sexp_message/metadata.xml b/dev-ml/ppx_sexp_message/metadata.xml
index 2f418c1a3acf..2570615dc02a 100644
--- a/dev-ml/ppx_sexp_message/metadata.xml
+++ b/dev-ml/ppx_sexp_message/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_sexp_message</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_sexp_message</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_sexp_value/metadata.xml b/dev-ml/ppx_sexp_value/metadata.xml
index 8bfb2fda744c..635da1548203 100644
--- a/dev-ml/ppx_sexp_value/metadata.xml
+++ b/dev-ml/ppx_sexp_value/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_sexp_value</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_sexp_value</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_stable/metadata.xml b/dev-ml/ppx_stable/metadata.xml
index b92f10916eeb..2fe672201c17 100644
--- a/dev-ml/ppx_stable/metadata.xml
+++ b/dev-ml/ppx_stable/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_stable</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_stable</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_string/metadata.xml b/dev-ml/ppx_string/metadata.xml
index 1350c31c1a0c..d9778e886bb0 100644
--- a/dev-ml/ppx_string/metadata.xml
+++ b/dev-ml/ppx_string/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_string</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_string</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_tools/metadata.xml b/dev-ml/ppx_tools/metadata.xml
index 5631f770f367..82e72ba9c135 100644
--- a/dev-ml/ppx_tools/metadata.xml
+++ b/dev-ml/ppx_tools/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">alainfrisch/ppx_tools</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">alainfrisch/ppx_tools</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_tools_versioned/Manifest b/dev-ml/ppx_tools_versioned/Manifest
index 729534d88fa4..52cd59da8081 100644
--- a/dev-ml/ppx_tools_versioned/Manifest
+++ b/dev-ml/ppx_tools_versioned/Manifest
@@ -1 +1,2 @@
 DIST ppx_tools_versioned-5.0.1.tar.gz 43741 BLAKE2B 0ff7dc5a03265a7e9fea6bebe372cee993f35d2d2ec451d5f77a1c7de51f91526bf15817882ff93033b3fcd51014efa12841a92cedf243870a22790f00807e9e SHA512 4d47f82c5a05f880dbb3d10caac6de705b9609c488d62be84eb1ebe22fa8c4e3716fad7c546035e955bd0e304d7940f23df090470f86c8d862b549b9db387acb
+DIST ppx_tools_versioned-5.2.2.tar.gz 60068 BLAKE2B 0b965d2124852e8ea3c8f4187ef320a3054eab4f969bfd64f4bb647e1381cc6f571b74d5176a6da59003ada89982a63b605f45231fb0bbf4ebec7da959e76d1e SHA512 68c168ebc01af46fe8766ad7e36cc778caabb97d8eb303db284d106450cb79974c2a640ce459e197630b9e84b02caa24b59c97c9a8d39ddadc7efc7284e42a70
diff --git a/dev-ml/ppx_tools_versioned/metadata.xml b/dev-ml/ppx_tools_versioned/metadata.xml
index ddebaeb27d82..b16fdf833578 100644
--- a/dev-ml/ppx_tools_versioned/metadata.xml
+++ b/dev-ml/ppx_tools_versioned/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">let-def/ppx_tools_versioned</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">let-def/ppx_tools_versioned</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.2.2.ebuild b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.2.2.ebuild
new file mode 100644
index 000000000000..78043c28ed6d
--- /dev/null
+++ b/dev-ml/ppx_tools_versioned/ppx_tools_versioned-5.2.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit dune
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+DESCRIPTION="Tools for authors of ppx rewriters"
+HOMEPAGE="https://github.com/let-def/ppx_tools_versioned"
+SRC_URI="https://github.com/let-def/ppx_tools_versioned/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="+ocamlopt"
+
+DEPEND="
+	dev-lang/ocaml:=
+	<dev-ml/ocaml-migrate-parsetree-2.0.0:=
+"
+RDEPEND="${DEPEND}"
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-ml/ppx_traverse/metadata.xml b/dev-ml/ppx_traverse/metadata.xml
index 777735f041c6..8fe86012f06c 100644
--- a/dev-ml/ppx_traverse/metadata.xml
+++ b/dev-ml/ppx_traverse/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/ppx_traverse</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_traverse</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_traverse_builtins/metadata.xml b/dev-ml/ppx_traverse_builtins/metadata.xml
index 424c533ad3f3..8612cd0859ea 100644
--- a/dev-ml/ppx_traverse_builtins/metadata.xml
+++ b/dev-ml/ppx_traverse_builtins/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/ppx_traverse_builtins</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_traverse_builtins</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_type_conv/metadata.xml b/dev-ml/ppx_type_conv/metadata.xml
index 75fe4910a683..453ea005d096 100644
--- a/dev-ml/ppx_type_conv/metadata.xml
+++ b/dev-ml/ppx_type_conv/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/ppx_type_conv</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_type_conv</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_typerep_conv/metadata.xml b/dev-ml/ppx_typerep_conv/metadata.xml
index 72fb97feee61..aa042f5bf103 100644
--- a/dev-ml/ppx_typerep_conv/metadata.xml
+++ b/dev-ml/ppx_typerep_conv/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_typerep_conv</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_typerep_conv</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppx_variants_conv/metadata.xml b/dev-ml/ppx_variants_conv/metadata.xml
index c250bb0849f9..a51e1cbb1480 100644
--- a/dev-ml/ppx_variants_conv/metadata.xml
+++ b/dev-ml/ppx_variants_conv/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/ppx_variants_conv</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/ppx_variants_conv</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppxfind/metadata.xml b/dev-ml/ppxfind/metadata.xml
index a5ded19769e9..da0fdad05ad0 100644
--- a/dev-ml/ppxfind/metadata.xml
+++ b/dev-ml/ppxfind/metadata.xml
@@ -1,15 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">diml/ppxfind</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">diml/ppxfind</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/ppxlib/metadata.xml b/dev-ml/ppxlib/metadata.xml
index 196ba5d9bcbf..04fb3e0e2c3e 100644
--- a/dev-ml/ppxlib/metadata.xml
+++ b/dev-ml/ppxlib/metadata.xml
@@ -1,15 +1,16 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml-ppx/ppxlib</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml-ppx/ppxlib</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/protocol_version_header/metadata.xml b/dev-ml/protocol_version_header/metadata.xml
index 90d70ef938a9..f4aeee7a01a4 100644
--- a/dev-ml/protocol_version_header/metadata.xml
+++ b/dev-ml/protocol_version_header/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>ML</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">janestreet/protocol_version_header</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/protocol_version_header</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/qcheck/metadata.xml b/dev-ml/qcheck/metadata.xml
index 11fddec26cee..421bcd6df73c 100644
--- a/dev-ml/qcheck/metadata.xml
+++ b/dev-ml/qcheck/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="github">c-cube/qcheck</remote-id>
-  </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">c-cube/qcheck</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/re/Manifest b/dev-ml/re/Manifest
index dff48b3bc245..073c0470c364 100644
--- a/dev-ml/re/Manifest
+++ b/dev-ml/re/Manifest
@@ -1 +1,2 @@
 DIST ocaml-re-1.9.0.tar.gz 83642 BLAKE2B abcabb80ffef241fc7e8ea075f49365cc64f8749db1d1f7eb654eeb52f5be8e96756f98ae7903391a26d8537f82e105878a38a15923d7f93c61abd5c08d3ff98 SHA512 3e11c6eccf573ab5d7f43accf1f1ac9eda0d7320067e142b9f76b309315c1e30d22c5bb80c7a54b05d9c92d3518d26ea82b5093de9b48f86e3c62d6073f14eda
+DIST re-1.7.1.tar.gz 132948 BLAKE2B 79a3114cb6221742e7e26187080a7029c8e17f728066ce4f4420c0b69be6377bb651f143a97f55f7976074ce9e48913489a51c586f9c79ed6adbcb6c9a595924 SHA512 0df5b0db4c8ab7017576516adbd8edf2e7774afbdca63383cbdb0f2f2b023efb7215366a6679c8810f3b70d542e0181e6b6d4a212b30531cb5d0bef0a6033747
diff --git a/dev-ml/re/metadata.xml b/dev-ml/re/metadata.xml
index e4f5c058dcb3..20c494c3bc47 100644
--- a/dev-ml/re/metadata.xml
+++ b/dev-ml/re/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ocaml/ocaml-re</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/ocaml-re</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/re/re-1.7.1.ebuild b/dev-ml/re/re-1.7.1.ebuild
new file mode 100644
index 000000000000..2900f6f2fc5a
--- /dev/null
+++ b/dev-ml/re/re-1.7.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit oasis
+
+DESCRIPTION="Regular expression library for OCaml"
+HOMEPAGE="https://github.com/ocaml/ocaml-re"
+SRC_URI="https://github.com/ocaml/ocaml-re/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!dev-ml/ocaml-re"
+DEPEND="${RDEPEND}
+	test? ( dev-ml/ounit )"
+DOCS=( "CHANGES" "TODO.txt" "README.md" )
+
+S="${WORKDIR}"/ocaml-${P}
diff --git a/dev-ml/re2/metadata.xml b/dev-ml/re2/metadata.xml
index ea7b1788aeb6..420d623bce41 100644
--- a/dev-ml/re2/metadata.xml
+++ b/dev-ml/re2/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">janestreet/re2</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">janestreet/re2</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/react/metadata.xml b/dev-ml/react/metadata.xml
index 39df5e2337a3..8e3eed18f5c7 100644
--- a/dev-ml/react/metadata.xml
+++ b/dev-ml/react/metadata.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
+ <longdescription lang="en">
 		React is an OCaml module for functional reactive programming (FRP). It
 		provides support to program with time varying values : applicative
 		events and signals. React doesn't define any primitive event or
@@ -14,7 +13,8 @@
 		Given an absolute notion of time Rtime helps you to manage a timeline
 		and provides time stamp events, delayed events and delayed signals.
 	</longdescription>
-	<upstream>
-		<remote-id type="github">dbuenzli/react</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">dbuenzli/react</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/reactiveData/metadata.xml b/dev-ml/reactiveData/metadata.xml
index 4aa903da617b..cda3d3a4a862 100644
--- a/dev-ml/reactiveData/metadata.xml
+++ b/dev-ml/reactiveData/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ocsigen/reactiveData</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ocsigen/reactiveData</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/reactiveData/reactiveData-0.2.1.ebuild b/dev-ml/reactiveData/reactiveData-0.2.1.ebuild
index a74fc715fcf0..5cbd4d885110 100644
--- a/dev-ml/reactiveData/reactiveData-0.2.1.ebuild
+++ b/dev-ml/reactiveData/reactiveData-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/ocsigen/reactiveData"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ocsigen/reactiveData/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/dev-ml/reactiveData/reactiveData-9999.ebuild b/dev-ml/reactiveData/reactiveData-9999.ebuild
index a74fc715fcf0..5cbd4d885110 100644
--- a/dev-ml/reactiveData/reactiveData-9999.ebuild
+++ b/dev-ml/reactiveData/reactiveData-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -12,7 +12,6 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://github.com/ocsigen/reactiveData"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ocsigen/reactiveData/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64"
diff --git a/dev-ml/result/metadata.xml b/dev-ml/result/metadata.xml
index ffa2962f92c9..5ccd55abfe76 100644
--- a/dev-ml/result/metadata.xml
+++ b/dev-ml/result/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/result</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/result</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/rresult/metadata.xml b/dev-ml/rresult/metadata.xml
index 92df0b694db5..73e8e051fb5d 100644
--- a/dev-ml/rresult/metadata.xml
+++ b/dev-ml/rresult/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">dbuenzli/rresult</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">dbuenzli/rresult</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/seq/metadata.xml b/dev-ml/seq/metadata.xml
index e24f3283a006..12fbb287f682 100644
--- a/dev-ml/seq/metadata.xml
+++ b/dev-ml/seq/metadata.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/sexplib/metadata.xml b/dev-ml/sexplib/metadata.xml
index 33a396fe6e79..bbc9b3c034c6 100644
--- a/dev-ml/sexplib/metadata.xml
+++ b/dev-ml/sexplib/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
-		<remote-id type="github">janestreet/sexplib</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+  <remote-id type="github">janestreet/sexplib</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/sexplib/sexplib-0.14.0.ebuild b/dev-ml/sexplib/sexplib-0.14.0.ebuild
index 66434610d364..dca6c6506a5d 100644
--- a/dev-ml/sexplib/sexplib-0.14.0.ebuild
+++ b/dev-ml/sexplib/sexplib-0.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/sexplib0/metadata.xml b/dev-ml/sexplib0/metadata.xml
index e579604e5a49..65419465574f 100644
--- a/dev-ml/sexplib0/metadata.xml
+++ b/dev-ml/sexplib0/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/sexplib0</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/sexplib0</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/spawn/metadata.xml b/dev-ml/spawn/metadata.xml
index 4d2739a06438..d353c293b4c9 100644
--- a/dev-ml/spawn/metadata.xml
+++ b/dev-ml/spawn/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/spawn</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/spawn</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/spawn/spawn-0.13.0.ebuild b/dev-ml/spawn/spawn-0.13.0.ebuild
index da93bdabc7e7..10b8e8af3e53 100644
--- a/dev-ml/spawn/spawn-0.13.0.ebuild
+++ b/dev-ml/spawn/spawn-0.13.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="ocamlopt test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-ml/splittable_random/metadata.xml b/dev-ml/splittable_random/metadata.xml
index ca905a069955..ba6e3fc20cd5 100644
--- a/dev-ml/splittable_random/metadata.xml
+++ b/dev-ml/splittable_random/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/splittable_random</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/splittable_random</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/stdio/metadata.xml b/dev-ml/stdio/metadata.xml
index 07fb8f069c5a..f8e7a0bae1c2 100644
--- a/dev-ml/stdio/metadata.xml
+++ b/dev-ml/stdio/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/stdio</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/stdio</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/stdlib-shims/metadata.xml b/dev-ml/stdlib-shims/metadata.xml
index bf7379a1dd2b..625bdc483920 100644
--- a/dev-ml/stdlib-shims/metadata.xml
+++ b/dev-ml/stdlib-shims/metadata.xml
@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <longdescription>
+ <maintainer type="person">
+  <email>rkitover@gmail.com</email>
+  <name>Rafael Kitover</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
     Compatibility library for OCaml compilers before 4.08 to allow calling
     Pervasives module functions on Stdlib, which is the API in newer compilers.
     Does not add newer Stdlib functions.
   </longdescription>
-  <maintainer type="person">
-    <email>rkitover@gmail.com</email>
-    <name>Rafael Kitover</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">ocaml/stdlib-shims</remote-id>
-  </upstream>
-  <use>
-    <flag name="ocamlopt">
+ <upstream>
+  <remote-id type="github">ocaml/stdlib-shims</remote-id>
+ </upstream>
+ <use>
+  <flag name="ocamlopt">
       Whether the OCaml native code compiler is used. Must be set globally and
       match dev-lang/ocaml.
     </flag>
-  </use>
-</pkgmetadata>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/stringext/metadata.xml b/dev-ml/stringext/metadata.xml
index 546e97319333..bbaa5a93532e 100644
--- a/dev-ml/stringext/metadata.xml
+++ b/dev-ml/stringext/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-   <!-- maintainer-needed -->
-   <upstream>
-        <remote-id type="github">rgrinberg/stringext</remote-id>
-    </upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">rgrinberg/stringext</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/textutils/metadata.xml b/dev-ml/textutils/metadata.xml
index 259c45b83ced..5b15eba5d280 100644
--- a/dev-ml/textutils/metadata.xml
+++ b/dev-ml/textutils/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>ml@gentoo.org</email>
-    <name>ML</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">janestreet/textutils</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/textutils</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/textutils/textutils-0.14.0.ebuild b/dev-ml/textutils/textutils-0.14.0.ebuild
index 13a9a52644a8..d3d973ca4fc0 100644
--- a/dev-ml/textutils/textutils-0.14.0.ebuild
+++ b/dev-ml/textutils/textutils-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/time_now/metadata.xml b/dev-ml/time_now/metadata.xml
index b78a86fdab86..769c4cddb263 100644
--- a/dev-ml/time_now/metadata.xml
+++ b/dev-ml/time_now/metadata.xml
@@ -1,11 +1,12 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/time_now</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/time_now</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/timezone/metadata.xml b/dev-ml/timezone/metadata.xml
index 58b29d804a67..859c123ad750 100644
--- a/dev-ml/timezone/metadata.xml
+++ b/dev-ml/timezone/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/timezone</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/timezone</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/timezone/timezone-0.14.0.ebuild b/dev-ml/timezone/timezone-0.14.0.ebuild
index 129799fb79e8..d6760a453763 100644
--- a/dev-ml/timezone/timezone-0.14.0.ebuild
+++ b/dev-ml/timezone/timezone-0.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="ocamlopt"
 
 RDEPEND="
diff --git a/dev-ml/topkg/metadata.xml b/dev-ml/topkg/metadata.xml
index 5b0819cca142..5f7207b61db2 100644
--- a/dev-ml/topkg/metadata.xml
+++ b/dev-ml/topkg/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">dbuenzli/topkg</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">dbuenzli/topkg</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/type-conv/metadata.xml b/dev-ml/type-conv/metadata.xml
index 1b2becffa26c..83d00b14c8d4 100644
--- a/dev-ml/type-conv/metadata.xml
+++ b/dev-ml/type-conv/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/typerep/metadata.xml b/dev-ml/typerep/metadata.xml
index d4bd94e13be7..06aa098b385b 100644
--- a/dev-ml/typerep/metadata.xml
+++ b/dev-ml/typerep/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">janestreet/typerep</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">janestreet/typerep</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/tyxml/Manifest b/dev-ml/tyxml/Manifest
index cb4234034574..3255e446b984 100644
--- a/dev-ml/tyxml/Manifest
+++ b/dev-ml/tyxml/Manifest
@@ -1 +1 @@
-DIST tyxml-4.1.0.tar.gz 179852 BLAKE2B d143c1291cedfb345f0773284891e17bbeb8d46eb5fa5c74df3e9ffd24adca35a8afddd60958ff3c7580bb3984c1ae2a4b077073346326c5d20a975dd42cba66 SHA512 add2b82939ea069ee74ee26ff3ee1f3ad2e361e593134da807e1acfbebff4ed546cbc23aca7ee2936a1eb8a736916d673aa2c96aeae8779706cd726bc2d07ead
+DIST tyxml-4.2.0.tar.gz 182255 BLAKE2B 04ec57372bb4b63eb66b21c8d8771290cf9d7d9a344d8354414c5512d112852c2f2af9e5dbda74e6c990c64a498545ad6ad7f4f94190523b7b9029809b0f41c8 SHA512 555df1fdf5eb30592a3bd93b7d08345964b1cd6e16c2f746ef777cb3c5fc9a31dddf316432e0457d317eaf7728c5d1156982956169a7b1eb9b660eedcf89ca58
diff --git a/dev-ml/tyxml/metadata.xml b/dev-ml/tyxml/metadata.xml
index 370ac65bc455..751c87857186 100644
--- a/dev-ml/tyxml/metadata.xml
+++ b/dev-ml/tyxml/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ocsigen/tyxml</remote-id>
-	</upstream>
-	<use>
-		<flag name="camlp4">Enables the camlp4 syntax extension (deprecated)</flag>
-		<flag name="ppx">Enables the ppx syntax extension (preferred)</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocsigen/tyxml</remote-id>
+ </upstream>
+ <use>
+  <flag name="camlp4">Enables the camlp4 syntax extension (deprecated)</flag>
+  <flag name="ppx">Enables the ppx syntax extension (preferred)</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/tyxml/tyxml-4.1.0.ebuild b/dev-ml/tyxml/tyxml-4.2.0.ebuild
index 396e5c943d53..dfda613ce476 100644
--- a/dev-ml/tyxml/tyxml-4.1.0.ebuild
+++ b/dev-ml/tyxml/tyxml-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,8 +21,11 @@ IUSE="+ppx +camlp4"
 DEPEND="
 	>=dev-ml/uutf-1.0:=
 	dev-ml/uchar:=
-	dev-ml/ocaml-re:=
-	ppx? ( >=dev-ml/ppx_tools-5:= dev-ml/markup:= )
+	dev-ml/re:=
+	ppx? (
+		>=dev-ml/ppx_tools_versioned-5.2.2:=
+		dev-ml/markup:=
+	)
 	camlp4? ( dev-ml/camlp4:= )"
 RDEPEND="${DEPEND}"
 
diff --git a/dev-ml/uchar/metadata.xml b/dev-ml/uchar/metadata.xml
index 4cae75b9a5d6..5ee2dd3f4a47 100644
--- a/dev-ml/uchar/metadata.xml
+++ b/dev-ml/uchar/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">ocaml/uchar</remote-id>
-	</upstream>
-</pkgmetadata>
+ <upstream>
+  <remote-id type="github">ocaml/uchar</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/uchar/uchar-0.0.2.ebuild b/dev-ml/uchar/uchar-0.0.2.ebuild
index a99e3720f69b..40c14e4bcc24 100644
--- a/dev-ml/uchar/uchar-0.0.2.ebuild
+++ b/dev-ml/uchar/uchar-0.0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/uchar/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="+ocamlopt"
 
 RDEPEND=">=dev-lang/ocaml-4.03:="
diff --git a/dev-ml/unidecode/metadata.xml b/dev-ml/unidecode/metadata.xml
index 9e612d997389..dd599976d7a8 100644
--- a/dev-ml/unidecode/metadata.xml
+++ b/dev-ml/unidecode/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">geneweb/unidecode</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">geneweb/unidecode</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/uucp/metadata.xml b/dev-ml/uucp/metadata.xml
index 26a42e76def9..b26dc580a7ad 100644
--- a/dev-ml/uucp/metadata.xml
+++ b/dev-ml/uucp/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">dbuenzli/uucp</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">dbuenzli/uucp</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/uuidm/metadata.xml b/dev-ml/uuidm/metadata.xml
index 01e057cc5972..ff76642172d0 100644
--- a/dev-ml/uuidm/metadata.xml
+++ b/dev-ml/uuidm/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">dbuenzli/uuidm</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">dbuenzli/uuidm</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/uuidm/uuidm-0.9.7.ebuild b/dev-ml/uuidm/uuidm-0.9.7.ebuild
index 426070a07538..b13893c3d737 100644
--- a/dev-ml/uuidm/uuidm-0.9.7.ebuild
+++ b/dev-ml/uuidm/uuidm-0.9.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dbuenzli/uuidm/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="+ocamlopt"
 
 BDEPEND="
diff --git a/dev-ml/uunf/metadata.xml b/dev-ml/uunf/metadata.xml
index 206743db91c8..cbcc0f91d7d9 100644
--- a/dev-ml/uunf/metadata.xml
+++ b/dev-ml/uunf/metadata.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">dbuenzli/uunf</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">dbuenzli/uunf</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/uutf/metadata.xml b/dev-ml/uutf/metadata.xml
index 4aefe5b72ed8..5f2e42e8ff76 100644
--- a/dev-ml/uutf/metadata.xml
+++ b/dev-ml/uutf/metadata.xml
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<use>
-		<flag name="utftrip">Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.</flag>
-	</use>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ 
+ <use>
+  <flag name="utftrip">Builds and install the utftrip executable: Among other things, reads unicode on stdin and rewrites it on stdout.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/uutf/uutf-1.0.1.ebuild b/dev-ml/uutf/uutf-1.0.1.ebuild
index e49c23332aef..d0109dc8f6ea 100644
--- a/dev-ml/uutf/uutf-1.0.1.ebuild
+++ b/dev-ml/uutf/uutf-1.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://erratique.ch/software/uutf/releases/${P}.tbz"
 
 LICENSE="ISC"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86"
 IUSE="doc utftrip +ocamlopt test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="utftrip? ( ocamlopt )"
diff --git a/dev-ml/variantslib/metadata.xml b/dev-ml/variantslib/metadata.xml
index fa46caee57a0..98d5553efd68 100644
--- a/dev-ml/variantslib/metadata.xml
+++ b/dev-ml/variantslib/metadata.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gienah@gentoo.org</email>
-		<name>Mark Wright</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
-		<remote-id type="github">janestreet/variantslib</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>gienah@gentoo.org</email>
+  <name>Mark Wright</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="bitbucket">yminsky/ocaml-core</remote-id>
+  <remote-id type="github">janestreet/variantslib</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/xml-light/metadata.xml b/dev-ml/xml-light/metadata.xml
index 6f49eba8f496..83d00b14c8d4 100644
--- a/dev-ml/xml-light/metadata.xml
+++ b/dev-ml/xml-light/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
+ 
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/yojson/metadata.xml b/dev-ml/yojson/metadata.xml
index a6f01f34da1b..4534ee34a1a2 100644
--- a/dev-ml/yojson/metadata.xml
+++ b/dev-ml/yojson/metadata.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <name>François-Xavier Carton</name>
-    <email>fx.carton91@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">mjambon/yojson</remote-id>
-  </upstream>
-</pkgmetadata>
+ <maintainer type="person">
+  <email>fx.carton91@gmail.com</email>
+  <name>François-Xavier Carton</name>
+ </maintainer>
+ <maintainer type="project">
+  <email>proxy-maint@gentoo.org</email>
+  <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">mjambon/yojson</remote-id>
+ </upstream>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml
index 98fa0a2215bc..d6a6c2c12bdd 100644
--- a/dev-ml/zarith/metadata.xml
+++ b/dev-ml/zarith/metadata.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>ML</name>
-	</maintainer>
-	<use>
-		<flag name="mpir">Use MPIR library instead of GMP.</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">ocaml/Zarith</remote-id>
-	</upstream>
-</pkgmetadata>
+ <maintainer type="project">
+  <email>ml@gentoo.org</email>
+  <name>ML</name>
+ </maintainer>
+ <upstream>
+  <remote-id type="github">ocaml/Zarith</remote-id>
+ </upstream>
+ <use>
+  <flag name="mpir">Use MPIR library instead of GMP.</flag>
+ </use>
+ <origin>gentoo-staging</origin>
+</pkgmetadata>
+\ No newline at end of file
diff --git a/dev-ml/zarith/zarith-1.11.ebuild b/dev-ml/zarith/zarith-1.11.ebuild
index 038a15cc6fd7..b6074eeede19 100644
--- a/dev-ml/zarith/zarith-1.11.ebuild
+++ b/dev-ml/zarith/zarith-1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ocaml/Zarith/archive/release-${PV}.tar.gz -> ${P}.ta
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc x86"
 IUSE="doc mpir +ocamlopt"
 RESTRICT="!ocamlopt? ( test )"
author	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-03-01 00:37:58 +0000
committer	Liguros - Gitlab CI/CD [master] <gitlab@liguros.net>	2021-03-01 00:37:58 +0000
commit	8ddb1a3d1229412a438971f82d37d518a0223726 (patch)
tree	83438b5ddb9d23a390f1a3fc505303d3d2223bf2 /dev-ml
parent	9acab46e1a820daece7b2e631485c157ce2210ad (diff)
download	baldeagleos-repo-21.1.5.tar.gz baldeagleos-repo-21.1.5.tar.xz baldeagleos-repo-21.1.5.zip