testing/ocaml-yojson: fix depends on -dev subpkg, fix depending pkgs

There are already two packages that require yojson and not biniou or
easy-format, but fails to build when ocaml-biniou-dev and
ocaml-easy-format-dev are not installed, so they are probably needed
as transitive dependencies.

testing/js_of_ocaml/APKBUILD

@@ -19,12 +19,10 @@ makedepends="
 	bash
 	dune
 	ocaml
-	ocaml-biniou-dev
 	ocaml-camlp4-dev
 	ocaml-cmdliner-dev
 	ocaml-compiler-libs
 	ocaml-cppo-dev
-	ocaml-easy-format-dev
 	ocaml-findlib-dev
 	ocaml-lwt-dev
 	ocaml-migrate-parsetree-dev

testing/merlin/APKBUILD

@@ -10,8 +10,6 @@ license="MIT"
 depends="ocaml ocaml-findlib"
 makedepends="
 	ocaml
-	ocaml-biniou-dev
-	ocaml-easy-format-dev
 	ocaml-findlib-dev
 	ocaml-yojson-dev
 	"

testing/ocaml-yojson/APKBUILD

@@ -3,15 +3,14 @@
 pkgname=ocaml-yojson
 _pkgname=yojson
 pkgver=1.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="JSON parsing and pretty-printing library for OCaml"
 url="https://github.com/mjambon/yojson"
 arch="all !x86 !armhf !s390x"  # limited by ocaml aport
 license="BSD-3-Clause"
 depends="ocaml-runtime ocaml-biniou ocaml-easy-format"
-depends_dev="$pkgname=$pkgver-r$pkgrel"
-makedepends="dune ocaml ocaml-biniou-dev ocaml-cppo ocaml-easy-format-dev
-	ocaml-findlib opam"
+depends_dev="$pkgname=$pkgver-r$pkgrel ocaml-biniou-dev ocaml-easy-format-dev"
+makedepends="$depends_dev dune ocaml ocaml-cppo ocaml-findlib opam"
 subpackages="$pkgname-dev"
 source="$pkgname-$pkgver.tar.gz::https://github.com/mjambon/$_pkgname/archive/v$pkgver.tar.gz"
 builddir="$srcdir/$_pkgname-$pkgver"