dev-ml/ocaml-dns: backport upstream patch to build with latest ocaml-uri

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/dev-ml/ocaml-dns/files/uri.patch b/dev-ml/ocaml-dns/files/uri.patch
new file mode 100644 (file)
index 0000000..09e50cf
--- /dev/null
+++ b/dev-ml/ocaml-dns/files/uri.patch
@@ -0,0 +1,21 @@
+commit 152097361dbe987af5de4efde78ed28c720900a8
+Author: Anil Madhavapeddy <anil@recoil.org>
+Date:   Tue May 30 20:45:06 2017 +0100
+
+    zone_parser: explictly depend on uri.services
+    
+    This seems to have been pulled in implicitly before, but breaks
+    when compiled with jbuilder
+
+diff --git a/_tags b/_tags
+index b38be12..bb5d5c0 100644
+--- a/_tags
++++ b/_tags
+@@ -9,6 +9,7 @@ true : package(re re.str ipaddr uri base64 hashcons cstruct result)
+ "lwt": include
+ <lwt/*.{ml,mli}>: package(lwt mirage-profile)
+ <lwt/dig_unix.*>: package(cmdliner lwt.unix uri.services ipaddr.unix lwt)
++<lib/zone_parser.*>: package(uri.services)
+ <mirage/*.{ml,mli}>: package(lwt duration mirage-time-lwt)
+ <mirage/*.{ml,mli}>: package(mirage-stack-lwt mirage-kv-lwt)
+ 

diff --git a/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild b/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild
index 9e32c2f31ec447f9e815f88aa245317824839289..af628a828703b0960508c8de847981ace704fa91 100644 (file)
--- a/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild
+++ b/dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild
@@ -43,6 +43,11 @@ DEPEND="
 # Missing mirage deps
 RESTRICT="test"
 
+src_prepare() {
+       epatch "${FILESDIR}/uri.patch"
+       default
+}
+
 src_compile() {
        ocaml pkg/pkg.ml build \
                --tests $(usex test true false) \