From 39e2c792ec3604975ee7abd39b7b4936b0197591 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sat, 1 Apr 2017 16:13:07 +0200 Subject: dev-ml/sexplib: Bump to 0.9.1. It will appear as downgrade but this is the new upstream versioning scheme. Package-Manager: Portage-2.3.5, Repoman-2.3.2 --- dev-ml/sexplib/Manifest | 2 +- dev-ml/sexplib/files/oc43.patch | 56 --------------------------------- dev-ml/sexplib/sexplib-0.9.1.ebuild | 29 +++++++++++++++++ dev-ml/sexplib/sexplib-113.33.00.ebuild | 43 ------------------------- 4 files changed, 30 insertions(+), 100 deletions(-) delete mode 100644 dev-ml/sexplib/files/oc43.patch create mode 100644 dev-ml/sexplib/sexplib-0.9.1.ebuild delete mode 100644 dev-ml/sexplib/sexplib-113.33.00.ebuild (limited to 'dev-ml/sexplib') diff --git a/dev-ml/sexplib/Manifest b/dev-ml/sexplib/Manifest index 38e051438277..f35fbb41eb03 100644 --- a/dev-ml/sexplib/Manifest +++ b/dev-ml/sexplib/Manifest @@ -1 +1 @@ -DIST sexplib-113.33.00.tar.gz 115786 SHA256 405c3dc9795e5d987fe88c437b86509f211b60ededf66ca1c7a650e12241818e SHA512 b05d96afcd116c62f76b92fb1bf13bf8fac800323beb9cc565183643cfe4bac2d4c1228cf15eeba23bd1bc729b0fca81cb9ba3d3145896f2cd4a6d7bf852c1a4 WHIRLPOOL 033a6a89b0aa952c7c6a0d29a52e9b890e044daebc32a05c0be7646805260ef8ef1c2d503f1d5cf22a6c9c041586f64fe40a75112661012f13afcf87643f3ecd +DIST sexplib-0.9.1.tar.gz 75004 SHA256 4cfea2edbe90db2227409abc5e93e86ee4413c8c7aeeb73f2fd69a86a7d55766 SHA512 c9b938c3fcbf50768f4db55c7bc8fe979400066b39b6bd0d431960e4f4c15d0d8265a9fdac9eda5278415a78119d8a2721df4aab1bca980fb1090c065c34d931 WHIRLPOOL 359ed2983ca6fba813ffd49c7db8bbaaeb63c918cd0e8eaed5a35134ec347cdc8493248d6662cc82b4c1c4299229fb69b61fec008dd52aa4c1d19ea49f800839 diff --git a/dev-ml/sexplib/files/oc43.patch b/dev-ml/sexplib/files/oc43.patch deleted file mode 100644 index 9162d58dd481..000000000000 --- a/dev-ml/sexplib/files/oc43.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff -uNr sexplib-113.33.00/_oasis sexplib-113.33.00+4.03/_oasis ---- sexplib-113.33.00/_oasis 2016-03-09 16:44:55.000000000 +0100 -+++ sexplib-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: sexplib --Version: 113.33.00 -+Version: 113.33.00+4.03 - Synopsis: Library for serializing OCaml values to and from S-expressions - Authors: Jane Street Group, LLC - Copyrights: (C) 2005-2016 Jane Street Group LLC -diff -uNr sexplib-113.33.00/src/conv.ml sexplib-113.33.00+4.03/src/conv.ml ---- sexplib-113.33.00/src/conv.ml 2016-03-09 16:44:55.000000000 +0100 -+++ sexplib-113.33.00+4.03/src/conv.ml 2016-03-22 15:13:51.000000000 +0100 -@@ -185,7 +185,7 @@ - - (* [Obj.extension_id] works on both the exception itself, and the extension slot of the - exception. *) -- let rec clean_up_handler (slot : Obj.t) = -+ let rec clean_up_handler (slot : extension_constructor) = - let id = Obj.extension_id slot in - let old_exn_id_map = !exn_id_map in - let new_exn_id_map = Exn_ids.remove id old_exn_id_map in -@@ -196,7 +196,7 @@ - exn_id_map := new_exn_id_map - - let add_auto ?(finalise = true) exn sexp_of_exn = -- let id = Obj.extension_id exn in -+ let id = Obj.extension_id (Obj.extension_constructor exn) in - let rec loop () = - let old_exn_id_map = !exn_id_map in - let new_exn_id_map = Exn_ids.add id sexp_of_exn old_exn_id_map in -@@ -205,13 +205,18 @@ - loop () - else begin - exn_id_map := new_exn_id_map; -- if finalise then Gc.finalise clean_up_handler (Obj.extension_slot exn) -+ if finalise then -+ try -+ Gc.finalise clean_up_handler (Obj.extension_constructor exn) -+ with Invalid_argument _ -> -+ (* Pre-allocated extension constructors cannot be finalised *) -+ () - end - in - loop () - - let find_auto exn = -- let id = Obj.extension_id exn in -+ let id = Obj.extension_id (Obj.extension_constructor exn) in - match Exn_ids.find id !exn_id_map with - | exception Not_found -> None - | sexp_of_exn -> Some (sexp_of_exn exn) diff --git a/dev-ml/sexplib/sexplib-0.9.1.ebuild b/dev-ml/sexplib/sexplib-0.9.1.ebuild new file mode 100644 index 000000000000..611c4befcf7e --- /dev/null +++ b/dev-ml/sexplib/sexplib-0.9.1.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions" +HOMEPAGE="https://github.com/janestreet/sexplib" +SRC_URI="https://github.com/janestreet/sexplib/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND="dev-lang/ocaml:=" +DEPEND="${RDEPEND} dev-ml/opam dev-ml/jbuilder" + +src_test() { + jbuilder runtest || die +} + +src_install() { + opam-installer -i \ + --prefix="${ED}/usr" \ + --libdir="${D}/$(ocamlc -where)" \ + --docdir="${ED}/usr/share/doc/${PF}" \ + ${PN}.install || die + dodoc CHANGES.md README.org +} diff --git a/dev-ml/sexplib/sexplib-113.33.00.ebuild b/dev-ml/sexplib/sexplib-113.33.00.ebuild deleted file mode 100644 index a0a04529feda..000000000000 --- a/dev-ml/sexplib/sexplib-113.33.00.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -OASIS_BUILD_DOCS=1 -OASIS_BUILD_TESTS=1 - -inherit oasis eutils - -DESCRIPTION="Library for automated conversion of OCaml-values to and from S-expressions" -HOMEPAGE="https://bitbucket.org/yminsky/ocaml-core/wiki/Home" -SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV%.*}/files/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0/${PV}" -KEYWORDS="~amd64" -IUSE="" - -RDEPEND=">=dev-ml/type-conv-113.00.00:=" -DEPEND="${RDEPEND} 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 README.org -} -- cgit v1.2.3-65-gdbad