Updated to latest upstream version (fixes bug #253363) but back to -j1.

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

4 files changed, 233 insertions, 5 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 7e8a32f4615f..3dd8d83dfcba 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,15 @@
 # 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.55 2009/03/02 19:51:15 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.56 2009/04/11 17:07:01 nerdboy Exp $
+
+*gdal-1.6.0 (11 Apr 2009)
+
+  11 Apr 2009; Steve Arnold <nerdboy@gentoo.org> +gdal-1.6.0.ebuild,
+  gdal-1.5.3.ebuild:
+  Updated to latest upstream version (fixes bug #253363) but had to revert 
+  to -j1 again to address reported build failures.  Also updated swig dep 
+  for the three supported bindings (perl, python, ruby).  Feel free to 
+  test the experimental java bindings and report success/failure.
 
   02 Mar 2009; Brent Baude <ranger@gentoo.org> gdal-1.5.2.ebuild:
   Marking gdal-1.5.2 ppc64 for bug 241500
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a470250da7d6..b05b158c5232 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -18,12 +18,14 @@ DIST gdal-1.5.0.tar.gz 6167411 RMD160 25326301edbc88739fce6f33b42dfb9499842896 S
 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.3.ebuild 6506 RMD160 117fed9efd494912e93b9350670254d029ee8ce6 SHA1 f783a97435b9362dea12d37505dfe7f61e8ca920 SHA256 da5aeac2ad5a509137dff11b29b97cab673752b6c374e92ebe6438b16dac6179
-MISC ChangeLog 10772 RMD160 8b30adc5962fb8108f43b1e4b9663c9983d5efea SHA1 8d676be5d676fb5b2b8e9c081fc92d3e85341937 SHA256 aa9e94deaf2eae8398adc2f229b5987ec3d3ac091cd0689057808abb6a54ebb6
+EBUILD gdal-1.5.3.ebuild 6510 RMD160 f3ed966b180a4dc169c00c3fbfa0d2095759b78e SHA1 b810791d98d84867812cd6700558b00cf32ce03d SHA256 995c6f2b68fd78234580d7612f720ad6d3dc398dec707c65236c17cfcd1b322f
+EBUILD gdal-1.6.0.ebuild 6458 RMD160 cf64645b1628f9a31ef9c1e65dd03ba8ca76fe25 SHA1 f74b6583a1e1f4005fff28466155fb10f344c747 SHA256 ad9e64beb369d54e42b8b427eae062a63d6900cd05a8f88af11999978b473c23
+MISC ChangeLog 11180 RMD160 a0c4112d62e7780265f69942abb8030fd2b42a54 SHA1 a09c63aece946030035335dfde3bc8c9fe47ac6a SHA256 faa7ea382a5d95e1aec8de581d01575fb4ec2031e76d00219d1589828927af2e
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/gdal-1.5.3.ebuild b/sci-libs/gdal/gdal-1.5.3.ebuild
index 03f9ff429c5c..bbbb67e05b53 100644
--- a/sci-libs/gdal/gdal-1.5.3.ebuild
+++ b/sci-libs/gdal/gdal-1.5.3.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.3.ebuild,v 1.3 2009/02/18 04:03:47 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.3.ebuild,v 1.4 2009/04/11 17:07:01 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -141,7 +141,7 @@ src_compile() {
 
 	# parallel makes fail on the ogr stuff (C++, what can I say?)
 	# also failing with gcc4 in libcsf
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 
 	if useq python; then
 	    sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
diff --git a/sci-libs/gdal/gdal-1.6.0.ebuild b/sci-libs/gdal/gdal-1.6.0.ebuild
new file mode 100644
index 000000000000..20dd20b8e026
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.6.0.ebuild
@@ -0,0 +1,217 @@
+# 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.6.0.ebuild,v 1.1 2009/04/11 17:07:01 nerdboy 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? ( virtual/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 \
+	    || 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() {
+
+	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
+
+	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
+}