[gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/

["Sebastien Fabbro" <bicatali@gentoo.org>]

commit:     bc62393734cd89341610c14c14f61abe8d478f86
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 01:55:26 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 01:55:26 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bc623937

sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time

Package-Manager: portage-2.2.8-prefix

---
 sci-libs/armadillo/ChangeLog                |  3 +++
 sci-libs/armadillo/armadillo-4.000.3.ebuild | 33 +++++++++++++++++------------
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index 59c557d..e28dc78 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  10 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> armadillo-4.000.3.ebuild:
+  sci-libs/armadillo: removed int64 flag, it is only for revdep at compile time
+
   09 Feb 2014; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml:
   sci-libs/armadillo: add use flag description
 

diff --git a/sci-libs/armadillo/armadillo-4.000.3.ebuild b/sci-libs/armadillo/armadillo-4.000.3.ebuild
index 7b82540..6dab248 100644
--- a/sci-libs/armadillo/armadillo-4.000.3.ebuild
+++ b/sci-libs/armadillo/armadillo-4.000.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
 LICENSE="MPL-2.0"
 SLOT="0/4"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack atlas blas debug doc examples hdf5 int64 lapack mkl tbb test"
+IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
 REQUIRED_USE="test? ( lapack )"
 
 RDEPEND="
@@ -49,7 +49,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
 		$(cmake-utils_use debug ARMA_EXTRA_DEBUG)
-		$(cmake-utils_use int64 ARMA_64BIT_WORD)
 		$(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
 		$(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
 	)
@@ -59,18 +58,6 @@ src_configure() {
 			-DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
 		)
 	fi
-	if use blas; then
-		mycmakeargs+=(
-			-DBLAS_FOUND=ON
-			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		)
-	fi
-	if use lapack; then
-		mycmakeargs+=(
-			-DLAPACK_FOUND=ON
-			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
-		)
-	fi
 	if use atlas; then
 		local c=atlas-cblas l=atlas-clapack
 		$(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
@@ -84,6 +71,24 @@ src_configure() {
 			-DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
 		)
 	fi
+	if use blas; then
+		mycmakeargs+=(
+			-DBLAS_FOUND=ON
+			-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+		)
+	fi
+	if use hdf5; then
+		mycmakeargs+=(
+			-DHDF5_FOUND=ON
+			-DHDF5_LIBRARIES="-lhdf5"
+		)
+	fi
+	if use lapack; then
+		mycmakeargs+=(
+			-DLAPACK_FOUND=ON
+			-DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+		)
+	fi
 	cmake-utils_src_configure
 }