2022-01-11 00:36:33 UTC

57 files changed, 113 insertions, 113 deletions

diff --git a/metadata/md5-cache/app-accessibility/brltty-6.1 b/metadata/md5-cache/app-accessibility/brltty-6.1
index 06483d26cf86..0bd79768862e 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.1
@@ -5,12 +5,12 @@ DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind pe
 EAPI=7
 HOMEPAGE=https://brltty.app/
 INHERIT=findlib multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscript autotools udev systemd python-r1 tmpfiles
-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 ocamlopt java split-usr python_targets_python3_8 python_targets_python3_9
+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 +ocamlopt 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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.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 ) ocaml? ( 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	1470b3b78030acb2c8fcd04414f4c611	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	udev	2d229ad4bfa09058e0184b1ca900db32	systemd	2736b403a83f194b59b767f3b344c2c1	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	python-r1	4c008ab1e6c02cbead059dfe8b864c26	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	udev	2d229ad4bfa09058e0184b1ca900db32	systemd	2736b403a83f194b59b767f3b344c2c1	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	python-r1	4c008ab1e6c02cbead059dfe8b864c26	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8
 _md5_=4bdbfdc381458f0c4307e21dba783703
diff --git a/metadata/md5-cache/app-accessibility/brltty-6.1-r1 b/metadata/md5-cache/app-accessibility/brltty-6.1-r1
index c1f7cd2d9e48..1c7d81c7b467 100644
--- a/metadata/md5-cache/app-accessibility/brltty-6.1-r1
+++ b/metadata/md5-cache/app-accessibility/brltty-6.1-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Daemon that provides access to the Linux/Unix console for a blind pe
 EAPI=7
 HOMEPAGE=https://brltty.app/
 INHERIT=findlib multilib toolchain-funcs java-pkg-opt-2 flag-o-matic usr-ldscript autotools udev systemd python-r1 tmpfiles
-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 ocamlopt java split-usr python_targets_python3_8 python_targets_python3_9
+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 +ocamlopt java split-usr python_targets_python3_8 python_targets_python3_9
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~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.12_p1-r1:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.9-r1:3.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.8:* ) ocaml? ( 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	1470b3b78030acb2c8fcd04414f4c611	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	udev	2d229ad4bfa09058e0184b1ca900db32	systemd	2736b403a83f194b59b767f3b344c2c1	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	python-r1	4c008ab1e6c02cbead059dfe8b864c26	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	java-utils-2	eb6cdf369ec1bc780222e7e2136f64f5	java-pkg-opt-2	e5029f11aa150c447c7e006015f84356	edos2unix	33e347e171066657f91f8b0c72ec8773	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4251d4c84c25f59094fd557e0063a974	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	d5e1306543bc457213f68bb18f830d14	usr-ldscript	6ae04038b0001994e6be364ffc1c0156	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	udev	2d229ad4bfa09058e0184b1ca900db32	systemd	2736b403a83f194b59b767f3b344c2c1	multibuild	05a584848db4901c97fcd94ae7cc3a97	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-utils-r1	b601c48fe339b4c9bc03ffe4f25283e0	python-r1	4c008ab1e6c02cbead059dfe8b864c26	tmpfiles	11d91b11caf3bbb725c7d9eba90335c8
 _md5_=3219d140af682343831d5c931105c633
diff --git a/metadata/md5-cache/app-text/cpdf-2.3.1 b/metadata/md5-cache/app-text/cpdf-2.3.1
index 127a377ca80d..5eda16fb925f 100644
--- a/metadata/md5-cache/app-text/cpdf-2.3.1
+++ b/metadata/md5-cache/app-text/cpdf-2.3.1
@@ -4,12 +4,12 @@ DESCRIPTION=A command line tool for manipulating PDF files
 EAPI=7
 HOMEPAGE=https://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/
 INHERIT=findlib
-IUSE=doc ocamlopt
+IUSE=doc +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=Coherent-Graphics BSD
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=11a709aeb4df4210994788eb005ae36a
diff --git a/metadata/md5-cache/dev-ml/batteries-3.4.0 b/metadata/md5-cache/dev-ml/batteries-3.4.0
index bf884eb072e3..71c393679f05 100644
--- a/metadata/md5-cache/dev-ml/batteries-3.4.0
+++ b/metadata/md5-cache/dev-ml/batteries-3.4.0
@@ -5,12 +5,12 @@ DESCRIPTION=A community-maintained standard library extension
 EAPI=7
 HOMEPAGE=https://github.com/ocaml-batteries-team/batteries-included
 INHERIT=findlib
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 RDEPEND=dev-ml/num:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/ocaml-batteries-team/batteries-included/archive/v3.4.0.tar.gz -> batteries-3.4.0.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=6bc8998711975611f07a4cdabc315ded
diff --git a/metadata/md5-cache/dev-ml/calendar-2.04 b/metadata/md5-cache/dev-ml/calendar-2.04
index da6493a8ab61..cf2945db4258 100644
--- a/metadata/md5-cache/dev-ml/calendar-2.04
+++ b/metadata/md5-cache/dev-ml/calendar-2.04
@@ -4,11 +4,11 @@ DESCRIPTION=An Ocaml library to handle dates and time
 EAPI=7
 HOMEPAGE=http://forge.ocamlcore.org/projects/calendar/
 INHERIT=findlib
-IUSE=doc ocamlopt
+IUSE=doc +ocamlopt
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 acd18a368d80..452e64d0c65b 100644
--- a/metadata/md5-cache/dev-ml/camlbz2-0.7.0
+++ b/metadata/md5-cache/dev-ml/camlbz2-0.7.0
@@ -5,11 +5,11 @@ DESCRIPTION=OCaml bindings for libbz (AKA, bzip2)
 EAPI=7
 HOMEPAGE=https://gitlab.com/irill/camlbz2
 INHERIT=autotools findlib
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 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	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=b712ef937f54a8d63fea6b28fbdfa455
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.11-r1 b/metadata/md5-cache/dev-ml/camlp5-7.11-r1
index 5181916c9002..36e98f01ed81 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.11-r1
+++ b/metadata/md5-cache/dev-ml/camlp5-7.11-r1
@@ -4,11 +4,11 @@ DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
 INHERIT=findlib
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha amd64 ppc x86
 LICENSE=BSD
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=cde1dbd375f335b2f7f5140d4c1e0617
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.12 b/metadata/md5-cache/dev-ml/camlp5-7.12
index b4ba970ece53..ec69ff0c5bc0 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.12
+++ b/metadata/md5-cache/dev-ml/camlp5-7.12
@@ -4,11 +4,11 @@ DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
 INHERIT=findlib vcs-clean
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.11.2:=[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	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=0fe86616a24f55306eb95a0f879f38e9
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.13 b/metadata/md5-cache/dev-ml/camlp5-7.13
index e98850c22ff0..977a006e62b7 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.13
+++ b/metadata/md5-cache/dev-ml/camlp5-7.13
@@ -4,11 +4,11 @@ DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
 INHERIT=findlib vcs-clean
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.10.2:=[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	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=7b42b54bdb151f0b19380eb4b56e2e35
diff --git a/metadata/md5-cache/dev-ml/camlp5-7.14 b/metadata/md5-cache/dev-ml/camlp5-7.14
index 1d3130304906..4490bd3298a7 100644
--- a/metadata/md5-cache/dev-ml/camlp5-7.14
+++ b/metadata/md5-cache/dev-ml/camlp5-7.14
@@ -4,11 +4,11 @@ DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
 INHERIT=findlib vcs-clean
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.13:=[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	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=03741aa922888cc118399ea3f49b9f57
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00 b/metadata/md5-cache/dev-ml/camlp5-8.00
index 5a44cb3c0cad..ce3afea93f94 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00
@@ -4,11 +4,11 @@ DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
 INHERIT=findlib vcs-clean
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.13:=[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	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=cafeecbff2773429bd3a4484f4fda5a5
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00.01 b/metadata/md5-cache/dev-ml/camlp5-8.00.01
index 29fdf255f580..d926b956e420 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00.01
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00.01
@@ -4,11 +4,11 @@ DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
 INHERIT=findlib vcs-clean
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha amd64 ~arm ~arm64 ppc ppc64 x86
 LICENSE=BSD
 RDEPEND=<dev-lang/ocaml-4.13:=[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	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=39c94b89dcd97e11831bbfc181fd55d0
diff --git a/metadata/md5-cache/dev-ml/camlp5-8.00.02 b/metadata/md5-cache/dev-ml/camlp5-8.00.02
index 26bad5429a43..26e70a675f7c 100644
--- a/metadata/md5-cache/dev-ml/camlp5-8.00.02
+++ b/metadata/md5-cache/dev-ml/camlp5-8.00.02
@@ -4,11 +4,11 @@ DESCRIPTION=A preprocessor-pretty-printer of ocaml
 EAPI=7
 HOMEPAGE=https://camlp5.github.io/
 INHERIT=findlib vcs-clean
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.10:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.00.02
 SRC_URI=https://github.com/camlp5/camlp5/archive/rel8.00.02.tar.gz -> camlp5-8.00.02.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _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 53cefb33b7b5..f04357f4b8f1 100644
--- a/metadata/md5-cache/dev-ml/camlpdf-2.3.1
+++ b/metadata/md5-cache/dev-ml/camlpdf-2.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=OCaml library for reading, writing, and modifying PDF files
 EAPI=7
 HOMEPAGE=https://github.com/johnwhitington/camlpdf/
 INHERIT=findlib
-IUSE=doc examples ocamlopt
+IUSE=doc examples +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1-with-linking-exception
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=0d359c4840afbfdbf87c8432fcfcdf42
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.10 b/metadata/md5-cache/dev-ml/camlzip-1.10
index 184e98810fe5..b77453ca6292 100644
--- a/metadata/md5-cache/dev-ml/camlzip-1.10
+++ b/metadata/md5-cache/dev-ml/camlzip-1.10
@@ -4,11 +4,11 @@ DESCRIPTION=Compressed file access ML library (ZIP, GZIP and JAR)
 EAPI=7
 HOMEPAGE=https://github.com/xavierleroy/camlzip
 INHERIT=findlib
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +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 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=74127cf99b770d401c6cd3ef33eded35
diff --git a/metadata/md5-cache/dev-ml/camlzip-1.11 b/metadata/md5-cache/dev-ml/camlzip-1.11
index d4e7f23e91f9..5053afc63828 100644
--- a/metadata/md5-cache/dev-ml/camlzip-1.11
+++ b/metadata/md5-cache/dev-ml/camlzip-1.11
@@ -4,11 +4,11 @@ DESCRIPTION=Compressed file access ML library (ZIP, GZIP and JAR)
 EAPI=7
 HOMEPAGE=https://github.com/xavierleroy/camlzip
 INHERIT=findlib
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-lang/ocaml-4.07:=[ocamlopt?] >=sys-libs/zlib-1.1.3 dev-lang/ocaml:=[ocamlopt?]
 SLOT=1/1.11
 SRC_URI=https://github.com/xavierleroy/camlzip/archive/rel111.tar.gz -> camlzip-1.11.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=a77acdccb22ce78df50660ac2d64196e
diff --git a/metadata/md5-cache/dev-ml/cmdliner-1.0.4 b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
index 6fbc0762a582..367a2319ff1e 100644
--- a/metadata/md5-cache/dev-ml/cmdliner-1.0.4
+++ b/metadata/md5-cache/dev-ml/cmdliner-1.0.4
@@ -4,12 +4,12 @@ DESCRIPTION=Declarative definition of command line interfaces for OCaml
 EAPI=7
 HOMEPAGE=http://erratique.ch/software/cmdliner
 INHERIT=findlib
-IUSE=+ocamlopt test ocamlopt
+IUSE=+ocamlopt test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 1481681f27fe..f0807d6286ed 100644
--- a/metadata/md5-cache/dev-ml/easy-format-1.2.0
+++ b/metadata/md5-cache/dev-ml/easy-format-1.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=Pretty-printing library for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/mjambon/easy-format
 INHERIT=findlib
-IUSE=examples +ocamlopt ocamlopt
+IUSE=examples +ocamlopt +ocamlopt
 KEYWORDS=~amd64
 LICENSE=BSD
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 f996c4436ddd..e093e5166d8c 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.7
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.7
@@ -5,11 +5,11 @@ DESCRIPTION=Standard library extensions for O'Caml
 EAPI=7
 HOMEPAGE=https://github.com/ygrek/ocaml-extlib
 INHERIT=findlib vcs-clean
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 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	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _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 89ed3e605741..844de4fd2e0e 100644
--- a/metadata/md5-cache/dev-ml/extlib-1.7.8
+++ b/metadata/md5-cache/dev-ml/extlib-1.7.8
@@ -5,11 +5,11 @@ DESCRIPTION=Standard library extensions for O'Caml
 EAPI=7
 HOMEPAGE=https://github.com/ygrek/ocaml-extlib
 INHERIT=findlib vcs-clean
-IUSE=doc +ocamlopt ocamlopt
+IUSE=doc +ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=LGPL-2.1
 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	1470b3b78030acb2c8fcd04414f4c611	vcs-clean	b690a7e9b6c497cf59326a7545df4283
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	vcs-clean	b690a7e9b6c497cf59326a7545df4283
 _md5_=6a2a79fe1808d8f5f3362c2dc7751cbb
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 e6e3ce758e50..6fb3c40e13a1 100644
--- a/metadata/md5-cache/dev-ml/fmt-0.8.9-r1
+++ b/metadata/md5-cache/dev-ml/fmt-0.8.9-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Combinators to devise OCaml Format pretty-printing functions
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
 INHERIT=findlib opam
-IUSE=test ocamlopt
+IUSE=test +ocamlopt
 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:=[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	1470b3b78030acb2c8fcd04414f4c611	opam	bb6e97cce1eab4343c4db2c51acf1349
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=59d49cf54bfee4f447016f2e580f70d2
diff --git a/metadata/md5-cache/dev-ml/fmt-0.9.0 b/metadata/md5-cache/dev-ml/fmt-0.9.0
index 4a16a90e808f..c5c1db11d235 100644
--- a/metadata/md5-cache/dev-ml/fmt-0.9.0
+++ b/metadata/md5-cache/dev-ml/fmt-0.9.0
@@ -5,12 +5,12 @@ DESCRIPTION=Combinators to devise OCaml Format pretty-printing functions
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/fmt https://github.com/dbuenzli/fmt
 INHERIT=findlib opam
-IUSE=test ocamlopt
+IUSE=test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=dev-ml/cmdliner:=[ocamlopt] >=dev-lang/ocaml-4.08:=[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.9.0
 SRC_URI=https://erratique.ch/software/fmt/releases/fmt-0.9.0.tbz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611	opam	bb6e97cce1eab4343c4db2c51acf1349
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	opam	bb6e97cce1eab4343c4db2c51acf1349
 _md5_=4db469bb8b43392855c791c26dc3093f
diff --git a/metadata/md5-cache/dev-ml/jsonm-1.0.1 b/metadata/md5-cache/dev-ml/jsonm-1.0.1
index 69909403bd1a..2eb7d92ca544 100644
--- a/metadata/md5-cache/dev-ml/jsonm-1.0.1
+++ b/metadata/md5-cache/dev-ml/jsonm-1.0.1
@@ -4,11 +4,11 @@ DESCRIPTION=Non-blocking streaming JSON codec for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/jsonm
 INHERIT=findlib
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
 LICENSE=ISC
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 d815317e153a..6a2e02557c83 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.10
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.10
@@ -4,11 +4,11 @@ DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
 INHERIT=findlib
-IUSE=+ocamlopt X ocamlopt
+IUSE=+ocamlopt X +ocamlopt
 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(+)?] 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 https://dev.gentoo.org/~sam/distfiles/dev-ml/labltk/labltk-8.06.10-warnings.patch.bz2
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=6ba6eef9b04c542994a95d54a76b4cb3
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.11 b/metadata/md5-cache/dev-ml/labltk-8.06.11
index b4235b5df3b3..1dcf7f717525 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.11
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.11
@@ -4,11 +4,11 @@ DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
 INHERIT=findlib
-IUSE=+ocamlopt X ocamlopt
+IUSE=+ocamlopt X +ocamlopt
 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.13:=[ocamlopt?,X(+)?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/8.06.11
 SRC_URI=https://github.com/garrigue/labltk/archive/8.06.11.tar.gz -> labltk-8.06.11.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=c379d3ef15b7109a7b0b3d646e3feab9
diff --git a/metadata/md5-cache/dev-ml/labltk-8.06.7 b/metadata/md5-cache/dev-ml/labltk-8.06.7
index b9b60e2e48ce..c39681a8deaa 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.7
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.7
@@ -4,11 +4,11 @@ DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
 INHERIT=findlib
-IUSE=+ocamlopt X ocamlopt
+IUSE=+ocamlopt X +ocamlopt
 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(+)?] 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 03e5824ae4f2..6d86233b41b5 100644
--- a/metadata/md5-cache/dev-ml/labltk-8.06.9
+++ b/metadata/md5-cache/dev-ml/labltk-8.06.9
@@ -4,11 +4,11 @@ DESCRIPTION=OCaml interface to the Tcl/Tk GUI framework
 EAPI=7
 HOMEPAGE=https://garrigue.github.io/labltk/
 INHERIT=findlib
-IUSE=+ocamlopt X ocamlopt
+IUSE=+ocamlopt X +ocamlopt
 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(+)?] 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=0f521f98630df1ac61c2e220f05d8783
diff --git a/metadata/md5-cache/dev-ml/logs-0.7.0-r1 b/metadata/md5-cache/dev-ml/logs-0.7.0-r1
index 6795c64e03eb..9dc6adea48b8 100644
--- a/metadata/md5-cache/dev-ml/logs-0.7.0-r1
+++ b/metadata/md5-cache/dev-ml/logs-0.7.0-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Logging infrastructure for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/logs https://github.com/dbuenzli/logs
 INHERIT=findlib
-IUSE=+fmt cli +lwt test ocamlopt
+IUSE=+fmt cli +lwt test +ocamlopt
 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:= ) 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=85a309608f98e25b0b914db2c602e790
diff --git a/metadata/md5-cache/dev-ml/menhir-20190924 b/metadata/md5-cache/dev-ml/menhir-20190924
index be84e55e1d40..f4b0a67633db 100644
--- a/metadata/md5-cache/dev-ml/menhir-20190924
+++ b/metadata/md5-cache/dev-ml/menhir-20190924
@@ -4,11 +4,11 @@ DESCRIPTION=LR(1) parser generator for the OCaml language
 EAPI=7
 HOMEPAGE=http://gallium.inria.fr/~fpottier/menhir/
 INHERIT=findlib
-IUSE=examples +ocamlopt ocamlopt
+IUSE=examples +ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=GPL-2 LGPL-2-with-linking-exception
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 85c06e486121..945e540edb50 100644
--- a/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
+++ b/metadata/md5-cache/dev-ml/merlin-extend-0.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=SDK to extend Merlin
 EAPI=7
 HOMEPAGE=https://github.com/let-def/merlin-extend
 INHERIT=findlib
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=~amd64
 LICENSE=MIT
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=b5b1adfb32630e70c7617bcbfc272dfb
diff --git a/metadata/md5-cache/dev-ml/num-1.3-r1 b/metadata/md5-cache/dev-ml/num-1.3-r1
index d451c890932b..47f6cc2cfae9 100644
--- a/metadata/md5-cache/dev-ml/num-1.3-r1
+++ b/metadata/md5-cache/dev-ml/num-1.3-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Library for arbitrary-precision integer and rational arithmetic
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/num
 INHERIT=findlib
-IUSE=ocamlopt
+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-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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=2c99de16380933bea986fda5f2a99343
diff --git a/metadata/md5-cache/dev-ml/num-1.4-r3 b/metadata/md5-cache/dev-ml/num-1.4-r3
index f728cf66827b..eff5dc7cc180 100644
--- a/metadata/md5-cache/dev-ml/num-1.4-r3
+++ b/metadata/md5-cache/dev-ml/num-1.4-r3
@@ -5,11 +5,11 @@ DESCRIPTION=Library for arbitrary-precision integer and rational arithmetic
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/num
 INHERIT=findlib
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +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?] 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=802f5f59840dc689cdfc1f3fec8d9ba7
diff --git a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5 b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
index 8c2512e2c283..6a893fb42926 100644
--- a/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
+++ b/metadata/md5-cache/dev-ml/ocaml-augeas-0.5
@@ -4,11 +4,11 @@ DESCRIPTION=Ocaml bindings for Augeas
 EAPI=7
 HOMEPAGE=http://augeas.net/
 INHERIT=findlib
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=ac4ccf374d07d89650a2c3bbde0a39f2
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1-r1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1-r1
index 3d9de886d019..aadf22302dad 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1-r1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.17.1-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Library for binding to C libraries using pure OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
 INHERIT=findlib
-IUSE=test ocamlopt
+IUSE=test +ocamlopt
 KEYWORDS=amd64 arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:= 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=76b4c4c8d786e29e5a420e83a0179822
diff --git a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1 b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1
index 00abf89a7a76..b73112ea780b 100644
--- a/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1
+++ b/metadata/md5-cache/dev-ml/ocaml-ctypes-0.19.1
@@ -4,12 +4,12 @@ DESCRIPTION=Library for binding to C libraries using pure OCaml
 EAPI=7
 HOMEPAGE=https://github.com/ocamllabs/ocaml-ctypes
 INHERIT=findlib
-IUSE=test ocamlopt
+IUSE=test +ocamlopt
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-lang/ocaml-4.02:=[ocamlopt] >=dev-libs/libffi-3.3_rc0:= dev-ml/bigarray-compat:= dev-ml/integers:= dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.19.1
 SRC_URI=https://github.com/ocamllabs/ocaml-ctypes/archive/0.19.1.tar.gz -> ocaml-ctypes-0.19.1.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=6a33fef6cd9ef0ebc16076129c766bb7
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 8fe510fb2bbb..6862959b3040 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
@@ -4,12 +4,12 @@ DESCRIPTION=OCaml bindings for expat
 EAPI=7
 HOMEPAGE=https://github.com/whitequark/ocaml-expat
 INHERIT=findlib
-IUSE=doc +ocamlopt test ocamlopt
+IUSE=doc +ocamlopt test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=MIT
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 1fedd73c18b4..41b7b40f8feb 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
@@ -5,12 +5,12 @@ DESCRIPTION=Provides support for internationalization of OCaml program
 EAPI=7
 HOMEPAGE=https://github.com/gildor478/ocaml-gettext
 INHERIT=autotools findlib
-IUSE=doc +ocamlopt test ocamlopt
+IUSE=doc +ocamlopt test +ocamlopt
 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 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	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=7a3b338614e50907dfe971669b9bebc1
diff --git a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3 b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
index ab67f04c929f..cfb51b208c1a 100644
--- a/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
+++ b/metadata/md5-cache/dev-ml/ocaml-hashcons-1.3
@@ -5,11 +5,11 @@ DESCRIPTION=OCaml hash-consing library
 EAPI=7
 HOMEPAGE=https://github.com/backtracking/ocaml-hashcons
 INHERIT=autotools findlib
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=~amd64
 LICENSE=LGPL-2.1-with-linking-exception
 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	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=52c306cd346c6d6b7bfea8fc80280321
diff --git a/metadata/md5-cache/dev-ml/ocaml-inifiles-1.2 b/metadata/md5-cache/dev-ml/ocaml-inifiles-1.2
index e77eed93010c..70585e343ac2 100644
--- a/metadata/md5-cache/dev-ml/ocaml-inifiles-1.2
+++ b/metadata/md5-cache/dev-ml/ocaml-inifiles-1.2
@@ -4,11 +4,11 @@ DESCRIPTION=A small OCaml library to read and write .ini files
 EAPI=7
 HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 INHERIT=findlib
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1+
 RDEPEND=dev-ml/pcre-ocaml:= dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.2
 SRC_URI=http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=27acfcb994338c6134b50cfc23c8b0ba
diff --git a/metadata/md5-cache/dev-ml/ocaml-process-0.2.1 b/metadata/md5-cache/dev-ml/ocaml-process-0.2.1
index 33f86320373e..91db3b67d75a 100644
--- a/metadata/md5-cache/dev-ml/ocaml-process-0.2.1
+++ b/metadata/md5-cache/dev-ml/ocaml-process-0.2.1
@@ -5,12 +5,12 @@ DESCRIPTION=Easy process control for OCaml
 EAPI=7
 HOMEPAGE=https://github.com/dsheets/ocaml-process
 INHERIT=findlib
-IUSE=+ocamlopt test ocamlopt
+IUSE=+ocamlopt test +ocamlopt
 KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 RDEPEND=dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=!test? ( test )
 SLOT=0/0.2.1
 SRC_URI=https://github.com/dsheets/ocaml-process/archive/0.2.1.tar.gz -> ocaml-process-0.2.1.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=8a1498ea87984b44f625f37ad9a4c6d8
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 31c78fb169f3..32f2ccc5a09b 100644
--- a/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
+++ b/metadata/md5-cache/dev-ml/ocamlgraph-1.8.8-r2
@@ -5,11 +5,11 @@ DESCRIPTION=O'Caml Graph library
 EAPI=7
 HOMEPAGE=http://ocamlgraph.lri.fr/index.en.html
 INHERIT=findlib
-IUSE=doc examples gtk +ocamlopt ocamlopt
+IUSE=doc examples gtk +ocamlopt +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?] ) dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.8.8
 SRC_URI=http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.8.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 5712d090f6c5..aecf71d3f377 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.8-r1
@@ -5,12 +5,12 @@ DESCRIPTION=Modules for OCaml application-level Internet protocols
 EAPI=7
 HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
 INHERIT=findlib
-IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip ocamlopt
+IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip +ocamlopt
 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:= ) 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=51d153b2607f6787161eac7bba3d3ee2
diff --git a/metadata/md5-cache/dev-ml/ocamlnet-4.1.9 b/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
index 86fe3127523b..bb0337f3c91a 100644
--- a/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
+++ b/metadata/md5-cache/dev-ml/ocamlnet-4.1.9
@@ -5,12 +5,12 @@ DESCRIPTION=Modules for OCaml application-level Internet protocols
 EAPI=7
 HOMEPAGE=http://projects.camlcity.org/projects/ocamlnet.html
 INHERIT=findlib
-IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip ocamlopt
+IUSE=kerberos tk httpd +ocamlopt +pcre ssl zip +ocamlopt
 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:= ) dev-lang/ocaml:=[ocamlopt?]
 RESTRICT=installsources strip
 SLOT=0/4.1.9
 SRC_URI=http://download.camlcity.org/download/ocamlnet-4.1.9.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 df7975cfd417..3988456aa625 100644
--- a/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
+++ b/metadata/md5-cache/dev-ml/ocamlsdl-0.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=OCaml SDL Bindings
 EAPI=7
 HOMEPAGE=http://ocamlsdl.sourceforge.net
 INHERIT=findlib
-IUSE=doc +ocamlopt opengl truetype ocamlopt
+IUSE=doc +ocamlopt opengl truetype +ocamlopt
 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 ) dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.9.1
 SRC_URI=mirror://sourceforge/ocamlsdl/ocamlsdl-0.9.1.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 e393c77f7716..706272d29f6b 100644
--- a/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
+++ b/metadata/md5-cache/dev-ml/ocplib-simplex-0.4
@@ -5,11 +5,11 @@ DESCRIPTION=A library implementing a simplex algorithm
 EAPI=7
 HOMEPAGE=https://github.com/OCamlPro-Iguernlala/ocplib-simplex
 INHERIT=autotools findlib
-IUSE=ocamlopt
+IUSE=+ocamlopt
 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	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 d7fa406e9b91..723242badd82 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.9.1
+++ b/metadata/md5-cache/dev-ml/ocurl-0.9.1
@@ -5,11 +5,11 @@ DESCRIPTION=OCaml interface to the libcurl library
 EAPI=7
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl
 INHERIT=findlib
-IUSE=examples +ocamlopt ocamlopt
+IUSE=examples +ocamlopt +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?] 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=fd07450fc47d4a7c8d6fcbef4bfe2200
diff --git a/metadata/md5-cache/dev-ml/ocurl-0.9.2 b/metadata/md5-cache/dev-ml/ocurl-0.9.2
index 7539baf6a116..b44df6d7e099 100644
--- a/metadata/md5-cache/dev-ml/ocurl-0.9.2
+++ b/metadata/md5-cache/dev-ml/ocurl-0.9.2
@@ -5,11 +5,11 @@ DESCRIPTION=OCaml interface to the libcurl library
 EAPI=7
 HOMEPAGE=http://forge.ocamlcore.org/projects/ocurl/ https://github.com/ygrek/ocurl
 INHERIT=findlib
-IUSE=examples +ocamlopt ocamlopt
+IUSE=examples +ocamlopt +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?] dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/0.9.2
 SRC_URI=https://github.com/ygrek/ocurl/archive/0.9.2.tar.gz -> ocurl-0.9.2.tar.gz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=00be4131a21ad8a975951c8645af9a99
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 84094efb46f5..e9dc06057b27 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
@@ -4,11 +4,11 @@ DESCRIPTION=Parser and printer for the opam file syntax
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/opam-file-format
 INHERIT=findlib
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2.1
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 ecdbf047a184..6a19120e481d 100644
--- a/metadata/md5-cache/dev-ml/topkg-1.0.3
+++ b/metadata/md5-cache/dev-ml/topkg-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=The transitory OCaml software packager
 EAPI=7
 HOMEPAGE=http://erratique.ch/software/topkg https://github.com/dbuenzli/topkg
 INHERIT=findlib
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 7296ed7d2d6c..b1490f42f732 100644
--- a/metadata/md5-cache/dev-ml/uchar-0.0.2
+++ b/metadata/md5-cache/dev-ml/uchar-0.0.2
@@ -4,12 +4,12 @@ DESCRIPTION=Uchar compatibility library
 EAPI=6
 HOMEPAGE=https://github.com/ocaml/uchar
 INHERIT=findlib
-IUSE=+ocamlopt ocamlopt
+IUSE=+ocamlopt +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=LGPL-2-with-linking-exception
 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _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 26ea070069c6..be30d3cf7a8c 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.1
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.1
@@ -4,7 +4,7 @@ DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/uutf
 INHERIT=findlib
-IUSE=doc utftrip +ocamlopt test ocamlopt
+IUSE=doc utftrip +ocamlopt test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-lang/ocaml:=[ocamlopt?]
@@ -12,5 +12,5 @@ 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=b72a59ff745e53a497a6f6fae92b0469
diff --git a/metadata/md5-cache/dev-ml/uutf-1.0.2 b/metadata/md5-cache/dev-ml/uutf-1.0.2
index 60e08de526a3..b3ebd654bbea 100644
--- a/metadata/md5-cache/dev-ml/uutf-1.0.2
+++ b/metadata/md5-cache/dev-ml/uutf-1.0.2
@@ -4,7 +4,7 @@ DESCRIPTION=Non-blocking streaming Unicode codec for OCaml
 EAPI=7
 HOMEPAGE=https://erratique.ch/software/uutf
 INHERIT=findlib
-IUSE=doc utftrip +ocamlopt test ocamlopt
+IUSE=doc utftrip +ocamlopt test +ocamlopt
 KEYWORDS=amd64 arm arm64 ppc ppc64 x86
 LICENSE=ISC
 RDEPEND=>=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/uchar:= utftrip? ( dev-ml/cmdliner:= ) dev-lang/ocaml:=[ocamlopt?]
@@ -12,5 +12,5 @@ REQUIRED_USE=utftrip? ( ocamlopt )
 RESTRICT=!test? ( test )
 SLOT=0/1.0.2
 SRC_URI=https://erratique.ch/software/uutf/releases/uutf-1.0.2.tbz
-_eclasses_=findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=b72a59ff745e53a497a6f6fae92b0469
diff --git a/metadata/md5-cache/dev-ml/zarith-1.12 b/metadata/md5-cache/dev-ml/zarith-1.12
index ff2c21b1c205..fe58ae0a0fb3 100644
--- a/metadata/md5-cache/dev-ml/zarith-1.12
+++ b/metadata/md5-cache/dev-ml/zarith-1.12
@@ -4,12 +4,12 @@ DESCRIPTION=Arithmetic and logic operations over arbitrary-precision integers
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/Zarith
 INHERIT=findlib toolchain-funcs
-IUSE=doc mpir +ocamlopt ocamlopt
+IUSE=doc mpir +ocamlopt +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:= ) 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	1470b3b78030acb2c8fcd04414f4c611	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784
 _md5_=a4672134fbe68fac82721e2bfa897538
diff --git a/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1 b/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
index f1c86191172c..9905c19dddb5 100644
--- a/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
+++ b/metadata/md5-cache/sci-mathematics/coq-8.13.0-r1
@@ -4,12 +4,12 @@ DESCRIPTION=Proof assistant written in O'Caml
 EAPI=7
 HOMEPAGE=http://coq.inria.fr/
 INHERIT=desktop findlib
-IUSE=gtk debug +ocamlopt doc ocamlopt
+IUSE=gtk debug +ocamlopt doc +ocamlopt
 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?] ) 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	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=desktop	c0d27bf73aa08ca05b663dbd31fbef28	findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=cf095aa4b2685a05dc9a994fa9bd075f
diff --git a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2 b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
index d27969be667a..52a183eb0582 100644
--- a/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
+++ b/metadata/md5-cache/sci-mathematics/psmt2-frontend-0.2
@@ -5,11 +5,11 @@ DESCRIPTION=Library to parse and type-check an extension of the SMT-LIB 2 standa
 EAPI=7
 HOMEPAGE=https://github.com/OCamlPro-Coquera/psmt2-frontend
 INHERIT=findlib autotools
-IUSE=ocamlopt
+IUSE=+ocamlopt
 KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 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	1470b3b78030acb2c8fcd04414f4c611	gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf
+_eclasses_=findlib	e6df6108c2d753998b1206f4d5ea4a2d	gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf
 _md5_=8babbf81ec962f9ae8c2edc628d37b26
diff --git a/metadata/md5-cache/sci-mathematics/why3-1.4.0-r1 b/metadata/md5-cache/sci-mathematics/why3-1.4.0-r1
index f9bb3a98cfd5..6ca0cc3560dc 100644
--- a/metadata/md5-cache/sci-mathematics/why3-1.4.0-r1
+++ b/metadata/md5-cache/sci-mathematics/why3-1.4.0-r1
@@ -5,11 +5,11 @@ DESCRIPTION=Platform for deductive program verification
 EAPI=7
 HOMEPAGE=http://why3.lri.fr/
 INHERIT=autotools findlib
-IUSE=coq doc emacs gtk +ocamlopt re sexp +zarith zip ocamlopt
+IUSE=coq doc emacs gtk +ocamlopt re sexp +zarith zip +ocamlopt
 KEYWORDS=~amd64
 LICENSE=LGPL-2
 RDEPEND=!sci-mathematics/why3-for-spark >=dev-lang/ocaml-4.05.0:=[ocamlopt?] >=dev-ml/menhir-20151112:= dev-ml/num:= coq? ( >=sci-mathematics/coq-8.6 ) emacs? ( app-editors/emacs:* ) gtk? ( dev-ml/lablgtk:=[sourceview,ocamlopt?] ) re? ( dev-ml/re:= dev-ml/seq:= ) sexp? ( dev-ml/ppx_deriving:=[ocamlopt?] dev-ml/ppx_sexp_conv:=[ocamlopt?] dev-ml/sexplib:=[ocamlopt?] ) zarith? ( dev-ml/zarith:= ) zip? ( dev-ml/camlzip:= ) dev-lang/ocaml:=[ocamlopt?]
 SLOT=0/1.4.0
 SRC_URI=https://why3.gitlabpages.inria.fr/releases/why3-1.4.0.tar.gz
-_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	1470b3b78030acb2c8fcd04414f4c611
+_eclasses_=gnuconfig	262062cef0ba4f22b397193da514a350	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	multilib	de4beb52bfa93c4c5d96792a6b5e1784	libtool	241a8f577b9781a42a7421e53448a44e	autotools	c9df06c186913b43eb211100ef5fe2cf	findlib	e6df6108c2d753998b1206f4d5ea4a2d
 _md5_=35aacde1da0e63b4e24fdd40ad629df9
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0482d5a2d53b..ca95ae5ab9ca 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 11 Jan 2022 00:07:07 +0000
+Tue, 11 Jan 2022 00:36:33 +0000