Fix szip configure logic, respect CC

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 33 insertions, 38 deletions

diff --git a/sci-libs/hdf/ChangeLog b/sci-libs/hdf/ChangeLog
index b1d00ed040cc..96b8fe58c798 100644
--- a/sci-libs/hdf/ChangeLog
+++ b/sci-libs/hdf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/hdf
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.22 2011/12/22 17:36:28 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/ChangeLog,v 1.23 2012/01/21 11:41:00 xarthisius Exp $
+
+  21 Jan 2012; Kacper Kowalik <xarthisius@gentoo.org>
+  files/4.2.6-autotools.patch, hdf-4.2.6.ebuild:
+  Fix szip configure logic, respect CC
 
 *hdf-4.2.6 (22 Dec 2011)
 
diff --git a/sci-libs/hdf/Manifest b/sci-libs/hdf/Manifest
index 387ba08edac9..ae7d2ff624e2 100644
--- a/sci-libs/hdf/Manifest
+++ b/sci-libs/hdf/Manifest
@@ -1,18 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX 4.2.6-autotools.patch 4656 RMD160 4b018639c931ba066bc397d27d5058791e8ed6ee SHA1 5f1999d6d9335ef6e9e70e12531f3e72a2b4a7e2 SHA256 b7d50495650b441ae483ef7d67dc7377f07191b30d12ec10c716039731e4a22c
+AUX 4.2.6-autotools.patch 3815 RMD160 332a70f75b760bb55735c7e2e2ade6563ab67cd2 SHA1 2166b5cc6a3cbcf476364031cac4df29f83ea125 SHA256 78c5b7bf33ac00f243f8f58fcaaeebdd2b7576bdb80b347687bbee215050cddb
 DIST HDF4.2r4.tar.gz 3914118 RMD160 13274858f1fa0c339fab83b1f9c37314bd10d624 SHA1 000fa1be9c355c490cceed786feeb269a0d355a7 SHA256 39695c85e15c391e589cfdcb98ecc9a72fbb7447f0575bff4d030d53a62e689d
 DIST hdf-4.2.6.tar.bz2 3088411 RMD160 9b8b9ccba7f84085cff2c64090d5f7c0abf7acad SHA1 914eedbd8d4714f8bc0cc10bbbad5ad7fe1e375c SHA256 9ddfc10f8703dda17f7ccf942c50f56ffd0c7b1066dd5b34ca493a799577a05f
 DIST hdf-4.2_p4-patches.tar.bz2 6914 RMD160 de251f3f54c635187d507743a2bb9afb70052dfa SHA1 02575337706c2a3e4256702be7e461c40fdba026 SHA256 e04ece17fab9739f145099ee78e926ca790177033bfa102f12b328b66bbac390
-EBUILD hdf-4.2.6.ebuild 1257 RMD160 0cc5b91fb1fd0c5d77109bb57c27ec92e4b5fda7 SHA1 e441e88f7723b515defc9fda606cc161a1d30260 SHA256 c28b12bed8a77e27b469bc2ebdd01b0d44cf9b77bd537c5b6fe0bf61b9707507
+EBUILD hdf-4.2.6.ebuild 1280 RMD160 a871e6815cff4efcd08dcb5dcdc674903903851c SHA1 3f912f496398f54338af61b3a4575725c91b597b SHA256 752906b275c360abab0b553113d1bf2dde87f5823a1cdba9928c1bbf153a3e08
 EBUILD hdf-4.2_p4.ebuild 2183 RMD160 b82091e343046b908e46ebae898068cf25c5a06f SHA1 ec0a6e68623c3edd447bcd8e180d825fce7b3089 SHA256 925fdcb74ec84b238e87c587feccf10a0e2b23e2bc3fa10c051da557ce287edc
-MISC ChangeLog 4645 RMD160 79cd29296af215d1c54036ad6e199de2981b02a1 SHA1 28b21df25f2c9dd91dabc84d7998cdaefbc997b0 SHA256 fe60148527d1e238d22846a4cea93ed778afd0935f2fc3a403e6087f576a6e51
+MISC ChangeLog 4790 RMD160 72ee3efa5f3748bbacdcc3acd815aea96c04e7c3 SHA1 e1c7120646e4fa4169e03342a0cf9878274d8733 SHA256 ebd0204699cf7f2d2a830ef56a9826922dbe07579c162f1eb23b9ff3214a69e6
 MISC metadata.xml 760 RMD160 4ef5d149f44169242bf9425d6c0b3a2e512fe0a1 SHA1 4c0c294751b93851300fd03ea9121f6d9f36a8d2 SHA256 a753e7be3b3935681d6aa925d90c6eff98d764b8a8dbf30ed0dfc4046df39def
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7zasgACgkQ1ycZbhPLE2BLXwCfaNB4YKWiU/nVZ9MIxArwv9qa
-qF8An0Xj9CjQHtOIeZp9Cods1nd98aNY
-=aTUo
+iQIcBAEBCAAGBQJPGqRWAAoJEF0huFKJUZL54iMP/04++cuzXoDQRmLbW06wwFXo
+pva9l8bo+XkS/c5g6vYcQgReq2OmfGHxnMAFO8jJWX4PUxxlH89H94pRkQc58hWR
+d4FXGPiGOont8WDtMmfpDblA6KwLNH+n7ofscmyN1t/qOkGe173AXAOX7BLcIEqJ
+WGO8pMvWqTHUvmo/Hh7P+Twn2W5LgXtmxOSxqapDSoR9BnKVj9eXWFPaJRgLkhO5
+EmUYhhbbmdYnRm/YHK1SYtRiMI9Ou2mV5ymQasa+Z8jTkD7YmHUdKvf0Ga3Ut6qw
+zvmKkFWtI5GGeTVZyHVEwm715M7WpZtCIr9FXZ6IdsNAXVC53q/CsWpkf2yoSWu7
+83SPkgW6eIYtXq9yRFxwukPn8mCs/Hhg1dzGC6uNkh57B9LCLlVmbc8dXSVhNV+A
+wQV9WG76B7FnfWEFaKqY2vSQrdkYXbK4jsK4DfGaL9cqjoxUl5NXaOPwMC4ePl4J
+Yg9MSmBwAU44pP5c1o3lSII1QpDeGVj2AldZGw1IPZ7Xvg9hZDtnrCorrhOerVBS
+O2MOpb8g74Nakmav4HC7INXS/R9v/FVN33HIxuefNw35DyW4kNNqcxlea9b4j8tn
+9Y7tOrGrG26xwlA9NYzVTdxbb5Ft69HkJGYOME6TJX8X963FazBBGWKVhYIHjLFb
+V78shEvaymQwB1bPQ46M
+=eeZ2
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/hdf/files/4.2.6-autotools.patch b/sci-libs/hdf/files/4.2.6-autotools.patch
index c3b8bb7112b7..67b0d279d8c5 100644
--- a/sci-libs/hdf/files/4.2.6-autotools.patch
+++ b/sci-libs/hdf/files/4.2.6-autotools.patch
@@ -1,6 +1,5 @@
-diff -Nur hdf-4.2.6.orig/configure.ac hdf-4.2.6/configure.ac
---- hdf-4.2.6.orig/configure.ac	2011-12-21 23:40:35.000000000 +0000
-+++ hdf-4.2.6/configure.ac	2011-12-22 00:36:53.000000000 +0000
+--- a/configure.ac
++++ b/configure.ac
 @@ -199,20 +199,6 @@
  dnl Build static libraries by default. Furthermore, fortran shared libraries
  dnl are unsupported. Disallow a user from enabling both shared libraries and
@@ -31,23 +30,6 @@ diff -Nur hdf-4.2.6.orig/configure.ac hdf-4.2.6/configure.ac
  AC_ARG_WITH([szlib],
              [AC_HELP_STRING([--with-szlib=DIR],
                              [Use szlib library [default=no]])],,
-@@ -445,14 +431,13 @@
-     fi
- 
-     AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [unset HAVE_SZIP])
--
-+    ;;
-+esac
-     if test -z "$HAVE_SZIP"; then
-       AC_MSG_ERROR([couldn't find szlib library])
-     else
-       USE_COMP_SZIP="yes"
-     fi
--    ;;
--esac
- 
- dnl Check to see if SZIP has encoder 
- if test "X$HAVE_SZIP" = "Xyes"; then
 @@ -702,7 +687,7 @@
  dnl ======================================================================
  dnl Libtool initialization
@@ -97,9 +79,8 @@ diff -Nur hdf-4.2.6.orig/configure.ac hdf-4.2.6/configure.ac
  
  
  dnl This part doesn't work yet since HDF4 config files do not contain
-diff -Nur hdf-4.2.6.orig/hdf/test/fortestF.f hdf-4.2.6/hdf/test/fortestF.f
---- hdf-4.2.6.orig/hdf/test/fortestF.f	2011-12-21 23:40:35.000000000 +0000
-+++ hdf-4.2.6/hdf/test/fortestF.f	2011-12-21 23:47:04.000000000 +0000
+--- a/hdf/test/fortestF.f
++++ b/hdf/test/fortestF.f
 @@ -203,7 +203,7 @@
  
  	if (cmd .NE. 'Test' .AND. cmd .NE. 'test') then
@@ -109,9 +90,8 @@ diff -Nur hdf-4.2.6.orig/hdf/test/fortestF.f hdf-4.2.6/hdf/test/fortestF.f
  	 retcode = -1
  	 return
  	endif
-diff -Nur hdf-4.2.6.orig/mfhdf/libsrc/Makefile.am hdf-4.2.6/mfhdf/libsrc/Makefile.am
---- hdf-4.2.6.orig/mfhdf/libsrc/Makefile.am	2011-12-21 23:40:35.000000000 +0000
-+++ hdf-4.2.6/mfhdf/libsrc/Makefile.am	2011-12-21 23:48:07.000000000 +0000
+--- a/mfhdf/libsrc/Makefile.am
++++ b/mfhdf/libsrc/Makefile.am
 @@ -32,10 +32,11 @@
  else
  libmfhdf_la_SOURCES = $(CSOURCES)
diff --git a/sci-libs/hdf/hdf-4.2.6.ebuild b/sci-libs/hdf/hdf-4.2.6.ebuild
index e117743fa098..2940e2d4b45a 100644
--- a/sci-libs/hdf/hdf-4.2.6.ebuild
+++ b/sci-libs/hdf/hdf-4.2.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2.6.ebuild,v 1.1 2011/12/22 17:36:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/hdf/hdf-4.2.6.ebuild,v 1.2 2012/01/21 11:41:00 xarthisius Exp $
 
 EAPI=4
 inherit eutils fortran-2 toolchain-funcs autotools flag-o-matic
@@ -34,7 +34,8 @@ src_configure() {
 		--disable-netcdf \
 		$(use_enable fortran) \
 		$(use_enable static-libs static) \
-		$(use_with szip szlib)
+		$(use_with szip szlib) \
+		CC="$(tc-getCC)"
 }
 
 src_install() {