7 files changed, 56 insertions, 102 deletions
diff --git a/dev-ml/lablgtk/ChangeLog b/dev-ml/lablgtk/ChangeLog
index f89746080339..50bb23b37daa 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.21 2004/07/14 01:35:45 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgtk/ChangeLog,v 1.22 2004/08/08 06:30:28 mattam Exp $
+
+*lablgtk-1.2.7 (08 Aug 2004)
+
+  08 Aug 2004; Matthieu Sozeau <mattam@gentoo.org> -lablgtk-1.2.3.ebuild,
+  +lablgtk-1.2.7.ebuild:
+  Remove old versions, add lablgtk-1.2.7.
 
   13 Jul 2004; Travis Tilley <lv@gentoo.org> lablgtk-1.2.6.ebuild:
   added back ~amd64 keyword
diff --git a/dev-ml/lablgtk/Manifest b/dev-ml/lablgtk/Manifest
index 1c7202b4f3d3..bff52ecbb969 100644
--- a/dev-ml/lablgtk/Manifest
+++ b/dev-ml/lablgtk/Manifest
@@ -1,11 +1,13 @@
-MD5 f1f8ee8482fca17844d5acfb983a86e6 lablgtk-1.2.6.ebuild 1252
+MD5 41d3f45afe9e4f5306ca1dcaa343f902 ChangeLog 2826
 MD5 1b8efa337442b44c994df8458e2130b3 lablgtk-1.2.3.ebuild 1212
 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 41d3f45afe9e4f5306ca1dcaa343f902 ChangeLog 2826
 MD5 845dbbef4eb685e1bfd5f9e13a03f2b8 metadata.xml 225
+MD5 b148af47d4223ae939b5f4e899284768 lablgtk-1.2.7.ebuild 1252
 MD5 424e314fd7cced60c111d5e2a220392b files/LablGTK-1.2.3-Makefile-destdir.patch 2124
 MD5 172783889b6b57cecf07de247ba7dcde files/digest-lablgtk-1.2.3 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
+MD5 a31a4824fac7faf0a0df2d8b8705b67f files/digest-lablgtk-1.2.7 65
diff --git a/dev-ml/lablgtk/files/LablGTK-1.2.3-Makefile-destdir.patch b/dev-ml/lablgtk/files/LablGTK-1.2.3-Makefile-destdir.patch
deleted file mode 100644
index 709e804e414a..000000000000
--- a/dev-ml/lablgtk/files/LablGTK-1.2.3-Makefile-destdir.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/Makefile.orig	2001-12-12 11:53:50.000000000 +0100
-+++ src/Makefile	2002-05-29 20:49:36.000000000 +0200
-@@ -132,28 +132,26 @@
- 	rm -f testcc.ml
- 
- install:
--	if test -d $(INSTALLDIR); then : ; else mkdir -p $(INSTALLDIR); fi
--	if test `grep -s -c '^$(INSTALLDIR)$$' $(LIBDIR)/ld.conf` = 0; then \
--	    echo $(INSTALLDIR) >> $(LIBDIR)/ld.conf; \
--	fi
--	cp $(ALLOBJS:.cmo=.cmi) $(THOBJS:.cmo=.cmi) $(INSTALLDIR)
--	cp -p *.mli $(INSTALLDIR)
--	cp -p $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) $(INSTALLDIR)
--	cp $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS) $(INSTALLDIR)
--	cp $(CLIBS) $(INSTALLDIR)
--	cp lablgtktop lablgtktop_t varcc $(INSTALLDIR)
--	cp -p *.h $(INSTALLDIR)
--	cp lablgtk $(BINDIR)
--	if test -f dlllablgtk.so; then cp $(CLIBS:lib%.a=dll%.so) $(INSTALLDIR); fi
--	if test -f lablgladecc; then cp lablgladecc $(BINDIR); fi
-+	mkdir -p $(DESTDIR)$(INSTALLDIR)
-+	mkdir -p $(DESTDIR)$(BINDIR)
-+	cp $(ALLOBJS:.cmo=.cmi) $(THOBJS:.cmo=.cmi) $(DESTDIR)$(INSTALLDIR)
-+	cp -p *.mli $(DESTDIR)$(INSTALLDIR)
-+	cp -p $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) $(DESTDIR)$(INSTALLDIR)
-+	cp $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS) $(DESTDIR)$(INSTALLDIR)
-+	cp $(CLIBS) $(DESTDIR)$(INSTALLDIR)
-+	cp lablgtktop lablgtktop_t varcc $(DESTDIR)$(INSTALLDIR)
-+	cp -p *.h $(DESTDIR)$(INSTALLDIR)
-+	cp lablgtk $(DESTDIR)$(BINDIR)
-+	if test -f dlllablgtk.so; then cp $(CLIBS:lib%.a=dll%.so) $(DESTDIR)$(INSTALLDIR); fi
-+	if test -f lablgladecc; then cp lablgladecc $(DESTDIR)$(BINDIR); fi
- 	if test -f lablgtk.cmxa; then $(MAKE) installopt; fi
- 
- installopt:
--	cp $(MLLIBS:.cma=.cmxa) $(MLLIBS:.cma=.a) $(INSTALLDIR)
--	cp $(ALLOBJS:.cmo=.cmx) $(INSTALLDIR)
--	cp $(INITOBJS:.cmo=.o) $(INSTALLDIR)
-+	cp $(MLLIBS:.cma=.cmxa) $(MLLIBS:.cma=.a) $(DESTDIR)$(INSTALLDIR)
-+	cp $(ALLOBJS:.cmo=.cmx) $(DESTDIR)$(INSTALLDIR)
-+	cp $(INITOBJS:.cmo=.o) $(DESTDIR)$(INSTALLDIR)
- 	if test -f gtkThread.cmx; then \
--	   cp $(THOBJS:.cmo=.cmx) $(THOBJS:.cmo=.o) $(INSTALLDIR); fi
-+	   cp $(THOBJS:.cmo=.cmx) $(THOBJS:.cmo=.o) $(DESTDIR)$(INSTALLDIR); fi
- 
- lablgtk.cma: $(MLOBJS) $(COBJS)
- 	$(LIBRARIAN) -o lablgtk $(MLOBJS) $(COBJS) $(GTKLIBS)
diff --git a/dev-ml/lablgtk/files/digest-lablgtk-1.2.3 b/dev-ml/lablgtk/files/digest-lablgtk-1.2.3
deleted file mode 100644
index aefaf461905d..000000000000
--- a/dev-ml/lablgtk/files/digest-lablgtk-1.2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 010448a814da16f8cff07176aa0fb415 lablgtk-1.2.3.tar.gz 433267
diff --git a/dev-ml/lablgtk/files/digest-lablgtk-1.2.7 b/dev-ml/lablgtk/files/digest-lablgtk-1.2.7
new file mode 100644
index 000000000000..6f72450211ed
--- /dev/null
+++ b/dev-ml/lablgtk/files/digest-lablgtk-1.2.7
@@ -0,0 +1 @@
+MD5 73a797e3a459190fdcaa8288935f6fb9 lablgtk-1.2.7.tar.gz 468443
diff --git a/dev-ml/lablgtk/lablgtk-1.2.3.ebuild b/dev-ml/lablgtk/lablgtk-1.2.3.ebuild
deleted file mode 100644
index cc38aa7d5cb5..000000000000
--- a/dev-ml/lablgtk/lablgtk-1.2.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.3.ebuild,v 1.14 2004/07/14 16:29:32 agriffis 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.10-r7
-	>=dev-lang/ocaml-3.04
-	gnome? ( >=gnome-base/libglade-0.17-r6
-	         >=gnome-base/gnome-libs-1.4.1.7 )
-	opengl? ( >=dev-ml/lablgl-0.97 >=x11-libs/gtkglarea-1.2.3 )"
-
-SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-${PV}.tar.gz"
-SLOT="1"
-KEYWORDS="x86 ~ppc ~sparc -amd64"
-
-Name="LablGTK"
-
-src_unpack() {
-	unpack ${A}
-
-	# patch the makefile to include DESTDIR support
-	cd ${S} || die
-	patch -p0 < ${FILESDIR}/${Name}-${PV}-Makefile-destdir.patch || die
-}
-
-src_compile() {
-
-	local myconf
-
-	if use gnome; then
-		myconf="$myconf USE_GNOME=1 USE_GLADE=1"
-	fi
-
-	if use opengl; then
-		myconf="$myconf USE_GL=1"
-	fi
-
-	make configure $myconf || die "./configure failed"
-	make all opt || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc CHANGES COPYING README
-}
diff --git a/dev-ml/lablgtk/lablgtk-1.2.7.ebuild b/dev-ml/lablgtk/lablgtk-1.2.7.ebuild
new file mode 100644
index 000000000000..7a80e3d6f199
--- /dev/null
+++ b/dev-ml/lablgtk/lablgtk-1.2.7.ebuild
@@ -0,0 +1,44 @@
+# 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.7.ebuild,v 1.1 2004/08/08 06:30:28 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-1.00
+			=x11-libs/gtkglarea-1.2* )"
+
+RDEPEND=${DEPEND}
+
+SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-${PV}.tar.gz"
+SLOT="1"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64 ~hppa"
+
+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
+}
+