dev-ml/ppx_custom_printf: Bump to 0.9.0

Package-Manager: Portage-2.3.5, Repoman-2.3.2

4 files changed, 33 insertions, 191 deletions

diff --git a/dev-ml/ppx_custom_printf/Manifest b/dev-ml/ppx_custom_printf/Manifest
index a8ed31a53ed1..9856eae085cf 100644
--- a/dev-ml/ppx_custom_printf/Manifest
+++ b/dev-ml/ppx_custom_printf/Manifest
@@ -1 +1 @@
-DIST ppx_custom_printf-113.33.00.tar.gz 57181 SHA256 a70e6bf16568aca86731fd38c8c1ba8c868c8867eee70607c71433dee70318c9 SHA512 5383246ffb07019d8203676966290917dbfce10956fb927739ff3238fa84a1ea205163ba15128dc58fd741ef151f96b895322bb60edebf978f108677c7d922d0 WHIRLPOOL 0347e5d0c8888bf54da961ef8c75fe0bc9a95b61eb07888ef9ac2a38a6c79cd97965e24e38ca3b85935c6257d97f2b6e679eab2e67653433f3c38f17b66a2b02
+DIST ppx_custom_printf-0.9.0.tar.gz 11527 SHA256 9c3c4be548d11a9b87f6a29bdc7bcf5509b4f20de5c309cf331ce45dcf314f8f SHA512 7608e09aac26f4f51d124d30c25a510abb73bea606007524a5563f5bb2c0e71f1ff033edb32c48f0c69656e8c3924b57186639812b1a647ce31f7ae15dc466cb WHIRLPOOL 729c03f257cb6edbb29ada1ed07f1f23952d5d369e2cf1b75700d01a24997a7f862228947256b729b20957614bf505ee878d576d90595ede0bf66480c7867803
diff --git a/dev-ml/ppx_custom_printf/files/oc43.patch b/dev-ml/ppx_custom_printf/files/oc43.patch
deleted file mode 100644
index 959a4be2ac1d..000000000000
--- a/dev-ml/ppx_custom_printf/files/oc43.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -uNr ppx_custom_printf-113.33.00/CHANGES.md ppx_custom_printf-113.33.00+4.03/CHANGES.md
---- ppx_custom_printf-113.33.00/CHANGES.md	2016-03-09 16:44:54.000000000 +0100
-+++ ppx_custom_printf-113.33.00+4.03/CHANGES.md	2016-03-22 15:13:50.000000000 +0100
-@@ -1,3 +1,7 @@
-+## 113.33.00+4.03
-+
-+Various updates to work with OCaml 4.03.0
-+
- ## 113.24.00
- 
- - OCaml makes no distinctions between "foo" and
-diff -uNr ppx_custom_printf-113.33.00/format-lifter/META ppx_custom_printf-113.33.00+4.03/format-lifter/META
---- ppx_custom_printf-113.33.00/format-lifter/META	2016-03-18 12:08:01.000000000 +0100
-+++ ppx_custom_printf-113.33.00+4.03/format-lifter/META	2016-03-22 17:51:36.000000000 +0100
-@@ -1,6 +1,6 @@
- # OASIS_START
--# DO NOT EDIT (digest: 30e281114bcfdcf7ccf231691613c2e6)
--version = "113.33.00"
-+# DO NOT EDIT (digest: 2c66a1ad37be0774b6cf2393020b734d)
-+version = "113.33.00+4.03"
- description =
- "Printf-style format-strings for user-defined string conversion"
- archive(byte) = "ppx_format_lifter.cma"
-diff -uNr ppx_custom_printf-113.33.00/INSTALL.txt ppx_custom_printf-113.33.00+4.03/INSTALL.txt
---- ppx_custom_printf-113.33.00/INSTALL.txt	2016-03-18 12:08:01.000000000 +0100
-+++ ppx_custom_printf-113.33.00+4.03/INSTALL.txt	2016-03-22 17:51:36.000000000 +0100
-@@ -1,5 +1,5 @@
- (* OASIS_START *)
--(* DO NOT EDIT (digest: aa3e5a8a416bfdc4bbbd15b0bcdbfede) *)
-+(* DO NOT EDIT (digest: d41a009725728d3aa9236f47b80b9b12) *)
- 
- This is the INSTALL file for the ppx_custom_printf distribution.
- 
-@@ -11,7 +11,7 @@
- 
- In order to compile this package, you will need:
- 
--* ocaml (>= 4.02.3)
-+* ocaml (>= 4.03.0)
- * findlib (>= 1.3.2)
- * ppx_core for library ppx_custom_printf
- * ppx_driver for library ppx_custom_printf, executable ppx
-diff -uNr ppx_custom_printf-113.33.00/_oasis ppx_custom_printf-113.33.00+4.03/_oasis
---- ppx_custom_printf-113.33.00/_oasis	2016-03-09 16:44:54.000000000 +0100
-+++ ppx_custom_printf-113.33.00+4.03/_oasis	2016-03-22 15:13:50.000000000 +0100
-@@ -1,8 +1,8 @@
- OASISFormat:      0.4
--OCamlVersion:     >= 4.02.3
-+OCamlVersion:     >= 4.03.0
- FindlibVersion:   >= 1.3.2
- Name:             ppx_custom_printf
--Version:          113.33.00
-+Version:          113.33.00+4.03
- Synopsis:         Printf-style format-strings for user-defined string conversion
- Authors:          Jane Street Group, LLC <opensource@janestreet.com>
- Copyrights:       (C) 2015-2016 Jane Street Group LLC <opensource@janestreet.com>
-diff -uNr ppx_custom_printf-113.33.00/opam ppx_custom_printf-113.33.00+4.03/opam
---- ppx_custom_printf-113.33.00/opam	2016-03-18 12:08:01.000000000 +0100
-+++ ppx_custom_printf-113.33.00+4.03/opam	2016-03-22 17:51:36.000000000 +0100
-@@ -17,4 +17,4 @@
-   "ppx_sexp_conv"
-   "ppx_tools"     {>= "0.99.3"}
- ]
--available: [ ocaml-version >= "4.02.3" ]
-+available: [ ocaml-version >= "4.03.0" ]
-diff -uNr ppx_custom_printf-113.33.00/setup.ml ppx_custom_printf-113.33.00+4.03/setup.ml
---- ppx_custom_printf-113.33.00/setup.ml	2016-03-18 12:08:01.000000000 +0100
-+++ ppx_custom_printf-113.33.00+4.03/setup.ml	2016-03-22 17:51:36.000000000 +0100
-@@ -1,5 +1,5 @@
- (* OASIS_START *)
--(* DO NOT EDIT (digest: c9a6b21baa91c0680f8cba2e849204cf) *)
-+(* DO NOT EDIT (digest: 924f534c954af21abd6099b21f46beee) *)
- (*
-    Regenerated by OASIS v0.4.5
-    Visit http://oasis.forge.ocamlcore.org for more information and
-@@ -6666,12 +6666,12 @@
-      package =
-        {
-           oasis_version = "0.4";
--          ocaml_version = Some (OASISVersion.VGreaterEqual "4.02.3");
-+          ocaml_version = Some (OASISVersion.VGreaterEqual "4.03.0");
-           findlib_version = Some (OASISVersion.VGreaterEqual "1.3.2");
-           alpha_features = [];
-           beta_features = [];
-           name = "ppx_custom_printf";
--          version = "113.33.00";
-+          version = "113.33.00+4.03";
-           license =
-             OASISLicense.DEP5License
-               (OASISLicense.DEP5Unit
-@@ -6841,7 +6841,7 @@
-        };
-      oasis_fn = Some "_oasis";
-      oasis_version = "0.4.5";
--     oasis_digest = Some "Hd\2128>@-\017\228\178\138\253\228l<\r";
-+     oasis_digest = Some "UJ\215>\004\182B+\173\217\151\0165\212\011,";
-      oasis_exec = None;
-      oasis_setup_args = [];
-      setup_update = false
-diff -uNr ppx_custom_printf-113.33.00/src/META ppx_custom_printf-113.33.00+4.03/src/META
---- ppx_custom_printf-113.33.00/src/META	2016-03-18 12:08:01.000000000 +0100
-+++ ppx_custom_printf-113.33.00+4.03/src/META	2016-03-22 17:51:36.000000000 +0100
-@@ -1,6 +1,6 @@
- # OASIS_START
--# DO NOT EDIT (digest: 2dabcf3bd944c3b9b0a168e17d64eb20)
--version = "113.33.00"
-+# DO NOT EDIT (digest: 148f0da22163c9e0ef38850349ca8160)
-+version = "113.33.00+4.03"
- description =
- "Printf-style format-strings for user-defined string conversion"
- requires =
-diff -uNr ppx_custom_printf-113.33.00/src/ppx_custom_printf.ml ppx_custom_printf-113.33.00+4.03/src/ppx_custom_printf.ml
---- ppx_custom_printf-113.33.00/src/ppx_custom_printf.ml	2016-03-09 16:44:54.000000000 +0100
-+++ ppx_custom_printf-113.33.00+4.03/src/ppx_custom_printf.ml	2016-03-22 15:13:50.000000000 +0100
-@@ -182,7 +182,7 @@
-     let ty = Parse.core_type lexbuf in
-     let e = Ppx_sexp_conv_expander.Sexp_of.core_type ty in
-     let arg = gen_symbol () in
--    pexp_fun ~loc "" None (pvar ~loc arg)
-+    pexp_fun ~loc Nolabel None (pvar ~loc arg)
-       (eapply ~loc sexp_converter [eapply ~loc e [evar ~loc arg]])
-   | None ->
-     let fail loc =
-@@ -214,7 +214,7 @@
-     let func = pexp_ident ~loc (Located.mk ~loc to_string_id) in
-     (* Eta-expand as the to_string function might take optional arguments *)
-     let arg = gen_symbol () in
--    pexp_fun ~loc "" None (pvar ~loc arg) (eapply ~loc func [evar ~loc arg])
-+    pexp_fun ~loc Nolabel None (pvar ~loc arg) (eapply ~loc func [evar ~loc arg])
- 
- class lifter ~loc ~custom_specs = object(self)
-   inherit [expression] Ppx_format_lifter.lifter as super
-@@ -296,9 +296,9 @@
-     match e.pexp_desc with
-     | Pexp_apply ({ pexp_desc = Pexp_ident { txt = Lident "!"; _ }
-                   ; pexp_attributes = ident_attrs; _ },
--                  [ ("", { pexp_desc = Pexp_constant (Const_string (str, _))
--                         ; pexp_loc = loc
--                         ; pexp_attributes = str_attrs }) ]) ->
-+                  [ (Nolabel, { pexp_desc = Pexp_constant (Pconst_string (str, _))
-+                              ; pexp_loc = loc
-+                              ; pexp_attributes = str_attrs }) ]) ->
-       assert_no_attributes ident_attrs;
-       assert_no_attributes str_attrs;
-       let e' = expand_format_string ~loc str in
diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0.ebuild
new file mode 100644
index 000000000000..165ba8d32c59
--- /dev/null
+++ b/dev-ml/ppx_custom_printf/ppx_custom_printf-0.9.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Printf-style format-strings for user-defined string conversion"
+HOMEPAGE="https://github.com/janestreet/ppx_custom_printf"
+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_core:=
+	dev-ml/ppx_driver:=
+	dev-ml/ppx_metaquot:=
+	dev-ml/ppx_sexp_conv:=
+	dev-ml/ppx_traverse
+	dev-ml/ocaml-migrate-parsetree:=
+"
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/opam dev-ml/jbuilder"
+
+src_install() {
+	opam-installer -i \
+		--prefix="${ED}/usr" \
+		--libdir="${D}/$(ocamlc -where)" \
+		--docdir="${ED}/usr/share/doc/${PF}" \
+		${PN}.install || die
+}
diff --git a/dev-ml/ppx_custom_printf/ppx_custom_printf-113.33.00.ebuild b/dev-ml/ppx_custom_printf/ppx_custom_printf-113.33.00.ebuild
deleted file mode 100644
index d51cc794f34f..000000000000
--- a/dev-ml/ppx_custom_printf/ppx_custom_printf-113.33.00.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit oasis eutils
-
-DESCRIPTION="Printf-style format-strings for user-defined string conversion"
-HOMEPAGE="http://www.janestreet.com/ocaml"
-SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-ml/ppx_tools:=
-	dev-ml/ppx_core:=
-	dev-ml/ppx_driver:=
-	dev-ml/ppx_sexp_conv:=
-"
-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
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		${PN}.install || die
-	dodoc CHANGES.md
-}