gentoo resync : 13.10.2017

3 files changed, 2 insertions, 66 deletions

diff --git a/dev-ml/ocaml-containers/Manifest b/dev-ml/ocaml-containers/Manifest
index 3b149f8defdc..4220d8e0ab0e 100644
--- a/dev-ml/ocaml-containers/Manifest
+++ b/dev-ml/ocaml-containers/Manifest
@@ -1,7 +1,6 @@
-AUX qcheck.patch 1974 SHA256 5661296bf670c4b70900d88011ab8cd05aaa08464fd7910243a1bb9bcaa890ae SHA512 b8b7dc36d63f1fa748843ccd682615936babfb0864587c429158914b4427a4dac35d59ea3faa37318b5f158d3710dd0300b6afaab421bbd68c5a6982bc012bdc WHIRLPOOL f6b8bead6d7002d89a5d58e819a9b173731dd40e8579cc085600fe4f85e24247a44875a6f2259116338dfe606a15dc43d17b1c90b3cd6f8386b42c8143de5f0c
-DIST ocaml-containers-1.2.tar.gz 293774 SHA256 1c7825fbefaf90c3f9f9367ce0abda95f1dda242b1db560ed51c75ef0c6b5b15 SHA512 c5d94760a51a94aca1482ce3720450bce4448090609737a5be50f99c8884441df4676da953b31bdb8f10dd2fca3235b6e9e8d1580bd3fa917b03408a9a14b28d WHIRLPOOL a365c6992d926d2c4045da0a39052c7eba71eb3c937eca126a186e393fefdf199fe1e40f5cde21539df914e235ce8e3dcd7712da86160a2ef1631cf223c3be65
 DIST ocaml-containers-1.3.tar.gz 299928 SHA256 839495aaca4f7bf681b8af931a5de7d51a5076e5c30a5fbf83f4b1de8216aa57 SHA512 d4402be1d11fee883bdf2b4fcc339df6ef175ac2d6532ee865c36656473c4882290e45f2efd9b90af7298fc3ffa0ce27fb83d8c7166edeafff798ceccad929e8 WHIRLPOOL 7292527f99eb92832b7e4b495cfbd6e2fe179d8c1496256f2016489f6f5e8ec0c1509cc5aa05c7af49999b73a0f2eaf77fa6d2bf4310cf68a4762a3ab9a0994e
-EBUILD ocaml-containers-1.2.ebuild 721 SHA256 590b7604258c498aac36096e3236773492ba2677e99d7345bb2c1b4df24bbbda SHA512 e8fbaa20000fe7badd5e27915bfcddfa64938805a6c009551e307e8739c42131d42bf3f32ae7a327fb5c53ea8033def80cf2ecd072d372f97f93ec45f028b518 WHIRLPOOL 2866a1770790e7bff498724ae5f728321c538a0ef64403c1351e1adfaefe87bd2db8ea753237b0c982803c774715899bd717b3d0cb0c10367a15c7bfad397622
+DIST ocaml-containers-1.4.tar.gz 302136 SHA256 fe89419bc502af431e8e9ec2e2dc3929bb115a0bd18c57e2a1a0c90179151f4b SHA512 f96c83a139cc277bb60f572966965eb3b669afe6dadd926f9baf42e8effb5f47fb4ba7628ee91ce3896a270f12e5828bc4dd9364cc6f187e800b07305fadce75 WHIRLPOOL 44eb73c2cefd4c0f9facc5655f4876880f422eafc301c69b19a764f9986d808c1e3921430d50d05d41035b8f9ce5342da310cc810e8eb4e3e7d8063dc4b9d466
 EBUILD ocaml-containers-1.3.ebuild 681 SHA256 c13b2ef6747f6bcd19165d03266430e7b84b38be585b1c23b3f5310c58d68475 SHA512 1050976dffe785acd9b6f562a3fe66f72b815ee78a0ac5045aa624427366b33f5586d435ea27294b89b7bc666e32de1bf889eef888556b520c9cf0a4bc514bd1 WHIRLPOOL c02f05963aebcee02c5a2156616bfa1a1267f8be31f9a4c2c315101fb3f9bd8846811fa1cedb190cf2d494dd31c1958c0122df65dd2ed865f795f11c6a2181ee
+EBUILD ocaml-containers-1.4.ebuild 681 SHA256 c13b2ef6747f6bcd19165d03266430e7b84b38be585b1c23b3f5310c58d68475 SHA512 1050976dffe785acd9b6f562a3fe66f72b815ee78a0ac5045aa624427366b33f5586d435ea27294b89b7bc666e32de1bf889eef888556b520c9cf0a4bc514bd1 WHIRLPOOL c02f05963aebcee02c5a2156616bfa1a1267f8be31f9a4c2c315101fb3f9bd8846811fa1cedb190cf2d494dd31c1958c0122df65dd2ed865f795f11c6a2181ee
 MISC ChangeLog 1066 SHA256 fbb9813bac694e61560d7cbd8b9f7e64f6c6f0df221107ad650ee7dd0d41e87f SHA512 ca763725b24aed96a5e6a0e9a5a6b3f8446795d377074398b5f712e7c94b516ac46b35a0c480e1896364768ec63a034ee56dea0fe5e5d407e6262ac761969e3f WHIRLPOOL a8c9abbc420f0de5515e3109fa033f995ca8e4c1553a32016aac85b2f2ff31ff87175ac9a3c5d542faa489bec81e473e5c58b2d80efc59478a2c43d25e81e9cd
 MISC metadata.xml 335 SHA256 6e2552a3d310f05ce33520dbd39d1bedaad76cf5eb29c66746b746feb8c1044e SHA512 9c960d71be6f05d8d34283cbe8d29f3134648b19587288ffeffad63c844c93c47f662bc181fc644c3b02a19901c6f859baacc6802db0947a002b9835867980a0 WHIRLPOOL 04ed8aea77728b8e5560a5fe3b17f2c52aebdab96900eeca40686de4eb299924978b8deae042c3deeb9dbdf8ba0ec5d867e5dcf49de6bab6a1f36bd59c889f49
diff --git a/dev-ml/ocaml-containers/files/qcheck.patch b/dev-ml/ocaml-containers/files/qcheck.patch
deleted file mode 100644
index c88ef31741af..000000000000
--- a/dev-ml/ocaml-containers/files/qcheck.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-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.4.ebuild
index 30745be4f65a..33e8871a4f73 100644
--- a/dev-ml/ocaml-containers/ocaml-containers-1.2.ebuild
+++ b/dev-ml/ocaml-containers/ocaml-containers-1.4.ebuild
@@ -24,8 +24,6 @@ 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