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

2021-02-15 Thread Sam James
commit: 66102e483b55615213d8f7024bddc774d7327d1d
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 15 09:02:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 15 09:03:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66102e48

dev-ml/js_of_ocaml: adjust KEYWORDS

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
index 12a42f7f42e..6b828ef4738 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
@@ -15,7 +15,6 @@ if [ "${PV#}" != "${PV}" ] ; then
 else
SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
# Breaks dev-ml/eliom dev-ml/async_js dev-ml/ocsigen-toolkit
-   KEYWORDS=""
#KEYWORDS="~amd64"
 fi
 



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

2021-02-08 Thread Sam James
commit: a4bac951c0398bc6274c19554cde73e2a0ea1187
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb  8 18:23:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb  8 18:25:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4bac951

dev-ml/js_of_ocaml: fix double KEYWORDS

Bug: https://bugs.gentoo.org/769554
Thanks-to: Douglas Freed  mtu.edu>
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild | 3 +--
 dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild| 3 +--
 dev-ml/js_of_ocaml/js_of_ocaml-.ebuild | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
index c598fe1bdb4..411a3127760 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ if [ "${PV#}" != "${PV}" ] ; then
inherit git-r3
SRC_URI=""
EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml;
-   KEYWORDS=""
 else
SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
KEYWORDS="~amd64"

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
index af4b80e9a5d..12a42f7f42e 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ if [ "${PV#}" != "${PV}" ] ; then
inherit git-r3
SRC_URI=""
EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml;
-   KEYWORDS=""
 else
SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
# Breaks dev-ml/eliom dev-ml/async_js dev-ml/ocsigen-toolkit

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
index 827937bd0f4..af747867d5a 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,6 @@ if [ "${PV#}" != "${PV}" ] ; then
KEYWORDS=""
 else
SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
 fi
 
 LICENSE="LGPL-2.1-with-linking-exception"



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

2019-12-27 Thread Mikle Kolyada
commit: 6a7cf422ce69cab5e7fbd9c2c0301c24980ab190
Author: Ralph Seichter  seichter  de>
AuthorDate: Wed Dec 18 21:21:24 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Dec 27 13:39:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a7cf422

dev-ml/{camlimages,js_of_ocaml,labltk}: Dependency default

dev-lang/ocaml-4.09.0 removes the "X" USE flag.

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Ralph Seichter  seichter.de>
Signed-off-by: Mikle Kolyada  gentoo.org>

 dev-ml/camlimages/camlimages-4.2.2.ebuild  | 4 ++--
 dev-ml/camlimages/camlimages-4.2.3.ebuild  | 4 ++--
 dev-ml/camlimages/camlimages-4.2.4.ebuild  | 4 ++--
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild | 4 ++--
 dev-ml/labltk/labltk-8.06.2.ebuild | 4 ++--
 dev-ml/labltk/labltk-8.06.3.ebuild | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dev-ml/camlimages/camlimages-4.2.2.ebuild 
b/dev-ml/camlimages/camlimages-4.2.2.ebuild
index 8f825c780a5..9b589566854 100644
--- a/dev-ml/camlimages/camlimages-4.2.2.ebuild
+++ b/dev-ml/camlimages/camlimages-4.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ppc x86"
 IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm"
 
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt]
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[X(+)?,ocamlopt]
exif? ( media-libs/libexif )
gif? ( media-libs/giflib )
gtk? ( dev-ml/lablgtk )

diff --git a/dev-ml/camlimages/camlimages-4.2.3.ebuild 
b/dev-ml/camlimages/camlimages-4.2.3.ebuild
index 9be34cb0db7..ab0b210a36c 100644
--- a/dev-ml/camlimages/camlimages-4.2.3.ebuild
+++ b/dev-ml/camlimages/camlimages-4.2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm"
 
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt]
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[X(+)?,ocamlopt]
exif? ( media-libs/libexif )
gif? ( media-libs/giflib )
gtk? ( dev-ml/lablgtk )

diff --git a/dev-ml/camlimages/camlimages-4.2.4.ebuild 
b/dev-ml/camlimages/camlimages-4.2.4.ebuild
index 9be34cb0db7..ab0b210a36c 100644
--- a/dev-ml/camlimages/camlimages-4.2.4.ebuild
+++ b/dev-ml/camlimages/camlimages-4.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="exif gif gtk jpeg png postscript tiff truetype X xpm"
 
-RDEPEND=">=dev-lang/ocaml-3.10.2:=[X?,ocamlopt]
+RDEPEND=">=dev-lang/ocaml-3.10.2:=[X(+)?,ocamlopt]
exif? ( media-libs/libexif )
gif? ( media-libs/giflib )
gtk? ( dev-ml/lablgtk )

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
index ebc669e81c2..c598fe1bdb4 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,7 @@ SLOT="0/${PV}"
 IUSE="+ocamlopt doc +deriving +ppx +react +xml X"
 
 RDEPEND="
-   >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
+   >=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:= )

diff --git a/dev-ml/labltk/labltk-8.06.2.ebuild 
b/dev-ml/labltk/labltk-8.06.2.ebuild
index cc5bfc3e116..9898bc5fa31 100644
--- a/dev-ml/labltk/labltk-8.06.2.ebuild
+++ b/dev-ml/labltk/labltk-8.06.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 
sparc x86 ~amd64-linu
 IUSE="+ocamlopt X"
 
 RDEPEND=">=dev-lang/tk-8.0.3:=
-   >=dev-lang/ocaml-4.04:=[ocamlopt?,X?]"
+   >=dev-lang/ocaml-4.04:=[ocamlopt?,X(+)?]"
 DEPEND="${RDEPEND}
>=dev-ml/findlib-1.5.5-r1"
 

diff --git a/dev-ml/labltk/labltk-8.06.3.ebuild 
b/dev-ml/labltk/labltk-8.06.3.ebuild
index 3695e8495ff..4b18b50e9a4 100644
--- a/dev-ml/labltk/labltk-8.06.3.ebuild
+++ b/dev-ml/labltk/labltk-8.06.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ 

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

2017-08-02 Thread Alexis Ballier
commit: 3d67e2fb49473ababb8bf7e5baf6316527fa472f
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Aug  2 10:40:35 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Aug  2 11:22:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d67e2fb

dev-ml/js_of_ocaml: add missing dev-ml/ocaml-migrate-parsetree:= dep in 2.8.4

Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../{js_of_ocaml-2.8.4-r1.ebuild => js_of_ocaml-2.8.4-r2.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
similarity index 98%
rename from dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild
rename to dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
index cac8f1d0da5..ebc669e81c2 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r2.ebuild
@@ -36,6 +36,7 @@ RDEPEND="
dev-ml/uchar:=
dev-ml/ocamlbuild:=
dev-ml/yojson:=
+   dev-ml/ocaml-migrate-parsetree:=
deriving? ( >=dev-ml/deriving-0.6:= )"
 DEPEND="${RDEPEND}"
 



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

2017-07-13 Thread Alexis Ballier
commit: fec5a15d92a88b7a3143c0f9c43355ff9aa4fb34
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Jul 13 22:39:19 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Jul 13 23:24:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec5a15d

dev-ml/js_of_ocaml: fix build with ocaml 4.05

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-ml/js_of_ocaml/files/ocaml405.patch| 41 ++
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild |  1 +
 2 files changed, 42 insertions(+)

diff --git a/dev-ml/js_of_ocaml/files/ocaml405.patch 
b/dev-ml/js_of_ocaml/files/ocaml405.patch
new file mode 100644
index 000..552dff425c4
--- /dev/null
+++ b/dev-ml/js_of_ocaml/files/ocaml405.patch
@@ -0,0 +1,41 @@
+Index: js_of_ocaml-2.8.4/lib/ppx/ppx_js.ml
+===
+--- js_of_ocaml-2.8.4.orig/lib/ppx/ppx_js.ml
 js_of_ocaml-2.8.4/lib/ppx/ppx_js.ml
+@@ -162,7 +162,8 @@ let invoker ?(extra_types = []) uplift d
+  {[ fun (type res t0 t1 ..) arg1 arg2 -> e ]}
+   *)
+   let local_types =
+-res :: List.map Arg.name (extra_types @ arguments)
++List.map Location.mknoloc
++(res :: List.map Arg.name (extra_types @ arguments))
+   in
+   let result = List.fold_right Exp.newtype local_types invoker in
+ 
+@@ -210,7 +211,7 @@ let method_call ~loc obj meth args =
+  (Exp.fun_ ~loc ~attrs:[merlin_noloc] Label.nolabel None
+ (Pat.var ~loc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
+ (Exp.send ~loc ~attrs:[merlin_noloc]
+-   (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) meth))]
++   (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc 
meth)))]
+   )
+ 
+ (* {[ obj##.prop ]} generates
+@@ -244,7 +245,7 @@ let prop_get ~loc:_ ~prop_loc obj prop =
+ (Exp.fun_ ~loc:gloc Label.nolabel None
+(Pat.var ~loc:gloc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
+(Exp.send ~loc:prop_loc ~attrs:[merlin_noloc]
+-  (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) prop))
++  (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc 
prop)))
+ ]
+   )
+ 
+@@ -289,7 +290,7 @@ let prop_set ~loc ~prop_loc obj prop val
+ (Exp.fun_ ~loc Label.nolabel None
+(Pat.var ~loc:gloc ~attrs:[merlin_noloc] (Location.mknoloc "x"))
+(Exp.send ~loc:prop_loc ~attrs:[merlin_noloc]
+-  (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) prop))
++  (Exp.ident ~loc:gloc (lid ~loc:gloc "x")) (Location.mknoloc 
prop)))
+ ]
+   )
+ 

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild
index 9331122157d..cac8f1d0da5 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4-r1.ebuild
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
epatch "${FILESDIR}/ppx.patch"
+   has_version '>=dev-lang/ocaml-4.05_rc' && epatch 
"${FILESDIR}/ocaml405.patch"
 }
 
 src_configure() {



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

2017-06-22 Thread Alexis Ballier
commit: 97deb89461d9abef0be98c0f185e3e1c80b287bf
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Jun 22 13:47:38 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Jun 22 14:24:36 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97deb894

dev-ml/js_of_ocaml: default enable previously mandatory flags

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild | 2 +-
 dev-ml/js_of_ocaml/js_of_ocaml-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
index 3a44770cfb6..9fe8dff84ed 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-IUSE="+ocamlopt camlp4 lwt doc +deriving +ppx +xml test"
+IUSE="+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test"
 
 RDEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?]

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
index 3a44770cfb6..9fe8dff84ed 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-IUSE="+ocamlopt camlp4 lwt doc +deriving +ppx +xml test"
+IUSE="+ocamlopt +camlp4 +lwt doc +deriving +ppx +xml test"
 
 RDEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?]



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

2017-06-22 Thread Alexis Ballier
commit: 0dc5e83d174cd5271de5c6829ee987844a9eb886
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Jun 22 12:46:29 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Jun 22 14:24:34 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc5e83d

dev-ml/js_of_ocaml: bump to 3.0.0 and update live ebuild

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-ml/js_of_ocaml/Manifest |  1 +
 dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild | 75 +
 dev-ml/js_of_ocaml/js_of_ocaml-.ebuild  | 72 +++
 dev-ml/js_of_ocaml/metadata.xml |  2 +
 4 files changed, 119 insertions(+), 31 deletions(-)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index 6a21ead28e5..3790dbaf16c 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1 +1,2 @@
 DIST js_of_ocaml-2.8.4.tar.gz 1344082 SHA256 
74edd38a964fcee930778a908c896b5c9795f64fc34a3c58361ccfa441811725 SHA512 
8dc65bac7d60f2d3534e31e0fddb061f1b97bfd8146b1a34b4a1a516574c6a39f66d115646aa9767b7e24a51ec76949b05841088601f97d76972c8899a50c4fd
 WHIRLPOOL 
bc444184519ae90d308ae4675078e1d5fd461ea32f4dccf5e74bab25f0a0e8ba49d229f951205effd676b337656633fb7046cd908c2167799253dcee0a61f20f
+DIST js_of_ocaml-3.0.0.tar.gz 1433377 SHA256 
eb49ca6d66ac51a41cf611f1a6a85269d310dbc1711ac4b819c9a04ee53b5a4e SHA512 
dc4bbbfdacb43338aa7f97b7012b6de8a2eac5d7c5f535ceb9565c477c961a212ce5b2a75b1719fcd9f2d57938ee2162f6f04d3364397a469d7a13d1fe4e3908
 WHIRLPOOL 
a43b35000af7714f571f0cf373b529883063194ff0a4b57a9bae9670b257ee38288a5b8f4caf19b9ee18fdceeea0a2f5fc0f45cd503ebfa1281b657115a54fc1

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
new file mode 100644
index 000..3a44770cfb6
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-3.0.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
+
+if [ "${PV#}" != "${PV}" ] ; then
+   inherit git-r3
+   SRC_URI=""
+   EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml;
+   KEYWORDS=""
+else
+   SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+ocamlopt camlp4 lwt doc +deriving +ppx +xml test"
+
+RDEPEND="
+   >=dev-lang/ocaml-3.12:=[ocamlopt?]
+
+   camlp4? ( dev-ml/camlp4:= )
+
+   dev-ml/cmdliner:=
+   dev-ml/cppo:=
+
+   lwt? ( >=dev-ml/lwt-2.4.4:= )
+
+   dev-ml/ocamlbuild:=
+
+   dev-ml/ocaml-migrate-parsetree:=
+   dev-ml/ppx_tools_versioned:=
+   dev-ml/uchar:=
+
+   ppx? ( dev-ml/ppx_tools:= dev-ml/ppx_deriving:= )
+
+   xml? ( >=dev-ml/tyxml-4:= dev-ml/reactiveData:= )
+"
+DEPEND="${RDEPEND}
+   dev-ml/jbuilder
+   dev-ml/opam
+   test? ( dev-util/patdiff )
+"
+REQUIRED_USE="xml? ( ppx )"
+
+src_compile() {
+   emake
+   use doc && emake doc
+}
+
+oinstall() {
+   opam-installer -i \
+   --prefix="${ED}/usr" \
+   --libdir="${D}/$(ocamlc -where)" \
+   --docdir="${ED}/usr/share/doc/${PF}" \
+   --mandir="${ED}/usr/share/man" \
+   ${1}.install || die
+}
+
+src_install() {
+   use camlp4 && oinstall js_of_ocaml-camlp4
+   oinstall js_of_ocaml-compiler
+   use lwt && oinstall js_of_ocaml-lwt
+   oinstall js_of_ocaml-ocamlbuild
+   oinstall js_of_ocaml
+   use ppx && oinstall js_of_ocaml-ppx
+   use ppx && oinstall js_of_ocaml-toplevel
+   use xml && oinstall js_of_ocaml-tyxml
+}

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
index 5b17a890bb3..3a44770cfb6 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
@@ -20,46 +20,56 @@ fi
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-IUSE="+ocamlopt doc +deriving +ppx +react +xml X"
+IUSE="+ocamlopt camlp4 lwt doc +deriving +ppx +xml test"
 
 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:= dev-ml/ppx_deriving:= dev-ml/ppx_driver:= )
+   >=dev-lang/ocaml-3.12:=[ocamlopt?]
+
+   camlp4? ( dev-ml/camlp4:= )
+
dev-ml/cmdliner:=
-   dev-ml/menhir:=
-   dev-ml/ocaml-base64:=
-   dev-ml/camlp4:=
dev-ml/cppo:=
-   dev-ml/uchar:=
+
+   lwt? ( >=dev-ml/lwt-2.4.4:= )
+
dev-ml/ocamlbuild:=
-   dev-ml/yojson:=
-   deriving? ( >=dev-ml/deriving-0.6:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-   printf 

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

2017-04-18 Thread Alexis Ballier
commit: ed40f0d4086818bc455b2db2127bcac78116d01c
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Apr 18 20:01:36 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Apr 18 20:09:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed40f0d4

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

 .../{js_of_ocaml-2.8.4.ebuild => js_of_ocaml-2.8.4-r1.ebuild} | 8 
 dev-ml/js_of_ocaml/js_of_ocaml-.ebuild| 8 
 dev-ml/js_of_ocaml/metadata.xml   | 1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

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 11d4b7ce009..9331122157d 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-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-.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
index a68da44990b..5b17a890bb3 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-.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 0b34c19deed..904a7a4498e 100644
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ b/dev-ml/js_of_ocaml/metadata.xml
@@ -8,7 +8,6 @@
   
 Enable dev-ml/deriving support for 
improving the type safety.
Enables the ppx syntax extension
-   Enables deriving support through ppx syntax 
extensions.
Enable functionnal reactive programming 
support.
   
   



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

2017-04-02 Thread Alexis Ballier
commit: 8afec5ec5f3e8cc64e1b781509cb41d4c26ce1e8
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Apr  1 21:42:07 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Apr  2 08:38:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8afec5ec

dev-ml/js_of_ocaml: Drop async support, will be readded with dev-ml/async_js.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild | 7 +++
 dev-ml/js_of_ocaml/js_of_ocaml-.ebuild  | 7 +++
 dev-ml/js_of_ocaml/metadata.xml | 1 -
 3 files changed, 6 insertions(+), 9 deletions(-)

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 212d6dd4065..a68da44990b 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,12 +20,11 @@ fi
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
+IUSE="+ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
 
 RDEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
>=dev-ml/lwt-2.4.4:=[camlp4(+)]
-   async? ( dev-ml/async_kernel:= )
react? ( dev-ml/react:=  dev-ml/reactiveData:= )
xml? ( >=dev-ml/tyxml-4:= )
ppx? ( dev-ml/ppx_tools:= )
@@ -50,7 +49,7 @@ src_configure() {
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 async || echo "WITH_ASYNC := NO" >> Makefile.conf
+   echo "WITH_ASYNC := NO" >> Makefile.conf
 }
 
 src_compile() {

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
index 212d6dd4065..a68da44990b 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,12 +20,11 @@ fi
 
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
-IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
+IUSE="+ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
 
 RDEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
>=dev-ml/lwt-2.4.4:=[camlp4(+)]
-   async? ( dev-ml/async_kernel:= )
react? ( dev-ml/react:=  dev-ml/reactiveData:= )
xml? ( >=dev-ml/tyxml-4:= )
ppx? ( dev-ml/ppx_tools:= )
@@ -50,7 +49,7 @@ src_configure() {
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 async || echo "WITH_ASYNC := NO" >> Makefile.conf
+   echo "WITH_ASYNC := NO" >> Makefile.conf
 }
 
 src_compile() {

diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
index 61eb3e1f870..0b34c19deed 100644
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ b/dev-ml/js_of_ocaml/metadata.xml
@@ -6,7 +6,6 @@
 Gentoo ML Project
   
   
-   Enable support of 
dev-ml/async_kernel.
 Enable dev-ml/deriving support for 
improving the type safety.
Enables the ppx syntax extension
Enables deriving support through ppx syntax 
extensions.



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

2017-04-02 Thread Alexis Ballier
commit: a94a3df89153fa514be328be032071c2d41545e7
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Apr  1 21:50:21 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Apr  2 08:38:03 2017 +
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 000..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



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

2017-01-24 Thread Alexis Ballier
commit: 40cb769726ee7bde587b4c07e53e0dd95edc0222
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Jan 24 11:06:51 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jan 24 11:07:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40cb7697

dev-ml/js_of_ocaml: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/js_of_ocaml/Manifest |  1 -
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild | 66 -
 2 files changed, 67 deletions(-)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index 5f4b5ea..6a21ead 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1,2 +1 @@
-DIST js_of_ocaml-2.8.3.tar.gz 1335811 SHA256 
a77e9d4896431742604cba69fb87f9022587de86f2c6d41a6b58e9c24b103c77 SHA512 
89908f3da1846f4fe24e1109ba262507221ed67d58bec1d8b7c53ec82438febbab66bdb3bec697e2880842253777167ef1563687cae414426e8ea1dcc00a323a
 WHIRLPOOL 
b299214ed367f7aa2252a76a7d49f68f219aaf3ab9901eafa354e937a7dbe4913657a6c1c6fdc85337d63c04b90a5f835b3cf9c321840528188a496f6bfc3d37
 DIST js_of_ocaml-2.8.4.tar.gz 1344082 SHA256 
74edd38a964fcee930778a908c896b5c9795f64fc34a3c58361ccfa441811725 SHA512 
8dc65bac7d60f2d3534e31e0fddb061f1b97bfd8146b1a34b4a1a516574c6a39f66d115646aa9767b7e24a51ec76949b05841088601f97d76972c8899a50c4fd
 WHIRLPOOL 
bc444184519ae90d308ae4675078e1d5fd461ea32f4dccf5e74bab25f0a0e8ba49d229f951205effd676b337656633fb7046cd908c2167799253dcee0a61f20f

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild
deleted file mode 100644
index 1eb80bd..
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="A compiler from OCaml bytecode to javascript"
-HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
-
-if [ "${PV#}" != "${PV}" ] ; then
-   inherit git-r3
-   SRC_URI=""
-   EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml;
-   KEYWORDS=""
-else
-   SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
-
-RDEPEND="
-   >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
-   >=dev-ml/lwt-2.4.4:=[camlp4(+)]
-   async? ( dev-ml/async_kernel:= )
-   react? ( dev-ml/react:=  dev-ml/reactiveData:= )
-   xml? ( >=dev-ml/tyxml-4:= )
-   ppx? ( dev-ml/ppx_tools:= )
-   ppx-deriving? ( dev-ml/ppx_deriving:= )
-   dev-ml/cmdliner:=
-   dev-ml/menhir:=
-   dev-ml/ocaml-base64:=
-   dev-ml/camlp4:=
-   dev-ml/cppo:=
-   dev-ml/uchar:=
-   dev-ml/ocamlbuild:=
-   deriving? ( >=dev-ml/deriving-0.6:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-   printf "\n\n" >> Makefile.conf
-   use ocamlopt || echo "BEST := byte" >> Makefile.conf
-   use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
-   use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
-   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 async || echo "WITH_ASYNC := NO" >> Makefile.conf
-}
-
-src_compile() {
-   emake -j1
-   use doc && emake doc
-}
-
-src_install() {
-   findlib_src_preinst
-   emake BINDIR="${ED}/usr/bin/" install
-   dodoc CHANGES README.md
-   use doc && dohtml -r doc/api/html/
-}



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

2016-12-22 Thread Alexis Ballier
commit: 3dc083fa2d58d3d428218e755dd12b8098aaeb2d
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Dec 22 19:44:18 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Dec 22 20:07:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc083fa

dev-ml/js_of_ocaml: add missing dep on yojson

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild | 1 +
 dev-ml/js_of_ocaml/js_of_ocaml-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

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 1eb80bd..457de52 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
@@ -38,6 +38,7 @@ RDEPEND="
dev-ml/cppo:=
dev-ml/uchar:=
dev-ml/ocamlbuild:=
+   dev-ml/yojson:=
deriving? ( >=dev-ml/deriving-0.6:= )"
 DEPEND="${RDEPEND}"
 

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
index 1eb80bd..457de52 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
dev-ml/cppo:=
dev-ml/uchar:=
dev-ml/ocamlbuild:=
+   dev-ml/yojson:=
deriving? ( >=dev-ml/deriving-0.6:= )"
 DEPEND="${RDEPEND}"
 



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

2016-12-22 Thread Alexis Ballier
commit: 684d124882f0382d155a831a9bfb3a42e5c76240
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Dec 22 18:51:57 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Dec 22 20:07:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684d1248

dev-ml/js_of_ocaml: bump to 2.8.4

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/js_of_ocaml/Manifest |  1 +
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild | 66 +
 2 files changed, 67 insertions(+)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index 7cd7991..5f4b5ea 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1 +1,2 @@
 DIST js_of_ocaml-2.8.3.tar.gz 1335811 SHA256 
a77e9d4896431742604cba69fb87f9022587de86f2c6d41a6b58e9c24b103c77 SHA512 
89908f3da1846f4fe24e1109ba262507221ed67d58bec1d8b7c53ec82438febbab66bdb3bec697e2880842253777167ef1563687cae414426e8ea1dcc00a323a
 WHIRLPOOL 
b299214ed367f7aa2252a76a7d49f68f219aaf3ab9901eafa354e937a7dbe4913657a6c1c6fdc85337d63c04b90a5f835b3cf9c321840528188a496f6bfc3d37
+DIST js_of_ocaml-2.8.4.tar.gz 1344082 SHA256 
74edd38a964fcee930778a908c896b5c9795f64fc34a3c58361ccfa441811725 SHA512 
8dc65bac7d60f2d3534e31e0fddb061f1b97bfd8146b1a34b4a1a516574c6a39f66d115646aa9767b7e24a51ec76949b05841088601f97d76972c8899a50c4fd
 WHIRLPOOL 
bc444184519ae90d308ae4675078e1d5fd461ea32f4dccf5e74bab25f0a0e8ba49d229f951205effd676b337656633fb7046cd908c2167799253dcee0a61f20f

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
new file mode 100644
index ..1eb80bd
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.4.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
+
+if [ "${PV#}" != "${PV}" ] ; then
+   inherit git-r3
+   SRC_URI=""
+   EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml;
+   KEYWORDS=""
+else
+   SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
+
+RDEPEND="
+   >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
+   >=dev-ml/lwt-2.4.4:=[camlp4(+)]
+   async? ( dev-ml/async_kernel:= )
+   react? ( dev-ml/react:=  dev-ml/reactiveData:= )
+   xml? ( >=dev-ml/tyxml-4:= )
+   ppx? ( dev-ml/ppx_tools:= )
+   ppx-deriving? ( dev-ml/ppx_deriving:= )
+   dev-ml/cmdliner:=
+   dev-ml/menhir:=
+   dev-ml/ocaml-base64:=
+   dev-ml/camlp4:=
+   dev-ml/cppo:=
+   dev-ml/uchar:=
+   dev-ml/ocamlbuild:=
+   deriving? ( >=dev-ml/deriving-0.6:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   printf "\n\n" >> Makefile.conf
+   use ocamlopt || echo "BEST := byte" >> Makefile.conf
+   use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
+   use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
+   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 async || echo "WITH_ASYNC := NO" >> Makefile.conf
+}
+
+src_compile() {
+   emake -j1
+   use doc && emake doc
+}
+
+src_install() {
+   findlib_src_preinst
+   emake BINDIR="${ED}/usr/bin/" install
+   dodoc CHANGES README.md
+   use doc && dohtml -r doc/api/html/
+}



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

2016-12-07 Thread Alexis Ballier
commit: c6548e6fefc44f50ef14093f45e6f8b81d1ad49b
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Dec  7 17:21:55 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Dec  7 19:31:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6548e6f

dev-ml/js_of_ocaml: require camlp4 on lwt.

Package-Manager: portage-2.3.3

 dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild | 2 +-
 dev-ml/js_of_ocaml/js_of_ocaml-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild
index 9e1c155..1eb80bd 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild
@@ -25,7 +25,7 @@ IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving 
+react +xml X"
 
 RDEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
-   >=dev-ml/lwt-2.4.4:=
+   >=dev-ml/lwt-2.4.4:=[camlp4(+)]
async? ( dev-ml/async_kernel:= )
react? ( dev-ml/react:=  dev-ml/reactiveData:= )
xml? ( >=dev-ml/tyxml-4:= )

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
index 9e1c155..1eb80bd 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
@@ -25,7 +25,7 @@ IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving 
+react +xml X"
 
 RDEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
-   >=dev-ml/lwt-2.4.4:=
+   >=dev-ml/lwt-2.4.4:=[camlp4(+)]
async? ( dev-ml/async_kernel:= )
react? ( dev-ml/react:=  dev-ml/reactiveData:= )
xml? ( >=dev-ml/tyxml-4:= )



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

2016-12-07 Thread Alexis Ballier
commit: e10248cc62c5a80b25699cd93c6539fa7cfaefe9
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Dec  7 17:12:09 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Dec  7 19:31:39 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e10248cc

dev-ml/js_of_ocaml: remove old

Package-Manager: portage-2.3.3

 dev-ml/js_of_ocaml/Manifest|  1 -
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.2-r1.ebuild | 66 --
 2 files changed, 67 deletions(-)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index 4e0d767..7cd7991 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1,2 +1 @@
-DIST js_of_ocaml-2.8.2.tar.gz 1334891 SHA256 
93d55c7a4883783acb3eee4c6a126993f548f1467d1f08a8d72fa30385a673c4 SHA512 
07550311b53a54ec55b5b1e63acbf8eee4757d643cf9639efb035faa029cde4b47c46d732dd2fa3ec0606edf1ef094d096a375c694b0b7255ada16e0c632c4ed
 WHIRLPOOL 
6eac8dccd5217aaa91dc3f899a6ec949afff725dcd1d60276660b0c2e4ca71faf2d55c0a747a3cab05ca55cf7962aa4dbcd2679ec4f8639c7ccbdf414a105d56
 DIST js_of_ocaml-2.8.3.tar.gz 1335811 SHA256 
a77e9d4896431742604cba69fb87f9022587de86f2c6d41a6b58e9c24b103c77 SHA512 
89908f3da1846f4fe24e1109ba262507221ed67d58bec1d8b7c53ec82438febbab66bdb3bec697e2880842253777167ef1563687cae414426e8ea1dcc00a323a
 WHIRLPOOL 
b299214ed367f7aa2252a76a7d49f68f219aaf3ab9901eafa354e937a7dbe4913657a6c1c6fdc85337d63c04b90a5f835b3cf9c321840528188a496f6bfc3d37

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2-r1.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2-r1.ebuild
deleted file mode 100644
index 9e1c155..
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="A compiler from OCaml bytecode to javascript"
-HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
-
-if [ "${PV#}" != "${PV}" ] ; then
-   inherit git-r3
-   SRC_URI=""
-   EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml;
-   KEYWORDS=""
-else
-   SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-   KEYWORDS="~amd64"
-fi
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
-
-RDEPEND="
-   >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
-   >=dev-ml/lwt-2.4.4:=
-   async? ( dev-ml/async_kernel:= )
-   react? ( dev-ml/react:=  dev-ml/reactiveData:= )
-   xml? ( >=dev-ml/tyxml-4:= )
-   ppx? ( dev-ml/ppx_tools:= )
-   ppx-deriving? ( dev-ml/ppx_deriving:= )
-   dev-ml/cmdliner:=
-   dev-ml/menhir:=
-   dev-ml/ocaml-base64:=
-   dev-ml/camlp4:=
-   dev-ml/cppo:=
-   dev-ml/uchar:=
-   dev-ml/ocamlbuild:=
-   deriving? ( >=dev-ml/deriving-0.6:= )"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-   printf "\n\n" >> Makefile.conf
-   use ocamlopt || echo "BEST := byte" >> Makefile.conf
-   use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
-   use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
-   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 async || echo "WITH_ASYNC := NO" >> Makefile.conf
-}
-
-src_compile() {
-   emake -j1
-   use doc && emake doc
-}
-
-src_install() {
-   findlib_src_preinst
-   emake BINDIR="${ED}/usr/bin/" install
-   dodoc CHANGES README.md
-   use doc && dohtml -r doc/api/html/
-}



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

2016-11-09 Thread Alexis Ballier
commit: 9ff3ec4217883d259652cb5e90bb73b81eaecffb
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Nov  9 10:05:43 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Nov  9 16:09:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ff3ec42

dev-ml/js_of_ocaml: bump to 2.8.3

Package-Manager: portage-2.3.2

 dev-ml/js_of_ocaml/Manifest |  1 +
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild | 66 +
 2 files changed, 67 insertions(+)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index 626682d..4e0d767 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1 +1,2 @@
 DIST js_of_ocaml-2.8.2.tar.gz 1334891 SHA256 
93d55c7a4883783acb3eee4c6a126993f548f1467d1f08a8d72fa30385a673c4 SHA512 
07550311b53a54ec55b5b1e63acbf8eee4757d643cf9639efb035faa029cde4b47c46d732dd2fa3ec0606edf1ef094d096a375c694b0b7255ada16e0c632c4ed
 WHIRLPOOL 
6eac8dccd5217aaa91dc3f899a6ec949afff725dcd1d60276660b0c2e4ca71faf2d55c0a747a3cab05ca55cf7962aa4dbcd2679ec4f8639c7ccbdf414a105d56
+DIST js_of_ocaml-2.8.3.tar.gz 1335811 SHA256 
a77e9d4896431742604cba69fb87f9022587de86f2c6d41a6b58e9c24b103c77 SHA512 
89908f3da1846f4fe24e1109ba262507221ed67d58bec1d8b7c53ec82438febbab66bdb3bec697e2880842253777167ef1563687cae414426e8ea1dcc00a323a
 WHIRLPOOL 
b299214ed367f7aa2252a76a7d49f68f219aaf3ab9901eafa354e937a7dbe4913657a6c1c6fdc85337d63c04b90a5f835b3cf9c321840528188a496f6bfc3d37

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild
new file mode 100644
index ..9e1c155
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
+
+if [ "${PV#}" != "${PV}" ] ; then
+   inherit git-r3
+   SRC_URI=""
+   EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml;
+   KEYWORDS=""
+else
+   SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
+
+RDEPEND="
+   >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
+   >=dev-ml/lwt-2.4.4:=
+   async? ( dev-ml/async_kernel:= )
+   react? ( dev-ml/react:=  dev-ml/reactiveData:= )
+   xml? ( >=dev-ml/tyxml-4:= )
+   ppx? ( dev-ml/ppx_tools:= )
+   ppx-deriving? ( dev-ml/ppx_deriving:= )
+   dev-ml/cmdliner:=
+   dev-ml/menhir:=
+   dev-ml/ocaml-base64:=
+   dev-ml/camlp4:=
+   dev-ml/cppo:=
+   dev-ml/uchar:=
+   dev-ml/ocamlbuild:=
+   deriving? ( >=dev-ml/deriving-0.6:= )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   printf "\n\n" >> Makefile.conf
+   use ocamlopt || echo "BEST := byte" >> Makefile.conf
+   use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
+   use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
+   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 async || echo "WITH_ASYNC := NO" >> Makefile.conf
+}
+
+src_compile() {
+   emake -j1
+   use doc && emake doc
+}
+
+src_install() {
+   findlib_src_preinst
+   emake BINDIR="${ED}/usr/bin/" install
+   dodoc CHANGES README.md
+   use doc && dohtml -r doc/api/html/
+}



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

2016-10-07 Thread Alexis Ballier
commit: 298bd8ceb4e68a3846f864dcc5ee08d1ac5c2519
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Oct  7 16:22:17 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Oct  7 16:28:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=298bd8ce

dev-ml/js_of_ocaml: move ocamlbuild to rdepend and add := dep on it

Package-Manager: portage-2.3.1

 .../{js_of_ocaml-2.8.2.ebuild => js_of_ocaml-2.8.2-r1.ebuild} | 4 ++--
 dev-ml/js_of_ocaml/js_of_ocaml-.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2-r1.ebuild
similarity index 97%
rename from dev-ml/js_of_ocaml/js_of_ocaml-2.8.2.ebuild
rename to dev-ml/js_of_ocaml/js_of_ocaml-2.8.2-r1.ebuild
index 41d79c3..9e1c155 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2-r1.ebuild
@@ -37,9 +37,9 @@ RDEPEND="
dev-ml/camlp4:=
dev-ml/cppo:=
dev-ml/uchar:=
+   dev-ml/ocamlbuild:=
deriving? ( >=dev-ml/deriving-0.6:= )"
-DEPEND="${RDEPEND}
-   dev-ml/ocamlbuild"
+DEPEND="${RDEPEND}"
 
 src_configure() {
printf "\n\n" >> Makefile.conf

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
index 41d79c3..9e1c155 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
@@ -37,9 +37,9 @@ RDEPEND="
dev-ml/camlp4:=
dev-ml/cppo:=
dev-ml/uchar:=
+   dev-ml/ocamlbuild:=
deriving? ( >=dev-ml/deriving-0.6:= )"
-DEPEND="${RDEPEND}
-   dev-ml/ocamlbuild"
+DEPEND="${RDEPEND}"
 
 src_configure() {
printf "\n\n" >> Makefile.conf



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

2016-10-07 Thread Alexis Ballier
commit: 986ceba6d63e209f68ab2db29c848c15324ff028
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Oct  7 16:21:24 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Oct  7 16:28:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986ceba6

dev-ml/js_of_ocaml: remove  old

Package-Manager: portage-2.3.1

 dev-ml/js_of_ocaml/Manifest |  1 -
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.1.ebuild | 57 -
 2 files changed, 58 deletions(-)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index a38e8c7..626682d 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1,2 +1 @@
-DIST js_of_ocaml-2.8.1.tar.gz 1329825 SHA256 
954ed80b3f37e10666e36ffa3c1d846e1913b8c7be9f0af79889f829b1333e1e SHA512 
bce4b173c29396ce7f28f12afd3185cdf402150a7390b9f5a21f14f71e72b3e5ae16234ed65e9d7b18ed2c0de524b658495d62d4673dfe3e61d5f0556b5a125c
 WHIRLPOOL 
ac66e7fa70e7365dc5a404d95b9f14186d727756df3aaebfa5d433237d33cb1f070ad74db12136b2a2b2db75b3eac127729343838f361000f962f2a5bc309d79
 DIST js_of_ocaml-2.8.2.tar.gz 1334891 SHA256 
93d55c7a4883783acb3eee4c6a126993f548f1467d1f08a8d72fa30385a673c4 SHA512 
07550311b53a54ec55b5b1e63acbf8eee4757d643cf9639efb035faa029cde4b47c46d732dd2fa3ec0606edf1ef094d096a375c694b0b7255ada16e0c632c4ed
 WHIRLPOOL 
6eac8dccd5217aaa91dc3f899a6ec949afff725dcd1d60276660b0c2e4ca71faf2d55c0a747a3cab05ca55cf7962aa4dbcd2679ec4f8639c7ccbdf414a105d56

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.1.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.1.ebuild
deleted file mode 100644
index 58bce36..
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib eutils
-
-DESCRIPTION="A compiler from OCaml bytecode to javascript"
-HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
-SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
-
-RDEPEND="
-   >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
-   >=dev-ml/lwt-2.4.4:=
-   async? ( dev-ml/async_kernel:= )
-   react? ( dev-ml/react:=  dev-ml/reactiveData:= )
-   xml? ( >=dev-ml/tyxml-4:= )
-   ppx? ( dev-ml/ppx_tools:= )
-   ppx-deriving? ( dev-ml/ppx_deriving:= )
-   dev-ml/cmdliner:=
-   dev-ml/menhir:=
-   dev-ml/ocaml-base64:=
-   dev-ml/camlp4:=
-   dev-ml/cppo:=
-   deriving? ( >=dev-ml/deriving-0.6:= )"
-DEPEND="${RDEPEND}
-   dev-ml/ocamlbuild"
-
-src_configure() {
-   printf "\n\n" >> Makefile.conf
-   use ocamlopt || echo "BEST := byte" >> Makefile.conf
-   use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
-   use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
-   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 async || echo "WITH_ASYNC := NO" >> Makefile.conf
-}
-
-src_compile() {
-   emake -j1
-   use doc && emake doc
-}
-
-src_install() {
-   findlib_src_preinst
-   emake BINDIR="${ED}/usr/bin/" install
-   dodoc CHANGES README.md
-   use doc && dohtml -r doc/api/html/
-}



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

2016-09-13 Thread Alexis Ballier
commit: f1b551e72e3c70117c3bbc53a4c9af867eb53567
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Sep 12 09:46:47 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Sep 13 12:30:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1b551e7

dev-ml/js_of_ocaml: bump to 2.8.2

Package-Manager: portage-2.3.0

 dev-ml/js_of_ocaml/Manifest |  1 +
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.2.ebuild | 66 +
 2 files changed, 67 insertions(+)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index 470a36f..a38e8c7 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1 +1,2 @@
 DIST js_of_ocaml-2.8.1.tar.gz 1329825 SHA256 
954ed80b3f37e10666e36ffa3c1d846e1913b8c7be9f0af79889f829b1333e1e SHA512 
bce4b173c29396ce7f28f12afd3185cdf402150a7390b9f5a21f14f71e72b3e5ae16234ed65e9d7b18ed2c0de524b658495d62d4673dfe3e61d5f0556b5a125c
 WHIRLPOOL 
ac66e7fa70e7365dc5a404d95b9f14186d727756df3aaebfa5d433237d33cb1f070ad74db12136b2a2b2db75b3eac127729343838f361000f962f2a5bc309d79
+DIST js_of_ocaml-2.8.2.tar.gz 1334891 SHA256 
93d55c7a4883783acb3eee4c6a126993f548f1467d1f08a8d72fa30385a673c4 SHA512 
07550311b53a54ec55b5b1e63acbf8eee4757d643cf9639efb035faa029cde4b47c46d732dd2fa3ec0606edf1ef094d096a375c694b0b7255ada16e0c632c4ed
 WHIRLPOOL 
6eac8dccd5217aaa91dc3f899a6ec949afff725dcd1d60276660b0c2e4ca71faf2d55c0a747a3cab05ca55cf7962aa4dbcd2679ec4f8639c7ccbdf414a105d56

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2.ebuild
new file mode 100644
index ..41d79c3
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.2.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
+
+if [ "${PV#}" != "${PV}" ] ; then
+   inherit git-r3
+   SRC_URI=""
+   EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml;
+   KEYWORDS=""
+else
+   SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
+
+RDEPEND="
+   >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
+   >=dev-ml/lwt-2.4.4:=
+   async? ( dev-ml/async_kernel:= )
+   react? ( dev-ml/react:=  dev-ml/reactiveData:= )
+   xml? ( >=dev-ml/tyxml-4:= )
+   ppx? ( dev-ml/ppx_tools:= )
+   ppx-deriving? ( dev-ml/ppx_deriving:= )
+   dev-ml/cmdliner:=
+   dev-ml/menhir:=
+   dev-ml/ocaml-base64:=
+   dev-ml/camlp4:=
+   dev-ml/cppo:=
+   dev-ml/uchar:=
+   deriving? ( >=dev-ml/deriving-0.6:= )"
+DEPEND="${RDEPEND}
+   dev-ml/ocamlbuild"
+
+src_configure() {
+   printf "\n\n" >> Makefile.conf
+   use ocamlopt || echo "BEST := byte" >> Makefile.conf
+   use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
+   use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
+   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 async || echo "WITH_ASYNC := NO" >> Makefile.conf
+}
+
+src_compile() {
+   emake -j1
+   use doc && emake doc
+}
+
+src_install() {
+   findlib_src_preinst
+   emake BINDIR="${ED}/usr/bin/" install
+   dodoc CHANGES README.md
+   use doc && dohtml -r doc/api/html/
+}



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

2016-09-07 Thread Alexis Ballier
commit: 3d546ae25cf8da778a7c3abbfa4c708b68b42094
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Sep  7 10:16:07 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Sep  7 10:23:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d546ae2

dev-ml/js_of_ocaml: add live ebuild

Package-Manager: portage-2.3.0

 dev-ml/js_of_ocaml/js_of_ocaml-.ebuild | 66 ++
 1 file changed, 66 insertions(+)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
new file mode 100644
index ..41d79c3
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
+
+if [ "${PV#}" != "${PV}" ] ; then
+   inherit git-r3
+   SRC_URI=""
+   EGIT_REPO_URI="https://github.com/ocsigen/js_of_ocaml;
+   KEYWORDS=""
+else
+   SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+fi
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
+
+RDEPEND="
+   >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
+   >=dev-ml/lwt-2.4.4:=
+   async? ( dev-ml/async_kernel:= )
+   react? ( dev-ml/react:=  dev-ml/reactiveData:= )
+   xml? ( >=dev-ml/tyxml-4:= )
+   ppx? ( dev-ml/ppx_tools:= )
+   ppx-deriving? ( dev-ml/ppx_deriving:= )
+   dev-ml/cmdliner:=
+   dev-ml/menhir:=
+   dev-ml/ocaml-base64:=
+   dev-ml/camlp4:=
+   dev-ml/cppo:=
+   dev-ml/uchar:=
+   deriving? ( >=dev-ml/deriving-0.6:= )"
+DEPEND="${RDEPEND}
+   dev-ml/ocamlbuild"
+
+src_configure() {
+   printf "\n\n" >> Makefile.conf
+   use ocamlopt || echo "BEST := byte" >> Makefile.conf
+   use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
+   use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
+   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 async || echo "WITH_ASYNC := NO" >> Makefile.conf
+}
+
+src_compile() {
+   emake -j1
+   use doc && emake doc
+}
+
+src_install() {
+   findlib_src_preinst
+   emake BINDIR="${ED}/usr/bin/" install
+   dodoc CHANGES README.md
+   use doc && dohtml -r doc/api/html/
+}



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

2016-09-07 Thread Alexis Ballier
commit: 915138df1231e929152fc5452e6b1c698b8c4481
Author: Alexis Ballier  gentoo  org>
AuthorDate: Wed Sep  7 09:53:00 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Wed Sep  7 09:57:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=915138df

dev-ml/js_of_ocaml: remove old

Package-Manager: portage-2.3.0

 dev-ml/js_of_ocaml/Manifest   |2 -
 dev-ml/js_of_ocaml/files/oc43.patch   | 1418 -
 dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild |   59 --
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.ebuild |   57 --
 4 files changed, 1536 deletions(-)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index 1e574d2..470a36f 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1,3 +1 @@
-DIST js_of_ocaml-2.7.tar.gz 1304487 SHA256 
52922f55428a1d8a55ec2493c4989152e06efd29a981adf8ac9f343f558854b5 SHA512 
ab6e5d16342bf763c10eb5c2e7589610622034eee2ad82aa09c6f68448f155a5c56584702307852b251bde80146c1b7115ed6add1358ad96b130c9dd2b96118b
 WHIRLPOOL 
278c17432fdf9bf670df33479c68705868be39eb4d53f67fc489fe44ac2e7645dd5e2ed3e6e71752a2387b516ce0ab6dc99ac1d870fc75ffdad9df87031e9de4
 DIST js_of_ocaml-2.8.1.tar.gz 1329825 SHA256 
954ed80b3f37e10666e36ffa3c1d846e1913b8c7be9f0af79889f829b1333e1e SHA512 
bce4b173c29396ce7f28f12afd3185cdf402150a7390b9f5a21f14f71e72b3e5ae16234ed65e9d7b18ed2c0de524b658495d62d4673dfe3e61d5f0556b5a125c
 WHIRLPOOL 
ac66e7fa70e7365dc5a404d95b9f14186d727756df3aaebfa5d433237d33cb1f070ad74db12136b2a2b2db75b3eac127729343838f361000f962f2a5bc309d79
-DIST js_of_ocaml-2.8.tar.gz 1330364 SHA256 
98564d9a36025edb5edd9d58c565fc7b38a3b49f9b8e32d7dc29289d443894b0 SHA512 
914b2a1a452acd494c3373fa65e858c2747bd7d946d6077320429160d4172f627978a0b4ee526fc6e39378dffc9c965b81e5a1f16eba1f60529e4a6b5f474c1e
 WHIRLPOOL 
cfb71c97c3c43e873dc1f83b26ccacf93be846940596e99f004e6539c5bfa15e810d290b254c4bfecce65133dc6b79247c3cb2cd301297b6062ac6526147f94d

diff --git a/dev-ml/js_of_ocaml/files/oc43.patch 
b/dev-ml/js_of_ocaml/files/oc43.patch
deleted file mode 100644
index face810..
--- a/dev-ml/js_of_ocaml/files/oc43.patch
+++ /dev/null
@@ -1,1418 +0,0 @@
-commit 3e4d39ece5a67bfc17f47c3da8a95ccca789abd5
-Author: Hugo Heuzard 
-Date:   Mon Mar 28 23:35:47 2016 +0100
-
-Deriving_json for ocaml 4.03
-
-move
-
-diff --git a/.gitignore b/.gitignore
-index 71e4ccf..ccbb796 100644
 a/.gitignore
-+++ b/.gitignore
-@@ -58,6 +58,7 @@ benchmarks/results
- benchmarks/config
- lib/deriving_json/deriving_Json_lexer.ml
- lib/ppx/ppx_js.ml
-+lib/ppx/ppx_deriving_json.ml
- lib/ppx/ppx_js
- Makefile.local
- 
-diff --git a/lib/ppx/ppx_deriving_json.cppo.ml 
b/lib/ppx/ppx_deriving_json.cppo.ml
-new file mode 100644
-index 000..814ed99
 /dev/null
-+++ b/lib/ppx/ppx_deriving_json.cppo.ml
-@@ -0,0 +1,711 @@
-+(* Js_of_ocaml
-+ * http://www.ocsigen.org
-+ * Copyright Vasilis Papavasileiou 2015
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU Lesser General Public License as published by
-+ * the Free Software Foundation, with linking exception;
-+ * either version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+ *)
-+
-+let deriver = "json"
-+
-+(* Copied (and adapted) this from ppx_deriving repo (commit
-+   e2079fa8f3460055bf990461f295c6c4b391fafc) ; we get an empty set of
-+   let bindings with ppx_deriving 3.0 *)
-+let sanitize expr = [%expr
-+  (let open! Ppx_deriving_runtime in [%e expr]) [@ocaml.warning "-A"]]
-+
-+let var_ptuple l =
-+  List.map Ast_convenience.pvar l |> Ast_helper.Pat.tuple
-+
-+let map_loc f {Location.txt; loc} =
-+  {Location.txt = f txt; loc}
-+
-+let suffix_lid {Location.txt; loc} ~suffix =
-+  let txt = Ppx_deriving.mangle_lid (`Suffix suffix) txt in
-+  Ast_helper.Exp.ident {txt; loc} ~loc
-+
-+let suffix_decl ({Parsetree.ptype_loc = loc} as d) ~suffix =
-+  (let s =
-+ Ppx_deriving.mangle_type_decl (`Suffix suffix) d |>
-+ Longident.parse
-+   in
-+   Location.mkloc s loc) |> Ast_helper.Exp.ident ~loc
-+
-+let suffix_decl_p ({Parsetree.ptype_loc = loc} as d) ~suffix =
-+  (let s = Ppx_deriving.mangle_type_decl (`Suffix suffix) d in
-+   Location.mkloc s loc) |> Ast_helper.Pat.var ~loc
-+
-+let rec fresh_vars ?(acc = []) n =
-+  if n <= 0 then
-+List.rev acc
-+  else
-+let acc = Ppx_deriving.fresh_var acc :: acc in
-+fresh_vars ~acc (n - 1)
-+
-+let unreachable_case 

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

2016-07-11 Thread Alexis Ballier
commit: d467378f4b10354c9f7e4baf87086a3d93b447c2
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jul  4 10:14:43 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jul 11 07:58:42 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d467378f

dev-ml/js_of_ocaml: bump to 2.8.1

Package-Manager: portage-2.3.0

 dev-ml/js_of_ocaml/Manifest |  1 +
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.1.ebuild | 57 +
 2 files changed, 58 insertions(+)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index 019ba1b..1e574d2 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1,2 +1,3 @@
 DIST js_of_ocaml-2.7.tar.gz 1304487 SHA256 
52922f55428a1d8a55ec2493c4989152e06efd29a981adf8ac9f343f558854b5 SHA512 
ab6e5d16342bf763c10eb5c2e7589610622034eee2ad82aa09c6f68448f155a5c56584702307852b251bde80146c1b7115ed6add1358ad96b130c9dd2b96118b
 WHIRLPOOL 
278c17432fdf9bf670df33479c68705868be39eb4d53f67fc489fe44ac2e7645dd5e2ed3e6e71752a2387b516ce0ab6dc99ac1d870fc75ffdad9df87031e9de4
+DIST js_of_ocaml-2.8.1.tar.gz 1329825 SHA256 
954ed80b3f37e10666e36ffa3c1d846e1913b8c7be9f0af79889f829b1333e1e SHA512 
bce4b173c29396ce7f28f12afd3185cdf402150a7390b9f5a21f14f71e72b3e5ae16234ed65e9d7b18ed2c0de524b658495d62d4673dfe3e61d5f0556b5a125c
 WHIRLPOOL 
ac66e7fa70e7365dc5a404d95b9f14186d727756df3aaebfa5d433237d33cb1f070ad74db12136b2a2b2db75b3eac127729343838f361000f962f2a5bc309d79
 DIST js_of_ocaml-2.8.tar.gz 1330364 SHA256 
98564d9a36025edb5edd9d58c565fc7b38a3b49f9b8e32d7dc29289d443894b0 SHA512 
914b2a1a452acd494c3373fa65e858c2747bd7d946d6077320429160d4172f627978a0b4ee526fc6e39378dffc9c965b81e5a1f16eba1f60529e4a6b5f474c1e
 WHIRLPOOL 
cfb71c97c3c43e873dc1f83b26ccacf93be846940596e99f004e6539c5bfa15e810d290b254c4bfecce65133dc6b79247c3cb2cd301297b6062ac6526147f94d

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.1.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.1.ebuild
new file mode 100644
index 000..58bce36
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
+SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
+
+RDEPEND="
+   >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
+   >=dev-ml/lwt-2.4.4:=
+   async? ( dev-ml/async_kernel:= )
+   react? ( dev-ml/react:=  dev-ml/reactiveData:= )
+   xml? ( >=dev-ml/tyxml-4:= )
+   ppx? ( dev-ml/ppx_tools:= )
+   ppx-deriving? ( dev-ml/ppx_deriving:= )
+   dev-ml/cmdliner:=
+   dev-ml/menhir:=
+   dev-ml/ocaml-base64:=
+   dev-ml/camlp4:=
+   dev-ml/cppo:=
+   deriving? ( >=dev-ml/deriving-0.6:= )"
+DEPEND="${RDEPEND}
+   dev-ml/ocamlbuild"
+
+src_configure() {
+   printf "\n\n" >> Makefile.conf
+   use ocamlopt || echo "BEST := byte" >> Makefile.conf
+   use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
+   use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
+   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 async || echo "WITH_ASYNC := NO" >> Makefile.conf
+}
+
+src_compile() {
+   emake -j1
+   use doc && emake doc
+}
+
+src_install() {
+   findlib_src_preinst
+   emake BINDIR="${ED}/usr/bin/" install
+   dodoc CHANGES README.md
+   use doc && dohtml -r doc/api/html/
+}



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

2016-06-20 Thread Alexis Ballier
commit: 225c6eecc035b5319a78cf4a14770555a16fbd0b
Author: Alexis Ballier  gentoo  org>
AuthorDate: Mon Jun 20 16:23:09 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Mon Jun 20 17:02:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=225c6eec

dev-ml/js_of_ocaml: bump to 2.8

Package-Manager: portage-2.3.0_rc1

 dev-ml/js_of_ocaml/Manifest   |  1 +
 dev-ml/js_of_ocaml/js_of_ocaml-2.8.ebuild | 57 +++
 dev-ml/js_of_ocaml/metadata.xml   |  1 +
 3 files changed, 59 insertions(+)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index e312923..019ba1b 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1 +1,2 @@
 DIST js_of_ocaml-2.7.tar.gz 1304487 SHA256 
52922f55428a1d8a55ec2493c4989152e06efd29a981adf8ac9f343f558854b5 SHA512 
ab6e5d16342bf763c10eb5c2e7589610622034eee2ad82aa09c6f68448f155a5c56584702307852b251bde80146c1b7115ed6add1358ad96b130c9dd2b96118b
 WHIRLPOOL 
278c17432fdf9bf670df33479c68705868be39eb4d53f67fc489fe44ac2e7645dd5e2ed3e6e71752a2387b516ce0ab6dc99ac1d870fc75ffdad9df87031e9de4
+DIST js_of_ocaml-2.8.tar.gz 1330364 SHA256 
98564d9a36025edb5edd9d58c565fc7b38a3b49f9b8e32d7dc29289d443894b0 SHA512 
914b2a1a452acd494c3373fa65e858c2747bd7d946d6077320429160d4172f627978a0b4ee526fc6e39378dffc9c965b81e5a1f16eba1f60529e4a6b5f474c1e
 WHIRLPOOL 
cfb71c97c3c43e873dc1f83b26ccacf93be846940596e99f004e6539c5bfa15e810d290b254c4bfecce65133dc6b79247c3cb2cd301297b6062ac6526147f94d

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.8.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.ebuild
new file mode 100644
index 000..58bce36
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.8.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
+SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+async +ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
+
+RDEPEND="
+   >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
+   >=dev-ml/lwt-2.4.4:=
+   async? ( dev-ml/async_kernel:= )
+   react? ( dev-ml/react:=  dev-ml/reactiveData:= )
+   xml? ( >=dev-ml/tyxml-4:= )
+   ppx? ( dev-ml/ppx_tools:= )
+   ppx-deriving? ( dev-ml/ppx_deriving:= )
+   dev-ml/cmdliner:=
+   dev-ml/menhir:=
+   dev-ml/ocaml-base64:=
+   dev-ml/camlp4:=
+   dev-ml/cppo:=
+   deriving? ( >=dev-ml/deriving-0.6:= )"
+DEPEND="${RDEPEND}
+   dev-ml/ocamlbuild"
+
+src_configure() {
+   printf "\n\n" >> Makefile.conf
+   use ocamlopt || echo "BEST := byte" >> Makefile.conf
+   use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
+   use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
+   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 async || echo "WITH_ASYNC := NO" >> Makefile.conf
+}
+
+src_compile() {
+   emake -j1
+   use doc && emake doc
+}
+
+src_install() {
+   findlib_src_preinst
+   emake BINDIR="${ED}/usr/bin/" install
+   dodoc CHANGES README.md
+   use doc && dohtml -r doc/api/html/
+}

diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
index 0b34c19..61eb3e1 100644
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ b/dev-ml/js_of_ocaml/metadata.xml
@@ -6,6 +6,7 @@
 Gentoo ML Project
   
   
+   Enable support of 
dev-ml/async_kernel.
 Enable dev-ml/deriving support for 
improving the type safety.
Enables the ppx syntax extension
Enables deriving support through ppx syntax 
extensions.



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

2016-05-03 Thread Alexis Ballier
commit: fde940cd10dd7ac97fa741dc85fcdc5a2e4b5c1f
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun May  1 18:46:12 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue May  3 09:13:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fde940cd

dev-ml/js_of_ocaml: fix build with ocaml 4.03

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/files/oc43.patch   | 1418 +
 dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild |4 +
 2 files changed, 1422 insertions(+)

diff --git a/dev-ml/js_of_ocaml/files/oc43.patch 
b/dev-ml/js_of_ocaml/files/oc43.patch
new file mode 100644
index 000..face810
--- /dev/null
+++ b/dev-ml/js_of_ocaml/files/oc43.patch
@@ -0,0 +1,1418 @@
+commit 3e4d39ece5a67bfc17f47c3da8a95ccca789abd5
+Author: Hugo Heuzard 
+Date:   Mon Mar 28 23:35:47 2016 +0100
+
+Deriving_json for ocaml 4.03
+
+move
+
+diff --git a/.gitignore b/.gitignore
+index 71e4ccf..ccbb796 100644
+--- a/.gitignore
 b/.gitignore
+@@ -58,6 +58,7 @@ benchmarks/results
+ benchmarks/config
+ lib/deriving_json/deriving_Json_lexer.ml
+ lib/ppx/ppx_js.ml
++lib/ppx/ppx_deriving_json.ml
+ lib/ppx/ppx_js
+ Makefile.local
+ 
+diff --git a/lib/ppx/ppx_deriving_json.cppo.ml 
b/lib/ppx/ppx_deriving_json.cppo.ml
+new file mode 100644
+index 000..814ed99
+--- /dev/null
 b/lib/ppx/ppx_deriving_json.cppo.ml
+@@ -0,0 +1,711 @@
++(* Js_of_ocaml
++ * http://www.ocsigen.org
++ * Copyright Vasilis Papavasileiou 2015
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation, with linking exception;
++ * either version 2.1 of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++ *)
++
++let deriver = "json"
++
++(* Copied (and adapted) this from ppx_deriving repo (commit
++   e2079fa8f3460055bf990461f295c6c4b391fafc) ; we get an empty set of
++   let bindings with ppx_deriving 3.0 *)
++let sanitize expr = [%expr
++  (let open! Ppx_deriving_runtime in [%e expr]) [@ocaml.warning "-A"]]
++
++let var_ptuple l =
++  List.map Ast_convenience.pvar l |> Ast_helper.Pat.tuple
++
++let map_loc f {Location.txt; loc} =
++  {Location.txt = f txt; loc}
++
++let suffix_lid {Location.txt; loc} ~suffix =
++  let txt = Ppx_deriving.mangle_lid (`Suffix suffix) txt in
++  Ast_helper.Exp.ident {txt; loc} ~loc
++
++let suffix_decl ({Parsetree.ptype_loc = loc} as d) ~suffix =
++  (let s =
++ Ppx_deriving.mangle_type_decl (`Suffix suffix) d |>
++ Longident.parse
++   in
++   Location.mkloc s loc) |> Ast_helper.Exp.ident ~loc
++
++let suffix_decl_p ({Parsetree.ptype_loc = loc} as d) ~suffix =
++  (let s = Ppx_deriving.mangle_type_decl (`Suffix suffix) d in
++   Location.mkloc s loc) |> Ast_helper.Pat.var ~loc
++
++let rec fresh_vars ?(acc = []) n =
++  if n <= 0 then
++List.rev acc
++  else
++let acc = Ppx_deriving.fresh_var acc :: acc in
++fresh_vars ~acc (n - 1)
++
++let unreachable_case () =
++  Ast_helper.Exp.case [%pat? _ ] [%expr assert false]
++
++let label_of_constructor = map_loc (fun c -> Longident.Lident c)
++
++let wrap_write r ~pattern = [%expr fun buf [%p pattern] -> [%e r]]
++
++let buf_expand r = [%expr fun buf -> [%e r]]
++
++let seqlist = function
++  | h :: l ->
++let f acc e = [%expr [%e acc]; [%e e]] in
++List.fold_left f h l
++  | [] ->
++[%expr ()]
++
++let check_record_fields =
++  List.iter @@ function
++  | {Parsetree.pld_mutable = Mutable} ->
++Location.raise_errorf
++  "%s cannot be derived for mutable records" deriver
++  | {pld_type = {ptyp_desc = Ptyp_poly _}} ->
++Location.raise_errorf
++  "%s cannot be derived for polymorphic records" deriver
++  | _ ->
++()
++
++let maybe_tuple_type = function
++  | [y] -> y
++  | l -> Ast_helper.Typ.tuple l
++
++let rec write_tuple_contents l ly ~tag ~poly =
++  let e =
++let f v y =
++  let arg = Ast_convenience.evar v in
++  let e = write_body_of_type y ~arg ~poly in
++  [%expr Buffer.add_string buf ","; [%e e]]
++in
++List.map2 f l ly |> seqlist
++  and s = Ast_convenience.str ("[" ^ string_of_int tag) in [%expr
++Buffer.add_string buf [%e s];
++[%e e];
++Buffer.add_string buf "]"]
++
++and write_body_of_tuple_type l ~arg ~poly ~tag =
++  let n = List.length l in
++  let vars = fresh_vars n in
++  let e = write_tuple_contents 

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

2016-03-01 Thread Alexis Ballier
commit: 79ba50f3e692f57b7ee9d4dc8af935f5e851a5a1
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Mar  1 18:19:59 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Mar  1 18:47:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79ba50f3

dev-ml/js_of_ocaml: remove old

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/Manifest   |   1 -
 dev-ml/js_of_ocaml/files/tyxml36-2.patch  |  30 --
 dev-ml/js_of_ocaml/files/tyxml36.patch| 158 --
 dev-ml/js_of_ocaml/js_of_ocaml-2.6.ebuild |  52 --
 4 files changed, 241 deletions(-)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index fa92aea..e312923 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1,2 +1 @@
-DIST js_of_ocaml-2.6.tar.gz 1291882 SHA256 
c1f066d09524c6be2d40cfb387de49b337837dcc8f2f746a207f37706ca66460 SHA512 
2c4e294b7946757d9b05ec640e130cbee6a0130c03eb3a2188988fb956c1f0e2738c32e97abc461e748e667e7d31e386c5470942df84ddbcf5903d41b133e8c8
 WHIRLPOOL 
abf477caa49edc65b5e577a90dd86641f12b6757e6f2c9034fe08d51cc1ac11209b73e8fdd88de420ed0277d8715bb085c10d29b237854cdebb8a9e36f8e22fe
 DIST js_of_ocaml-2.7.tar.gz 1304487 SHA256 
52922f55428a1d8a55ec2493c4989152e06efd29a981adf8ac9f343f558854b5 SHA512 
ab6e5d16342bf763c10eb5c2e7589610622034eee2ad82aa09c6f68448f155a5c56584702307852b251bde80146c1b7115ed6add1358ad96b130c9dd2b96118b
 WHIRLPOOL 
278c17432fdf9bf670df33479c68705868be39eb4d53f67fc489fe44ac2e7645dd5e2ed3e6e71752a2387b516ce0ab6dc99ac1d870fc75ffdad9df87031e9de4

diff --git a/dev-ml/js_of_ocaml/files/tyxml36-2.patch 
b/dev-ml/js_of_ocaml/files/tyxml36-2.patch
deleted file mode 100644
index 0f7771c..000
--- a/dev-ml/js_of_ocaml/files/tyxml36-2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit f11959da5a630a7dca47497c9543231d9698b406
-Author: Vasilis Papavasileiou 
-Date:   Fri Aug 7 11:16:20 2015 +0200
-
-Tyxml_js: ft constructor in Xml_wrap (forward-compatibility)
-
-diff --git a/lib/tyxml/tyxml_js.ml b/lib/tyxml/tyxml_js.ml
-index 4799600..cdf7cd2 100644
 a/lib/tyxml/tyxml_js.ml
-+++ b/lib/tyxml/tyxml_js.ml
-@@ -164,6 +164,7 @@ module Html5 = Html5_f.Make(Xml)(Svg)
- module Xml_wrap = struct
-   type 'a t = 'a React.signal
-   type 'a tlist = 'a ReactiveData.RList.t
-+  type ('a, 'b) ft = 'a -> 'b
-   let return = React.S.const
-   let fmap f = React.S.map f
-   let nil () = ReactiveData.RList.nil
-diff --git a/lib/tyxml/tyxml_js.mli b/lib/tyxml/tyxml_js.mli
-index 8cb33c5..db2183e 100644
 a/lib/tyxml/tyxml_js.mli
-+++ b/lib/tyxml/tyxml_js.mli
-@@ -50,6 +50,7 @@ module Xml : XML with module W = Xml_wrap.NoWrap
- module Xml_wrap : Xml_wrap.T
-   with type 'a t = 'a React.signal
-and type 'a tlist = 'a ReactiveData.RList.t
-+   and type ('a, 'b) ft = 'a -> 'b
- 
- module Util : sig
-   val update_children : Dom.node Js.t -> Dom.node Js.t ReactiveData.RList.t 
-> unit

diff --git a/dev-ml/js_of_ocaml/files/tyxml36.patch 
b/dev-ml/js_of_ocaml/files/tyxml36.patch
deleted file mode 100644
index 34a2aab..000
--- a/dev-ml/js_of_ocaml/files/tyxml36.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-commit ebf7150f41c64ac0e18e9f89d1e565b6c3115414
-Author: Vasilis Papavasileiou 
-Date:   Thu Aug 6 11:52:11 2015 +0200
-
-up-to-date version of @drup's new-style wrapping (ocsigen/tyxml#58)
-
-diff --git a/lib/tyxml/tyxml_js.ml b/lib/tyxml/tyxml_js.ml
-index 0143219..4799600 100644
 a/lib/tyxml/tyxml_js.ml
-+++ b/lib/tyxml/tyxml_js.ml
-@@ -20,8 +20,19 @@
- let js_string_of_float f = (Js.number_of_float f)##toString()
- let js_string_of_int i = (Js.number_of_float (float_of_int i))##toString()
- 
-+
-+module type XML =
-+  Xml_sigs.T
-+  with type uri = string
-+   and type event_handler = Dom_html.event Js.t -> bool
-+   and type mouse_event_handler = Dom_html.mouseEvent Js.t -> bool
-+   and type keyboard_event_handler = Dom_html.keyboardEvent Js.t -> bool
-+   and type elt = Dom.node Js.t
-+
-+
- module Xml = struct
- 
-+  module W = Xml_wrap.NoWrap
-   type 'a wrap = 'a
-   type 'a list_wrap = 'a list
- 
-@@ -162,7 +173,6 @@ module Xml_wrap = struct
-   let append x y = ReactiveData.RList.concat x y
- end
- 
--
- module Util = struct
-   open ReactiveData
-   open RList
-@@ -226,9 +236,23 @@ end
- 
- 
- module R = struct
--  module Xml_wed = struct
--type 'a wrap = 'a Xml_wrap.t
--type 'a list_wrap = 'a Xml_wrap.tlist
-+
-+  let filter_attrib (name,a) on =
-+match a with
-+| Xml.Event _ ->
-+  raise (Invalid_argument "filter_attrib not implemented for event 
handler")
-+| Xml.Attr a ->
-+  name,
-+  Xml.Attr
-+(React.S.l2
-+   (fun on a -> if on then a else None) on a)
-+
-+  let attach_attribs = Xml.attach_attribs
-+
-+  module Xml = struct
-+module W = Xml_wrap
-+type 'a wrap = 'a W.t
-+type 'a list_wrap = 'a W.tlist
- type uri = 

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

2016-03-01 Thread Alexis Ballier
commit: 469d308f63735fac8ecc1816acc527678ba30c88
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Mar  1 18:20:32 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Mar  1 18:47:37 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=469d308f

dev-ml/js_of_ocaml: add ocamlbuild dep

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
index 8967f79..420e7ae 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
@@ -15,7 +15,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE="+ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
 
-DEPEND="
+RDEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
>=dev-ml/lwt-2.4.4:=
react? ( dev-ml/react:=  dev-ml/reactiveData:= )
@@ -28,7 +28,8 @@ DEPEND="
dev-ml/camlp4:=
dev-ml/cppo:=
deriving? ( >=dev-ml/deriving-0.6:= )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+   dev-ml/ocamlbuild"
 
 src_configure() {
printf "\n\n" >> Makefile.conf



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

2016-02-06 Thread Alexis Ballier
commit: a9075b53a9bb36659878fbab65721fc4209497c5
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Feb  6 15:39:03 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Feb  6 15:39:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9075b53

dev-ml/js_of_ocaml: add ppx-deriving useflag

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild | 4 +++-
 dev-ml/js_of_ocaml/metadata.xml   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
index 1f8b9b0..8967f79 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="+ocamlopt doc +deriving +ppx +react +xml X"
+IUSE="+ocamlopt doc +deriving +ppx +ppx-deriving +react +xml X"
 
 DEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
@@ -21,6 +21,7 @@ DEPEND="
react? ( dev-ml/react:=  dev-ml/reactiveData:= )
xml? ( >=dev-ml/tyxml-3.6:= )
ppx? ( dev-ml/ppx_tools:= )
+   ppx-deriving? ( dev-ml/ppx_deriving:= )
dev-ml/cmdliner:=
dev-ml/menhir:=
dev-ml/ocaml-base64:=
@@ -37,6 +38,7 @@ 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
 }
 
 src_compile() {

diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
index 904a7a4..0b34c19 100644
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ b/dev-ml/js_of_ocaml/metadata.xml
@@ -8,6 +8,7 @@
   
 Enable dev-ml/deriving support for 
improving the type safety.
Enables the ppx syntax extension
+   Enables deriving support through ppx syntax 
extensions.
Enable functionnal reactive programming 
support.
   
   



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

2016-02-06 Thread Alexis Ballier
commit: 4ff20e362115e87f35719268388563706007e6e9
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Feb  6 15:27:12 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Feb  6 15:39:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ff20e36

dev-ml/js_of_ocaml: add react useflag

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild | 6 +++---
 dev-ml/js_of_ocaml/metadata.xml   | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
index 3d6298a..1bf41b5 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
@@ -13,13 +13,12 @@ 
SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="+ocamlopt doc +deriving X"
+IUSE="+ocamlopt doc +deriving +react X"
 
 DEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
>=dev-ml/lwt-2.4.4:=
-   dev-ml/react:=
-   dev-ml/reactiveData:=
+   react? ( dev-ml/react:=  dev-ml/reactiveData:= )
>=dev-ml/tyxml-3.6:=
dev-ml/cmdliner:=
dev-ml/menhir:=
@@ -35,6 +34,7 @@ src_configure() {
use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf
+   use react || echo "WITH_REACT := NO" >> Makefile.conf
 }
 
 src_compile() {

diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
index 2a56cab..d3fd68e 100644
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ b/dev-ml/js_of_ocaml/metadata.xml
@@ -7,6 +7,7 @@
   
   
 Enable dev-ml/deriving support for 
improving the type safety.
+   Enable functionnal reactive programming 
support.
   
   
 ocsigen/js_of_ocaml



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

2016-02-06 Thread Alexis Ballier
commit: 5452ff7ec75d38c1819fbb8175f482e28cc35041
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Feb  6 15:22:43 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Feb  6 15:39:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5452ff7e

dev-ml/js_of_ocaml: Add X useflag

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
index 4f423b9..3d6298a 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
@@ -13,9 +13,10 @@ 
SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="+ocamlopt doc +deriving"
+IUSE="+ocamlopt doc +deriving X"
 
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+DEPEND="
+   >=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
>=dev-ml/lwt-2.4.4:=
dev-ml/react:=
dev-ml/reactiveData:=
@@ -29,8 +30,11 @@ DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
 RDEPEND="${DEPEND}"
 
 src_configure() {
+   printf "\n\n" >> Makefile.conf
use ocamlopt || echo "BEST := byte" >> Makefile.conf
+   use ocamlopt || echo "NATDYNLINK := NO" >> Makefile.conf
use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
+   use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf
 }
 
 src_compile() {



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

2016-02-06 Thread Alexis Ballier
commit: 167d4fb62fa65b0b5cbdc46af73ae971519401d1
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Feb  6 15:29:44 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Feb  6 15:39:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=167d4fb6

dev-ml/js_of_ocaml: add xml useflag

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
index 1bf41b5..060d3ca 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
@@ -13,13 +13,13 @@ 
SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="+ocamlopt doc +deriving +react X"
+IUSE="+ocamlopt doc +deriving +react +xml X"
 
 DEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
>=dev-ml/lwt-2.4.4:=
react? ( dev-ml/react:=  dev-ml/reactiveData:= )
-   >=dev-ml/tyxml-3.6:=
+   xml? ( >=dev-ml/tyxml-3.6:= )
dev-ml/cmdliner:=
dev-ml/menhir:=
dev-ml/ocaml-base64:=



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

2016-02-06 Thread Alexis Ballier
commit: 555d2144ffdac351bab4b7f67a8a2e832a2ca659
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Feb  6 15:33:29 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Feb  6 15:39:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=555d2144

dev-ml/js_of_ocaml: add ppx useflag

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild | 4 +++-
 dev-ml/js_of_ocaml/metadata.xml   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
index 060d3ca..1f8b9b0 100644
--- a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
@@ -13,13 +13,14 @@ 
SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> ${P}.tar
 LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
-IUSE="+ocamlopt doc +deriving +react +xml X"
+IUSE="+ocamlopt doc +deriving +ppx +react +xml X"
 
 DEPEND="
>=dev-lang/ocaml-3.12:=[ocamlopt?,X?]
>=dev-ml/lwt-2.4.4:=
react? ( dev-ml/react:=  dev-ml/reactiveData:= )
xml? ( >=dev-ml/tyxml-3.6:= )
+   ppx? ( dev-ml/ppx_tools:= )
dev-ml/cmdliner:=
dev-ml/menhir:=
dev-ml/ocaml-base64:=
@@ -35,6 +36,7 @@ src_configure() {
use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
use X || echo "WITH_GRAPHICS := NO" >> Makefile.conf
use react || echo "WITH_REACT := NO" >> Makefile.conf
+   use ppx || echo "WITH_PPX := NO" >> Makefile.conf
 }
 
 src_compile() {

diff --git a/dev-ml/js_of_ocaml/metadata.xml b/dev-ml/js_of_ocaml/metadata.xml
index d3fd68e..904a7a4 100644
--- a/dev-ml/js_of_ocaml/metadata.xml
+++ b/dev-ml/js_of_ocaml/metadata.xml
@@ -7,6 +7,7 @@
   
   
 Enable dev-ml/deriving support for 
improving the type safety.
+   Enables the ppx syntax extension
Enable functionnal reactive programming 
support.
   
   



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

2016-01-30 Thread Alexis Ballier
commit: 4e9923a56d22e6f36e152433ddc8c1196ff5e63f
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sat Jan 30 16:02:58 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sat Jan 30 16:30:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e9923a5

dev-ml/js_of_ocaml: bump to 2.7

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/Manifest   |  1 +
 dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild | 46 +++
 2 files changed, 47 insertions(+)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index 5905692..fa92aea 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1 +1,2 @@
 DIST js_of_ocaml-2.6.tar.gz 1291882 SHA256 
c1f066d09524c6be2d40cfb387de49b337837dcc8f2f746a207f37706ca66460 SHA512 
2c4e294b7946757d9b05ec640e130cbee6a0130c03eb3a2188988fb956c1f0e2738c32e97abc461e748e667e7d31e386c5470942df84ddbcf5903d41b133e8c8
 WHIRLPOOL 
abf477caa49edc65b5e577a90dd86641f12b6757e6f2c9034fe08d51cc1ac11209b73e8fdd88de420ed0277d8715bb085c10d29b237854cdebb8a9e36f8e22fe
+DIST js_of_ocaml-2.7.tar.gz 1304487 SHA256 
52922f55428a1d8a55ec2493c4989152e06efd29a981adf8ac9f343f558854b5 SHA512 
ab6e5d16342bf763c10eb5c2e7589610622034eee2ad82aa09c6f68448f155a5c56584702307852b251bde80146c1b7115ed6add1358ad96b130c9dd2b96118b
 WHIRLPOOL 
278c17432fdf9bf670df33479c68705868be39eb4d53f67fc489fe44ac2e7645dd5e2ed3e6e71752a2387b516ce0ab6dc99ac1d870fc75ffdad9df87031e9de4

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
new file mode 100644
index 000..4f423b9
--- /dev/null
+++ b/dev-ml/js_of_ocaml/js_of_ocaml-2.7.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit findlib eutils
+
+DESCRIPTION="A compiler from OCaml bytecode to javascript"
+HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
+SRC_URI="https://github.com/ocsigen/js_of_ocaml/archive/${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="+ocamlopt doc +deriving"
+
+DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
+   >=dev-ml/lwt-2.4.4:=
+   dev-ml/react:=
+   dev-ml/reactiveData:=
+   >=dev-ml/tyxml-3.6:=
+   dev-ml/cmdliner:=
+   dev-ml/menhir:=
+   dev-ml/ocaml-base64:=
+   dev-ml/camlp4:=
+   dev-ml/cppo:=
+   deriving? ( >=dev-ml/deriving-0.6:= )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+   use ocamlopt || echo "BEST := byte" >> Makefile.conf
+   use deriving || echo "WITH_DERIVING := NO" >> Makefile.conf
+}
+
+src_compile() {
+   emake
+   use doc && emake doc
+}
+
+src_install() {
+   findlib_src_preinst
+   emake BINDIR="${ED}/usr/bin/" install
+   dodoc CHANGES README.md
+   use doc && dohtml -r doc/api/html/
+}



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

2016-01-19 Thread Alexis Ballier
commit: 819054c97631599c237a8fafc166b734318233b4
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Jan 19 12:02:12 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jan 19 12:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=819054c9

dev-ml/js_of_ocaml: import upstream patches to build with tyxml 3.6

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/files/tyxml36-2.patch  |  30 ++
 dev-ml/js_of_ocaml/files/tyxml36.patch| 158 ++
 dev-ml/js_of_ocaml/js_of_ocaml-2.6.ebuild |  10 +-
 3 files changed, 196 insertions(+), 2 deletions(-)

diff --git a/dev-ml/js_of_ocaml/files/tyxml36-2.patch 
b/dev-ml/js_of_ocaml/files/tyxml36-2.patch
new file mode 100644
index 000..0f7771c
--- /dev/null
+++ b/dev-ml/js_of_ocaml/files/tyxml36-2.patch
@@ -0,0 +1,30 @@
+commit f11959da5a630a7dca47497c9543231d9698b406
+Author: Vasilis Papavasileiou 
+Date:   Fri Aug 7 11:16:20 2015 +0200
+
+Tyxml_js: ft constructor in Xml_wrap (forward-compatibility)
+
+diff --git a/lib/tyxml/tyxml_js.ml b/lib/tyxml/tyxml_js.ml
+index 4799600..cdf7cd2 100644
+--- a/lib/tyxml/tyxml_js.ml
 b/lib/tyxml/tyxml_js.ml
+@@ -164,6 +164,7 @@ module Html5 = Html5_f.Make(Xml)(Svg)
+ module Xml_wrap = struct
+   type 'a t = 'a React.signal
+   type 'a tlist = 'a ReactiveData.RList.t
++  type ('a, 'b) ft = 'a -> 'b
+   let return = React.S.const
+   let fmap f = React.S.map f
+   let nil () = ReactiveData.RList.nil
+diff --git a/lib/tyxml/tyxml_js.mli b/lib/tyxml/tyxml_js.mli
+index 8cb33c5..db2183e 100644
+--- a/lib/tyxml/tyxml_js.mli
 b/lib/tyxml/tyxml_js.mli
+@@ -50,6 +50,7 @@ module Xml : XML with module W = Xml_wrap.NoWrap
+ module Xml_wrap : Xml_wrap.T
+   with type 'a t = 'a React.signal
+and type 'a tlist = 'a ReactiveData.RList.t
++   and type ('a, 'b) ft = 'a -> 'b
+ 
+ module Util : sig
+   val update_children : Dom.node Js.t -> Dom.node Js.t ReactiveData.RList.t 
-> unit

diff --git a/dev-ml/js_of_ocaml/files/tyxml36.patch 
b/dev-ml/js_of_ocaml/files/tyxml36.patch
new file mode 100644
index 000..34a2aab
--- /dev/null
+++ b/dev-ml/js_of_ocaml/files/tyxml36.patch
@@ -0,0 +1,158 @@
+commit ebf7150f41c64ac0e18e9f89d1e565b6c3115414
+Author: Vasilis Papavasileiou 
+Date:   Thu Aug 6 11:52:11 2015 +0200
+
+up-to-date version of @drup's new-style wrapping (ocsigen/tyxml#58)
+
+diff --git a/lib/tyxml/tyxml_js.ml b/lib/tyxml/tyxml_js.ml
+index 0143219..4799600 100644
+--- a/lib/tyxml/tyxml_js.ml
 b/lib/tyxml/tyxml_js.ml
+@@ -20,8 +20,19 @@
+ let js_string_of_float f = (Js.number_of_float f)##toString()
+ let js_string_of_int i = (Js.number_of_float (float_of_int i))##toString()
+ 
++
++module type XML =
++  Xml_sigs.T
++  with type uri = string
++   and type event_handler = Dom_html.event Js.t -> bool
++   and type mouse_event_handler = Dom_html.mouseEvent Js.t -> bool
++   and type keyboard_event_handler = Dom_html.keyboardEvent Js.t -> bool
++   and type elt = Dom.node Js.t
++
++
+ module Xml = struct
+ 
++  module W = Xml_wrap.NoWrap
+   type 'a wrap = 'a
+   type 'a list_wrap = 'a list
+ 
+@@ -162,7 +173,6 @@ module Xml_wrap = struct
+   let append x y = ReactiveData.RList.concat x y
+ end
+ 
+-
+ module Util = struct
+   open ReactiveData
+   open RList
+@@ -226,9 +236,23 @@ end
+ 
+ 
+ module R = struct
+-  module Xml_wed = struct
+-type 'a wrap = 'a Xml_wrap.t
+-type 'a list_wrap = 'a Xml_wrap.tlist
++
++  let filter_attrib (name,a) on =
++match a with
++| Xml.Event _ ->
++  raise (Invalid_argument "filter_attrib not implemented for event 
handler")
++| Xml.Attr a ->
++  name,
++  Xml.Attr
++(React.S.l2
++   (fun on a -> if on then a else None) on a)
++
++  let attach_attribs = Xml.attach_attribs
++
++  module Xml = struct
++module W = Xml_wrap
++type 'a wrap = 'a W.t
++type 'a list_wrap = 'a W.tlist
+ type uri = Xml.uri
+ let string_of_uri = Xml.string_of_uri
+ let uri_of_string = Xml.uri_of_string
+@@ -239,7 +263,7 @@ module R = struct
+ type attrib = Xml.attrib
+ 
+ let attr name f s =
+-  let a = Xml_wrap.fmap f s in
++  let a = W.fmap f s in
+   name,Xml.Attr a
+ 
+ let float_attrib name s = attr name (fun f -> Some (js_string_of_float 
f)) s
+@@ -267,7 +291,7 @@ module R = struct
+ let leaf = Xml.leaf
+ let node ?(a=[]) name l =
+   let e = Dom_html.document##createElement(Js.string name) in
+-  Xml.attach_attribs e a;
++  attach_attribs e a;
+   Util.update_children (e :> Dom.node Js.t) l;
+   (e :> Dom.node Js.t)
+ let cdata = Xml.cdata
+@@ -275,30 +299,22 @@ module R = struct
+ let cdata_style = Xml.cdata_style
+   end
+ 
+-  module Xml_wed_svg = struct
+-include Xml_wed
++  module Xml_Svg = struct
++include Xml
+ 
+ let leaf = Xml_Svg.leaf
+ 
+ let node ?(a = []) name l =
+  

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

2016-01-19 Thread Alexis Ballier
commit: 0dc89dcc999115655053671274448ca57e655075
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Jan 19 12:02:53 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jan 19 12:03:03 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dc89dcc

dev-ml/js_of_ocaml: remove old

Package-Manager: portage-2.2.27
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/js_of_ocaml/Manifest  |  3 --
 dev-ml/js_of_ocaml/js_of_ocaml-1.3.2.ebuild  | 39 
 dev-ml/js_of_ocaml/js_of_ocaml-1.4.ebuild| 39 
 dev-ml/js_of_ocaml/js_of_ocaml-2.5-r1.ebuild | 44 
 dev-ml/js_of_ocaml/js_of_ocaml-2.5.ebuild| 43 ---
 dev-ml/js_of_ocaml/metadata.xml  |  1 -
 6 files changed, 169 deletions(-)

diff --git a/dev-ml/js_of_ocaml/Manifest b/dev-ml/js_of_ocaml/Manifest
index eb1a6b9..5905692 100644
--- a/dev-ml/js_of_ocaml/Manifest
+++ b/dev-ml/js_of_ocaml/Manifest
@@ -1,4 +1 @@
-DIST js_of_ocaml-1.3.2.tar.gz 1901593 SHA256 
5996d2a9bc32121186e1964af557bb411eb5a27aa155d2c6a8a144ee5f3d0c36 SHA512 
83fe5818554d226d175ff3c876883a4837c015271681a73ef92b8d809134c6e5148d33d1eb7e3e71e0c3775627c26d0c246ffb183ff0c9a5736bd9b30ea6aedf
 WHIRLPOOL 
0dc7232940df09913cb1b829cabc35817ca1eca1c4c3e2381f9f7f08d33d2e5cc973fde25576a7b04004860aa6cf193f206690ac6e681cb1e8cae4084675785b
-DIST js_of_ocaml-1.4.tar.gz 1906998 SHA256 
56033c5b08e6db9f957d93f691641264c2bd5fb3624b9db5e0766d5c6a64d781 SHA512 
6b7dc0bc48373e4930916213f87fb0e7a0283ea4ff91284c9708de9b1d60b9c6b576658ebd0c33b0b5ca28bad467bfabd17ed0910f22fef59b3cdf96089d4c83
 WHIRLPOOL 
abc5ab718554fc0f3e97281620968b2943da539e2c39a894afbd99702da0f0fb8e322da69c78ab04ca61ae83fbc3bd5f9c69fb0ceec875c91bdfa6b15fbecae0
-DIST js_of_ocaml-2.5.tar.gz 1249680 SHA256 
5bea34f47210791b8bb89adb158ec9d47816ba074bfb11ee68f56be42c0235df SHA512 
5a69993dbb5e6dd763a1b43cf2fee7de7000c91e8cb473379445603a0592941dc9c67c7591f322dca1c7fedd8d3df2cd79e2a9716204b5642a9d2999de1db82d
 WHIRLPOOL 
fde0c0d553f3f8aaa220b705294ee7a366e6667ca9eb9a21e148082c36ea13f64f1f01616468fd0e8f5ab3a201c6d3a92ad2606a7eda54e1ddd22432c72b0dd3
 DIST js_of_ocaml-2.6.tar.gz 1291882 SHA256 
c1f066d09524c6be2d40cfb387de49b337837dcc8f2f746a207f37706ca66460 SHA512 
2c4e294b7946757d9b05ec640e130cbee6a0130c03eb3a2188988fb956c1f0e2738c32e97abc461e748e667e7d31e386c5470942df84ddbcf5903d41b133e8c8
 WHIRLPOOL 
abf477caa49edc65b5e577a90dd86641f12b6757e6f2c9034fe08d51cc1ac11209b73e8fdd88de420ed0277d8715bb085c10d29b237854cdebb8a9e36f8e22fe

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-1.3.2.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-1.3.2.ebuild
deleted file mode 100644
index 28b39b2..000
--- a/dev-ml/js_of_ocaml/js_of_ocaml-1.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="A compiler from OCaml bytecode to javascript"
-HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
-SRC_URI="http://www.ocsigen.org/download/${P}.tar.gz;
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt doc +deriving-ocsigen"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
-   >=dev-ml/lwt-2.3.0:=
-   deriving-ocsigen? ( >=dev-ml/deriving-ocsigen-0.3:= )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-   use ocamlopt || echo "BEST := byte" >> Makefile.conf
-   use deriving-ocsigen || echo "DERIVING :=" >> Makefile.conf
-   echo "BINDIR := ${ED}/usr/bin" >> Makefile.conf
-}
-
-src_compile() {
-   emake
-   use doc && emake doc
-}
-
-src_install() {
-   findlib_src_preinst
-   emake install
-   dodoc CHANGES README
-   use doc && dohtml -r doc/api-html
-}

diff --git a/dev-ml/js_of_ocaml/js_of_ocaml-1.4.ebuild 
b/dev-ml/js_of_ocaml/js_of_ocaml-1.4.ebuild
deleted file mode 100644
index fdfa20c..000
--- a/dev-ml/js_of_ocaml/js_of_ocaml-1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit findlib
-
-DESCRIPTION="A compiler from OCaml bytecode to javascript"
-HOMEPAGE="http://ocsigen.org/js_of_ocaml/;
-SRC_URI="http://www.ocsigen.org/download/${P}.tar.gz;
-
-LICENSE="LGPL-2.1-with-linking-exception"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="+ocamlopt doc +deriving-ocsigen"
-
-DEPEND=">=dev-lang/ocaml-3.12:=[ocamlopt?]
-   >=dev-ml/lwt-2.3.0:=
-   deriving-ocsigen? ( >=dev-ml/deriving-ocsigen-0.3:= )
-   || ( dev-ml/camlp4:= > Makefile.conf
-   use deriving-ocsigen || echo "DERIVING :=" >> Makefile.conf
-}
-
-src_compile() {
-   emake
-   use doc && emake doc
-}
-
-src_install() {
-   findlib_src_preinst
-   emake BINDIR="${ED}/usr/bin/" install
-   dodoc CHANGES README
-   use doc && dohtml -r doc/api-html
-}

diff --git