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

Package-Manager: portage-2.1_pre10-r4

6 files changed, 99 insertions, 14 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/Manifest b/app-misc/ledit/Manifest
index 22f2bafbe3f6..d526364babde 100644
--- a/app-misc/ledit/Manifest
+++ b/app-misc/ledit/Manifest
@@ -1,14 +1,27 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX ledit-1.11-loc.patch 939 RMD160 1d11bfff87349c82f238cfa0f4bdf900af49615b SHA1 ccaeb51b93275241c82682942603c1a02c23e0fb SHA256 892c3be5a317cbdbbcf4fd94f49aadaee95e5e76e94187420b411a3cafb3aca9 size 939
+MD5 56df2dff929cb23dc2843d0bacff3ef4 files/ledit-1.11-loc.patch 939
+RMD160 1d11bfff87349c82f238cfa0f4bdf900af49615b files/ledit-1.11-loc.patch 939
+SHA256 892c3be5a317cbdbbcf4fd94f49aadaee95e5e76e94187420b411a3cafb3aca9 files/ledit-1.11-loc.patch 939
+DIST ledit-1.11.tar.gz 14027 RMD160 251e077db5beb514860e0ecca4d78d6b2460c5fc SHA256 d5f3775e200f0bfcd2f255866b284572cb431b1befd61eab34112c10369c4d59 size 14027
+EBUILD ledit-1.11-r1.ebuild 793 RMD160 3fa92d341b1bbf3523b6f806fb0a95705ad409cf SHA1 1f0348d91bc541807b72c6fb744f155c46535d2e SHA256 825de724cc657f4be30b961de7aa4a12324cfdabbc62210d4b144d28133e41ce size 793
+MD5 8c78c274908f7612a6be1c2d337a9037 ledit-1.11-r1.ebuild 793
+RMD160 3fa92d341b1bbf3523b6f806fb0a95705ad409cf ledit-1.11-r1.ebuild 793
+SHA256 825de724cc657f4be30b961de7aa4a12324cfdabbc62210d4b144d28133e41ce ledit-1.11-r1.ebuild 793
+EBUILD ledit-1.11.ebuild 698 RMD160 1785bafda343c8fe3f03633b0b169264edd3d2ca SHA1 b92781fd29b34439e43ce5f2e8a18faabe0700f4 SHA256 b72e5b56688d81a9061ddaeb29ef11a5bd3cbdd37553a7ae6fefb2a7653abd3d size 698
 MD5 3c72c518ee1aafc2149a168ac6e5bd24 ledit-1.11.ebuild 698
+RMD160 1785bafda343c8fe3f03633b0b169264edd3d2ca ledit-1.11.ebuild 698
+SHA256 b72e5b56688d81a9061ddaeb29ef11a5bd3cbdd37553a7ae6fefb2a7653abd3d ledit-1.11.ebuild 698
+MISC ChangeLog 1006 RMD160 21cfb7bca106936770bec6e02e5101b6fefd9af9 SHA1 32f6b0534c26e033227ce61758250c478f0027c4 SHA256 cbe44193611ec59ffedd4927fe2f18cc8e50722dc7f545a57e10a5a6030546ad size 1006
+MD5 497ac3a3e5c3bab85dd7e8a7158f7c5c ChangeLog 1006
+RMD160 21cfb7bca106936770bec6e02e5101b6fefd9af9 ChangeLog 1006
+SHA256 cbe44193611ec59ffedd4927fe2f18cc8e50722dc7f545a57e10a5a6030546ad ChangeLog 1006
+MISC metadata.xml 157 RMD160 30153301a2a5cca5547a6e47941aae2895837613 SHA1 66e87d50f913856e703f3ee29841b03332af40db SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799 size 157
 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
-MD5 a6629fe64bc19b783e18e30e2a763835 ChangeLog 789
-MD5 ebd27d57928935b7692a6499cf7dfde8 files/digest-ledit-1.11 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDKzkpLLFUmVNQ7rkRAqn/AKC5DZ5eoz367wCzqbERp9LzoIrq9gCfVBQa
-IIRAByIaONrHkhpTwiFUUhw=
-=S48f
------END PGP SIGNATURE-----
+RMD160 30153301a2a5cca5547a6e47941aae2895837613 metadata.xml 157
+SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799 metadata.xml 157
+MD5 aa98e145e2ad5fd535f329021ea59333 files/digest-ledit-1.11 229
+RMD160 73ff6ce4328e6b71d2a78cc0517d65f65a161681 files/digest-ledit-1.11 229
+SHA256 dd1e2d557755446fe03bddc59911c2904820bafbca2637b0ad2822081ef6b06e files/digest-ledit-1.11 229
+MD5 aa98e145e2ad5fd535f329021ea59333 files/digest-ledit-1.11-r1 229
+RMD160 73ff6ce4328e6b71d2a78cc0517d65f65a161681 files/digest-ledit-1.11-r1 229
+SHA256 dd1e2d557755446fe03bddc59911c2904820bafbca2637b0ad2822081ef6b06e files/digest-ledit-1.11-r1 229
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
+}