Updated for zlib header changes (closes bug #383569). Thanks to Ed

Catmur for the patch suggestion.

Package-Manager: portage-2.1.10.19/cvs/Linux x86_64

4 files changed, 291 insertions, 12 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 9a895f6a2790..19703bf9e21f 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.118 2011/07/26 16:21:29 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.119 2011/09/26 03:33:45 nerdboy Exp $
+
+*gdal-1.8.1-r1 (26 Sep 2011)
+
+  26 Sep 2011; Steve Arnold <nerdboy@gentoo.org> +gdal-1.8.1-r1.ebuild,
+  +files/gdal-1.8.1-zlib_header_fix.patch:
+  Updated for zlib header changes (closes bug #383569).  Also updated
+  python handling and EAPI.
 
   26 Jul 2011; Jesus Rivero <neurogeek@gentoo.org> gdal-1.8.1.ebuild:
   Added python_mod_cleanup in pkg_postrm
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 0f5387783c9b..3c9254169c1a 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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
@@ -8,17 +5,12 @@ AUX gdal-1.5.0-soname.patch 483 RMD160 4ed5e17c3b1e50a1d0bbb52a1d3a56f5bec52aa4
 AUX gdal-1.5.1-python-install.patch 493 RMD160 f925c5b902a14f4a75a8c6a7816c3e500a59c24e SHA1 7c02ab132485d1486751d45663af21aa9a04ace1 SHA256 122555483fcb811df1f305b20c9c492c64575321b4e834c75a2805ca8e62f593
 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.8.1-zlib_header_fix.patch 253 RMD160 0c2f1483ea373f596a6bbf0c86ba0f11094ef232 SHA1 04df59a10d1ad719742dd40b0d0225bad053a78d SHA256 019d7a858670aa4651b5c887db4f951d906fd3395e12f3f3a570295fcc171b89
 AUX gdal-png-1.5.patch 1422 RMD160 5177f60d44189289fefc98ec8f59645b880b7362 SHA1 63c3290883f6f9f70fe6ec9cd2c3e37becaeee7b SHA256 c7a5c4584b60c653b0f2116d9898e5110fe0e29d175a2fc00d34d36487856418
 DIST gdal-1.6.3.tar.gz 7007613 RMD160 aab37ae4b7a98f9af6c10511e2ce5205505b9769 SHA1 b8fc53f562dd253c0c75e9ea4d4398f9548c1f1f SHA256 bf946aa229eef28f3d95c8bbf75913aa2d89dd93a03c5cc769cd7c8b98890c67
 DIST gdal-1.8.1.tar.gz 8852355 RMD160 4ac1cd59979464bd37b4d2aa588092ee0c34d45c SHA1 b2f8b12ebdd00c05bc7f1ab7b761d9ac335c470c SHA256 d5d76b85b4a7a0e28ead6c92be0eba9e2b2361a06db0a60ef0fb85db63e7a5df
 EBUILD gdal-1.6.3-r1.ebuild 6735 RMD160 5e29a11f00004e879c12b774597b19d0b5b7947e SHA1 9b389f851c4c577ecd638a0ba18b2488ccb9c86f SHA256 82eed125dcc005990b7f1e9d223308c1d00cdf47a1b33ca966488c56b3ace9e3
+EBUILD gdal-1.8.1-r1.ebuild 6759 RMD160 42217a61a288042e6dfd822ca28cb2b0b1805c67 SHA1 c4145e3c028b41a25998e64364ff4db08581875b SHA256 f2be63285978082e5ad646b025fa685c98bb536b2cef28c14f5ac9615f67f89f
 EBUILD gdal-1.8.1.ebuild 6617 RMD160 921a18ca9653a18f0fb32ede2b2b9185271a8d5b SHA1 1384de09c51d7309d7d891d744354b8bb0d763c8 SHA256 a96ab13343f3a88a6253bc05586056c08c404f92c5f633281a54c5c8a0619916
-MISC ChangeLog 21947 RMD160 dcd0e759652a8a0a8b6d1842166714dc751f571c SHA1 1e65cd93ce6ff44c871aaba4d217ea744004f399 SHA256 92a9aa6625ab12839e7c3ae4c88e3447cfc42f5585b1231edfcd0f97fcf03e4c
+MISC ChangeLog 22189 RMD160 a9adddf40ded086bcb63fd6b50b079c202c3edb6 SHA1 b3de1753e5f1cfb9e1c56ab41df408f31eb32d75 SHA256 412766299d04b1f5f6f2173b1c03844eff79accac9e1b096d973d4048ecf9a33
 MISC metadata.xml 1183 RMD160 a095695d479404c183e066274335dacc408bd406 SHA1 0c07b2188a4e5e2cff50ba6355a1543e7f70ed57 SHA256 789b3c4b281326a6c763ac9a62f3e1ef82ddf679e71bc7d1a1849d3772a4323e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAk4u6bIACgkQdIssYB9vBoMtLQCeLFeR8eYfmCS0xhpwZtASQpl3
-v5IAnRYtCByieQBzkODY3kdniuambIPo
-=c2Xi
------END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch b/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch
new file mode 100644
index 000000000000..04777c8cdbb1
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.8.1-zlib_header_fix.patch
@@ -0,0 +1,13 @@
+--- port/cpl_minizip_ioapi.h.orig	2011-09-25 13:38:22.000000000 -0700
++++ port/cpl_minizip_ioapi.h	2011-09-25 13:39:22.000000000 -0700
+@@ -41,6 +41,10 @@
+ #endif
+ #endif
+ 
++#ifndef OF
++#define OF(x) x
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
diff --git a/sci-libs/gdal/gdal-1.8.1-r1.ebuild b/sci-libs/gdal/gdal-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..aad8d461292e
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.8.1-r1.ebuild
@@ -0,0 +1,267 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.8.1-r1.ebuild,v 1.1 2011/09/26 03:33:45 nerdboy Exp $
+
+EAPI=3
+
+WANT_AUTOCONF="2.5"
+
+RUBY_OPTIONAL="yes"
+USE_RUBY="ruby18"
+
+PYTHON_DEPEND="python? 2:2.6"
+
+inherit autotools eutils libtool perl-module python ruby-ng toolchain-funcs
+
+DESCRIPTION="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 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+
+IUSE="+aux_xml curl debug doc ecwj2k fits geos gif gml hdf5 jpeg jpeg2k mysql netcdf odbc ogdi pdf perl png postgres python ruby sqlite threads"
+
+RDEPEND="
+	dev-libs/expat
+	media-libs/tiff
+	sci-libs/libgeotiff
+	( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) )
+	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? ( virtual/jpeg )
+	jpeg2k? ( media-libs/jasper )
+	mysql? ( virtual/mysql )
+	netcdf? ( sci-libs/netcdf )
+	odbc?   ( dev-db/unixODBC )
+	ogdi? ( sci-libs/ogdi )
+	pdf? ( app-text/poppler )
+	perl? ( dev-lang/perl )
+	png? ( media-libs/libpng )
+	postgres? ( >=dev-db/postgresql-base-8.4 )
+	python? ( dev-python/numpy )
+	ruby? ( $(ruby_implementation_depend ruby18) )
+	sqlite? ( >=dev-db/sqlite-3 )"
+
+SWIG_DEP=">=dev-lang/swig-2.0.2"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	perl? ( ${SWIG_DEP} )
+	python? ( ${SWIG_DEP} )
+	ruby? ( ${SWIG_DEP} )"
+
+AT_M4DIR="${S}/m4"
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_unpack() {
+	# prevent ruby-ng.eclass from messing with the src path
+	default
+}
+
+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
+
+	# the second sed expression should fix bug 371075
+	sed -i \
+		-e "s:setup.py install:setup.py install --root=\$(DESTDIR):" \
+		-e "s:--prefix=\$(DESTDIR):--prefix=:" \
+		swig/python/GNUmakefile || die
+
+	epatch "${FILESDIR}"/1.7.2-ruby_cflags.patch
+
+	# -soname is only accepted by GNU ld/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& epatch "${FILESDIR}"/${PN}-1.5.0-install_name.patch \
+		|| epatch "${FILESDIR}"/${PN}-1.5.0-soname.patch
+
+	# Update for zlib header changes (see bug #383569)
+	epatch "${FILESDIR}"/${P}-zlib_header_fix.patch
+
+	# autoheader fail
+	eaclocal
+	eautoconf
+	eautomake
+	elibtoolize
+}
+
+src_configure() {
+	if use ruby; then
+		RUBY_MOD_DIR="$(ruby18 -r rbconfig -e 'print Config::CONFIG["sitearchdir"]')"
+		echo "Ruby module dir is: $RUBY_MOD_DIR"
+	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
+	# tiff is a hard dep
+	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 \
+		--without-libtool \
+		--with-libz="${EPREFIX}/usr/" \
+		--with-ogr \
+		--with-grib \
+		--with-vfk \
+		--with-libtiff=external \
+		--with-geotiff=external \
+		$(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 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 aux_xml pam) \
+		$(use_with pdf poppler) \
+		$(use_with perl) \
+		$(use_with ruby) \
+		$(use_with python) \
+		$(use_with threads) \
+		--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 || die "emake failed"
+
+	if use perl ; then
+		pushd "${S}"/swig/perl > /dev/null
+		perl-module_src_prep
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+
+	if use doc ; then
+		emake 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() {
+	if use python; then
+		python_need_rebuild
+		python_mod_optimize osgeo
+	fi
+	echo
+	elog "Check available image and data formats after building with"
+	elog "gdalinfo and ogrinfo (using the --formats switch)."
+}
+
+pkg_postrm() {
+	if use python; then
+		python_mod_cleanup osgeo
+	fi
+}