Making szip dependency optional

4 files changed, 124 insertions, 3 deletions

diff --git a/media-gfx/opendx/ChangeLog b/media-gfx/opendx/ChangeLog
index 2f851e4e73bd..b03b4ceb4d4f 100644
--- a/media-gfx/opendx/ChangeLog
+++ b/media-gfx/opendx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/opendx
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/opendx/ChangeLog,v 1.3 2004/03/21 20:48:51 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opendx/ChangeLog,v 1.4 2004/05/24 11:35:26 phosphan Exp $
+
+*opendx-4.3.2-r1 (24 May 2004)
+
+  24 May 2004; Patrick Kursawe <phosphan@gentoo.org> opendx-4.3.2-r1.ebuild:
+  Making szip dependency optional
 
   16 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> opendx-4.3.2.ebuild:
   Fixing bug #44727 by adding szip as dependency.
diff --git a/media-gfx/opendx/Manifest b/media-gfx/opendx/Manifest
index f437de683d3a..25c3052df063 100644
--- a/media-gfx/opendx/Manifest
+++ b/media-gfx/opendx/Manifest
@@ -1,4 +1,6 @@
-MD5 ae8192bf7ac4a4953cad8810a305e005 ChangeLog 640
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 1cddadf1900304815058f8c2c5772195 opendx-4.3.2.ebuild 2898
+MD5 f9851b8b0f0e2332b3bd7c3c870199e5 opendx-4.3.2-r1.ebuild 2909
+MD5 318b95ab07305ca40cebd782cf4cf724 ChangeLog 787
+MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 e8b3b97f7766dc0b83d6dfd1cd0b753e files/digest-opendx-4.3.2 61
+MD5 e8b3b97f7766dc0b83d6dfd1cd0b753e files/digest-opendx-4.3.2-r1 61
diff --git a/media-gfx/opendx/files/digest-opendx-4.3.2-r1 b/media-gfx/opendx/files/digest-opendx-4.3.2-r1
new file mode 100644
index 000000000000..189444d56482
--- /dev/null
+++ b/media-gfx/opendx/files/digest-opendx-4.3.2-r1
@@ -0,0 +1 @@
+MD5 201afdd86a5ddcfda0dc60fc7b6d3fea dx-4.3.2.tar.gz 9904514
diff --git a/media-gfx/opendx/opendx-4.3.2-r1.ebuild b/media-gfx/opendx/opendx-4.3.2-r1.ebuild
new file mode 100644
index 000000000000..b3c8b3a642cd
--- /dev/null
+++ b/media-gfx/opendx/opendx-4.3.2-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/opendx/opendx-4.3.2-r1.ebuild,v 1.1 2004/05/24 11:35:26 phosphan Exp $
+
+# Set SMP="no" to force disable of SMP compilation.
+# Set SMP="yes" to force enable of SMP compilation.
+# Otherwise it will be autodetected from /usr/src/linux.
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="A 3D data visualization tool"
+HOMEPAGE="http://www.opendx.org/"
+SRC_URI="http://opendx.npaci.edu/source/${P/open}.tar.gz"
+
+#	There are a few jar files that can be added to enhance JX.
+#	These are java40.jar from the Netscape libraries
+#	(we've provided them in the OpenDX.org lib area) nscosmop211.jar
+#	from the Cosmo Player libs.
+#	http://opendx.npaci.edu/libs/
+#SRC_URI="${SRC_URI}
+#	http://opendx.npaci.edu/libs/netscape-java40.tar.gz
+#	http://opendx.npaci.edu/libs/cosmoplayer-jar.tar.gz"
+
+LICENSE="IPL-1"
+SLOT="0"
+# Should work on x86, ppc, alpha at least
+KEYWORDS="~x86 ~ppc"
+
+IUSE="hdf cdf netcdf tiff imagemagick szip" # java doc"
+
+DEPEND="virtual/x11
+	x11-libs/openmotif
+	szip? ( dev-libs/szip )
+	hdf? ( dev-libs/hdf )
+	cdf? ( app-sci/cdf )
+	netcdf? ( app-sci/netcdf )
+	tiff? ( media-libs/tiff )
+	imagemagick? ( >=media-gfx/imagemagick-5.3.4 )"
+# waiting on bug #36349 for media-libs/jasper in imagemagick
+# java support gives some trouble - deprecated api and other unresolved symbols
+#		java? ( virtual/jdk
+#				dev-java/java-config )"
+
+S="${WORKDIR}/${P/open}"
+
+smp() {
+	has "$1" "${SMP}"
+}
+
+smp_check() {
+	if [ -e /usr/src/linux/.config ]
+	then
+		if [ "`grep SMP /usr/src/linux/.config | cut -d= -f2`" = "y" ]
+		then
+			return 0
+		else
+			return 1
+		fi
+	else
+		die "SMP check failed. Make sure /usr/src/linux/.config exists."
+	fi
+}
+
+src_compile() {
+	local myconf="--with-x \
+		--host=${CHOST}"
+
+	# Check for SMP
+	# This needs to be done for /usr/src/linux, NOT the running kernel
+	# Allow override using smp().
+	if smp no
+	then
+		myconf="${myconf} --disable-smp-linux"
+		einfo "Disabling SMP capabilities"
+	elif smp yes || smp_check
+	then
+		myconf="${myconf} --enable-smp-linux"
+		einfo "Enabling SMP capabilities"
+	else
+		myconf="${myconf} --disable-smp-linux"
+		einfo "Disabling SMP capabilities"
+	fi
+
+	# with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
+	append-flags -fno-strength-reduce
+
+
+	local GENTOOARCH="${ARCH}"
+	# opendx uses this variable
+	unset ARCH
+
+	local morelibs=""
+	use szip && morelibs="-lsz"
+	# use java && myconf="${myconf} JNIPATH=$(java-config -O)/include:$(java-config -O)/include/linux"
+	econf LIBS="${morelibs}" \
+		`use_with cdf` \
+		`use_with netcdf` \
+		`use_with hdf` \
+		`use_with tiff` \
+		`use_with imagemagick magick` \
+		${myconf} || die
+
+	#		`use_with java javadx` 
+	# This is broken
+	#	`use_enable doc installhtml`
+
+	make || die
+	ARCH="${GENTOOARCH}"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}