dev-ml/js_of_ocaml: fix automagic on ppx_driver and merge ppx useflag…

…s into one Package-Manager: Portage-2.3.5, Repoman-2.3.2
hanetzer · Apr 18, 2017 · ed40f0d · ed40f0d
1 parent 32de73b
commit ed40f0d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild → ...l/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild → ...l/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild
@@ -20,15 +20,14 @@ fi
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-IUSE="+ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
+IUSE="+ocamlopt doc +deriving +ppx +react +xml X"
 
 RDEPEND="
  >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
  >=dev-ml/lwt-2.4.4:=[camlp4(+)]
  react? ( dev-ml/react:= dev-ml/reactiveData:= )
  xml? ( >=dev-ml/tyxml-4:= )
- ppx? ( dev-ml/ppx_tools:= )
- ppx-deriving? ( dev-ml/ppx_deriving:= )
+ ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= )
  dev-ml/cmdliner:=
  dev-ml/menhir:=
  dev-ml/ocaml-base64:=
@@ -52,7 +51,8 @@ src_configure() {
  use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf
  use react || echo "WITH_REACT := NO" >> Makefile.conf
  use ppx || echo "WITH_PPX := NO" >> Makefile.conf
- use ppx-deriving || echo "WITH_PPX_PPX_DERIVING := NO" >> Makefile.conf
+ use ppx || echo "WITH_PPX_DERIVING := NO" >> Makefile.conf
+ use ppx || echo "WITH_PPX_DRIVER := NO" >> Makefile.conf
  echo "WITH_ASYNC := NO" >> Makefile.conf
 }
 

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild
@@ -20,15 +20,14 @@ fi
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-IUSE="+ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
+IUSE="+ocamlopt doc +deriving +ppx +react +xml X"
 
 RDEPEND="
  >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
  >=dev-ml/lwt-2.4.4:=[camlp4(+)]
  react? ( dev-ml/react:= dev-ml/reactiveData:= )
  xml? ( >=dev-ml/tyxml-4:= )
- ppx? ( dev-ml/ppx_tools:= )
- ppx-deriving? ( dev-ml/ppx_deriving:= )
+ ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= )
  dev-ml/cmdliner:=
  dev-ml/menhir:=
  dev-ml/ocaml-base64:=
@@ -48,7 +47,8 @@ src_configure() {
  use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf
  use react || echo "WITH_REACT := NO" >> Makefile.conf
  use ppx || echo "WITH_PPX := NO" >> Makefile.conf
- use ppx-deriving || echo "WITH_PPX_PPX_DERIVING := NO" >> Makefile.conf
+ use ppx || echo "WITH_PPX_DERIVING := NO" >> Makefile.conf
+ use ppx || echo "WITH_PPX_DRIVER := NO" >> Makefile.conf
  echo "WITH_ASYNC := NO" >> Makefile.conf
 }
 

diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
@@ -8,7 +8,6 @@
  <use>
  <flag name="deriving">Enable <pkg>dev-ml/deriving</pkg> support for improving the type safety.</flag>
  <flag name="ppx">Enables the ppx syntax extension</flag>
- <flag name="ppx-deriving">Enables deriving support through ppx syntax extensions.</flag>
  <flag name="react">Enable functionnal reactive programming support.</flag>
  </use>
  <upstream>