removed grass deps and added new version

(Portage version: 2.0.53_rc5)

7 files changed, 367 insertions, 28 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index d798c69f59ec..01ab796828ed 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.15 2005/10/13 06:46:23 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.16 2005/10/25 07:22:14 nerdboy Exp $
+
+*gdal-1.3.1 (25 Oct 2005)
+
+  25 Oct 2005; Steve Arnold <nerdboy@gentoo.org>
+  +files/gdal-1.3.1-installpathfix.patch, gdal-1.2.6-r4.ebuild,
+  gdal-1.3.0-r1.ebuild, +gdal-1.3.1.ebuild:
+  Removed grass deps and added new version (really fixes bug 106287).
+  New ebuild coming for gdal-grass driver (mysql is currently borked
+  on 1.3.1).
 
   13 Oct 2005; Steve Arnold <nerdboy@gentoo.org> gdal-1.2.6-r4.ebuild,
   gdal-1.3.0-r1.ebuild:
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 81a61959c7db..fc4d4e6bf811 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,8 +1,11 @@
-MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481
-MD5 842b36ae8eb26d03a3e0e3b58bf12eab ChangeLog 2979
-MD5 f2994eb2cdb0db01674a20b59d7dc7ec gdal-1.2.6-r4.ebuild 4214
-MD5 8256e70a78e0f691ec31177b2fc55f25 gdal-1.3.0-r1.ebuild 4267
+MD5 cfdb5b7ef78736ef74e9dcaaab1e08d6 ChangeLog 3316
 MD5 4d15ffbcc89c38a4e5a7bbbe698207a1 files/digest-gdal-1.2.6-r4 63
 MD5 d4bd0e3f81da140c24f49c6e6513b9f6 files/digest-gdal-1.3.0-r1 63
+MD5 388a23e8269dd2033b621fbd5e33ca94 files/digest-gdal-1.3.1 63
 MD5 8069b0c62dde416a0c74d1bf73543c9d files/gdal-1.2.6-installpathfix.patch 7786
 MD5 3f4304111ffcc48b1784cc03ef64844b files/gdal-1.3.0-installpathfix.patch 7764
+MD5 f93770205b88c698e73487038b46a707 files/gdal-1.3.1-installpathfix.patch 6805
+MD5 d50b60cdadc7f74474b469cb4482e681 gdal-1.2.6-r4.ebuild 4032
+MD5 21aae2b8e8c1b59ac840a0d42e671f51 gdal-1.3.0-r1.ebuild 4085
+MD5 fa15317992c4b7908eb91c6267ccb6c1 gdal-1.3.1.ebuild 4300
+MD5 dc56f5d75556cdbcd7c4024288ef8fcb metadata.xml 481
diff --git a/sci-libs/gdal/files/digest-gdal-1.3.1 b/sci-libs/gdal/files/digest-gdal-1.3.1
new file mode 100644
index 000000000000..a81d081883a3
--- /dev/null
+++ b/sci-libs/gdal/files/digest-gdal-1.3.1
@@ -0,0 +1 @@
+MD5 7ff1ceff745ee011793e1f860c02c172 gdal-1.3.1.tar.gz 6856011
diff --git a/sci-libs/gdal/files/gdal-1.3.1-installpathfix.patch b/sci-libs/gdal/files/gdal-1.3.1-installpathfix.patch
new file mode 100644
index 000000000000..83c98623c6b4
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.3.1-installpathfix.patch
@@ -0,0 +1,203 @@
+--- GDALmake.opt.in.orig	2005-09-29 21:52:58.000000000 -0700
++++ GDALmake.opt.in	2005-10-24 20:49:49.000000000 -0700
+@@ -53,10 +53,10 @@
+ exec_prefix	=	@exec_prefix@
+ INST_PREFIX	=	@exec_prefix@
+ INST_INCLUDE	=	@includedir@
+-INST_DATA 	=	@datadir@
++INST_DATA 	=	@datadir@/gdal
+ INST_LIB	=	@libdir@
+ INST_BIN	=	@bindir@
+-INST_PYMOD      =       @pymoddir@
++INST_PYMOD      =	@pymoddir@
+ INST_DOCS	=	@exec_prefix@/doc
+ INST_MAN	=	@mandir@
+ 
+--- GNUmakefile.orig	2005-09-16 08:47:29.000000000 -0700
++++ GNUmakefile	2005-10-24 20:38:33.000000000 -0700
+@@ -132,7 +132,7 @@
+ 
+ install-docs:
+ 	(cd ogr; $(MAKE) install-docs)
+-	$(INSTALL_DIR) $(INST_DOCS)/gdal
++	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/gdal
+ 	cp html/*.* $(INST_DOCS)/gdal
+ 
+ web-update:	docs
+@@ -141,9 +141,9 @@
+ install:	default install-actions
+ 
+ install-actions: install-lib
+-	$(INSTALL_DIR) $(INST_BIN)
+-	$(INSTALL_DIR) $(INST_DATA)
+-	$(INSTALL_DIR) $(INST_INCLUDE)
++	$(INSTALL_DIR) $(DESTDIR)$(INST_BIN)
++	$(INSTALL_DIR) $(DESTDIR)$(INST_DATA)
++	$(INSTALL_DIR) $(DESTDIR)$(INST_INCLUDE)
+ 	(cd port; $(MAKE) install)
+ 	(cd gcore; $(MAKE) install)
+ 	(cd frmts; $(MAKE) install)
+@@ -155,14 +155,14 @@
+ 	(cd pymod; $(MAKE) install)
+ endif
+ 	(cd swig; $(MAKE) install)
+-	for f in data/*.* ; do $(INSTALL_DATA) $$f $(INST_DATA) ; done
++	for f in data/*.* ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_DATA) ; done
+ 	$(LIBTOOL_FINISH) $(INST_LIB)
+ 
+ ifeq ($(HAVE_LIBTOOL),yes)
+ 
+ install-lib:
+-	$(INSTALL_DIR) $(INST_LIB)
+-	for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(INST_LIB) ; done
++	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
++	for f in $(LIBGDAL-yes) ; do $(INSTALL_LIB) $$f $(DESTDIR)$(INST_LIB) ; done
+ 
+ else
+ 
+@@ -172,11 +172,11 @@
+ GDAL_SLIB_B	=	$(notdir $(GDAL_SLIB))
+ 
+ install-lib:
+-	$(INSTALL_DIR) $(INST_LIB)
++	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
+ 	rm -f $(INST_LIB)/$(GDAL_SLIB_B)
+ 	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER_MAJOR)
+ 	rm -f $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
+-	$(INSTALL_LIB) $(GDAL_SLIB) $(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
++	$(INSTALL_LIB) $(GDAL_SLIB) $(DESTDIR)$(INST_LIB)/$(GDAL_SLIB_B).$(GDAL_VER)
+ 	(cd $(INST_LIB) ; \
+ 	 ln -s $(GDAL_SLIB_B).$(GDAL_VER_MAJOR) $(GDAL_SLIB_B))
+ 	(cd $(INST_LIB) ; \
+@@ -185,8 +185,8 @@
+ else
+ 
+ install-lib:
+-	$(INSTALL_DIR) $(INST_LIB)
+-	$(INSTALL_LIB) $(GDAL_LIB) $(INST_LIB)
++	$(INSTALL_DIR) $(DESTDIR)$(INST_LIB)
++	$(INSTALL_LIB) $(GDAL_LIB) $(DESTDIR)$(INST_LIB)
+ 
+ endif # HAVE_LD_SHARED=no 
+ 
+--- alg/GNUmakefile.orig	2004-12-26 13:26:15.000000000 -0800
++++ alg/GNUmakefile	2005-10-24 20:39:25.000000000 -0700
+@@ -23,7 +23,7 @@
+ 	(cd ..; $(MAKE) docs)
+ 
+ install:
+-	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
++	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
+ 
+ lib:	$(OBJ)
+ 	(cd .. ; $(MAKE) force-lib)
+--- apps/GNUmakefile.orig	2005-05-12 00:10:00.000000000 -0700
++++ apps/GNUmakefile	2005-10-24 20:40:28.000000000 -0700
+@@ -89,6 +89,6 @@
+ 
+ 
+ install: default
+-	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(INST_BIN) ; done
+-	$(INSTALL) gdal-config-inst $(INST_BIN)/gdal-config
++	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
++	$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
+ 
+--- frmts/mem/GNUmakefile.orig	2005-01-24 10:09:57.000000000 -0800
++++ frmts/mem/GNUmakefile	2005-10-24 20:41:33.000000000 -0700
+@@ -15,4 +15,4 @@
+ install-obj:	$(O_OBJ)
+ 
+ install:
+-	$(INSTALL_DATA) memdataset.h $(INST_INCLUDE)
++	$(INSTALL_DATA) memdataset.h $(DESTDIR)$(INST_INCLUDE)
+--- frmts/raw/GNUmakefile.orig	2005-01-24 10:09:57.000000000 -0800
++++ frmts/raw/GNUmakefile	2005-10-24 20:42:10.000000000 -0700
+@@ -21,4 +21,4 @@
+ $(OBJ) $(O_OBJ):	rawdataset.h
+ 
+ install:
+-	$(INSTALL_DATA) rawdataset.h $(INST_INCLUDE)
++	$(INSTALL_DATA) rawdataset.h $(DESTDIR)$(INST_INCLUDE)
+--- frmts/vrt/GNUmakefile.orig	2005-01-24 10:09:57.000000000 -0800
++++ frmts/vrt/GNUmakefile	2005-10-24 20:42:48.000000000 -0700
+@@ -19,4 +19,4 @@
+ $(OBJ) $(O_OBJ):	vrtdataset.h
+ 
+ install:
+-	$(INSTALL_DATA) vrtdataset.h $(INST_INCLUDE)
++	$(INSTALL_DATA) vrtdataset.h $(DESTDIR)$(INST_INCLUDE)
+--- gcore/GNUmakefile.orig	2005-09-24 12:03:11.000000000 -0700
++++ gcore/GNUmakefile	2005-10-24 20:43:25.000000000 -0700
+@@ -33,4 +33,4 @@
+ 		$*.cpp -o $*.o
+ 
+ install:
+-	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
++	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
+--- man/GNUmakefile.orig	2004-02-20 09:26:13.000000000 -0800
++++ man/GNUmakefile	2005-10-24 20:44:21.000000000 -0700
+@@ -5,5 +5,5 @@
+ include ../GDALmake.opt
+ 
+ install:
+-	$(INSTALL_DIR) $(INST_MAN)/man1
+-	for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(INST_MAN)/man1 ; done
++	$(INSTALL_DIR) $(DESTDIR)$(INST_MAN)/man1
++	for f in $(MAN1_FILES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_MAN)/man1 ; done
+--- ogr/GNUmakefile.orig	2005-03-11 06:28:05.000000000 -0800
++++ ogr/GNUmakefile	2005-10-24 20:46:02.000000000 -0700
+@@ -79,7 +79,7 @@
+ 	cp ogr_feature_style.html html
+ 
+ install-docs:
+-	$(INSTALL_DIR) $(INST_DOCS)/ogr
++	$(INSTALL_DIR) $(DESTDIR)$(INST_DOCS)/ogr
+ 	cp html/* $(INST_DOCS)/ogr
+ 
+ gdalso:	$(GDAL_SLIB)
+@@ -120,14 +120,14 @@
+ 
+ ifeq ($(OGR_ENABLED),yes)
+ install-full:	apps
+-	$(INSTALL) ogr2ogr $(INST_BIN)
+-	$(INSTALL) ogrinfo $(INST_BIN)
+-	$(INSTALL) ogrtindex $(INST_BIN)
++	$(INSTALL) ogr2ogr $(DESTDIR)$(INST_BIN)
++	$(INSTALL) ogrinfo $(DESTDIR)$(INST_BIN)
++	$(INSTALL) ogrtindex $(DESTDIR)$(INST_BIN)
+ else
+ install-full:
+ endif
+ 
+ install:	install-full
+ 	for f in $(INST_H_FILES) ; \
+-	    do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; \
++	    do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; \
+ 	done
+--- port/GNUmakefile.orig	2005-09-11 11:01:48.000000000 -0700
++++ port/GNUmakefile	2005-10-24 20:46:38.000000000 -0700
+@@ -25,7 +25,7 @@
+ 	$(RM) *.o $(LIB)
+ 
+ install:
+-	for f in *.h ; do $(INSTALL_DATA) $$f $(INST_INCLUDE) ; done
++	for f in *.h ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_INCLUDE) ; done
+ 
+ xmlreformat:	xmlreformat.o 
+ 	$(CXX) $(CXXFLAGS) xmlreformat.o $(CONFIG_LIBS) -o xmlreformat
+--- pymod/GNUmakefile.orig	2005-01-31 14:07:02.000000000 -0800
++++ pymod/GNUmakefile	2005-10-24 20:47:51.000000000 -0700
+@@ -45,9 +45,9 @@
+ 
+ # special care is taken so that python scripts are installed as executables
+ install:	$(GDALMODULE_SO)
+-	$(INSTALL_DIR) $(INST_PYMOD)
+-	$(INSTALL_LIB) $(GDALMODULE_SO) $(INST_PYMOD)
+-	for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(INST_BIN) ; done
+-	for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(INST_PYMOD) ; done
++	$(INSTALL_DIR) $(DESTDIR)$(INST_PYMOD)
++	$(INSTALL_LIB) $(GDALMODULE_SO) $(DESTDIR)$(INST_PYMOD)
++	for f in $(PY_COMMANDS) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
++	for f in $(PY_MODULES) ; do $(INSTALL_DATA) $$f $(DESTDIR)$(INST_PYMOD) ; done
+ 	# ugh! spurius relinking leaves a file owned by root into .libs/.
+ 	rm -f .libs/*.soT
diff --git a/sci-libs/gdal/gdal-1.2.6-r4.ebuild b/sci-libs/gdal/gdal-1.2.6-r4.ebuild
index e10a6262f69a..5df373437d61 100644
--- a/sci-libs/gdal/gdal-1.2.6-r4.ebuild
+++ b/sci-libs/gdal/gdal-1.2.6-r4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r4.ebuild,v 1.2 2005/10/13 06:46:23 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r4.ebuild,v 1.3 2005/10/25 07:22:14 nerdboy Exp $
 
 inherit eutils libtool gnuconfig distutils
 
-IUSE="jpeg png geos gif grass jasper netcdf hdf python postgres mysql \
-	odbc sqlite ogdi fits gml doc debug"
+IUSE="jpeg png geos gif jasper netcdf hdf python postgres mysql sqlite \
+	odbc 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"
@@ -21,7 +21,7 @@ DEPEND=">=sys-libs/zlib-1.1.4
 	>=media-libs/tiff-3.7.0
 	sci-libs/libgeotiff
 	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib )
+	gif? ( media-libs/libungif )
 	png? ( media-libs/libpng )
 	python? ( dev-lang/python )
 	fits? ( sci-libs/cfitsio )
@@ -38,7 +38,6 @@ DEPEND=">=sys-libs/zlib-1.1.4
 	jasper? ( media-libs/jasper )
 	odbc?   ( dev-db/unixODBC )
 	geos?   ( sci-libs/geos )
-	grass? ( >=sci-geosciences/grass-6.0.0 )
 	sqlite? ( dev-db/sqlite )
 	doc? ( app-doc/doxygen )"
 
@@ -86,12 +85,6 @@ src_compile() {
 	    export CFG=debug
 	fi
 
-	# Enable newer Grass support only
-	if useq grass ; then
-	    use_conf="--with-grass=/usr/grass60 ${use_conf}"
-	    use_conf="--with-libgrass=no ${use_conf}"
-	fi
-
 	if useq python ; then
 	    use_conf="--with-pymoddir=/usr/${get_libdir}/python${PYVER}/site-packages \
 	    ${use_conf}"
@@ -124,7 +117,8 @@ pkg_postinst() {
 	einfo "GDAL is most useful with full graphics support enabled via various"
 	einfo "USE flags: png, jpeg, gif, jasper, etc. Also python, fits, ogdi,"
 	einfo "geos, and support for either netcdf or HDF4 is available, as well as"
-	einfo "grass, and mysql, sqlite, or postgres (grass support requires grass 6)."
+	einfo "grass, and mysql, sqlite, or postgres (grass support requires newer"
+	einfo "gdal and gdal-grass)."
 	ewarn
 	einfo "Note: tiff and geotiff are now hard depends, so no USE flags."
 	einfo "Also, this package will check for netcdf before hdf, so if you"
diff --git a/sci-libs/gdal/gdal-1.3.0-r1.ebuild b/sci-libs/gdal/gdal-1.3.0-r1.ebuild
index f7b2462404b8..037028523342 100644
--- a/sci-libs/gdal/gdal-1.3.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.3.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.0-r1.ebuild,v 1.2 2005/10/13 06:46:23 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.0-r1.ebuild,v 1.3 2005/10/25 07:22:14 nerdboy Exp $
 
 inherit eutils libtool gnuconfig distutils
 
-IUSE="jpeg png geos gif grass jasper netcdf hdf hdf5 python postgres mysql \
+IUSE="jpeg png geos gif jasper netcdf hdf hdf5 python postgres mysql \
 	odbc sqlite ogdi fits gml doc debug"
 
 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
@@ -21,7 +21,7 @@ DEPEND=">=sys-libs/zlib-1.1.4
 	>=media-libs/tiff-3.7.0
 	sci-libs/libgeotiff
 	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib )
+	gif? ( media-libs/libungif )
 	png? ( media-libs/libpng )
 	python? ( dev-lang/python )
 	fits? ( sci-libs/cfitsio )
@@ -39,7 +39,6 @@ DEPEND=">=sys-libs/zlib-1.1.4
 	jasper? ( media-libs/jasper )
 	odbc?   ( dev-db/unixODBC )
 	geos?   ( sci-libs/geos )
-	grass? ( >=sci-geosciences/grass-6.0.0 )
 	sqlite? ( dev-db/sqlite )
 	doc? ( app-doc/doxygen )"
 
@@ -87,12 +86,6 @@ src_compile() {
 	    export CFG=debug
 	fi
 
-	# Enable newer Grass support only
-	if useq grass ; then
-	    use_conf="--with-grass=/usr/grass60 ${use_conf}"
-	    use_conf="--with-libgrass=no ${use_conf}"
-	fi
-
 	if useq python ; then
 	    use_conf="--with-pymoddir=/usr/${get_libdir}/python${PYVER}/site-packages \
 	    ${use_conf}"
@@ -125,7 +118,8 @@ pkg_postinst() {
 	einfo "GDAL is most useful with full graphics support enabled via various"
 	einfo "USE flags: png, jpeg, gif, jasper, etc. Also python, fits, ogdi,"
 	einfo "geos, and support for either netcdf or HDF4 is available, as well as"
-	einfo "grass, and mysql, sqlite, or postgres (grass support requires grass 6)."
+	einfo "grass, and mysql, sqlite, or postgres (grass support requires newer"
+	einfo "gdal and gdal-grass)."
 	ewarn
 	einfo "Note: tiff and geotiff are now hard depends, so no USE flags."
 	einfo "Also, this package will check for netcdf before hdf, so if you"
diff --git a/sci-libs/gdal/gdal-1.3.1.ebuild b/sci-libs/gdal/gdal-1.3.1.ebuild
new file mode 100644
index 000000000000..1f4e150857b0
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.3.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild,v 1.1 2005/10/25 07:22:14 nerdboy Exp $
+
+inherit eutils libtool gnuconfig distutils
+
+IUSE="jpeg png geos gif jasper netcdf hdf hdf5 python 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"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+# need to get these arches updated on several libs first
+#KEYWORDS="~alpha ~hppa ~ppc64"
+
+DEPEND=">=sys-libs/zlib-1.1.4
+	>=media-libs/tiff-3.7.0
+	sci-libs/libgeotiff
+	jpeg? ( media-libs/jpeg )
+	gif? ( media-libs/libungif )
+	png? ( media-libs/libpng )
+	python? ( dev-lang/python )
+	fits? ( sci-libs/cfitsio )
+	ogdi? ( sci-libs/ogdi )
+	gml? ( dev-libs/xerces-c )
+	hdf5? ( >=sci-libs/hdf5-1.6.4 )
+	postgres? ( dev-db/postgresql )
+	|| (
+	    netcdf? ( sci-libs/netcdf )
+	    hdf? ( sci-libs/hdf )
+	)
+	jasper? ( media-libs/jasper )
+	odbc?   ( dev-db/unixODBC )
+	geos?   ( sci-libs/geos )
+	sqlite? ( dev-db/sqlite )
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-installpathfix.patch || die "epatch failed"
+	elibtoolize --patch-only
+	gnuconfig_update
+	if useq netcdf && useq 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."
+	    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"
+	    fi
+	fi
+}
+
+src_compile() {
+	distutils_python_version
+
+	pkg_conf="--enable-static=no --enable-shared=yes --with-gnu-ld \
+		--with-libgrass=no"
+
+	use_conf="$(use_with jpeg) $(use_with png) \
+	    $(use_with postgres pg) $(use_with fits cfitsio) \
+	    $(use_with netcdf) $(use_with hdf hdf4) $(use_with geos) \
+	    $(use_with sqlite) $(use_with jasper) $(use_with odbc) \
+	    $(use_with gml xerces) $(use_with hdf5)"
+	    # mysql support temporarily disabled $(use_with mysql)
+
+	# It can't find this
+	if useq ogdi ; then
+	    use_conf="--with-ogdi=/usr/${get_libdir} ${use_conf}"
+	fi
+
+#	if useq mysql ; then
+#	    use_conf="--with-mysql=/usr/bin/mysql_config ${use_conf}"
+#	fi
+
+	if useq gif ; then
+	    use_conf="--with-gif=internal ${use_conf}"
+	else
+	    use_conf="--with-gif=no ${use_conf}"
+	fi
+
+	if useq debug ; then
+	    export CFG=debug
+	fi
+
+	if useq python ; then
+	    use_conf="--with-pymoddir=/usr/${get_libdir}/python${PYVER}/site-packages \
+	    ${use_conf}"
+	else
+	    use_conf="--with-python=no ${use_conf}"
+	fi
+
+	# Fix doc path just in case
+	sed -i -e "s:@exec_prefix@/doc:/usr/share/doc/${PF}/html:g" GDALmake.opt.in
+
+	econf ${pkg_conf} ${use_conf} || die "econf failed"
+	# parallel makes fail on the ogr stuff (C++, what can I say?)
+	emake  || die "emake failed"
+	if useq doc ; then
+	    emake docs || die "emake docs failed"
+	fi
+}
+
+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
+	if useq doc ; then
+	    dohtml html/* || die "install html failed"
+	    docinto ogr
+	    dohtml ogr/html/* || die "install ogr html failed"
+	fi
+}
+
+pkg_postinst() {
+	einfo "GDAL is most useful with full graphics support enabled via various"
+	einfo "USE flags: png, jpeg, gif, jasper, etc. Also python, fits, ogdi,"
+	einfo "geos, and support for either netcdf or HDF4 is available, as well as"
+	einfo "grass, and mysql, sqlite, or postgres (grass support requires grass 6"
+	einfo "and the new gdal-grass ebuild).  HDF5 support is now included."
+	ewarn
+	einfo "Note: tiff and geotiff are now hard depends, so no USE flags."
+	einfo "Also, this package will check for netcdf before hdf, so if you"
+	einfo "prefer hdf, please emerge hdf with USE=szip prior to emerging"
+	einfo "gdal.  Detailed API docs require doxygen (man pages are free)."
+	einfo ""
+	einfo "Check available image and data formats after building with"
+	einfo "gdalinfo and ogrinfo (using the --formats switch)."
+}