From: Alexis Ballier <aballier@gentoo.org>
Date: Sat, 1 Apr 2017 21:50:21 +0000 (+0200)
Subject: dev-ml/js_of_ocaml: Fix build with latest ppx tools.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a94a3df89153fa514be328be032071c2d41545e7;p=gentoo.git

dev-ml/js_of_ocaml: Fix build with latest ppx tools.

Package-Manager: Portage-2.3.5, Repoman-2.3.2
---

diff --git a/dev-ml/js_of_ocaml/files/ppx.patch b/dev-ml/js_of_ocaml/files/ppx.patch
new file mode 100644
index 000000000000..c46293f546da
--- /dev/null
+++ b/dev-ml/js_of_ocaml/files/ppx.patch
@@ -0,0 +1,11 @@
+Index: js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml
+===================================================================
+--- js_of_ocaml-2.8.4.orig/lib/ppx_driver/ppx_js_driver.ml
++++ js_of_ocaml-2.8.4/lib/ppx_driver/ppx_js_driver.ml
+@@ -1,5 +1,5 @@
+ let () =
+   let js_mapper = Ppx_js.js_mapper [] in
+-  Ppx_driver.register_transformation "js_of_ocaml"
++  Ppx_driver.register_transformation_using_ocaml_current_ast "js_of_ocaml"
+     ~impl:(js_mapper.Ast_mapper.structure js_mapper)
+     ~intf:(js_mapper.Ast_mapper.signature js_mapper)
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild
index a68da44990b4..11d4b7ce0093 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild
@@ -40,6 +40,10 @@ RDEPEND="
 	deriving? ( >=dev-ml/deriving-0.6:= )"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+	epatch "${FILESDIR}/ppx.patch"
+}
+
 src_configure() {
 	printf "\n\n" >> Makefile.conf
 	use ocamlopt || echo "BEST := byte" >> Makefile.conf