Version bump. Drop older. Grass support to be done.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

9 files changed, 284 insertions, 1083 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 447e011d8ee3..22ca7d6af780 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.91 2010/07/18 20:08:22 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.92 2010/07/30 12:27:51 scarabeus Exp $
+
+*gdal-1.7.2 (30 Jul 2010)
+
+  30 Jul 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/1.7.2-ruby_cflags.patch, -gdal-1.5.2.ebuild, -gdal-1.5.3.ebuild,
+  -gdal-1.6.0-r1.ebuild, -gdal-1.6.2.ebuild, -gdal-1.6.3.ebuild,
+  +gdal-1.7.2.ebuild:
+  Version bump. Drop older. Grass support to be done.
 
   18 Jul 2010; Steve Arnold <nerdboy@gentoo.org> gdal-1.6.3-r1.ebuild:
   Updated for a couple of minor/weird bugs (320237 and 325193). Suspect 
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 066b598cd58a..ac3f52f99e41 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,3 +1,4 @@
+AUX 1.7.2-ruby_cflags.patch 1161 RMD160 5635b016c18a54a45e4f9410028f0a4596b52e5b SHA1 42389f01f14ba57a6337a9a1cdbe889c9fc34d61 SHA256 8a943b69b200e8b926e2ed9ad1861a152731bb829459f402a8024e1137eed754
 AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
 AUX gdal-1.5.0-install_name.patch 1731 RMD160 9e6d9d2a8a14bf01de242d889140369d083fd7c4 SHA1 4c46ebb1bb7d5f5ca2f1079e6ad1a1230ef698ef SHA256 da631282e7ee42b3f9c46a4ce76d7b4905caa4a056c8109fce0f661b9aa58abd
 AUX gdal-1.5.0-makefile.patch 894 RMD160 955b2ac69f6d8477cc26ae1321ddc0d92e88fb90 SHA1 02ee0ac5351c2c83a848f7f9db646dcc19937123 SHA256 cd40c5f77c9f5d2a78a880a83d09656eacfe3437e8be7bfb13559a5e3fd9ee58
@@ -8,20 +9,13 @@ AUX gdal-1.6.0-mysql_ogr_header.patch 545 RMD160 65551255869f26c23be3ba4ed264164
 AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301ba SHA1 9b3214e7ffe6aa821d716caf3e984841f6e208fd SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1
 AUX gdal-1.6.1-ruby-make.patch 1150 RMD160 8e5b8397a86506d968cbf1a5a04616303df26fc8 SHA1 80c9844bfa4374879cc01af8ac90674c251e1034 SHA256 33d213226ad831ea43df8e7d78e56cd6704dc6089320ac63a4eb3d369b920dea
 AUX gdal-1.7.1-warp_fix.patch 2954 RMD160 76c8897fa4be8e8197016a3a2a0ddc1d326f2498 SHA1 b98c18c634a40d80d54b2c3416d7e06b7a2d8976 SHA256 4ed685891e17e7005457225eac96f455e91e7601ee358f403f112537e744aab5
-DIST gdal-1.5.2.tar.gz 6180070 RMD160 37601decec7cc23ee6ea77c9c0e7c12ef3154213 SHA1 bf759b28d2218919212484c2b593edbc1c09aabb SHA256 243dabf3c45530cac8be092f9a1d838a46b46a92d4138870423006ffd6ae4001
-DIST gdal-1.5.3.tar.gz 6194379 RMD160 3178dc1cc76e79071c77ad1cca0c8e23bcb91ef3 SHA1 b8b48f44f8da6e7d5028fe7f57c79e218625b986 SHA256 8f68386582d178842bf990e2e94473ec72c3fd69de2ca757542888f1c95bbf4d
-DIST gdal-1.6.0.tar.gz 7072689 RMD160 85bf968b5ec6c2af5a02597bc4c8375d8f775fec SHA1 cae5a891231ee5794350d1626a688d802a429423 SHA256 acdc2faf7496f8d8f4680347ce30fd3a2139b5c050f13dcd6ca8a3d7f6e418a4
 DIST gdal-1.6.1.tar.gz 6999411 RMD160 64955b4940675475bfaf0cc8fd5f0b264b56b0bb SHA1 b2091a3830d8230a97aa0ced429935e7caef00ee SHA256 e9876a5a6e80d0b078b10aeb29e7dc01df8be38f13d836257190c9ca48a998ad
-DIST gdal-1.6.2.tar.gz 7002816 RMD160 e445680953f25047a280f36cedba0597094e0562 SHA1 1d9e1d8f01f06bca99e7335d7e86dff784eee819 SHA256 60c49a58e8641e6bf640b08306f4a0434915026fd3e0af0b53f0dcd5f5e3f74d
 DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67
 DIST gdal-1.7.1.tar.gz 7709157 RMD160 337502e12e0eb4b5ff5fad806545752e677a4ab8 SHA1 1ff42b51f416da966ee25c42631a3faa3cca5d4d SHA256 c32c379811c203aa4af23683171547a947f1308bbb746ec70839965b2db4ad66
-EBUILD gdal-1.5.2.ebuild 6366 RMD160 e9db6422bab565db01fa277581f3ec2f3ea2ece7 SHA1 1d23d9c5a7b8942bfa4d08648318c6f3d40ad292 SHA256 c022f15b46d75f3ef8a8cc9d394118726c5be1d0d663bf19fa2508b2ad18f4de
-EBUILD gdal-1.5.3.ebuild 6455 RMD160 76ab124ec71a6c68d7ea116a782701fbfdf3ba0d SHA1 6650ae2a94f4391e63f893790edb93bb66ead8b1 SHA256 1b324c8abfd9e35296686c9dbf893a3c0da5317d03708181c64a4f869140b7fd
-EBUILD gdal-1.6.0-r1.ebuild 6598 RMD160 d8fbea8dfe3b0c04b96fc1d0de53c50d8f4feb7a SHA1 65ab9497ad9e7f5d06a1c17a7ba8b79f956a756c SHA256 d9198f83e1176f0fb73a55f1d4d161576e31f03f6ee975c7597cd364e0f52377
+DIST gdal-1.7.2.tar.gz 7755378 RMD160 a3f7950798448d8179f899dc095a83e23dcc269b SHA1 a03127530708e3924aec7b505cc2ca4f8153f13c SHA256 0834909a93e955a45cf050714b018fed89f8dbe74e0381e91d16a8084ca08837
 EBUILD gdal-1.6.1.ebuild 6207 RMD160 bc770f30e3fc7a2730593301493e5131887f96cf SHA1 fa00e68b0db2889ff4f41485577c73aea4c1902d SHA256 f42f23039752836249fbd420e7be8d1261b31dd8f62189a38e0e6cb030deff93
-EBUILD gdal-1.6.2.ebuild 6203 RMD160 caa9c6d1dae739c603cb2919d5a7b5db1b28d0d7 SHA1 38896d24f7c3656db8a97e3fee4ab72d07a0d920 SHA256 c4d1c50620b1ace080e9e6b741435dc943a8a7d065b46f9df70bda614bcfc738
 EBUILD gdal-1.6.3-r1.ebuild 6953 RMD160 ebddd7e18664123f25311ab30c3a81ffbc8fbed0 SHA1 3e9f9ea851f0e1a818339249c1c7cc03f2f6ce41 SHA256 e0203d2a2e49adcb982c4cdc05520816af0e5ebd7a15edfb55275f4ec86e189f
-EBUILD gdal-1.6.3.ebuild 6367 RMD160 59ed9586e72af81c706f531ae5aac4e5e9204aba SHA1 be5691f97c876f0445f92598af24caf0348b558d SHA256 8790e3ffcc862e5484f6d94bfb7692a61f9bfea4ba743d4bb48c43c233de8036
 EBUILD gdal-1.7.1-r1.ebuild 7451 RMD160 52f641bb8f071b89cc735f10b88ec238ad3d3376 SHA1 3cdbf9facf1f1cb7aec01663741c8cb261fc5b2b SHA256 9fbda91f15606d33a0fcd2e421925b965800e78bcde3f15816965b2edb6202cd
-MISC ChangeLog 17201 RMD160 2c5bf9ad528a816818cc4dec101216c8c948a5c9 SHA1 115404761877160f14bc20614323b127ac2e8c91 SHA256 cac7d0a2c45b2dcb726847c5910edb92a33dfa6c9a7229a5d9d80ab56e6a9273
+EBUILD gdal-1.7.2.ebuild 6035 RMD160 13f1fac86c92a228e1084d959ac6e804a73ba1fd SHA1 6056ccaec33e7729efa3f21b7edda861a1b6d609 SHA256 65593e0b53c36364d46a5212630530d6e956e399000c593395fa16346a9c6218
+MISC ChangeLog 17501 RMD160 7e50d4b745e4b6cc7ca6dad2fa4fd0b865a11dff SHA1 d7c2d9636753696f1977f049fa0bd589c2e0c0dd SHA256 9928de201de7686d803a6c33ee564409fd3acc575ee9a0c1e73683f7b3eb3b1a
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/files/1.7.2-ruby_cflags.patch b/sci-libs/gdal/files/1.7.2-ruby_cflags.patch
new file mode 100644
index 000000000000..1371c0535457
--- /dev/null
+++ b/sci-libs/gdal/files/1.7.2-ruby_cflags.patch
@@ -0,0 +1,35 @@
+--- swig/ruby/RubyMakefile.mk.orig	2010-07-27 16:55:52.061254647 +0200
++++ swig/ruby/RubyMakefile.mk	2010-07-27 16:57:06.837255416 +0200
+@@ -25,7 +25,9 @@
+ INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
+ 
+ RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
+-LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
++LDFLAGS += -fPIC -DPIC -Xcompiler -shared -L$(RUBY_LIB_DIR)
++CFLAGS += -fPIC -DPIC
++CXXFLAGS += -fPIC -DPIC
+ RUBY_LIB := -l$(RUBY_SO_NAME)
+ 
+ build: $(RUBY_MODULES)
+@@ -40,17 +42,17 @@
+ $(INSTALL_DIR):
+ 	mkdir -p $(DESTDIR)$(INSTALL_DIR)
+ 
+-install: $(INSTALL_DIR)
+-	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
++install: $(INSTALL_DIR) $(RUBY_MODULES)
++	for f in $(RUBY_MODULES) ; do $(INSTALL) $$f $(DESTDIR)$(INSTALL_DIR) ; done
+ 
+ $(RUBY_MODULES): %.so: %_wrap.o
+ 	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
+ 
+ %.o: %.cpp
+-	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
++	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE)  -c $<
+ 
+ %.o: %.cxx
+-	$(CXX) $(CFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
++	$(CXX) $(CXXFLAGS) $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $<
+ 
+ %.o: %.c
+ 	$(CC) $(CFLAGS) $(GDAL_INCLUDE)  $(RUBY_INCLUDE) -c $<
diff --git a/sci-libs/gdal/gdal-1.5.2.ebuild b/sci-libs/gdal/gdal-1.5.2.ebuild
deleted file mode 100644
index 55d38f4de495..000000000000
--- a/sci-libs/gdal/gdal-1.5.2.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild,v 1.11 2010/06/17 21:06:34 patrick Exp $
-
-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"
-
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
-
-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
-	sci-libs/libgeotiff
-	dev-libs/expat
-	curl? ( net-misc/curl )
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	perl? ( dev-lang/perl )
-	python? ( virtual/python
-		dev-python/numpy )
-	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
-	fits? ( sci-libs/cfitsio )
-	ogdi? ( sci-libs/ogdi )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( dev-db/postgresql-server )
-	|| (
-	    netcdf? ( sci-libs/netcdf )
-	    hdf? ( sci-libs/hdf )
-	)
-	jpeg2k? ( media-libs/jasper )
-	mysql? ( virtual/mysql )
-	odbc?   ( dev-db/unixODBC )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${RDEPEND}
-	ruby? ( >=dev-lang/swig-1.3.28 )
-	doc? ( app-doc/doxygen )"
-
-AT_M4DIR="${S}/m4"
-
-pkg_setup() {
-	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then
-	    elog "User-specified configure options are ${GDAL_CONFIGURE_OPTS}."
-	else
-	    elog "User-specified configure options are not set."
-	    elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
-	fi
-
-	if useq hdf; then
-	    einfo	"Checking if HDF4 is 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 the szip USE flag!"
-		einfo 	"Please emerge hdf with szip USE flag and then emerge GDAL."
-		die 	"HDF4 not merged with szip use flag"
-	    fi
-
-	    if useq netcdf; then
-		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
-		ewarn "common; HDF5 is now the preferred choice for HDF data."
-		die "Please disable either the hdf or netcdf use flag."
-	    fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eaclocal
-	eautoconf
-
-	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
-	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
-	    "${FILESDIR}"/${PN}-1.5.0-makefile.patch \
-	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
-	    "${FILESDIR}"/${P}-xerces-64-bit.patch
-}
-
-src_compile() {
-	local pkg_conf="${GDAL_CONFIGURE_OPTS}"
-	local use_conf=""
-
-	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
-		--with-libgrass=no --without-libtool"
-
-	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
-	    $(use_with postgres pg) $(use_with python) $(use_with ruby) \
-	    $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
-	    $(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)"
-
-	# 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 python ; then
-	    use_conf="--with-pymoddir=$(python_get_sitedir) \
-		${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 || die "sed gdalmake.opt failed"
-
-	econf ${pkg_conf} ${use_conf} || die "econf failed"
-
-	# parallel makes fail on the ogr stuff (C++, what can I say?)
-	# also failing with gcc4 in libcsf
-	emake -j1 || die "emake failed"
-
-	if useq python; then
-	    sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
-		swig/python/setup.cfg || die "sed python setup.cfg failed"
-	    sed -i -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		swig/python/GNUmakefile || die "sed python makefile failed"
-	fi
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_prep
-	    perl-module_src_compile
-	    cd "${S}"
-	fi
-
-	if useq doc ; then
-	    make docs || die "make docs failed"
-	fi
-}
-
-src_install() {
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_install
-	    sed -i -e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-		GDALmake.opt
-	    cd "${S}"
-	fi
-
-	# einstall causes sandbox violations on /usr/lib/libgdal.so
-	make DESTDIR="${D}" install \
-	    || die "make install failed"
-
-	dodoc 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
-
-	if useq python; then
-	    newdoc swig/python/README.txt README-python.txt
-	    dodir /usr/share/${PN}/samples
-	    insinto /usr/share/${PN}/samples
-	    doins swig/python/samples/*
-	fi
-
-	use perl && fixlocalpod
-}
-
-pkg_postinst() {
-	elog
-	elog "If you need libgrass support, then you must rebuild gdal, after"
-	elog "installing the latest Grass, and set the following option:"
-	elog
-	elog "GDAL_CONFIGURE_OPTS=--with-grass=${GRASS_HOME} emerge gdal"
-	elog
-	elog "GDAL is most useful with full graphics support enabled via various"
-	elog "USE flags: png, jpeg, gif, jpeg2k, etc. Also python, fits, ogdi,"
-	elog "geos, and support for either netcdf or HDF4 is available, as well as"
-	elog "grass, and mysql, sqlite, or postgres (grass support requires grass 6"
-	elog "and rebuilding gdal).  HDF5 support is now included."
-	elog
-	elog "Note: tiff and geotiff are now hard depends, so no USE flags."
-	elog "Also, this package will check for netcdf before hdf, so if you"
-	elog "prefer hdf, please emerge hdf with USE=szip prior to emerging"
-	elog "gdal.  Detailed API docs require doxygen (man pages are free)."
-	elog
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-	elog
-}
diff --git a/sci-libs/gdal/gdal-1.5.3.ebuild b/sci-libs/gdal/gdal-1.5.3.ebuild
deleted file mode 100644
index 46ffaab3883a..000000000000
--- a/sci-libs/gdal/gdal-1.5.3.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.3.ebuild,v 1.6 2010/06/17 21:06:34 patrick Exp $
-
-WANT_AUTOCONF="2.5"
-inherit autotools distutils eutils perl-module toolchain-funcs
-
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-# need to get these arches updated on several libs first
-#KEYWORDS="~alpha ~hppa"
-
-IUSE="curl debug doc ecwj2k fits geos gif gml hdf hdf5 jpeg jpeg2k mysql \
-netcdf odbc png ogdi perl postgres python ruby sqlite threads"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=media-libs/tiff-3.7.0
-	sci-libs/libgeotiff
-	dev-libs/expat
-	curl? ( net-misc/curl )
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	perl? ( dev-lang/perl )
-	python? ( virtual/python
-		dev-python/numpy )
-	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
-	fits? ( sci-libs/cfitsio )
-	ogdi? ( sci-libs/ogdi )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( dev-db/postgresql-server )
-	|| (
-	    netcdf? ( sci-libs/netcdf )
-	    hdf? ( sci-libs/hdf )
-	)
-	|| (
-	    jpeg2k? ( media-libs/jasper )
-	    ecwj2k? ( !media-libs/lcms
-		    sci-libs/libecwj2 )
-	)
-	mysql? ( virtual/mysql )
-	odbc?   ( dev-db/unixODBC )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${RDEPEND}
-	ruby? ( >=dev-lang/swig-1.3.28 )
-	doc? ( app-doc/doxygen )"
-
-AT_M4DIR="${S}/m4"
-
-pkg_setup() {
-	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then
-	    elog "User-specified configure options are ${GDAL_CONFIGURE_OPTS}."
-	else
-	    elog "User-specified configure options are not set."
-	    elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
-	fi
-
-	if useq hdf; then
-	    einfo	"Checking if HDF4 is 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 the szip USE flag!"
-		einfo 	"Please emerge hdf with szip USE flag and then emerge GDAL."
-		die 	"HDF4 not merged with szip use flag"
-	    fi
-
-	    if useq netcdf; then
-		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
-		ewarn "common; HDF5 is now the preferred choice for HDF data."
-		die "Please disable either the hdf or netcdf use flag."
-	    fi
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eaclocal
-	eautoconf
-
-	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
-	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
-	    "${FILESDIR}"/${PN}-1.5.0-makefile.patch \
-	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
-	    "${FILESDIR}"/${PN}-1.5.2-xerces-64-bit.patch
-}
-
-src_compile() {
-	local pkg_conf="${GDAL_CONFIGURE_OPTS}"
-	local use_conf=""
-
-	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
-		--with-libgrass=no --without-libtool"
-
-	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
-	    $(use_with postgres pg) $(use_with python) $(use_with ruby) \
-	    $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
-	    $(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)"
-
-	# 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 python ; then
-	    use_conf="--with-pymoddir=$(python_get_sitedir) \
-		${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 || die "sed gdalmake.opt failed"
-
-	econf ${pkg_conf} ${use_conf} || die "econf failed"
-
-	# parallel makes fail on the ogr stuff (C++, what can I say?)
-	# also failing with gcc4 in libcsf
-	emake -j1 || die "emake failed"
-
-	if useq python; then
-	    sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
-		swig/python/setup.cfg || die "sed python setup.cfg failed"
-	    sed -i -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		swig/python/GNUmakefile || die "sed python makefile failed"
-	fi
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_prep
-	    perl-module_src_compile
-	    cd "${S}"
-	fi
-
-	if useq doc ; then
-	    make docs || die "make docs failed"
-	fi
-}
-
-src_install() {
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_install
-	    sed -i -e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-		GDALmake.opt
-	    cd "${S}"
-	fi
-
-	# einstall causes sandbox violations on /usr/lib/libgdal.so
-	make DESTDIR="${D}" install \
-	    || die "make install failed"
-
-	dodoc 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
-
-	if useq python; then
-	    newdoc swig/python/README.txt README-python.txt
-	    dodir /usr/share/${PN}/samples
-	    insinto /usr/share/${PN}/samples
-	    doins swig/python/samples/*
-	fi
-
-	use perl && fixlocalpod
-}
-
-pkg_postinst() {
-	elog
-	elog "If you need libgrass support, then you must rebuild gdal, after"
-	elog "installing the latest Grass, and set the following option:"
-	elog
-	elog "GDAL_CONFIGURE_OPTS=--with-grass=${GRASS_HOME} emerge gdal"
-	elog
-	elog "GDAL is most useful with full graphics support enabled via various"
-	elog "USE flags: png, jpeg, gif, jpeg2k, etc. Also python, fits, ogdi,"
-	elog "geos, and support for either netcdf or HDF4 is available, as well as"
-	elog "grass, and mysql, sqlite, or postgres (grass support requires grass 6"
-	elog "and rebuilding gdal).  HDF5 support is now included."
-	elog
-	elog "Note: tiff and geotiff are now hard depends, so no USE flags."
-	elog "Also, this package will check for netcdf before hdf, so if you"
-	elog "prefer hdf, please emerge hdf with USE=szip prior to emerging"
-	elog "gdal.  Detailed API docs require doxygen (man pages are free)."
-	elog
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-	elog
-}
diff --git a/sci-libs/gdal/gdal-1.6.0-r1.ebuild b/sci-libs/gdal/gdal-1.6.0-r1.ebuild
deleted file mode 100644
index 8d9d58ee2534..000000000000
--- a/sci-libs/gdal/gdal-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.0-r1.ebuild,v 1.6 2010/06/17 21:06:34 patrick Exp $
-
-WANT_AUTOCONF="2.5"
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
-
-inherit autotools distutils eutils perl-module ruby toolchain-funcs
-
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-# need to get these arches updated on several libs first
-#KEYWORDS="~alpha ~hppa"
-
-IUSE="curl debug doc ecwj2k fits geos gif gml hdf hdf5 jpeg jpeg2k mysql \
-netcdf odbc png ogdi perl postgres python ruby sqlite threads"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=media-libs/tiff-3.7.0
-	sci-libs/libgeotiff
-	dev-libs/expat
-	curl? ( net-misc/curl )
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	perl? ( dev-lang/perl )
-	python? ( virtual/python
-		dev-python/numpy )
-	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
-	fits? ( sci-libs/cfitsio )
-	ogdi? ( sci-libs/ogdi )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( dev-db/postgresql-server )
-	|| (
-	    netcdf? ( sci-libs/netcdf )
-	    hdf? ( sci-libs/hdf )
-	)
-	|| (
-	    jpeg2k? ( media-libs/jasper )
-	    ecwj2k? ( !media-libs/lcms
-		    sci-libs/libecwj2 )
-	)
-	mysql? ( virtual/mysql )
-	odbc?   ( dev-db/unixODBC )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${RDEPEND}
-	perl? ( python? ( ruby? ( >=dev-lang/swig-1.3.28 ) ) )
-	doc? ( app-doc/doxygen )"
-
-AT_M4DIR="${S}/m4"
-
-pkg_setup() {
-	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then
-	    elog "User-specified configure options are ${GDAL_CONFIGURE_OPTS}."
-	else
-	    elog "User-specified configure options are not set."
-	    elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eaclocal
-	eautoconf
-
-	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
-	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
-	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
-	    "${FILESDIR}"/${PN}-1.6.1-ruby-make.patch \
-	    "${FILESDIR}"/${P}-swig-fix.patch \
-	    "${FILESDIR}"/${P}-mysql_ogr_header.patch \
-	    || die "sed failed"
-
-	if useq hdf; then
-	    einfo	"Checking if HDF4 is 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 the szip USE flag!"
-		einfo 	"Please emerge hdf with szip USE flag and then emerge GDAL."
-		die 	"HDF4 not merged with szip use flag"
-	    fi
-
-	    if useq netcdf; then
-		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
-		ewarn "common; HDF5 is now the preferred choice for HDF data."
-		die "Please disable either the hdf or netcdf use flag."
-	    fi
-	fi
-}
-
-src_compile() {
-	local pkg_conf="${GDAL_CONFIGURE_OPTS}"
-	local use_conf=""
-
-	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
-		--with-libgrass=no --without-libtool"
-
-	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
-	    $(use_with postgres pg) $(use_with python) $(use_with ruby) \
-	    $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
-	    $(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)"
-
-	# 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 python ; then
-	    use_conf="--with-pymoddir=$(python_get_sitedir) \
-		${use_conf}"
-	fi
-
-	# Fix doc path just in case
-	sed -i -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-	    GDALmake.opt.in || die "sed gdalmake.opt failed"
-
-	econf ${pkg_conf} ${use_conf} || die "econf failed"
-
-	# parallel makes fail on the ogr stuff (C++, what can I say?)
-	# also failing with gcc4 in libcsf
-	emake -j1 || die "emake failed"
-
-	if useq python; then
-	    sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
-		swig/python/setup.cfg || die "sed python setup.cfg failed"
-	    sed -i -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		swig/python/GNUmakefile || die "sed python makefile failed"
-	fi
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_prep
-	    perl-module_src_compile
-	    cd "${S}"
-	fi
-
-	if useq doc ; then
-	    make docs || die "make docs failed"
-	fi
-}
-
-src_install() {
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_install
-	    sed -i -e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-		GDALmake.opt
-	    cd "${S}"
-	fi
-
-	# einstall causes sandbox violations on /usr/lib/libgdal.so
-	make DESTDIR="${D}" install \
-	    || die "make install failed"
-
-	dodoc 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
-
-	if useq python; then
-	    newdoc swig/python/README.txt README-python.txt
-	    dodir /usr/share/${PN}/samples
-	    insinto /usr/share/${PN}/samples
-	    doins swig/python/samples/*
-	fi
-
-	use perl && fixlocalpod
-}
-
-pkg_postinst() {
-	elog
-	elog "If you need libgrass support, then you must rebuild gdal, after"
-	elog "installing the latest Grass, and set the following option:"
-	elog
-	elog "GDAL_CONFIGURE_OPTS=--with-grass=${GRASS_HOME} emerge gdal"
-	elog
-	elog "GDAL is most useful with full graphics support enabled via various"
-	elog "USE flags: png, jpeg, gif, jpeg2k, etc. Also python, fits, ogdi,"
-	elog "geos, and support for either netcdf or HDF4 is available, as well as"
-	elog "grass, and mysql, sqlite, or postgres (grass support requires grass 6"
-	elog "and rebuilding gdal).  HDF5 support is now included."
-	elog
-	elog "Note: tiff and geotiff are now hard depends, so no USE flags."
-	elog "Also, this package will check for netcdf before hdf, so if you"
-	elog "prefer hdf, please emerge hdf with USE=szip prior to emerging"
-	elog "gdal.  Detailed API docs require doxygen (man pages are free)."
-	elog
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-	elog
-}
diff --git a/sci-libs/gdal/gdal-1.6.2.ebuild b/sci-libs/gdal/gdal-1.6.2.ebuild
deleted file mode 100644
index d1171c2c70d6..000000000000
--- a/sci-libs/gdal/gdal-1.6.2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.2.ebuild,v 1.6 2010/06/17 21:06:34 patrick Exp $
-
-EAPI="2"
-WANT_AUTOCONF="2.5"
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
-
-inherit autotools distutils eutils perl-module ruby toolchain-funcs
-
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-# need to get these arches updated on several libs first
-#KEYWORDS="~alpha ~hppa"
-
-IUSE="curl debug doc ecwj2k fits geos gif gml hdf hdf5 jpeg jpeg2k mysql \
-netcdf odbc png ogdi perl postgres python ruby sqlite threads"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=media-libs/tiff-3.9.1
-	sci-libs/libgeotiff
-	dev-libs/expat
-	curl? ( net-misc/curl )
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	perl? ( dev-lang/perl )
-	python? ( virtual/python
-		dev-python/numpy )
-	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
-	fits? ( sci-libs/cfitsio )
-	ogdi? ( sci-libs/ogdi )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( dev-db/postgresql-base )
-	|| (
-	    netcdf? ( sci-libs/netcdf )
-	    hdf? ( sci-libs/hdf )
-	)
-	|| (
-	    jpeg2k? ( media-libs/jasper )
-	    ecwj2k? ( !media-libs/lcms
-		    sci-libs/libecwj2 )
-	)
-	mysql? ( virtual/mysql )
-	odbc?   ( dev-db/unixODBC )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${RDEPEND}
-	perl? ( >=dev-lang/swig-1.3.28 )
-	python? ( >=dev-lang/swig-1.3.28 )
-	ruby? ( >=dev-lang/swig-1.3.28 )
-	doc? ( app-doc/doxygen )"
-
-AT_M4DIR="${S}/m4"
-
-pkg_setup() {
-	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then
-	    elog "User-specified configure options are ${GDAL_CONFIGURE_OPTS}."
-	else
-	    elog "User-specified configure options are not set."
-	    elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
-	fi
-}
-
-src_prepare() {
-	eaclocal
-	eautoconf
-
-	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
-	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
-	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
-	    "${FILESDIR}"/${PN}-1.6.0-swig-fix.patch \
-	    "${FILESDIR}"/${PN}-1.6.1-ruby-make.patch
-
-	if useq hdf && useq netcdf; then
-		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
-		ewarn "common; HDF5 is now the preferred choice for HDF data."
-		die "Please disable either the hdf or netcdf use flag."
-	fi
-}
-
-src_configure() {
-	local pkg_conf="${GDAL_CONFIGURE_OPTS}"
-	local use_conf=""
-
-	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
-		--with-libgrass=no --without-libtool"
-
-	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
-	    $(use_with postgres pg) $(use_with python) $(use_with ruby) \
-	    $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
-	    $(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)"
-
-	# 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 python ; then
-	    use_conf="--with-pymoddir=$(python_get_sitedir) \
-		${use_conf}"
-	fi
-
-	# Fix doc path just in case
-	sed -i -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-	    GDALmake.opt.in || die "sed gdalmake.opt failed"
-
-	econf ${pkg_conf} ${use_conf} || die "econf failed"
-}
-
-src_compile() {
-	# parallel makes fail on the ogr stuff (C++, what can I say?)
-	# also failing with gcc4 in libcsf
-	emake -j1 || die "emake failed"
-
-	if useq python; then
-	    sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
-		swig/python/setup.cfg || die "sed python setup.cfg failed"
-	    sed -i -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		swig/python/GNUmakefile || die "sed python makefile failed"
-	fi
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_prep
-	    perl-module_src_compile
-	    cd "${S}"
-	fi
-
-	if useq doc ; then
-	    make docs || die "make docs failed"
-	fi
-}
-
-src_install() {
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_install
-	    sed -i -e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-		GDALmake.opt
-	    cd "${S}"
-	fi
-
-	# einstall causes sandbox violations on /usr/lib/libgdal.so
-	emake DESTDIR="${D}" install \
-	    || die "make install failed"
-
-	dodoc 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
-
-	if useq python; then
-	    newdoc swig/python/README.txt README-python.txt
-	    dodir /usr/share/${PN}/samples
-	    insinto /usr/share/${PN}/samples
-	    doins swig/python/samples/*
-	fi
-
-	use perl && fixlocalpod
-}
-
-pkg_postinst() {
-	elog
-	elog "If you need libgrass support, then you must rebuild gdal, after"
-	elog "installing the latest Grass, and set the following option:"
-	elog
-	elog "GDAL_CONFIGURE_OPTS=--with-grass=\$GRASS_HOME emerge gdal"
-	elog
-	elog "GDAL is most useful with full graphics support enabled via various"
-	elog "USE flags: png, jpeg, gif, jpeg2k, etc. Also python, fits, ogdi,"
-	elog "geos, and support for either netcdf or HDF4 is available, as well as"
-	elog "grass, and mysql, sqlite, or postgres (grass support requires grass 6"
-	elog "and rebuilding gdal).  HDF5 support is now included."
-	elog
-	elog "Note: tiff and geotiff are now hard depends, so no USE flags."
-	elog "Also, this package will check for netcdf before hdf, so if you"
-	elog "prefer hdf, please emerge hdf with USE=szip prior to emerging"
-	elog "gdal.  Detailed API docs require doxygen (man pages are free)."
-	elog
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-	elog
-}
diff --git a/sci-libs/gdal/gdal-1.6.3.ebuild b/sci-libs/gdal/gdal-1.6.3.ebuild
deleted file mode 100644
index 5bb840c711cf..000000000000
--- a/sci-libs/gdal/gdal-1.6.3.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.6.3.ebuild,v 1.4 2010/06/17 21:06:34 patrick Exp $
-
-EAPI="2"
-WANT_AUTOCONF="2.5"
-RUBY_OPTIONAL="yes"
-USE_RUBY="ruby18"
-
-inherit autotools distutils eutils perl-module ruby toolchain-funcs
-
-DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
-HOMEPAGE="http://www.gdal.org/"
-SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-# need to get these arches updated on several libs first
-#KEYWORDS="~alpha ~hppa"
-
-IUSE="curl debug doc ecwj2k fits geos gif gml hdf hdf5 jpeg jpeg2k mysql \
-netcdf odbc png ogdi perl postgres python ruby sqlite threads"
-
-RDEPEND=">=sys-libs/zlib-1.1.4
-	>=media-libs/tiff-3.9.1
-	sci-libs/libgeotiff
-	dev-libs/expat
-	curl? ( net-misc/curl )
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	perl? ( dev-lang/perl )
-	python? ( virtual/python
-		dev-python/numpy )
-	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
-	fits? ( sci-libs/cfitsio )
-	ogdi? ( sci-libs/ogdi )
-	gml? ( >=dev-libs/xerces-c-3 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( dev-db/postgresql-base )
-	|| (
-	    netcdf? ( sci-libs/netcdf )
-	    hdf? ( sci-libs/hdf )
-	)
-	|| (
-	    jpeg2k? ( media-libs/jasper )
-	    ecwj2k? ( sci-libs/libecwj2 )
-	)
-	mysql? ( virtual/mysql )
-	odbc?   ( dev-db/unixODBC )
-	geos?   ( >=sci-libs/geos-2.2.1 )
-	sqlite? ( >=dev-db/sqlite-3 )"
-
-DEPEND="${RDEPEND}
-	perl? ( >=dev-lang/swig-1.3.32 )
-	python? ( >=dev-lang/swig-1.3.32 )
-	ruby? ( >=dev-lang/swig-1.3.32 )
-	doc? ( app-doc/doxygen )"
-
-AT_M4DIR="${S}/m4"
-
-pkg_setup() {
-	if [ -n "${GDAL_CONFIGURE_OPTS}" ]; then
-	    elog "User-specified configure options are ${GDAL_CONFIGURE_OPTS}."
-	else
-	    elog "User-specified configure options are not set."
-	    elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
-	fi
-}
-
-src_prepare() {
-	eaclocal
-	eautoconf
-
-	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
-	    "${FILESDIR}"/${PN}-1.5.0-soname.patch \
-	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
-	    "${FILESDIR}"/${PN}-1.6.0-swig-fix.patch \
-	    "${FILESDIR}"/${PN}-1.6.1-ruby-make.patch
-
-	if useq hdf && useq netcdf; then
-		ewarn "Netcdf and HDF4 are incompatible due to certain tools in"
-		ewarn "common; HDF5 is now the preferred choice for HDF data."
-		die "Please disable either the hdf or netcdf use flag."
-	fi
-}
-
-src_configure() {
-	local pkg_conf="${GDAL_CONFIGURE_OPTS}"
-	local use_conf=""
-
-	pkg_conf="${pkg_conf} --enable-shared=yes --with-pic \
-		--with-libgrass=no --without-libtool"
-
-	use_conf="$(use_with jpeg) $(use_with png) $(use_with mysql) \
-	    $(use_with postgres pg) $(use_with python) $(use_with ruby) \
-	    $(use_with threads) $(use_with fits cfitsio) $(use_with perl) \
-	    $(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)"
-
-	# 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 python ; then
-	    use_conf="--with-pymoddir=$(python_get_sitedir) \
-		${use_conf}"
-	fi
-
-	# Fix doc path just in case
-	sed -i -e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
-	    GDALmake.opt.in || die "sed gdalmake.opt failed"
-
-	econf ${pkg_conf} ${use_conf} || die "econf failed"
-}
-
-src_compile() {
-	local i
-	for i in perl ruby python; do
-		if useq $i; then
-			rm "${S}"/swig/$i/*_wrap.cpp
-			emake -C "${S}"/swig/$i generate || \
-				die "make generate failed for swig/$i"
-		fi
-	done
-
-	# parallel makes fail on the ogr stuff (C++, what can I say?)
-	# also failing with gcc4 in libcsf
-	emake -j1 || die "emake failed"
-
-	if useq python; then
-	    sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
-		swig/python/setup.cfg || die "sed python setup.cfg failed"
-	    sed -i -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
-		swig/python/GNUmakefile || die "sed python makefile failed"
-	fi
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_prep
-	    perl-module_src_compile
-	    cd "${S}"
-	fi
-
-	if useq doc ; then
-	    make docs || die "make docs failed"
-	fi
-}
-
-src_install() {
-
-	if useq perl ; then
-	    cd "${S}"/swig/perl
-	    perl-module_src_install
-	    sed -i -e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
-		GDALmake.opt
-	    cd "${S}"
-	fi
-
-	# einstall causes sandbox violations on /usr/lib/libgdal.so
-	emake DESTDIR="${D}" install \
-	    || die "make install failed"
-
-	dodoc 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
-
-	if useq python; then
-	    newdoc swig/python/README.txt README-python.txt
-	    dodir /usr/share/${PN}/samples
-	    insinto /usr/share/${PN}/samples
-	    doins swig/python/samples/*
-	fi
-
-	use perl && fixlocalpod
-}
-
-pkg_postinst() {
-	elog
-	elog "If you need libgrass support, then you must rebuild gdal, after"
-	elog "installing the latest Grass, and set the following option:"
-	elog
-	elog "GDAL_CONFIGURE_OPTS=--with-grass=\$GRASS_HOME emerge gdal"
-	elog
-	elog "GDAL is most useful with full graphics support enabled via various"
-	elog "USE flags: png, jpeg, gif, jpeg2k, etc. Also python, fits, ogdi,"
-	elog "geos, and support for either netcdf or HDF4 is available, as well as"
-	elog "grass, and mysql, sqlite, or postgres (grass support requires grass 6"
-	elog "and rebuilding gdal).  HDF5 support is now included."
-	elog
-	elog "Note: tiff and geotiff are now hard depends, so no USE flags."
-	elog "Also, this package will check for netcdf before hdf, so if you"
-	elog "prefer hdf, please emerge hdf with USE=szip prior to emerging"
-	elog "gdal.  Detailed API docs require doxygen (man pages are free)."
-	elog
-	elog "Check available image and data formats after building with"
-	elog "gdalinfo and ogrinfo (using the --formats switch)."
-	elog
-}
diff --git a/sci-libs/gdal/gdal-1.7.2.ebuild b/sci-libs/gdal/gdal-1.7.2.ebuild
new file mode 100644
index 000000000000..6cabc80bf1c9
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.7.2.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.7.2.ebuild,v 1.1 2010/07/30 12:27:51 scarabeus Exp $
+
+EAPI="3"
+
+WANT_AUTOCONF="2.5"
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby18"
+PYTHON_DEPEND="python? 2"
+inherit autotools eutils perl-module python ruby toolchain-funcs
+
+DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
+HOMEPAGE="http://www.gdal.org/"
+SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x86-linux ~x86-macos"
+
+IUSE="curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pam perl png postgres python ruby sqlite tiff threads"
+
+RDEPEND="
+	dev-libs/expat
+	sys-libs/zlib
+	curl? ( net-misc/curl )
+	ecwj2k? ( sci-libs/libecwj2 )
+	fits? ( sci-libs/cfitsio )
+	geos?   ( >=sci-libs/geos-2.2.1 )
+	gif? ( media-libs/giflib )
+	gml? ( >=dev-libs/xerces-c-3 )
+	hdf5? ( >=sci-libs/hdf5-1.6.4[szip] )
+	jpeg? ( media-libs/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf )
+	odbc?   ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	pam? ( sys-libs/pam )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng )
+	postgres? (
+		|| (
+			>=dev-db/postgresql-base-8.4
+			>=dev-db/postgresql-server-8.4
+		)
+	)
+	python? ( dev-python/numpy )
+	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
+	sqlite? ( >=dev-db/sqlite-3 )
+	tiff? (
+		>=media-libs/tiff-4.0.0_beta6
+		sci-libs/libgeotiff
+	)
+"
+
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	perl? ( >=dev-lang/swig-1.3.32 )
+	python? ( >=dev-lang/swig-1.3.32 )
+	ruby? ( >=dev-lang/swig-1.3.32 )
+"
+
+AT_M4DIR="${S}/m4"
+
+pkg_setup() {
+	# only py2 is supported
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# fix datadir and docdir placement
+	sed -i \
+		-e "s:@datadir@:@datadir@/gdal:" \
+		-e "s:@exec_prefix@/doc:@exec_prefix@/share/doc/${PF}/html:g" \
+		GDALmake.opt.in || die
+
+	sed -i \
+		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+		swig/python/GNUmakefile || die
+
+	epatch "${FILESDIR}"/${PV}-ruby_cflags.patch \
+		"${FILESDIR}"/${PN}-1.5.0-soname.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	if use ruby; then
+		RUBY_MOD_DIR=$(${RUBY} -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')
+	fi
+
+	# pcidsk is internal, because there is no such library yet released
+	# 	also that thing is developed by the gdal people
+	# kakadu, mrsid jp2mrsid - another jpeg2k stuff, ignore
+	# bsb - legal issues
+	# oracle - disabled, i dont have and can't test
+	# ingres - same story as oracle oci
+	econf \
+		--enable-shared \
+		--disable-static \
+		--with-expat \
+		--without-grass \
+		--without-hdf4 \
+		--without-fme \
+		--without-pcraster \
+		--without-kakadu \
+		--without-mrsid \
+		--without-jp2mrsid \
+		--without-msg \
+		--without-bsb \
+		--without-dods-root \
+		--without-oci \
+		--without-ingres \
+		--without-spatialite \
+		--without-dwgdirect \
+		--without-epsilon \
+		--without-idb \
+		--without-sde \
+		--with-libz="${EPREFIX}/usr/" \
+		--with-ogr \
+		--with-grib \
+		--with-vfk \
+		$(use_enable debug) \
+		$(use_with postgres pg) \
+		$(use_with fits cfitsio) \
+		$(use_with netcdf) \
+		$(use_with png) \
+		$(use_with jpeg) \
+		$(use_with jpeg pcidsk) \
+		$(use_with tiff libtiff) \
+		$(use_with tiff geotiff) \
+		$(use_with gif) \
+		$(use_with ogdi ogdi "${EPREFIX}"/usr) \
+		$(use_with hdf5) \
+		$(use_with jpeg2k jasper) \
+		$(use_with ecwj2k ecw) \
+		$(use_with gml xerces) \
+		$(use_with odbc) \
+		$(use_with curl) \
+		$(use_with sqlite sqlite3 "${EPREFIX}"/usr) \
+		$(use_with mysql mysql "${EPREFIX}"/usr/bin/mysql_config) \
+		$(use_with geos) \
+		$(use_with pam) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with python) \
+		--with-pymoddir=${EPREFIX}/$(python_get_sitedir)
+
+	# mysql-config puts this in (and boy is it a PITA to get it out)
+	if use mysql; then
+		sed -i \
+	    	-e "s: -rdynamic : :" \
+		    GDALmake.opt || die "sed LIBS failed"
+	fi
+
+	# updated for newer swig (must specify the path to input files)
+	if use python; then
+	    sed -i \
+			-e "s: gdal_array.i: ../include/gdal_array.i:" \
+	        -e "s:\$(DESTDIR)\$(prefix):\$(DESTDIR)\$(INST_PREFIX):g" \
+	        swig/python/GNUmakefile || die "sed python makefile failed"
+	    sed -i \
+			-e "s:library_dirs = :library_dirs = /usr/$(get_libdir)::g" \
+	        swig/python/setup.cfg || die "sed python setup.cfg failed"
+	fi
+}
+
+src_compile() {
+	local i
+	for i in perl ruby python; do
+		if use $i; then
+			rm "${S}"/swig/$i/*_wrap.cpp
+			emake -C "${S}"/swig/$i generate || \
+				die "make generate failed for swig/$i"
+		fi
+	done
+
+	# parallel makes fail
+	emake -j1 || die "emake failed"
+
+	if use perl ; then
+	    cd "${S}"/swig/perl
+	    perl-module_src_prep
+	    perl-module_src_compile
+	    cd "${S}"
+	fi
+
+	if use doc ; then
+	    make docs || die "make docs failed"
+	fi
+}
+
+src_install() {
+	if use perl ; then
+	    pushd "${S}"/swig/perl > /dev/null
+	    perl-module_src_install
+		popd > /dev/null
+	    sed -i \
+			-e "s:BINDINGS        =       python ruby perl:BINDINGS        =       python ruby:g" \
+			GDALmake.opt || die
+	fi
+
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	if use ruby ; then
+	    # weird reinstall collision; needs manual intervention...
+	    pushd "${S}"/swig/ruby > /dev/null
+	    rm -rf "${D}"${RUBY_MOD_DIR}/gdal
+	    exeinto ${RUBY_MOD_DIR}/gdal
+	    doexe *.so || die "doins ruby modules failed"
+	    popd > /dev/null
+	fi
+
+	use perl && fixlocalpod
+
+	dodoc Doxyfile HOWTO-RELEASE NEWS || die
+
+	if use doc ; then
+	    dohtml html/* || die "install html failed"
+	    docinto ogr
+	    dohtml ogr/html/* || die "install ogr html failed"
+	fi
+
+	if use python; then
+	    newdoc swig/python/README.txt README-python.txt || die
+	    insinto /usr/share/${PN}/samples
+	    doins swig/python/samples/* || die
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}