dev-ml/ppx_variants_conv: Bump to 0.9.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

3 files changed, 9 insertions, 110 deletions

diff --git a/dev-ml/ppx_variants_conv/Manifest b/dev-ml/ppx_variants_conv/Manifest
index 2bb4835aab80..4bd3e00d0783 100644
--- a/dev-ml/ppx_variants_conv/Manifest
+++ b/dev-ml/ppx_variants_conv/Manifest
@@ -1 +1 @@
-DIST ppx_variants_conv-113.33.00.tar.gz 55374 SHA256 f425d430345e1eb8c0a33c081d21c0ab0cbf1f4bffa5aad4f97f6bc2fba6d78c SHA512 df59e630f30d87da4414456380e974cb2e9ffc88c1c381edc80d012fe196a7f09956ce1654d2d73518d1bbd79e8bdc991960498130329501d81e0ca91724a4e0 WHIRLPOOL d056712c46199d738a34bf54304e2c3d76a3967f373d5b5c40dd1c8a06e8fe0bf9b409f1063b75135acd68dc21d0a6887673d4b8347dd6913110783ed7ad9985
+DIST ppx_variants_conv-0.9.0.tar.gz 10649 SHA256 393e1997ea9375e20824f0d0e414471c0069001ab20d35e1b6a451c0c6f0bf57 SHA512 4bb7c087c835fe0c8debc25b66dab9da2da3a5ad4eef856845075a146a2fe3a2598a5b77851bd922b532b57cb821ee934336f8638d44cc0fd81faefcc56e1d89 WHIRLPOOL 12a7c2b894b8e3276a03bc2a9b4b795217ac24f3ec87144b3919b43d17fac3b5d8ad4bdc8ef4083560f9799f634fad5ab9834a21dd42aa6b58d736832b489bef
diff --git a/dev-ml/ppx_variants_conv/files/oc43.patch b/dev-ml/ppx_variants_conv/files/oc43.patch
deleted file mode 100644
index 5c59422200f9..000000000000
--- a/dev-ml/ppx_variants_conv/files/oc43.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -uNr ppx_variants_conv-113.33.00/_oasis ppx_variants_conv-113.33.00+4.03/_oasis
---- ppx_variants_conv-113.33.00/_oasis	2016-03-09 16:44:55.000000000 +0100
-+++ ppx_variants_conv-113.33.00+4.03/_oasis	2016-03-22 15:13:51.000000000 +0100
-@@ -1,8 +1,8 @@
- OASISFormat:      0.4
--OCamlVersion:     >= 4.02.3
-+OCamlVersion:     >= 4.03.0
- FindlibVersion:   >= 1.3.2
- Name:             ppx_variants_conv
--Version:          113.33.00
-+Version:          113.33.00+4.03
- Synopsis:         Generation of accessor and iteration functions for ocaml variant types
- Authors:          Jane Street Group, LLC <opensource@janestreet.com>
- Copyrights:       (C) 2015-2016 Jane Street Group LLC <opensource@janestreet.com>
-diff -uNr ppx_variants_conv-113.33.00/opam ppx_variants_conv-113.33.00+4.03/opam
---- ppx_variants_conv-113.33.00/opam	2016-03-18 12:08:01.000000000 +0100
-+++ ppx_variants_conv-113.33.00+4.03/opam	2016-03-22 17:51:38.000000000 +0100
-@@ -18,4 +18,4 @@
-   "ppx_type_conv"
-   "variantslib"
- ]
--available: [ ocaml-version >= "4.02.3" ]
-+available: [ ocaml-version >= "4.03.0" ]
-diff -uNr ppx_variants_conv-113.33.00/src/ppx_variants_conv.ml ppx_variants_conv-113.33.00+4.03/src/ppx_variants_conv.ml
---- ppx_variants_conv-113.33.00/src/ppx_variants_conv.ml	2016-03-09 16:44:55.000000000 +0100
-+++ ppx_variants_conv-113.33.00+4.03/src/ppx_variants_conv.ml	2016-03-22 15:13:51.000000000 +0100
-@@ -34,7 +34,7 @@
- 
-   let lambda_sig loc arg_tys body_ty =
-     List.fold_right arg_tys ~init:body_ty ~f:(fun arg_ty acc ->
--      ptyp_arrow ~loc "" arg_ty acc)
-+      ptyp_arrow ~loc Nolabel arg_ty acc)
-   ;;
- 
-   let lambda_sig' loc arg_tys body_ty =
-@@ -94,9 +94,14 @@
-   let constructor body_ty cd : Variant_definition.t =
-     if cd.pcd_res <> None then
-       Location.raise_errorf ~loc:cd.pcd_loc "GADTs are not supported by variantslib";
-+    let pcd_args =
-+      match cd.pcd_args with
-+      | Pcstr_tuple pcd_args -> pcd_args
-+      | Pcstr_record _ -> failwith "Pcstr_record not supported"
-+    in
-     { name = cd.pcd_name.txt
-     ; body_ty
--    ; arg_tys = cd.pcd_args
-+    ; arg_tys = pcd_args
-     ; kind = `Normal
-     }
- 
-@@ -120,7 +125,7 @@
-     ptyp_constr ~loc (Located.lident ~loc ty_name) tps
- 
-   let label_arg _loc name ty =
--    (String.lowercase name, ty)
-+    (Asttypes.Labelled (String.lowercase name), ty)
-   ;;
- 
-   let variant_arg loc f v =
-@@ -186,7 +191,7 @@
-     in
-     let types = List.map variants ~f in
-     let t = Create.lambda_sig' loc
--      (("", variant_type) :: types) result_type in
-+      ((Nolabel, variant_type) :: types) result_type in
-     psig_value ~loc (value_description ~loc ~name:(Located.mk ~loc "map") ~type_:t
-                        ~prim:[])
-   ;;
-@@ -316,7 +321,7 @@
-       | None    -> name
-       | Some n  -> n
-     in
--    (l, pvar ~loc name)
-+    (Asttypes.Labelled l, pvar ~loc name)
-   ;;
- 
-   let label_arg_fun loc name =
-@@ -408,7 +413,7 @@
-       List.map variants ~f:(fun variant ->
-         label_arg_fun loc (variant_name_to_string variant.V.name))
-     in
--    let lambda = Create.lambda loc (("", [%pat? t__]) :: patterns) body in
-+    let lambda = Create.lambda loc ((Nolabel, [%pat? t__]) :: patterns) body in
-     [%stri let map = [%e lambda] ]
-   ;;
- 
diff --git a/dev-ml/ppx_variants_conv/ppx_variants_conv-113.33.00.ebuild b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.9.0.ebuild
index 4fa30d178363..61553b10ecbd 100644
--- a/dev-ml/ppx_variants_conv/ppx_variants_conv-113.33.00.ebuild
+++ b/dev-ml/ppx_variants_conv/ppx_variants_conv-0.9.0.ebuild
@@ -1,40 +1,27 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-
-inherit oasis
+EAPI=6
 
 DESCRIPTION="Generation of accessor and iteration functions for ocaml variant types"
-HOMEPAGE="http://www.janestreet.com/ocaml"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz"
+HOMEPAGE="https://github.com/janestreet/ppx_variants_conv"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND="dev-ml/ppx_tools:=
+DEPEND="
 	dev-ml/ppx_core:=
 	dev-ml/ppx_driver:=
+	dev-ml/ppx_metaquot:=
 	dev-ml/ppx_type_conv:=
 	dev-ml/variantslib:=
+	dev-ml/ocaml-migrate-parsetree:=
 "
 RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/opam"
-
-src_prepare() {
-	has_version '>=dev-lang/ocaml-4.03' && epatch "${FILESDIR}/oc43.patch"
-}
-
-src_configure() {
-	emake setup.exe
-	OASIS_SETUP_COMMAND="./setup.exe" oasis_src_configure
-}
-
-src_compile() {
-	emake
-}
+DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
 
 src_install() {
 	opam-installer -i \
@@ -42,5 +29,4 @@ src_install() {
 		--libdir="${D}/$(ocamlc -where)" \
 		--docdir="${ED}/usr/share/doc/${PF}" \
 		${PN}.install || die
-	dodoc CHANGES.md
 }