commit: f0aefa837e2e397bc4678723122de1a27b01a02d Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Fri Jun 2 12:23:57 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Sat Jun 3 15:13:26 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0aefa83
dev-ml/ocaml-dns: backport upstream patch to build with latest ocaml-uri Package-Manager: Portage-2.3.6, Repoman-2.3.2 dev-ml/ocaml-dns/files/uri.patch | 21 +++++++++++++++++++++ dev-ml/ocaml-dns/ocaml-dns-0.20.1.ebuild | 5 +++++ 2 files changed, 26 insertions(+) diff --git a/dev-ml/ocaml-dns/files/uri.patch b/dev-ml/ocaml-dns/files/uri.patch new file mode 100644 index 00000000000..09e50cfc5ea --- /dev/null +++ b/dev-ml/ocaml-dns/files/uri.patch @@ -0,0 +1,21 @@ +commit 152097361dbe987af5de4efde78ed28c720900a8 +Author: Anil Madhavapeddy <[email protected]> +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 9e32c2f31ec..af628a82870 100644 --- 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) \
