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

[Alexis Ballier]

commit:     155b4371b4fca510e83ef2210caa0b40c361e425
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Apr  1 16:50:03 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sun Apr  2 08:37:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=155b4371

dev-ml/ppx_expect: Bump to 0.9.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-ml/ppx_expect/Manifest                         |  2 +-
 dev-ml/ppx_expect/files/oc43.patch                 | 49 ----------------------
 ...ct-113.33.01.ebuild => ppx_expect-0.9.0.ebuild} | 39 ++++++-----------
 3 files changed, 14 insertions(+), 76 deletions(-)

diff --git a/dev-ml/ppx_expect/Manifest b/dev-ml/ppx_expect/Manifest
index c2d6b6cf5d8..a164d0729bd 100644
--- a/dev-ml/ppx_expect/Manifest
+++ b/dev-ml/ppx_expect/Manifest
@@ -1 +1 @@
-DIST ppx_expect-113.33.01.tar.gz 79539 SHA256 8697a447ce335bb5cf780ba258c13d13302d591109ff7f3ccb3ac6592db92242 SHA512 2074962dad42cb319ad758a202df4cc8f7e4302de45409da8f6167d9d3138914eba91339c3c71980663c893e1562994938907a1000fef45c96b74cbc0ace80f0 WHIRLPOOL be96bbde6d61127b1e03e7db9cf677bb5d37d5082d8110c377a545073b2500c0224e40d85c768602d40fa47fd9ac1c36294be108d3f100b590f5cb10ba5fbb49
+DIST ppx_expect-0.9.0.tar.gz 33700 SHA256 77d6b0da071c1fd31139edca2d95cf05c535ad8ef9b8816df041ce626be44efb SHA512 b8a6941f3ac0dea2167d7fe5c61e7adf605f5399e11049b5c9f22c613182983a014d05c2fb16e7a2dc94dbccf445e1801c39a89e6d995b5599cb40ee4322148e WHIRLPOOL e7741c77bbf06f35da4ddb1f10e2d008fff8dc536f6373317bd79a0fcac5c30fd10b4403588a71f3d9e44ec01280579e8d443a7ab37c30e0893644d81e2847aa

diff --git a/dev-ml/ppx_expect/files/oc43.patch b/dev-ml/ppx_expect/files/oc43.patch
deleted file mode 100644
index 3606d296338..00000000000
--- a/dev-ml/ppx_expect/files/oc43.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -uNr ppx_expect-113.33.01/expect_payload/ppx_expect_payload.ml ppx_expect-113.33.01+4.03/expect_payload/ppx_expect_payload.ml
---- ppx_expect-113.33.01/expect_payload/ppx_expect_payload.ml	2016-03-22 17:09:17.000000000 +0100
-+++ ppx_expect-113.33.01+4.03/expect_payload/ppx_expect_payload.ml	2016-04-06 12:35:50.000000000 +0200
-@@ -63,7 +63,7 @@
- 
- let pattern () =
-   Ast_pattern.(
--    map (single_expr_payload (pexp_loc __ (pexp_constant (const_string __ __))))
-+    map (single_expr_payload (pexp_loc __ (pexp_constant (pconst_string __ __))))
-       ~f:(fun f loc s tag -> f (Some (loc, s, tag)))
-     |||
-     map (pstr nil)
-diff -uNr ppx_expect-113.33.01/_oasis ppx_expect-113.33.01+4.03/_oasis
---- ppx_expect-113.33.01/_oasis	2016-03-22 17:09:17.000000000 +0100
-+++ ppx_expect-113.33.01+4.03/_oasis	2016-04-06 12:35:50.000000000 +0200
-@@ -1,8 +1,8 @@
- OASISFormat:           0.4
--OCamlVersion:          >= 4.02.3
-+OCamlVersion:          >= 4.03.0
- FindlibVersion:        >= 1.3.2
- Name:                  ppx_expect
--Version:               113.33.01
-+Version:               113.33.01+4.03
- Synopsis:              Cram like framework for OCaml
- Authors:               Jane Street Group, LLC <opensource@××××××××××.com>
- Copyrights:            (C) 2015-2016 Jane Street Group LLC <opensource@××××××××××.com>
-diff -uNr ppx_expect-113.33.01/opam ppx_expect-113.33.01+4.03/opam
---- ppx_expect-113.33.01/opam	2016-03-22 18:31:21.000000000 +0100
-+++ ppx_expect-113.33.01+4.03/opam	2016-04-06 12:54:27.000000000 +0200
-@@ -27,4 +27,4 @@
-   "sexplib"
-   "variantslib"
- ]
--available: [ ocaml-version >= "4.02.3" ]
-+available: [ ocaml-version >= "4.03.0" ]
-diff -uNr ppx_expect-113.33.01/src/expect_extension.ml ppx_expect-113.33.01+4.03/src/expect_extension.ml
---- ppx_expect-113.33.01/src/expect_extension.ml	2016-03-22 17:09:17.000000000 +0100
-+++ ppx_expect-113.33.01+4.03/src/expect_extension.ml	2016-04-06 12:35:50.000000000 +0200
-@@ -24,9 +24,8 @@
-   pstr ((
-     pstr_value nonrecursive (
-       value_binding
--        ~pat:(map (pstring __) ~f:(fun f x -> f (Some x)))
-+        ~pat:(alt_option (pstring __) ppat_any)
-         ~expr ^:: nil)
--    ||| map (pstr_eval expr nil) ~f:(fun f -> f None)
-   ) ^:: nil)
- 
- let expect_test =

diff --git a/dev-ml/ppx_expect/ppx_expect-113.33.01.ebuild b/dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild
similarity index 51%
rename from dev-ml/ppx_expect/ppx_expect-113.33.01.ebuild
rename to dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild
index 7e3ba793aa6..06f32df2666 100644
--- a/dev-ml/ppx_expect/ppx_expect-113.33.01.ebuild
+++ b/dev-ml/ppx_expect/ppx_expect-0.9.0.ebuild
@@ -1,50 +1,38 @@
-# 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="Cram like framework for OCaml"
-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_expect"
+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:=
-	dev-ml/fieldslib:=
+DEPEND="
+	dev-lang/ocaml:=
+	dev-ml/base:=
 	dev-ml/ppx_assert:=
 	dev-ml/ppx_compare:=
 	dev-ml/ppx_core:=
 	dev-ml/ppx_custom_printf:=
 	dev-ml/ppx_driver:=
 	dev-ml/ppx_fields_conv:=
+	dev-ml/ppx_here:=
 	dev-ml/ppx_inline_test:=
+	dev-ml/ppx_metaquot:=
 	dev-ml/ppx_sexp_conv:=
-	dev-ml/ppx_sexp_value:=
+	dev-ml/ppx_traverse:=
 	dev-ml/ppx_variants_conv:=
+	dev-ml/stdio:=
+	dev-ml/ocaml-migrate-parsetree:=
 	dev-ml/ocaml-re:=
-	dev-ml/sexplib:=
-	dev-ml/variantslib:=
 "
 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 \
@@ -52,5 +40,4 @@ src_install() {
 		--libdir="${D}/$(ocamlc -where)" \
 		--docdir="${ED}/usr/share/doc/${PF}" \
 		${PN}.install || die
-	dodoc CHANGES.md
 }