updated for optional libgrass rebuild support

Package-Manager: portage-2.1.4.4

3 files changed, 55 insertions, 37 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 4278f8924d9d..ce979718ee64 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/gdal
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.38 2008/02/09 19:53:23 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.39 2008/03/22 06:14:33 nerdboy Exp $
+
+*gdal-1.5.0-r1 (22 Mar 2008)
+
+  22 Mar 2008; Steve Arnold <nerdboy@gentoo.org> -gdal-1.5.0.ebuild,
+  +gdal-1.5.0-r1.ebuild:
+  Updated for optional libgrass rebuild support (avoids circular 
+  dependency issue).
 
   09 Feb 2008; Steve Arnold <nerdboy@gentoo.org> ChangeLog:
   removed stale digest files; had to force it again after a tree update...
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 4590587e296b..ee1a37369fb9 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gdal-1.3.1-installpathfix.patch 6805 RMD160 6cc35c1f741fdb19249666fa2f94052e8fe4a30e SHA1 ebd9b397bd1230a4b5110367f29f6040a86284f3 SHA256 0f9d7e1da2617df781429c2191f6e2429d2e8c73d01c6c115d36f3a295d69280
 AUX gdal-1.3.2-destdir.patch 6789 RMD160 f74a404c3d9874542b9074477af7d21fe7e0774a SHA1 09296a78067d6b3a12bc7ee47a1969e82efa2a26 SHA256 6818460591e7077878f4658ca73a4582325f19f9e5580d73411b13f4dd548e81
 AUX gdal-1.3.2-gcc4-stl.patch 902 RMD160 a8e6a79b8158913bfa3de9a4ef763f95f7197b53 SHA1 68f53438de2af1a325260d6070728d363fffd91f SHA256 c11381cabeb56e65f5277953b7b738d91f406560d88612d44d4295cb24bdae21
@@ -18,13 +15,6 @@ DIST gdal-1.5.0.tar.gz 6167411 RMD160 25326301edbc88739fce6f33b42dfb9499842896 S
 EBUILD gdal-1.3.1.ebuild 4424 RMD160 92cfb77b8b2348aab5847efb6783b8f6ba77ba91 SHA1 5cf1570aa03cf618b24e3c961490946dfd629d2e SHA256 1c912465c93dc6515a48a6824f4e43e442f341eac9729566cd9e6ecb34fe001c
 EBUILD gdal-1.3.2.ebuild 4710 RMD160 6c5f327b0c69a19078b5d87931826abef174c364 SHA1 ea273c09db5ab2a26bd4ee91d3ea70cdaa70d9ce SHA256 2db23bb124b9a6fb019da6e6c3494f406c6bea8ec72871af1e0a32b8018e834f
 EBUILD gdal-1.4.2.ebuild 4581 RMD160 c47c1fba5b94bc3a4c57c8abfa2b19444962a4f7 SHA1 f6b426fd97c71e486cd4017d8f2139318079a3f4 SHA256 90946f8420887ecf15a6d054906a7937359fc809324f20df9b3913be5cda162f
-EBUILD gdal-1.5.0.ebuild 5408 RMD160 50a94d03d043b5e3977f0735679f2b6163d19fd1 SHA1 b0983527d35e389aaa612a7c740fd4e2fe7ef842 SHA256 cb44f2f8ef7c1626920d9c3a830f13cd6347cdef6540d8af8fe22cd944f05d38
-MISC ChangeLog 7560 RMD160 e7864d6f4dc630f173955f8e882ab5837823cd4d SHA1 d094fd68a8182cbabc5d76049d00b72d75423057 SHA256 21584e405d1664718ffc8e4aa32dd8094fa27143a149610326ef00318b0cd2c7
+EBUILD gdal-1.5.0-r1.ebuild 5964 RMD160 d6468b34b8240f693a17b704c1bac89ba3c268de SHA1 191a9fb5e848e808fae77e7790cd344dbc06cf5a SHA256 d17204b0e1509031763bf1f746ec31a02316f7209d05eb9a0409d0f74e174bb7
+MISC ChangeLog 7772 RMD160 9ccb77e66c3c26c46bbe8307a30a0e299c0cbd43 SHA1 f377e2830c197d02ace4e2231e84b6f0ce6aec74 SHA256 7fdffeea3c08dc3747c6917fad5d4f31bc18f531c757de2cc9d6206ef179aef2
 MISC metadata.xml 493 RMD160 8ad930d21e928734d6c22796abc6da27f420eb4d SHA1 d97adc27fa58d040e92e93d17fce2f666090ad36 SHA256 1f6fdd4665a2c5e8f6f53e3d7d1b05ab2696eb23af60d7f430e20b2b3022b958
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHrqdd/ejvha5XGaMRAs+SAKDr7Hy6AOi1F5n5RbR0NUfIHPDHvwCeKGPA
-Cla0vism0jVzrOfBrGMnIHs=
-=39ON
------END PGP SIGNATURE-----
diff --git a/sci-libs/gdal/gdal-1.5.0.ebuild b/sci-libs/gdal/gdal-1.5.0-r1.ebuild
index 0d3af1d9659e..917bd1d7593e 100644
--- a/sci-libs/gdal/gdal-1.5.0.ebuild
+++ b/sci-libs/gdal/gdal-1.5.0-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.0.ebuild,v 1.2 2008/02/09 18:39:06 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.0-r1.ebuild,v 1.1 2008/03/22 06:14:33 nerdboy Exp $
 
+WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
 
 IUSE="curl debug doc fits geos gif gml hdf hdf5 jpeg jpeg2k mysql netcdf \
-	odbc png ogdi perl postgres python ruby sqlite threads"
+odbc png ogdi perl postgres python ruby sqlite threads"
 
 DESCRIPTION="GDAL is a translator library for raster geospatial data formats (includes OGR support)"
 HOMEPAGE="http://www.gdal.org/"
@@ -20,6 +21,7 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 DEPEND=">=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 )
@@ -45,9 +47,17 @@ DEPEND=">=sys-libs/zlib-1.1.4
 	sqlite? ( >=dev-db/sqlite-3 )
 	doc? ( app-doc/doxygen )"
 
-WANT_AUTOCONF="2.5"
 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}"
@@ -55,10 +65,10 @@ src_unpack() {
 	eaclocal
 	eautoconf
 
-	epatch "${FILESDIR}/${PN}-1.4.2-datadir.patch" \
-	    "${FILESDIR}/${P}-python-install.patch" \
-	    "${FILESDIR}/${P}-soname.patch" \
-	    "${FILESDIR}/${P}-makefile.patch"
+	epatch "${FILESDIR}"/${PN}-1.4.2-datadir.patch \
+	    "${FILESDIR}"/${P}-python-install.patch \
+	    "${FILESDIR}"/${P}-soname.patch \
+	    "${FILESDIR}"/${P}-makefile.patch
 
 	if useq netcdf && useq hdf; then
 	    einfo	"Checking if HDF4 is compiled with szip..."
@@ -75,15 +85,19 @@ src_unpack() {
 src_compile() {
 	distutils_python_version
 
-	pkg_conf="--enable-static=no --enable-shared=yes --with-pic \
-		--with-libgrass=no --without-libtool $(use_enable debug)"
+	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) $(use_with jpeg2k jasper) $(use_with odbc) \
-	    $(use_with gml xerces) $(use_with hdf5) $(use_with curl)"
+	    $(use_with gml xerces) $(use_with hdf5) $(use_with curl) \
+	    $(use_enable debug)"
 
 	# It can't find this
 	if useq ogdi ; then
@@ -114,7 +128,7 @@ src_compile() {
 	# also failing with gcc4 in libcsf
 	emake -j1 || die "emake failed"
 
-	if use python; then
+	if useq python; then
 	    sed -i -e "s#library_dirs = #library_dirs = /usr/$(get_libdir):#g" \
 		swig/python/setup.cfg
 	    sed -i -e "s:$(DESTDIR)$(prefix):$(DESTDIR)$(INST_PREFIX):g" \
@@ -164,17 +178,24 @@ src_install() {
 }
 
 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)."
+	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
 }