| 1 |
commit: ed40f0d4086818bc455b2db2127bcac78116d01c |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 18 20:01:36 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 18 20:09:54 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed40f0d4 |
| 7 |
|
| 8 |
dev-ml/js_of_ocaml: fix automagic on ppx_driver and merge ppx useflags into one |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
.../{js_of_ocaml-2.8.4.ebuild => js_of_ocaml-2.8.4-r1.ebuild} | 8 ++++---- |
| 13 |
dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild | 8 ++++---- |
| 14 |
dev-ml/js_of_ocaml/metadata.xml | 1 - |
| 15 |
3 files changed, 8 insertions(+), 9 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
similarity index 86% |
| 19 |
rename from dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild |
| 20 |
rename to dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild |
| 21 |
index 11d4b7ce009..9331122157d 100644 |
| 22 |
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild |
| 23 |
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild |
| 24 |
@@ -20,15 +20,14 @@ fi |
| 25 |
|
| 26 |
LICENSE="LGPL-2.1-with-linking-exception" |
| 27 |
SLOT="0/${PV}" |
| 28 |
-IUSE="+ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X" |
| 29 |
+IUSE="+ocamlopt doc +deriving +ppx +react +xml X" |
| 30 |
|
| 31 |
RDEPEND=" |
| 32 |
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?] |
| 33 |
>=dev-ml/lwt-2.4.4:=[camlp4(+)] |
| 34 |
react? ( dev-ml/react:= dev-ml/reactiveData:= ) |
| 35 |
xml? ( >=dev-ml/tyxml-4:= ) |
| 36 |
- ppx? ( dev-ml/ppx_tools:= ) |
| 37 |
- ppx-deriving? ( dev-ml/ppx_deriving:= ) |
| 38 |
+ ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= ) |
| 39 |
dev-ml/cmdliner:= |
| 40 |
dev-ml/menhir:= |
| 41 |
dev-ml/ocaml-base64:= |
| 42 |
@@ -52,7 +51,8 @@ src_configure() { |
| 43 |
use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf |
| 44 |
use react || echo "WITH_REACT := NO" >> Makefile.conf |
| 45 |
use ppx || echo "WITH_PPX := NO" >> Makefile.conf |
| 46 |
- use ppx-deriving || echo "WITH_PPX_PPX_DERIVING := NO" >> Makefile.conf |
| 47 |
+ use ppx || echo "WITH_PPX_DERIVING := NO" >> Makefile.conf |
| 48 |
+ use ppx || echo "WITH_PPX_DRIVER := NO" >> Makefile.conf |
| 49 |
echo "WITH_ASYNC := NO" >> Makefile.conf |
| 50 |
} |
| 51 |
|
| 52 |
|
| 53 |
diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild b/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild |
| 54 |
index a68da44990b..5b17a890bb3 100644 |
| 55 |
--- a/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild |
| 56 |
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-9999.ebuild |
| 57 |
@@ -20,15 +20,14 @@ fi |
| 58 |
|
| 59 |
LICENSE="LGPL-2.1-with-linking-exception" |
| 60 |
SLOT="0/${PV}" |
| 61 |
-IUSE="+ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X" |
| 62 |
+IUSE="+ocamlopt doc +deriving +ppx +react +xml X" |
| 63 |
|
| 64 |
RDEPEND=" |
| 65 |
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?] |
| 66 |
>=dev-ml/lwt-2.4.4:=[camlp4(+)] |
| 67 |
react? ( dev-ml/react:= dev-ml/reactiveData:= ) |
| 68 |
xml? ( >=dev-ml/tyxml-4:= ) |
| 69 |
- ppx? ( dev-ml/ppx_tools:= ) |
| 70 |
- ppx-deriving? ( dev-ml/ppx_deriving:= ) |
| 71 |
+ ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= ) |
| 72 |
dev-ml/cmdliner:= |
| 73 |
dev-ml/menhir:= |
| 74 |
dev-ml/ocaml-base64:= |
| 75 |
@@ -48,7 +47,8 @@ src_configure() { |
| 76 |
use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf |
| 77 |
use react || echo "WITH_REACT := NO" >> Makefile.conf |
| 78 |
use ppx || echo "WITH_PPX := NO" >> Makefile.conf |
| 79 |
- use ppx-deriving || echo "WITH_PPX_PPX_DERIVING := NO" >> Makefile.conf |
| 80 |
+ use ppx || echo "WITH_PPX_DERIVING := NO" >> Makefile.conf |
| 81 |
+ use ppx || echo "WITH_PPX_DRIVER := NO" >> Makefile.conf |
| 82 |
echo "WITH_ASYNC := NO" >> Makefile.conf |
| 83 |
} |
| 84 |
|
| 85 |
|
| 86 |
diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml |
| 87 |
index 0b34c19deed..904a7a4498e 100644 |
| 88 |
--- a/dev-ml/js_of_ocaml/metadata.xml |
| 89 |
+++ b/dev-ml/js_of_ocaml/metadata.xml |
| 90 |
@@ -8,7 +8,6 @@ |
| 91 |
<use> |
| 92 |
<flag name="deriving">Enable <pkg>dev-ml/deriving</pkg> support for improving the type safety.</flag> |
| 93 |
<flag name="ppx">Enables the ppx syntax extension</flag> |
| 94 |
- <flag name="ppx-deriving">Enables deriving support through ppx syntax extensions.</flag> |
| 95 |
<flag name="react">Enable functionnal reactive programming support.</flag> |
| 96 |
</use> |
| 97 |
<upstream> |
Archives