| 1 |
commit: 5763e2211bebc3a0a48aa6bb6d8c8773b906fc18 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Dec 26 14:02:21 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Dec 26 15:11:46 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5763e221 |
| 7 |
|
| 8 |
dev-ml/ocaml-containers: fix build with sequence 0.9 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
dev-ml/ocaml-containers/files/seq.patch | 13 +++++++++++++ |
| 13 |
dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild | 4 +++- |
| 14 |
2 files changed, 16 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/dev-ml/ocaml-containers/files/seq.patch b/dev-ml/ocaml-containers/files/seq.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..2ba116e |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-ml/ocaml-containers/files/seq.patch |
| 21 |
@@ -0,0 +1,13 @@ |
| 22 |
+Index: ocaml-containers-0.22/src/advanced/CCLinq.ml |
| 23 |
+=================================================================== |
| 24 |
+--- ocaml-containers-0.22.orig/src/advanced/CCLinq.ml |
| 25 |
++++ ocaml-containers-0.22/src/advanced/CCLinq.ml |
| 26 |
+@@ -212,7 +212,7 @@ module PMap = struct |
| 27 |
+ seq |
| 28 |
+ |
| 29 |
+ let flatten_l m = |
| 30 |
+- let seq = Sequence.flatMap |
| 31 |
++ let seq = Sequence.flat_map |
| 32 |
+ (fun (k,v) -> Sequence.map (fun v' -> k,v') (Sequence.of_list v)) |
| 33 |
+ m.to_seq |
| 34 |
+ in |
| 35 |
|
| 36 |
diff --git a/dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild b/dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild |
| 37 |
index 27d31ce..29bae80 100644 |
| 38 |
--- a/dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild |
| 39 |
+++ b/dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild |
| 40 |
@@ -20,11 +20,13 @@ IUSE="test" |
| 41 |
|
| 42 |
RDEPEND=" |
| 43 |
dev-ml/result:= |
| 44 |
- dev-ml/sequence:= |
| 45 |
+ >=dev-ml/sequence-0.9:= |
| 46 |
" |
| 47 |
DEPEND="${RDEPEND} dev-ml/cppo |
| 48 |
test? ( dev-ml/iTeML )" |
| 49 |
|
| 50 |
+PATCHES=( "${FILESDIR}/seq.patch" ) |
| 51 |
+ |
| 52 |
src_configure() { |
| 53 |
oasis_configure_opts=" |
| 54 |
--enable-unix |
Archives