version bump and fix build with ocaml 4.01

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

4 files changed, 77 insertions, 5 deletions

diff --git a/dev-ml/core/ChangeLog b/dev-ml/core/ChangeLog
index b5f506f029fc..9d1562755498 100644
--- a/dev-ml/core/ChangeLog
+++ b/dev-ml/core/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/core
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/core/ChangeLog,v 1.24 2013/08/19 12:53:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/core/ChangeLog,v 1.25 2013/08/19 15:28:17 aballier Exp $
+
+*core-109.38.00 (19 Aug 2013)
+
+  19 Aug 2013; Alexis Ballier <aballier@gentoo.org> +core-109.38.00.ebuild,
+  +files/core-ocaml-4.01.patch:
+  version bump and fix build with ocaml 4.01
 
   19 Aug 2013; Alexis Ballier <aballier@gentoo.org> -core-109.27.00.ebuild,
   -core-109.34.00.ebuild:
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index 80841039ca91..d1fee36870a9 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX core-ocaml-4.01.patch 884 SHA256 eb2cb5a72c7d0d16ee9b867bc46781a9eac67c4bde345473e9b7b88f5c89061d SHA512 948e15d464c680ac3751ddb93a5e6e59a9be18c79e4c531a6ff3ddc952d06d2f45a31f4fac62f4f7d3017c68acc42dfef189fe8be4abd856572437d470ecc812 WHIRLPOOL a628650ca503c5f886a651fd57d09f6db850f7c448b85830a1c56b56ce39f081cf8747212fd1d4182fcfd3e1ce440dc03085170cb2af510ac0ce2554ab654d1d
 DIST core-109.35.00.tar.gz 632262 SHA256 20ff89722c5a5a5a15eb30470a1676a5bd1a72d60f6a5bbf76675223c148fa93 SHA512 08ca8e7ceac6fd9a0b09562ea2a0dd472dc32a55cba27b45957fb078a12604eae9a092e250d79f9f4c6105b9b3184ad21c1214fed56d8d1b33f3e6545a7b1040 WHIRLPOOL 14fe5e7ad641977d07dcb50866bfb1ebf13b72546b4ff5ac49b2f25ccd859de60f48d034914f64196a911f5782afce1103571ae49122814a330895b8adc8ded1
+DIST core-109.38.00.tar.gz 632794 SHA256 0bd685b19ee0ca165a06b6c4f61784122f4c03c04b0dbc51d4d680679e7f7bb0 SHA512 36fd2f152432c8b228d2c07cf40277ea7ccb1a0f0c467be967f0943ecdb8688bdb14c8a245dcd9dd37a8e018d54ba366d631ec60164a7c112a289b2dc59ab16f WHIRLPOOL 8330f0da6f4ef32241ffa3f08f54890a9c12974cd434838606699e31ce4dc3966ac6626491420b99c61183a2f01061da501e221764cd8c654207da9395ff473e
 EBUILD core-109.35.00.ebuild 1011 SHA256 8a35ed8a65bea628fa1764c37e357542ed21baa3d6449df4d0ca122031cb09e6 SHA512 baffb44b793f164635092badb4b5dd02aab15ad58236a027a438dc97678bfe2eb764d4a85ebc2dd42c57b36b581e0cea01c22e3c5d19774f96df6df938f1c5f0 WHIRLPOOL f8b983fdfcae29d574a22a01e2f85654596809a3175c95a7d3abdb47696fa52a4b5001a391b3d17f2f4811c849d011da4f4440838ee807ed38eb9766ffbde64f
-MISC ChangeLog 3668 SHA256 8c9bde037246e647d51e3c82e6d3e56afdb94352f01a9fd980f14e0fb6f2294c SHA512 3036c55d346db809859e126b251b63fe6ff7139d06967f409ff8754860897deeafbdc617ec3ab97b26daea75f1f5ffe1e0e59d905b5464b427c464001f211f39 WHIRLPOOL 044baeea8338dc16715fb65b910bcaab684f5457a10a12f35d95cea24f33ef0f81a1aaf64d831185b8cefd47de5d9ba8c5ed6f06cea4752c4f23484b25df94d6
+EBUILD core-109.38.00.ebuild 1128 SHA256 12c772b43f813c7b6ca1f301b2dac411a8d2c210b1a2e012b8bfd3a61461b7c1 SHA512 ae45b510451060ec796282fa8d7da1b24711494957b25cf4218bbf536feac7011ddcc7446db3e0ca050d85b6138ed30d9e620b74e83e0afe98323f1b97213d8c WHIRLPOOL 3cb4298c8f87ab4854ecc13463568f52697fc16c58ec97fdf75e1bdd3268dc5a6d0647554a3ad49d73d108511f6f1661c6879ba5d828bf01c3f9ea0d72af1112
+MISC ChangeLog 3853 SHA256 0e34880f78cc5ae0649c970ca8061b91aed61c822ae9465e76e5a6e39f91c093 SHA512 36cb5a6f5461425846189e4696ca8d99ccc7ba9fcadf92cd1204fd8a552c5d4f36432ecc71029bb43c6dee326cf9589a27462ba6a5db6a001585328f940d8176 WHIRLPOOL 3779963c168fafaba7cbe56d19903085ed54614618fe0a3e868d17cd29da58a4a149eb62d0534d52f02c17987b4720ae8880af1fd5ab8677de97af213e1f0e66
 MISC metadata.xml 544 SHA256 5779df3b70a633829dcb09a18f99a65ac4124e5fac46a16b523da4f445bdc715 SHA512 00cc414d67e22bf104584185b2701e70bc76f72953faac7e5fa55e87685a2c3911cb8418ae865eaa31301b26d82b87a59c596eb4c524d52f113eabc738801f37 WHIRLPOOL cdf13646ffbf6957223d6a77cbef18af271cfba1914040f06c43d1230aa41aacc1464997f2f48ef252bfe4ea9eb34d3a62c635f76751fccae85ba00d8b3e3381
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlISFS0ACgkQvFcC4BYPU0qyiACfW13y7lDHM0LE6iEcxMukDqOq
-q4cAoLmOD1P3otGLofeQDXXOPhliH407
-=lK3m
+iEYEAREIAAYFAlISOZIACgkQvFcC4BYPU0rPLgCeK4qk0F9Uwcp/I9huwdCS/M6N
+oHUAoJRZBVU++Nivv6yMLB6xGgG8tgk8
+=sLEq
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/core/core-109.38.00.ebuild b/dev-ml/core/core-109.38.00.ebuild
new file mode 100644
index 000000000000..6c23b6497546
--- /dev/null
+++ b/dev-ml/core/core-109.38.00.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/core/core-109.38.00.ebuild,v 1.1 2013/08/19 15:28:17 aballier Exp $
+
+EAPI="5"
+
+OASIS_BUILD_DOCS=1
+OASIS_BUILD_TESTS=1
+
+inherit eutils oasis
+
+MY_P=${P/_/\~}
+DESCRIPTION="Jane Street's alternative to the standard library"
+HOMEPAGE="http://www.janestreet.com/ocaml"
+SRC_URI="http://ocaml.janestreet.com/ocaml-core/${PV}/individual/${MY_P}.tar.gz
+	http://dev.gentoo.org/~aballier/distfiles/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-ml/res:=
+	>=dev-ml/core_kernel-109.35.00:=
+	>=dev-ml/sexplib-109.20.00:=
+	>=dev-ml/bin-prot-109.15.00:=
+	>=dev-ml/fieldslib-109.20.00:=
+	>=dev-ml/pa_ounit-109.27.00:=
+	>=dev-ml/variantslib-109.15.00:=
+	>=dev-ml/comparelib-109.27.00:=
+	>=dev-ml/herelib-109.35.00:=
+	>=dev-ml/pipebang-109.15.00:="
+DEPEND="${RDEPEND}
+	test? ( >=dev-ml/ounit-1.1.2 )"
+DOCS=( "README.md" )
+
+src_prepare() {
+	has_version '>=dev-lang/ocaml-4.01.0_beta' && epatch "${FILESDIR}/${PN}-ocaml-4.01.patch"
+}
diff --git a/dev-ml/core/files/core-ocaml-4.01.patch b/dev-ml/core/files/core-ocaml-4.01.patch
new file mode 100644
index 000000000000..1f08a11f69e7
--- /dev/null
+++ b/dev-ml/core/files/core-ocaml-4.01.patch
@@ -0,0 +1,24 @@
+Index: core-109.38.00/lib/core_unix.ml
+===================================================================
+--- core-109.38.00.orig/lib/core_unix.ml
++++ core-109.38.00/lib/core_unix.ml
+@@ -890,6 +890,7 @@ Unix.open_flag =
+ | O_SYNC
+ | O_RSYNC
+ | O_SHARE_DELETE
++| O_CLOEXEC
+ with sexp
+ 
+ type file_perm = int with of_sexp
+Index: core-109.38.00/lib/core_unix.mli
+===================================================================
+--- core-109.38.00.orig/lib/core_unix.mli
++++ core-109.38.00/lib/core_unix.mli
+@@ -305,6 +305,7 @@ type open_flag =
+     | O_SYNC          (** Writes complete as `Synchronised I/O file integrity completion' *)
+     | O_RSYNC         (** Reads complete as writes (depending on O_SYNC/O_DSYNC) *)
+     | O_SHARE_DELETE  (** Windows only: allow the file to be deleted while still open *)
++    | O_CLOEXEC
+ with sexp
+ 
+ (** The type of file access rights. *)