Fix pervasives conflict with ocaml 3.12

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

4 files changed, 100 insertions, 11 deletions

diff --git a/dev-ml/obrowser/ChangeLog b/dev-ml/obrowser/ChangeLog
index 86c5bdea0ae4..745da75f0a9c 100644
--- a/dev-ml/obrowser/ChangeLog
+++ b/dev-ml/obrowser/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/obrowser
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/obrowser/ChangeLog,v 1.1 2010/11/07 19:22:39 aballier Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/obrowser/ChangeLog,v 1.2 2011/01/20 23:39:13 aballier Exp $
+
+  20 Jan 2011; Alexis Ballier <aballier@gentoo.org> obrowser-1.1.ebuild,
+  +files/obrowser-1.1-ocaml312.patch:
+  Fix pervasives conflict with ocaml 3.12
 
 *obrowser-1.1 (07 Nov 2010)
 
diff --git a/dev-ml/obrowser/Manifest b/dev-ml/obrowser/Manifest
index 7e23be6bad2b..9b36d0b6ff47 100644
--- a/dev-ml/obrowser/Manifest
+++ b/dev-ml/obrowser/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX obrowser-1.1-ocaml312.patch 3356 RMD160 613bc59a437b752d03e16a0bbdb278d9e30c7655 SHA1 960d649538a7da5c2d0cb9f42240664fe0955fa2 SHA256 edb2c2fcbc3ad9a75a528a43b9eccd7d9306d4ca371d993e3f72885bbba9170d
 DIST obrowser-1.1.tar.gz 1357924 RMD160 f1a452395c44eff36b7f927af3487d316d7b2614 SHA1 98216de8a73b4b7586fce3fe24a4019e11c8319b SHA256 908e2ab4b622b959acd6fdbb116a9bbbf0e241073fb32ffcd07efcaaaca43003
-EBUILD obrowser-1.1.ebuild 781 RMD160 2e749d1cd7bf465cdb4be7dbfa12eb7df1b2733b SHA1 bf9c2676d7c978151ca2e37b77226c421e4e56ce SHA256 3fd8bde723d42549a43ecc7972293476eb149b9f795f4e1d3da7726884eb7f4b
-MISC ChangeLog 357 RMD160 640687a25790bd7270a14b4d74ee8795a1129d54 SHA1 f9350f7591c8ccb88c51d6b16821939d7b6ae0dc SHA256 61c9465c88f6eebea10062b1050ffca3142b026d39c673d9c835ab27c1e7802f
+EBUILD obrowser-1.1.ebuild 888 RMD160 d8a1f4e5b3025a3fc6882e0e135464757ebdb2cb SHA1 820cd184ba2968fe6c54fba7720b212a036495f9 SHA256 50812032f54419ee3621e46cd014bf8f9aabd68bca64d58ba3d309c991764061
+MISC ChangeLog 511 RMD160 2bea57060e34e1d13f8352c334a1a0d7bf80da15 SHA1 d271cdbfea5901c21361aaed1c17a99cce8ef894 SHA256 81d8e4b69c3f725bf52c21993c452a291d6621ab2f8eeafe092080fca8819239
 MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzW/IUACgkQvFcC4BYPU0qsNACeK0SNVl+8V/FQAYGdipr5c7Z4
-fQ4An2jDhDE1opnXESItm+SPsKplFzle
-=IFzK
+iEYEARECAAYFAk04x6gACgkQvFcC4BYPU0oAFQCglz2AWhycq4gaZgxmesvja8MX
+gawAoMF9Av3zdtwqWwXp4uJ58WRW06mF
+=w7r2
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/obrowser/files/obrowser-1.1-ocaml312.patch b/dev-ml/obrowser/files/obrowser-1.1-ocaml312.patch
new file mode 100644
index 000000000000..f4718d5b1525
--- /dev/null
+++ b/dev-ml/obrowser/files/obrowser-1.1-ocaml312.patch
@@ -0,0 +1,80 @@
+Sync the pervasives interface with ocaml 3.12.0
+
+--- obrowser-1.1.orig/rt/caml/pervasives.mli
++++ obrowser-1.1/rt/caml/pervasives.mli
+@@ -142,6 +145,11 @@ external ( or ) : bool -> bool -> bool =
+ 
+ external ( ~- ) : int -> int = "%negint"
+ (** Unary negation. You can also write [-e] instead of [~-e]. *)
++
++external ( ~+ ) : int -> int = "%identity"
++(** Unary addition. You can also write [+ e] instead of [~+ e].
++    @since 3.12.0
++*)
+ 
+ external succ : int -> int = "%succint"
+ (** [succ x] is [x+1]. *)
+@@ -230,6 +237,11 @@ external ( asr ) : int -> int -> int = "
+ 
+ external ( ~-. ) : float -> float = "%negfloat"
+ (** Unary negation. You can also write [-.e] instead of [~-.e]. *)
++
++external ( ~+. ) : float -> float = "%identity"
++(** Unary addition. You can also write [+. e] instead of [~+. e].
++    @since 3.12.0
++*)
+ 
+ external ( +. ) : float -> float -> float = "%addfloat"
+ (** Floating-point addition *)
+@@ -264,6 +276,18 @@ external log : float -> float = "caml_lo
+ external log10 : float -> float = "caml_log10_float" "log10" "float"
+ (** Base 10 logarithm. *)
+ 
++external expm1 : float -> float = "caml_expm1_float" "caml_expm1" "float"
++(** [expm1 x] computes [exp x -. 1.0], giving numerically-accurate results
++    even if [x] is close to [0.0].
++    @since 3.12.0
++*)
++
++external log1p : float -> float = "caml_log1p_float" "caml_log1p" "float"
++(** [log1p x] computes [log(1.0 +. x)] (natural logarithm),
++    giving numerically-accurate results even if [x] is close to [0.0].
++    @since 3.12.0
++*)
++
+ external cos : float -> float = "caml_cos_float" "cos" "float"
+ (** See {!Pervasives.atan2}. *)
+ 
+--- obrowser-1.1.orig/rt/caml/pervasives.ml
++++ obrowser-1.1/rt/caml/pervasives.ml
+@@ -51,6 +51,7 @@ external (||) : bool -> bool -> bool = "
+ (* Integer operations *)
+ 
+ external (~-) : int -> int = "%negint"
++external (~+) : int -> int = "%identity"
+ external succ : int -> int = "%succint"
+ external pred : int -> int = "%predint"
+ external (+) : int -> int -> int = "%addint"
+@@ -77,12 +78,14 @@ let max_int = min_int - 1
+ (* Floating-point operations *)
+ 
+ external (~-.) : float -> float = "%negfloat"
++external (~+.) : float -> float = "%identity"
+ external (+.) : float -> float -> float = "%addfloat"
+ external (-.) : float -> float -> float = "%subfloat"
+ external ( *. ) : float -> float -> float = "%mulfloat"
+ external (/.) : float -> float -> float = "%divfloat"
+ external ( ** ) : float -> float -> float = "caml_power_float" "pow" "float"
+ external exp : float -> float = "caml_exp_float" "exp" "float"
++external expm1 : float -> float = "caml_expm1_float" "caml_expm1" "float"
+ external acos : float -> float = "caml_acos_float" "acos" "float"
+ external asin : float -> float = "caml_asin_float" "asin" "float"
+ external atan : float -> float = "caml_atan_float" "atan" "float"
+@@ -91,6 +94,7 @@ external cos : float -> float = "caml_co
+ external cosh : float -> float = "caml_cosh_float" "cosh" "float"
+ external log : float -> float = "caml_log_float" "log" "float"
+ external log10 : float -> float = "caml_log10_float" "log10" "float"
++external log1p : float -> float = "caml_log1p_float" "caml_log1p" "float"
+ external sin : float -> float = "caml_sin_float" "sin" "float"
+ external sinh : float -> float = "caml_sinh_float" "sinh" "float"
+ external sqrt : float -> float = "caml_sqrt_float" "sqrt" "float"
diff --git a/dev-ml/obrowser/obrowser-1.1.ebuild b/dev-ml/obrowser/obrowser-1.1.ebuild
index 81c26c80e5a6..d7631edaa067 100644
--- a/dev-ml/obrowser/obrowser-1.1.ebuild
+++ b/dev-ml/obrowser/obrowser-1.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/obrowser/obrowser-1.1.ebuild,v 1.1 2010/11/07 19:22:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/obrowser/obrowser-1.1.ebuild,v 1.2 2011/01/20 23:39:13 aballier Exp $
 
 EAPI=3
 
-inherit findlib
+inherit findlib eutils
 
 DESCRIPTION="OCaml virtual machine written in Javascript, to run OCaml program in browsers"
 HOMEPAGE="http://ocsigen.org/obrowser/"
@@ -21,6 +21,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${PN}
 
+src_prepare() {
+	has_version '>=dev-lang/ocaml-3.12' && epatch "${FILESDIR}/${P}-ocaml312.patch"
+}
+
 src_compile() {
 	emake -j1 EXAMPLES_TARGETS="" || die
 }