7 files changed, 77 insertions, 9 deletions
diff --git a/dev-ml/lablgtk/ChangeLog b/dev-ml/lablgtk/ChangeLog
index 50bb23b37daa..c86b8582bc2d 100644
--- a/dev-ml/lablgtk/ChangeLog
+++ b/dev-ml/lablgtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/lablgtk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.22 2004/08/08 06:30:28 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.23 2004/08/08 07:46:48 mattam Exp $
+
+*lablgtk-2.4.0 (08 Aug 2004)
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> lablgtk-1.2.5.ebuild,
+  lablgtk-1.2.6.ebuild, lablgtk-2.2.0.ebuild, +lablgtk-2.4.0.ebuild:
+  Prepare for ocaml-3.08 bump, add latest version for gtk+2.
 
 *lablgtk-1.2.7 (08 Aug 2004)
 
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index ad9f1bfda85e..a77ed7bfa8c8 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,9 +1,13 @@
-MD5 19117cc5869012a6ddb48a51b8c13004 ChangeLog 3002
-MD5 52d4a236a8b84715ec8c5037ea3f0b26 lablgtk-1.2.5.ebuild 1245
-MD5 f1f8ee8482fca17844d5acfb983a86e6 lablgtk-1.2.6.ebuild 1252
-MD5 b05108af7f9fe9e23efe30e9cb9fd282 lablgtk-2.2.0.ebuild 1645
+MD5 653a7f27054a98a701a4db93274557d9 ChangeLog 3236
+MD5 7ddccd0ac99a44584893c5fa5db6c1e3 lablgtk-2.4.0.ebuild 1645
+MD5 5fa6025ada94585962fed911cf3b6bcd lablgtk-1.2.5.ebuild 1270
+MD5 070fdfd1fc6abaa60ec4b006d6629860 lablgtk-1.2.6.ebuild 1277
+MD5 e8ac60e5eb26e457817cee6183647272 lablgtk-2.2.0.ebuild 1645
 MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
 MD5 fb2887662273839b922026fe40a2d56c lablgtk-1.2.7.ebuild 1252
+MD5 f1f8ee8482fca17844d5acfb983a86e6 lablgtk-1.2.6.ebuild.~1.10.~ 1252
+MD5 52d4a236a8b84715ec8c5037ea3f0b26 lablgtk-1.2.5.ebuild.~1.14.~ 1245
+MD5 7cbae54b1d8a667973bd4d3689f25605 files/digest-lablgtk-2.4.0 65
 MD5 58e497f72394c82abd2991deb196cb5d files/digest-lablgtk-1.2.5 65
 MD5 7942d753e9ae00567c6a9f7de0242d53 files/digest-lablgtk-1.2.6 65
 MD5 b5ae3dc8963ec992c47b24ec7b529377 files/digest-lablgtk-2.2.0 65
diff --git a/dev-ml/lablgtk/files/digest-lablgtk-2.4.0 b/dev-ml/lablgtk/files/digest-lablgtk-2.4.0
new file mode 100644
index 000000000000..aa329c20934a
--- /dev/null
+++ b/dev-ml/lablgtk/files/digest-lablgtk-2.4.0
@@ -0,0 +1 @@
+MD5 faa7b28c3ad97a1a76d983d24f26f567 lablgtk-2.4.0.tar.gz 637739
diff --git a/dev-ml/lablgtk/lablgtk-1.2.5.ebuild b/dev-ml/lablgtk/lablgtk-1.2.5.ebuild
index d4a50f5239e0..ebf85a6ae4b9 100644
--- a/dev-ml/lablgtk/lablgtk-1.2.5.ebuild
+++ b/dev-ml/lablgtk/lablgtk-1.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-1.2.5.ebuild,v 1.14 2004/07/14 16:29:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-1.2.5.ebuild,v 1.15 2004/08/08 07:46:48 mattam Exp $
 
 IUSE="gnome opengl"
 
@@ -10,6 +10,7 @@ LICENSE="LGPL-2.1 as-is"
 
 DEPEND="=x11-libs/gtk+-1.2*
 		>=dev-lang/ocaml-3.06
+		!>=dev-lang/ocaml-3.08
 		gnome? ( =gnome-base/libglade-0.17*
 			>=gnome-base/gnome-libs-1.4.1.7
 			media-libs/gdk-pixbuf )
diff --git a/dev-ml/lablgtk/lablgtk-1.2.6.ebuild b/dev-ml/lablgtk/lablgtk-1.2.6.ebuild
index 94811e411df2..4289d61dd433 100644
--- a/dev-ml/lablgtk/lablgtk-1.2.6.ebuild
+++ b/dev-ml/lablgtk/lablgtk-1.2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-1.2.6.ebuild,v 1.10 2004/07/14 16:29:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-1.2.6.ebuild,v 1.11 2004/08/08 07:46:48 mattam Exp $
 
 IUSE="gnome opengl"
 
@@ -10,6 +10,7 @@ LICENSE="LGPL-2.1 as-is"
 
 DEPEND="=x11-libs/gtk+-1.2*
 		>=dev-lang/ocaml-3.06
+		!>=dev-lang/ocaml-3.08
 		gnome? ( =gnome-base/libglade-0.17*
 			>=gnome-base/gnome-libs-1.4.1.7
 			media-libs/gdk-pixbuf )
diff --git a/dev-ml/lablgtk/lablgtk-2.2.0.ebuild b/dev-ml/lablgtk/lablgtk-2.2.0.ebuild
index 8c4c2bc6631d..c4cec391d1d6 100644
--- a/dev-ml/lablgtk/lablgtk-2.2.0.ebuild
+++ b/dev-ml/lablgtk/lablgtk-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.2.0.ebuild,v 1.7 2004/07/14 16:29:32 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.2.0.ebuild,v 1.8 2004/08/08 07:46:48 mattam Exp $
 
 IUSE="debug doc glade gnome opengl svg"
 
@@ -10,7 +10,7 @@ SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
 LICENSE="LGPL-2.1 as-is"
 
 DEPEND=">=x11-libs/gtk+-2.2*
-	>=dev-lang/ocaml-3.07
+	=dev-lang/ocaml-3.07*
 	svg? ( >=gnome-base/librsvg-2.2* )
 	glade? ( >=gnome-base/libglade-2.0.1 )
 	gnome? ( >=gnome-base/libgnomecanvas-2.2
diff --git a/dev-ml/lablgtk/lablgtk-2.4.0.ebuild b/dev-ml/lablgtk/lablgtk-2.4.0.ebuild
new file mode 100644
index 000000000000..3f91a41c4927
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-2.4.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.4.0.ebuild,v 1.1 2004/08/08 07:46:48 mattam Exp $
+
+IUSE="debug doc glade gnome opengl 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"
+
+DEPEND=">=x11-libs/gtk+-2.4*
+	>=dev-lang/ocaml-3.07
+	svg? ( >=gnome-base/librsvg-2.2* )
+	glade? ( >=gnome-base/libglade-2.0.1 )
+	gnome? ( >=gnome-base/libgnomecanvas-2.2
+		>=gnome-base/gnome-panel-2.4.0
+		>=gnome-base/libgnomeui-2.4.0
+		media-libs/gdk-pixbuf )
+	opengl? ( >=dev-ml/lablgl-0.98
+		>=x11-libs/gtkglarea-1.9* )"
+
+SLOT="2"
+KEYWORDS="-amd64 ~x86 ~ppc ~alpha ~ia64"
+
+src_compile() {
+	use gnome || myconf="$myconf
+				--without-gnomecanvas --without-gnomeui
+				--without-panel"
+	use opengl || myconf="$myconf --without-gl"
+	use svg || myconf="$myconf --without-rsvg"
+	use glade || myconf="$myconf --without-glade"
+	use debug && myconf="$myconf --enable-debug"
+
+	econf $myconf || die "configure failed"
+	make all opt || die "make failed"
+}
+
+install_examples() {
+	examples=/usr/share/doc/${P}/examples
+	dodir $examples
+	insinto $examples
+	doins examples/*.ml examples/*.rgb
+}
+
+src_install () {
+	make install DESTDIR=${D} || die
+	dodoc CHANGES COPYING README
+	use doc && install_examples
+}
+
+pkg_postinst () {
+	use doc && einfo "To run the examples you can use the lablgtk2 toplevel."
+	use doc && einfo "e.g: lablgtk2 /usr/share/doc/${P}/examples/testgtk.ml"
+}