Fix build with ocaml 4.01.

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

4 files changed, 49 insertions, 9 deletions

diff --git a/dev-ml/pomap/ChangeLog b/dev-ml/pomap/ChangeLog
index d45f2a5ac6d1..dc2f710b4ab1 100644
--- a/dev-ml/pomap/ChangeLog
+++ b/dev-ml/pomap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/pomap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/ChangeLog,v 1.27 2013/03/10 10:27:23 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/ChangeLog,v 1.28 2013/08/19 16:19:50 aballier Exp $
+
+  19 Aug 2013; Alexis Ballier <aballier@gentoo.org> pomap-3.0.1.ebuild,
+  +files/pomap-3.0.1-ocaml-4.01.patch:
+  Fix build with ocaml 4.01.
 
   10 Mar 2013; Alexis Ballier <aballier@gentoo.org> -pomap-2.9.9.ebuild:
   remove old
diff --git a/dev-ml/pomap/Manifest b/dev-ml/pomap/Manifest
index b117bf75ce9f..e1f434478235 100644
--- a/dev-ml/pomap/Manifest
+++ b/dev-ml/pomap/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX pomap-3.0.1-ocaml-4.01.patch 1174 SHA256 a2169920cfe552bfb143257bbd22e83ee21a04c8bf8e98fe3c0cdd2018b859f0 SHA512 669bc32a2396f3ad86c369ccfbdb8a9ae83c59f864707d4ccef2e173d3177b3bd15ae69acdd971b2be98f559120c4ffa5a3b17b139d06877ebb590ca84f13ff2 WHIRLPOOL 0f156b34067fca1ccda36ac1c48b4ea5be13c8d9f39486f5544f3da80044e1afcbbfc6ed616c3d7e86a53abf731c6338e4612be1754962fdb1166ac7a648a1bc
 DIST pomap-3.0.1.tar.gz 69989 SHA256 1afbedafedb6922937cb58b3bbef057e69f2908cac899288257ba608fbf534ce SHA512 901c7655686711978df476332d2ef969c6eefa47a276f88e227c43d95e21d4bc6e301b3880d69a3c5c1e2278c1bab511e9b538f8278ad79ee0ea54efe6dcae5d WHIRLPOOL 1c2893ba61058e3effa03b2d42972c2c2f3d733c5c815b90a4ea95e701ab17917969088868c7a220387127bb10bd190aea7cbfaa1c2facd0807da0c62118f858
-EBUILD pomap-3.0.1.ebuild 712 SHA256 ea34d99abb91d41f81bff56f1fd15708d5de411c13e5f0e41c2b911605f93a19 SHA512 819047a8d25b7a43cbb76cb86763ad8d5e2f4d76a75e87fdde8eb9740f5a8e7c1b16137088b0dd6d4b82c1a57eef167b1eba4b8159a5e0a42dd71e40d5a5b101 WHIRLPOOL f1a73c8602d1d93018ccf5397e046e8a37508e559a99a6e6efa3d3dbea02efe63b1ef0832071604ce2b4f2f160863cdc375e4711809b8210580324b5788d8925
-MISC ChangeLog 2878 SHA256 7a9b44edf41537780f94f3507078c14a96e2ec6c3e9a5a074de3410146b917fa SHA512 a228f88b4243e5e827ef764ec38647b6c7eeca934cb6d47a4feddb2f3658f72ec799f927dc690a8470675cb596016a2976534dc3195d5fda41f2f617c8ea9612 WHIRLPOOL f796e371e52a6437c78dfe5602fde8b1f809808b62ca745f72de8eaf23d90f2033d56d3f337467e90706cc1ecf6b2f27eb523b4173b384be658553ff5f3bb2bc
+EBUILD pomap-3.0.1.ebuild 831 SHA256 609517601cf596d38811530b83622f7d630d5d65af891cc19a7195567f9b4396 SHA512 f647a192315708951cb2d0d6b83e81f91fca1f6a2f7d00e927e6297b75d14e1ab3d19b786767fa6a7b129ee14bc83d631ebbc5fc36ca3629a5045ff39822c9cd WHIRLPOOL 79b5a89210ffea7ce86a3885d777279c9009568e7a72ddd1b5cd83af02de9c2a71dfb6af5cea818e0adb1d521706fa40edff2b34683e2198677da509834c66a5
+MISC ChangeLog 3019 SHA256 bece37e810a6e242f497e5d6bdcec692e55639f2a3c2cff090080d1413102b61 SHA512 5277e73f05b623b2210c7ae63d94a7076c461238ce4b1e9487fbd953c9d8613c1ea5d4c27f8f98f57da327dcc5b60aee0ab05f5e3083d9b7d79a8c97dec35e4b WHIRLPOOL 09b0c2e404cba072d0afceccb0412b2fdfab5ca6a9e75fa5dfa29c3019447779306063e6c2d92087952b8370147834181c208060395b9a43227a4868cb377abf
 MISC metadata.xml 157 SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799 SHA512 5e4a17ffdcc021c3d28f9ac71f8ec0b35a243e269281ba7db2e17845d7990221040ab16db6fa13c708f7d8db154d8d65d2d7f80f3a7dd84bc001449369738f2f WHIRLPOOL 79ae48d5df04eab0d90848c85d48c62b0e3901cc5c9a74d0b85de5becac5de0f55a3c9c719bf716bb757cfd8be306a222f247a0749fb346f6589893698b25c63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlE8YAwACgkQvFcC4BYPU0qz7gCeLmcNmfnmAeFvOK7xKE8RpJeW
-vTwAn2+32JT+Z6y+MZwDPV5czBqByuOl
-=okeQ
+iEYEAREIAAYFAlISRacACgkQvFcC4BYPU0q7ZACgsHtEe5f8asrJ2MnihdNZWHxd
+VeoAni88bZeMu3PqIIg309gA3bJ8FMOv
+=q1yl
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/pomap/files/pomap-3.0.1-ocaml-4.01.patch b/dev-ml/pomap/files/pomap-3.0.1-ocaml-4.01.patch
new file mode 100644
index 000000000000..b0d7bfa42605
--- /dev/null
+++ b/dev-ml/pomap/files/pomap-3.0.1-ocaml-4.01.patch
@@ -0,0 +1,31 @@
+Dummy find implementation required by ocaml 4.01.
+
+https://bitbucket.org/mmottl/pomap/issue/1/pomap-301-does-not-build-with-ocaml-401
+
+
+Index: pomap-3.0.1/lib/ptset.ml
+===================================================================
+--- pomap-3.0.1.orig/lib/ptset.ml
++++ pomap-3.0.1/lib/ptset.ml
+@@ -336,6 +336,8 @@ let rec max_elt = function
+   | Leaf k -> k
+   | Branch (_,_,s,t) -> max (max_elt s) (max_elt t)
+ 
++let find e t = if exists (fun x -> (x = e)) t then e else raise Not_found
++
+ (*s Another nice property of Patricia trees is to be independent of the
+     order of insertion. As a consequence, two Patricia trees have the
+     same elements if and only if they are structurally equal. *)
+Index: pomap-3.0.1/lib/ptset.mli
+===================================================================
+--- pomap-3.0.1.orig/lib/ptset.mli
++++ pomap-3.0.1/lib/ptset.mli
+@@ -70,6 +70,8 @@ val partition : (elt -> bool) -> t -> t
+ 
+ val split : elt -> t -> t * bool * t
+ 
++val find : elt -> t -> elt
++
+ (*s Warning: [min_elt] and [max_elt] are linear w.r.t. the size of the
+     set. In other words, [min_elt t] is barely more efficient than [fold
+     min t (choose t)]. *)
diff --git a/dev-ml/pomap/pomap-3.0.1.ebuild b/dev-ml/pomap/pomap-3.0.1.ebuild
index b689a36741cc..748278f36141 100644
--- a/dev-ml/pomap/pomap-3.0.1.ebuild
+++ b/dev-ml/pomap/pomap-3.0.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.1.ebuild,v 1.5 2013/02/12 16:58:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/pomap/pomap-3.0.1.ebuild,v 1.6 2013/08/19 16:19:50 aballier Exp $
 
 EAPI=5
 
 OASIS_BUILD_DOCS=1
 
-inherit oasis
+inherit eutils oasis
 
 DESCRIPTION="Partially Ordered Map ADT for O'Caml"
 HOMEPAGE="http://bitbucket.org/mmottl/pomap"
@@ -21,6 +21,10 @@ IUSE="examples"
 
 DOCS=( "AUTHORS.txt" "CHANGES.txt" "README.md" )
 
+src_prepare() {
+	has_version '>=dev-lang/ocaml-4.01_beta' && epatch "${FILESDIR}/${P}-ocaml-4.01.patch"
+}
+
 src_install() {
 	oasis_src_install
 	if use examples ; then