import ocaml 4.02 fix from opam

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 30 insertions, 10 deletions

diff --git a/dev-ml/ocamldap/ChangeLog b/dev-ml/ocamldap/ChangeLog
index d043f56d5f29..13a0eb91d544 100644
--- a/dev-ml/ocamldap/ChangeLog
+++ b/dev-ml/ocamldap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/ocamldap
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldap/ChangeLog,v 1.4 2013/03/03 14:32:02 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldap/ChangeLog,v 1.5 2014/12/01 09:05:20 aballier Exp $
+
+  01 Dec 2014; Alexis Ballier <aballier@gentoo.org> ocamldap-2.2.ebuild,
+  +files/ocaml-4.02.patch:
+  import ocaml 4.02 fix from opam
 
   03 Mar 2013; Alexis Ballier <aballier@gentoo.org> -ocamldap-2.1.8.ebuild:
   remove old
diff --git a/dev-ml/ocamldap/Manifest b/dev-ml/ocamldap/Manifest
index 81e2dc10d4d8..22c7c9b92166 100644
--- a/dev-ml/ocamldap/Manifest
+++ b/dev-ml/ocamldap/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ocaml-4.02.patch 328 SHA256 7e9f8e2dfda427f47631963b592501cc4e0fa9f725ec615771b214147b6a102d SHA512 375027a35bb592f215f5bdccdf4ff18ad29feb6e82236f8bd1fd4852cd2b50da3934d95ddcb73468ba9c039b2e09e24ae4b8f27ba23e399e1892bcac02e6c5b5 WHIRLPOOL 836c8f4761258cc487cdf3a6a9196929ecf69362965d8bbd4b474aad6685145014cd52d1d4e4f76c61677742edd76f7e143e4367bb355be467ba279b80ca8d80
 DIST ocamldap-2.2.tar.gz 174204 SHA256 19da4383c76b22eea22f9ba50b55829fa6a4ed430d58b6291545dfbe57449804 SHA512 e24e78497b7c9ed89b0ae73c5773cc9ec28c7c7d317b4b8b39f6b20536ff8f44e15c2657d6aba4bb4689afb5bb155fc7391bea6edab50d0855b22bc457982a2d WHIRLPOOL 5e93f761d44aa4e7249a8c04f31d42fcf0b1872610b08a21b3289796209cdea537f5f8d87421e036fe5ffa9de160af2b833020aac347cde91dd91228a5ed5843
-EBUILD ocamldap-2.2.ebuild 736 SHA256 32ab56e1c023087c57061b9b0080891a1befa8024dfdcd7a034f8ca46ae5b40e SHA512 ed9838828e77eaeaef7df9c92e7164e49cbd0f032bced3fc1b93fd98dcfe11c88650e101b2e85b4a3be7001011dbb8546046eb5452c226688d5d8e0ff68be795 WHIRLPOOL d7c4770427faf0754ae9ac613dcb08e2fbc1d287a9b8e088b059be57940b42d76f71ed56d1bebd276b68fd5d878bf89a41e5e8044d603e38eefbf0e7a6c708d2
-MISC ChangeLog 784 SHA256 3402d22c05127582a1f41e70e492f62f0d5f1e1c607fe5ad792f3a6513bfa859 SHA512 b64002399ec4f46b886849b02d507ca9ad79e5a979b7757a2a461f33d5be068c51240972df116e262dac77c4aeb506f6cae73858818fa8f0164e168280e3129c WHIRLPOOL 1cc545fcc2755f7377e409d7901ccd9d1ac6ed5d813d300697c4424daa7da89b9b0802a56659a806cca649af0ea6bea66a3977530d086c8c9f35b1cd4c6199db
+EBUILD ocamldap-2.2.ebuild 780 SHA256 20a602009e761731d1f159450b71963201f4ff76508b4b1bb2228464d30e121b SHA512 61b77407f8e5590e115f904f7ab46ee1ac6168879cec0146cde8fe41a85753cdd85ee01f4ebb6b4aecdd79c92792778237f3afa08eb7a927c85334c57c356ff9 WHIRLPOOL cae0c6389cd2143a020dba03b8fcc7b8153a4b92738b97f3483696aea92c07f123ca12528e61aa78a3620bf79f1a6fb0cd4b96b64f470b71adfdb8bbc55eae8b
+MISC ChangeLog 919 SHA256 41abeea700a0c23921b886e7a50bcc9bb80a942d2c27d9a1140a3118b3f0ecff SHA512 be08915e08a3eb07ff719fe891fd6890a9ee7080967b888dc8c12b37daaf738fbcb3bf8aaab5a326381abab2b2379c38b1c1c3dc3835c9b8ec790eb931355d2e WHIRLPOOL c0f2b6ff8d5d467a493e0863038525ac3360670fcca97df8ee0bd26376de28e4ec761215e7602721bc97e43f75aca0864db60c9c58c040b9cd144a1f5ab7edf9
 MISC metadata.xml 1272 SHA256 98f3fce3f14d23876efb9f4ca64ea699ad156cdc82d76aa9f374c90f015a39ec SHA512 bce6f475069c72328169e146645ce2fecea49d912f1aa431a9c42a57860786a380517a03b340ace95f0ff6fc306669c91e2b7cbb9f900c5900715880027db20e WHIRLPOOL 290b8ab2681b5d50cb5114176429e724635ef3e6f3525ea5dcc71c3c3c10db6be1868c9fc71e63cf12f3f0214cd86f9d63cab986eec7dcc963e047e8bcab25de
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlEzXuIACgkQvFcC4BYPU0q1yQCfdg9sKaMvwV1MM8ypyH4z7VmL
-WzoAoJzvaRd7ToxFz2jhzGNDZuDo5zub
-=sbJn
+iEYEAREIAAYFAlR8L1EACgkQvFcC4BYPU0pKfwCdGjWUFlHoV76LXb0EWWK+GSyz
+Z80AnjO5o1NAvMw1QjD2YlQuz6Eur/7I
+=/e06
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamldap/files/ocaml-4.02.patch b/dev-ml/ocamldap/files/ocaml-4.02.patch
new file mode 100644
index 000000000000..959ddd0a5a4f
--- /dev/null
+++ b/dev-ml/ocamldap/files/ocaml-4.02.patch
@@ -0,0 +1,13 @@
+diff --git a/src/ldap_ooclient.ml b/src/ldap_ooclient.ml
+index 79fd51d..7ffa39e 100644
+--- a/src/ldap_ooclient.ml
++++ b/src/ldap_ooclient.ml
+@@ -23,7 +23,7 @@
+ open Ldap_types
+ open Ldap_funclient
+ open Ldap_schemaparser
+-open String
++let lowercase = String.lowercase
+ 
+ (* types used throughout the library *)
+ (* add types *)
diff --git a/dev-ml/ocamldap/ocamldap-2.2.ebuild b/dev-ml/ocamldap/ocamldap-2.2.ebuild
index 3f6278a12670..109239cf8394 100644
--- a/dev-ml/ocamldap/ocamldap-2.2.ebuild
+++ b/dev-ml/ocamldap/ocamldap-2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldap/ocamldap-2.2.ebuild,v 1.2 2013/03/03 14:31:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamldap/ocamldap-2.2.ebuild,v 1.3 2014/12/01 09:05:20 aballier Exp $
 
 EAPI=5
 
@@ -21,6 +21,8 @@ RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS.txt Changelog INSTALL.txt README.txt )
 
+PATCHES=( "${FILESDIR}/ocaml-4.02.patch" )
+
 src_install() {
 	oasis_src_install
 	use doc && dohtml -r doc/ocamldap/html