dev-ml/js_of_ocaml: fix automagic on ppx_driver and merge ppx useflags into one

Package-Manager: Portage-2.3.5, Repoman-2.3.2

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-r1.ebuild
similarity index 86%
rename from dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild
rename to dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild
index 11d4b7ce0093c0cd21b3d30d3831fc9168db8271..9331122157d463906670644f497d214ddb9c3050 100644 (file)
--- 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-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
index a68da44990b4a25a0ca484feab14c3ae7faee769..5b17a890bb3f20b39a3995c00bf0639cb5bdcafb 100644 (file)
--- 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
index 0b34c19deedf0deec976583ba18560b664c040c8..904a7a4498e54a81e2cf760b81a405798c09bb39 100644 (file)
--- 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>