dev-ml/ocaml-ipaddr: port to pa_sexp_conv and avoid requiring old sexplib

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

diff --git a/dev-ml/ocaml-ipaddr/files/sexpl.patch b/dev-ml/ocaml-ipaddr/files/sexpl.patch
new file mode 100644 (file)
index 0000000..a23175f
--- /dev/null
+++ b/dev-ml/ocaml-ipaddr/files/sexpl.patch
@@ -0,0 +1,26 @@
+Index: ocaml-ipaddr-2.6.1/_tags
+===================================================================
+--- ocaml-ipaddr-2.6.1.orig/_tags
++++ ocaml-ipaddr-2.6.1/_tags
+@@ -23,7 +23,7 @@
+ "lib/ipaddr_unix.cmxs": use_ipaddr_unix
+ <lib/*.ml{,i}>: pkg_bytes
+ <lib/*.ml{,i}>: pkg_sexplib
+-<lib/*.ml{,i}>: pkg_sexplib.syntax
++<lib/*.ml{,i}>: pkg_pa_sexp_conv.syntax
+ <lib/*.ml{,i}>: pkg_unix
+ <lib/*.ml{,i}>: use_ipaddr
+ # Library ipaddr_top
+Index: ocaml-ipaddr-2.6.1/setup.ml
+===================================================================
+--- ocaml-ipaddr-2.6.1.orig/setup.ml
++++ ocaml-ipaddr-2.6.1/setup.ml
+@@ -6905,7 +6905,7 @@ let setup_t =
+                         [
+                            FindlibPackage ("bytes", None);
+                            FindlibPackage ("sexplib", None);
+-                           FindlibPackage ("sexplib.syntax", None)
++                           FindlibPackage ("pa_sexp_conv.syntax", None)
+                         ];
+                       bs_build_tools = [ExternalTool "ocamlbuild"];
+                       bs_c_sources = [];

diff --git a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.6.1.ebuild b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.6.1.ebuild
index 644bd00960e17cc6910a4998b5f927b910987ec3..3f09aa926cc84caf04ce531c9d4ac8a4dd45b8b3 100644 (file)
--- a/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.6.1.ebuild
+++ b/dev-ml/ocaml-ipaddr/ocaml-ipaddr-2.6.1.ebuild
@@ -18,8 +18,9 @@ KEYWORDS="~amd64"
 IUSE=""
 
 DEPEND="dev-ml/sexplib:=
-       <dev-ml/sexplib-113.01.00
+       dev-ml/pa_sexp_conv:=
 "
 RDEPEND="${DEPEND}"
+PATCHES=( "${FILESDIR}/sexpl.patch" )
 
 DOCS=( CHANGES README.md )