Updated to latest upstream release; closes bug #303557.

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

3 files changed, 218 insertions, 2 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 81ac2f00f872..4b8e7a00e4fe 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # 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.71 2010/01/23 20:21:34 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.72 2010/02/15 08:24:18 nerdboy Exp $
+
+*gdal-1.6.3 (15 Feb 2010)
+
+  15 Feb 2010; Steve Arnold <nerdboy@gentoo.org> +gdal-1.6.3.ebuild:
+  Updated to latest upstream release; closes bug #303557.
 
   23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> gdal-1.6.2.ebuild:
   Replace dep postgresql-server to postgresql-base
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 7ebda24124af..163a6c9355b2 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -11,10 +11,12 @@ DIST gdal-1.5.3.tar.gz 6194379 RMD160 3178dc1cc76e79071c77ad1cca0c8e23bcb91ef3 S
 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
 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 6653 RMD160 271dc8fb8ac3b8941a008f5459fe5c9264060f51 SHA1 5f5d5179d95a9c69e888641276d5202f0061782c SHA256 ca12c8f828064b7a6a5340a97a495799d767df095a3fbe9db39e4e656ebf2142
 EBUILD gdal-1.6.1.ebuild 6212 RMD160 99cf716528a26e78679a7a31294a4dd62ca8276d SHA1 12ca0bca2aa8cce4ffc6c5cd6d68f60ee3204e08 SHA256 a59d633b5304e4c9b27f9996fddb502fb335cc188ab1179ad8010e2cdaaa7c42
 EBUILD gdal-1.6.2.ebuild 6212 RMD160 14649f0621f21e37c1554e5a3aa04c34667a59a6 SHA1 e529bd007d9dbc10e98e846a725d5379b7740d3d SHA256 73222b5d9f27a13266f60c96fba9d1f6d30df762a2eb939d22c39660a1f7ebb0
-MISC ChangeLog 13980 RMD160 d798206aa9a04d373348ac6acebea154281c4b32 SHA1 0f8bf5365aeccd7e04e3a45313658cc4ce657f6a SHA256 edb0ca5292a56a823bf0c9c7e58c4481e9ffdbccc4ca9b2d97a14f3988ecf0ec
+EBUILD gdal-1.6.3.ebuild 6187 RMD160 e8df3ed408c0f0970e497650a415715f4790e38f SHA1 db564ed5e56d789d7e80be7af6015eba4d44ee9e SHA256 f70e975e67c364c1ae48a9a1af37d736026fe06302dbaeac38a313bc5c59a7fa
+MISC ChangeLog 14133 RMD160 c8076994212f724a613df4ee6bc04fea0aec3941 SHA1 98da54f51fa483a936af77c8183cf34a5a816a6e SHA256 6815a105e533f4433c66dc9e7cda6ac26146ab10e2f8240ebbcf3e7c57f7c7fe
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/gdal-1.6.3.ebuild b/sci-libs/gdal/gdal-1.6.3.ebuild
new file mode 100644
index 000000000000..3d13a837e60a
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.6.3.ebuild
@@ -0,0 +1,209 @@
+# 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.1 2010/02/15 08:24:18 nerdboy 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? ( virtual/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? ( 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_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() {
+
+	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:@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
+}