Version bump and minor fix.

5 files changed, 59 insertions, 6 deletions

diff --git a/dev-ml/lablgtk/ChangeLog b/dev-ml/lablgtk/ChangeLog
index f1b33cf27d5c..2c9092646ccc 100644
--- a/dev-ml/lablgtk/ChangeLog
+++ b/dev-ml/lablgtk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-ml/lablgtk
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.9 2004/01/22 22:30:43 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.10 2004/02/03 01:27:08 mattam Exp $
+
+*lablgtk-1.2.6 (03 Feb 2004)
+
+  03 Feb 2004; Matthieu Sozeau <mattam@gentoo.org> lablgtk-1.2.6.ebuild,
+  lablgtk-2.2.0.ebuild:
+  1.2.6 version bump, all arches ~ keyworded. Fix depend in 2.2.0 to allow
+  >gtk-2.2 versions to be linked with lablgl (bug #31854).
 
   22 Jan 2004; Matthieu Sozeau <mattam@gentoo.org> lablgtk-1.2.3.ebuild:
   Forgot to say i added ~ppc keywords to 1.2.3 and 2.2.0.
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 0895e93036a0..96579dd87c1b 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,9 +1,9 @@
 MD5 8b350f19c06fcabf1053b0421b7c3f5a metadata.xml 155
 MD5 35f18449cbf7fa91db96609de79c0437 lablgtk-1.2.5.ebuild 1250
-MD5 35f18449cbf7fa91db96609de79c0437 lablgtk-1.2.6.ebuild 1250
-MD5 cdb98eafda959b3b5cd491fb7c2e612c lablgtk-2.2.0.ebuild 1627
+MD5 faa337308ef689ae312620f5f4f10732 lablgtk-1.2.6.ebuild 1253
+MD5 68ffddda49c5e95ec041bebb3222bc4e lablgtk-2.2.0.ebuild 1628
 MD5 d31ae1ea15f86f5cb7e914437c449c28 lablgtk-1.2.3.ebuild 1241
-MD5 2e13d3cd64b6cf1589756f41db26de11 ChangeLog 1498
+MD5 1ce6cc669039f0c9fde24d7a4de13be5 ChangeLog 1761
 MD5 7942d753e9ae00567c6a9f7de0242d53 files/digest-lablgtk-1.2.6 65
 MD5 b5ae3dc8963ec992c47b24ec7b529377 files/digest-lablgtk-2.2.0 65
 MD5 58e497f72394c82abd2991deb196cb5d files/digest-lablgtk-1.2.5 65
diff --git a/dev-ml/lablgtk/files/digest-lablgtk-1.2.6 b/dev-ml/lablgtk/files/digest-lablgtk-1.2.6
new file mode 100644
index 000000000000..fb953b53c096
--- /dev/null
+++ b/dev-ml/lablgtk/files/digest-lablgtk-1.2.6
@@ -0,0 +1 @@
+MD5 7f349d9755ddb3a33fa915f5f4ecedb3 lablgtk-1.2.6.tar.gz 480949
diff --git a/dev-ml/lablgtk/lablgtk-1.2.6.ebuild b/dev-ml/lablgtk/lablgtk-1.2.6.ebuild
new file mode 100644
index 000000000000..4b3b6b570836
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-1.2.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# 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.1 2004/02/03 01:27:08 mattam Exp $
+
+IUSE="gnome opengl"
+
+DESCRIPTION="Objective CAML interface for Gtk+"
+HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html"
+LICENSE="LGPL-2.1 as-is"
+
+DEPEND="=x11-libs/gtk+-1.2*
+		>=dev-lang/ocaml-3.06
+		gnome? ( =gnome-base/libglade-0.17*
+			>=gnome-base/gnome-libs-1.4.1.7
+			media-libs/gdk-pixbuf )
+		opengl? ( >=dev-ml/lablgl-0.98
+			=x11-libs/gtkglarea-1.2* )"
+
+RDEPEND=${DEPEND}
+
+SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-${PV}.tar.gz"
+S=${WORKDIR}/${P}
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+Name="LablGTK"
+
+src_compile() {
+
+	local myconf="USE_DOTOPT=1 BINDIR=${D}/usr/bin INSTALLDIR=${D}/usr/lib/ocaml/lablgtk DLLDIR=${D}/usr/lib/ocaml/stublibs"
+
+	use gnome && myconf="$myconf USE_GNOME=1 USE_GLADE=1"
+	use opengl && myconf="$myconf USE_GL=1"
+
+	make configure $myconf || die "./configure failed"
+	make all opt || die
+}
+
+src_install () {
+	dodir /usr/bin /usr/lib/ocaml/lablgtk /usr/lib/ocaml/stublibs
+	make install || die
+	dosed /usr/bin/lablgtk
+	dodoc CHANGES COPYING README
+}
+
diff --git a/dev-ml/lablgtk/lablgtk-2.2.0.ebuild b/dev-ml/lablgtk/lablgtk-2.2.0.ebuild
index 9820882a08ad..11222435f212 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 Technologies, Inc.
 # 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.1 2004/01/22 22:27:38 mattam Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/lablgtk-2.2.0.ebuild,v 1.2 2004/02/03 01:27:08 mattam Exp $
 
 IUSE="gnome opengl debug glade svg"
 
@@ -9,7 +9,7 @@ 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.2*
+DEPEND=">=x11-libs/gtk+-2.2*
 	>=dev-lang/ocaml-3.07
 	svg? ( >=gnome-base/librsvg-2.2* )
 	glade? ( >=gnome-base/libglade-2.0.1 )