fix build with ocaml4

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

4 files changed, 51 insertions, 6 deletions

diff --git a/dev-ml/facile/ChangeLog b/dev-ml/facile/ChangeLog
index ce0995a080ac..c5ca862acb0c 100644
--- a/dev-ml/facile/ChangeLog
+++ b/dev-ml/facile/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/facile
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/ChangeLog,v 1.18 2011/01/03 21:12:19 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/ChangeLog,v 1.19 2012/10/10 13:04:33 aballier Exp $
+
+  10 Oct 2012; Alexis Ballier <aballier@gentoo.org> facile-1.1.ebuild,
+  +files/facile-1.1-ocaml4.patch:
+  fix build with ocaml4
 
   03 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org> facile-1.1.ebuild:
   Removed RESTRICT=mirror since there is no reason for it
diff --git a/dev-ml/facile/Manifest b/dev-ml/facile/Manifest
index 7ffa558e940d..b94998f87c45 100644
--- a/dev-ml/facile/Manifest
+++ b/dev-ml/facile/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX facile-1.1-make.patch 1613 SHA256 6e1ed39d10b9dd6824ac2754570efc41d7a4c53ee339df8ebd2d3f96417b3f06 SHA512 024132dfacce666c1f52f331fe5ec9f927dbabc1742b44aa11be7ae8851c25943afea5f2f99b3e544127b5c49af7d7337d4b59c60165a777990402855100ebc0 WHIRLPOOL 7fecb858b6cb15187583a076dfb96c7ae3c5b26be93308ab7b135ca55d223d0c8ed6f1fbd115c103d1a1a233da9756498626627817f23704b8d5b008f1c1fd3f
+AUX facile-1.1-ocaml4.patch 1116 SHA256 2d5959aa885323851b9a07d47e8bb0231e9f14a36c626393dc7c33ad69b28389 SHA512 8ae9ae3e2c7519f09f10f926b2661b4e619f587c78392aed7e21cdef22d01de9769280cbddd5414b23e631074296376b3d02513b9d67369a7d37343f8d2cbef1 WHIRLPOOL 1415f8dd495b8b25ca6d9c0ab85d36d0d9e0114290e5c43138a0702d49527cd2c39dc47cd3e89c9bd723385b8cb54fdabdc1dde245e9a5b17f448f8a9b77f72f
 DIST facile-1.1.tar.gz 96343 SHA256 a87a6ba7869104f85828c19a9681758bd1d01c816581ba09ac483739ad4ae5ca SHA512 5048daa30bc0de47465f3978cc9079e29407e35f03a3e0d6656b61838e750f62370562e26b5377d30afa478974f19e962a4a3b5a4f8fbd6661bf6f6485d90565 WHIRLPOOL a3aa0b50e51042fcdb90dffb62da483730738c1ed48eadcc1a329cc2f6529a985f50efe157231cc566ca909194468fb505ced2d653f71c3c39fd85a32e2d4558
-EBUILD facile-1.1.ebuild 1581 SHA256 ece8e4cfda90fe71f6ffc398675d9eecce7919eb54e8f0cd963319217ad1796e SHA512 021946b33190e39b3e007df54a5bbd8cc257c772fbad3d592a9c8634db2a86def12a411c560ad065b114ff7230900536778e9f73e38c1efc0d4b323fa23608fb WHIRLPOOL 4be25530719529dc822192c705c8eb828b0ef92b65c2fdf7cd0f58d632eb1de6bca8426bcf7f14443d16fe02ca2d2140837c20a02917eac7353d5bb4dae7d26c
-MISC ChangeLog 2780 SHA256 31663db77cea3da4b3241b75f4e1141aad0450f0da770845d3ecce0ce43c0deb SHA512 c73477fdab08f9a3510e62a5181d8258aa05abf8824ed8083dce7ad3fd9577bf733dd0148a4591217562285b7d59558c3d56554733c86e2f88f2d5c590a8f8f2 WHIRLPOOL 2e336729e27849c45d8826f5ad762e362b95aca972cc57442f24fcaee2f0a801f2db68aa062c4b758090cbf08695dd42d8877236ff46c3f340973efc73081af3
+EBUILD facile-1.1.ebuild 1656 SHA256 1e102492975d0f562493322405cbaaf20c325f56ca17a16dc43e32d4d6f1cb0f SHA512 ede98752cc83f8fc579f5d2b6683f4854e7cfbaa6aff0e1782a43bf785831447cbbf8ef2a806a69ec8d053df399c1ac034a18af10827433d0c347cf04e836641 WHIRLPOOL 5a9c76fd3c14ed1b9307aa261c1d8e85b236f3ffb41fd2191e87ef36f6512d9b9ce848203711cacdd5aa7adef4ea1b7d33584046f526b84a78a7cf1b5fc1e2f9
+MISC ChangeLog 2909 SHA256 ce38dc7c0aaae832aa5ffbe1534982d5c03cd972f12cb300de3d5589558a56cb SHA512 0c4b689ae883aea9b3730e6071fdef39526bb9c7ccf92f7bfe70ec72bb6b8eb2189bc70846f6aee93fc943ffbf6997f099f8f57e599d2aee43fd29fb42251d08 WHIRLPOOL 5995e6c127ac7bc40fb17bf572716be078b702174ec718a5fdcbf3b10c8ec17b68f322875a847aa01cd0eb9f1b761a82e6870e742afbb2452b24c66916a4de54
 MISC metadata.xml 172 SHA256 667504f38af7bc26d7a585a40d28365d53e5154178847ec85f44baa9ebbb91d5 SHA512 981a05d87e8e38bc1e68a71a4526b75a80e5cad0865ecd05239dd0a6a0af842c97db0c721ad323239e191b12a494265d277c47edda1d446201890335ed44b7a6 WHIRLPOOL 29552aea1796c36f754dba0ea1c87e38827034f330411c47d2af0e2e781dc3faac58f4856824ef916ca0d61768ae62df7baa40782149fed2cacd07740cdf6560
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlB1cmMACgkQvFcC4BYPU0pHswCguDweD6Bdx9Pg1ui+OBhyYnFA
+tI0AoJrr7EftiAgouiMSs+XRD8dC8UUF
+=smWu
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/facile/facile-1.1.ebuild b/dev-ml/facile/facile-1.1.ebuild
index 389b1f490307..7114a5c64f88 100644
--- a/dev-ml/facile/facile-1.1.ebuild
+++ b/dev-ml/facile/facile-1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/facile-1.1.ebuild,v 1.18 2011/01/03 21:12:19 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/facile/facile-1.1.ebuild,v 1.19 2012/10/10 13:04:33 aballier Exp $
 
 EAPI="2"
 
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Fix building on FreeBSD
 	epatch "${FILESDIR}/${P}"-make.patch
+	has_version '>=dev-lang/ocaml-4' && epatch "${FILESDIR}/${P}-ocaml4.patch"
 	# Disable building native code objects if we dont have/want ocamlopt
 	if ! use ocamlopt; then
 		sed -i -e 's/\.opt//' src/Makefile || die "failed to change native code compiler to bytecode ones"
diff --git a/dev-ml/facile/files/facile-1.1-ocaml4.patch b/dev-ml/facile/files/facile-1.1-ocaml4.patch
new file mode 100644
index 000000000000..3c7556312364
--- /dev/null
+++ b/dev-ml/facile/files/facile-1.1-ocaml4.patch
@@ -0,0 +1,29 @@
+Index: facile-1.1/src/facile.mli
+===================================================================
+--- facile-1.1.orig/src/facile.mli
++++ facile-1.1/src/facile.mli
+@@ -127,7 +127,7 @@ module Data :
+       module Hashtbl :
+ 	  sig
+ 	    type ('a, 'b) t
+-	    val create : int -> ('a, 'b) t
++	    val create : ?random:bool -> int -> ('a, 'b) t
+ 	    val get : ('a, 'b) t -> ('a, 'b) Hashtbl.t
+ 	    val add : ('a, 'b) t -> 'a -> 'b -> unit
+ 	    val find : ('a, 'b) t -> 'a -> 'b
+Index: facile-1.1/src/fcl_data.cmi
+===================================================================
+Binary files facile-1.1.orig/src/fcl_data.cmi and facile-1.1/src/fcl_data.cmi differ
+Index: facile-1.1/src/fcl_data.mli
+===================================================================
+--- facile-1.1.orig/src/fcl_data.mli
++++ facile-1.1/src/fcl_data.mli
+@@ -23,7 +23,7 @@ end
+ 
+ module Hashtbl : sig
+   type ('a, 'b) t
+-  val create : int -> ('a, 'b) t
++  val create : ?random:bool -> int -> ('a, 'b) t
+   val get : ('a, 'b) t -> ('a, 'b) Hashtbl.t
+   val add : ('a, 'b) t -> 'a -> 'b -> unit
+   val find : ('a, 'b) t -> 'a -> 'b