--- gdl-0.8.11.ebuild	2005-12-10 18:49:26.000000000 +0000
+++ gdl-0.8.11.ebuild.current	2005-12-10 18:49:06.000000000 +0000
@@ -2,53 +2,52 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-#inherit eutils libtool
+inherit eutils 
 
-DESCRIPTION="A free IDL (Interactive Data Language) compatible incremental compiler"
+DESCRIPTION="A Interactive Data Language compatible incremental compiler"
+LICENSE="GPL"
 HOMEPAGE="http://gnudatalanguage.sourceforge.net/"
 SRC_URI="mirror://sourceforge/gnudatalanguage/${P}.tar.gz"
-LICENSE="GPL-2"
+
+
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="python fftw hdf hdf5 imagemagick netcdf fftw"
+KEYWORDS="~x86"
+IUSE="python fftw hdf hdf5 netcdf imagemagick"
 
 DEPEND=">=sys-libs/readline-4.3
 	sci-libs/gsl
 	>=sci-libs/plplot-5.3
 	imagemagick? ( media-gfx/imagemagick )
-	hdf?  ( sci-libs/hdf )
+	hdf? ( sci-libs/hdf )
 	hdf5? ( sci-libs/hdf5 )
 	netcdf? ( sci-libs/netcdf )
-	python? ( >=dev-lang/python-2.3 )
-	python? ( >=dev-python/numarray-0.9 )
-	python? ( >=dev-python/matplotlib-0.52 )
-	fftw? ( sci-libs/fftw )
-"
+	python? ( dev-lang/python
+			dev-python/numarray
+			dev-python/matplotlib )
+	fftw? ( sci-libs/fftw )"
 
 src_compile() {
-	local myconf="--without-Magick"
-	use imagemagick && myconf=" --with-Magick "
 	econf \
-	  ${myconf} \
-	  $(use_with hdf ) \
-	  $(use_with hdf5 ) \
-	  $(use_with netcdf ) \
-	  $(use_with python ) \
-	  $(use_with fftw ) \
-	  || die "econf failed"
+	  $(use_with python) \
+	  $(use_with fftw) \
+	  $(use_with hdf) \
+	  $(use_with hdf5) \
+	  $(use_with netcdf) \
+	  $(use_with imagemagick Magick) \
+	  || die "econf failed!"
+	
 	emake || die "emake failed"
 }
 
 src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodir /usr/share/${PN}
+	make DESTDIR=${D} install || die "failed to install"
+
 	insinto /usr/share/${PN}
 	doins -r src/pro
-	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO 
-	echo IDL_PATH=":/usr/share/gdl/pro:" > 99gdl
+	doins -r src/py
+	dodoc README PYTHON.txt AUTHORS ChangeLog NEWS TODO
+	
+	# add GDL provided routines to IDL_PATH
+	echo "IDL_STARTUP=/usr/share/${PN}/pro" > 99gdl
 	doenvd 99gdl
 }
-
-
-#TODO
-# - test the python modules src/py, install them.