update to latest release (fixes bug 182306)

Package-Manager: portage-2.1.3_rc6

6 files changed, 211 insertions, 15 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 866dfd7c8bc5..a0829d813fc9 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.31 2007/01/05 09:08:46 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.32 2007/07/03 20:12:55 nerdboy Exp $
+
+*gdal-1.4.2 (02 Jul 2007)
+
+  02 Jul 2007; Steve Arnold <nerdboy@gentoo.org>
+  +files/gdal-1.4.2-datadir.patch, +files/gdal-1.4.2-ruby-install.patch,
+  +gdal-1.4.2.ebuild:
+  Update to latest release (fixes bug 182306). Test away...
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> gdal-1.2.6-r4.ebuild,
   gdal-1.3.0-r1.ebuild, gdal-1.3.1.ebuild, gdal-1.3.2.ebuild:
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index a292a07e84c2..75bf34ea3f29 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gdal-1.2.6-installpathfix.patch 7786 RMD160 0a8650cb4b8e4f8b21596434f3848ac4db548024 SHA1 6ac083a354a4d89b89935de4fe998eba805f95d0 SHA256 408fc31a7b96f8a6cf9c7a7ea9775668aa842f40964e6ac1d9add07956cbca02
 MD5 8069b0c62dde416a0c74d1bf73543c9d files/gdal-1.2.6-installpathfix.patch 7786
 RMD160 0a8650cb4b8e4f8b21596434f3848ac4db548024 files/gdal-1.2.6-installpathfix.patch 7786
@@ -25,6 +22,14 @@ AUX gdal-1.3.2-ruby-install.patch 766 RMD160 bd81796a97d162e238750e0184437ff54cb
 MD5 f2b9cec943d95fcf9b3c487af6d96771 files/gdal-1.3.2-ruby-install.patch 766
 RMD160 bd81796a97d162e238750e0184437ff54cbb38af files/gdal-1.3.2-ruby-install.patch 766
 SHA256 9a42203279e512e629094ff9aea66c8d613acda3e1656fcf24f6e659c02e1061 files/gdal-1.3.2-ruby-install.patch 766
+AUX gdal-1.4.2-datadir.patch 353 RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 SHA1 eddb7f332ff361cbfb8771cc7496d2428a290d71 SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e
+MD5 1c2d5761f3adb87249d2af7e3be5e11e files/gdal-1.4.2-datadir.patch 353
+RMD160 a5dec6a5bbe091b6e877ced363507798d0ed47d5 files/gdal-1.4.2-datadir.patch 353
+SHA256 761e5dc10bb8a0d6a270af62aa67e7ec1259f072db958969ce14812f85004c4e files/gdal-1.4.2-datadir.patch 353
+AUX gdal-1.4.2-ruby-install.patch 934 RMD160 c63a79e091fee943526ec94182d75ca798ba1f5e SHA1 c61b02caf80495beb4af55113b5847fc8796d1d7 SHA256 cbf7b66b48406ad10c1c4b2d39216ad4e16944c033f7cac9dea85a9929b71352
+MD5 f10e534e57c2277dc192ac425e75327a files/gdal-1.4.2-ruby-install.patch 934
+RMD160 c63a79e091fee943526ec94182d75ca798ba1f5e files/gdal-1.4.2-ruby-install.patch 934
+SHA256 cbf7b66b48406ad10c1c4b2d39216ad4e16944c033f7cac9dea85a9929b71352 files/gdal-1.4.2-ruby-install.patch 934
 AUX gdal-gcc4.patch 472 RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 SHA1 9cbba5ebf35e2ca90386e4ddcd53c47a748f4597 SHA256 25f4b1a67063373536407d23eb98bc98752b5341c1a4556e18906e2077d1d5ae
 MD5 2f3f328abbefa4056b6ee71dfbfce529 files/gdal-gcc4.patch 472
 RMD160 7c12123cc5e61bf2f92e60acc7f7aafd24a9b413 files/gdal-gcc4.patch 472
@@ -33,6 +38,7 @@ DIST gdal-1.2.6.tar.gz 4315879 RMD160 2492520cfa9b724a2a880145f03e44e9804418c8 S
 DIST gdal-1.3.0.tar.gz 6644839 RMD160 4296a5b6d3255ab8f3d20f4e7e372c35a2ca335c SHA1 05de80a5c6b605505576a59242306c2db9a0f2af SHA256 48624307e66b7e70fe75d9c4884617bfda75026cbfc20ab23764b28811864bf9
 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
 EBUILD gdal-1.2.6-r4.ebuild 4145 RMD160 bbf586d9149073c3d7ef5dea26ff6d59348b3275 SHA1 0f09e3838fb46ba27a1ae1b1acb55cea747daa65 SHA256 d1fc349a6b27aecf87b07f0036f2b360fd3bc1fdfeedaff8dbf1adc02bf8236a
 MD5 7f274c3b415ce2067c4c4470a0a9d841 gdal-1.2.6-r4.ebuild 4145
 RMD160 bbf586d9149073c3d7ef5dea26ff6d59348b3275 gdal-1.2.6-r4.ebuild 4145
@@ -49,10 +55,14 @@ EBUILD gdal-1.3.2.ebuild 4691 RMD160 0eca64ea629540926e207bb796f236a408a4946d SH
 MD5 f671b7f110f22f99ef2377d8cbfac606 gdal-1.3.2.ebuild 4691
 RMD160 0eca64ea629540926e207bb796f236a408a4946d gdal-1.3.2.ebuild 4691
 SHA256 b36d6b32346fd07929b48bded422a64661767a55b518c73a6fae6cae0d1e6412 gdal-1.3.2.ebuild 4691
-MISC ChangeLog 6126 RMD160 bb6bdd420ced80e81b59099c3a93f36430ce6651 SHA1 2a6bab112597197e03e557da4a89e479ebdc3fe5 SHA256 e73c40ba23dccdd0603a98b1b2aa7f3d99c435381cb0b98848187e3584d139cf
-MD5 bffc1b4628d660a12091a1a1f3d12dd6 ChangeLog 6126
-RMD160 bb6bdd420ced80e81b59099c3a93f36430ce6651 ChangeLog 6126
-SHA256 e73c40ba23dccdd0603a98b1b2aa7f3d99c435381cb0b98848187e3584d139cf ChangeLog 6126
+EBUILD gdal-1.4.2.ebuild 4525 RMD160 257b394895e292f7f96d6c70a11dd3c30f2551e8 SHA1 25f04eed293c886597d224cc86776400d79db497 SHA256 59e16db381f103cc0dae8634dd04addf181a04e0973bdbbceca883a0cd1240f6
+MD5 fd73a7c464ec6ea0d235739ac7d00535 gdal-1.4.2.ebuild 4525
+RMD160 257b394895e292f7f96d6c70a11dd3c30f2551e8 gdal-1.4.2.ebuild 4525
+SHA256 59e16db381f103cc0dae8634dd04addf181a04e0973bdbbceca883a0cd1240f6 gdal-1.4.2.ebuild 4525
+MISC ChangeLog 6356 RMD160 9d445074d6c9175f18489cbb4e7df2204af76dba SHA1 87fac846573c533fdbf9b6fec6bcc8fca564427a SHA256 c6d183d20e7d710dffdebae8b21a6af0eb9d753853deed534f1a4e54237e6479
+MD5 ee295250041a702e235cbcfb9c714f5f ChangeLog 6356
+RMD160 9d445074d6c9175f18489cbb4e7df2204af76dba ChangeLog 6356
+SHA256 c6d183d20e7d710dffdebae8b21a6af0eb9d753853deed534f1a4e54237e6479 ChangeLog 6356
 MISC metadata.xml 493 RMD160 8ad930d21e928734d6c22796abc6da27f420eb4d SHA1 d97adc27fa58d040e92e93d17fce2f666090ad36 SHA256 1f6fdd4665a2c5e8f6f53e3d7d1b05ab2696eb23af60d7f430e20b2b3022b958
 MD5 bf6b9c6083b3ccc9c3924343d20636e7 metadata.xml 493
 RMD160 8ad930d21e928734d6c22796abc6da27f420eb4d metadata.xml 493
@@ -69,10 +79,6 @@ SHA256 a734d65225fe198341b408460b9b7b8be14296ba31070619486a0c83f6095596 files/di
 MD5 eff5bde48b9efae3ae40982cb722008c files/digest-gdal-1.3.2 235
 RMD160 31f4e2ebbed5331e26f59bd812df2a0592d5a9ee files/digest-gdal-1.3.2 235
 SHA256 33b0611e0b879c18f363b9356c1700ba4d1aa9d0ab22d31c642825a636c87b98 files/digest-gdal-1.3.2 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFnhWmAiZjviIA2XgRAhVUAKCyw2yuH8pbPjyKYg6Y9l28Q2NYsACg3nUB
-hS9zMPUyXH+0AJYbqOhtYw0=
-=725M
------END PGP SIGNATURE-----
+MD5 0f9efaea4b8df419d4ab22166c2a3b3c files/digest-gdal-1.4.2 235
+RMD160 daae620929e3d2876c0fd1b682b957337d2fe75a files/digest-gdal-1.4.2 235
+SHA256 29eb75fa8cb7ed3a1b6e2ac1fe322eacabde1c1bcbded93bd9113a3ef2d4732c files/digest-gdal-1.4.2 235
diff --git a/sci-libs/gdal/files/digest-gdal-1.4.2 b/sci-libs/gdal/files/digest-gdal-1.4.2
new file mode 100644
index 000000000000..ed44e919cd42
--- /dev/null
+++ b/sci-libs/gdal/files/digest-gdal-1.4.2
@@ -0,0 +1,3 @@
+MD5 dedf5ff6a766e85b9a2b5c54c1c59221 gdal-1.4.2.tar.gz 7457778
+RMD160 d4e2c09b4ec4ef3eb6a4da0e832168ef89878860 gdal-1.4.2.tar.gz 7457778
+SHA256 ee6e74cb80f47929fcfe8426fb024c2b195d237612be4d9a0795e9e353f588ee gdal-1.4.2.tar.gz 7457778
diff --git a/sci-libs/gdal/files/gdal-1.4.2-datadir.patch b/sci-libs/gdal/files/gdal-1.4.2-datadir.patch
new file mode 100644
index 000000000000..95cd058256a1
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.4.2-datadir.patch
@@ -0,0 +1,11 @@
+--- GDALmake.opt.in.orig	2006-05-21 14:59:21.000000000 -0700
++++ GDALmake.opt.in	2006-05-21 15:13:22.000000000 -0700
+@@ -54,7 +54,7 @@
+ exec_prefix	=	@exec_prefix@
+ INST_PREFIX	=	@exec_prefix@
+ INST_INCLUDE	=	@includedir@
+-INST_DATA 	=	@datadir@
++INST_DATA 	=	@datadir@/gdal
+ INST_LIB	=	@libdir@
+ INST_BIN	=	@bindir@
+ INST_PYMOD      =       @pymoddir@
diff --git a/sci-libs/gdal/files/gdal-1.4.2-ruby-install.patch b/sci-libs/gdal/files/gdal-1.4.2-ruby-install.patch
new file mode 100644
index 000000000000..3aea3e26ea48
--- /dev/null
+++ b/sci-libs/gdal/files/gdal-1.4.2-ruby-install.patch
@@ -0,0 +1,24 @@
+--- swig/ruby/RubyMakefile.mk.orig	2007-07-01 18:15:18.000000000 -0700
++++ swig/ruby/RubyMakefile.mk	2007-07-01 18:18:47.000000000 -0700
+@@ -22,7 +22,7 @@
+ RUBY_LIB_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['libdir']")
+ RUBY_SO_NAME := $(shell ruby -rrbconfig -e "puts Config::CONFIG['RUBY_SO_NAME']")
+ RUBY_EXTENSIONS_DIR := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
+-INSTALL_DIR := $(RUBY_EXTENSIONS_DIR)/gdal
++INSTALL_DIR := $(DESTDIR)$(RUBY_EXTENSIONS_DIR)/gdal
+ 
+ RUBY_INCLUDE = -I$(RUBY_INCLUDE_DIR)
+ LDFLAGS += -shared -L$(RUBY_LIB_DIR)
+@@ -39,10 +39,10 @@
+ 	rm -frd $(INSTALL_DIR)
+ 
+ $(INSTALL_DIR):
+-	mkdir -p $(DESTDIR)$(INSTALL_DIR)
++	mkdir -p $(INSTALL_DIR)
+ 
+ install: $(INSTALL_DIR)
+-	$(INSTALL) $(RUBY_MODULES) $(DESTDIR)$(INSTALL_DIR) 
++	$(INSTALL) $(RUBY_MODULES) $(INSTALL_DIR) 
+ 
+ $(RUBY_MODULES): %.so: %_wrap.o
+ 	$(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@
diff --git a/sci-libs/gdal/gdal-1.4.2.ebuild b/sci-libs/gdal/gdal-1.4.2.ebuild
new file mode 100644
index 000000000000..2823886a107a
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.4.2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2007 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.1 2007/07/03 20:12:55 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.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"
+
+DEPEND=">=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
+		>=dev-lang/swig-1.3.28 )
+	fits? ( sci-libs/cfitsio )
+	ogdi? ( sci-libs/ogdi )
+	gml? ( dev-libs/xerces-c )
+	hdf5? ( >=sci-libs/hdf5-1.6.4 )
+	postgres? ( dev-db/postgresql )
+	|| (
+	    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 )
+	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
+
+	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)."
+}