2021-04-21 02:20:12 UTC

14 files changed, 44 insertions, 57 deletions

diff --git a/metadata/md5-cache/dev-ml/camlidl-1.05-r1 b/metadata/md5-cache/dev-ml/camlidl-1.05-r1
index 5c2cb2894409..87f132d7ed39 100644
--- a/metadata/md5-cache/dev-ml/camlidl-1.05-r1
+++ b/metadata/md5-cache/dev-ml/camlidl-1.05-r1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install prepare test
+DEFINED_PHASES=compile install test
 DEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt]
 DESCRIPTION=CamlIDL is a stub code generator for using C/C++ libraries from O'Caml
-EAPI=5
+EAPI=7
 HOMEPAGE=http://caml.inria.fr/camlidl/
-INHERIT=epatch toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt]
 SLOT=0/1.05
 SRC_URI=http://caml.inria.fr/distrib/bazar-ocaml/camlidl-1.05.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
-_md5_=483495005833fe2e8149026cdeb0f07a
+_eclasses_=toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e
+_md5_=33abe98661ca190e941a2edc5c21ba6f
diff --git a/metadata/md5-cache/dev-ml/easy-format-1.2.0 b/metadata/md5-cache/dev-ml/easy-format-1.2.0
index 5b6bc8974ebf..6be841aa6bff 100644
--- a/metadata/md5-cache/dev-ml/easy-format-1.2.0
+++ b/metadata/md5-cache/dev-ml/easy-format-1.2.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install
 DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Pretty-printing library for OCaml
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/mjambon/easy-format
 INHERIT=findlib
 IUSE=examples +ocamlopt
@@ -11,4 +11,4 @@ RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.2.0
 SRC_URI=https://github.com/mjambon/easy-format/archive/v1.2.0.tar.gz -> easy-format-1.2.0.tar.gz
 _eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
-_md5_=6e7952ad6480e325dea6b9fd42f83911
+_md5_=ac78b787a31b18fe4756015720b0ac9d
diff --git a/metadata/md5-cache/dev-ml/jsonm-1.0.1 b/metadata/md5-cache/dev-ml/jsonm-1.0.1
index 132af6c3c8d3..9f99bc1659df 100644
--- a/metadata/md5-cache/dev-ml/jsonm-1.0.1
+++ b/metadata/md5-cache/dev-ml/jsonm-1.0.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install
 DEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:= dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Non-blocking streaming JSON codec for OCaml
-EAPI=5
+EAPI=7
 HOMEPAGE=https://erratique.ch/software/jsonm
 INHERIT=findlib
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
@@ -10,4 +10,4 @@ RDEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:=
 SLOT=0/1.0.1
 SRC_URI=https://erratique.ch/software/jsonm/releases/jsonm-1.0.1.tbz
 _eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
-_md5_=c56ddeca7e680b3a21ade99e3dabc59a
+_md5_=5929a2fbb46a9132d0287fc6124cbdb6
diff --git a/metadata/md5-cache/dev-ml/merlin-extend-0.3 b/metadata/md5-cache/dev-ml/merlin-extend-0.3
index 07ea21a49c2f..fcb7c8a7fec8 100644
--- a/metadata/md5-cache/dev-ml/merlin-extend-0.3
+++ b/metadata/md5-cache/dev-ml/merlin-extend-0.3
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install
 DEPEND=dev-lang/ocaml:0/4.05.0 dev-ml/cppo >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=SDK to extend Merlin
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/let-def/merlin-extend
 INHERIT=findlib
 KEYWORDS=~amd64
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/ocaml:0/4.05.0
 SLOT=0/0.3
 SRC_URI=https://github.com/let-def/merlin-extend/archive/v0.3.tar.gz -> merlin-extend-0.3.tar.gz
 _eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
-_md5_=ce85a9c43bafda9e786360053f203c3b
+_md5_=42de43034d120371b3db683862242c92
diff --git a/metadata/md5-cache/dev-ml/mtime-1.1.0 b/metadata/md5-cache/dev-ml/mtime-1.1.0
index 523a62b6daf1..9133a5b3140d 100644
--- a/metadata/md5-cache/dev-ml/mtime-1.1.0
+++ b/metadata/md5-cache/dev-ml/mtime-1.1.0
@@ -1,7 +1,8 @@
+BDEPEND=dev-ml/opam-installer dev-lang/ocaml
 DEFINED_PHASES=compile install test
-DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:= dev-ml/opam-installer
+DEPEND=dev-lang/ocaml:=[ocamlopt] dev-ml/topkg dev-ml/ocamlbuild dev-ml/findlib >=dev-lang/ocaml-4:=
 DESCRIPTION=OCaml module to access monotonic wall-clock time
-EAPI=5
+EAPI=7
 HOMEPAGE=https://erratique.ch/software/mtime https://github.com/dbuenzli/mtime
 INHERIT=opam
 IUSE=test
@@ -12,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=https://erratique.ch/software/mtime/releases/mtime-1.1.0.tbz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=b3937426d0a01d9b7a099c82b885651f
+_md5_=957c3c7cc5a87d8554ee54eb4d131469
diff --git a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5 b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
index feba8374f2b4..06f6067ad20d 100644
--- a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install
 DEPEND=app-admin/augeas dev-ml/ocaml-autoconf dev-ml/findlib dev-lang/ocaml[ocamlopt] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Ocaml bindings for Augeas
-EAPI=5
+EAPI=7
 HOMEPAGE=http://augeas.net/
 INHERIT=findlib
 KEYWORDS=~amd64 ~x86
@@ -10,4 +10,4 @@ RDEPEND=app-admin/augeas dev-ml/ocaml-autoconf dev-ml/findlib dev-lang/ocaml[oca
 SLOT=0
 SRC_URI=https://people.redhat.com/~rjones/augeas/files/ocaml-augeas-0.5.tar.gz
 _eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
-_md5_=76e54ded6746510da592d83b2bff3b37
+_md5_=ac4ccf374d07d89650a2c3bbde0a39f2
diff --git a/metadata/md5-cache/dev-ml/ocaml-doc-4.04 b/metadata/md5-cache/dev-ml/ocaml-doc-4.04
index d27f478cab4a..7c6ee0bece49 100644
--- a/metadata/md5-cache/dev-ml/ocaml-doc-4.04
+++ b/metadata/md5-cache/dev-ml/ocaml-doc-4.04
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=Ocaml reference manual (html)
-EAPI=5
-HOMEPAGE=http://caml.inria.fr/pub/docs/manual-ocaml/
+EAPI=7
+HOMEPAGE=https://caml.inria.fr/pub/docs/manual-ocaml/
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04-refman-html.tar.gz
-_md5_=5ea245eaf42416e632d96ad232e1c33e
+SRC_URI=https://caml.inria.fr/pub/distrib/ocaml-4.04/ocaml-4.04-refman-html.tar.gz
+_md5_=5211a3259edfda361954945fa724c240
diff --git a/metadata/md5-cache/dev-ml/ocaml-doc-4.05 b/metadata/md5-cache/dev-ml/ocaml-doc-4.05
index 41c824b8b3ec..bcf7bd2f9230 100644
--- a/metadata/md5-cache/dev-ml/ocaml-doc-4.05
+++ b/metadata/md5-cache/dev-ml/ocaml-doc-4.05
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install postinst
 DESCRIPTION=Ocaml reference manual (html)
-EAPI=5
-HOMEPAGE=http://caml.inria.fr/pub/docs/manual-ocaml/
+EAPI=7
+HOMEPAGE=https://caml.inria.fr/pub/docs/manual-ocaml/
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://caml.inria.fr/pub/distrib/ocaml-4.05/ocaml-4.05-refman-html.tar.gz
-_md5_=b8f6b2434ce22ffee8cd694886b17db1
+SRC_URI=https://caml.inria.fr/pub/distrib/ocaml-4.05/ocaml-4.05-refman-html.tar.gz
+_md5_=acee4f32f0d3d0233c11dd9d48572496
diff --git a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3 b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
index 2163ca4073a0..fb92c9552705 100644
--- a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
+++ b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
@@ -1,7 +1,8 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/ocaml:=[ocamlopt?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.2-r1:1.16 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=dev-ml/findlib-1.0.4-r1
+DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=OCaml hash-consing library
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/backtracking/ocaml-hashcons
 INHERIT=autotools findlib
 IUSE=+ocamlopt
@@ -10,5 +11,5 @@ LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.3
 SRC_URI=https://github.com/backtracking/ocaml-hashcons/archive/1.3.tar.gz -> ocaml-hashcons-1.3.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	edos2unix	33e347e171066657f91f8b0c72ec8773	estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	l10n	8cdd85e169b835d518bc2fd59f780d8e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	ltprune	4f3f2db5ce3ccbeeacdf3f94954043aa	preserve-libs	ef207dc62baddfddfd39a164d9797648	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	findlib	197b318e28cee28e11c2b474328b50dd
-_md5_=ea0dcaeade9713d11f14cc5684c340cc
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	d410501a125f99ffb560b0c523cd3d1e	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	findlib	197b318e28cee28e11c2b474328b50dd
+_md5_=52c306cd346c6d6b7bfea8fc80280321
diff --git a/metadata/md5-cache/dev-ml/opam-1.3.1-r2 b/metadata/md5-cache/dev-ml/opam-1.3.1-r2
index dfe96361d7b0..f4fe0cdfa089 100644
--- a/metadata/md5-cache/dev-ml/opam-1.3.1-r2
+++ b/metadata/md5-cache/dev-ml/opam-1.3.1-r2
@@ -1,9 +1,8 @@
-DEFINED_PHASES=compile install prepare test
+DEFINED_PHASES=compile install test
 DEPEND=dev-lang/ocaml:= || ( net-misc/wget net-misc/curl ) dev-ml/extlib:= dev-ml/re:= dev-ml/ocamlgraph:= dev-ml/cmdliner:= dev-ml/cudf:= >=dev-ml/dose3-5:= dev-ml/uutf:= dev-ml/jsonm:= dev-ml/findlib test? ( dev-vcs/git )
 DESCRIPTION=A source-based package manager for OCaml
-EAPI=5
+EAPI=7
 HOMEPAGE=http://opam.ocaml.org/
-INHERIT=epatch
 IUSE=test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=LGPL-3-with-linking-exception
@@ -11,5 +10,4 @@ RDEPEND=dev-lang/ocaml:= || ( net-misc/wget net-misc/curl ) dev-ml/extlib:= dev-
 RESTRICT=!test? ( test )
 SLOT=0/1.3.1
 SRC_URI=https://github.com/ocaml/opam/archive/1.3.1.tar.gz -> opam-1.3.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e
-_md5_=f691fc96d33ef9ebd7b3a015ae021343
+_md5_=c0a60e5380bac2f49784adf04c3138bc
diff --git a/metadata/md5-cache/dev-ml/reactiveData-0.2.1 b/metadata/md5-cache/dev-ml/reactiveData-0.2.1
index 855e8d3ab863..fa4e588f63d6 100644
--- a/metadata/md5-cache/dev-ml/reactiveData-0.2.1
+++ b/metadata/md5-cache/dev-ml/reactiveData-0.2.1
@@ -1,7 +1,8 @@
+BDEPEND=dev-ml/opam-installer dev-lang/ocaml
 DEFINED_PHASES=compile install
-DEPEND=dev-ml/react:= dev-ml/findlib dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam-installer
+DEPEND=dev-ml/react:= dev-ml/findlib dev-ml/ocamlbuild >=dev-lang/ocaml-4:=
 DESCRIPTION=Functional reactive programming with incremental changes in data structures
-EAPI=5
+EAPI=7
 HOMEPAGE=https://github.com/ocsigen/reactiveData
 INHERIT=opam
 IUSE=+ocamlopt
@@ -11,4 +12,4 @@ RDEPEND=dev-ml/react:= >=dev-lang/ocaml-4:=
 SLOT=0/0.2.1
 SRC_URI=https://github.com/ocsigen/reactiveData/archive/0.2.1.tar.gz -> reactiveData-0.2.1.tar.gz
 _eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349
-_md5_=1d4dfd3b44004e20724207b8a3e4a350
+_md5_=e84e4d99e73d79b4fc3de77ac471666d
diff --git a/metadata/md5-cache/dev-ml/reactiveData-9999 b/metadata/md5-cache/dev-ml/reactiveData-9999
deleted file mode 100644
index d49205b8f415..000000000000
--- a/metadata/md5-cache/dev-ml/reactiveData-9999
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install unpack
-DEPEND=dev-ml/react:= dev-ml/findlib dev-ml/ocamlbuild >=dev-lang/ocaml-4:= dev-ml/opam-installer >=dev-vcs/git-1.8.2.1[curl]
-DESCRIPTION=Functional reactive programming with incremental changes in data structures
-EAPI=5
-HOMEPAGE=https://github.com/ocsigen/reactiveData
-INHERIT=opam git-r3
-IUSE=+ocamlopt
-LICENSE=LGPL-3-with-linking-exception
-PROPERTIES=live
-RDEPEND=dev-ml/react:= >=dev-lang/ocaml-4:=
-SLOT=0/9999
-_eclasses_=opam	bb6e97cce1eab4343c4db2c51acf1349	git-r3	b8e8c92aa5fe8df7187e466138eb4e52
-_md5_=1d4dfd3b44004e20724207b8a3e4a350
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.1 b/metadata/md5-cache/dev-ml/uutf-1.0.1
index e02d34ea8696..84984d48d3ce 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install test
 DEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-ml/ocamlbuild dev-ml/topkg test? ( dev-ml/cmdliner ) >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
-EAPI=5
+EAPI=7
 HOMEPAGE=https://erratique.ch/software/uutf
 INHERIT=findlib
 IUSE=doc utftrip +ocamlopt test
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
 _eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
-_md5_=db92ee2473e729a944507f6306f3a339
+_md5_=7a9e33489e82758223d4b5bd464662e9
diff --git a/metadata/md5-cache/dev-ml/xml-light-2.2-r3 b/metadata/md5-cache/dev-ml/xml-light-2.2-r3
index 2114605999fb..11bfc3c13e47 100644
--- a/metadata/md5-cache/dev-ml/xml-light-2.2-r3
+++ b/metadata/md5-cache/dev-ml/xml-light-2.2-r3
@@ -1,14 +1,13 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=app-arch/unzip dev-lang/ocaml:=[ocamlopt?]
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install test
+DEPEND=dev-lang/ocaml:=[ocamlopt?]
 DESCRIPTION=Minimal Xml parser and printer for OCaml
-EAPI=5
+EAPI=7
 HOMEPAGE=http://tech.motion-twin.com/xmllight.html
-INHERIT=epatch multilib
 IUSE=doc +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.2
 SRC_URI=http://tech.motion-twin.com/zip/xml-light-2.2.zip
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	epatch	9f813bb3c47cf2e60619a663b87c5f4e	multilib	d410501a125f99ffb560b0c523cd3d1e	toolchain-funcs	24921b57d6561d87cbef4916a296ada4
-_md5_=61936dd8730283dd7923774dac482cfc
+_md5_=d9b624f532eb564e6ec8c364576e6bcd