gentoo resync : 03.03.2021

4 files changed, 29 insertions, 6 deletions

diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index f5f9bc12a043..9d248f9b1b91 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -3,7 +3,8 @@ AUX ocamlgraph-1.8.7-test.patch 594 BLAKE2B 7a04f1357f82ab23820d7013ead56918b954
 DIST ocamlgraph-1.8.7.tar.gz 272625 BLAKE2B 18df3f78cfe66e2259c770cfc3671096b06a185e3f407b22eb0a21ff6e7f7df4b0b705a830d740c64f66609b88e2fb76aa91e200ca4c0fadc7ae2a1910641f3d SHA512 27559293bf576ecc9cf49090e24905c50d00ebaeb444a3c917826f3cfe1e7ceab34b43e30f98634811b1688b675d8747b590b5bb103a720d099304f5031feb2e
 DIST ocamlgraph-1.8.8.tar.gz 282729 BLAKE2B 79fdbcdd86fc5b6f36ad3399c890c31831a20fec22f0b4faf6da1fb61a12d25a54587e4b3ed8f9266ad1ce37bfffe76d66cf7a7e765e8046429943ad3c555208 SHA512 ccb07d4a7fb0c3026ad2d4563e1ca0a88483ac3cf43c9378989ae5c031961853a11c9673c06b54a16733c5755d9c0a2783c5f475afdcc7692d2bf3d4778f5bc5
 DIST ocamlgraph-2.0.0.tbz 298912 BLAKE2B a4bb04c74f4dba8b0f37cdf8ab9a82ef5120b1e7f5b5570e67aac35de16e4553c93759acfa5c218e07dc7c036750d92d2c557c7d58247783718f691c5319ded8 SHA512 c4973ac03bdff52d1c8a1ed01c81e0fbe2f76486995e57ff4e4a11bcc7b1793556139d52a81ff14ee8c8de52f1b40e4bd359e60a2ae626cc630ebe8bccefb3f1
-EBUILD ocamlgraph-1.8.7-r1.ebuild 1363 BLAKE2B 28025fea671e7b843a545e8fb1948c8aa60034f63a5d95f9974e06d5b9653dd74c181b6b5b1f2d40de30db795664b45a7db5d478d2e5ac499bed98bbaa478b3d SHA512 492aac98e26845283b78971c72ab68b81118db3997cfb2ed1764005b72f2c553f995af1142149277ec145fde1b6eda0504fdf57eed74c7c5277e767cf1ace9f5
+EBUILD ocamlgraph-1.8.7-r1.ebuild 1363 BLAKE2B 2350a00277e23466213d134190d69bbf85fcc9cd5c274af447cf939dfe3a99412cfcc828913a8354cdb37854e8fe0278dd1de965f51f5bc1f560fdbdc4daaadf SHA512 2edba0df4e85c60a4de4a92560b6a49fb5f29eca1259748b4cdf43dd4d98416458d6a5948358d30e22cf981eb06931da8490de085a736912e079e7d5fc05e199
 EBUILD ocamlgraph-1.8.8-r1.ebuild 1249 BLAKE2B 27ba4d13ba15c443dc8b3bc45223ae667c13ab224ea7195b120eac877b39083f5ffde60b31162c682ef65f92c2441d77eacc15629abbe69660074c521afe198b SHA512 445b06c8333436f9622df96a9e8acd71f6f04603e75d45a18895c0a7f000d59f76ace9743bfe91b6b48ac5a9b48e10786c51819c140c44dac0a0fbe58a9baff6
-EBUILD ocamlgraph-2.0.0.ebuild 658 BLAKE2B 2963148d639e28b2309813c50f6ca2fab6de4fe92d85452348b98f48bf2df5a362a7f505a05c31ccae1d314739780a0c6d53687b3e0cc8b3322d0de8d1b90032 SHA512 31b7a54146df2e2b32383b801cec9f38992e0ba31e53a6b78e85b8a162d282d2192035e3c39e7a37133e91db98cad805e2ddf4478519fd618a8e5c1364f99b13
+EBUILD ocamlgraph-2.0.0-r1.ebuild 560 BLAKE2B ed03789e3c3a297be8ee1d11c4be2bdca11ad5eeb17ee3854a5fdd59587cffaafdb1382c3d8e80a498c23ed261be0bc393dbbd37fcfba37b3bfded49ba4bfb13 SHA512 dc59baa9d7e1a6cf1e091c3cbc96e6849404c9f974c675587905624d62ba335c36cac8fd4d483118d6eed2113d2c1f72cf5d45399360c17315ab80325a6c2f6c
+EBUILD ocamlgraph-2.0.0.ebuild 675 BLAKE2B 6aa8a6360e6e3c043f7dd2defbe7f0d94d4c72c94b99e46f14fcb8f58fbbe22a5d692b3509858633071203bf73b5c01900430b01e40e97ef34981f1b6a5ddd94 SHA512 fda6a086d5c1941787df29ecaa82e702f6e424ebe0607ab10344b60416212308923f48c75fe5d785740177852f58d2c9bb8b018e4d894994ed69526b6466ccb0
 MISC metadata.xml 320 BLAKE2B 6e9b68d7730eeb473f9f54e46d3c141e034114b9a87c13c2a7d43372780a5858f3aa129e032cd1d4066df00ec2a7650b2b1ae01d06c7a499ab634d4523751ced SHA512 e901769566dcc8840cbe098cd907d479eac133a458a52becbf53146856d3808c206484ec8e5a7dd60f4471434b1126b098baa8546c7bfaa650888d61fb8c7479
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild
index 41454fc22085..1ae4977a6ef7 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="http://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..6001ee9fb27f
--- /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="http://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 1c843c42933b..6fca1bfe3b02 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="http://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?]