fix build with ocaml 3.12, patch from upstream svn, bug #331083

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 261 insertions, 5 deletions

diff --git a/dev-ml/lablgtk/ChangeLog b/dev-ml/lablgtk/ChangeLog
index af63c9251143..92922a771fd1 100644
--- a/dev-ml/lablgtk/ChangeLog
+++ b/dev-ml/lablgtk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ml/lablgtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.82 2010/07/20 15:17:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.83 2010/08/03 20:38:28 aballier Exp $
+
+  03 Aug 2010; Alexis Ballier <aballier@gentoo.org> lablgtk-2.14.1.ebuild,
+  +files/lablgtk-2.14.1-ocaml312.patch:
+  fix build with ocaml 3.12, patch from upstream svn, bug #331083
 
   20 Jul 2010; Jeroen Roovers <jer@gentoo.org> lablgtk-2.12.0.ebuild,
   lablgtk-2.14.1.ebuild:
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 20b95b21f7bf..6759a27e0b57 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX lablgtk-2.12.0-libgnomeui.patch 394 RMD160 6110fc7f96d4a717ec0ec46ed48e69e750a8010a SHA1 5ed52d96ddaeec2c8d0689b1124af145fae77768 SHA256 9b07e97563a363005ec8b433f05cbbbc5498c4258521a92c772cd28dfb84735d
+AUX lablgtk-2.14.1-ocaml312.patch 7043 RMD160 0ff8ee44b54fa2d64b13a76afb94f4ce995cb556 SHA1 b60b63a6cd3a8a4701837558a3c2fddb6ef7905c SHA256 578f8924458377ca9143791fa8e5d24bf8284c827290165b20556193d5116981
 DIST lablgtk-2.12.0.tar.gz 789731 RMD160 b64f17545e797d5b94e7d23ed02d6ef751485803 SHA1 fe3a6499bf28be21d723e379e2e9a4d7b4798baa SHA256 b3e3341adb0aa5d66dc91e9d5e6a1053a00a42f990fee61cf8f9639cc9cbd4cd
 DIST lablgtk-2.14.1.tar.gz 777615 RMD160 efa0c1446d03f4deb90656586d479d2b32e110da SHA1 d0fb6185f210c6b106c250d1a85541b7da402310 SHA256 3044d96a970818cdd7fc5d7f33a5e476bf92c52b44617c953786fa3f76c177b5
 EBUILD lablgtk-2.12.0.ebuild 2799 RMD160 914af7eb7bebe05d3eeea60bd15d5e024934c15a SHA1 58794fa1ed84f0acec27720b48749b2754f4bdfe SHA256 dd9077b1b1c2f6707b10a46e0121ef019162861d59b71a4bd97e31562703bc88
-EBUILD lablgtk-2.14.1.ebuild 2686 RMD160 8d6b896b95ce9c81690ee6352f7b0cac47bd5c44 SHA1 a69a5a05c5418bc4471245ae10ded1b599e15cec SHA256 b1bf8f20a47cb08a04207fbe1042a729129d056718e33dbbcda25d1f294732eb
-MISC ChangeLog 10798 RMD160 394e5d149c74e1e8fbe28de14258718c35a7eae5 SHA1 46189d5c38ef1decc16bfb057c0285c06f10cc34 SHA256 06badba659729f8e1d0a6674ee260eb0052565d91eaef1bca28253ca4985ad49
+EBUILD lablgtk-2.14.1.ebuild 2759 RMD160 f40b40e5ca5fd0d1ecd495c37be5abb4c9253f5e SHA1 01e78f44964ab38d9e5009eadda3fbb709962f04 SHA256 51f71cff4eebc6dbd9fa0dbd1a5defd8b70e5d54b84def9043520812ddb2602c
+MISC ChangeLog 10985 RMD160 aefaf399852eb8a51423497accfc4ea8997a9376 SHA1 9bb02ffb703fcb4920eb878d9af8811b153021cc SHA256 a1f6dbbe789aab49b9addbc948794f8af466d68b50c7dc64b4d97eb21ce82049
 MISC metadata.xml 372 RMD160 9c49a617a7f4b6fc76c6f894e70d401c3488def5 SHA1 396f45fb7ab62109c7ed9978d7af14b9e528679b SHA256 ae0b87241d6b64bb768c0c3e482efd98d2e904ab09f4c49020e19c5896bf93e2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkxYfkoACgkQvFcC4BYPU0pV4ACffIHHw7hywrQw2mKNuQWHjKK1
+bSsAoIt+0fB02OUSdf2e1h5eQoXc4yQq
+=xcKJ
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/lablgtk/files/lablgtk-2.14.1-ocaml312.patch b/dev-ml/lablgtk/files/lablgtk-2.14.1-ocaml312.patch
new file mode 100644
index 000000000000..1b960138f33f
--- /dev/null
+++ b/dev-ml/lablgtk/files/lablgtk-2.14.1-ocaml312.patch
@@ -0,0 +1,237 @@
+Index: src/gWindow.mli
+===================================================================
+--- src/gWindow.mli	(revision 1514)
++++ src/gWindow.mli	(revision 1515)
+@@ -191,9 +191,10 @@
+ 
+ (** Create popup windows
+    @gtkdoc gtk GtkDialog *)
+-class ['a] dialog_ext : [> Gtk.dialog] obj ->
++class ['a] dialog_ext : ([> Gtk.dialog] as 'b) obj ->
+   object
+     inherit ['a] dialog_skel
++    val obj : 'b obj
+     method add_button : string -> 'a -> unit
+     method add_button_stock : GtkStock.id -> 'a -> unit
+   end
+@@ -203,6 +204,7 @@
+ class ['a] dialog : [> Gtk.dialog] obj ->
+   object
+     inherit ['a] dialog_ext
++    val obj : Gtk.dialog obj
+     method connect : 'a dialog_signals
+   end
+ 
+Index: src/gButton.mli
+===================================================================
+--- src/gButton.mli	(revision 1514)
++++ src/gButton.mli	(revision 1515)
+@@ -357,9 +357,10 @@
+ (** @gtkdoc gtk GtkToolItem 
+     @since GTK 2.4 *)
+ class tool_item : 
+-  [> Gtk.tool_item] obj ->
++  ([> Gtk.tool_item] as 'a) obj ->
+   object
+     inherit tool_item_skel
++    val obj : 'a obj
+     method connect : GContainer.container_signals
+   end
+ 
+@@ -423,9 +424,10 @@
+ (** @gtkdoc gtk GtkToolButton
+     @since GTK 2.4 *)
+ class tool_button : 
+-  [> Gtk.tool_button] obj ->
++  ([> Gtk.tool_button] as 'a) obj ->
+   object
+     inherit tool_button_skel
++    val obj : 'a obj
+     method connect : tool_button_signals
+   end
+ 
+Index: src/gAction.mli
+===================================================================
+--- src/gAction.mli	(revision 1514)
++++ src/gAction.mli	(revision 1515)
+@@ -20,6 +20,10 @@
+ (*                                                                        *)
+ (**************************************************************************)
+ 
++(* $Id: lablgtk-2.14.1-ocaml312.patch,v 1.1 2010/08/03 20:38:29 aballier Exp $ *)
++
++open Gobject
++
+ (** Action-based menus and toolbars *)
+ 
+ (** {3 GtkAction} *)
+@@ -27,9 +31,9 @@
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkAction *)
+ class action_signals :
+-  ([> Gtk.action ] as 'b) Gobject.obj ->
++  ([> Gtk.action ] as 'b) obj ->
+   object ('a)
+-    val obj : 'b Gobject.obj
++    val obj : 'b obj
+     val after : bool
+     method after : < after : 'a; .. > as 'a
+     method activate : callback:(unit -> unit) -> GtkSignal.id
+@@ -38,10 +42,10 @@
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkAction *)
+ class action_skel :
+-  ([> Gtk.action ] as 'a) Gobject.obj ->
++  ([> Gtk.action ] as 'a) obj ->
+   object
+-    val obj : 'a Gobject.obj
+-    method as_action : Gtk.action Gobject.obj
++    val obj : 'a obj
++    method as_action : Gtk.action obj
+ 
+     (** Properties *)
+ 
+@@ -88,10 +92,10 @@
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkAction *)
+ class action :
+-  ([> Gtk.action ] as 'a) Gobject.obj ->
++  ([> Gtk.action ] as 'a) obj ->
+   object
+     inherit action_skel
+-    val obj : 'a Gobject.obj
++    val obj : 'a obj
+     method connect : action_signals
+   end
+ 
+@@ -103,20 +107,20 @@
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkToggleAction *)
+ class toggle_action_signals :
+-  ([> Gtk.toggle_action ] as 'b) Gobject.obj ->
++  ([> Gtk.toggle_action ] as 'b) obj ->
+   object
+     inherit action_signals
+-    val obj : 'b Gobject.obj
++    val obj : 'b obj
+     method toggled : callback:(unit -> unit) -> GtkSignal.id
+   end
+ 
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkToggleAction *)
+ class toggle_action_skel :
+-  ([> Gtk.toggle_action ] as 'a) Gobject.obj ->
++  ([> Gtk.toggle_action ] as 'a) obj ->
+   object
+     inherit action_skel
+-    val obj : 'a Gobject.obj
++    val obj : 'a obj
+     method draw_as_radio : bool
+     method get_active : bool
+     method set_active : bool -> unit
+@@ -127,9 +131,10 @@
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkToggleAction *)
+ class toggle_action :
+-  ([> Gtk.toggle_action ] as 'a) Gobject.obj ->
++  ([> Gtk.toggle_action ] as 'a) obj ->
+   object
+     inherit toggle_action_skel
++    val obj : 'a obj
+     method connect : toggle_action_signals
+   end
+ 
+@@ -140,10 +145,10 @@
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkRadioAction *)
+ class radio_action_signals :
+-  ([> Gtk.radio_action] as 'b) Gobject.obj ->
++  ([> Gtk.radio_action] as 'b) obj ->
+   object
+     inherit toggle_action_signals
+-    val obj : 'b Gobject.obj
++    val obj : 'b obj
+     method changed :
+       callback:(int -> unit) -> GtkSignal.id
+   end
+@@ -151,12 +156,12 @@
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkRadioAction *)
+ class radio_action :
+-  ([> Gtk.radio_action] as 'a) Gobject.obj ->
++  ([> Gtk.radio_action] as 'a) obj ->
+   object
+     inherit toggle_action_skel
+-    val obj : 'a Gobject.obj
++    val obj : 'a obj
+     method connect : radio_action_signals
+-    method as_radio_action : Gtk.radio_action Gobject.obj
++    method as_radio_action : Gtk.radio_action obj
+     method get_current_value : int
+     method set_group : Gtk.radio_action Gtk.group -> unit
+     method set_value : int -> unit
+@@ -172,10 +177,10 @@
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkActionGroup *)
+ class action_group_signals :
+-  ([> Gtk.action_group ] as 'b) Gobject.obj ->
++  ([> Gtk.action_group ] as 'b) obj ->
+   object ('a)
+     val after : bool
+-    val obj : 'b Gobject.obj
++    val obj : 'b obj
+     method after : 'a
+     method connect_proxy : callback:(action -> GObj.widget -> unit) -> GtkSignal.id
+     method disconnect_proxy : callback:(action -> GObj.widget -> unit) -> GtkSignal.id
+@@ -186,10 +191,10 @@
+ (** @since GTK 2.4
+     @gtkdoc gtk GtkActionGroup *)
+ class action_group :
+-  ([> Gtk.action_group ] as 'a) Gobject.obj ->
++  ([> Gtk.action_group ] as 'a) obj ->
+   object
+-    val obj : 'a Gobject.obj
+-    method as_group : Gtk.action_group Gobject.obj
++    val obj : 'a obj
++    method as_group : Gtk.action_group obj
+     method connect : action_group_signals
+     method sensitive : bool
+     method set_sensitive : bool -> unit
+Index: src/gnoCanvas.mli
+===================================================================
+--- src/gnoCanvas.mli	(revision 1514)
++++ src/gnoCanvas.mli	(revision 1515)
+@@ -180,9 +180,10 @@
+   end
+ 
+ (** @gtkdoc libgnomecanvas GnomeCanvasItem *)
+-class ['p] item : [> GnomeCanvas.item] Gtk.obj -> 
++class ['p] item : ([> GnomeCanvas.item] as 'a) Gtk.obj -> 
+   object
+     inherit base_item
++    val obj : 'a Gtk.obj
+     constraint 'p = [< items_properties]
+     method set : 'p list -> unit
+   end
+Index: src/gWindow.ml
+===================================================================
+--- src/gWindow.ml	(revision 1514)
++++ src/gWindow.ml	(revision 1515)
+@@ -171,7 +171,7 @@
+ end
+ 
+ class ['a] dialog obj = object (self)
+-  inherit ['a] dialog_ext obj
++  inherit ['a] dialog_ext (obj :> Gtk.dialog obj)
+   method connect : 'a dialog_signals = new dialog_signals obj (self#decode)
+ end
+ 
+@@ -193,7 +193,7 @@
+ type any_response = [GtkEnums.response | `OTHER of int]
+ 
+ class dialog_any obj = object (self)
+-  inherit [any_response] dialog_base obj
++  inherit [any_response] dialog_base (obj :> Gtk.dialog obj)
+   method private encode = function
+       `OTHER n -> n
+     | #GtkEnums.response as v -> Dialog.std_response v
diff --git a/dev-ml/lablgtk/lablgtk-2.14.1.ebuild b/dev-ml/lablgtk/lablgtk-2.14.1.ebuild
index 93008565b5e2..7a6c457f8c17 100644
--- a/dev-ml/lablgtk/lablgtk-2.14.1.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.14.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.14.1.ebuild,v 1.2 2010/07/20 15:17:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.14.1.ebuild,v 1.3 2010/08/03 20:38:28 aballier Exp $
 
 EAPI="2"
 
-inherit multilib
+inherit multilib eutils
 
 IUSE="debug examples glade gnome gnomecanvas sourceview +ocamlopt opengl spell svg"
 
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd ~x86-linux"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-ocaml312.patch"
+}
+
 src_configure() {
 	econf $(use_enable debug) \
 		$(use_with svg rsvg) \