Fix for unset variable when user specifically disable a default enabled feature. This also fixes bug #431594

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

4 files changed, 122 insertions, 8 deletions

diff --git a/dev-libs/blitz/ChangeLog b/dev-libs/blitz/ChangeLog
index 09cfacedb32b..8899296278c4 100644
--- a/dev-libs/blitz/ChangeLog
+++ b/dev-libs/blitz/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/blitz
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/ChangeLog,v 1.43 2012/08/13 21:14:13 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/ChangeLog,v 1.44 2012/08/20 17:30:01 bicatali Exp $
+
+  20 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/blitz-0.10-set-default-arg-value.patch, blitz-0.10.ebuild:
+  Fix for unset variable when user specifically disable a default enabled
+  feature. This also fixes bug #431594
 
   13 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   Update metadata.xml boost use flag description
diff --git a/dev-libs/blitz/Manifest b/dev-libs/blitz/Manifest
index ddb3e835330a..2304f5d2e742 100644
--- a/dev-libs/blitz/Manifest
+++ b/dev-libs/blitz/Manifest
@@ -3,18 +3,19 @@ Hash: SHA256
 
 AUX blitz-0.10-docs.patch 2824 SHA256 aa1dd23e6d38bf6a4540e4b0b49503e5a851aebeb0315ee7e3a8fba7aba02a60 SHA512 c20fe575a5466c11ec386a3e826622035826b0fea133c3f212809d5b39f0ea058418b347e425daded48141b5ef1446af655f221a60e1919f3867442673ff9707 WHIRLPOOL 0fd569f2705adc4614ca5b4b98df875461deba4ce71ea5cbe75bfe3dbf82cb99b2a60ef28f2d0615e16b311e027e27464aa15a9e7aadc61aa2840108024b16c6
 AUX blitz-0.10-gcc47.patch 1534 SHA256 b455d0b68b1c992ac58f546c7b3ec51e754cfceacf85f3c5e7d5c7c077018f29 SHA512 1cc37eba48e7e486dd53f9441b375be2f8140fe634e2fbf3a1bfb0225a7eb0810f95b3f02c66c674d88a97a13f598677867ad77472dc0cd7a3b936a5e3c185de WHIRLPOOL 0ec3824febc62abe6b039b6f49e52123ad21dcb92ed5b29ec22b378982fe4a92a3ecbfd19a76a0187615572476caa0ab2386b6abd53a700bc72d6e74c7ef9076
+AUX blitz-0.10-set-default-arg-value.patch 4809 SHA256 b7df9a999234bece33d8f293f97917d64f12a3268a16d9cc9c83214fcfac7888 SHA512 8181b3740b561f126ce503cc74ed09f9cd1f54cadd29634b2a2771c00cdf6ecc51f82441d30c55703e5576d929dc555a6c52def65b542ffea66a86eca4d6c1f1 WHIRLPOOL a40042b1a43da05fed202cd3f89003910f3c66f7f89475bb3e446afdb29e5b7e1bc5a7ca41fc770270d8a5ba9e81f930d6dc4c64cb6a86884328ad2e4613a0d6
 AUX blitz-0.9-gcc-4.3-missing-includes.patch 404 SHA256 dac1360a34e0f24222873247ae1933e27f760e6207356dff142c81bc30e6f8a2 SHA512 4eb0bf6104cb04ed895166e07c9dbe12bbe37e40f292540c0191304a5087dc8f8dc9f8a6080ec29ce9585a12949a5edb7d38dd30afce5fc6c49cec255afa5db6 WHIRLPOOL ed1b624d7816658e0357e400d8d61d8086613c98f328f43f80b5fa9205d26fc1c7e92ef5ec31894f70cdbd7cd00a418869d11fadf5b86310c4d1bdaac5ab1db7
 DIST blitz-0.10.tar.gz 3777276 SHA256 804ef0e6911d43642a2ea1894e47c6007e4c185c866a7d68bad1e4c8ac4e6f94 SHA512 04fb0c8735d8ae173e6e907bd04fd739c482b7816c25b7dfe58c8641b90c17321e9a6849ced73a04ca9cc55439070de1a1e395497887317b553b0550fa0a2462 WHIRLPOOL ab091832e5dd34f0d2a0f6584c000962946b42f32175fb589fc5c329807e6f75cc81c921c4da3d9e60bc211de0746af1a5f30dc5776761993434a0b8e32ebf6e
 DIST blitz-0.9.tar.gz 3124301 SHA256 88b7c5e062b06767d04511776cf706316026b9357b128e126be88935626d2bcb SHA512 93cce436fa86d7e3d7f93c93aaa0c8bfbe3e3b04f22ef2bc8096a2b700b6a6a8e76c9c84edff550464daeebabe8648ff58639fb46a4c059aa7059606cf3e0913 WHIRLPOOL d7166efa7996bb8ca8055d3a4a0cc6b2ac6bc2e042cfcf2108da1ea5d7656076bb76eaa222b9359c65cfd59ecd0f843ac61daaed97483a3b27cc8606ba3b6ef8
-EBUILD blitz-0.10.ebuild 1581 SHA256 2adc9133c8b2dfce549f3df5bcb8ce907c01d844c4412eb449b503d20c2d5f73 SHA512 0e7533f74a7c59df406bc16bb90fd2aebf04db09192ae877dc99ebb3707116cbce101967cfe50c760654b7b03ea36c5ca3da54d3cc02f589b4c0c2932933947f WHIRLPOOL c5a4d36f8a40723631b6f2d72a849b349b8798c2381555999001e7b001bf617825a45f0b8fb68f6f92900c059f7417bf60e90ad327f4d9b4182c950cb8d5e588
+EBUILD blitz-0.10.ebuild 1643 SHA256 e3aa1b9a077c1ce09aff9e39d85ae183fa9ca230810306f14f7fb2f901b987e2 SHA512 31c08cba4fe27b1332f1c514ee5c435db132591b30ca2add35fcb5c76df50d25a20a80f88d763c8c439a1cace3cda7d92c995ce66586872359e3b4da97ba8246 WHIRLPOOL 980f04a4a9dc34acb4e36baa5a8bb00f1ade4377a9f355ce78a9b323fb63fcb028adb823e521a45ac7e1d3551c8d5b572598312f7e2ce6de3da19f539a4a1cb3
 EBUILD blitz-0.9-r3.ebuild 1639 SHA256 b4acba570ccbdd4f2711e88c9c4a4bc890b703f56e3e67b29468ad734b061c67 SHA512 cbafdd21d74ee94b549a8bdde69ecb49146d44841c9ec4f20abd3717a844178169d4ecb80585f78b912ddeab916d7bbdf9fafd66ec9fadc9c015538b76985b24 WHIRLPOOL 4b25e8386f5214b8ecf98408d5361821a6daf3c225054b2fd2317890f96f8af4bc3bd5e1223ea2d337d3dfb3338e42e721178a43e79f0b60a8086ad39d4e409b
 EBUILD blitz-0.9.ebuild 1368 SHA256 78dc8b28e9e570ac893f067d8371da64b1aa7d6d445ddb0e084e45c1db9c9515 SHA512 d3ac99b7e7bc3a43d337dbd555ffd8f5f35bfa0a0c83465ac079c55f5b8ea08a659564fee053d85018c81567863e92e34cba0b641d6fc1b3048cf3caa2cf4066 WHIRLPOOL 144edef99d58355c41d012e63dc41ff2acd6b1e532d0cfdbea8c3575bb24a479f93593b45747f1c60a6fa784b501dc18199670d83ff5379f27becec868a2381f
-MISC ChangeLog 6120 SHA256 77d185d107e5272eaa6ef017d6bc63c9a39c9e1a90f54e43a1442fc7640af79a SHA512 08661ccfb3263330f2017ade84ade01a09689a127af5c8a92a319285031aaa33a5f915fd13a3bf6adb27c1db285df2989f19718effd5077c93f70fed40e996c9 WHIRLPOOL 5d7b905a495ebfc36ffb9c5957a759f50ce5d6e4621d56aba1cfa388c969c44cbeaf0f834573b2eddfee3d32d9ee1856c7686f9f3dffce65699720e8b3e85c64
+MISC ChangeLog 6357 SHA256 7f81b68c0fd77d60e930f9f9157eb313343a414dd33e206b0047e9b03f9a425b SHA512 d971192e7e1f49b28855e5058876598838d6e1f5a24da0abc914d5b3a1d65015a3b34c6bb58df8413cba1a352d7d0cae5d9e59e4c882b90b5737996cf5fc75da WHIRLPOOL a5ec5ce633dc2d8aff932d518105f4d9b15906ce3507a298e2621ce25e6de8a748c658a3208ccd595c7e0cd099227e15d4cbb76dd5e6620d02603300bb8c384d
 MISC metadata.xml 893 SHA256 39dec851c32908a7fd90b63add1166837acd18214e7d9ca57c4e583818dbbf9a SHA512 fbaf7f0f682682aafef43c611314da4f8103f93bccbaf482ea33ae031d48caa13eba241110721f6706d36baa89b7dd9e95dc0fe5cb4bf60c5ad2e91532dffda6 WHIRLPOOL d009cbd07ecec1238a0a8f89170b6d3feca8d549de2576d2b180cb12f94543ce408e11e0f4cf9ac633b34a2ce4720ef65dd7448e70c088814cbbe3ed8a95630d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlApbioACgkQ1ycZbhPLE2B/zwCcCAGySLcjoxHZqYIOOIafeLP/
-oqgAnRp0UXgYFMWdoyKX1wughvzjUP2A
-=tOqN
+iEYEAREIAAYFAlAydD8ACgkQ1ycZbhPLE2AJBQCgpvjlZ9aI+YAJCNKZvk9/tgvK
+4aYAnje4PdCJ9aQHErrSg9S3eWmsKmxE
+=HYLm
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/blitz/blitz-0.10.ebuild b/dev-libs/blitz/blitz-0.10.ebuild
index e82ea2534714..06efa29c9672 100644
--- a/dev-libs/blitz/blitz-0.10.ebuild
+++ b/dev-libs/blitz/blitz-0.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/blitz-0.10.ebuild,v 1.1 2012/08/13 21:11:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/blitz/blitz-0.10.ebuild,v 1.2 2012/08/20 17:30:01 bicatali Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ RDEPEND="boost? ( >=dev-libs/boost-1.40 )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen[dot] )"
 
-PATCHES=( "${FILESDIR}"/${P}-{docs,gcc47}.patch )
+PATCHES=( "${FILESDIR}"/${P}-{docs,gcc47,set-default-arg-value}.patch )
 
 src_configure() {
 	# blas / fortran only needed for benchmarks
@@ -36,6 +36,7 @@ src_configure() {
 		$(use_enable doc doxygen)
 		$(use_enable doc html-docs)
 		$(use_with boost boost "${EPREFIX}/usr")
+		$(use_with boost boost-serialization)
 	)
 	autotools-utils_src_configure
 }
diff --git a/dev-libs/blitz/files/blitz-0.10-set-default-arg-value.patch b/dev-libs/blitz/files/blitz-0.10-set-default-arg-value.patch
new file mode 100644
index 000000000000..6d10b399a1af
--- /dev/null
+++ b/dev-libs/blitz/files/blitz-0.10-set-default-arg-value.patch
@@ -0,0 +1,107 @@
+Set default variable to allow both --enable-x/--disable-x and
+ --with-x/--without-x to work as expected.
+
+bicatali@gentoo.org 08/2012
+
+--- configure.ac.orig	2012-08-20 17:46:41.000000000 +0100
++++ configure.ac	2012-08-20 17:56:23.000000000 +0100
+@@ -37,7 +37,7 @@
+ # Option to disable Fortran (benchmarks will not compile)
+ AC_MSG_CHECKING([whether to enable Fortran compilation for benchmark codes])
+ AC_ARG_ENABLE(fortran,
+-  AS_HELP_STRING([--enable-fortran],[Enable Fortran compilation]),,[
++  AS_HELP_STRING([--enable-fortran],[Enable Fortran compilation]),enable_fortran=$enableval,[
+   enable_fortran="yes"])
+ AC_MSG_RESULT([$enable_fortran])
+ AM_CONDITIONAL(FORTRAN_ENABLED, [test $enable_fortran = yes])
+@@ -96,7 +96,7 @@
+ # Option to enable thread-safety (requires thread support or OpenMP)
+ AC_MSG_CHECKING([whether to enable Blitz thread-safety features])
+ AC_ARG_ENABLE(threadsafe,
+-  AS_HELP_STRING([--enable-threadsafe],[Enable thread-safety features]),,[
++  AS_HELP_STRING([--enable-threadsafe],[Enable thread-safety features]),enable_threadsafe=$enableval,[
+   enable_threadsafe="no"])
+ AC_MSG_RESULT([$enable_threadsafe])
+ if test "$enable_threadsafe" = yes; then
+@@ -106,17 +106,22 @@
+ AC_MSG_CHECKING([if we are using Intel Threading Building Blocks])
+ AC_ARG_WITH([tbb],
+   AS_HELP_STRING([--with-tbb],[Use Intel Threading Building Blocks atomic types]),
+-    [
++    [if test x$withval != xno; then
+     AC_MSG_RESULT([yes])
+     AC_CHECK_HEADERS([tbb/atomic.h],,AC_MSG_ERROR([tbb/atomic.h not found]))
+     AC_DEFINE([THREADSAFE_USE_TBB],[1],[Use TBB atomic types])
++    else
++    AC_MSG_RESULT([no])
++    fi
+     ],AC_MSG_RESULT([no]))
+ 
+ AC_MSG_CHECKING([for SIMD instruction width])
+ AC_ARG_ENABLE([simd-width],
+   AS_HELP_STRING([--enable-simd-width=n],[Facilitate compiler vectorization optimizations for SIMD instruction width of n bytes.]),
+-  [ AC_ALIGNMENT_DIRECTIVE
+-   AC_DEFINE([USE_ALIGNMENT_PRAGMAS],[1],[Specifies whether compiler alignment pragmas should be used]) ],
++  [if test x$enableval != xno; then
++   AC_ALIGNMENT_DIRECTIVE
++   AC_DEFINE([USE_ALIGNMENT_PRAGMAS],[1],[Specifies whether compiler alignment pragmas should be used])
++   fi ],
+   [enable_simd_width=no]
+   )
+ AC_MSG_RESULT([$enable_simd_width])
+@@ -130,12 +135,15 @@
+ AC_MSG_CHECKING([whether to pad array lengths to SIMD instruction width])
+ AC_ARG_ENABLE([array-length-padding],
+   AS_HELP_STRING([--enable-array-length-padding],[Sets the default array padding policy to pad all lowest-rank lengths to nearest larger SIMD width. Caution: This means that arrays will in general be non-contiguous.]),
+-  [
++  [if test x$enableval != xno; then
+   AC_MSG_RESULT([yes])
+   if test "$enable_simd_width" == [1] ; then
+      AC_MSG_WARN([This option is useless without a SIMD width >1.])
+   fi
+   AC_DEFINE([PAD_ARRAYS],1,[Pad array lengths to SIMD width.])
++  else 
++  AC_MSG_RESULT([no])
++  fi
+   ],AC_MSG_RESULT([no]))
+ 
+ AC_MSG_CHECKING([whether to enable Blitz 64-bit dimensions])
+@@ -147,10 +155,14 @@
+ AC_MSG_CHECKING([whether to enable serialization support])
+ AC_ARG_ENABLE([serialization],
+ 	AS_HELP_STRING([--enable-serialization],[Enable serialization support using Boost::Serialization]), [
++	if test x$enableval != xno; then
+ 	AC_MSG_RESULT([yes])
+ 	AX_BOOST_BASE([1.40.0])						       
+ 	AX_BOOST_SERIALIZATION
+ 	AC_CHECK_HEADERS([boost/mpi.hpp])
++	else
++	AC_MSG_RESULT([no])
++	fi
+ 	 ], AC_MSG_RESULT([no]))
+   
+ # check for PAPI library
+diff -Nur m4.orig/ac_prog_doxygen.m4 m4/ac_prog_doxygen.m4
+--- m4.orig/ac_prog_doxygen.m4	2012-08-20 18:03:12.000000000 +0100
++++ m4/ac_prog_doxygen.m4	2012-08-20 18:00:46.000000000 +0100
+@@ -3,16 +3,16 @@
+ AC_DEFUN([AC_PROG_DOXYGEN],
+ [
+ AC_ARG_ENABLE(doxygen,
+-AS_HELP_STRING([--enable-doxygen],[enable documentation generation with doxygen (no)]),[],[enable_doxygen=no])
++AS_HELP_STRING([--enable-doxygen],[enable documentation generation with doxygen (no)]),[enable_doxygen=$enableval],[enable_doxygen=no])
+ 
+ AC_ARG_ENABLE(dot,
+-AS_HELP_STRING([--enable-dot],[use 'dot' to generate graphs in doxygen (no)]),[],[enable_dot=no])              
++AS_HELP_STRING([--enable-dot],[use 'dot' to generate graphs in doxygen (no)]),[enable_dot=$enableval],[enable_dot=no])              
+ AC_ARG_ENABLE(html-docs,
+ AS_HELP_STRING([--enable-html-docs],[enable HTML generation with doxygen (no)]),
+-[],[ enable_html_docs=no])              
++[enable_html_docs=$enableval],[ enable_html_docs=no])              
+ AC_ARG_ENABLE(latex-docs,
+ AS_HELP_STRING([--enable-latex-docs],
+-[enable LaTeX documentation generation with doxygen (no)]),[],[enable_latex_docs=no])              
++[enable LaTeX documentation generation with doxygen (no)]),[enable_latex_docs=$enableval],[enable_latex_docs=no])              
+ 
+ if test "x$enable_doxygen" = xno; then
+  enable_doc=no