--- /usr/portage/sci-libs/gdal/gdal-1.3.2.ebuild	2006-06-09 21:36:16.000000000 +0200
+++ /usr/local/portage/sci-libs/gdal/gdal-1.4.0_beta1.ebuild	2006-12-16 17:16:51.000000000 +0100
@@ -1,15 +1,16 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild,v 1.3 2006/06/09 19:22:52 nerdboy Exp $
+# $Header: $
 
 inherit eutils libtool gnuconfig distutils toolchain-funcs
 
-IUSE="jpeg png geos gif jpeg2k netcdf hdf hdf5 python ruby postgres \
+IUSE="ecw jpeg png geos gif jpeg2k netcdf hdf hdf5 python ruby postgres \
 	odbc sqlite ogdi fits gml doc debug"
 
 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="http://www.remotesensing.org/gdal/index.html"
-SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz"
+PKG="${PN}-1.4.0beta1"
+SRC_URI="http://dl.maptools.org/dl/gdal/${PKG}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
@@ -31,38 +32,41 @@
 	gml? ( dev-libs/xerces-c )
 	hdf5? ( >=sci-libs/hdf5-1.6.4 )
 	postgres? ( dev-db/postgresql )
-	|| (
-	    netcdf? ( sci-libs/netcdf )
-	    hdf? ( sci-libs/hdf )
-	)
+	netcdf? ( sci-libs/netcdf )
+	hdf? ( sci-libs/hdf )
 	jpeg2k? ( media-libs/jasper )
 	odbc?   ( dev-db/unixODBC )
 	geos?   ( >=sci-libs/geos-2.2.1 )
 	sqlite? ( >=dev-db/sqlite-3 )
+	ecw? ( sci-libs/libecwj2 )
 	doc? ( app-doc/doxygen )"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-destdir.patch || die "epatch failed"
-	epatch ${FILESDIR}/${P}-ruby-install.patch || die "epatch failed"
-	if [ $(gcc-major-version) -eq 4 ]; then
-	    epatch ${FILESDIR}/${P}-gcc4-stl.patch || die "epatch failed"
+S="${WORKDIR}/${PKG}"
+pkg_setup() {
+	if use netcdf && use hdf; then
+		einfo "Please set one USEflag between 'netcdf' and 'hdf', not both"
+		die "use netcdf && use hdf is not valid!"
 	fi
-	elibtoolize --patch-only
-	gnuconfig_update
-	if useq netcdf && useq hdf; then
+	if use hdf; then
 	    einfo	"Checking is HDF4 compiled with szip..."
 	    if built_with_use sci-libs/hdf szip ; then
-		einfo	"Found HDF4 compiled with szip. Nice."
+			einfo	"Found HDF4 compiled with szip. Nice."
 	    else
-		ewarn 	"HDF4 (sci-libs/hdf) must be compiled with szip USE flag!"
-		einfo 	"Emerge HDF with szip USE flag and then emerge GDAL."
-		die 	"HDF4 not merged with szip use flag"
+			ewarn 	"HDF4 (sci-libs/hdf) must be compiled with szip USE flag!"
+			einfo 	"Emerge HDF with szip USE flag and then emerge GDAL."
+			die 	"HDF4 not merged with szip use flag"
 	    fi
 	fi
 }
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-ruby-install.patch || die "epatch failed"
+	elibtoolize --patch-only
+	gnuconfig_update
+}
+
 src_compile() {
 	distutils_python_version
 
@@ -73,7 +77,7 @@
 	    $(use_with postgres pg) $(use_with fits cfitsio) \
 	    $(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \
 	    $(use_with sqlite) $(use_with jpeg2k jasper) $(use_with odbc) \
-	    $(use_with gml xerces) $(use_with hdf5)"
+	    $(use_with gml xerces) $(use_with hdf5) $(use_with ecw)"
 	    # mysql support temporarily disabled $(use_with mysql)
 
 	# It can't find this
@@ -122,7 +126,7 @@
 src_install() {
 	# einstall causes sandbox violations on /usr/lib/libgdal.so
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc Doxyfile.man Doxyfile HOWTO-RELEASE NEWS
+	dodoc Doxyfile HOWTO-RELEASE NEWS
 	if useq doc ; then
 	    dohtml html/* || die "install html failed"
 	    docinto ogr