summaryrefslogtreecommitdiff
path: root/dev-ml
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2014-12-01 09:05:20 +0000
committerAlexis Ballier <aballier@gentoo.org>2014-12-01 09:05:20 +0000
commitd7ac13e5516a74aab59ede46e2e01804c1187fcc (patch)
treeff97a1f6950f371fd22dac4c2a09d46729191855 /dev-ml
parentBump (diff)
downloadgentoo-2-d7ac13e5516a74aab59ede46e2e01804c1187fcc.tar.gz
gentoo-2-d7ac13e5516a74aab59ede46e2e01804c1187fcc.tar.bz2
gentoo-2-d7ac13e5516a74aab59ede46e2e01804c1187fcc.zip
import ocaml 4.02 fix from opam
Signed-off-by: aballier@gentoo.org (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'dev-ml')
-rw-r--r--dev-ml/ocamldap/ChangeLog8
-rw-r--r--dev-ml/ocamldap/files/ocaml-4.02.patch13
-rw-r--r--dev-ml/ocamldap/ocamldap-2.2.ebuild6
3 files changed, 23 insertions, 4 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/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