Import a patch from debian to fix build with ocaml 3.12, bug #343811

Package-Manager: portage-2.2.0_alpha4/cvs/Linux x86_64

4 files changed, 42 insertions, 11 deletions

diff --git a/dev-ml/core/ChangeLog b/dev-ml/core/ChangeLog
index 563147e11016..91a04b707a34 100644
--- a/dev-ml/core/ChangeLog
+++ b/dev-ml/core/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/core
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/core/ChangeLog,v 1.1 2009/10/27 12:36:35 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/core/ChangeLog,v 1.2 2010/11/11 20:09:18 aballier Exp $
+
+  11 Nov 2010; Alexis Ballier <aballier@gentoo.org> core-0.6.0.ebuild,
+  +files/core-0.6.0-ocaml312.patch:
+  Import a patch from debian to fix build with ocaml 3.12, bug #343811
 
 *core-0.6.0 (27 Oct 2009)
 
diff --git a/dev-ml/core/Manifest b/dev-ml/core/Manifest
index a1b9d1ac85bb..a287b3c9a813 100644
--- a/dev-ml/core/Manifest
+++ b/dev-ml/core/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX core-0.6.0-ocaml312.patch 594 RMD160 fda0805956aebeae47cbc7780554c304650b2280 SHA1 4686218586a74bf91a02b0c094132f935b9056a1 SHA256 35260898d477ec4a294245887054bf7923e21779a7096f4fd129d15f7b418054
 DIST core-0.6.0.tgz 361224 RMD160 7fe705aa2c92bbd2be51b82b271617fefa4ab526 SHA1 eb18d710414ed712599719bd90304e0b08daba8e SHA256 465448016b90f59921ad032dc24330f148de6d3a1e19323ad975b1ba76771004
-EBUILD core-0.6.0.ebuild 1102 RMD160 4976f3ae7003137abc062de73e060691d4e47f6a SHA1 50f28a2ccc866b5f4864dd13e9521839c5bdd9ea SHA256 6c0d88905e442f276b08040686ac69bd8c373e033f8bc480c5436e647673d118
-MISC ChangeLog 345 RMD160 9134c6b7cfe7928b9b9fb8453a3a31c02ab23197 SHA1 7165f64958bce463f81f47bcec66e3c003d9069b SHA256 11daaece015c18789fd35b983db210f72860ee40fce79b751605aead7f25003a
+EBUILD core-0.6.0.ebuild 1209 RMD160 75bb33acef59f89c9611779f9fbc6aff1d99a56f SHA1 ae7bde87439a4de6e5d90e1715311e129389f6fa SHA256 695ee2c0efbf3aa65b5a1c2d508ac960eed948b2499b4862a853494bcff3ea4c
+MISC ChangeLog 524 RMD160 7fa0b2b350796bb6ddeb74efe9ca74f5ceca856b SHA1 6e81d3c02dd5b7868370e6dc88cdcc0dea648728 SHA256 c956d53a0387d0c9c0961b9c498d8b5132dfbafbe90a89b08d943c416fdedf20
 MISC metadata.xml 544 RMD160 1e10e2f2b20afd5632d63194d0ab99167e975dc5 SHA1 81f571fd9974ac53e79ac08c5df20ea10edce61a SHA256 5779df3b70a633829dcb09a18f99a65ac4124e5fac46a16b523da4f445bdc715
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkrm6VkACgkQvFcC4BYPU0pyTACgplS/kPIA6itC7fW67F9+y/N9
-jcQAoMah9plfxAKPObGOoeTCtYSiR8lb
-=wdyJ
+iEYEARECAAYFAkzcTXQACgkQvFcC4BYPU0rqsACdF66ANJIKYqA//K8BaceBdMCF
+xRUAn1ES6jIDKzDbcCUv1EgrH2KoQIpA
+=Vk4K
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/core/core-0.6.0.ebuild b/dev-ml/core/core-0.6.0.ebuild
index 7dede9f282df..b2a094a5eb2a 100644
--- a/dev-ml/core/core-0.6.0.ebuild
+++ b/dev-ml/core/core-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/core/core-0.6.0.ebuild,v 1.1 2009/10/27 12:36:35 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/core/core-0.6.0.ebuild,v 1.2 2010/11/11 20:09:18 aballier Exp $
 
 EAPI="2"
-inherit findlib
+inherit findlib eutils
 
 DESCRIPTION="Jane Street's alternative to the standard library"
 HOMEPAGE="http://www.janestreet.com/ocaml"
@@ -26,6 +26,10 @@ DEPEND="${RDEPEND}
 		dev-ml/type-conv
 	)"
 
+src_prepare() {
+	has_version '>=dev-lang/ocaml-3.12' && epatch "${FILESDIR}/${P}-ocaml312.patch"
+}
+
 src_compile() {
 	emake -j1 || die
 }
diff --git a/dev-ml/core/files/core-0.6.0-ocaml312.patch b/dev-ml/core/files/core-0.6.0-ocaml312.patch
new file mode 100644
index 000000000000..9ed10d1eb1ea
--- /dev/null
+++ b/dev-ml/core/files/core-0.6.0-ocaml312.patch
@@ -0,0 +1,22 @@
+--- janest-core-0.6.0.orig/lib/core_gc.mli
++++ janest-core-0.6.0/lib/core_gc.mli
+@@ -71,6 +71,8 @@
+ 
+     top_heap_words : int;
+     (** Maximum size reached by the major heap, in words. *)
++
++    stack_size : int;
+   }
+   include Binable.S with type binable = t
+   include Sexpable.S with type sexpable = t
+--- janest-core-0.6.0.orig/lib/core_gc.ml
++++ janest-core-0.6.0/lib/core_gc.ml
+@@ -54,6 +54,7 @@
+     fragments : pretty_int;
+     compactions : pretty_int;
+     top_heap_words : pretty_int;
++    stack_size : pretty_int;
+   } with bin_io, sexp
+   type binable = t
+   type sexpable = t
+