gentoo resync : 20.03.2021

6 files changed, 12 insertions, 160 deletions

diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index 6f14b2db8001..606bf93eb216 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -1,10 +1,5 @@
-AUX ocamlgraph-1.8.6-installfindlib.patch 1383 BLAKE2B dcdfa9cfde71eb22e057950414d68a7873f8b9f7d88e84b4c11293379aa8276e8b4083a24cec192ee4f57ca460caa54e239c943b155331252dd0f2a25f53568c SHA512 a46ef5504a79dc33e25db45832411cb65dc1ca6b41fd572276595f29bc983a96f31b3efe969e82534c4cdbf98e37184d145e38cb9d43d5709c5b233af689ced4
-AUX ocamlgraph-1.8.7-test.patch 594 BLAKE2B 7a04f1357f82ab23820d7013ead56918b9548853dec086f5dabd45c81e035762d2d792797e83f9213a13ae37c5a27618577226373c31ae974cd4e3d506f788e5 SHA512 795a28d8b9702ed8e55d4b001285320c179de77de4edcc260212536cea4bb1bf36c58158ff7975e9a9befc075f03a1a64e069bc2a74a2b7770913a19c52d0652
-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 2350a00277e23466213d134190d69bbf85fcc9cd5c274af447cf939dfe3a99412cfcc828913a8354cdb37854e8fe0278dd1de965f51f5bc1f560fdbdc4daaadf SHA512 2edba0df4e85c60a4de4a92560b6a49fb5f29eca1259748b4cdf43dd4d98416458d6a5948358d30e22cf981eb06931da8490de085a736912e079e7d5fc05e199
-EBUILD ocamlgraph-1.8.8-r1.ebuild 1249 BLAKE2B 27ba4d13ba15c443dc8b3bc45223ae667c13ab224ea7195b120eac877b39083f5ffde60b31162c682ef65f92c2441d77eacc15629abbe69660074c521afe198b SHA512 445b06c8333436f9622df96a9e8acd71f6f04603e75d45a18895c0a7f000d59f76ace9743bfe91b6b48ac5a9b48e10786c51819c140c44dac0a0fbe58a9baff6
+EBUILD ocamlgraph-1.8.8-r2.ebuild 1261 BLAKE2B 5cbe7c4686a5f23fc3e6eb931dd2dd6bd0b0634088dadd6073e158ad365c0562acf01b2a7894936022e9b374a2457ff846349189f02a220725d5a82484fc6893 SHA512 df648c6d9b4b9ff3ec910b6a8d4dfd3def5b45985b6b8daebdbc7d4fbddb52d0c6a46592b16b08f704b8c46e9b95cb2be28e7cc2c9d71965263bb274b34726f0
 EBUILD ocamlgraph-2.0.0-r1.ebuild 556 BLAKE2B 84cfcdd68931055500fe5f9641795f554434a69498a62a1cc9a114014acf61acff2a20c0e8f075596bbd0cd59429808337bf9d3ac7710ccf312339cdc46e1dcf SHA512 408d1e86c48733520e65b946475498afbea91c0802bb144c4ab744b3526c14e4f338353ba579ca99422610fb7c08f74dcb5c04b0dcf0a50a570e7687dcc97e4d
-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/files/ocamlgraph-1.8.6-installfindlib.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch
deleted file mode 100644
index cb980b6f19dc..000000000000
--- a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: ocamlgraph-1.8.6/Makefile.in
-===================================================================
---- ocamlgraph-1.8.6.orig/Makefile.in
-+++ ocamlgraph-1.8.6/Makefile.in
-@@ -421,21 +421,25 @@ ifdef DESTDIR
- OCAMLFINDDEST := -destdir $(DESTDIR)
- endif
- 
-+ifneq ($(WANT_OCAMLOPT),no)
-+INSTALL_OPT=graph$(LIBEXT) graph.cmx $(CMXA)
-+INSTALL_GTK_OPT=$(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) graph$(OBJEXT)
-+endif
-+
- install-findlib: META
- ifdef OCAMLFIND
--ifeq (@LABLGNOMECANVAS@,yes)
-+ifeq ($(WANT_GTK),yes)
- 	$(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
- 		$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
--		graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \
--		$(CMA) $(CMXA) \
--		$(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
--                $(VIEWER_CMXLIB:.cmx=.o) \
--                $(DGRAPH_CMXLIB) $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) \
--                $(DGRAPH_CMXLIB:.cmx=.o)
-+		$(INSTALL_OPT) graph.cmo graph.cmi \
-+		$(CMA) \
-+		$(INSTALL_GTK_OPT) \
-+		$(VIEWER_CMOLIB) $(VIEWER_CMILIB) \
-+                $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB)
- else
- 	$(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \
- 		$(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \
--		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
-+		$(INSTALL_OPT) graph.cmo graph.cmi $(CMA)
- endif
- endif
- 
diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch
deleted file mode 100644
index f0d370cfd94a..000000000000
--- a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 726e8d6e31224eb70f75655579da9a374e910b98
-Author: Jean-Christophe Filliatre <Jean-Christophe.Filliatre@lri.fr>
-Date:   Mon Feb 13 08:41:58 2017 +0100
-
-    fixed 'make check'
-
-diff --git a/Makefile.in b/Makefile.in
-index 58b9e9c..9ce40df 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -360,7 +360,7 @@ bin/testunix.opt: $(CMXA) myTest/testunix.ml
- 	$(OCAMLOPT) -unsafe -inline 100 -o $@ unix.cmxa $^
- 
- check: $(CMA) tests/check.ml bin/test-ts
--	ocaml $(CMA) tests/test_clique.ml tests/check.ml
-+	ocaml -I . $(CMA) tests/test_clique.ml tests/check.ml
- 	bin/test-ts 10
- 
- # Additional rules
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild
deleted file mode 100644
index 1ae4977a6ef7..000000000000
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils findlib
-
-DESCRIPTION="O'Caml Graph library"
-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-4.06:=[ocamlopt?]
-	gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? ( dev-tex/hevea dev-ml/ocamlweb )"
-IUSE="doc examples gtk +ocamlopt"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.8.6-installfindlib.patch"
-	epatch "${FILESDIR}/${P}-test.patch"
-}
-
-src_compile() {
-	emake byte
-	use ocamlopt && emake opt
-
-	if use doc;	then
-		emake doc
-	fi
-
-	if use gtk; then
-		emake OCAMLBEST=$(usex ocamlopt opt byte) viewer dgraph editor
-	fi
-}
-
-src_install() {
-	findlib_src_preinst
-	use ocamlopt || export WANT_OCAMLOPT=no
-	use gtk && export WANT_GTK=yes
-	emake install-findlib
-
-	if use gtk ; then
-		local ext=byte
-		use ocamlopt && ext=opt
-		newbin dgraph/dgraph.${ext} ${PN}-dgraph
-		newbin editor/editor.${ext} ${PN}-editor
-		newbin view_graph/viewgraph.${ext} ${PN}-viewgraph
-	fi
-
-	dodoc README.adoc CREDITS FAQ CHANGES
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	if use doc; then
-		docinto html
-		dodoc doc/*
-	fi
-}
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild
index e76a4464ef6c..a395027a55ff 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild
@@ -1,27 +1,31 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit findlib
 
 DESCRIPTION="O'Caml Graph library"
 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 ppc64 x86"
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?]
-	gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )"
-DEPEND="${RDEPEND}
-	doc? ( dev-tex/hevea dev-ml/ocamlweb )"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="doc examples gtk +ocamlopt"
 
+RDEPEND="
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+	gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( dev-tex/hevea dev-ml/ocamlweb )"
+
 src_compile() {
 	emake byte
 	use ocamlopt && emake opt
 
-	if use doc;	then
+	if use doc; then
 		emake doc
 	fi
 
diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild
deleted file mode 100644
index 6fca1bfe3b02..000000000000
--- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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="
-	gtk? ( dev-ml/lablgtk:2=[ocamlopt?,gnomecanvas] )
-	dev-ml/stdlib-shims:=[ocamlopt?]
-	dev-ml/graphics:=[ocamlopt?]"
-DEPEND="${RDEPEND}"
-IUSE="gtk +ocamlopt"
-
-src_compile() {
-	if ! use gtk; then
-		dune build --only-packages ocamlgraph @install || die
-	else
-		dune build @install || die
-	fi
-}