* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_type_conv/, dev-ml/ppx_type_conv/files/
@ 2017-01-24 11:50 Alexis Ballier
0 siblings, 0 replies; only message in thread
From: Alexis Ballier @ 2017-01-24 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 71ef0dc7cc917991c0475003a884e348d3b14d76
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 11:42:59 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 11:50:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71ef0dc7
dev-ml/ppx_type_conv: remove old
Package-Manager: Portage-2.3.3, Repoman-2.3.1
dev-ml/ppx_type_conv/Manifest | 2 -
dev-ml/ppx_type_conv/files/oc43.patch | 122 ---------------------
.../ppx_type_conv/ppx_type_conv-113.24.00.ebuild | 43 --------
.../ppx_type_conv/ppx_type_conv-113.33.00.ebuild | 47 --------
4 files changed, 214 deletions(-)
diff --git a/dev-ml/ppx_type_conv/Manifest b/dev-ml/ppx_type_conv/Manifest
index f247f91..3ffeb95 100644
--- a/dev-ml/ppx_type_conv/Manifest
+++ b/dev-ml/ppx_type_conv/Manifest
@@ -1,3 +1 @@
-DIST ppx_type_conv-113.24.00.tar.gz 59641 SHA256 0751505c5d400416d5abc2525d164264ea82b8569ce819aec04065bf47ce2c42 SHA512 7fd809c35e5f009886dcaa310822eb919efecba155c8cd1377c50a05894c2c9afcf88a979361bb2a277791b6cd5b7d17e2a30fda36bd3d416a046a0b34989b57 WHIRLPOOL c22d424260b0f0fb1337da41de4beff1f90fcaca5590c7b0620f633ab1a296690f76df428d96dabece3fc8267704f1f34cf721bb5f3ca562d75098b3133d4701
-DIST ppx_type_conv-113.33.00.tar.gz 59371 SHA256 983e704c9e3579ad2dc93b8017c7c3852160c6245eb85ef98d6eb1723724921f SHA512 4da9e3252522865f2a4976810b33ecaf0275e3a19f40193466a5ddce7163727ff0c0e02fbabf93a3133bde231597b1fd4fba4ff4d813d49ab1858e9243b228f8 WHIRLPOOL c02ce8f8d401d527803b02a72b301ac5992fba1444ee4d8dec50b71785078213d5dc1d2c8bb7d68ee9779997cf5ba5b39c78ae97d3f66f482ea50f5690502b6b
DIST ppx_type_conv-113.33.02+4.03.tar.gz 60598 SHA256 a211cc73cc3f31b6765b022bb851d762d9f6fa4c6b64666242923d5102d4f078 SHA512 305a46b9bf6ed6b082f5b794d180b9b194ed5f183d75e31fe49a392fa06c8cdfce1825987f9da0080bf83c49bf10dfd54837b22d73e50bc4eea8707bb64b7303 WHIRLPOOL 760ef375523410a8a1333bb5274a55efa8b27cd412a185fd65d6128a5f9ce5cb97d9d3703165cddf71b9f6c0d7c6a57baed6539bc22b8d689d19a8b1f54231d6
diff --git a/dev-ml/ppx_type_conv/files/oc43.patch b/dev-ml/ppx_type_conv/files/oc43.patch
deleted file mode 100644
index f9df3e1..00000000
--- a/dev-ml/ppx_type_conv/files/oc43.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff -uNr ppx_type_conv-113.33.00/js-utils/gen_install.ml ppx_type_conv-113.33.01+4.03/js-utils/gen_install.ml
---- ppx_type_conv-113.33.00/js-utils/gen_install.ml 2016-03-09 16:44:55.000000000 +0100
-+++ ppx_type_conv-113.33.01+4.03/js-utils/gen_install.ml 2016-04-18 12:11:00.000000000 +0200
-@@ -31,7 +31,7 @@
- |> List.map (fun line -> Scanf.sscanf line "%[^=]=%S" (fun k v -> (k, v)))
-
- let remove_cwd =
-- let prefix = Sys.getcwd () ^ "/" in
-+ let prefix = Sys.getcwd () ^ Filename.dir_sep in
- let len_prefix = String.length prefix in
- fun fn ->
- let len = String.length fn in
-diff -uNr ppx_type_conv-113.33.00/_oasis ppx_type_conv-113.33.01+4.03/_oasis
---- ppx_type_conv-113.33.00/_oasis 2016-03-09 16:44:55.000000000 +0100
-+++ ppx_type_conv-113.33.01+4.03/_oasis 2016-04-18 12:11:00.000000000 +0200
-@@ -1,8 +1,8 @@
- OASISFormat: 0.4
--OCamlVersion: >= 4.02.3
-+OCamlVersion: >= 4.03.0
- FindlibVersion: >= 1.3.2
- Name: ppx_type_conv
--Version: 113.33.00
-+Version: 113.33.01+4.03
- Synopsis: Support Library for type-driven code generators
- Authors: Jane Street Group, LLC <opensource@janestreet.com>
- Copyrights: (C) 2015-2016 Jane Street Group LLC <opensource@janestreet.com>
-diff -uNr ppx_type_conv-113.33.00/opam ppx_type_conv-113.33.01+4.03/opam
---- ppx_type_conv-113.33.00/opam 2016-03-18 12:08:01.000000000 +0100
-+++ ppx_type_conv-113.33.01+4.03/opam 2016-04-18 12:27:13.000000000 +0200
-@@ -17,4 +17,4 @@
- "ppx_driver"
- "ppx_tools" {>= "0.99.3"}
- ]
--available: [ ocaml-version >= "4.02.3" ]
-+available: [ ocaml-version >= "4.03.0" ]
-diff -uNr ppx_type_conv-113.33.00/src/ignore_unused_warning.ml ppx_type_conv-113.33.01+4.03/src/ignore_unused_warning.ml
---- ppx_type_conv-113.33.00/src/ignore_unused_warning.ml 2016-03-09 16:44:55.000000000 +0100
-+++ ppx_type_conv-113.33.01+4.03/src/ignore_unused_warning.ml 2016-04-18 12:11:00.000000000 +0200
-@@ -30,11 +30,11 @@
- List.fold_left vbs ~init:[] ~f:(fun acc vb -> vars_of#pattern vb.pvb_pat acc)
- in
- let ign =
-- pstr_value ~loc Nonrecursive
-+ pstr_value_list ~loc Nonrecursive
- (List.rev_map vars ~f:(fun v ->
- underscore_binding (pexp_ident ~loc:v.loc v)))
- in
-- loop rest (ign :: item :: acc)
-+ loop rest (ign @ (item :: acc))
- | item :: rest ->
- loop rest (item :: acc)
- in
-diff -uNr ppx_type_conv-113.33.00/src/type_conv.ml ppx_type_conv-113.33.01+4.03/src/type_conv.ml
---- ppx_type_conv-113.33.00/src/type_conv.ml 2016-03-09 16:44:55.000000000 +0100
-+++ ppx_type_conv-113.33.01+4.03/src/type_conv.ml 2016-04-18 12:11:00.000000000 +0200
-@@ -472,9 +472,10 @@
- Ast_pattern.(
- let label =
- map' __ ~f:(fun loc f label ->
-- if label = "" || label.[0] = '?' then
-+ match label with
-+ | Nolabel | Optional _ ->
- Location.raise_errorf ~loc "non-optional labeled argument expected"
-- else
-+ | Labelled label ->
- f label)
- in
- let generator_name () =
-@@ -530,16 +531,6 @@
- let get_str_exception_derivers = get_derivers deriving_attr_ec Deriver.Field.str_exception
- let get_sig_exception_derivers = get_derivers deriving_attr_ec Deriver.Field.sig_exception
-
--let get_rec_flag tds =
-- let has_nonrec td =
-- List.exists td.ptype_attributes ~f:(fun (name, _) -> name.txt = "nonrec")
-- in
-- if List.exists tds ~f:has_nonrec then
-- Nonrecursive
-- else
-- Recursive
--;;
--
- (* +-----------------------------------------------------------------+
- | Unused warning stuff |
- +-----------------------------------------------------------------+ *)
-@@ -627,17 +618,16 @@
- let item = super#structure_item path item in
- let loc = item.pstr_loc in
- match item.pstr_desc with
-- | Pstr_type tds ->
-+ | Pstr_type (rec_flag, tds) ->
- begin match get_str_type_decl_derivers tds with
- | None -> [item]
- | Some (tds, generators) ->
-- let rec_flag = get_rec_flag tds in
- let generated =
- types_used_by_type_conv tds
- @ Generator.apply_all ~rev:true ~loc ~path (rec_flag, tds) generators;
- in
- let tds = List.map tds ~f:(remove generators)#type_declaration in
-- let item = { item with pstr_desc = Pstr_type tds } in
-+ let item = { item with pstr_desc = Pstr_type (rec_flag, tds) } in
- item :: disable_unused_warning_str ~loc generated
- end
-
-@@ -670,14 +660,13 @@
- let item = super#signature_item path item in
- let loc = item.psig_loc in
- match item.psig_desc with
-- | Psig_type tds ->
-+ | Psig_type (rec_flag, tds) ->
- begin match get_sig_type_decl_derivers tds with
- | None -> [item]
- | Some (tds, generators) ->
-- let rec_flag = get_rec_flag tds in
- let generated = Generator.apply_all ~loc ~path (rec_flag, tds) generators in
- let tds = List.map tds ~f:(remove generators)#type_declaration in
-- let item = { item with psig_desc = Psig_type tds } in
-+ let item = { item with psig_desc = Psig_type (rec_flag, tds) } in
- item :: disable_unused_warning_sig ~loc generated
- end
-
diff --git a/dev-ml/ppx_type_conv/ppx_type_conv-113.24.00.ebuild b/dev-ml/ppx_type_conv/ppx_type_conv-113.24.00.ebuild
deleted file mode 100644
index 3520939..00000000
--- a/dev-ml/ppx_type_conv/ppx_type_conv-113.24.00.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit oasis
-
-DESCRIPTION="Support Library for type-driven code generators"
-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_driver:=
- dev-ml/ppx_deriving:=
- dev-ml/ppx_core:=
- dev-ml/ppx_optcomp:="
-
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/opam"
-
-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_type_conv/ppx_type_conv-113.33.00.ebuild b/dev-ml/ppx_type_conv/ppx_type_conv-113.33.00.ebuild
deleted file mode 100644
index c1370e2..00000000
--- a/dev-ml/ppx_type_conv/ppx_type_conv-113.33.00.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit oasis eutils
-
-DESCRIPTION="Support Library for type-driven code generators"
-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_driver:=
- dev-ml/ppx_deriving:=
- dev-ml/ppx_core:=
- 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
-}
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2017-01-24 11:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-24 11:50 [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_type_conv/, dev-ml/ppx_type_conv/files/ Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox