add file from upstream bug tracker by Sergei Lebedev to fix build with type-conv-3

Package-Manager: portage-2.2.0_alpha62/cvs/Linux x86_64

diff --git a/dev-ml/ocaml-data-notation/ChangeLog b/dev-ml/ocaml-data-notation/ChangeLog
index 3b1bf57f81d54e4cb7575dcce575f0b4a1b4be8c..6df5319d44cb3162d7686d242c7090560b8b6427 100644 (file)
--- a/dev-ml/ocaml-data-notation/ChangeLog
+++ b/dev-ml/ocaml-data-notation/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/ocaml-data-notation
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-data-notation/ChangeLog,v 1.4 2011/07/06 18:31:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-data-notation/ChangeLog,v 1.5 2011/10/06 20:23:26 aballier Exp $
+
+  06 Oct 2011; Alexis Ballier <aballier@gentoo.org> +files/typeconv3.patch,
+  ocaml-data-notation-0.0.6.ebuild:
+  add file from upstream bug tracker by Sergei Lebedev to fix build with
+  type-conv-3
 
   06 Jul 2011; Alexis Ballier <aballier@gentoo.org>
   -ocaml-data-notation-0.0.3.ebuild, -ocaml-data-notation-0.0.4.ebuild:

diff --git a/dev-ml/ocaml-data-notation/Manifest b/dev-ml/ocaml-data-notation/Manifest
index d223f516e97f4dcc56e6ba940a575586a928b543..9fa9ec8b66dcdfd6aaf3ff68e158c2fd0268a30b 100644 (file)
--- a/dev-ml/ocaml-data-notation/Manifest
+++ b/dev-ml/ocaml-data-notation/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX typeconv3.patch 629 RMD160 8d27fe44137737c16bc7116f78f39ebd1b8f5cf4 SHA1 cf2b48b82b13468a78504de22ec191e96feb81dd SHA256 69c1c96d2a1e9cf2e68e6061de70eec76064b9a3e9da4a1b04c04604bcdde266
 DIST ocaml-data-notation-0.0.6.tar.gz 57004 RMD160 bd6d51e58b34de19c619f4db8f622caf32fd01d1 SHA1 05428d7e260006e362764c118e60314223bcddaf SHA256 51d7b8e7107ea018d009a099cdffba9597096eb05b0df5bf684df8266b8476c6
-EBUILD ocaml-data-notation-0.0.6.ebuild 1114 RMD160 197c74457f511eb549e3b614d9ae169b59b2c3ec SHA1 36cfbb7a46050ffc0c02902fe911901861db3055 SHA256 4e0d497b7876fdd02c9452a3ce4613ebcd8f6e073814ac63a83fbddc89315d46
-MISC ChangeLog 896 RMD160 2b32897959ec94fc10d1d2d7d276c742efb30e2a SHA1 7937864aa0372404e42118c171ea75c198e1d8ab SHA256 3771832261e739f6d9bf6598c5d2e64a5b7ddf48e1b68f5ecc26166e92457e21
+EBUILD ocaml-data-notation-0.0.6.ebuild 1216 RMD160 9b97c1b8efd5c741710c7152ab2e7341b4c2be17 SHA1 c064aa69b5a0c14549301dd3566515b7b24f56a5 SHA256 6ac8261ba4cce8b9b52646672062d1e8a5e44ae17d136c5bc7b80210fb56915b
+MISC ChangeLog 1096 RMD160 315a33413a30a1cc9ef82e653860adb3f01a844c SHA1 b54b9544ca733a0a32327a288ea3814e73a9da1c SHA256 7fb982d9c767b4b756730e2550d9330a302c3eb8a67a9d7bfa77888ba3a4d523
 MISC metadata.xml 249 RMD160 eb94c89a6647e6cc5ff168b75a1d5282aefa7a73 SHA1 6bfb6cc9628948c3a1f3221210c6d59aa1ef1f2b SHA256 d4c14c36ffd9245062b47a24024d8fecee009a3795d41e55139c513fe168173e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4UqiYACgkQvFcC4BYPU0qVLgCglW4cyop0teNOZUGTsCnaz68T
-RlQAnRcCW340/aSWaLR/fcWOgAVmUAP2
-=5UKL
+iEYEARECAAYFAk6ODkUACgkQvFcC4BYPU0oehgCeK+Yn+R+LVJmzXXz2oTeqpV+0
++dUAn2u8u0F0bRd1tRXM3tc6MlFbt9kP
+=j6lW
 -----END PGP SIGNATURE-----

diff --git a/dev-ml/ocaml-data-notation/files/typeconv3.patch b/dev-ml/ocaml-data-notation/files/typeconv3.patch
new file mode 100644 (file)
index 0000000..5c64dfd
--- /dev/null
+++ b/dev-ml/ocaml-data-notation/files/typeconv3.patch
@@ -0,0 +1,22 @@
+http://forge.ocamlcore.org/tracker/index.php?func=detail&aid=1033&group_id=148&atid=674
+Date: 2011-09-14 06:41
+Sender: Sergei Lebedev
+
+Index: ocaml-data-notation-0.0.6/src/pa_odn.ml
+===================================================================
+--- ocaml-data-notation-0.0.6.orig/src/pa_odn.ml
++++ ocaml-data-notation-0.0.6/src/pa_odn.ml
+@@ -31,6 +31,13 @@ open PreCast;;
+ open Ast;;
+ open Pa_type_conv;;
+ 
++module Gen = struct
++ include Gen
++ (* Compatibility functions, removed from type-conv > 2.3 *)
++ let idp _loc id = <:patt< $lid:id$ >>
++ let ide _loc id = <:expr< $lid:id$ >>
++end
++
+ let dbug =
+   prerr_endline
+ ;;

diff --git a/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.6.ebuild b/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.6.ebuild
index 19cc1d174453eeca65dce7711c5242fd34f5fe0a..530ef532e50ab291148d45d7bd4e9c05fe1ffa25 100644 (file)
--- a/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.6.ebuild
+++ b/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.6.ebuild,v 1.1 2011/06/25 18:56:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-data-notation/ocaml-data-notation-0.0.6.ebuild,v 1.2 2011/10/06 20:23:26 aballier Exp $
 
 EAPI=3
 
-inherit findlib multilib
+inherit findlib multilib eutils
 
 DESCRIPTION="This project uses type-conv to dump OCaml data structure using OCaml data notation"
 HOMEPAGE="https://forge.ocamlcore.org/projects/odn"
@@ -21,6 +21,10 @@ DEPEND="${RDEPEND}
                  dev-ml/ounit[ocamlopt?]
                  dev-ml/ocaml-fileutils[ocamlopt?]"
 
+src_prepare() {
+       has_version '>=dev-ml/type-conv-3' && epatch "${FILESDIR}/typeconv3.patch"
+}
+
 oasis_use_enable() {
        echo "--override $2 `use $1 && echo \"true\" || echo \"false\"`"
 }