public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-containers/files/, dev-ml/ocaml-containers/
@ 2016-08-16 12:13 Alexis Ballier
  0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2016-08-16 12:13 UTC (permalink / raw
  To: gentoo-commits

commit:     1f001a8b5c7ed44829fb2f0ef0f4edd6f60132c1
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 16 11:57:30 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 16 11:57:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f001a8b

dev-ml/ocaml-containers: initial import; ebuild by me

Package-Manager: portage-2.3.0

 dev-ml/ocaml-containers/Manifest                   |  1 +
 dev-ml/ocaml-containers/files/notests.patch        | 18 ++++++++++++
 dev-ml/ocaml-containers/metadata.xml               |  8 ++++++
 .../ocaml-containers/ocaml-containers-0.18.ebuild  | 33 ++++++++++++++++++++++
 4 files changed, 60 insertions(+)

diff --git a/dev-ml/ocaml-containers/Manifest b/dev-ml/ocaml-containers/Manifest
new file mode 100644
index 0000000..3b998aa
--- /dev/null
+++ b/dev-ml/ocaml-containers/Manifest
@@ -0,0 +1 @@
+DIST ocaml-containers-0.18.tar.gz 418480 SHA256 8bac90113e229a9dc55a2f54c20cf363df43c2e72ca349a5a811ad113a6d2909 SHA512 fa61039fc3bbfcd53117ae582689ffca645b42a811ebe0fc8aa5da93ba5373c2ac54896ecaddbe3eff7593b2be44f208abb625ad3354d2b089a0b811b9f77cff WHIRLPOOL 10795e812baab4525f6fdfbc101c7b14230ef87893ccf01702a6a75e373a12bf643f775f63cb27640f0dd398da541e6c185489dc27cd9fc7bd75a4a90f34baf2

diff --git a/dev-ml/ocaml-containers/files/notests.patch b/dev-ml/ocaml-containers/files/notests.patch
new file mode 100644
index 0000000..011edc9
--- /dev/null
+++ b/dev-ml/ocaml-containers/files/notests.patch
@@ -0,0 +1,18 @@
+Index: ocaml-containers-0.18/Makefile
+===================================================================
+--- ocaml-containers-0.18.orig/Makefile
++++ ocaml-containers-0.18/Makefile
+@@ -90,12 +90,7 @@ QTEST_PREAMBLE='open CCFun;; '
+ 
+ qtest-gen:
+ 	@mkdir -p qtest
+-	@if which qtest > /dev/null ; then \
+-		qtest extract --preamble $(QTEST_PREAMBLE) \
+-			-o qtest/run_qtest.ml \
+-			$(QTESTABLE) 2> /dev/null ; \
+-	else touch qtest/run_qtest.ml ; \
+-	fi
++	touch qtest/run_qtest.ml
+ 
+ push-stable:
+ 	git checkout stable

diff --git a/dev-ml/ocaml-containers/metadata.xml b/dev-ml/ocaml-containers/metadata.xml
new file mode 100644
index 0000000..ffac4d7
--- /dev/null
+++ b/dev-ml/ocaml-containers/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+	<email>ml@gentoo.org</email>
+	<name>Gentoo ML Project</name>
+</maintainer>
+</pkgmetadata>

diff --git a/dev-ml/ocaml-containers/ocaml-containers-0.18.ebuild b/dev-ml/ocaml-containers/ocaml-containers-0.18.ebuild
new file mode 100644
index 0000000..a2a2dba
--- /dev/null
+++ b/dev-ml/ocaml-containers/ocaml-containers-0.18.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#OASIS_BUILD_TESTS=1
+OASIS_BUILD_DOCS=1
+
+inherit oasis
+
+DESCRIPTION="A modular standard library focused on data structures"
+HOMEPAGE="https://github.com/c-cube/ocaml-containers"
+SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-ml/result:=
+	dev-ml/sequence:=
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/notests.patch" )
+
+src_configure() {
+	oasis_configure_opts="
+		--enable-unix
+		--disable-bench
+	" oasis_src_configure
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-containers/files/, dev-ml/ocaml-containers/
@ 2016-12-19 12:15 Alexis Ballier
  0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2016-12-19 12:15 UTC (permalink / raw
  To: gentoo-commits

commit:     ff46b72a53c99b19678b99bf01c88fa1ba82210f
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 10:16:32 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 12:07:26 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff46b72a

dev-ml/ocaml-containers: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/ocaml-containers/Manifest                   |  3 --
 dev-ml/ocaml-containers/files/notests.patch        | 18 ------------
 .../ocaml-containers/ocaml-containers-0.18.ebuild  | 33 ----------------------
 .../ocaml-containers/ocaml-containers-0.19.ebuild  | 33 ----------------------
 .../ocaml-containers/ocaml-containers-0.20.ebuild  | 33 ----------------------
 5 files changed, 120 deletions(-)

diff --git a/dev-ml/ocaml-containers/Manifest b/dev-ml/ocaml-containers/Manifest
index 676f12f..6385689 100644
--- a/dev-ml/ocaml-containers/Manifest
+++ b/dev-ml/ocaml-containers/Manifest
@@ -1,4 +1 @@
-DIST ocaml-containers-0.18.tar.gz 418480 SHA256 8bac90113e229a9dc55a2f54c20cf363df43c2e72ca349a5a811ad113a6d2909 SHA512 fa61039fc3bbfcd53117ae582689ffca645b42a811ebe0fc8aa5da93ba5373c2ac54896ecaddbe3eff7593b2be44f208abb625ad3354d2b089a0b811b9f77cff WHIRLPOOL 10795e812baab4525f6fdfbc101c7b14230ef87893ccf01702a6a75e373a12bf643f775f63cb27640f0dd398da541e6c185489dc27cd9fc7bd75a4a90f34baf2
-DIST ocaml-containers-0.19.tar.gz 419243 SHA256 e53472e009ea2699f39940844fc0ef9abb332234834c6963f8325aa7df0694f5 SHA512 1ed078121770d72ba685c116ddeebc848b086e371604c7fedf1bdb58ea5cb9685db8a3c7c4edcac69a9cd18ece1eb601d1675c25efe6ab61e2a511a8a857aff2 WHIRLPOOL 27df23c2b0196647f071089d2044dbb7cf4b2c710bdc066eda892e8e4ffe229d5bafc2ec29b5afc4cffd0513d69d16776342258e667e62613ff2c771762ea1d5
-DIST ocaml-containers-0.20.tar.gz 427546 SHA256 d5ffbf6c87bc25b914043817f02a5513fe9b0499d3d0d67b43cceb2bc38d286b SHA512 9e97d4563824a937c42fee89dc86e91ff740bdb4c444ab4ce9b31f50b272f9f400d2d71fb298294d80443002f4b511f2292cc41be15234128bdcd18dd1b1cfd4 WHIRLPOOL f1e0599504d206725a6027905803355e5a80ee936287024bd184062c3030796dd289044e2d6d301bdb104eda25a9d457f424371123f0ce5b320dff1e83463d1f
 DIST ocaml-containers-0.21.tar.gz 429430 SHA256 7b3395964e527a60cfc3c96354c4ba1ebb9996e6f83399a31dd58eb053fd777b SHA512 fd339b09296245d40eac7661468147c98c45cdfc882ac890ca9a903f3a4abb21d4d13981b9784710d317ef4b3f76c3141b322df78673df2e0108d20cb633ae84 WHIRLPOOL 5cdd686f4d1b2b33ecc401b569a9321bc639b5c83866b5954585b021ecadb72e2a2b66eca778e6d5b0105f2c613d7df2cc3e20f2c1b44db622a03f7bf9068f9e

diff --git a/dev-ml/ocaml-containers/files/notests.patch b/dev-ml/ocaml-containers/files/notests.patch
deleted file mode 100644
index 011edc9..00000000
--- a/dev-ml/ocaml-containers/files/notests.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Index: ocaml-containers-0.18/Makefile
-===================================================================
---- ocaml-containers-0.18.orig/Makefile
-+++ ocaml-containers-0.18/Makefile
-@@ -90,12 +90,7 @@ QTEST_PREAMBLE='open CCFun;; '
- 
- qtest-gen:
- 	@mkdir -p qtest
--	@if which qtest > /dev/null ; then \
--		qtest extract --preamble $(QTEST_PREAMBLE) \
--			-o qtest/run_qtest.ml \
--			$(QTESTABLE) 2> /dev/null ; \
--	else touch qtest/run_qtest.ml ; \
--	fi
-+	touch qtest/run_qtest.ml
- 
- push-stable:
- 	git checkout stable

diff --git a/dev-ml/ocaml-containers/ocaml-containers-0.18.ebuild b/dev-ml/ocaml-containers/ocaml-containers-0.18.ebuild
deleted file mode 100644
index 9b88e57..00000000
--- a/dev-ml/ocaml-containers/ocaml-containers-0.18.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="A modular standard library focused on data structures"
-HOMEPAGE="https://github.com/c-cube/ocaml-containers"
-SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-ml/result:=
-	dev-ml/sequence:=
-"
-DEPEND="${RDEPEND} dev-ml/cppo"
-PATCHES=( "${FILESDIR}/notests.patch" )
-
-src_configure() {
-	oasis_configure_opts="
-		--enable-unix
-		--disable-bench
-	" oasis_src_configure
-}

diff --git a/dev-ml/ocaml-containers/ocaml-containers-0.19.ebuild b/dev-ml/ocaml-containers/ocaml-containers-0.19.ebuild
deleted file mode 100644
index 9b88e57..00000000
--- a/dev-ml/ocaml-containers/ocaml-containers-0.19.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-#OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="A modular standard library focused on data structures"
-HOMEPAGE="https://github.com/c-cube/ocaml-containers"
-SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	dev-ml/result:=
-	dev-ml/sequence:=
-"
-DEPEND="${RDEPEND} dev-ml/cppo"
-PATCHES=( "${FILESDIR}/notests.patch" )
-
-src_configure() {
-	oasis_configure_opts="
-		--enable-unix
-		--disable-bench
-	" oasis_src_configure
-}

diff --git a/dev-ml/ocaml-containers/ocaml-containers-0.20.ebuild b/dev-ml/ocaml-containers/ocaml-containers-0.20.ebuild
deleted file mode 100644
index 27d31ce..00000000
--- a/dev-ml/ocaml-containers/ocaml-containers-0.20.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="A modular standard library focused on data structures"
-HOMEPAGE="https://github.com/c-cube/ocaml-containers"
-SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-ml/result:=
-	dev-ml/sequence:=
-"
-DEPEND="${RDEPEND} dev-ml/cppo
-	test? ( dev-ml/iTeML )"
-
-src_configure() {
-	oasis_configure_opts="
-		--enable-unix
-		--disable-bench
-	" oasis_src_configure
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-containers/files/, dev-ml/ocaml-containers/
@ 2016-12-26 15:18 Alexis Ballier
  0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2016-12-26 15:18 UTC (permalink / raw
  To: gentoo-commits

commit:     5763e2211bebc3a0a48aa6bb6d8c8773b906fc18
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 26 14:02:21 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Dec 26 15:11:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5763e221

dev-ml/ocaml-containers: fix build with sequence 0.9

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/ocaml-containers/files/seq.patch              | 13 +++++++++++++
 dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dev-ml/ocaml-containers/files/seq.patch b/dev-ml/ocaml-containers/files/seq.patch
new file mode 100644
index 00000000..2ba116e
--- /dev/null
+++ b/dev-ml/ocaml-containers/files/seq.patch
@@ -0,0 +1,13 @@
+Index: ocaml-containers-0.22/src/advanced/CCLinq.ml
+===================================================================
+--- ocaml-containers-0.22.orig/src/advanced/CCLinq.ml
++++ ocaml-containers-0.22/src/advanced/CCLinq.ml
+@@ -212,7 +212,7 @@ module PMap = struct
+     seq
+ 
+   let flatten_l m =
+-    let seq = Sequence.flatMap
++    let seq = Sequence.flat_map
+         (fun (k,v) -> Sequence.map (fun v' -> k,v') (Sequence.of_list v))
+         m.to_seq
+     in

diff --git a/dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild b/dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild
index 27d31ce..29bae80 100644
--- a/dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild
+++ b/dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild
@@ -20,11 +20,13 @@ IUSE="test"
 
 RDEPEND="
 	dev-ml/result:=
-	dev-ml/sequence:=
+	>=dev-ml/sequence-0.9:=
 "
 DEPEND="${RDEPEND} dev-ml/cppo
 	test? ( dev-ml/iTeML )"
 
+PATCHES=( "${FILESDIR}/seq.patch" )
+
 src_configure() {
 	oasis_configure_opts="
 		--enable-unix


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-containers/files/, dev-ml/ocaml-containers/
@ 2017-01-24 11:14 Alexis Ballier
  0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2017-01-24 11:14 UTC (permalink / raw
  To: gentoo-commits

commit:     83315eba145df907dde535652e5df848a44dc15e
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 11:10:44 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 11:14:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83315eba

dev-ml/ocaml-containers: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/ocaml-containers/Manifest                   |  1 -
 dev-ml/ocaml-containers/files/seq.patch            | 13 --------
 .../ocaml-containers/ocaml-containers-0.22.ebuild  | 35 ----------------------
 3 files changed, 49 deletions(-)

diff --git a/dev-ml/ocaml-containers/Manifest b/dev-ml/ocaml-containers/Manifest
index 77b4f9f..5fd1cfc 100644
--- a/dev-ml/ocaml-containers/Manifest
+++ b/dev-ml/ocaml-containers/Manifest
@@ -1,2 +1 @@
 DIST ocaml-containers-0.22.1.tar.gz 429672 SHA256 2ef64e8ed93211dfd4f8cd594943db3cde81ee0400b17703d8a7993128634622 SHA512 9294d43485cd17998f9d0c758ee0ffdc187ea78f1f456c0b06a57a9401c6de529e9e68bad12908b2b0da5f22fca64835acb90f3dfd6ee3403bb7c3c301cd6821 WHIRLPOOL 67844578447b321439223b5f560258cb5d5417135dfdbfdaf2fa10e104beb764e9ca6ae0ab774864c974d928e75aa5aedc7e90ea5659d910f33349a7ec4b568b
-DIST ocaml-containers-0.22.tar.gz 429678 SHA256 883e64a6b2275355086521a67d5fe0e436bbf79f54c8fb068a05ab3cf3408e98 SHA512 1454f8bcd11d02a9efd2fe223e2db591d2e1d66df6877af920b4d8a2cc3a2c6b34b0979069015565618700dfb4a74d6a8f2d8cd8f9fc6fa7888331320ea41c46 WHIRLPOOL f5993d629fe2a803b1284cd5794f3345060215cf16bb97347dd2173b7015735ddcd43b98c3b5ccf365d372ffedf77892e862fbc276b24468699a95492dc784e7

diff --git a/dev-ml/ocaml-containers/files/seq.patch b/dev-ml/ocaml-containers/files/seq.patch
deleted file mode 100644
index 2ba116e..00000000
--- a/dev-ml/ocaml-containers/files/seq.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: ocaml-containers-0.22/src/advanced/CCLinq.ml
-===================================================================
---- ocaml-containers-0.22.orig/src/advanced/CCLinq.ml
-+++ ocaml-containers-0.22/src/advanced/CCLinq.ml
-@@ -212,7 +212,7 @@ module PMap = struct
-     seq
- 
-   let flatten_l m =
--    let seq = Sequence.flatMap
-+    let seq = Sequence.flat_map
-         (fun (k,v) -> Sequence.map (fun v' -> k,v') (Sequence.of_list v))
-         m.to_seq
-     in

diff --git a/dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild b/dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild
deleted file mode 100644
index 29bae80..00000000
--- a/dev-ml/ocaml-containers/ocaml-containers-0.22.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-OASIS_BUILD_TESTS=1
-OASIS_BUILD_DOCS=1
-
-inherit oasis
-
-DESCRIPTION="A modular standard library focused on data structures"
-HOMEPAGE="https://github.com/c-cube/ocaml-containers"
-SRC_URI="https://github.com/c-cube/ocaml-containers/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	dev-ml/result:=
-	>=dev-ml/sequence-0.9:=
-"
-DEPEND="${RDEPEND} dev-ml/cppo
-	test? ( dev-ml/iTeML )"
-
-PATCHES=( "${FILESDIR}/seq.patch" )
-
-src_configure() {
-	oasis_configure_opts="
-		--enable-unix
-		--disable-bench
-	" oasis_src_configure
-}


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-containers/files/, dev-ml/ocaml-containers/
@ 2017-07-03 17:40 Alexis Ballier
  0 siblings, 0 replies; 5+ messages in thread
From: Alexis Ballier @ 2017-07-03 17:40 UTC (permalink / raw
  To: gentoo-commits

commit:     94a16fb921f072d6f3d4cf776834ec316031ed51
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  3 17:40:06 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Mon Jul  3 17:40:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a16fb9

dev-ml/ocaml-containers: backport upstream test build fix with latest qcheck, bug #623664

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-ml/ocaml-containers/files/qcheck.patch         | 61 ++++++++++++++++++++++
 .../ocaml-containers/ocaml-containers-1.2.ebuild   |  2 +
 2 files changed, 63 insertions(+)

diff --git a/dev-ml/ocaml-containers/files/qcheck.patch b/dev-ml/ocaml-containers/files/qcheck.patch
new file mode 100644
index 00000000000..c88ef31741a
--- /dev/null
+++ b/dev-ml/ocaml-containers/files/qcheck.patch
@@ -0,0 +1,61 @@
+commit b2f8eb5b27a95f37509ab6345910ecd62b3c8a90
+Author: Simon Cruanes <simon.cruanes.2007@m4x.org>
+Date:   Tue May 30 09:16:37 2017 +0200
+
+    update to qcheck 0.6
+
+diff --git a/src/core/CCList.ml b/src/core/CCList.ml
+index ebdf7ce..ef4254e 100644
+--- a/src/core/CCList.ml
++++ b/src/core/CCList.ml
+@@ -688,9 +688,9 @@ let take_while p l =
+ *)
+ 
+ (*$Q
+-  Q.(pair (fun1 small_int bool) (list small_int)) (fun (f,l) -> \
+-    let l1 = take_while f l in \
+-    List.for_all f l1)
++  Q.(pair (fun1 Observable.int bool) (list small_int)) (fun (f,l) -> \
++    let l1 = take_while (Q.Fn.apply f) l in \
++    List.for_all (Q.Fn.apply f) l1)
+ *)
+ 
+ let rec drop_while p l = match l with
+@@ -698,8 +698,8 @@ let rec drop_while p l = match l with
+   | x :: l' -> if p x then drop_while p l' else l
+ 
+ (*$Q
+-  Q.(pair (fun1 small_int bool) (list small_int)) (fun (f,l) -> \
+-    take_while f l @ drop_while f l = l)
++  Q.(pair (fun1 Observable.int bool) (list small_int)) (fun (f,l) -> \
++    take_while (Q.Fn.apply f) l @ drop_while (Q.Fn.apply f) l = l)
+ *)
+ 
+ let take_drop_while p l =
+@@ -720,9 +720,9 @@ let take_drop_while p l =
+   direct direct_depth_default_ p l
+ 
+ (*$Q
+-  Q.(pair (fun1 small_int bool) (list small_int)) (fun (f,l) -> \
+-    let l1,l2 = take_drop_while f l in \
+-    (l1 = take_while f l) && (l2 = drop_while f l))
++  Q.(pair (fun1 Observable.int bool) (list small_int)) (fun (f,l) -> \
++    let l1,l2 = take_drop_while (Q.Fn.apply f) l in \
++    (l1 = take_while (Q.Fn.apply f) l) && (l2 = drop_while (Q.Fn.apply f) l))
+ *)
+ 
+ let last n l =
+diff --git a/src/data/CCRAL.ml b/src/data/CCRAL.ml
+index 0c00c3a..5d9aa24 100644
+--- a/src/data/CCRAL.ml
++++ b/src/data/CCRAL.ml
+@@ -151,7 +151,8 @@ let mapi ~f l =
+ *)
+ 
+ (*$Q
+-  Q.(pair (list small_int)(fun2 int int bool)) (fun (l,f) -> \
++  Q.(pair (list small_int)(fun2 Observable.int Observable.int bool)) (fun (l,f) -> \
++    let f = Q.Fn.apply f in \
+     mapi ~f (of_list l) |> to_list = List.mapi f l )
+ *)
+ 

diff --git a/dev-ml/ocaml-containers/ocaml-containers-1.2.ebuild b/dev-ml/ocaml-containers/ocaml-containers-1.2.ebuild
index 33e8871a4f7..30745be4f65 100644
--- a/dev-ml/ocaml-containers/ocaml-containers-1.2.ebuild
+++ b/dev-ml/ocaml-containers/ocaml-containers-1.2.ebuild
@@ -24,6 +24,8 @@ RDEPEND="
 DEPEND="${RDEPEND} dev-ml/cppo
 	test? ( dev-ml/iTeML dev-ml/ounit dev-ml/gen )"
 
+PATCHES=( "${FILESDIR}/qcheck.patch" )
+
 src_configure() {
 	oasis_configure_opts="
 		--enable-unix


^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-07-03 17:40 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-12-26 15:18 [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocaml-containers/files/, dev-ml/ocaml-containers/ Alexis Ballier
  -- strict thread matches above, loose matches on Subject: below --
2017-07-03 17:40 Alexis Ballier
2017-01-24 11:14 Alexis Ballier
2016-12-19 12:15 Alexis Ballier
2016-08-16 12:13 Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox