[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_type_conv/

[Sam James]

commit: 9e345ac43f59e97ee5302d69ae7f4983b7b3744f
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 22 04:14:00 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr  4 06:09:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e345ac4

dev-ml/ppx_type_conv: treeclean

Signed-off-by: Sam James  gentoo.org>

 dev-ml/ppx_type_conv/Manifest   |  1 -
 dev-ml/ppx_type_conv/metadata.xml   |  8 
 dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild | 26 -
 3 files changed, 35 deletions(-)

diff --git a/dev-ml/ppx_type_conv/Manifest b/dev-ml/ppx_type_conv/Manifest
deleted file mode 100644
index e7bb605ae29..000
--- a/dev-ml/ppx_type_conv/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ppx_type_conv-0.9.0.tar.gz 14651 BLAKE2B 
50b4ffb85062eb306bbadb3b641f9ca0318e95c614482302c4b3e001eeeb14137c4d0050abb8cf5c6e57a5fd8afe70b16a3455b4080e6f85981c88765c8ba945
 SHA512 
71af29d7e882652a5e101e1fc3610adb4faaba30068161b4b391e3ce7419af7feffd289070c1707cc961c593eda7b7f325609e8c98543c1168400cfafea31472

diff --git a/dev-ml/ppx_type_conv/metadata.xml 
b/dev-ml/ppx_type_conv/metadata.xml
deleted file mode 100644
index 75fe4910a68..000
--- a/dev-ml/ppx_type_conv/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   
-   janestreet/ppx_type_conv
-   
-

diff --git a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild 
b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
deleted file mode 100644
index 879332244f9..000
--- a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit opam
-
-DESCRIPTION="Support Library for type-driven code generators"
-HOMEPAGE="https://github.com/janestreet/ppx_type_conv;
-SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-   dev-ml/ppx_driver:=
-   dev-ml/ppx_metaquot:=
-   dev-ml/ppx_core:=
-   dev-ml/ocaml-migrate-parsetree:=
-   dev-ml/ppx_deriving:=
-"
-
-RDEPEND="${DEPEND}"
-DEPEND="${DEPEND} dev-ml/jbuilder"

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_type_conv/

[Thomas Deutschmann]

commit: 7f247e5df4bc98cc774b712c4df72269d76beaec
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Wed Feb 14 14:23:20 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Wed Feb 14 14:23:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f247e5d

dev-ml/ppx_type_conv: x86 keyworded (bug #627836)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild 
b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
index b88f55d56fa..879332244f9 100644
--- a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
+++ b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_type_conv/

[Sergei Trofimovich]

commit: c700e2779fab57c2faab88003a40ac6f939eba93
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep 10 14:41:45 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep 10 14:44:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c700e277

dev-ml/ppx_type_conv: keyworded 0.9.0 for ppc, bug #627836

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --include-arches="ppc"

 dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild 
b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
index 476039b4d8e..b88f55d56fa 100644
--- a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
+++ b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0/${PV}"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~ppc"
 IUSE=""
 
 DEPEND="

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_type_conv/

[Alexis Ballier]

commit: 1d93253250c92ad4a3b6b5dccd0028cf4d29404f
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Aug 15 07:15:16 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Aug 15 07:26:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d932532

dev-ml/ppx_type_conv: convert to opam.eclass

Package-Manager: Portage-2.3.7, Repoman-2.3.3

 dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild | 12 +++-
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild 
b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
index b8868855e53..476039b4d8e 100644
--- a/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
+++ b/dev-ml/ppx_type_conv/ppx_type_conv-0.9.0.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit opam
+
 DESCRIPTION="Support Library for type-driven code generators"
 HOMEPAGE="https://github.com/janestreet/ppx_type_conv;
 SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
@@ -21,12 +23,4 @@ DEPEND="
 "
 
 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
-}
+DEPEND="${DEPEND} dev-ml/jbuilder"

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

[Alexis Ballier]

commit: 71ef0dc7cc917991c0475003a884e348d3b14d76
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Jan 24 11:42:59 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Jan 24 11:50:27 2017 +
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..
--- 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.ml2016-03-09 
16:44:55.0 +0100
-+++ ppx_type_conv-113.33.01+4.03/js-utils/gen_install.ml   2016-04-18 
12:11:00.0 +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.0 +0100
-+++ ppx_type_conv-113.33.01+4.03/_oasis2016-04-18 12:11:00.0 
+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 
- Copyrights:   (C) 2015-2016 Jane Street Group LLC 

-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.0 +0100
-+++ ppx_type_conv-113.33.01+4.03/opam  2016-04-18 12:27:13.0 +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.0 +0100
-+++ ppx_type_conv-113.33.01+4.03/src/ignore_unused_warning.ml  2016-04-18 
12:11:00.0 +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.0 
+0100
-+++ 

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_type_conv/

[Alexis Ballier]

commit: 6d63621e39d1c1fe9a7f1e8468b72c6a8a28576c
Author: Alexis Ballier  gentoo  org>
AuthorDate: Thu Sep  8 08:34:12 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Thu Sep  8 14:56:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d63621e

dev-ml/ppx_type_conv: bump to 113.33.02

Package-Manager: portage-2.3.0

 dev-ml/ppx_type_conv/Manifest  |  1 +
 .../ppx_type_conv/ppx_type_conv-113.33.02.ebuild   | 47 ++
 2 files changed, 48 insertions(+)

diff --git a/dev-ml/ppx_type_conv/Manifest b/dev-ml/ppx_type_conv/Manifest
index d741fa6..f247f91 100644
--- a/dev-ml/ppx_type_conv/Manifest
+++ b/dev-ml/ppx_type_conv/Manifest
@@ -1,2 +1,3 @@
 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/ppx_type_conv-113.33.02.ebuild 
b/dev-ml/ppx_type_conv/ppx_type_conv-113.33.02.ebuild
new file mode 100644
index ..cde7e86
--- /dev/null
+++ b/dev-ml/ppx_type_conv/ppx_type_conv-113.33.02.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2016 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}+4.03.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:=
+   >=dev-lang/ocaml-4.03:=
+"
+
+RDEPEND="${DEPEND}"
+DEPEND="${DEPEND} dev-ml/opam"
+
+S=${WORKDIR}/${P}+4.03
+
+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
+}

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

[Alexis Ballier]

commit: ebedfa131a4d00867a4cb02b9a518859cb9418d9
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun May  1 18:09:57 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue May  3 09:13:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebedfa13

dev-ml/ppx_type_conv: fix build with ocaml 4.03

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/ppx_type_conv/files/oc43.patch  | 93 ++
 .../ppx_type_conv/ppx_type_conv-113.33.00.ebuild   |  6 +-
 2 files changed, 98 insertions(+), 1 deletion(-)

diff --git a/dev-ml/ppx_type_conv/files/oc43.patch 
b/dev-ml/ppx_type_conv/files/oc43.patch
new file mode 100644
index 000..ac3a1df
--- /dev/null
+++ b/dev-ml/ppx_type_conv/files/oc43.patch
@@ -0,0 +1,93 @@
+diff -uNr ppx_type_conv-113.33.00/_oasis ppx_type_conv-113.33.00+4.03/_oasis
+--- ppx_type_conv-113.33.00/_oasis 2016-03-09 16:44:55.0 +0100
 ppx_type_conv-113.33.00+4.03/_oasis2016-03-22 15:13:51.0 
+0100
+@@ -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.00+4.03
+ Synopsis: Support Library for type-driven code generators
+ Authors:  Jane Street Group, LLC 
+ Copyrights:   (C) 2015-2016 Jane Street Group LLC 

+diff -uNr ppx_type_conv-113.33.00/opam ppx_type_conv-113.33.00+4.03/opam
+--- ppx_type_conv-113.33.00/opam   2016-03-18 12:08:01.0 +0100
 ppx_type_conv-113.33.00+4.03/opam  2016-03-22 17:51:38.0 +0100
+@@ -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/type_conv.ml 
ppx_type_conv-113.33.00+4.03/src/type_conv.ml
+--- ppx_type_conv-113.33.00/src/type_conv.ml   2016-03-09 16:44:55.0 
+0100
 ppx_type_conv-113.33.00+4.03/src/type_conv.ml  2016-03-22 
15:13:51.0 +0100
+@@ -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.33.00.ebuild 

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

[Alexis Ballier]

commit: d7ad273c456d1563cbb0abc12d9b7b9bb5ef6736
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun May  1 18:21:57 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue May  3 09:13:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ad273c

dev-ml/ppx_type_conv: use more recent upstream patch for ocaml 4.03

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/ppx_type_conv/files/oc43.patch | 43 +--
 1 file changed, 36 insertions(+), 7 deletions(-)

diff --git a/dev-ml/ppx_type_conv/files/oc43.patch 
b/dev-ml/ppx_type_conv/files/oc43.patch
index ac3a1df..f9df3e1 100644
--- a/dev-ml/ppx_type_conv/files/oc43.patch
+++ b/dev-ml/ppx_type_conv/files/oc43.patch
@@ -1,6 +1,18 @@
-diff -uNr ppx_type_conv-113.33.00/_oasis ppx_type_conv-113.33.00+4.03/_oasis
+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.ml2016-03-09 
16:44:55.0 +0100
 ppx_type_conv-113.33.01+4.03/js-utils/gen_install.ml   2016-04-18 
12:11:00.0 +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.0 +0100
-+++ ppx_type_conv-113.33.00+4.03/_oasis2016-03-22 15:13:51.0 
+0100
 ppx_type_conv-113.33.01+4.03/_oasis2016-04-18 12:11:00.0 
+0200
 @@ -1,8 +1,8 @@
  OASISFormat:  0.4
 -OCamlVersion: >= 4.02.3
@@ -8,22 +20,39 @@ diff -uNr ppx_type_conv-113.33.00/_oasis 
ppx_type_conv-113.33.00+4.03/_oasis
  FindlibVersion:   >= 1.3.2
  Name: ppx_type_conv
 -Version:  113.33.00
-+Version:  113.33.00+4.03
++Version:  113.33.01+4.03
  Synopsis: Support Library for type-driven code generators
  Authors:  Jane Street Group, LLC 
  Copyrights:   (C) 2015-2016 Jane Street Group LLC 

-diff -uNr ppx_type_conv-113.33.00/opam ppx_type_conv-113.33.00+4.03/opam
+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.0 +0100
-+++ ppx_type_conv-113.33.00+4.03/opam  2016-03-22 17:51:38.0 +0100
 ppx_type_conv-113.33.01+4.03/opam  2016-04-18 12:27:13.0 +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/type_conv.ml 
ppx_type_conv-113.33.00+4.03/src/type_conv.ml
+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.0 +0100
 ppx_type_conv-113.33.01+4.03/src/ignore_unused_warning.ml  2016-04-18 
12:11:00.0 +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.0 
+0100
-+++ ppx_type_conv-113.33.00+4.03/src/type_conv.ml  2016-03-22 
15:13:51.0 +0100
 ppx_type_conv-113.33.01+4.03/src/type_conv.ml  2016-04-18 
12:11:00.0 +0200
 @@ -472,9 +472,10 @@
  Ast_pattern.(
let label =

[gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_type_conv/

[Alexis Ballier]

commit: 4f97f2e3361259f3fd92123c0f46376843f95b69
Author: Alexis Ballier  gentoo  org>
AuthorDate: Tue Mar 22 08:52:55 2016 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Tue Mar 22 09:20:01 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f97f2e3

dev-ml/ppx_type_conv: bump to 113.33.00

Package-Manager: portage-2.2.28
Signed-off-by: Alexis Ballier  gentoo.org>

 dev-ml/ppx_type_conv/Manifest  |  1 +
 .../ppx_type_conv/ppx_type_conv-113.33.00.ebuild   | 43 ++
 2 files changed, 44 insertions(+)

diff --git a/dev-ml/ppx_type_conv/Manifest b/dev-ml/ppx_type_conv/Manifest
index ec3c4bf..d741fa6 100644
--- a/dev-ml/ppx_type_conv/Manifest
+++ b/dev-ml/ppx_type_conv/Manifest
@@ -1 +1,2 @@
 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

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
new file mode 100644
index 000..3520939
--- /dev/null
+++ b/dev-ml/ppx_type_conv/ppx_type_conv-113.33.00.ebuild
@@ -0,0 +1,43 @@
+# 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
+}