[gentoo-commits] proj/sci:master commit in: sci-physics/abinit/

[Honza Macháček]

commit:     60e43b80b7752dd0afb8ae3f3eb431ecd46118de
Author:     Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
AuthorDate: Wed Jun 29 11:31:08 2011 +0000
Commit:     Honza Macháček <Hloupy.Honza <AT> centrum <DOT> cz>
CommitDate: Wed Jun 29 11:31:08 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=60e43b80

Restored the support for threaded fftw. Works for me. NEVER DISABLE FEATURES FOR OTHERS.

---
 sci-physics/abinit/ChangeLog           |    4 ++++
 sci-physics/abinit/abinit-6.6.3.ebuild |   21 ++++++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog
index 3b8132d..237af8e 100644
--- a/sci-physics/abinit/ChangeLog
+++ b/sci-physics/abinit/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jun 2011; Honza Macháček <Hloupy.Honza@×××××××.cz> abinit-6.6.3.ebuild:
+  Restored the support for threaded fftw. Works for me. NEVER DISABLE FEATURES
+  FOR OTHERS.
+
   24 Jun 2011; Justin Lecher <jlec@g.o> -abinit-6.6.2.ebuild,
   abinit-6.6.3.ebuild:
   Dropped ~ppc as many deps aren't keyworded

diff --git a/sci-physics/abinit/abinit-6.6.3.ebuild b/sci-physics/abinit/abinit-6.6.3.ebuild
index eff92bd..3799d05 100644
--- a/sci-physics/abinit/abinit-6.6.3.ebuild
+++ b/sci-physics/abinit/abinit-6.6.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI="3"
 
 inherit autotools eutils fortran-2 multilib toolchain-funcs
 
@@ -15,8 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="cuda -debug +fftw +fox gsl +hdf5 mpi +netcdf python -test +threads -vdwxc"
 
-RDEPEND="
-	>=sci-libs/bigdft-1.2.0.2
+RDEPEND=">=sci-libs/bigdft-1.2.0.2
 	sci-libs/etsf_io
 	=sci-libs/libxc-1.0[fortran]
 	sci-physics/atompaw[libxc]
@@ -72,8 +71,20 @@ src_configure() {
 	local netcdff_libs="-lnetcdff"
 	use hdf5 && netcdff_libs="${netcdff_libs} -lhdf5_fortran"
 	local fft_flavor="fftw3"
-	#fft_flavor="fftw3-threads" causes a ./configure error
-	local fft_libs="-L/usr/$(get_libdir) $(pkg-config --libs fftw3)"
+	local fft_libs="-L/usr/lib"
+	# Since now, fftw threads support is protected by black magick.
+	# Anybody removes it again, dies.
+	# If it does not work FOR YOU, disable the "threads" USE flag
+	# for the package at YOUR box. If YOU want it disabled selectively
+	# for fftw use in abinit, you may consider adding a special USE flag
+	# for that. NEVER REMOVE AN OPTION FOR OTHERS, at least if there is
+	# anybody it works for.
+	if use threads; then
+		fft_libs="${fft_libs} $(pkg-config --libs fftw3_threads)"
+		fft_flavor="fftw3-threads"
+	else
+		fft_libs="${fft_libs} $(pkg-config --libs fftw3)"
+	fi
 	if use mpi; then
 		MY_FC="mpif90"
 		MY_CC="mpicc"