Drop togl as it does not build with recent tk versions; eapi5 and use slot deps

Package-Manager: portage-2.2.0_alpha164/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 106 insertions, 6 deletions

diff --git a/dev-ml/lablgl/ChangeLog b/dev-ml/lablgl/ChangeLog
index aea9d3b20f09..4a989888d517 100644
--- a/dev-ml/lablgl/ChangeLog
+++ b/dev-ml/lablgl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/lablgl
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.61 2012/10/06 20:46:11 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.62 2013/03/02 18:00:28 aballier Exp $
+
+*lablgl-1.04-r1 (02 Mar 2013)
+
+  02 Mar 2013; Alexis Ballier <aballier@gentoo.org> +lablgl-1.04-r1.ebuild:
+  Drop togl as it does not build with recent tk versions; eapi5 and use slot
+  deps
 
   06 Oct 2012; Alexis Ballier <aballier@gentoo.org> lablgl-1.04.ebuild:
   add missing virutal/glu dep, bug #434456
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index 43d77539b5f8..10eb82f3e736 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -2,13 +2,14 @@
 Hash: SHA256
 
 DIST lablgl-1.04.tar.gz 410525 SHA256 3fedf5537069481b95836e8495380c742af7b87cfecd105fff1b98e40cac3b3e SHA512 6ae9ed365c390e06bba45214e62ad1479f96cec8087672d543fb18bd20643be0adf52c53e3b19031976eb833880be1f30c3c705d87dea5f7ed4488b57781e084 WHIRLPOOL efb03beeb18277d374c7fbbdf32aa2be4d7f2e23c31322de2b2e37d6b636e44bb4432bdca08c401af326abc4f729c21df2551e63a90193a5bbea95d7018d05d0
+EBUILD lablgl-1.04-r1.ebuild 2457 SHA256 fb07cf744edb8b7f57190f6e3da4b96865b2165c50cea5648d3e2bbe24f07773 SHA512 4e6a2493346b7f324a12218a1f810b03aaa355436857ff5d907840ef41b1a2d3ed2a01c5ff31c6e42168777122e4f09162b605fb2e02ce82d19bcb9131accbd4 WHIRLPOOL 1ae3640ce888d39b2ee4c6bbe60654436c9fde12a67f7a42189280deae64a9f29be8ed8ae1a13d96c93cddbf48f982a545658b8cff89182adee5dd0e915a2408
 EBUILD lablgl-1.04.ebuild 2385 SHA256 60976c62cbe716609d6b24b4caa5cdbc642c7a5876089dd3b11ee48e98328e20 SHA512 d7d465915eb7973ee5f91906c5769ece8ec18fc86b5b38427a1e4468299f433a698ff2888bd27afec741018b6239d6325ae70619754ee25107e176af86caeb12 WHIRLPOOL 8d361f1ed6573a91cfd2d9c1760c05ebf60a5fb93cd2d8b359964d88088afa519331c4402ae8a40e73af7c09ecf4a1fba44eb74034cdf3caec2c8417d35a2f5a
-MISC ChangeLog 8201 SHA256 67d294dc608f4e8fc974140e7e3baf54b4b2d807610ec0f3351c3ca98e27a791 SHA512 1cf3bc393a0ab512e30aac6bced880b4a25d7c3c0d11e956ea0e96c2f53c88eca24bdf84bc2a67d77aec38bf226e88c2b37abde47c2476df79097cb9b0c8d3af WHIRLPOOL b19112975a7db06244803ef1d5879f3289da1934c9f8880136b59bd2da9a2de9175d4b2eeb463bcd3d24c6025fbd79ebcf13c19e9d7ee2af550fee4e85b38463
+MISC ChangeLog 8393 SHA256 0d549241fc9782c72802f4c1600c8f9774d7ef2e4c4d5cf2ec68039ebe6a6b57 SHA512 92170abe53992cfd3bc40425f93464f978dd3f575a4b4f67df574c180ebef935ca3afb6a50c0710b45e9d6758bf2b609b87d23b9a6bd357bcafc12b967dd3ad5 WHIRLPOOL 7c00d8fbaf51d050414135efffa106c5e8c4eb55cd527d4597ed8dbece23cde734f5f6b1505e34fb6fa0f6387e6b1df02595d5deba934b12a4b4659b1f78504f
 MISC metadata.xml 157 SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799 SHA512 5e4a17ffdcc021c3d28f9ac71f8ec0b35a243e269281ba7db2e17845d7990221040ab16db6fa13c708f7d8db154d8d65d2d7f80f3a7dd84bc001449369738f2f WHIRLPOOL 79ae48d5df04eab0d90848c85d48c62b0e3901cc5c9a74d0b85de5becac5de0f55a3c9c719bf716bb757cfd8be306a222f247a0749fb346f6589893698b25c63
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBwwsYACgkQvFcC4BYPU0pOdACfVVzD3Mqh8ODWrvT6hsTP7w0q
-Ia0AoLVWotmZsXNevtd4+9/wiMrk9ytj
-=dt4v
+iEYEAREIAAYFAlEyPj0ACgkQvFcC4BYPU0oXBgCgsuMAfEzjisBXvN2ZgDl+R3vO
+ehEAnjOKkqIckw7WOUXn9xo6vXfYdWQA
+=bGqC
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/lablgl/lablgl-1.04-r1.ebuild b/dev-ml/lablgl/lablgl-1.04-r1.ebuild
new file mode 100644
index 000000000000..cc7977a39b26
--- /dev/null
+++ b/dev-ml/lablgl/lablgl-1.04-r1.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.04-r1.ebuild,v 1.1 2013/03/02 18:00:28 aballier Exp $
+
+EAPI="5"
+
+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"
+
+#	>=dev-lang/ocaml-3.10.2:=[tk?,ocamlopt?]
+RDEPEND="
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libX11
+	virtual/opengl
+	virtual/glu
+	glut? ( media-libs/freeglut )
+	"
+#	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/${PV}"
+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=${ED}/usr/bin
+	BASE=${ED}/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
+}