2021-06-17 19:05:11 UTC

45 files changed, 89 insertions, 88 deletions

diff --git a/metadata/md5-cache/app-accessibility/brltty-6.1 b/metadata/md5-cache/app-accessibility/brltty-6.1
index 45c6122e0f05..89ebfb915470 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.1
@@ -8,9 +8,9 @@ INHERIT=findlib multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscrip
 IUSE=+api +beeper bluetooth +contracted-braille doc +fm gpm iconv icu java louis +midi ncurses nls ocaml +pcm policykit python usb systemd +speech tcl xml X elibc_FreeBSD java split-usr python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/libpcre2[pcre32] sys-apps/dbus bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) speech? ( app-accessibility/espeak app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) xml? ( dev-libs/expat ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
+RDEPEND=app-accessibility/at-spi2-core:2 dev-libs/libpcre2[pcre32] sys-apps/dbus bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu:= ) louis? ( dev-libs/liblouis:= ) midi? ( media-libs/alsa-lib ) ncurses? ( sys-libs/ncurses:0= ) pcm? ( media-libs/alsa-lib ) policykit? ( sys-auth/polkit ) python? ( python_targets_python3_8? ( dev-lang/python:3.8 ) python_targets_python3_9? ( dev-lang/python:3.9 ) >=dev-lang/python-exec-2:=[python_targets_python3_8(-)?,python_targets_python3_9(-)?,-python_single_target_python3_8(-),-python_single_target_python3_9(-)] ) speech? ( app-accessibility/espeak app-accessibility/flite app-accessibility/speech-dispatcher ) systemd? ( sys-apps/systemd ) tcl? ( >=dev-lang/tcl-8.4.15:0= ) usb? ( virtual/libusb:0 ) xml? ( dev-libs/expat ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXfixes x11-libs/libXt x11-libs/libXtst ) java? ( >=virtual/jre-1.4 ) dev-lang/ocaml:=[ocamlopt?] java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/tmpfiles
 REQUIRED_USE=doc? ( api ) java? ( api ) ocaml? ( api ) python? ( api || ( python_targets_python3_8 python_targets_python3_9 ) ) tcl? ( api )
 SLOT=0
 SRC_URI=https://brltty.app/archive/brltty-6.1.tar.xz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	udev	452708c3f55cf6e918b045adb949a9e6	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	multilib	ebdbaed22e873a5abe6205f41349b479	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	java-utils-2	2440f41421207d084e5e3f1fb001b34e	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	edos2unix	33e347e171066657f91f8b0c72ec8773	l10n	8cdd85e169b835d518bc2fd59f780d8e	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	2d5b3f4b315094768576b6799e4f926e	flag-o-matic	bc2e7662a4a9a8643be851982a837ddc	usr-ldscript	7c918d239d0f9098867d0c8e33348fc9	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	udev	452708c3f55cf6e918b045adb949a9e6	systemd	fdf0d765c3f11f91fe54f8def9a8c0e6	multibuild	6b3d5ee849dafe6cdfd7b859c211fb01	python-utils-r1	6e84b7d3d8d0bb1ee12774f4a66909e2	python-r1	26e4ad0a4190b14f70973dc253e86535	tmpfiles	5cd6e8cf3288d5b19ff8b5c78c7e3e31
 _md5_=e515caa3a83a122963e4fff093d645e9
diff --git a/metadata/md5-cache/app-text/cpdf-2.3.1 b/metadata/md5-cache/app-text/cpdf-2.3.1
index 8a3928c7f315..265442a30fb1 100644
--- a/metadata/md5-cache/app-text/cpdf-2.3.1
+++ b/metadata/md5-cache/app-text/cpdf-2.3.1
@@ -7,9 +7,9 @@ INHERIT=findlib
 IUSE=doc
 KEYWORDS=~amd64 ~x86
 LICENSE=Coherent-Graphics BSD
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt] ~dev-ml/camlpdf-2.3.1:=
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt] ~dev-ml/camlpdf-2.3.1:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://github.com/johnwhitington/cpdf-source/archive/v2.3.1.tar.gz -> cpdf-2.3.1.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=11a709aeb4df4210994788eb005ae36a
diff --git a/metadata/md5-cache/dev-ml/calendar-2.04 b/metadata/md5-cache/dev-ml/calendar-2.04
index aefe0f388dd2..8543b4480124 100644
--- a/metadata/md5-cache/dev-ml/calendar-2.04
+++ b/metadata/md5-cache/dev-ml/calendar-2.04
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=doc
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt]
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.04
 SRC_URI=http://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=98a4ad1eb8a4730293a71476871017f0
diff --git a/metadata/md5-cache/dev-ml/camlbz2-0.7.0 b/metadata/md5-cache/dev-ml/camlbz2-0.7.0
index 50f912942ec1..76c65acf685d 100644
--- a/metadata/md5-cache/dev-ml/camlbz2-0.7.0
+++ b/metadata/md5-cache/dev-ml/camlbz2-0.7.0
@@ -8,8 +8,8 @@ INHERIT=autotools findlib
 IUSE=doc
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt]
+RDEPEND=app-arch/bzip2 >=dev-lang/ocaml-3.12:=[ocamlopt] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.7.0
 SRC_URI=https://gitlab.com/irill/camlbz2/-/archive/0.7.0/camlbz2-0.7.0.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=61ee3e5a6e052b646a3e2f46321e9a37
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.11-r1 b/metadata/md5-cache/dev-ml/camlp5-7.11-r1
index b432d069d020..32473090fe39 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.11-r1
+++ b/metadata/md5-cache/dev-ml/camlp5-7.11-r1
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=BSD
-RDEPEND=<dev-lang/ocaml-4.11.0:=[ocamlopt?]
+RDEPEND=<dev-lang/ocaml-4.11.0:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/7.11
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel711.tar.gz -> camlp5-7.11.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=cde1dbd375f335b2f7f5140d4c1e0617
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.12 b/metadata/md5-cache/dev-ml/camlp5-7.12
index 57277aedc2a5..a1b49c3ff7bf 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.12
+++ b/metadata/md5-cache/dev-ml/camlp5-7.12
@@ -7,8 +7,8 @@ INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
+RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/7.12
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel712.tar.gz -> camlp5-7.12.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=cbbb762b149f82e0a9ae2359f2255ef1
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.13 b/metadata/md5-cache/dev-ml/camlp5-7.13
index 0fa61e7b3196..89c675ce25a1 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.13
+++ b/metadata/md5-cache/dev-ml/camlp5-7.13
@@ -7,8 +7,8 @@ INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
+RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/7.13
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel713.tar.gz -> camlp5-7.13.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c97f331df68737d35671bad10e09f5c9
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.14 b/metadata/md5-cache/dev-ml/camlp5-7.14
index 3a07af44cd7d..c4647d173338 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.14
+++ b/metadata/md5-cache/dev-ml/camlp5-7.14
@@ -7,8 +7,8 @@ INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
+RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/7.14
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel714.tar.gz -> camlp5-7.14.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b2a6d0fb08bb3daebf210355cef5622c
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00 b/metadata/md5-cache/dev-ml/camlp5-8.00
index c03c0c0d9daa..afea55a86c3a 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00
@@ -7,8 +7,8 @@ INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
+RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.00
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel8.00.tar.gz -> camlp5-8.00.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c13990ac18b63018473ad47ce92d2e3a
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00.01 b/metadata/md5-cache/dev-ml/camlp5-8.00.01
index c3bd643b0e64..2dea5bbe5319 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00.01
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00.01
@@ -7,8 +7,8 @@ INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?]
+RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.00.01
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel8.00.01.tar.gz -> camlp5-8.00.01.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=c13990ac18b63018473ad47ce92d2e3a
diff --git a/metadata/md5-cache/dev-ml/camlpdf-2.3.1 b/metadata/md5-cache/dev-ml/camlpdf-2.3.1
index d0512bd87fa1..e4a50ba39c50 100644
--- a/metadata/md5-cache/dev-ml/camlpdf-2.3.1
+++ b/metadata/md5-cache/dev-ml/camlpdf-2.3.1
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=doc examples
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:=[ocamlopt]
+RDEPEND=dev-lang/ocaml:=[ocamlopt] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.3.1
 SRC_URI=https://github.com/johnwhitington/camlpdf/archive/v2.3.1.tar.gz -> camlpdf-2.3.1.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=0d359c4840afbfdbf87c8432fcfcdf42
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.10 b/metadata/md5-cache/dev-ml/camlzip-1.10
index 81e230f11f92..0ae5814df41a 100644
--- a/metadata/md5-cache/dev-ml/camlzip-1.10
+++ b/metadata/md5-cache/dev-ml/camlzip-1.10
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3
+RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt?] >=sys-libs/zlib-1.1.3 dev-lang/ocaml:=[ocamlopt?]
 SLOT=1/1.10
 SRC_URI=https://github.com/xavierleroy/camlzip/archive/rel110.tar.gz -> camlzip-1.10.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=74127cf99b770d401c6cd3ef33eded35
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.4 b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
index 34163f330ebb..f69f3209c569 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.4
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
@@ -7,9 +7,9 @@ INHERIT=findlib
 IUSE=+ocamlopt test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/findlib:=
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/result:= dev-ml/findlib:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.0.4
 SRC_URI=http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=5218301cadbc2c95ef53fe4c49bb784e
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 6be841aa6bff..10266746d9ba 100644
--- a/metadata/md5-cache/dev-ml/easy-format-1.2.0
+++ b/metadata/md5-cache/dev-ml/easy-format-1.2.0
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=examples +ocamlopt
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-lang/ocaml:=[ocamlopt?]
+RDEPEND=dev-lang/ocaml:=[ocamlopt?] 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
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=ac78b787a31b18fe4756015720b0ac9d
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.7 b/metadata/md5-cache/dev-ml/extlib-1.7.7
index 7a26afacdbaf..8c71fc56a16d 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.7
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.7
@@ -8,8 +8,8 @@ INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
-RDEPEND=dev-lang/ocaml:=[ocamlopt?]
+RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.7.7
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.7.tar.gz -> extlib-1.7.7.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=3e9bd27402f3d978f12037534b694b0a
diff --git a/metadata/md5-cache/dev-ml/extlib-1.7.8 b/metadata/md5-cache/dev-ml/extlib-1.7.8
index 110e0079706b..02bdbaaa45a8 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.8
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.8
@@ -8,8 +8,8 @@ INHERIT=findlib vcs-clean
 IUSE=doc +ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
-RDEPEND=dev-lang/ocaml:=[ocamlopt?]
+RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.7.8
 SRC_URI=https://github.com/ygrek/ocaml-extlib/archive/1.7.8.tar.gz -> extlib-1.7.8.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
 _md5_=b5ac57c0e3d6f0655611ab656217d612
diff --git a/metadata/md5-cache/dev-ml/fmt-0.8.9-r1 b/metadata/md5-cache/dev-ml/fmt-0.8.9-r1
index 3cf2caa7de0d..85946374ed2e 100644
--- a/metadata/md5-cache/dev-ml/fmt-0.8.9-r1
+++ b/metadata/md5-cache/dev-ml/fmt-0.8.9-r1
@@ -8,9 +8,9 @@ INHERIT=findlib opam
 IUSE=test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
-RDEPEND=dev-ml/cmdliner:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/result:=[ocamlopt] dev-ml/stdlib-shims:=[ocamlopt] dev-ml/uchar:=[ocamlopt] >=dev-lang/ocaml-4:=
+RDEPEND=dev-ml/cmdliner:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] dev-ml/result:=[ocamlopt] dev-ml/stdlib-shims:=[ocamlopt] dev-ml/uchar:=[ocamlopt] dev-lang/ocaml:=[ocamlopt?] >=dev-lang/ocaml-4:=
 RESTRICT=!test? ( test )
 SLOT=0/0.8.9
 SRC_URI=https://erratique.ch/software/fmt/releases/fmt-0.8.9.tbz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	opam	bb6e97cce1eab4343c4db2c51acf1349
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=59d49cf54bfee4f447016f2e580f70d2
diff --git a/metadata/md5-cache/dev-ml/jsonm-1.0.1 b/metadata/md5-cache/dev-ml/jsonm-1.0.1
index 9f99bc1659df..40f0652a709f 100644
--- a/metadata/md5-cache/dev-ml/jsonm-1.0.1
+++ b/metadata/md5-cache/dev-ml/jsonm-1.0.1
@@ -6,8 +6,8 @@ HOMEPAGE=https://erratique.ch/software/jsonm
 INHERIT=findlib
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
-RDEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:=
+RDEPEND=>=dev-ml/uutf-1.0.0:= dev-lang/ocaml:= dev-ml/uchar:= dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.0.1
 SRC_URI=https://erratique.ch/software/jsonm/releases/jsonm-1.0.1.tbz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=5929a2fbb46a9132d0287fc6124cbdb6
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.10 b/metadata/md5-cache/dev-ml/labltk-8.06.10
index f0480fcfb6db..5b2e9fe78686 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.10
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.10
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=+ocamlopt X
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
-RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]
+RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.06.10
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.10.tar.gz -> labltk-8.06.10.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=0f521f98630df1ac61c2e220f05d8783
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.7 b/metadata/md5-cache/dev-ml/labltk-8.06.7
index cb8e3b4a967c..734b31aaa0ce 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.7
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.7
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=+ocamlopt X
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
-RDEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?]
+RDEPEND=>=dev-lang/tk-8.0.3:= >=dev-lang/ocaml-4.08:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.06.7
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.7.tar.gz -> labltk-8.06.7.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=c80e4b28cfb847a73637bb5f9e06e1fe
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.9 b/metadata/md5-cache/dev-ml/labltk-8.06.9
index 8cdfaad03a21..58615fbf4688 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.9
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.9
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=+ocamlopt X
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=QPL-1.0 LGPL-2
-RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?]
+RDEPEND=dev-lang/tk:= >=dev-lang/ocaml-4.11:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.06.9
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.9.tar.gz -> labltk-8.06.9.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=0f521f98630df1ac61c2e220f05d8783
diff --git a/metadata/md5-cache/dev-ml/logs-0.7.0 b/metadata/md5-cache/dev-ml/logs-0.7.0
index de124a3d6751..e2bcce7dc685 100644
--- a/metadata/md5-cache/dev-ml/logs-0.7.0
+++ b/metadata/md5-cache/dev-ml/logs-0.7.0
@@ -7,9 +7,9 @@ INHERIT=findlib
 IUSE=+fmt cli +lwt test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
-RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] fmt? ( dev-ml/fmt:= ) cli? ( dev-ml/cmdliner:=[ocamlopt] ) lwt? ( dev-ml/lwt:= )
+RDEPEND=dev-ml/result:=[ocamlopt] dev-lang/ocaml:=[ocamlopt] fmt? ( dev-ml/fmt:= ) cli? ( dev-ml/cmdliner:=[ocamlopt] ) lwt? ( dev-ml/lwt:= ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.7.0
 SRC_URI=https://erratique.ch/software/logs/releases/logs-0.7.0.tbz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=53ccdf8a3dc9e2760c83e61b09380f76
diff --git a/metadata/md5-cache/dev-ml/menhir-20190924 b/metadata/md5-cache/dev-ml/menhir-20190924
index b809858e6916..ef2c4d34439c 100644
--- a/metadata/md5-cache/dev-ml/menhir-20190924
+++ b/metadata/md5-cache/dev-ml/menhir-20190924
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=examples +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?]
+RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/20190924
 SRC_URI=https://gitlab.inria.fr/fpottier/menhir/-/archive/20190924/menhir-20190924.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=5841849f52bd68f8fda3a6f345b5ab33
diff --git a/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1 b/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
index 850b3bdd81af..664f2ef61a0d 100644
--- a/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
+++ b/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
@@ -6,8 +6,8 @@ HOMEPAGE=https://github.com/let-def/merlin-extend
 INHERIT=findlib
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-lang/ocaml:0/4.05
+RDEPEND=dev-lang/ocaml:0/4.05 dev-lang/ocaml:=[ocamlopt?]
 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
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=1f433df2da567a2a13ce602ff31fb3b5
diff --git a/metadata/md5-cache/dev-ml/num-1.3-r1 b/metadata/md5-cache/dev-ml/num-1.3-r1
index 18e38b5ef2b1..749b33d1b14c 100644
--- a/metadata/md5-cache/dev-ml/num-1.3-r1
+++ b/metadata/md5-cache/dev-ml/num-1.3-r1
@@ -7,8 +7,8 @@ HOMEPAGE=https://github.com/ocaml/num
 INHERIT=findlib
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt]
+RDEPEND=>=dev-lang/ocaml-4.09.0:=[ocamlopt] >=dev-ml/findlib-1.8.1[ocamlopt] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/ocaml/num/archive/v1.3.tar.gz -> num-1.3.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=2c99de16380933bea986fda5f2a99343
diff --git a/metadata/md5-cache/dev-ml/num-1.4-r1 b/metadata/md5-cache/dev-ml/num-1.4-r1
index 3377ac47dfd0..d78e8a29ee8b 100644
--- a/metadata/md5-cache/dev-ml/num-1.4-r1
+++ b/metadata/md5-cache/dev-ml/num-1.4-r1
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:=[ocamlopt?]
+RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/ocaml/num/archive/v1.4.tar.gz -> num-1.4.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=e9e5cfa32e550508640a3d2aef6360be
diff --git a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5 b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
index 06f6067ad20d..320618e4701b 100644
--- a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
@@ -6,8 +6,8 @@ HOMEPAGE=http://augeas.net/
 INHERIT=findlib
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=app-admin/augeas dev-ml/ocaml-autoconf dev-ml/findlib dev-lang/ocaml[ocamlopt]
+RDEPEND=app-admin/augeas dev-ml/ocaml-autoconf dev-ml/findlib dev-lang/ocaml[ocamlopt] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://people.redhat.com/~rjones/augeas/files/ocaml-augeas-0.5.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=ac4ccf374d07d89650a2c3bbde0a39f2
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
index f3d74642e94a..c1e8327588da 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1
@@ -7,9 +7,9 @@ INHERIT=findlib
 IUSE=test
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:0/7 dev-ml/integers:=
+RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:0/7 dev-ml/integers:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.17.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.17.1.tar.gz -> ocaml-ctypes-0.17.1.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=68ffd978d8b2627a94a4bb380291dea0
diff --git a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1 b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
index c494a65d9b70..ab501044d6cc 100644
--- a/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-expat-1.1.0-r1
@@ -7,9 +7,9 @@ INHERIT=findlib
 IUSE=doc +ocamlopt test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+RDEPEND=dev-libs/expat >=dev-lang/ocaml-3.10.2:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/1.1.0
 SRC_URI=https://github.com/whitequark/ocaml-expat/archive/v1.1.0.tar.gz -> ocaml-expat-1.1.0.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=5eb4340f24b2a108c4d7f5537c4fb451
diff --git a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3 b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3
index b4d4714ed707..9ca7967d8749 100644
--- a/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3
+++ b/metadata/md5-cache/dev-ml/ocaml-gettext-0.3.7-r3
@@ -8,9 +8,9 @@ INHERIT=autotools findlib
 IUSE=doc test
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-3.12.1:= <dev-lang/ocaml-4.10.0:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:= !dev-ml/ocaml-gettext-stub
+RDEPEND=>=dev-lang/ocaml-3.12.1:= <dev-lang/ocaml-4.10.0:= >=dev-ml/ocaml-fileutils-0.4.0:= >=dev-ml/camomile-0.8.3:= sys-devel/gettext dev-ml/camlp4:= !dev-ml/ocaml-gettext-stub dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.3.7
 SRC_URI=https://github.com/gildor478/ocaml-gettext/archive/0.3.7.tar.gz -> ocaml-gettext-0.3.7.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=c113fe60ae20a5a4ebf3004d029a853e
diff --git a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3 b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
index 64cfc84abf17..98c83d772a9b 100644
--- a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
+++ b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
@@ -8,8 +8,8 @@ INHERIT=autotools findlib
 IUSE=+ocamlopt
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=dev-lang/ocaml:=[ocamlopt?]
+RDEPEND=dev-lang/ocaml:=[ocamlopt?] 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_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=52c306cd346c6d6b7bfea8fc80280321
diff --git a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2 b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
index 97423c82f978..2fa4de71f84c 100644
--- a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
+++ b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
@@ -8,8 +8,8 @@ INHERIT=findlib
 IUSE=doc examples gtk +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )
+RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] ) dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.8.8
 SRC_URI=http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=fec682d1031c5f5ae701652c09ef1972
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
index 54f3481182d3..93809b21da8b 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
@@ -8,9 +8,9 @@ INHERIT=findlib
 IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip
 KEYWORDS=amd64 ppc x86
 LICENSE=ZLIB GPL-2+
-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:= )
+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:= ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=installsources strip
 SLOT=0/4.1.8
 SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.8.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=51d153b2607f6787161eac7bba3d3ee2
diff --git a/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1 b/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
index 622e18435f8e..d27a014b95d5 100644
--- a/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
+++ b/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=doc +ocamlopt opengl truetype
 KEYWORDS=~amd64 ppc x86
 LICENSE=LGPL-2
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] >=media-libs/libsdl-1.2 opengl? ( >=dev-ml/lablgl-0.98:= ) >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 truetype? ( >=media-libs/sdl-ttf-2.0 )
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt=] >=media-libs/libsdl-1.2 opengl? ( >=dev-ml/lablgl-0.98:= ) >=media-libs/sdl-mixer-1.2 >=media-libs/sdl-image-1.2 truetype? ( >=media-libs/sdl-ttf-2.0 ) dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.9.1
 SRC_URI=mirror://sourceforge/ocamlsdl/ocamlsdl-0.9.1.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=1a311da00e4c349e39769a3da3cd64ec
diff --git a/metadata/md5-cache/dev-ml/ocplib-simplex-0.4 b/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
index 860be3897afa..ab5b1012a42f 100644
--- a/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
+++ b/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
@@ -7,7 +7,8 @@ HOMEPAGE=https://github.com/OCamlPro-Iguernlala/ocplib-simplex
 INHERIT=autotools findlib
 KEYWORDS=amd64
 LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/OCamlPro-Iguernlala/ocplib-simplex/archive/v0.4.tar.gz -> ocplib-simplex-0.4.tar.gz
-_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354	findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=15581ffa1f1c180f16113afbdab0c591
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.9.1 b/metadata/md5-cache/dev-ml/ocurl-0.9.1
index 6d7870762b16..02eb9b827055 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.9.1
+++ b/metadata/md5-cache/dev-ml/ocurl-0.9.1
@@ -8,8 +8,8 @@ INHERIT=findlib
 IUSE=examples +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
-RDEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RDEPEND=>=net-misc/curl-7.9.8 dev-ml/lwt:= dev-ml/camlp4:= >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.9.1
 SRC_URI=https://github.com/ygrek/ocurl/archive/0.9.1.tar.gz -> ocurl-0.9.1.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=fd07450fc47d4a7c8d6fcbef4bfe2200
diff --git a/metadata/md5-cache/dev-ml/opam-file-format-2.1.0 b/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
index a7b102883195..aceed620b838 100644
--- a/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
+++ b/metadata/md5-cache/dev-ml/opam-file-format-2.1.0
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-lang/ocaml:=[ocamlopt?]
+RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/2.1.0
 SRC_URI=https://github.com/ocaml/opam-file-format/archive/2.1.0.tar.gz -> opam-file-format-2.1.0.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=82a2e1da0399dcbe2d56d32065b8f09e
diff --git a/metadata/md5-cache/dev-ml/topkg-1.0.3 b/metadata/md5-cache/dev-ml/topkg-1.0.3
index ff9e4dd00242..0c170d19b402 100644
--- a/metadata/md5-cache/dev-ml/topkg-1.0.3
+++ b/metadata/md5-cache/dev-ml/topkg-1.0.3
@@ -7,8 +7,8 @@ INHERIT=findlib
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
-RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=[ocamlopt?]
+RDEPEND=dev-ml/result:= dev-ml/ocamlbuild:= dev-ml/findlib:= dev-lang/ocaml:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.0.3
 SRC_URI=https://github.com/dbuenzli/topkg/archive/v1.0.3.tar.gz -> topkg-1.0.3.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=5c2e2141a0c531da7d626b264ce89f77
diff --git a/metadata/md5-cache/dev-ml/uchar-0.0.2 b/metadata/md5-cache/dev-ml/uchar-0.0.2
index 5d44ed38099c..20d680c3ac8d 100644
--- a/metadata/md5-cache/dev-ml/uchar-0.0.2
+++ b/metadata/md5-cache/dev-ml/uchar-0.0.2
@@ -7,9 +7,9 @@ INHERIT=findlib
 IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.03:=
+RDEPEND=>=dev-lang/ocaml-4.03:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=test
 SLOT=0/0.0.2
 SRC_URI=https://github.com/ocaml/uchar/archive/v0.0.2.tar.gz -> uchar-0.0.2.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=6b1a445737154f460460acfec1dad23d
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.1 b/metadata/md5-cache/dev-ml/uutf-1.0.1
index 84984d48d3ce..b5854b18c6a4 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -7,10 +7,10 @@ INHERIT=findlib
 IUSE=doc utftrip +ocamlopt test
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
-RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= )
+RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-lang/ocaml:=[ocamlopt?]
 REQUIRED_USE=utftrip? ( ocamlopt )
 RESTRICT=!test? ( test )
 SLOT=0/1.0.1
 SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.1.tbz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=7a9e33489e82758223d4b5bd464662e9
diff --git a/metadata/md5-cache/dev-ml/zarith-1.11 b/metadata/md5-cache/dev-ml/zarith-1.11
index 843dd675e963..0321db721c1d 100644
--- a/metadata/md5-cache/dev-ml/zarith-1.11
+++ b/metadata/md5-cache/dev-ml/zarith-1.11
@@ -7,9 +7,9 @@ INHERIT=findlib toolchain-funcs
 IUSE=doc mpir +ocamlopt
 KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir:= )
+RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir:= ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!ocamlopt? ( test )
 SLOT=0/1.11
 SRC_URI=https://github.com/ocaml/Zarith/archive/release-1.11.tar.gz -> zarith-1.11.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
 _md5_=6655366fb5950ec24ab1af21a7194873
diff --git a/metadata/md5-cache/dev-ml/zarith-1.12 b/metadata/md5-cache/dev-ml/zarith-1.12
index b2cd85bbc8fe..cfbdf5f28cb2 100644
--- a/metadata/md5-cache/dev-ml/zarith-1.12
+++ b/metadata/md5-cache/dev-ml/zarith-1.12
@@ -7,9 +7,9 @@ INHERIT=findlib toolchain-funcs
 IUSE=doc mpir +ocamlopt
 KEYWORDS=amd64 ~arm ~arm64 ppc x86
 LICENSE=LGPL-2.1-with-linking-exception
-RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir:= )
+RDEPEND=>=dev-lang/ocaml-4.05:=[ocamlopt=] !mpir? ( dev-libs/gmp:0= ) mpir? ( sci-libs/mpir:= ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!ocamlopt? ( test )
 SLOT=0/1.12
 SRC_URI=https://github.com/ocaml/Zarith/archive/release-1.12.tar.gz -> zarith-1.12.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479
 _md5_=1ad8d9df6641ffcc5f05fe9540853b14
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.13.0 b/metadata/md5-cache/sci-mathematics/coq-8.13.0
index 7292b027ea41..4357f0bb78c7 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.13.0
+++ b/metadata/md5-cache/sci-mathematics/coq-8.13.0
@@ -7,9 +7,9 @@ INHERIT=desktop findlib
 IUSE=gtk debug +ocamlopt doc
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=dev-ml/zarith || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? ( dev-ml/lablgtk:3=[sourceview,ocamlopt?] dev-ml/lablgtk-sourceview:3=[ocamlopt?] )
+RDEPEND=dev-ml/zarith || ( dev-ml/num <dev-lang/ocaml-4.09.0[ocamlopt?] ) gtk? ( dev-ml/lablgtk:3=[sourceview,ocamlopt?] dev-ml/lablgtk-sourceview:3=[ocamlopt?] ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/coq/coq/archive/V8.13.0.tar.gz -> coq-8.13.0.tar.gz
-_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	findlib	197b318e28cee28e11c2b474328b50dd
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	findlib	34a4bb0c0d4e2f20b27aeadab3dc9641
 _md5_=1df475721d818781f764ea1537ed1af4
diff --git a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2 b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
index 7708760fa3d4..84f7c97d71c6 100644
--- a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
+++ b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
@@ -7,8 +7,8 @@ HOMEPAGE=https://github.com/OCamlPro-Coquera/psmt2-frontend
 INHERIT=findlib autotools
 KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
-RDEPEND=>=dev-ml/menhir-20181006
+RDEPEND=>=dev-ml/menhir-20181006 dev-lang/ocaml:=[ocamlopt?]
 SLOT=0
 SRC_URI=https://github.com/OCamlPro-Coquera/psmt2-frontend/archive/0.2.tar.gz -> psmt2-frontend-0.2.tar.gz
-_eclasses_=findlib	197b318e28cee28e11c2b474328b50dd	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
+_eclasses_=findlib	34a4bb0c0d4e2f20b27aeadab3dc9641	gnuconfig	9f91b4b0c84e734a87492d4293f03de5	toolchain-funcs	24921b57d6561d87cbef4916a296ada4	multilib	ebdbaed22e873a5abe6205f41349b479	libtool	f143db5a74ccd9ca28c1234deffede96	autotools	9e63f92c2a5d867fea55ecb160c7d354
 _md5_=8babbf81ec962f9ae8c2edc628d37b26
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 2f7993bd8945..0cd9ae5bd1db 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 17 Jun 2021 18:50:08 +0000
+Thu, 17 Jun 2021 19:05:11 +0000