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

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

[Alexis Ballier]

commit:     82b852916efb5ba3f1d49e0680b8071250c4d71f
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 13 22:07:49 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 13 22:09:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82b85291

dev-ml/ppx_deriving: Apply conditional patch, backported from upstream, to build with ocaml 4.05

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-ml/ppx_deriving/files/ocaml405.patch       | 21 +++++++++++++++++++++
 dev-ml/ppx_deriving/ppx_deriving-4.1-r1.ebuild |  1 +
 2 files changed, 22 insertions(+)

diff --git a/dev-ml/ppx_deriving/files/ocaml405.patch b/dev-ml/ppx_deriving/files/ocaml405.patch
new file mode 100644
index 00000000000..6f0a5c56f46
--- /dev/null
+++ b/dev-ml/ppx_deriving/files/ocaml405.patch
@@ -0,0 +1,21 @@
+Index: ppx_deriving-4.1/src/ppx_deriving.cppo.ml
+===================================================================
+--- ppx_deriving-4.1.orig/src/ppx_deriving.cppo.ml
++++ ppx_deriving-4.1/src/ppx_deriving.cppo.ml
+@@ -310,6 +310,7 @@ let free_vars_in_core_type typ =
+       List.map free_in xs |> List.concat
+     | { ptyp_desc = Ptyp_alias (x, name) } -> [name] @ free_in x
+     | { ptyp_desc = Ptyp_poly (bound, x) } ->
++      let bound = List.map (fun x -> x.Location.txt) bound in
+       List.filter (fun y -> not (List.mem y bound)) (free_in x)
+     | { ptyp_desc = Ptyp_variant (rows, _, _) } ->
+       List.map (
+@@ -401,7 +402,7 @@ let binop_reduce x a b =
+   [%expr [%e x] [%e a] [%e b]]
+ 
+ let strong_type_of_type ty =
+-  let free_vars = free_vars_in_core_type ty in
++  let free_vars = List.map Location.mknoloc (free_vars_in_core_type ty) in
+   Typ.force_poly @@ Typ.poly free_vars ty
+ 
+ let derive path pstr_loc item attributes fn arg =

diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.1-r1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.1-r1.ebuild
index c0d348838f6..5adaa541c9c 100644
--- a/dev-ml/ppx_deriving/ppx_deriving-4.1-r1.ebuild
+++ b/dev-ml/ppx_deriving/ppx_deriving-4.1-r1.ebuild
@@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}/ocb011.patch"
+	has_version '>=dev-lang/ocaml-4.05_rc' && epatch "${FILESDIR}/ocaml405.patch"
 }
 
 src_compile() {

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

[Alexis Ballier]

commit:     d3b81d19f7e1c9e1fac287a4199bc23b9e874404
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 22 08:09:48 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 08:31:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3b81d19

dev-ml/ppx_deriving: Remove old

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 dev-ml/ppx_deriving/Manifest                   |  1 -
 dev-ml/ppx_deriving/files/ocb011.patch         | 16 -------
 dev-ml/ppx_deriving/ppx_deriving-4.1-r1.ebuild | 59 --------------------------
 3 files changed, 76 deletions(-)

diff --git a/dev-ml/ppx_deriving/Manifest b/dev-ml/ppx_deriving/Manifest
index ade8b609d2e..d3e25267fee 100644
--- a/dev-ml/ppx_deriving/Manifest
+++ b/dev-ml/ppx_deriving/Manifest
@@ -1,2 +1 @@
-DIST ppx_deriving-4.1.tar.gz 46502 SHA256 74831b9688140f27304c55e82f930d47107f4587f4e7cbb88ddfc820c23321bb SHA512 5191565254edd036ebe4d1eae1c660bcac293c000ce1f3eb12aeb1fb05b82d93bb28ddb88ab31967f98827838ce1c57e6f83f767f4dfe41eb265bad6dfaa5e8a WHIRLPOOL ca7860a918384de36fd3b3f6c259117f654357dd78193fe23d1d3324b61e08df8792984cb93801a92e80100140f0fdae999040cf0965237c9faba4d3f0a46ee0
 DIST ppx_deriving-4.2.tar.gz 48327 SHA256 488618f652bd30baa9f6d42d9e4168c97b8e71c60e7d54b5018a0da097db016f SHA512 084526157d6f4b41f7ad73157c5edb54d5bb9130d706525031670d8495ede8af5545302f442c2d2c506772201b79ccc93bdc7fead9455d3a59977ddfa9c3284d WHIRLPOOL 305f3283d965d0cdf4eb7abc0b63e6a960785a629569e97d8654d0aee9915b20471f127bf950191d459dcda209b0c33991a899a60e95b195e0044c3e21dc8406

diff --git a/dev-ml/ppx_deriving/files/ocb011.patch b/dev-ml/ppx_deriving/files/ocb011.patch
deleted file mode 100644
index 73c921971b0..00000000000
--- a/dev-ml/ppx_deriving/files/ocb011.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-commit a4428407e974361d872e0a70e036bc7ee20e8467
-Author: whitequark <whitequark@whitequark.org>
-Date:   Tue Feb 28 00:37:56 2017 +0000
-
-    Fix ppx_deriving_make.mllib.
-    
-    This is a bug that goes back all the way to c2fb119f, but it was
-    hidden by a matching bug in ocamlbuild <0.11.
-
-diff --git a/src_plugins/ppx_deriving_make.mllib b/src_plugins/ppx_deriving_make.mllib
-index 1b2681b..7f23204 100644
---- a/src_plugins/ppx_deriving_make.mllib
-+++ b/src_plugins/ppx_deriving_make.mllib
-@@ -1 +1 @@
--ppx_deriving_create
-+ppx_deriving_make

diff --git a/dev-ml/ppx_deriving/ppx_deriving-4.1-r1.ebuild b/dev-ml/ppx_deriving/ppx_deriving-4.1-r1.ebuild
deleted file mode 100644
index 5adaa541c9c..00000000000
--- a/dev-ml/ppx_deriving/ppx_deriving-4.1-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit findlib eutils
-
-DESCRIPTION="Type-driven code generation for OCaml"
-HOMEPAGE="https://github.com/whitequark/ppx_deriving"
-SRC_URI="https://github.com/whitequark/ppx_deriving/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="doc +ocamlopt test"
-
-DEPEND="dev-ml/ppx_tools:=
-	>=dev-lang/ocaml-4.02.3:=[ocamlopt?]"
-RDEPEND="${DEPEND}"
-DEPEND="${RDEPEND}
-	dev-ml/cppo
-	dev-ml/opam
-	test? ( dev-ml/ounit )"
-
-src_prepare() {
-	epatch "${FILESDIR}/ocb011.patch"
-	has_version '>=dev-lang/ocaml-4.05_rc' && epatch "${FILESDIR}/ocaml405.patch"
-}
-
-src_compile() {
-	cp pkg/META.in pkg/META || die
-	ocaml pkg/build.ml \
-		native=$(usex ocamlopt true false) \
-		native-dynlink=$(usex ocamlopt true false) \
-		|| die
-	use doc && emake doc
-}
-
-src_test() {
-	ocamlbuild -j 0 -use-ocamlfind -classic-display \
-			src_test/test_ppx_deriving.byte -- || die
-	if use ocamlopt;  then
-		ocamlbuild -j 0 -use-ocamlfind -classic-display \
-			src_test/test_ppx_deriving.native -- || die
-	fi
-}
-
-src_install() {
-	opam-installer -i \
-		--prefix="${ED}/usr" \
-		--libdir="${D}/$(ocamlc -where)" \
-		--docdir="${ED}/usr/share/doc/${PF}" \
-		${PN}.install || die
-	mv "${ED}/usr/lib/ppx_deriving/ppx_deriving" "${D}/$(ocamlc -where)/ppx_deriving/" || die
-
-	use doc && dohtml api.docdir/*
-
-	dodoc CHANGELOG.md README.md
-}