updated to latest version, but no ecw or oracle support just yet

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25.6 x86_64

3 files changed, 215 insertions, 2 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index a183a6bd1171..ff102c4c322b 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.43 2008/05/21 19:01:41 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.44 2008/07/05 17:17:41 nerdboy Exp $
+
+*gdal-1.5.2 (05 Jul 2008)
+
+  05 Jul 2008; Steve Arnold <nerdboy@gentoo.org> +gdal-1.5.2.ebuild:
+  Updated to latest version, but no ecw or oracle support just yet (see
+  bug #230802 for the blocking issue).
 
   21 May 2008; Tiziano Müller <dev-zero@gentoo.org> gdal-1.3.1.ebuild,
   gdal-1.3.2.ebuild, gdal-1.4.2.ebuild, gdal-1.5.0-r1.ebuild,
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index d252f18dde58..baeaddba154f 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -15,10 +15,12 @@ DIST gdal-1.3.2.tar.gz 7279872 RMD160 98c7f33bc3a57364e9ca15bf61d11d45f147b8ad S
 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
 EBUILD gdal-1.3.1.ebuild 4433 RMD160 90e75e8762d254918901259d7fc18878f9c944d2 SHA1 4adf098db1b6137147b698d1f09f427f0a2ec6ac SHA256 4047d6abc8395e3cfb5e789fa0429b949ce8d9732ca11661e214691499c0f1e7
 EBUILD gdal-1.3.2.ebuild 4719 RMD160 9170b33c5836b334fdf36262f56e1e51bab900d2 SHA1 9d0e952e7be7fbfce3d3f94b0ea9aec9a90445d2 SHA256 e7bb8a9c9d110189b22e3938b5740bcc4c12c8c10156d4c95d0f50e9cfdc4ff4
 EBUILD gdal-1.4.2.ebuild 4590 RMD160 5f0abae2511ec0cbfafc123309a973c8dc6690aa SHA1 acbde4df8ef2ca27e2a7b2ca4e67015aa06ec925 SHA256 662631ab4afd12657bc62934a1b3813e68bb11fba8dbff32f417c857b1f71766
 EBUILD gdal-1.5.0-r1.ebuild 6012 RMD160 4f3330a8ad52f5a5a574349074a4f18f697f2617 SHA1 200e710a186c01d9db25fde6218551c94f969903 SHA256 2a6252b3eb34a685fbb5de2e9e9c1a741814e9bd59fb72061028124312466d5a
 EBUILD gdal-1.5.1.ebuild 6181 RMD160 fab38e35517ecb614fd06b25a01e6deb7f495cbd SHA1 cfb48b1ef59cb36f8d70e2d0638dfe553e641c7d SHA256 b5169d89b0f260cae069d41d36f5d69e700fcdf27b6172282458520b365f6acf
-MISC ChangeLog 8566 RMD160 ea94281844bdb79cb916fe94f9d26d6a0d80308b SHA1 8e9f00744b0b701e40ef1674095f04f00c0d3cf6 SHA256 2722146a6c202968a1466adeaee925a7ccfc75c2b3ec006d64950f7fb063dd66
+EBUILD gdal-1.5.2.ebuild 6147 RMD160 548f582c8f25f9df5186cdc444b56920e9e2f7cc SHA1 62f7eed12ee64235e5c66d31e3101dd2068a71bf SHA256 575fb78144fba6bcbf2e83b3dd77db8200f9ad8421af66fdc2984e7e68637e38
+MISC ChangeLog 8773 RMD160 629dcabc53f68a691b7d48a18d082511092a27fd SHA1 ef7debd6be979cdbc2c480292af143f6a93b6e7a SHA256 d6b834248f5ff07151ec71e58e10c54c1d52b7c8d70e8879764d0d207c47b7da
 MISC metadata.xml 493 RMD160 8ad930d21e928734d6c22796abc6da27f420eb4d SHA1 d97adc27fa58d040e92e93d17fce2f666090ad36 SHA256 1f6fdd4665a2c5e8f6f53e3d7d1b05ab2696eb23af60d7f430e20b2b3022b958
diff --git a/sci-libs/gdal/gdal-1.5.2.ebuild b/sci-libs/gdal/gdal-1.5.2.ebuild
new file mode 100644
index 000000000000..3c79f4e5935a
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.5.2.ebuild
@@ -0,0 +1,205 @@
+# 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.2.ebuild,v 1.1 2008/07/05 17:17:41 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}"/${PN}-1.5.0-soname.patch \
+	    "${FILESDIR}"/${PN}-1.5.0-makefile.patch \
+	    "${FILESDIR}"/${PN}-1.5.1-python-install.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
+}