Add patch to change "loc" to "_loc" for >=dev-lang/ocaml-3.09 (bug #128535).

(Portage version: 2.1_pre10-r4)

5 files changed, 74 insertions, 2 deletions

diff --git a/app-misc/ledit/ChangeLog b/app-misc/ledit/ChangeLog
index d1c9e5292e46..2cdf1887be4c 100644
--- a/app-misc/ledit/ChangeLog
+++ b/app-misc/ledit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-misc/ledit
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ledit/ChangeLog,v 1.6 2005/09/16 21:28:24 ciaranm Exp $
+# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ledit/ChangeLog,v 1.7 2006/05/10 13:54:01 chutzpah Exp $
+
+*ledit-1.11-r1 (10 May 2006)
+
+  10 May 2006; Patrick McLean <chutzpah@gentoo.org>
+  +files/ledit-1.11-loc.patch, +ledit-1.11-r1.ebuild:
+  Add patch to change "loc" to "_loc" for >=dev-lang/ocaml-3.09 (bug #128535).
 
   16 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
   Converted to UTF-8, fixed encoding screwups
diff --git a/app-misc/ledit/files/digest-ledit-1.11 b/app-misc/ledit/files/digest-ledit-1.11
index ed0a68451fbb..e5266f2f2070 100644
--- a/app-misc/ledit/files/digest-ledit-1.11
+++ b/app-misc/ledit/files/digest-ledit-1.11
@@ -1 +1,3 @@
 MD5 a2d38ba641682509c1e964ad699a9dd2 ledit-1.11.tar.gz 14027
+RMD160 251e077db5beb514860e0ecca4d78d6b2460c5fc ledit-1.11.tar.gz 14027
+SHA256 d5f3775e200f0bfcd2f255866b284572cb431b1befd61eab34112c10369c4d59 ledit-1.11.tar.gz 14027
diff --git a/app-misc/ledit/files/digest-ledit-1.11-r1 b/app-misc/ledit/files/digest-ledit-1.11-r1
new file mode 100644
index 000000000000..e5266f2f2070
--- /dev/null
+++ b/app-misc/ledit/files/digest-ledit-1.11-r1
@@ -0,0 +1,3 @@
+MD5 a2d38ba641682509c1e964ad699a9dd2 ledit-1.11.tar.gz 14027
+RMD160 251e077db5beb514860e0ecca4d78d6b2460c5fc ledit-1.11.tar.gz 14027
+SHA256 d5f3775e200f0bfcd2f255866b284572cb431b1befd61eab34112c10369c4d59 ledit-1.11.tar.gz 14027
diff --git a/app-misc/ledit/files/ledit-1.11-loc.patch b/app-misc/ledit/files/ledit-1.11-loc.patch
new file mode 100644
index 000000000000..ba415e271c64
--- /dev/null
+++ b/app-misc/ledit/files/ledit-1.11-loc.patch
@@ -0,0 +1,29 @@
+diff -rNu ledit-1.11/pa_local.ml ledit-1.11-fix/pa_local.ml
+--- ledit-1.11/pa_local.ml      2001-06-16 10:50:02.000000000 +0200
++++ ledit-1.11-fix/pa_local.ml  2006-04-02 18:11:31.786957250 +0200
+@@ -14,10 +14,10 @@
+ open Pcaml;   
+
+ value expr_of_patt p =
+-  let loc = MLast.loc_of_patt p in
++  let _loc = MLast.loc_of_patt p in
+   match p with
+   [ <:patt< $lid:x$ >> -> <:expr< $lid:x$ >>
+-  | _ -> Stdpp.raise_with_loc loc (Stream.Error "identifier expected") ]
++  | _ -> Stdpp.raise_with_loc _loc (Stream.Error "identifier expected") ]
+ ;
+
+ EXTEND
+diff -rNu ledit-1.11/pr_local.ml ledit-1.11-fix/pr_local.ml
+--- ledit-1.11/pr_local.ml      2001-06-25 11:33:50.000000000 +0200
++++ ledit-1.11-fix/pr_local.ml  2006-04-02 18:12:05.769081000 +0200
+@@ -7,7 +7,7 @@
+ open Pcaml;
+ open Spretty;
+
+-value loc = (0, 0);
++value _loc = (0, 0);
+
+ value expr e dg k = pr_expr.pr_fun "top" e dg k;
+ value patt e dg k = pr_patt.pr_fun "top" e dg k;
+
diff --git a/app-misc/ledit/ledit-1.11-r1.ebuild b/app-misc/ledit/ledit-1.11-r1.ebuild
new file mode 100644
index 000000000000..3eec985e30c1
--- /dev/null
+++ b/app-misc/ledit/ledit-1.11-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ledit/ledit-1.11-r1.ebuild,v 1.1 2006/05/10 13:54:01 chutzpah Exp $
+
+inherit eutils
+
+IUSE=""
+
+DESCRIPTION="A line editor to be used with interactive commands."
+SRC_URI="ftp://ftp.inria.fr/INRIA/Projects/cristal/Daniel.de_Rauglaudre/Tools/${P}.tar.gz"
+HOMEPAGE="http://caml.inria.fr/cgi-bin/hump.en.cgi?contrib=301"
+
+DEPEND=">=dev-lang/ocaml-3.09"
+RDEPEND=""
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~ppc ~x86"
+
+src_compile()
+{
+	epatch "${FILESDIR}/${P}-loc.patch" || die "patch failed"
+	make || die "make failed"
+	make ledit.opt || die "make failed"
+}
+
+src_install()
+{
+	newbin ledit.opt ledit
+	newman ledit.l ledit.1
+	dodoc Changes LICENSE README
+}