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

[Alexis Ballier]

commit:     69548160f8d2d9fcd6191cc29d3883ac813992b6
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 16:51:51 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 08:38:00 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69548160

dev-ml/ppx_sexp_value: Bump to 0.9.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-ml/ppx_sexp_value/Manifest                     |  2 +-
 dev-ml/ppx_sexp_value/files/oc43.patch             | 62 ----------------------
 ...13.33.00.ebuild => ppx_sexp_value-0.9.0.ebuild} | 31 ++++-------
 3 files changed, 11 insertions(+), 84 deletions(-)

diff --git a/dev-ml/ppx_sexp_value/Manifest b/dev-ml/ppx_sexp_value/Manifest
index e329abaa00f..c62478c3278 100644
--- a/dev-ml/ppx_sexp_value/Manifest
+++ b/dev-ml/ppx_sexp_value/Manifest
@@ -1 +1 @@
-DIST ppx_sexp_value-113.33.00.tar.gz 55863 SHA256 c26380a790ce4226a180d69314d284c8d7b093f1874e965d5f90bd66b532d20f SHA512 a13af6addb235b138df6ad021615625133739aaadc254b62efc3951f3259a434614232d60032f969de674652152dc8a67e05a0e6999e1dc6d4504352c5c9a374 WHIRLPOOL 68d82b5aacf3f0682bd82a56361d4d89ef6136c1dd0a9b06b96d49723978f56551a63f143172f69c906e97db93b7e34179a01f9340bac495611f463441badfa6
+DIST ppx_sexp_value-0.9.0.tar.gz 10666 SHA256 4460c05a8389a4089d97a8af650f2972e4386e0fd91683aa53d4d1197275711a SHA512 7dcb8f70a7938d26fc5a1afea2bf5e77c4996d8e82720206ab9e5a462a59182dcedfbfede49ed83ed50f2683776b75fb5bae00c53fc451b03f6a33e126566e84 WHIRLPOOL a4a51ee6eaebacf3c779302d491992455865ceb83f5dca679e7390c765c324f4e14d3c849abc7e4c6ea8bd90d8d8f08a772a05782ef1f6e060ba0a77c60c279d

diff --git a/dev-ml/ppx_sexp_value/files/oc43.patch b/dev-ml/ppx_sexp_value/files/oc43.patch
deleted file mode 100644
index 36cc972541a..00000000000
--- a/dev-ml/ppx_sexp_value/files/oc43.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -uNr ppx_sexp_value-113.33.00/_oasis ppx_sexp_value-113.33.00+4.03/_oasis
---- ppx_sexp_value-113.33.00/_oasis	2016-03-09 16:44:54.000000000 +0100
-+++ ppx_sexp_value-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_sexp_value
--Version:          113.33.00
-+Version:          113.33.00+4.03
- Synopsis:         A ppx rewriter that simplifies building s-expressions from ocaml values
- Authors:          Jane Street Group, LLC <opensource@××××××××××.com>
- Copyrights:       (C) 2015-2016 Jane Street Group LLC <opensource@××××××××××.com>
-diff -uNr ppx_sexp_value-113.33.00/opam ppx_sexp_value-113.33.00+4.03/opam
---- ppx_sexp_value-113.33.00/opam	2016-03-18 12:08:01.000000000 +0100
-+++ ppx_sexp_value-113.33.00+4.03/opam	2016-03-22 17:51:37.000000000 +0100
-@@ -18,4 +18,4 @@
-   "ppx_sexp_conv"
-   "ppx_tools"     {>= "0.99.3"}
- ]
--available: [ ocaml-version >= "4.02.3" ]
-+available: [ ocaml-version >= "4.03.0" ]
-diff -uNr ppx_sexp_value-113.33.00/src/ppx_sexp_value.ml ppx_sexp_value-113.33.00+4.03/src/ppx_sexp_value.ml
---- ppx_sexp_value-113.33.00/src/ppx_sexp_value.ml	2016-03-09 16:44:54.000000000 +0100
-+++ ppx_sexp_value-113.33.00+4.03/src/ppx_sexp_value.ml	2016-03-22 15:13:51.000000000 +0100
-@@ -25,13 +25,10 @@
-     eapply ~loc (evar ~loc ("Sexplib.Conv.sexp_of_" ^ typ)) [pexp_constant ~loc const]
-   in
-   match const with
--  | Const_int       _ -> f "int"
--  | Const_char      _ -> f "char"
--  | Const_string    _ -> f "string"
--  | Const_float     _ -> f "float"
--  | Const_int32     _ -> f "int32"
--  | Const_int64     _ -> f "int64"
--  | Const_nativeint _ -> f "nativeint"
-+  | Pconst_integer       _ -> f "int"
-+  | Pconst_char      _ -> f "char"
-+  | Pconst_string    _ -> f "string"
-+  | Pconst_float     _ -> f "float"
- ;;
- 
- let sexp_of_constraint ~loc expr ctyp =
-@@ -90,7 +87,7 @@
-     | Pexp_record (fields, None) ->
-       sexp_of_record ~loc fields
-     | Pexp_apply ({ pexp_desc = Pexp_ident { txt = Lident "~~"; _ }; _},
--                  [ ("", { pexp_desc = Pexp_constraint (expr, ctyp); _ }) ]) ->
-+                  [ (Nolabel, { pexp_desc = Pexp_constraint (expr, ctyp); _ }) ]) ->
-       let expr_str = Pprintast.string_of_expression expr in
-       sexp_list ~loc
-         (elist ~loc [ sexp_atom ~loc (estring ~loc expr_str)
-@@ -168,7 +165,7 @@
-     (* Don't misinterpret [%sexp ~~(e : t)] for the deprecated application syntax. *)
-     | Pexp_apply ({ pexp_desc = Pexp_ident { txt = Lident "~~"; _}; _ }, _) -> expr
-     | Pexp_apply (f, (_ :: _ as args))
--      when List.for_all args ~f:(fun (lab, _) -> lab = "") ->
-+      when List.for_all args ~f:(fun (lab, _) -> lab = Nolabel) ->
-       let el = List.map (f :: List.map args ~f:snd) ~f:rewrite_arg in
-       let e = pexp_tuple ~loc el in
-       if !allow_deprecated_syntax then

diff --git a/dev-ml/ppx_sexp_value/ppx_sexp_value-113.33.00.ebuild b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.9.0.ebuild
similarity index 50%
rename from dev-ml/ppx_sexp_value/ppx_sexp_value-113.33.00.ebuild
rename to dev-ml/ppx_sexp_value/ppx_sexp_value-0.9.0.ebuild
index 0dfb28a0f07..a5901d07f62 100644
--- a/dev-ml/ppx_sexp_value/ppx_sexp_value-113.33.00.ebuild
+++ b/dev-ml/ppx_sexp_value/ppx_sexp_value-0.9.0.ebuild
@@ -1,40 +1,29 @@
-# 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="Standard library for ppx rewriters"
-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_sexp_value"
+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-lang/ocaml:=
 	dev-ml/ppx_core:=
 	dev-ml/ppx_driver:=
 	dev-ml/ppx_here:=
+	dev-ml/ppx_metaquot:=
 	dev-ml/ppx_sexp_conv:=
+	dev-ml/sexplib:=
+	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 \