Add gtksourceview2 support and use it instead of 1.x versions; patch by Rafał Mużyło <galtgendo@o2.pl>, bug #295515

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

4 files changed, 163 insertions, 5 deletions

diff --git a/dev-ml/lablgtk/ChangeLog b/dev-ml/lablgtk/ChangeLog
index f34da862f22d..1cb05501ad7a 100644
--- a/dev-ml/lablgtk/ChangeLog
+++ b/dev-ml/lablgtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ml/lablgtk
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.77 2009/12/07 08:03:12 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.78 2009/12/22 15:54:43 aballier Exp $
+
+*lablgtk-2.14.0-r1 (22 Dec 2009)
+
+  22 Dec 2009; Alexis Ballier <aballier@gentoo.org>
+  +lablgtk-2.14.0-r1.ebuild, +files/lablgtk-2.14.0-sourceview2.patch:
+  Add gtksourceview2 support and use it instead of 1.x versions; patch by
+  Rafał Mużyło <galtgendo@o2.pl>, bug #295515
 
   07 Dec 2009; Alexis Ballier <aballier@gentoo.org> -lablgtk-2.10.1.ebuild:
   remove old
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index b61d2db45fe3..c693de6100e0 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -2,16 +2,18 @@
 Hash: SHA1
 
 AUX lablgtk-2.12.0-libgnomeui.patch 394 RMD160 6110fc7f96d4a717ec0ec46ed48e69e750a8010a SHA1 5ed52d96ddaeec2c8d0689b1124af145fae77768 SHA256 9b07e97563a363005ec8b433f05cbbbc5498c4258521a92c772cd28dfb84735d
+AUX lablgtk-2.14.0-sourceview2.patch 2587 RMD160 62e2a35f7fea94a2040e4a0b13ca36731bffde35 SHA1 c855e96eaeb659ef2b8ed77d9864bcbdedebad4d SHA256 a1d0e927dd7cdd0704ba01687cd59e916afc30fe2211960436f8a8d87f7c6bfe
 DIST lablgtk-2.12.0.tar.gz 789731 RMD160 b64f17545e797d5b94e7d23ed02d6ef751485803 SHA1 fe3a6499bf28be21d723e379e2e9a4d7b4798baa SHA256 b3e3341adb0aa5d66dc91e9d5e6a1053a00a42f990fee61cf8f9639cc9cbd4cd
 DIST lablgtk-2.14.0.tar.gz 775221 RMD160 fa72ad547b3a169710f137c7fc1e7f841af437f0 SHA1 4454747e6056181730e68ec253a1ec0f0a644867 SHA256 22a0dcf1b268c32023eee8a10346debc724961474f0c08958c1a53934917156a
 EBUILD lablgtk-2.12.0.ebuild 2807 RMD160 228845bbb6e43a6a9cd9229d2ee72bf60cedf1c7 SHA1 3b80c5f839149f093471aedfc5c05f6015b1e37e SHA256 531134067e9027a069b39ea0634642ff208434f420974e0e81fb94eec8a59cd9
+EBUILD lablgtk-2.14.0-r1.ebuild 2760 RMD160 d81fff441064e8e91ca9abadfc9945d4e9460634 SHA1 6c5506e8be1ce9db831c0791b978b09b16b0712a SHA256 8e8cf42f73e58df1236fd8ef10a9e295d42984c50806615a4afd0c61b2f4f874
 EBUILD lablgtk-2.14.0.ebuild 2693 RMD160 5c326735d7d5fbd3cb2820b7f5748758e2414b6c SHA1 a9bf8055d51cc10078998ecc881163f925cb2b25 SHA256 6eb72453be2c8e6ca3608232b84f7a37dbc4dcfc6a9e9776d50c0b8200c5b191
-MISC ChangeLog 9995 RMD160 50739a8beddb73c0afdecd0df39198c71b41f30d SHA1 b18e1d15cd6565a479bafad50a0fb0c57a86f666 SHA256 70ef3596a2c016c96a58e9cf9de026328cadbc81cc0759189a0bdee988e8b0c3
+MISC ChangeLog 10275 RMD160 fae7238483a90ec6ba6106736d917ce65306d0a7 SHA1 9616b506932c4be671106a318f8fb6363d1b1a97 SHA256 fb14873cc5468ffe23b3e060e42d21a9e00187fcd4be69902cc9429e85a6fc08
 MISC metadata.xml 372 RMD160 9c49a617a7f4b6fc76c6f894e70d401c3488def5 SHA1 396f45fb7ab62109c7ed9978d7af14b9e528679b SHA256 ae0b87241d6b64bb768c0c3e482efd98d2e904ab09f4c49020e19c5896bf93e2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.13 (GNU/Linux)
 
-iEYEARECAAYFAksctsUACgkQvFcC4BYPU0pibgCgm/eq6qq4jncZdLZbaTC0/SsD
-rnAAnA/4ONXMoGdcCCc/3Fs2TR+MIihH
-=OobC
+iEYEARECAAYFAksw68gACgkQvFcC4BYPU0oP3gCgrnDPzQHtrYoUfZuHonRXwdzh
+iEYAnR6MlsyOtb571TLUHLzJh8J/aolS
+=SEBU
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/lablgtk/files/lablgtk-2.14.0-sourceview2.patch b/dev-ml/lablgtk/files/lablgtk-2.14.0-sourceview2.patch
new file mode 100644
index 000000000000..a79e62242c38
--- /dev/null
+++ b/dev-ml/lablgtk/files/lablgtk-2.14.0-sourceview2.patch
@@ -0,0 +1,64 @@
+--- src/gSourceView2.mli	(wersja 1491)
++++ src/gSourceView2.mli	(wersja 1494)
+@@ -251,7 +251,7 @@
+ 
+ val iter_forward_search :
+   GText.iter ->
+-  SourceViewEnums.source_search_flag list ->
++  SourceView2Enums.source_search_flag list ->
+   start:< as_iter : Gtk.text_iter; .. > ->
+   stop:< as_iter : Gtk.text_iter; .. > ->
+   ?limit:< as_iter : Gtk.text_iter; .. > ->
+@@ -259,8 +259,8 @@
+ 
+ val iter_backward_search :
+   GText.iter ->
+-  SourceViewEnums.source_search_flag list ->
++  SourceView2Enums.source_search_flag list ->
+   start:< as_iter : Gtk.text_iter; .. > ->
+   stop:< as_iter : Gtk.text_iter; .. > ->
+   ?limit:< as_iter : Gtk.text_iter; .. > ->
+-  string -> (GText.iter * GText.iter) option
+\ No newline at end of file
++  string -> (GText.iter * GText.iter) option
+--- src/Makefile	(wersja 1491)
++++ src/Makefile	(wersja 1494)
+@@ -337,7 +337,7 @@
+ 	cd "$(INSTALLDIR)" && $(RANLIB) $(CLIBS)
+ 	cp varcc$(XE) propcc$(XE) "$(INSTALLDIR)"
+ 	if test $(THREADS_LIB) != no; \
+-	   then cp  $(ALLTHOBJS:.cmo=.cmi) $(INSTALLDIR); \
++	   then cp  $(ALLTHOBJS:.cmo=.cmi) "$(INSTALLDIR)"; \
+ 	fi
+ 	if test $(THREADS_LIB) = vm || test $(HAS_DLL_SUPPORT) != yes; \
+ 	   then cp lablgtktop$(XE) "$(INSTALLDIR)"; \
+--- src/ml_gtktree.c	(wersja 1491)
++++ src/ml_gtktree.c	(wersja 1494)
+@@ -684,6 +684,7 @@
+ ML_2 (gtk_tree_view_set_tooltip_column, GtkTreeView_val, Int_val, Unit)
+ #else
+ Unsupported_212 (gtk_tree_view_set_tooltip_cell)
++Unsupported_212 (gtk_tree_view_set_tooltip_cell_bc)
+ Unsupported_212 (gtk_tree_view_set_tooltip_row)
+ Unsupported_212 (gtk_tree_view_get_tooltip_context)
+ Unsupported_212 (gtk_tree_view_get_tooltip_column)
+--- src/gtkSourceView2.ml	(wersja 1491)
++++ src/gtkSourceView2.ml	(wersja 1494)
+@@ -189,13 +189,13 @@
+ module SourceViewMisc =
+ struct
+   external iter_backward_search:
+-       Gtk.text_iter -> string -> SourceViewEnums.source_search_flag list ->
++       Gtk.text_iter -> string -> SourceView2Enums.source_search_flag list ->
+ 	start: Gtk.text_iter -> stop: Gtk.text_iter -> Gtk.text_iter option ->
+ 	(Gtk.text_iter * Gtk.text_iter) option =
+     "ml_gtk_source_iter_backward_search_bc" "ml_gtk_source_iter_backward_search"
+   external iter_forward_search:
+-      Gtk.text_iter -> string -> SourceViewEnums.source_search_flag list ->
++      Gtk.text_iter -> string -> SourceView2Enums.source_search_flag list ->
+ 	start: Gtk.text_iter -> stop: Gtk.text_iter -> Gtk.text_iter option ->
+ 	(Gtk.text_iter * Gtk.text_iter) option =
+     "ml_gtk_source_iter_forward_search_bc" "ml_gtk_source_iter_forward_search"
+-end
+\ No newline at end of file
++end
diff --git a/dev-ml/lablgtk/lablgtk-2.14.0-r1.ebuild b/dev-ml/lablgtk/lablgtk-2.14.0-r1.ebuild
new file mode 100644
index 000000000000..99b117c85738
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-2.14.0-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.14.0-r1.ebuild,v 1.1 2009/12/22 15:54:43 aballier Exp $
+
+EAPI="2"
+
+inherit eutils multilib
+
+IUSE="debug examples glade gnome gnomecanvas sourceview +ocamlopt opengl spell svg"
+
+DESCRIPTION="Objective CAML interface for Gtk+2"
+HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
+SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
+LICENSE="LGPL-2.1 as-is"
+
+RDEPEND=">=x11-libs/gtk+-2.10
+	>=dev-lang/ocaml-3.10[ocamlopt?]
+	svg? ( >=gnome-base/librsvg-2.2 )
+	glade? ( >=gnome-base/libglade-2.0.1 )
+	gnomecanvas? ( >=gnome-base/libgnomecanvas-2.2 )
+	gnome? ( >=gnome-base/gnome-panel-2.4.0
+		>=gnome-base/libgnomeui-2.4.0 )
+	opengl? ( >=dev-ml/lablgl-0.98
+		>=x11-libs/gtkglarea-1.9 )
+	spell? ( app-text/gtkspell )
+	sourceview? ( x11-libs/gtksourceview:2.0 )
+	"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-sourceview2.patch"
+}
+
+src_configure() {
+	econf $(use_enable debug) \
+		$(use_with svg rsvg) \
+		$(use_with glade) \
+		$(use_with gnome gnomeui) \
+		$(use_with gnome panel) \
+		$(use_with opengl gl) \
+		$(use_with spell gtkspell) \
+		--without-gtksourceview \
+		$(use_with sourceview gtksourceview2) \
+		$(use_with gnomecanvas)
+}
+
+src_compile() {
+	emake -j1 all || die "make failed"
+	if use ocamlopt; then
+		emake -j1 opt || die "Compiling native code failed"
+	fi
+}
+
+install_examples() {
+	insinto /usr/share/doc/${P}/examples
+	doins examples/*.ml examples/*.rgb examples/*.png examples/*.xpm
+
+	# Install examples for optional components
+	use gnomecanvas && insinto /usr/share/doc/${P}/examples/canvas && doins examples/canvas/*.ml examples/canvas/*.png
+	use svg && insinto /usr/share/doc/${P}/examples/rsvg && doins examples/rsvg/*.ml examples/rsvg/*.svg
+	use glade && insinto /usr/share/doc/${P}/examples/glade && doins examples/glade/*.ml examples/glade/*.glade*
+	use sourceview && insinto /usr/share/doc/${P}/examples/sourceview && doins examples/sourceview/*.ml examples/sourceview/*.lang
+	use opengl && insinto /usr/share/doc/${P}/examples/GL && doins examples/GL/*.ml
+	use gnome && insinto /usr/share/doc/${P}/examples/panel && doins examples/panel/*
+}
+
+src_install () {
+	emake install DESTDIR="${D}" || die
+
+	# ocamlfind support
+	insinto /usr/$(get_libdir)/ocaml/lablgtk2
+	doins META
+
+	dodoc CHANGES README CHANGES.API
+	use examples && install_examples
+}
+
+pkg_postinst () {
+	use examples && elog "To run the examples you can use the lablgtk2 toplevel."
+	use examples && elog "e.g: lablgtk2 /usr/share/doc/${P}/examples/testgtk.ml"
+}