[gentoo-commits] repo/gentoo:master commit in: dev-ml/js_of_ocaml/, dev-ml/js_of_ocaml/files/

[Alexis Ballier]

commit:     a94a3df89153fa514be328be032071c2d41545e7
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 21:50:21 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 08:38:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a94a3df8

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

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-ml/js_of_ocaml/files/ppx.patch          | 11 +++++++++++
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild |  4 ++++
 2 files changed, 15 insertions(+)

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 00000000000..c46293f546d
--- /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 a68da44990b..11d4b7ce009 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