Backport upstream patch to build with ocaml 4.01.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 50 insertions, 20 deletions

diff --git a/dev-ml/lwt/ChangeLog b/dev-ml/lwt/ChangeLog
index 8bbbaeb76741..0b8e0ad6054a 100644
--- a/dev-ml/lwt/ChangeLog
+++ b/dev-ml/lwt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/lwt
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lwt/ChangeLog,v 1.26 2013/03/17 15:50:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lwt/ChangeLog,v 1.27 2013/08/19 13:06:38 aballier Exp $
+
+  19 Aug 2013; Alexis Ballier <aballier@gentoo.org> lwt-2.4.3.ebuild,
+  +files/lwt-2.4.3-ocaml-4.01.patch:
+  Backport upstream patch to build with ocaml 4.01.
 
   17 Mar 2013; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/dev-ml/lwt/Manifest b/dev-ml/lwt/Manifest
index cf1c404913e8..2dffc8d742fd 100644
--- a/dev-ml/lwt/Manifest
+++ b/dev-ml/lwt/Manifest
@@ -1,26 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX lwt-2.4.3-ocaml-4.01.patch 995 SHA256 4cd8530208830c0299017442ac09be8e2379704b3e55cefaa8d2fd0acbe64a49 SHA512 24e1a35516ae902e36acccf85bbbe5344fe791ef39a979ec734fb7f9525e601b531daffd92964726bbaa5d364a3dc6eda9e54c126ff74a431315f0f484a3a964 WHIRLPOOL df1a7b30c586b1784a7f91a43f43db4d39754b12b5886d502c59805e0ab49efe5346e3eb0eb5d063d8b6ef58003c5a82c350d58e32b7da5ae17d027e90639450
 DIST lwt-2.4.3.tar.gz 504000 SHA256 efee23937750290d6dee96eed6c0bbdb19817d5be6eefcba61ac5031fac10107 SHA512 725d50a096a43294d49ae2322fdc985c301ce6a8ff5c956925225d7977e787ccb446e36a9db5fdbb50f284b9f1a3a12a52d1aa44d4400feecb59f6f938ed00ad WHIRLPOOL c5999e950008902600b43bf39f174ed0bc2cb3f6dce983d885416969a3bb98170ec8b74c8f5829459c3c96d160e5b4c8491b7057e7efeac035a46c9846ff7764
-EBUILD lwt-2.4.3.ebuild 897 SHA256 59e5900536fc75b80acabff0f3c3bb15778f43a4846cafad600c5e9d46c72d9d SHA512 7f40c34ed5dabc02fa11e971946a629f3df6aa21fa6ed10cce696b4fa6e1173706dfdfcf094bc156821833729e4181c30e10686662fa44ae65f224396db0346b WHIRLPOOL 5dbb36b002c271a922548c1769d0fc51322ca4459b426430f38abc0aae239fe4edf889042f6067970f427c6210ab9af8ee486f86c7ba89469d98c49527b1816d
-MISC ChangeLog 3277 SHA256 f74641c521db7e68b6f52be510d4e1e4543986d947b70d55f6c514620ba66215 SHA512 04ac22b17125d7213163646288db6081cec43bb8ae2488c8d43664fbb4bfaf614ccafe37168c67f99cc25dc0fc1446b21d1866b48b585cebc30e7a4673b6c84c WHIRLPOOL 42d85ef1f0ef74f0ed49377bd7a2535febe55cd715891452a7dde099b37355e5e0e4071ba4be87630746fcc003586853f42276f2b50ad3d545b195a407ab7d23
+EBUILD lwt-2.4.3.ebuild 945 SHA256 72f9112f896e65e4b7a62505b179e5f7d20c6f5604b03fad707394a737949a30 SHA512 8a4116ae333d8cd5f78811a0792b4763bda4e8ceb17d22ab810189bd1eaf89307e20f7f04771ec03dccdb5f2581d0129417b94b49f0947168e3de1ce32ef74a8 WHIRLPOOL 35386888319410a2c8a5d819d74c8c248c0988103d6b2b2acac481a060ca9abf2bf00830f313a4b11214844514372ab8249fd266c7dc02d3e8ac2af211ca3fda
+MISC ChangeLog 3437 SHA256 b26885c3760e95d67d33c551f2440a88aa352627e7ab45a3807f1a879333a19e SHA512 9dcb16bd8f97d6cbebbc55e673ad764179ab5c997f780fb318f820910ee166247facdef729557122f6d04cd51c6b41c4c842057d814518844f6aa15e89bd1bbc WHIRLPOOL 5c5a4a15ad6ea3190694ef5de8358c289af1acfb286759229ba3e65c4f44466825836ae2afd9c3131331465e0ea7944a091d1cdc8ed3d96b70f0e7d935c932b4
 MISC metadata.xml 534 SHA256 6c69102cec037c9248cff719efe3c516f5ca9b988c11a1fcb5093ea34245ac92 SHA512 f949b58c76c99078afd910804ca4774b07c79f06c6b0a8d95841e94331bd09681b2c4ddc560c8fe9117c055b0130102aae8ade9d7d7a9137ce1ea3f180570147 WHIRLPOOL 17211791e012338696c37ff5afb39cc8383c1e2e68f7893408e060f059c68c06842621db3dbbf96646dc531dcc6aeef188efe85a02de4da42326b8af12068f5d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRReZhXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88fW4P/1zh5J+9Kt5J6+xoKFJPRAFb
-hG69A58BA6SpRHJv+ar6Rf013FSLPMR45XwQet+hcnnDqwcJJKfidLjlEiR2Md/h
-H35kAlfwW3c3Qea4JWuPr8LnISIVPma3EDvQvt9m+m8BLLFvoGYZ9K+LUJmfZ7hj
-Vfw9KvN3V5Sx2ryaT1DI6qci71X5y8PSsTVbSXyayvguloLFGNSTqJ5GgDAM4Hp+
-gzsXvjpoKgNt0UGwCp7YOYeF5Ckf6/flqx9tpwkWmbefYdAXL39vpUzkuo3rp7Am
-R6tnKX+g3EBAgH75kP23ndunH/nZqhuPedjvcw3LMqYIEHpnuCU2eFPVki365wMP
-JOeCM+ale01Q623oAkyH3eJLPe4ehSkOK9wOfDi3nTrWPB1EPnmoTyQ49+CtQNwv
-MgQBg8k0bjFrR+VmtN0NdhV8xMqHRnSC1u1LaeFUlUKzhKj2XBxcUDARfXKC8S/t
-i8lyeuJubPOZyqQGEoHMfrphjtuUwtRdbnBnx9mWZuMhT1WvXuPt6gu17cPcLNfp
-7uYKv9EEO0sAx/KjjnoTg3gRc95kh8Glq3RWHUTSt4ZnEjJjXpgOxz9ViM/0qUOI
-oLd206KgsiGjLIktBrmaUmR5JFuMCg2k5vEkUTBQxQ687gC+jma5MdRttYJD5ky3
-iexN5EpYXPlsFybxY0R0
-=jxiB
+iEYEAREIAAYFAlISGF8ACgkQvFcC4BYPU0oV1QCgqpZkpIyEursiUJG4xkW/fV4U
+JoQAn2oNRObAaOQ3j4fX/9CuN37Rx07O
+=3DbI
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/lwt/files/lwt-2.4.3-ocaml-4.01.patch b/dev-ml/lwt/files/lwt-2.4.3-ocaml-4.01.patch
new file mode 100644
index 000000000000..eb2566705da1
--- /dev/null
+++ b/dev-ml/lwt/files/lwt-2.4.3-ocaml-4.01.patch
@@ -0,0 +1,36 @@
+commit 0df80f6d05625f80e1e3e05a46e355728881b38a
+Author: Anil Madhavapeddy <anil@recoil.org>
+Date:   Sat Aug 3 20:20:55 2013 +0100
+
+    OCaml 4.01.0dev has a Unix.O_CLOEXEC flag, so add this to Lwt_unix too.
+    
+    This was added quite recently in ocaml/ocaml@2207c45056e69d1ea5
+
+diff --git a/src/unix/lwt_unix.ml b/src/unix/lwt_unix.ml
+index 5115ffe..4222f7b 100644
+--- a/src/unix/lwt_unix.ml
++++ b/src/unix/lwt_unix.ml
+@@ -596,6 +596,9 @@ type open_flag =
+ #if ocaml_version >= (3, 13)
+   | O_SHARE_DELETE
+ #endif
++#if ocaml_version >= (4, 01)
++  | O_CLOEXEC
++#endif
+ 
+ #if windows
+ 
+diff --git a/src/unix/lwt_unix.mli b/src/unix/lwt_unix.mli
+index cc9df59..f85df52 100644
+--- a/src/unix/lwt_unix.mli
++++ b/src/unix/lwt_unix.mli
+@@ -315,6 +315,9 @@ type open_flag =
+ #if ocaml_version >= (3, 13)
+   | O_SHARE_DELETE
+ #endif
++#if ocaml_version >= (4, 01)
++  | O_CLOEXEC
++#endif
+ 
+ val openfile : string -> open_flag list -> file_perm -> file_descr Lwt.t
+   (** Wrapper for [Unix.openfile]. *)
diff --git a/dev-ml/lwt/lwt-2.4.3.ebuild b/dev-ml/lwt/lwt-2.4.3.ebuild
index 6e046afc24b2..c055035dd1de 100644
--- a/dev-ml/lwt/lwt-2.4.3.ebuild
+++ b/dev-ml/lwt/lwt-2.4.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lwt/lwt-2.4.3.ebuild,v 1.2 2013/03/03 14:25:41 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lwt/lwt-2.4.3.ebuild,v 1.3 2013/08/19 13:06:38 aballier Exp $
 
 EAPI=5
 
@@ -28,6 +28,7 @@ LICENSE="LGPL-2.1-with-linking-exception"
 KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 
 DOCS=( "CHANGES" "CHANGES.darcs" "README" )
+PATCHES=( "${FILESDIR}/${P}-ocaml-4.01.patch" )
 
 src_configure() {
 	oasis_configure_opts="$(use_enable gtk glib)