--- old/sci-libs/gdal/gdal-1.5.1.ebuild	2008-05-21 21:06:52.000000000 +0200
+++ old/sci-libs/gdal/gdal-1.5.1.ebuild	2008-06-16 11:45:32.000000000 +0200
@@ -5,8 +5,8 @@ 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
 
-IUSE="curl debug doc fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf \
-odbc png ogdi perl postgres python ruby sqlite threads"
+IUSE="curl debug doc ecw fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf \
+occi odbc png ogdi perl postgres python ruby sqlite threads"
 
 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="http://www.gdal.org/"
@@ -15,8 +15,6 @@ 
 SLOT="0"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-# need to get these arches updated on several libs first
-#KEYWORDS="~alpha ~hppa"
 
 RDEPEND=">=sys-libs/zlib-1.1.4
 	>=media-libs/tiff-3.7.0
@@ -43,7 +41,8 @@ 
 	mysql? ( virtual/mysql )
 	odbc?   ( dev-db/unixODBC )
 	geos?   ( >=sci-libs/geos-2.2.1 )
-	sqlite? ( >=dev-db/sqlite-3 )"
+	sqlite? ( >=dev-db/sqlite-3 )
+    ecw? ( sci-libs/libecwj2 )"
 
 DEPEND="${RDEPEND}
 	ruby? ( >=dev-lang/swig-1.3.28 )
@@ -101,9 +100,14 @@ 
 	    $(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \
 	    $(use_with sqlite sqlite3) $(use_with jpeg2k jasper) $(use_with odbc) \
 	    $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
-	    $(use_enable debug)"
+	    $(use_with ecw) $(use_enable debug)"
 
 	# It can't find this
+	if useq occi ; then
+        use_conf="--with-oci-include=${ORACLE_HOME}/include \
+                  --with-oci-lib=${ORACLE_HOME}/lib ${use_conf}"
+	fi
+
 	if useq ogdi ; then
 	    use_conf="--with-ogdi=/usr/$(get_libdir) ${use_conf}"
 	fi
@@ -123,6 +127,9 @@ 
 		${use_conf}"
 	fi
 
+	# Force use of largefiles
+	append-flags "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
+
 	# Fix doc path just in case
 	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" \
 	    GDALmake.opt.in || die "sed gdalmake.opt failed"