The conditional use of several configure options tweaked to actually work even if a USE flag is unset. Reported by Jérôme Borme <jerome.borme@gmail.com>

4 files changed, 21 insertions, 208 deletions

diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog
index f7c7a5e63..2c2cf355c 100644
--- a/sci-physics/abinit/ChangeLog
+++ b/sci-physics/abinit/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Jan 2011; Honza Macháček <Hloupy.Honza@centrum.cz> -abinit-6.2.2.ebuild,
+  abinit-6.4.2.ebuild:
+  The conditional use of several configure options tweaked to actually work
+  even if a USE flag is unset. Reported by Jérôme Borme
+  <jerome.borme@gmail.com>
+
 *abinit-6.4.2 (17 Jan 2011)
 *abinit-6.2.2 (17 Jan 2011)
 
diff --git a/sci-physics/abinit/Manifest b/sci-physics/abinit/Manifest
index 8ca0b9fd7..a4fd38df7 100644
--- a/sci-physics/abinit/Manifest
+++ b/sci-physics/abinit/Manifest
@@ -5,8 +5,6 @@ AUX 6.2.2-configure-fortran-calls.patch 1056 RMD160 0adc386a28545d89b2aabc8faec7
 AUX 6.2.2-long-message.patch 856 RMD160 78f68e28061f1611120e065aa9cc7dde5d55a13c SHA1 443528ca06c89f6b8df49813b3a9735e4f0631c8 SHA256 0e8e2b85ed366a8fe279298bbc47409d08268b94f48bb18f9d71a0367c900c54
 AUX 6.2.2-non-plugin-libs.patch 5341 RMD160 1dffa7d14a8b0711ae9f681df073bf0355983300 SHA1 db2b48bdd983e7d9b4be3e4bb2181237337a3a6d SHA256 5ca6435a11ee07db148c8f542307fa0d473455e6c4fb6194b73176bb66aaabd1
 AUX 6.4.2-openmp.patch 131318 RMD160 782f451384b916e9d5b990769a47b162412fc7e4 SHA1 e002581dcfeb2a3c0214cdc302dd9be9f014dc4a SHA256 5fed737e0a8758c4fe389df16391c7a99e2546416225aec89fe05b36ca937fc4
-DIST abinit-6.2.2.tar.gz 41960307 RMD160 d3fba3d70a70a702c83639b33d373ff8e99f9fb6 SHA1 048846161a95814bc1244d2418566c26772140ad SHA256 51fb88cebd9bfe614888b1004cee26531ac259a723993baa507cb2f50c5b2e90
 DIST abinit-6.4.2.tar.gz 42499278 RMD160 2673b3490f84fa3ec341d68adbf8a5e36ed9afc9 SHA1 88d15b7ab9598daac448748bfc0756808d2b75cf SHA256 4655fdc15237eb55cbca511c4ae606a42dee7b093b119cc472912404ebdb7a41
-EBUILD abinit-6.2.2.ebuild 5614 RMD160 72c247c30ad90d6df1e4d24fb93db8c1f852c879 SHA1 febc874e091770620d9cc068ef6870237ec0de35 SHA256 7826ccd6091751d8411aae6d9118e8b1579e302c86ad995dd3c60bb6e2aefc3e
-EBUILD abinit-6.4.2.ebuild 6581 RMD160 e402cd545044c48ab81a5a16251b424787bedb22 SHA1 ee2dd5dd2a2f9582588b73a891932afb7c4a1cc1 SHA256 1e7d97f35d48c1d15484e6c44013b8dfa407b2ace64857a03f9cea1b91e452e0
-MISC ChangeLog 704 RMD160 47bda0e598d5f65a4b36d74f29afb327864f2574 SHA1 4fcd61769ad32d370918972927f6dc11b32519ad SHA256 7597fbc8c0981af0584058435072d02ac9c60e5628a2446ac499c2ef949ae556
+EBUILD abinit-6.4.2.ebuild 6656 RMD160 80bf9115218e9ca7adf43c5717029d4821460122 SHA1 c7eeff16cc270226a8652c9e3978b57ae592c412 SHA256 789dfeeda5d3642052ee7a59f181afeec853aa6aa7fc0ed0f5a9f90e08419562
+MISC ChangeLog 969 RMD160 ce3325137f0685320b5aabe88b8af9f1948e76c6 SHA1 e08975c2ef3544597de705f412873476f9e50821 SHA256 cc811a721f28d4d4807f4b6ded39a713308ac92ca8e8661f341b201f5770f38b
diff --git a/sci-physics/abinit/abinit-6.2.2.ebuild b/sci-physics/abinit/abinit-6.2.2.ebuild
deleted file mode 100644
index ea0a7c9d8..000000000
--- a/sci-physics/abinit/abinit-6.2.2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-
-inherit autotools eutils multilib toolchain-funcs
-
-DESCRIPTION="Find total energy, charge density and electronic structure using density functional theory"
-HOMEPAGE="http://www.abinit.org/"
-SRC_URI="http://ftp.abinit.org/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="cuda fftw fox gsl mpi smp test vdwxc"
-
-RDEPEND="=sci-libs/bigdft-1.2.0.2
-	sci-libs/etsf_io
-	=sci-libs/libxc-1.0_p6071
-	fox? ( sci-libs/fox[dom,sax,wcml,wxml] )
-	sci-libs/netcdf[fortran,hdf5]
-	sci-libs/hdf5[fortran]
-	sci-libs/wannier90
-	virtual/blas
-	virtual/lapack
-	gsl? ( sci-libs/gsl )
-	fftw? ( sci-libs/fftw:3 )
-	mpi? ( virtual/mpi )
-	cuda? ( dev-util/nvidia-cuda-sdk )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
-
-# F90 code, g77 won't work
-FORTRAN="gfortran ifc mpif90"
-
-S=${WORKDIR}/${P%[a-z]}
-
-pkg_setup() {
-	# Doesn't compile with gcc-4.0, only >=4.1
-	if [[ $(tc-getFC) == *gfortran ]]; then
-		if [[ $(gcc-major-version) -eq 4 ]] \
-			&& [[ $(gcc-minor-version) -lt 1  ]]; then
-				die "Requires gcc-4.1 or newer"
-		fi
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/6.2.2-change-default-directories.patch
-	epatch "${FILESDIR}"/6.2.2-configure-fortran-calls.patch
-	epatch "${FILESDIR}"/6.0.3-fftw.patch
-	epatch "${FILESDIR}"/6.2.2-long-message.patch
-	epatch "${FILESDIR}"/6.2.2-non-plugin-libs.patch
-# To compile against the current SVN HEAD of libxc:
-#	epatch "${FILESDIR}"/6.0.3-libxc-flags.patch
-	eautoreconf
-#	find "${S}" -type f -exec grep -q -- '-llibxc' {} \; \
-#		-exec sed -i -e's/-llibxc/-lxc/g' {} \;
-}
-
-src_configure() {
-	local libs="-L/usr/$(get_libdir)"
-	local modules="-I/usr/$(get_libdir)/finclude"
-	local FoX_libs="-lFoX_dom -lFoX_sax -lFoX_wcml -lFoX_wxml -lFoX_common -lFoX_utils -lFoX_fsys"
-	if use mpi; then
-		MY_FC="mpif90"
-		MY_CC="mpicc"
-		MY_CXX="mpic++"
-	else
-		MY_FC="${tc-getFC}"
-		MY_CC="$(tc-getCC)"
-		MY_CXX="$(tc-getCXX)"
-	fi
-	econf \
-		$(use_enable mpi) \
-		$(use_enable mpi mpi-io) \
-		$(use_enable smp) \
-		$(use_enable fox) \
-		$(use_enable gsl math) \
-		$(use_enable fftw fft) \
-		$(use_enable cuda gpu) \
-		$(use_with cuda gpu-flavor cuda) \
-		$(use_with cuda gpu-prefix /opt/cuda/) \
-		$(use_enable vdwxc) \
-		--enable-linalg \
-		--enable-trio \
-		--enable-etsf-io \
-		--enable-dft \
-		--with-linalg-flavor="atlas" \
-		--with-linalg-libs="$(pkg-config --libs lapack)" \
-		--with-trio-flavor="etsf+hdf+netcdf" \
-		--with-netcdf-includes="-I/usr/include" \
-		--with-netcdf-libs="$(pkg-config --libs netcdf) -lnetcdff -lhdf5_fortran" \
-		$(use-with fox fox-includes "${modules}") \
-		$(use-with fox fox-libs "${libs} ${FoX_libs}") \
-		--with-etsf-io-includes="${modules}" \
-		--with-etsf-io-libs="${libs} -letsf_io -letsf_io_low_level -letsf_io_utils" \
-		--with-trio-includes="-I/usr/include ${modules}" \
-		--with-trio-libs="$(pkg-config --libs netcdf) -lnetcdff -lhdf5_fortran -letsf_io -letsf_io_low_level -letsf_io_utils" \
-		--with-dft-flavor="libxc+bigdft+wannier90" \
-		--with-libxc-includes="${modules}" \
-		--with-libxc-libs="${libs} -lxc" \
-		--with-bigdft-includes="${modules}" \
-		--with-bigdft-libs="${libs} -lpoissonsolver -lbigdft" \
-		--with-wannier90="/usr/bin/wannier90.x" \
-		--with-wannier90-includes="${modules}" \
-		--with-wannier90-libs="${libs} -lwannier $(pkg-config --libs lapack)" \
-		--with-dft-includes="${modules}" \
-		--with-dft-libs="${libs} -lwannier -lpoissonsolver -lbigdft -lxc $(pkg-config --libs lapack)" \
-		$(use-with fftw fft-flavor "fftw3+fftw3-threads") \
-		$(use-with fftw fft-includes "-I/usr/include $(pkg-config --cflags fftw3)") \
-		$(use-with fftw fft-libs "$(pkg-config --libs fftw3) -lfftw3_threads") \
-		$(use-with gsl math-flavor "gsl") \
-		$(use-with gsl math-includes "$(pkg-config --cflags gsl)") \
-		$(use-with gsl math-libs "$(pkg-config --libs gsl)") \
-		--with-timer-flavor="abinit" \
-		FC="${MY_FC}" \
-		CC="${MY_CC}" \
-		CXX="${MY_CXX}" \
-		LD="$(tc-getLD)" \
-		FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} ${modules}"
-}
-
-src_compile() {
-#	if use mpi; then
-#		emake multi || die
-#	else
-		emake || die
-#	fi
-}
-
-src_test() {
-	einfo "The tests take quite a while, on the order of 1-2 hours"
-	einfo "on an Intel Penryn (2.5 GHz)."
-	cd "${S}"/tests
-	emake tests_min
-	emake tests_paw
-	emake tests_gw
-	emake tests_gw_paw
-	emake tests tdft
-	emake tests_bench
-
-	local REPORT
-	for REPORT in $(find . -name report); do
-		REPORT=${REPORT#*/}
-		elog "Parameters and unusual results for ${REPORT%%/*} tests"
-		echo "Parameters and unusual results for ${REPORT%%/*} tests" >>tests_summary.txt
-		while read line; do
-			elog "${line}"
-			echo "${line}" >>tests_summary.txt
-		done \
-			< <(grep -v -e succeeded -e passed ${REPORT})
-	done
-
-	local testdir
-	find . -name ",,test*" -print | \
-		while read testdir; do
-			if [ -e summary_tests.tar ]; then
-				tar rvf summary_tests.tar ${testdir}
-			else tar cvf summary_tests.tar ${testdir}
-			fi
-		done
-
-	elog "The full test results will be installed as summary_tests.tar.bz2."
-	elog "Also a concise report tests_summary.txt is installed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-
-	if use test; then
-		dodoc tests/tests_summary.txt || ewarn "Copying tests summary failed"
-		dodoc tests/summary_tests.tar || ewarn "Copying tests results failed"
-	fi
-
-	dodoc KNOWN_PROBLEMS README || die "Copying doc files failed"
-}
-
-pkg_postinst() {
-	if use test; then
-		elog "The full test results will be installed as summary_tests.tar.bz2."
-		elog "Also a concise report tests_summary.txt is installed."
-	fi
-}
diff --git a/sci-physics/abinit/abinit-6.4.2.ebuild b/sci-physics/abinit/abinit-6.4.2.ebuild
index 8ca4c2c46..409ee0792 100644
--- a/sci-physics/abinit/abinit-6.4.2.ebuild
+++ b/sci-physics/abinit/abinit-6.4.2.ebuild
@@ -72,12 +72,6 @@ src_configure() {
 	local libs="-L/usr/$(get_libdir)"
 	local modules="-I/usr/$(get_libdir)/finclude"
 	local FoX_libs="${libs} -lFoX_dom -lFoX_sax -lFoX_wcml -lFoX_wxml -lFoX_common -lFoX_utils -lFoX_fsys"
-	local cudaopts=""
-	if use cuda; then
-		cudaopts="--enable-gpu --with-gpu-flavor=cuda-single"
-		cudaopts="${cudaopts} --with-gpu-prefix=/opt/cuda/"
-
-	fi
 	local trio_flavor="etsf"
 	use fox && trio_flavor="${trio_flavor}+fox"
 	use hdf5 && trio_flavor="${trio_flavor}+hdf"
@@ -118,7 +112,12 @@ src_configure() {
 		$(use_enable gsl math) \
 		$(use_enable fftw fft) \
 		$(use_enable vdwxc) \
-		${cudaopts} \
+		$(use_enable cuda gpu) \
+		"$(use cuda && echo "--with-gpu-flavor=cuda-single")" \
+		"$(use cuda && echo "--with-gpu-prefix=/opt/cuda/")" \
+		"$(use gsl && echo "--with-math-flavor=gsl")" \
+		"$(use gsl && echo "--with-math-includes=$(pkg-config --cflags gsl)")" \
+		"$(use gsl && echo "--with-math-libs=$(pkg-config --libs gsl)")" \
 		--enable-linalg \
 		--enable-trio \
 		--enable-etsf-io \
@@ -126,10 +125,10 @@ src_configure() {
 		--with-linalg-flavor="atlas" \
 		--with-linalg-libs="$(pkg-config --libs lapack)" \
 		--with-trio-flavor="${trio_flavor}" \
-		"$(use_with netcdf netcdf-includes "-I/usr/include")" \
-		"$(use_with netcdf netcdf-libs "$(pkg-config --libs netcdf) ${netcdff_libs}")" \
-		"$(use_with fox fox-includes "${modules}")" \
-		"$(use_with fox fox-libs "${FoX_libs}")" \
+		"$(use netcdf && echo "--with-netcdf-includes=-I/usr/include")" \
+		"$(use netcdf && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")" \
+		"$(use fox && echo "--with-fox-includes=${modules}")" \
+		"$(use fox && echo "--with-fox-libs=${FoX_libs}")" \
 		--with-etsf-io-includes="${modules}" \
 		--with-etsf-io-libs="${libs} -letsf_io -letsf_io_low_level -letsf_io_utils" \
 		--with-trio-includes="-I/usr/include ${modules}" \
@@ -144,12 +143,9 @@ src_configure() {
 		--with-wannier90-libs="${libs} -lwannier $(pkg-config --libs lapack)" \
 		--with-dft-includes="${modules}" \
 		--with-dft-libs="${libs} -lwannier -lpoissonsolver -lbigdft -lxc $(pkg-config --libs lapack)" \
-		"$(use_with fftw fft-flavor "${fft_flavor}")" \
-		"$(use_with fftw fft-includes "-I/usr/include")" \
-		"$(use_with fftw fft-libs "${fft_libs}")" \
-		"$(use_with gsl math-flavor "gsl")" \
-		"$(use_with gsl math-includes "$(pkg-config --cflags gsl)")" \
-		"$(use_with gsl math-libs $(pkg-config --libs gsl))" \
+		"$(use fftw && echo "--with-fft-flavor=${fft_flavor}")" \
+		"$(use fftw && echo "--with-fft-includes=-I/usr/include")" \
+		"$(use fftw && echo "--with-fft-libs=${fft_libs}")" \
 		--with-timer-flavor="abinit" \
 		FC="${MY_FC}" \
 		CC="${MY_CC}" \