Readd more modularity, bug #204121

Package-Manager: portage-2.1.4

3 files changed, 44 insertions, 23 deletions

diff --git a/dev-ml/lablgl/ChangeLog b/dev-ml/lablgl/ChangeLog
index b0242987d9a8..2422976e1e55 100644
--- a/dev-ml/lablgl/ChangeLog
+++ b/dev-ml/lablgl/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/lablgl
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.42 2008/01/02 20:13:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/ChangeLog,v 1.43 2008/01/12 19:13:19 aballier Exp $
+
+  12 Jan 2008; Alexis Ballier <aballier@gentoo.org> lablgl-1.03.ebuild:
+  Readd more modularity, bug #204121
 
   02 Jan 2008; Alexis Ballier <aballier@gentoo.org> lablgl-1.03.ebuild:
   Add support to not build with ocamlopt
diff --git a/dev-ml/lablgl/Manifest b/dev-ml/lablgl/Manifest
index 39178a5310ab..aa921f549f54 100644
--- a/dev-ml/lablgl/Manifest
+++ b/dev-ml/lablgl/Manifest
@@ -11,14 +11,14 @@ EBUILD lablgl-1.00.ebuild 2240 RMD160 c835af0dcf830c14b332344ca6014a58d5603c7b S
 MD5 f42e1acc32bbbe2599cb3a7c0164a522 lablgl-1.00.ebuild 2240
 RMD160 c835af0dcf830c14b332344ca6014a58d5603c7b lablgl-1.00.ebuild 2240
 SHA256 9ca8815ad99d7ca679325034acb74401191917367bb3296dc1aead6a354ca439 lablgl-1.00.ebuild 2240
-EBUILD lablgl-1.03.ebuild 2477 RMD160 5285553b1208b9d385b2f9912920f9bcd6a394ab SHA1 511698eb623dc8168423d16dbdd00b5734b9dc35 SHA256 c13cf4fda046f875dd6a9d996b35b1e7cac155c12c99b41a8e894ede17d4c9cf
-MD5 c6f5660c98e4e95faee2cd7418672a96 lablgl-1.03.ebuild 2477
-RMD160 5285553b1208b9d385b2f9912920f9bcd6a394ab lablgl-1.03.ebuild 2477
-SHA256 c13cf4fda046f875dd6a9d996b35b1e7cac155c12c99b41a8e894ede17d4c9cf lablgl-1.03.ebuild 2477
-MISC ChangeLog 5927 RMD160 851538719a1dc99ba449e6b6d15e4acc72c2b116 SHA1 48cbcc20703ca9a49c3f08126c38d5f4aa0ef323 SHA256 ec09804c6f4ea93061f1fbab8a5a2a27ec17274dceb19f4aa42c8362799b4859
-MD5 f0da21897fae4c7e6d465cd1d5ba9d9b ChangeLog 5927
-RMD160 851538719a1dc99ba449e6b6d15e4acc72c2b116 ChangeLog 5927
-SHA256 ec09804c6f4ea93061f1fbab8a5a2a27ec17274dceb19f4aa42c8362799b4859 ChangeLog 5927
+EBUILD lablgl-1.03.ebuild 2944 RMD160 c287bc602fd7871b307e7d28c3038593a2c2a211 SHA1 1cd89ebd6ebc2590a58ca87b806f9818ea58d899 SHA256 ce9e828e4637c8aeace090df03da7258b7d0505148690f83cdee483e542b027a
+MD5 3abb22dd806e6c2df68f5a57d6f65790 lablgl-1.03.ebuild 2944
+RMD160 c287bc602fd7871b307e7d28c3038593a2c2a211 lablgl-1.03.ebuild 2944
+SHA256 ce9e828e4637c8aeace090df03da7258b7d0505148690f83cdee483e542b027a lablgl-1.03.ebuild 2944
+MISC ChangeLog 6037 RMD160 66904b02ba08af2e272d8c26d1c12f8c206d1529 SHA1 3e1367218735de1470db384f5da7fb77c2c205d1 SHA256 75ba81da976383c42105a6dea2af48ead82c6ac800a8b98c5ef9c67ff81fbe96
+MD5 e357aa91765783761f440bd7b859ee64 ChangeLog 6037
+RMD160 66904b02ba08af2e272d8c26d1c12f8c206d1529 ChangeLog 6037
+SHA256 75ba81da976383c42105a6dea2af48ead82c6ac800a8b98c5ef9c67ff81fbe96 ChangeLog 6037
 MISC metadata.xml 157 RMD160 30153301a2a5cca5547a6e47941aae2895837613 SHA1 66e87d50f913856e703f3ee29841b03332af40db SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799
 MD5 648a541494aceee26dbcfd76164f37ea metadata.xml 157
 RMD160 30153301a2a5cca5547a6e47941aae2895837613 metadata.xml 157
@@ -30,9 +30,9 @@ MD5 488e0dc9fa972b594e5a858ff85901d4 files/digest-lablgl-1.03 235
 RMD160 5e16b4ac06ff297c38088fabb50627198ebb916c files/digest-lablgl-1.03 235
 SHA256 9ab68e91cf52b83ee9ff62ad4d639f8f0d32a177de138ee2bca1502b36d74d3a files/digest-lablgl-1.03 235
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkd78FkACgkQvFcC4BYPU0rFhgCgwRDX+OaOfMGz22xB0CvTkEzA
-R44AniByioosLAXXl89YJAbcEZ9NR6z9
-=OSzw
+iD8DBQFHiRGivFcC4BYPU0oRAqJcAKDATOCEFKxeHSyRLzgkCujatQlCGgCfTDBR
+KbzeNVeHjMbLaOsZJxfKeyc=
+=kfME
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/lablgl/lablgl-1.03.ebuild b/dev-ml/lablgl/lablgl-1.03.ebuild
index eaf71215facd..e81d52bb0a51 100644
--- a/dev-ml/lablgl/lablgl-1.03.ebuild
+++ b/dev-ml/lablgl/lablgl-1.03.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.03.ebuild,v 1.2 2008/01/02 20:13:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/lablgl/lablgl-1.03.ebuild,v 1.3 2008/01/12 19:13:19 aballier Exp $
 
 inherit multilib eutils toolchain-funcs
 
 EAPI="1"
 
-IUSE="doc +ocamlopt"
+IUSE="doc glut +ocamlopt tk"
 
 DESCRIPTION="Objective CAML interface for OpenGL"
 HOMEPAGE="http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html"
@@ -17,16 +17,16 @@ DEPEND=">=dev-lang/ocaml-3.05
 	x11-libs/libXext
 	x11-libs/libXmu
 	x11-libs/libX11
-	virtual/glut
-	>=dev-lang/tcl-8.3
-	>=dev-lang/tk-8.3"
+	glut? ( virtual/glut )
+	tk? ( >=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"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~sparc ~x86 ~x86-fbsd"
 
 pkg_setup() {
-	if ! built_with_use dev-lang/ocaml tk ; then
+	if use tk && ! built_with_use dev-lang/ocaml tk ; then
 		eerror "You don't have ocaml compiled with tk support"
 		eerror ""
 		eerror "lablgl requires ocaml be built with tk support."
@@ -47,15 +47,33 @@ src_compile() {
 	# make configuration file
 	echo "BINDIR=/usr/bin" > Makefile.config
 	echo "GLLIBS = -lGL -lGLU" >> Makefile.config
-	echo "GLUTLIBS = -lglut" >> 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
 
-	emake -j1 || die "failed to build"
-	if use ocamlopt; then
-		emake -j1 opt || die "failed to build opt"
+	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 useocamlopt; 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
 }