Removed older versions (see bug #271137) and marked 1.5.2 stable for ppc

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

8 files changed, 11 insertions, 863 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index f9af7c6417a5..2abce285d157 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.58 2009/04/28 05:33:37 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.59 2009/06/17 04:45:59 nerdboy Exp $
+
+  17 Jun 2009; Steve Arnold <nerdboy@gentoo.org> -gdal-1.3.1.ebuild,
+  -gdal-1.3.2.ebuild, -gdal-1.4.2.ebuild, -gdal-1.5.0-r1.ebuild,
+  -gdal-1.5.1.ebuild, gdal-1.5.2.ebuild:
+  Removed older versions (see bug #271137) and marked 1.5.2 stable for ppc
+  (which it should have been already, but I tested it on efika anyway).
 
   28 Apr 2009; Steve Arnold <nerdboy@gentoo.org>
   +files/gdal-1.6.0-ruby-make.patch:
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 4c018e7360c7..b448e583cd44 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -13,21 +13,11 @@ AUX gdal-1.5.2-xerces-64-bit.patch 2002 RMD160 3e8386a5d4127881a299344c36f18e984
 AUX gdal-1.6.0-ruby-make.patch 1071 RMD160 ec020c5c22a397e248363232197358ea0e9eb6de SHA1 d7b5a568da01dd83f46fee897f8622db3b6b6db2 SHA256 4a027ce95da9ab870676e097239b83d40e87b199852590854bbe349b18c7ac4e
 AUX gdal-1.6.0-swig-fix.patch 535 RMD160 a3946ac3897d73d09be2d03f1f8a5facef7301ba SHA1 9b3214e7ffe6aa821d716caf3e984841f6e208fd SHA256 83f4de0287893efbc4528a0e4ecc97e0f174d5a44406a8ab5e94e66e51286db1
 AUX gdal-gcc4.patch 472 RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 SHA1 9cbba5ebf35e2ca90386e4ddcd53c47a748f4597 SHA256 25f4b1a67063373536407d23eb98bc98752b5341c1a4556e18906e2077d1d5ae
-DIST gdal-1.3.1.tar.gz 6856011 RMD160 5967608e6e1c9f0af8698fcffb58eab4dcdd518d SHA1 2783c4c0d2a83a34f4c5c6a8efe41e816ba396fb SHA256 4f8f3c462f9174e1dd99f7bfa2abe010aa129e04c08a242a3c63c1a9e5078753
-DIST gdal-1.3.2.tar.gz 7279872 RMD160 98c7f33bc3a57364e9ca15bf61d11d45f147b8ad SHA1 eda247dd96558ff79f843fb7b4393bf62cb01644 SHA256 00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87
-DIST gdal-1.4.2.tar.gz 7457778 RMD160 d4e2c09b4ec4ef3eb6a4da0e832168ef89878860 SHA1 42fc753f6fa70a66b9e619365575bcfb60a5003d SHA256 ee6e74cb80f47929fcfe8426fb024c2b195d237612be4d9a0795e9e353f588ee
-DIST gdal-1.5.0.tar.gz 6167411 RMD160 25326301edbc88739fce6f33b42dfb9499842896 SHA1 c049d29f530f1867e4edcf36b1a299c96a9327a1 SHA256 9ac75f8928aa649a70e2aa3ebda86e71e18acc295cd874c43d33a84ac11c1e91
-DIST gdal-1.5.1.tar.gz 6176140 RMD160 4f0557edaf99e89cbaa540bfdbf8fa8b352204c6 SHA1 e188b82f0c4f12c6925afecfde742e3eab627d49 SHA256 407794d5846d18673df71ece278707ddb209d505a100335e21d6489a09f290fe
 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
-EBUILD gdal-1.3.1.ebuild 4494 RMD160 b541687c1986642f0f349f3015193bf9933d7286 SHA1 e436f344239742988c09114c6de8f3e9f0f2b73e SHA256 c7c6c51111517578b13a26d1ae7e8540057d407cba85b51d4d62d6d5d5f21c56
-EBUILD gdal-1.3.2.ebuild 4789 RMD160 88e7bcf13b6b130b821a211cc3e121716546556e SHA1 a4a1509900a66b50a078821e194d0b3961e74ebd SHA256 f366838204d1c35efe2af33633a37c2ab7598883c71d8b0898cccdc7af9a2294
-EBUILD gdal-1.4.2.ebuild 4660 RMD160 437566fd4915ca05388e0fcd4c4ce6f63079b779 SHA1 a74e39f5ce6946b623ea74a5a28b0133a1b071a8 SHA256 d021e6cc88f1b6a98c3422bfb43f463563c024d77666277a424a518901d07be1
-EBUILD gdal-1.5.0-r1.ebuild 6127 RMD160 3282266d87f529fc5f34874886547e0dc56528ff SHA1 ce429086a266ba00d04aa5f69a62cdd228aacf51 SHA256 c6458586043fbfd15de9b09640a6e12fa55a611dcbdf64a91922c297c3531df4
-EBUILD gdal-1.5.1.ebuild 6181 RMD160 fab38e35517ecb614fd06b25a01e6deb7f495cbd SHA1 cfb48b1ef59cb36f8d70e2d0638dfe553e641c7d SHA256 b5169d89b0f260cae069d41d36f5d69e700fcdf27b6172282458520b365f6acf
-EBUILD gdal-1.5.2.ebuild 6420 RMD160 8647e5beb496b3fca5e3616cb7839f749fc2f85a SHA1 ea96e14b1ddf131f075e9c06d61b3d2d98a831b9 SHA256 2e74fe78c00fb02cd61bcc484493f9ec069ad86676b7bca0dfe50f9c5c0164a4
+EBUILD gdal-1.5.2.ebuild 6420 RMD160 0619a3660937eda53d501235d3b95de7f492e13f SHA1 3d0a948f9959ad3b0e232476fe77345db6d727b8 SHA256 c09aabaa7019c25adf18763d16bfde2d5b4e801dc2a4747cc22155e1f5767fce
 EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SHA1 b810791d98d84867812cd6700558b00cf32ce03d SHA256 995c6f2b68fd78234580d7612f720ad6d3dc398dec707c65236c17cfcd1b322f
 EBUILD gdal-1.6.0-r1.ebuild 6544 RMD160 5a1341a5c0458249dbd5f7ff5412776c7dfc6c00 SHA1 c21106d24615110821f9818e1aff86413a3f5aec SHA256 74af1e59daa5d0bd966df71adbff0fe7125f43401401c690d69fa0422ccf5556
-MISC ChangeLog 11583 RMD160 828024c7e5971c059ff000c69b03609b871859bf SHA1 c3091e28c216a76f0b5d7254678666ac1e5c1478 SHA256 04e7603695be256863b64cc06b9f18fff6b6f669890efad0791e15eac6cb1b94
+MISC ChangeLog 11906 RMD160 d3cdff6dc8ef7033e8d96758fbc42272f96629af SHA1 6753f48e68fd86e70a9bdbee9a4a69238035bc02 SHA256 192c55747e0ec1a59d64d818fcb8b2f7ee78f442436b8867d280d8e8bcc3d6ac
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/gdal-1.3.1.ebuild b/sci-libs/gdal/gdal-1.3.1.ebuild
deleted file mode 100644
index af06c1e9f582..000000000000
--- a/sci-libs/gdal/gdal-1.3.1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2008 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.18 2008/10/18 19:08:36 nerdboy Exp $
-
-inherit eutils libtool distutils toolchain-funcs
-
-IUSE="jpeg png geos gif jpeg2k 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 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
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	python? ( dev-lang/python )
-	fits? ( sci-libs/cfitsio )
-	ogdi? ( sci-libs/ogdi )
-	gml? ( <dev-libs/xerces-c-2.8.0 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( virtual/postgresql-server )
-	|| (
-	    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 )"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-installpathfix.patch" || die "installpath patch failed"
-	if [ $(gcc-major-version) -eq 4 ] ; then
-	    epatch "${FILESDIR}/${PN}-gcc4.patch" || die "gcc4 patch failed"
-	fi
-	elibtoolize --patch-only
-	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-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 jpeg2k 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 || 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?)
-	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, jpeg2k, 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)."
-}
diff --git a/sci-libs/gdal/gdal-1.3.2.ebuild b/sci-libs/gdal/gdal-1.3.2.ebuild
deleted file mode 100644
index 4218ac4c7a25..000000000000
--- a/sci-libs/gdal/gdal-1.3.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2008 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.8 2008/10/18 19:08:36 nerdboy Exp $
-
-inherit eutils libtool distutils toolchain-funcs
-
-IUSE="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"
-
-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
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
-	fits? ( sci-libs/cfitsio )
-	ogdi? ( sci-libs/ogdi )
-	gml? ( <dev-libs/xerces-c-2.8.0 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( virtual/postgresql-server )
-	|| (
-	    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 )"
-
-DEPEND="${RDEPEND}
-	ruby? ( >=dev-lang/swig-1.3.28 )
-	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"
-	fi
-	elibtoolize --patch-only
-	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-pic \
-		--with-libgrass=no"
-
-	use_conf="$(use_with jpeg) $(use_with png) $(use_with ruby) \
-	    $(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)"
-	    # 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 || 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
-	make || die "make failed"
-	if useq ruby ; then
-	    cd "${S}"/swig
-	    make build || die "make ruby failed"
-	    cd "${S}"
-	fi
-	if useq doc ; then
-	    make docs || die "make 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, jpeg2k, 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)."
-}
diff --git a/sci-libs/gdal/gdal-1.4.2.ebuild b/sci-libs/gdal/gdal-1.4.2.ebuild
deleted file mode 100644
index ded2d03f92d4..000000000000
--- a/sci-libs/gdal/gdal-1.4.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.4.2.ebuild,v 1.6 2008/10/18 19:08:36 nerdboy Exp $
-
-inherit eutils libtool distutils toolchain-funcs
-
-IUSE="debug doc fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf \
-	odbc png ogdi postgres python ruby sqlite"
-
-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
-	jpeg? ( media-libs/jpeg )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	python? ( dev-lang/python )
-	ruby? ( >=dev-lang/ruby-1.8.4.20060226 )
-	fits? ( sci-libs/cfitsio )
-	ogdi? ( sci-libs/ogdi )
-	gml? ( <dev-libs/xerces-c-2.8.0 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( virtual/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 )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-datadir.patch" || die "epatch failed"
-	epatch "${FILESDIR}/${P}-ruby-install.patch" || die "epatch failed"
-
-	elibtoolize --patch-only
-
-	if useq netcdf && 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
-	fi
-}
-
-src_compile() {
-	distutils_python_version
-
-	pkg_conf="--enable-static=no --enable-shared=yes --with-pic \
-		--with-libgrass=no"
-
-	use_conf="$(use_with jpeg) $(use_with png) $(use_with ruby) \
-	    $(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 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 || 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 "make failed"
-	if useq ruby ; then
-	    cd "${S}"/swig
-	    make build || die "make ruby failed"
-	    cd "${S}"
-	fi
-	if useq doc ; then
-	    make docs || die "make 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, jpeg2k, 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)."
-}
diff --git a/sci-libs/gdal/gdal-1.5.0-r1.ebuild b/sci-libs/gdal/gdal-1.5.0-r1.ebuild
deleted file mode 100644
index cadcf23307bb..000000000000
--- a/sci-libs/gdal/gdal-1.5.0-r1.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.0-r1.ebuild,v 1.5 2008/10/12 02:38:16 nerdboy 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-2.8.0 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( virtual/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
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	eaclocal
-	eautoconf
-
-	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
-	    "${FILESDIR}"/${P}-python-install.patch \
-	    "${FILESDIR}"/${P}-soname.patch \
-	    "${FILESDIR}"/${P}-makefile.patch
-
-	if useq netcdf && 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
-	fi
-}
-
-src_compile() {
-	distutils_python_version
-
-	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=/usr/$(get_libdir)/python${PYVER}/site-packages \
-		${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 GNUmakefile 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
-}
-
-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.1.ebuild b/sci-libs/gdal/gdal-1.5.1.ebuild
deleted file mode 100644
index 88a9e657b44f..000000000000
--- a/sci-libs/gdal/gdal-1.5.1.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.1.ebuild,v 1.2 2008/05/21 19:01:41 dev-zero 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-2.8.0 )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
-	postgres? ( virtual/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
-}
-
-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}"/${P}-python-install.patch \
-	    "${FILESDIR}"/${P}-max-min.patch
-
-	if useq netcdf && 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
-	fi
-}
-
-src_compile() {
-
-	distutils_python_version
-
-	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=/usr/$(get_libdir)/python${PYVER}/site-packages \
-		${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
-}
-
-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.2.ebuild b/sci-libs/gdal/gdal-1.5.2.ebuild
index c1da150bea12..9e54ada59141 100644
--- a/sci-libs/gdal/gdal-1.5.2.ebuild
+++ b/sci-libs/gdal/gdal-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.8 2009/03/02 19:51:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild,v 1.9 2009/06/17 04:45:59 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -14,7 +14,7 @@ SRC_URI="http://download.osgeo.org/gdal/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~ppc ppc64 sparc x86"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
 # need to get these arches updated on several libs first
 #KEYWORDS="~alpha ~hppa"