4 files changed, 36 insertions, 13 deletions
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?]