2022-06-08 20:33:26 UTC

6 files changed, 31 insertions, 15 deletions

diff --git a/metadata/md5-cache/dev-ml/merlin-3.4.2-r2 b/metadata/md5-cache/dev-ml/merlin-3.4.2-r3
index 95c65019c561..fbcaf2f10ab9 100644
--- a/metadata/md5-cache/dev-ml/merlin-3.4.2-r2
+++ b/metadata/md5-cache/dev-ml/merlin-3.4.2-r3
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-ml/csexp:= dev-ml/yojson:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/merlin
@@ -8,8 +8,8 @@ INHERIT=elisp-common dune
 IUSE=emacs +ocamlopt
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-ml/csexp:= dev-ml/yojson:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= >=dev-lang/ocaml-4.09:= <dev-lang/ocaml-4.12:= emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 SLOT=0/3.4.2
 SRC_URI=https://github.com/ocaml/merlin/archive/v3.4.2.tar.gz -> merlin-3.4.2.tar.gz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	dune	c8f275f00adf2380fe0a57d8a249885c
-_md5_=192c216bcc00ee4fee8f8caee6a5ad63
+_md5_=6d883bcb5d4a15fc1248429ae550534c
diff --git a/metadata/md5-cache/dev-ml/merlin-4.2-r1 b/metadata/md5-cache/dev-ml/merlin-4.2-r2
index d2f38537cb9f..bd8a7efa9761 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.2-r1
+++ b/metadata/md5-cache/dev-ml/merlin-4.2-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= dev-ml/menhir:= || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/merlin
@@ -8,9 +8,9 @@ INHERIT=elisp-common dune
 IUSE=emacs +ocamlopt test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= dev-ml/menhir:= || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/4.2
 SRC_URI=https://github.com/ocaml/merlin/archive/v4.2-411.tar.gz -> merlin-4.2-411.tar.gz https://dev.gentoo.org/~tupone/distfiles/merlin-4.2-ocaml-4.12.patch.gz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	dune	c8f275f00adf2380fe0a57d8a249885c
-_md5_=3480d4122b4cf9483e84ae01db606ac3
+_md5_=2535fe193cd69de184cfdb74cdaf1314
diff --git a/metadata/md5-cache/dev-ml/merlin-4.3.1-r1 b/metadata/md5-cache/dev-ml/merlin-4.3.1-r2
index 6100572f98c2..80b1e749ce80 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.3.1-r1
+++ b/metadata/md5-cache/dev-ml/merlin-4.3.1-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/merlin
@@ -8,9 +8,9 @@ INHERIT=elisp-common dune
 IUSE=emacs +ocamlopt test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/4.3.1
 SRC_URI=https://github.com/ocaml/merlin/archive/v4.3.1-411.tar.gz -> merlin-4.3.1-411.tar.gz https://dev.gentoo.org/~tupone/distfiles/merlin-4.3.1-ocaml-4.12.patch.gz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	dune	c8f275f00adf2380fe0a57d8a249885c
-_md5_=aa526aa0556496dd458dff93534eccf3
+_md5_=3274a86abcac804581cdf8351681ff34
diff --git a/metadata/md5-cache/dev-ml/merlin-4.4-r1 b/metadata/md5-cache/dev-ml/merlin-4.4-r2
index c616ca0b8040..d6eca47b0b86 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.4-r1
+++ b/metadata/md5-cache/dev-ml/merlin-4.4-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install postinst postrm prepare test unpack
-DEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
 EAPI=7
 HOMEPAGE=https://github.com/ocaml/merlin
@@ -8,9 +8,9 @@ INHERIT=elisp-common dune
 IUSE=emacs +ocamlopt test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/4.4
 SRC_URI=https://github.com/ocaml/merlin/releases/download/v4.4-411/merlin-4.4-411.tbz https://github.com/ocaml/merlin/releases/download/v4.4-412/merlin-4.4-412.tbz https://github.com/ocaml/merlin/releases/download/v4.4-413/merlin-4.4-413.tbz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	dune	c8f275f00adf2380fe0a57d8a249885c
-_md5_=06898a1d4143355d39047fea3ce50e93
+_md5_=55774fe8e5abf7a9c2b2646d4075a5d9
diff --git a/metadata/md5-cache/dev-ml/merlin-4.5-r1 b/metadata/md5-cache/dev-ml/merlin-4.5-r2
index b76977d3232c..b266e9d818dc 100644
--- a/metadata/md5-cache/dev-ml/merlin-4.5-r1
+++ b/metadata/md5-cache/dev-ml/merlin-4.5-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-ml/dune dev-lang/ocaml
 DEFINED_PHASES=compile install postinst postrm prepare test unpack
-DEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 dev-lang/ocaml:0/4.14 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 dev-lang/ocaml:0/4.14 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) test? ( app-misc/jq ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 DESCRIPTION=Context sensitive completion for OCaml in Vim and Emacs
 EAPI=8
 HOMEPAGE=https://github.com/ocaml/merlin
@@ -8,9 +8,9 @@ INHERIT=elisp-common dune
 IUSE=emacs +ocamlopt test
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-ml/csexp:= dev-ml/yojson:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 dev-lang/ocaml:0/4.14 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RDEPEND=dev-ml/csexp:= <dev-ml/yojson-2:= dev-ml/menhir:= >=dev-ml/dune-2.9 || ( dev-lang/ocaml:0/4.11 dev-lang/ocaml:0/4.12 dev-lang/ocaml:0/4.13 dev-lang/ocaml:0/4.14 ) emacs? ( >=app-editors/emacs-23.1:* app-emacs/auto-complete app-emacs/company-mode ) >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
 RESTRICT=!test? ( test )
 SLOT=0/4.5
 SRC_URI=https://github.com/ocaml/merlin/releases/download/v4.5-411/merlin-4.5-411.tbz https://github.com/ocaml/merlin/releases/download/v4.5-412/merlin-4.5-412.tbz https://github.com/ocaml/merlin/releases/download/v4.5-413/merlin-4.5-413.tbz https://github.com/ocaml/merlin/releases/download/v4.5-414/merlin-4.5-414.tbz
 _eclasses_=elisp-common	e7aaa047873789f549ea3df2f04b2145	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	dune	c8f275f00adf2380fe0a57d8a249885c
-_md5_=9a0e4014848429a9bcee9237fd36767c
+_md5_=384ecba48f86814f4e14e5fc025d8d10
diff --git a/metadata/md5-cache/dev-ml/yojson-2.0.0 b/metadata/md5-cache/dev-ml/yojson-2.0.0
new file mode 100644
index 000000000000..775023c0b9d9
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/yojson-2.0.0
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/cppo-1.6.1 test? ( dev-ml/alcotest ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/ocaml-4.02.3:=[ocamlopt=] >=dev-ml/seq-0.2.2:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=JSON parsing and pretty-printing library for OCaml
+EAPI=8
+HOMEPAGE=https://github.com/ocaml-community/yojson
+INHERIT=dune
+IUSE=examples +ocamlopt test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-lang/ocaml-4.02.3:=[ocamlopt=] >=dev-ml/seq-0.2.2:=[ocamlopt=] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/2.0.0
+SRC_URI=https://github.com/ocaml-community/yojson/archive/2.0.0.tar.gz -> yojson-2.0.0.tar.gz
+_eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	dune	c8f275f00adf2380fe0a57d8a249885c
+_md5_=f51ff507f76bfb39382e90d892845918