Fixed USE flag dependencies and configure options.

3 files changed, 55 insertions, 19 deletions

diff --git a/media-libs/openvrml/ChangeLog b/media-libs/openvrml/ChangeLog
index 4673c79c450b..934fd2be8a15 100644
--- a/media-libs/openvrml/ChangeLog
+++ b/media-libs/openvrml/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/openvrml
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openvrml/ChangeLog,v 1.5 2003/10/18 21:48:05 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openvrml/ChangeLog,v 1.6 2003/10/21 11:42:21 brandy Exp $
+
+  22 Oct 2003; Brandy Westcott brandy@gentoo.org openvrml-0.14.1.ebuild:
+  An OpenVRML overhaul. Optional functionality can now be specified through USE
+  flags; added required dependencies. Closes #31634.
 
 *openvrml-0.14.1 (18 Oct 2003)
 
diff --git a/media-libs/openvrml/Manifest b/media-libs/openvrml/Manifest
index 82f9450513b3..5f2932390f38 100644
--- a/media-libs/openvrml/Manifest
+++ b/media-libs/openvrml/Manifest
@@ -1,5 +1,5 @@
-MD5 c208b69ce218c6a303336a79cb111ddf openvrml-0.14.1.ebuild 1061
-MD5 2d0c29ff5c171815cc9e2bf5d7384993 ChangeLog 510
+MD5 3c765852a04677894bd036fd2ec7628c openvrml-0.14.1.ebuild 2079
+MD5 51955f1db9e52a84dfd062d464445fea ChangeLog 717
 MD5 06b0e40e66ea3872e8517e8331b0a1c7 openvrml-0.11.2.ebuild 1063
 MD5 1809eaa3f4dfdf64908639f65510c4ed files/digest-openvrml-0.11.2 67
 MD5 929bedd2d3187b0a4243958201862a0b files/digest-openvrml-0.14.1 68
diff --git a/media-libs/openvrml/openvrml-0.14.1.ebuild b/media-libs/openvrml/openvrml-0.14.1.ebuild
index e52729c19531..eca4efa4192e 100644
--- a/media-libs/openvrml/openvrml-0.14.1.ebuild
+++ b/media-libs/openvrml/openvrml-0.14.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/openvrml/openvrml-0.14.1.ebuild,v 1.2 2003/10/18 21:50:35 lanius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openvrml/openvrml-0.14.1.ebuild,v 1.3 2003/10/21 11:42:21 brandy Exp $
 
-IUSE="jpeg png"
+IUSE="zlib png jpeg truetype javascript java opengl doc"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="VRML97 library"
@@ -13,34 +13,66 @@ SLOT="0"
 LICENSE="LGPL-2.1 GPL-2"
 KEYWORDS="~x86 ~sparc"
 
-DEPEND="virtual/opengl
-	sys-libs/zlib
-	media-libs/glut
+DEPEND="virtual/x11
+	app-doc/doxygen
+	zlib? ( sys-libs/zlib )
 	png? ( media-libs/libpng )
-	jpeg? ( media-libs/jpeg )"
+	jpeg? ( media-libs/jpeg )
+	text? ( media-libs/freetype media-libs/fontconfig )
+	javascript? ( net-www/mozilla )
+	java? ( virtual/jdk )
+	opengl? ( virtual/opengl virtual/glut )"
 
 # TODO: add support for java via libmozjs (http://www.mozilla.org/js/spidermonkey/)
 
+pkg_setup() {
+
+	if ! use jpeg || ! use png ; then
+		einfo
+		einfo "OpenVRML will *not* be built with ImageTexture support."
+		einfo "Both 'png' and 'jpeg' must be enabled in USE flags for ImageTexture support."
+		einfo
+	fi
+}
+
 src_compile() {
 
-	use png \
-		&& myconf="${myconf} --with-libpng" \
-		|| myconf="${myconf} --without-libpng"
+	local myconf=""
+
+	use zlib \
+		&& myconf="${myconf} --enable-gzip" \
+		|| myconf="${myconf} --disable-gzip"
+
+	use png && use jpeg \
+		&& myconf="${myconf} --enable-imagetexture-node" \
+		|| myconf="${myconf} --disable-imagetexture-node"
+
+	use truetype \
+		&& myconf="${myconf} --enable-text-node" \
+		|| myconf="${myconf} --disable-text-node"
+
+	use javascript \
+		&& myconf="${myconf} --enable-script-node-javascript" \
+		|| myconf="${myconf} --disable-script-node-javascript"
+
+	use java \
+		&& myconf="${myconf} --enable-script-node-java" \
+		|| myconf="${myconf} --disable-script-node-java"
 
-	use jpeg \
-		&& myconf="${myconf} --with-libjpeg" \
-		|| myconf="${myconf} --without-libjpeg"
+	use opengl \
+		&& myconf="${myconf} --enable-gl-renderer --enable-lookat" \
+		|| myconf="${myconf} --disable-gl-renderer --disable-lookat"
 
-	./configure --with-x --prefix=/usr --without-mozjs ${myconf} || die
+	./configure --with-x --prefix=/usr ${myconf} || die "configure failed"
 
-	make || die
+	make || die "make failed"
 
 }
 
 src_install() {
 
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 
-	dodoc AUTHORS COPYING* ChangeLog NEWS README THANKS
+	dodoc AUTHORS COPYING* ChangeLog INSTALL NEWS README THANKS
 
 }