Reworked ebuild and added metadata.xml.

4 files changed, 90 insertions, 2 deletions

diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index fb5999154a06..b67e767ca196 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -1,8 +1,9 @@
+MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
 MD5 55fee7b83f4be8f4c3eda525b2f4614b lablgl-0.97.ebuild 1100
-MD5 c8a1c5461c0d6944906bca3eec70450f ChangeLog 2231
+MD5 72fa591c7d3106356f08d13730c4ea05 ChangeLog 2455
 MD5 1b082f4db0678bfb9b1b54cfe41470e2 lablgl-0.98.ebuild 1757
 MD5 c43d56bd957cec6f22e4a01d27e98f06 lablgl-0.99.ebuild 1853
-MD5 7b7c6254203b76854298c5999672c751 lablgl-0.99-r1.ebuild 1891
+MD5 56830e6ef23cdf12790c7cac22c3c183 lablgl-0.99-r1.ebuild 1936
 MD5 b5f4f06ceeac8ce19b70d33f538b885a files/LablGL-0.97-Makefile-destdir.patch 1350
 MD5 6ef239cb00bd6b3b6b60356f31adea47 files/digest-lablgl-0.97 63
 MD5 007f6ebc610ac1d9f52d6396f5b430e1 files/LablGL-0.98-Makefile-destdir.patch 1540
diff --git a/dev-ml/lablgl/files/digest-lablgl-0.99-r1 b/dev-ml/lablgl/files/digest-lablgl-0.99-r1
new file mode 100644
index 000000000000..028acb4ea1a9
--- /dev/null
+++ b/dev-ml/lablgl/files/digest-lablgl-0.99-r1
@@ -0,0 +1,3 @@
+MD5 5b5ea7889536246c58a5e747d61d6d14 lablgl-0.99.tar.gz 263510
+MD5 ee11755055492e0a9e60cb51fae657bf LablGL-0.99-Makefile-destdir.patch 1450
+MD5 7b95aa62137ce4a457a8603803892bcd LablGL-0.99-Makefile.config 1422
diff --git a/dev-ml/lablgl/lablgl-0.99-r1.ebuild b/dev-ml/lablgl/lablgl-0.99-r1.ebuild
new file mode 100644
index 000000000000..2e5ccc433d98
--- /dev/null
+++ b/dev-ml/lablgl/lablgl-0.99-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-0.99-r1.ebuild,v 1.1 2004/02/03 01:22:40 mattam Exp $
+
+IUSE="tcltk"
+
+DESCRIPTION="Objective CAML interface for OpenGL"
+HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
+LICENSE="as-is"
+
+DEPEND=">=dev-lang/ocaml-3.05
+	virtual/opengl
+	tcltk? ( >=dev-lang/tcl-8.3*
+			 >=dev-lang/tk-8.3* )"
+
+SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz
+	mirror://gentoo/LablGL-0.99-Makefile-destdir.patch
+	mirror://gentoo/LablGL-0.99-Makefile.config"
+S=${WORKDIR}/lablGL-${PV}
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc"
+
+#need to do some mangling to keep ebuild name lowercase
+#(anyway package uses mixture of upper and lower case letters)
+Name="LablGL"
+
+pkg_setup()
+{
+	if ( use tcltk )
+	then
+		#lablgl requires ocaml compiled with tk support while ocaml has it as an optional dependency
+		if ( ! which labltk )
+		then
+			eerror "It seems you don't have ocaml compiled with tk support"
+			eerror ""
+			eerror "lablgl requires ocaml be built with tk support."
+			eerror ""
+			eerror "Please make sure that ocaml is installed with tk support."
+			false;
+		fi
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+
+	# patch the makefile to include DESTDIR support
+	cd ${S} || die
+	patch -p0 < ${DISTDIR}/${Name}-${PV}-Makefile-destdir.patch || die
+}
+
+src_compile() {
+	# make configuration file
+	cp ${DISTDIR}/${Name}-${PV}-Makefile.config ${S}/Makefile.config || die
+
+	if ( use tcltk )
+	then
+		make || die
+		make opt || die
+	else
+		make lib || die
+		make libopt || die
+	fi
+}
+
+src_install () {
+	# Makefile do not use mkdir so the library is not installed 
+	# but copied as a 'stublibs' file.
+	dodir /usr/lib/ocaml/stublibs
+
+	if ( use tcltk )
+	then
+		make DESTDIR=${D} install || die
+	else
+		make DESTDIR=${D} libinstall || die
+	fi
+
+	dodoc README CHANGES COPYRIGHT
+}
diff --git a/dev-ml/lablgl/metadata.xml b/dev-ml/lablgl/metadata.xml
new file mode 100644
index 000000000000..849ed8ebf13d
--- /dev/null
+++ b/dev-ml/lablgl/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>ml</herd>
+</pkgmetadata>