version bump

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

3 files changed, 100 insertions, 5 deletions

diff --git a/dev-ml/lablgl/ChangeLog b/dev-ml/lablgl/ChangeLog
index 28244106d29e..396aadb108ff 100644
--- a/dev-ml/lablgl/ChangeLog
+++ b/dev-ml/lablgl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/lablgl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.52 2009/06/21 13:29:11 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.53 2009/06/22 08:22:06 aballier Exp $
+
+*lablgl-1.04 (22 Jun 2009)
+
+  22 Jun 2009; Alexis Ballier <aballier@gentoo.org> +lablgl-1.04.ebuild:
+  version bump
 
   21 Jun 2009; Alexis Ballier <aballier@gentoo.org> lablgl-1.03-r1.ebuild:
   define eapi before inherit and explicitly assign rdepend
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index 18ab546658b2..a0f7f1d77307 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -3,13 +3,15 @@ Hash: SHA1
 
 AUX lablgl-1.03-tk8.5.patch 534 RMD160 af4527af9f0870c5a6c7b112d4ba0802fe121990 SHA1 22754c689cf7641d07aa8f98ca43b891b8316a2b SHA256 219d195d385c701601d04b9b5c74bd2caa3e2712c79982dc9b371df0b8eba8e8
 DIST lablgl-1.03.tar.gz 389404 RMD160 b4214c2ca6e88d6dc6ebe09b1ca8c60cc5341e0c SHA1 f86de74e4f14d8a636fa87d9d4307ab35a214049 SHA256 f4dcb28cb11e9a0791ba4d35eb86d9dcb19d8d4d0f3171dd18ede4c8d5e002db
+DIST lablgl-1.04.tar.gz 410525 RMD160 d623514e2f1b1b2a1e71323aae4874f2beb3db6d SHA1 80e8bf4deaade52372a64fe1e93713b4a49e9171 SHA256 3fedf5537069481b95836e8495380c742af7b87cfecd105fff1b98e40cac3b3e
 EBUILD lablgl-1.03-r1.ebuild 3043 RMD160 8bf628ced787a5eb3c1b514beaad79b1d94bf148 SHA1 d7bf8d24832a3be2658f16e9ca0f3d09aca9cfc1 SHA256 7cd3c51525b7c6825e1d8103ade855369f12fa86556edccfb299cd3e2b372d7b
-MISC ChangeLog 7239 RMD160 a38cb2d830d0395f05e515c51f022651720de83d SHA1 0323ef565749e112c7500bffc7f5805c963c08d5 SHA256 83e8789e830d447e35f8a384340047558bda076588b1d87ef09efd34b13782e4
+EBUILD lablgl-1.04.ebuild 2372 RMD160 b06d89beb854d8b665b0aeaf7d12d8a3b4205dc3 SHA1 7068061e9cc4062c11e80a62c0812f1dcf624866 SHA256 316017023263dc4818e97f476bd5428c9b290f3a4481ca11b8a6c524a036d8ca
+MISC ChangeLog 7356 RMD160 88f8571dd3315b67022020e565795b8b89c76e1b SHA1 78adbcc3e5fec17c7e7a0a0ada60a9e36f982001 SHA256 adbf360b2451fbf3ea69175e8801faf13f70d29bbadd5143eda27695834e1011
 MISC metadata.xml 157 RMD160 30153301a2a5cca5547a6e47941aae2895837613 SHA1 66e87d50f913856e703f3ee29841b03332af40db SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAko+NaoACgkQvFcC4BYPU0oxdQCdHTnRkcAe3d0XoexyiVsKSFc3
-KlcAnR5cTu8YIK7nDxnigqkvfKp7cxki
-=fzfc
+iEYEARECAAYFAko/PyUACgkQvFcC4BYPU0p6agCgvgV2+rGsacdNZHw4iOfwlfCA
+F4MAn119Q4EXyoLkmPzcVRPE+gqxH7HP
+=Svor
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/lablgl/lablgl-1.04.ebuild b/dev-ml/lablgl/lablgl-1.04.ebuild
new file mode 100644
index 000000000000..4fbd2d07b3d0
--- /dev/null
+++ b/dev-ml/lablgl/lablgl-1.04.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.04.ebuild,v 1.1 2009/06/22 08:22:06 aballier Exp $
+
+EAPI="2"
+
+inherit multilib eutils toolchain-funcs
+
+IUSE="doc glut +ocamlopt tk"
+
+DESCRIPTION="Objective CAML interface for OpenGL"
+HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
+LICENSE="BSD"
+
+RDEPEND=">=dev-lang/ocaml-3.10.2[tk?,ocamlopt?]
+	virtual/opengl
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libX11
+	glut? ( virtual/glut )
+	tk? ( >=dev-lang/tcl-8.3
+	>=dev-lang/tk-8.3 )"
+DEPEND="${RDEPEND}"
+
+SRC_URI="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
+S=${WORKDIR}/lablGL-${PV}
+
+src_configure() {
+	# make configuration file
+	echo "BINDIR=/usr/bin" > Makefile.config
+	echo "GLLIBS = -lGL -lGLU" >> Makefile.config
+	if use glut; then
+		echo "GLUTLIBS = -lglut" >> Makefile.config
+	else
+		echo "GLUTLIBS = " >> Makefile.config
+	fi
+	echo "XLIBS = -lXext -lXmu -lX11" >> Makefile.config
+	echo "RANLIB = $(tc-getRANLIB)" >> Makefile.config
+	echo 'COPTS = -c -O $(CFLAGS)' >> Makefile.config
+	echo 'INCLUDES = $(TKINCLUDES) $(GLINCLUDES) $(XINCLUDES)' >> Makefile.config
+}
+
+src_compile() {
+	if use tk; then
+		emake -j1 togl || die "failed to build togl"
+		if use ocamlopt; then
+			emake -j1 toglopt || die "failed to build native code togl"
+		fi
+	fi
+
+	emake -j1 lib || die "failed to build the library"
+	if use ocamlopt; then
+		emake -j1 libopt || die "failed to build native code library"
+	fi
+
+	if use glut; then
+		emake -j1 glut || die "failed to build glut"
+		if use ocamlopt; then
+			emake -j1 glutopt || die "failed to build native code glutopt"
+		fi
+	fi
+}
+
+src_install () {
+	# Makefile do not use mkdir so the library is not installed
+	# but copied as a 'stublibs' file.
+	dodir /usr/$(get_libdir)/ocaml/stublibs
+
+	# Same for lablglut's toplevel
+	dodir /usr/bin
+
+	BINDIR=${D}/usr/bin
+	BASE=${D}/usr/$(get_libdir)/ocaml
+	emake BINDIR="${BINDIR}" INSTALLDIR="${BASE}/lablGL" DLLDIR="${BASE}/stublibs" install || die "make install failed"
+
+	dodoc README CHANGES
+
+	if use doc ; then
+		insinto /usr/share/doc/${PF}
+		mv Togl/examples{,.togl}
+		doins -r Togl/examples.togl
+
+		mv LablGlut/examples{,.glut}
+		doins -r LablGlut/examples.glut
+	fi
+}