updated pkg_setup logic to more explicitly handle hdf4 vs. netcdf

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

4 files changed, 48 insertions, 31 deletions

diff --git a/sci-libs/gdal/ChangeLog b/sci-libs/gdal/ChangeLog
index 1be4207ee68c..f2de87aa5bc0 100644
--- a/sci-libs/gdal/ChangeLog
+++ b/sci-libs/gdal/ChangeLog
@@ -1,6 +1,11 @@
 # 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.53 2008/12/25 13:40:29 bluebird Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/ChangeLog,v 1.54 2009/02/18 04:03:47 nerdboy Exp $
+
+  18 Feb 2009; Steve Arnold <nerdboy@gentoo.org> gdal-1.5.3.ebuild,
+  gdal-1.5.2.ebuild:
+  Updated pkg_setup logic to more explicitly handle hdf4 vs. netcdf;
+  should fix bugs #256423 and #238999.
 
   25 Dec 2008; Friedrich Oslage <bluebird@gentoo.org> gdal-1.5.2.ebuild:
   Stable on sparc, bug #241500
diff --git a/sci-libs/gdal/Manifest b/sci-libs/gdal/Manifest
index 5ea8c1a98d85..c80fbce0e5dd 100644
--- a/sci-libs/gdal/Manifest
+++ b/sci-libs/gdal/Manifest
@@ -23,7 +23,7 @@ EBUILD gdal-1.3.2.ebuild 4789 RMD160 88e7bcf13b6b130b821a211cc3e121716546556e SH
 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 6213 RMD160 9f39673742f9ef1e2dd4524dff9ad040536acc12 SHA1 91635b52f4b2de16781a67f6ea090199167dfaff SHA256 734ff87b6ccee23bbd52bed372b488b5490129d0486c39c2d648d8b54757c771
-EBUILD gdal-1.5.3.ebuild 6296 RMD160 8a5bcc3e3b062d2785e44d8b844569d1e96acbb1 SHA1 d9c31669962aa88d99d3ff44f83edbb939f85eb4 SHA256 e9d10a5d9f718c985b6350eb2872a92d5aa5fe2ce3693a4c29951b7b77969284
-MISC ChangeLog 10467 RMD160 50cb1f401cf2b8031698b71274dab01ea8e590b5 SHA1 7c9cc25c79794ad1e115d6db77ac604a0f7e55fc SHA256 ec86c963eedf4d86789b035f1d7edf6548305437cb878d4399de6d3d3615b779
+EBUILD gdal-1.5.2.ebuild 6422 RMD160 74e1612b3a70258e6a0508f7a41a6b504a830ea6 SHA1 2cd62b97f7c8552dae7cfbd1b9a0aa33d3f335d4 SHA256 be762133901022f026d9499389d56d8b148fb82f51d0ed79148142b949cd602d
+EBUILD gdal-1.5.3.ebuild 6506 RMD160 117fed9efd494912e93b9350670254d029ee8ce6 SHA1 f783a97435b9362dea12d37505dfe7f61e8ca920 SHA256 da5aeac2ad5a509137dff11b29b97cab673752b6c374e92ebe6438b16dac6179
+MISC ChangeLog 10664 RMD160 13fcf5e62782e7f407d77d10f97f1d5d01da8a13 SHA1 bb7f711265b64d55934889c26f8afc61471a78a2 SHA256 7d95a72511a0f2d32511aac3516065e36b3490fff93833111165c4fc50c2d215
 MISC metadata.xml 1100 RMD160 edad0e7b25dec94f4b1f7a66ce2289da3115c9d1 SHA1 b3ad2e46e137bcd069a6867c6a5c9f6fbba00e66 SHA256 2aff971ad868d45f5d30128cfbc508e2c1eab7adb05028a95d182ec1821b15b3
diff --git a/sci-libs/gdal/gdal-1.5.2.ebuild b/sci-libs/gdal/gdal-1.5.2.ebuild
index 912c48e57780..19d647f13eb4 100644
--- a/sci-libs/gdal/gdal-1.5.2.ebuild
+++ b/sci-libs/gdal/gdal-1.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# 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.2.ebuild,v 1.6 2008/12/25 13:40:29 bluebird Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.2.ebuild,v 1.7 2009/02/18 04:03:47 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -58,6 +58,23 @@ pkg_setup() {
 	    elog "User-specified configure options are not set."
 	    elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
 	fi
+
+	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_unpack() {
@@ -72,17 +89,6 @@ src_unpack() {
 	    "${FILESDIR}"/${PN}-1.5.0-makefile.patch \
 	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
 	    "${FILESDIR}"/${P}-xerces-64-bit.patch
-
-	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() {
diff --git a/sci-libs/gdal/gdal-1.5.3.ebuild b/sci-libs/gdal/gdal-1.5.3.ebuild
index 66087deb7c52..03f9ff429c5c 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-2008 Gentoo Foundation
+# 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.2 2008/11/10 23:30:30 nerdboy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/gdal/gdal-1.5.3.ebuild,v 1.3 2009/02/18 04:03:47 nerdboy Exp $
 
 WANT_AUTOCONF="2.5"
 inherit autotools distutils eutils perl-module toolchain-funcs
@@ -62,6 +62,23 @@ pkg_setup() {
 	    elog "User-specified configure options are not set."
 	    elog "If needed, set GDAL_CONFIGURE_OPTS to enable grass support."
 	fi
+
+	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_unpack() {
@@ -76,17 +93,6 @@ src_unpack() {
 	    "${FILESDIR}"/${PN}-1.5.0-makefile.patch \
 	    "${FILESDIR}"/${PN}-1.5.1-python-install.patch \
 	    "${FILESDIR}"/${PN}-1.5.2-xerces-64-bit.patch
-
-	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() {