From: Alexis Ballier Date: Sat, 1 Apr 2017 14:39:59 +0000 (+0200) Subject: dev-ml/ppx_driver: Bump to 0.9.0 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=11195c2b1ef4c6a0936f0e9ca73913155ee4f010;p=gentoo.git dev-ml/ppx_driver: Bump to 0.9.0 Package-Manager: Portage-2.3.5, Repoman-2.3.2 --- diff --git a/dev-ml/ppx_driver/Manifest b/dev-ml/ppx_driver/Manifest index 852ed693cf40..2903b8c45c6f 100644 --- a/dev-ml/ppx_driver/Manifest +++ b/dev-ml/ppx_driver/Manifest @@ -1,2 +1 @@ -DIST ppx_driver-113.33.00.tar.gz 59174 SHA256 e58e86e0e5cc4c038fd7ac4eeefdbb6b9a26036b9df24ea5e1cbe163edefe61e SHA512 b3644c138b5f2c23c6e9f2f6084121b91ef67d4131a29a17ff629d21e0d33e7c313f3d1531e1d87b4073bb6f10142e612d61e450a0690cf27443b573bbb28399 WHIRLPOOL 46223d2c5cb558c4a218939973c202c0f20ae0797202ccfc75f78eb63edb16f9411d533d1e63fce3b3e614e443f0df07fec317426290292171a7b0faa719866d -DIST ppx_driver-113.33.04.tar.gz 65968 SHA256 3a6affd73f477f0929191c60d1c4124a27e0494bd4eb0c4a19fd7756a827f4df SHA512 b119824ff50457bdc0bec4d1e7f4b57e8db6b34d4606d7d473328314616173c65bde0fa610d666d4a8ca7659a16f17c46acf9007206d78c63679b8ccbe41e514 WHIRLPOOL 249e5a47bb914b7c4c614c3ba4b2b589ea2989795f6ce867e68f61451fbc2cdee7cb42eb253b293ccc00f7425480f820df71c6314ed1b653a3814f3dda87c54c +DIST ppx_driver-0.9.0.tar.gz 25052 SHA256 6c282d2957dba79ba890a28ffd6c30b2a81f0bb1c67bb2e18e355728798ad69f SHA512 3a5797601d0dde663a760b327737aa1ce3af4a77b1de7d5f76a4c934b10039cd63566a9a44eb56774d9a1982fcc4663a49d39a70ea500d7557b89cc3990ebb54 WHIRLPOOL dca6906cf9cd559f205459d75e5c92bd255a511da6753a91d2639a19d53abe64d74c613256b0f3ecd6657df80dcc5dd26ca7fbbecf25975b9cc69f00385f6bb0 diff --git a/dev-ml/ppx_driver/files/oc43.patch b/dev-ml/ppx_driver/files/oc43.patch deleted file mode 100644 index 630d6bfff3fc..000000000000 --- a/dev-ml/ppx_driver/files/oc43.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -uNr ppx_driver-113.33.00/_oasis ppx_driver-113.33.00+4.03/_oasis ---- ppx_driver-113.33.00/_oasis 2016-03-09 16:44:54.000000000 +0100 -+++ ppx_driver-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_driver --Version: 113.33.00 -+Version: 113.33.00+4.03 - Synopsis: Feature-full driver for OCaml AST transformers - Authors: Jane Street Group, LLC - Copyrights: (C) 2015-2016 Jane Street Group LLC -diff -uNr ppx_driver-113.33.00/opam ppx_driver-113.33.00+4.03/opam ---- ppx_driver-113.33.00/opam 2016-03-18 12:08:01.000000000 +0100 -+++ ppx_driver-113.33.00+4.03/opam 2016-03-22 17:51:36.000000000 +0100 -@@ -16,4 +16,4 @@ - "ppx_core" - "ppx_optcomp" - ] --available: [ ocaml-version >= "4.02.3" ] -+available: [ ocaml-version >= "4.03.0" ] -diff -uNr ppx_driver-113.33.00/src/ppx_driver.ml ppx_driver-113.33.00+4.03/src/ppx_driver.ml ---- ppx_driver-113.33.00/src/ppx_driver.ml 2016-03-09 16:44:54.000000000 +0100 -+++ ppx_driver-113.33.00+4.03/src/ppx_driver.ml 2016-03-22 15:13:50.000000000 +0100 -@@ -111,6 +111,24 @@ - |> fst - ;; - -+let remove_empty_lets = object -+ inherit Ast_traverse.map as super -+ -+ method! structure_item st = -+ let st = super#structure_item st in -+ match st.pstr_desc with -+ | Pstr_value (_, []) -> -+ let (module B) = Ast_builder.make st.pstr_loc in -+ B.pstr_value Nonrecursive [B.value_binding ~pat:B.punit ~expr:B.eunit] -+ | _ -> st -+ -+ method! expression e = -+ let e = super#expression e in -+ match e.pexp_desc with -+ | Pexp_let (_, [], e) -> e -+ | _ -> e -+end -+ - let map_structure st = - let st = - if !perform_checks then begin -@@ -123,6 +141,7 @@ - apply_transforms st ~field:(fun (ct : Transform.t) -> ct.impl) - ~dropped_so_far:Attribute.dropped_so_far_structure - in -+ let st = remove_empty_lets#structure st in - if !perform_checks then begin - Attribute.check_unused#structure st; - Extension.check_unused#structure st; -@@ -143,6 +162,7 @@ - apply_transforms sg ~field:(fun ct -> ct.intf) - ~dropped_so_far:Attribute.dropped_so_far_signature - in -+ let sg = remove_empty_lets#signature sg in - if !perform_checks then begin - Attribute.check_unused#signature sg; - Extension.check_unused#signature sg; diff --git a/dev-ml/ppx_driver/ppx_driver-0.9.0.ebuild b/dev-ml/ppx_driver/ppx_driver-0.9.0.ebuild new file mode 100644 index 000000000000..ca8838223d31 --- /dev/null +++ b/dev-ml/ppx_driver/ppx_driver-0.9.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Feature-full driver for OCaml AST transformers" +HOMEPAGE="https://github.com/janestreet/ppx_driver" +SRC_URI="https://github.com/janestreet/ppx_driver/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="" + +DEPEND=" + dev-lang/ocaml:= + dev-ml/ppx_core:= + dev-ml/ppx_optcomp:= + dev-ml/ocaml-migrate-parsetree:= + dev-ml/ocamlbuild:=" +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_driver/ppx_driver-113.33.00.ebuild b/dev-ml/ppx_driver/ppx_driver-113.33.00.ebuild deleted file mode 100644 index 5a539ea35a2b..000000000000 --- a/dev-ml/ppx_driver/ppx_driver-113.33.00.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit oasis eutils - -DESCRIPTION="Feature-full driver for OCaml AST transformers" -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-113.33.00:= - dev-ml/ocamlbuild:=[ocamlopt?] - dev-ml/ppx_optcomp:=" -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 -} diff --git a/dev-ml/ppx_driver/ppx_driver-113.33.04.ebuild b/dev-ml/ppx_driver/ppx_driver-113.33.04.ebuild deleted file mode 100644 index 79781710ff23..000000000000 --- a/dev-ml/ppx_driver/ppx_driver-113.33.04.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit oasis eutils - -DESCRIPTION="Feature-full driver for OCaml AST transformers" -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-113.33.00:= - dev-ml/ocamlbuild:=[ocamlopt?] - dev-ml/ppx_optcomp:=" -RDEPEND="${DEPEND}" -DEPEND="${DEPEND} dev-ml/opam dev-ml/js-build-tools" - -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 -}