dev-ml/ppx_sexp_message: Bump to 0.9.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

3 files changed, 11 insertions, 113 deletions

diff --git a/dev-ml/ppx_sexp_message/Manifest b/dev-ml/ppx_sexp_message/Manifest
index 42e82ebbeecb..cfa88e6baee6 100644
--- a/dev-ml/ppx_sexp_message/Manifest
+++ b/dev-ml/ppx_sexp_message/Manifest
@@ -1 +1 @@
-DIST ppx_sexp_message-113.33.00.tar.gz 53908 SHA256 853b57b9c65344b7b34c805d43f46c4248e57e20bd82d40303ce9618cc31c037 SHA512 db695644c7cc870db1091cfe8fb940406fa631c3c61ed0deb060adc9672d89e57329fe5aa2b9f6594a049d27eb675fbd6ff8ab1d2f796a9c657cbdac0d465f99 WHIRLPOOL 553685834e94461bb343a86d8a66a82cc6bc3ec4dd7cdc97cfe18582da9765d974084581679d0c27ccaa65a3cb55186bada1dea34ca5197c16a43eae2f9e4cef
+DIST ppx_sexp_message-0.9.0.tar.gz 8965 SHA256 4d3db307444923eb248632209b402eb163ed98196965439eec02920e9ea72dd9 SHA512 38a376b23372b8699fef76085ad2ead7b5fb34b823b0c7e3e52ac90654133a44429d7a3383197b78c8f01a7b64753ce424d5138b8aef596d236ce9c798ec1887 WHIRLPOOL 5871bea6f38e0f8a7430ac951dce2d37bdaf7d0dec1811bc3bd0157ef650e05b38947de69722979ae68c8f23339cf4b01a8e2655352197a497c1de15501bf791
diff --git a/dev-ml/ppx_sexp_message/files/oc43.patch b/dev-ml/ppx_sexp_message/files/oc43.patch
deleted file mode 100644
index d2d4e09429df..000000000000
--- a/dev-ml/ppx_sexp_message/files/oc43.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff -uNr ppx_sexp_message-113.33.00/_oasis ppx_sexp_message-113.33.00+4.03/_oasis
---- ppx_sexp_message-113.33.00/_oasis	2016-03-09 16:44:54.000000000 +0100
-+++ ppx_sexp_message-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_message
--Version:          113.33.00
-+Version:          113.33.00+4.03
- Synopsis:         A ppx rewriter for easy construction of s-expressions
- Authors:          Jane Street Group, LLC <opensource@janestreet.com>
- Copyrights:       (C) 2015-2016 Jane Street Group LLC <opensource@janestreet.com>
-diff -uNr ppx_sexp_message-113.33.00/opam ppx_sexp_message-113.33.00+4.03/opam
---- ppx_sexp_message-113.33.00/opam	2016-03-18 12:08:01.000000000 +0100
-+++ ppx_sexp_message-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_message-113.33.00/src/ppx_sexp_message.ml ppx_sexp_message-113.33.00+4.03/src/ppx_sexp_message.ml
---- ppx_sexp_message-113.33.00/src/ppx_sexp_message.ml	2016-03-09 16:44:54.000000000 +0100
-+++ ppx_sexp_message-113.33.00+4.03/src/ppx_sexp_message.ml	2016-03-22 15:13:51.000000000 +0100
-@@ -42,13 +42,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 rewrite_here e =
-@@ -62,7 +59,7 @@
-   let e = rewrite_here e in
-   let loc = e.pexp_loc in
-   match e.pexp_desc with
--  | Pexp_constant (Const_string ("", _)) ->
-+  | Pexp_constant (Pconst_string ("", _)) ->
-     None
-   | Pexp_constant const ->
-     Some (sexp_of_constant ~loc const)
-@@ -71,18 +68,6 @@
-   | _ -> Some [%expr Sexplib.Conv.sexp_of_string [%e e]]
- ;;
- 
--type arg_label =
--  | Nolabel
--  | Labelled of string
--  | Optional
--
--(* Will help with the switch to 4.03 *)
--let arg_label_of_string = function
--  | "" -> Nolabel
--  | s when s.[0] = '?' -> Optional
--  | s -> Labelled s
--;;
--
- let sexp_of_labelled_expr (label, e) =
-   let loc = e.pexp_loc in
-   match label, e.pexp_desc with
-@@ -97,7 +82,7 @@
-   | Labelled label, _ ->
-     Some (sexp_inline ~loc (sexp_atom ~loc (estring ~loc label)
-                             :: List.of_option (sexp_of_expr e)))
--  | Optional, _ ->
-+  | Optional _, _ ->
-     (* Could be used to encode sexp_option if that's ever needed. *)
-     Location.raise_errorf ~loc
-       "ppx_sexp_value: optional argument not allowed here"
-@@ -112,7 +97,7 @@
-   let labelled_exprs =
-     match e.pexp_desc with
-     | Pexp_apply (f, args) ->
--      (Nolabel, f) :: List.map args ~f:(fun (label, e) -> arg_label_of_string label, e)
-+      (Nolabel, f) :: args
-     | _ ->
-       (Nolabel, e) :: []
-   in
diff --git a/dev-ml/ppx_sexp_message/ppx_sexp_message-113.33.00.ebuild b/dev-ml/ppx_sexp_message/ppx_sexp_message-0.9.0.ebuild
index 006fdf13e881..c8fd307c4f0e 100644
--- a/dev-ml/ppx_sexp_message/ppx_sexp_message-113.33.00.ebuild
+++ b/dev-ml/ppx_sexp_message/ppx_sexp_message-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="A ppx rewriter for easy construction of s-expressions"
-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_message"
+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 \
@@ -42,5 +31,4 @@ src_install() {
 		--libdir="${D}/$(ocamlc -where)" \
 		--docdir="${ED}/usr/share/doc/${PF}" \
 		${PN}.install || die
-	dodoc README.md
 }