version bump for more features (ruby bindings)version bump for more features (ruby bindings)

(Portage version: 2.1_rc1-r3)

9 files changed, 181 insertions, 13 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 83b229ab62d8..cfb2741a3fd9 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sci-libs/gdal
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.22 2005/12/23 16:21:05 carlo Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.23 2006/05/22 06:52:51 nerdboy Exp $
+
+*gdal-1.3.2 (22 May 2006)
+
+  22 May 2006; Steve Arnold <nerdboy@gentoo.org> gdal-1.2.6-r4.ebuild,
+  gdal-1.3.0-r1.ebuild, +gdal-1.3.2.ebuild:
+  Version bump for more features (ruby bindings), plus adjusted keywords
+  to work around hdf5 borkage.
+
+  20 May 2006; Steve Arnold <nerdboy@gentoo.org> gdal-1.2.6-r4.ebuild,
+  gdal-1.3.0-r1.ebuild, gdal-1.3.1.ebuild:
+  Overdue stable bump for my current arches (my sparc broke).
 
   23 Dec 2005; Carsten Lohrke <carlo@gentoo.org> gdal-1.2.6-r4.ebuild,
   gdal-1.3.0-r1.ebuild, gdal-1.3.1.ebuild:
diff --git a/sci-libs/gdal/files/digest-gdal-1.2.6-r4 b/sci-libs/gdal/files/digest-gdal-1.2.6-r4
index 9cfc52edf488..68e7cdb18303 100644
--- a/sci-libs/gdal/files/digest-gdal-1.2.6-r4
+++ b/sci-libs/gdal/files/digest-gdal-1.2.6-r4
@@ -1 +1,3 @@
 MD5 410e581874ce2b94bfa00deb9f2087f6 gdal-1.2.6.tar.gz 4315879
+RMD160 2492520cfa9b724a2a880145f03e44e9804418c8 gdal-1.2.6.tar.gz 4315879
+SHA256 b2c39995839296f396cebaf0410e44aa362851315508258a46c7caee4c37706c gdal-1.2.6.tar.gz 4315879
diff --git a/sci-libs/gdal/files/digest-gdal-1.3.0-r1 b/sci-libs/gdal/files/digest-gdal-1.3.0-r1
index 952482fd1a38..881d81cad8ba 100644
--- a/sci-libs/gdal/files/digest-gdal-1.3.0-r1
+++ b/sci-libs/gdal/files/digest-gdal-1.3.0-r1
@@ -1 +1,3 @@
 MD5 fbf4e137c9d0f64f5a70273e555bf777 gdal-1.3.0.tar.gz 6644839
+RMD160 4296a5b6d3255ab8f3d20f4e7e372c35a2ca335c gdal-1.3.0.tar.gz 6644839
+SHA256 48624307e66b7e70fe75d9c4884617bfda75026cbfc20ab23764b28811864bf9 gdal-1.3.0.tar.gz 6644839
diff --git a/sci-libs/gdal/files/digest-gdal-1.3.1 b/sci-libs/gdal/files/digest-gdal-1.3.1
index a81d081883a3..fb5b692a91d7 100644
--- a/sci-libs/gdal/files/digest-gdal-1.3.1
+++ b/sci-libs/gdal/files/digest-gdal-1.3.1
@@ -1 +1,3 @@
 MD5 7ff1ceff745ee011793e1f860c02c172 gdal-1.3.1.tar.gz 6856011
+RMD160 5967608e6e1c9f0af8698fcffb58eab4dcdd518d gdal-1.3.1.tar.gz 6856011
+SHA256 4f8f3c462f9174e1dd99f7bfa2abe010aa129e04c08a242a3c63c1a9e5078753 gdal-1.3.1.tar.gz 6856011
diff --git a/sci-libs/gdal/files/digest-gdal-1.3.2 b/sci-libs/gdal/files/digest-gdal-1.3.2
new file mode 100644
index 000000000000..56220c22ba3a
--- /dev/null
+++ b/sci-libs/gdal/files/digest-gdal-1.3.2
@@ -0,0 +1,3 @@
+MD5 67ed02dcea21e93f5e123bb0d322898a gdal-1.3.2.tar.gz 7279872
+RMD160 98c7f33bc3a57364e9ca15bf61d11d45f147b8ad gdal-1.3.2.tar.gz 7279872
+SHA256 00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87 gdal-1.3.2.tar.gz 7279872
diff --git a/sci-libs/gdal/gdal-1.2.6-r4.ebuild b/sci-libs/gdal/gdal-1.2.6-r4.ebuild
index d0b9ac44aca9..95eec289b62f 100644
--- a/sci-libs/gdal/gdal-1.2.6-r4.ebuild
+++ b/sci-libs/gdal/gdal-1.2.6-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r4.ebuild,v 1.10 2005/12/23 16:26:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.2.6-r4.ebuild,v 1.11 2006/05/22 06:52:51 nerdboy Exp $
 
 inherit eutils libtool gnuconfig distutils toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc sparc x86"
+KEYWORDS="amd64 ppc sparc x86"
 # need to get these arches updated on several libs first
 #KEYWORDS="~alpha ~hppa ~ppc64"
 
diff --git a/sci-libs/gdal/gdal-1.3.0-r1.ebuild b/sci-libs/gdal/gdal-1.3.0-r1.ebuild
index 832698a0f20c..f9ecfc9259e4 100644
--- a/sci-libs/gdal/gdal-1.3.0-r1.ebuild
+++ b/sci-libs/gdal/gdal-1.3.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.0-r1.ebuild,v 1.9 2005/12/23 16:26:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.0-r1.ebuild,v 1.10 2006/05/22 06:52:51 nerdboy Exp $
 
 inherit eutils libtool gnuconfig distutils toolchain-funcs
 
-IUSE="jpeg png geos gif jpeg2k netcdf hdf hdf5 python postgres mysql \
+IUSE="jpeg png geos gif jpeg2k netcdf hdf python postgres mysql \
 	odbc sqlite ogdi fits gml doc debug"
 
 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
@@ -13,7 +13,7 @@ SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 # need to get these arches updated on several libs first
 #KEYWORDS="~alpha ~hppa ~ppc64"
 
@@ -27,7 +27,6 @@ DEPEND=">=sys-libs/zlib-1.1.4
 	fits? ( sci-libs/cfitsio )
 	ogdi? ( sci-libs/ogdi )
 	gml? ( dev-libs/xerces-c )
-	hdf5? ( >=sci-libs/hdf5-1.6.4 )
 	|| (
 	    postgres? ( dev-db/postgresql )
 	    mysql? ( dev-db/mysql )
@@ -72,7 +71,7 @@ src_compile() {
 	    $(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 gml xerces)"
 
 	# It can't find this
 	if useq ogdi ; then
diff --git a/sci-libs/gdal/gdal-1.3.1.ebuild b/sci-libs/gdal/gdal-1.3.1.ebuild
index 33755bacda9f..c532ccd44fda 100644
--- a/sci-libs/gdal/gdal-1.3.1.ebuild
+++ b/sci-libs/gdal/gdal-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild,v 1.8 2005/12/23 16:26:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.1.ebuild,v 1.9 2006/05/22 06:52:51 nerdboy Exp $
 
 inherit eutils libtool gnuconfig distutils toolchain-funcs
 
diff --git a/sci-libs/gdal/gdal-1.3.2.ebuild b/sci-libs/gdal/gdal-1.3.2.ebuild
new file mode 100644
index 000000000000..637d844254f7
--- /dev/null
+++ b/sci-libs/gdal/gdal-1.3.2.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.3.2.ebuild,v 1.1 2006/05/22 06:52:51 nerdboy Exp $
+
+inherit eutils libtool gnuconfig 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.remotesensing.org/gdal/index.html"
+SRC_URI="http://dl.maptools.org/dl/gdal/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+# need to get these arches updated on several libs first
+#KEYWORDS="~alpha ~hppa ~ppc64"
+
+#USE_RUBY="1.7"
+#RUBY_ECONF="--with-rubydir=/usr/$(get_libdir)/ruby/site_ruby"
+
+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 )
+	sqlite? ( >=dev-db/sqlite-3 )
+	doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-destdir.patch || die "epatch failed"
+	epatch ${FILESDIR}/${P}-ruby-install.patch || die "epatch failed"
+	if [ $(gcc-major-version) -eq 4 ] ; then
+	    epatch ${FILESDIR}/${PN}-gcc4.patch || die "gcc4 patch failed"
+	fi
+	elibtoolize --patch-only
+	gnuconfig_update
+	if useq netcdf && useq hdf; then
+	    einfo	"Checking is HDF4 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 szip USE flag!"
+		einfo 	"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)"
+	    # mysql support temporarily disabled $(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?)
+	emake || die "emake failed"
+	if useq ruby ; then
+	    cd ${S}/swig
+	    make build || die "make ruby failed"
+	    cd ${S}
+	fi
+	if useq doc ; then
+	    emake docs || die "emake 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)."
+}