--- oldebuild	2003-12-17 14:12:18.000000000 +0100
+++ opendx-4.3.2.ebuild	2003-12-22 13:07:30.000000000 +0100
@@ -7,10 +7,11 @@
 # Otherwise it will be autodetected from /usr/src/linux.
 
 inherit eutils
+inherit flag-o-matic
 
 DESCRIPTION="A 3D data visualization tool"
 HOMEPAGE="http://www.opendx.org/"
-SRC_URI="${P/open}.tar.gz
+SRC_URI="${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
@@ -26,26 +27,19 @@
 KEYWORDS="~x86"
 RESTRICT="fetch"
 
-# HDF4 is not in portage yet, but HDF5 is.
-# nor CDF (http://nssdc.gsfc.nasa.gov/cdf/cdf_home.html)
-# nor jasper (http://www.ece.uvic.ca/~mdadams/jasper/)
-# http://opendx.org/compiling-libs.html
-# http://opendx.org/compiling-dx.html
+IUSE="hdf cdf netcdf tiff imagemagick" # java"
 
-RDEPEND="virtual/x11
+DEPEND="virtual/x11
 		virtual/motif
-		hdf? dev-libs/hdf
-		cdf? app-sci/cdf
-		netcdf? app-sci/netcdf
-		media-gfx/jasper
-		imagemagick? >=media-gfx/imagemagick-5.3.3
-		tiff? media-libs/tiff
-		java? virtual/jdk"
-
-# Waiting for this to work
-#RDEPEND="${RDEPEND}
-#		imagemagick? ( tiff? media-gfx/imagemagick[tiff] )
-#		similar w/ jpeg, png, mpeg, jbig
+		hdf? ( dev-libs/hdf )
+		cdf? ( app-sci/cdf )
+		netcdf? ( app-sci/netcdf )
+		media-libs/jasper
+		tiff? ( media-libs/tiff )
+		imagemagick? ( >=media-gfx/imagemagick-5.3.4 )"
+# java support gives some trouble - deprecated api and other unresolved symbols
+#		java? ( virtual/jdk
+#				dev-java/java-config )"
 
 S=${WORKDIR}/${P/open}
 
@@ -80,19 +74,27 @@
 	# If you are using Lesstif instead of Motif, you may need to create
 	# symbolic links in /usr/include to /usr/X11R6/include/Xm and /usr/X11R/X11.
 
-	econf \
-		`use_with hdf` \
+	# with gcc 3.3.2 I had an infinite loop on src/exec/libdx/zclipQ.c
+	append-flags -fno-strength-reduce
+
+	# szlib is used by hdf package, have to link with it here aswell
+
+	local GENTOOARCH="${ARCH}"
+	#opendx uses this variable
+	unset ARCH
+#	use java && myconf="${myconf} JNIPATH=$(java-config -O)/include:$(java-config -O)/include/linux"
+	econf LIBS="-lsz" \
 		`use_with cdf` \
 		`use_with netcdf` \
-		`use_with java javadx` \
-		`use_with imagemagick magick` \
+		`use_with hdf` \
 		`use_with tiff` \
+		`use_with imagemagick magick` \
 		${myconf} || die
 
-	# If you are using Lesstif, check include/dxconfig.h after you configure
-	# to make sure USING_LESSTIF is set to 1
+#		`use_with java javadx` 
 
 	emake || die
+	ARCH="${GENTOOARCH}"
 }
 
 src_install() {