sci-libs/bigdft: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; drop old

Package-Manager: portage-2.2.0_alpha163

6 files changed, 36 insertions, 157 deletions

diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 0765022be..224a6f374 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -4,6 +4,11 @@
 
 <<<<<<< HEAD
 
+  22 Feb 2013; Justin Lecher <jlec@gentoo.org> -bigdft-1.6_pre1-r4.ebuild,
+  bigdft-1.6.0-r2.ebuild, bigdft-1.7_pre12.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  drop old
+
   20 Feb 2013; Honza Macháček <Hloupy.Honza@centrum.cz>
   bigdft-1.7_pre12.ebuild:
   The setup of python for the compilation of the GPU support in
diff --git a/sci-libs/bigdft/Manifest b/sci-libs/bigdft/Manifest
index 39acfb0cf..a828ad66e 100644
--- a/sci-libs/bigdft/Manifest
+++ b/sci-libs/bigdft/Manifest
@@ -1,3 +1,2 @@
-DIST bigdft-1.6-tuto.1.tar.gz 7510733 SHA256 32020c7e58b36fe1f58a47ef02af99bd0da81c6da7d6f15e89b8075494d39d87 SHA512 48684413b0807b5dcee4b97b5b83d9a839c44043801b923c5f0ce7c8a92024cfee64c1065d4d2ffc67cb249cfcd485680b5526aaaedba06e6a88ccc52ba290f2 WHIRLPOOL d6efcc6f9ded331c42e8e3b13a9260e2acd922c4fa0bf303455e33924a930df6aa01abec897c1d190d5016a5bb3781c491e8a17d500e5485717989bddd4f579d
 DIST bigdft-1.6.0.tar.gz 8876759 SHA256 2d3212ef5f1ebc10fe7c627397ac6282ad41e1433ec6e66905f9d39a302913c0 SHA512 facbb78d126885dd04fed6451aa9cd1f5c755055e146cda1d2d4e90e3310fc3066b661635477db96d5b143ffaaa3ebb01107681437fd9965f3c764cf1b034361 WHIRLPOOL 97bc6c28296a92b09139e3a65266daa583011620fad5aed208e0e48627ab1d9c0ef9993d6c4c3cce5696d5c707bcdfb4b8ca7e64379909b3cf073206e32f9572
 DIST bigdft-1.7-dev.12.tar.gz 8904633 SHA256 2f899f287dd508dc616fb798cc9d01d1c79951dc68c277fb0ce19ea0ad690332 SHA512 35efe93edd7e6fb08abe919c59913c173f23e17a50104ad92e510dba5ba35ba8117012249d620896affc8acc05c9d85c6c61a411bc903750db6593456e9e8142 WHIRLPOOL 94a8d6d25fe82f3f1b89d15b4e23293d018bfb66c96fd1061a09e6352fb6811e79a15161bd3ca92e5f544253c8fa9f919d41fe069635ac07f33e21cc70878719
diff --git a/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
index 09350541e..e43d7e45b 100644
--- a/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -37,7 +37,7 @@ RDEPEND="
 				)
 			)"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	>=sys-devel/autoconf-2.59
 	doc? ( virtual/latex-base )"
 
@@ -79,10 +79,10 @@ src_configure() {
 		--enable-binaries
 		--disable-minima-hopping
 		--with-moduledir="${modules}"
-		--with-ext-linalg="$(pkg-config --libs-only-l lapack) \
-			$(pkg-config --libs-only-l blas)"
-		--with-ext-linalg-path="$(pkg-config --libs-only-L lapack) \
-			$(pkg-config --libs-only-L blas)"
+		--with-ext-linalg="$($(tc-getPKG_CONFIG) --libs-only-l lapack) \
+			$($(tc-getPKG_CONFIG) --libs-only-l blas)"
+		--with-ext-linalg-path="$($(tc-getPKG_CONFIG) --libs-only-L lapack) \
+			$($(tc-getPKG_CONFIG) --libs-only-L blas)"
 		--disable-internal-libxc
 		--with-libxc-path="/usr"
 		--with-libxc-include="${modules}"
@@ -93,9 +93,9 @@ src_configure() {
 		$(use_with opencl ocl-path "${EPREFIX}/usr")
 		$(use_with etsf_io etsf-io)
 		$(use_with etsf_io etsf-io-path "${EPREFIX}/usr")
-		$(use_with etsf_io netcdf-path "$(pkg-config --libs-only-L netcdf)")
-		"$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")"
-		FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -I${modules}"
+		$(use_with etsf_io netcdf-path "$($(tc-getPKG_CONFIG) --libs-only-L netcdf)")
+		"$(use etsf_io && echo "--with-netcdf-libs=$($(tc-getPKG_CONFIG) --libs netcdf) ${netcdff_libs}")"
+		FCFLAGS+=" -I${modules}"
 		LD="$(tc-getLD)"
 		CPP="$(tc-getCPP)"
 		)
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild
deleted file mode 100644
index 95bbebf41..000000000
--- a/sci-libs/bigdft/bigdft-1.6_pre1-r4.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit autotools-utils eutils flag-o-matic fortran-2 toolchain-funcs
-
-REAL_P="${P/_pre/-tuto.}"
-REAL_P="${REAL_P/-tuto.0/-tuto}"
-
-DESCRIPTION="A DFT electronic structure code using a wavelet basis set"
-HOMEPAGE="http://inac.cea.fr/L_Sim/BigDFT/"
-SRC_URI="http://inac.cea.fr/L_Sim/BigDFT/${REAL_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="cuda doc etsf_io mpi netcdf opencl test"
-
-RDEPEND="
-	=sci-libs/libxc-1*[fortran]
-	virtual/blas
-	virtual/fortran
-	virtual/lapack
-	mpi? ( virtual/mpi )
-	cuda? ( dev-util/nvidia-cuda-sdk )
-	opencl? (
-		|| (
-			dev-util/nvidia-cuda-sdk
-			dev-util/amdstream
-			)
-		)
-	etsf_io? ( sci-libs/etsf_io )
-	netcdf? ( || (
-				sci-libs/netcdf[fortran]
-				sci-libs/netcdf-fortran
-				)
-			)"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=sys-devel/autoconf-2.59
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${REAL_P}"
-
-DOCS=( README INSTALL ChangeLog AUTHORS NEWS )
-
-FORTRAN_STANDARD=90
-
-pkg_setup() {
-	# fortran-2.eclass does not handle mpi wrappers
-	if use mpi; then
-		export FC="mpif90"
-		export F77="mpif77"
-		export CC="mpicc"
-	else
-		tc-export FC F77 CC
-	fi
-
-	fortran-2_pkg_setup
-}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/"${REAL_P}"-libxc_dir_include.patch \
-		"${FILESDIR}"/"${REAL_P}"-bigdft.pc-1.patch \
-		"${FILESDIR}"/"${REAL_P}"-gcc-4.6.patch \
-		"${FILESDIR}"/"${REAL_P}"-GPUlibs-1.patch
-	sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure || die
-	sed -i -e's/capitalize_module_ext/ax_fc_mod_ext/g' "${S}"/configure.ac || die
-	eautoreconf
-}
-
-src_configure() {
-	local modules="${EPREFIX}/usr/$(get_libdir)/finclude"
-	local netcdff_libs="-lnetcdff"
-	filter-flags '-m*' '-O*' "-pipe"
-	local nvcflags="${CFLAGS}"
-#	_filter-var nvcflags '-m*' '-O*' "-pipe"
-	local myeconfargs=(
-		$(use_enable mpi)
-		--enable-optimised-convolution
-		--enable-pseudo
-		--enable-libbigdft
-		--enable-binaries
-		--disable-minima-hopping
-		--with-moduledir="${modules}"
-		--with-ext-linalg="$(pkg-config --libs-only-l lapack) \
-			$(pkg-config --libs-only-l blas)"
-		--with-ext-linalg-path="$(pkg-config --libs-only-L lapack) \
-			$(pkg-config --libs-only-L blas)"
-		--enable-libxc
-		--disable-internal-libxc
-		--with-libxc-path="/usr"
-		--with-libxc-include="${modules}"
-		$(use_enable cuda cuda-gpu)
-		$(use_with cuda cuda-path /opt/cuda)
-		$(use_with cuda nvcc-flags "${nvcflags}")
-		$(use_enable opencl)
-		$(use_with opencl ocl-path "${EPREFIX}/usr")
-		$(use_with etsf_io etsf-io)
-		$(use_with etsf_io etsf-io-path "${EPREFIX}/usr")
-		$(use_with etsf_io netcdf-path "$(pkg-config --libs-only-L netcdf)")
-		"$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")"
-		FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} -I${modules}"
-		LD="$(tc-getLD)"
-		CPP="$(tc-getCPP)"
-		)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	#autotools-utils_src_compile() expanded
-	_check_build_dir
-	pushd "${AUTOTOOLS_BUILD_DIR}" > /dev/null
-	emake -j1
-	sed -i -e's%\$(top_builddir)/[^ ]*/lib\([^ /$-]*\)\.a%-l\1%g' bigdft.pc
-	popd > /dev/null
-
-	use doc && autotools-utils_src_compile doc
-}
-
-src_test() {
-	use test && autotools-utils_src_test
-}
-
-src_install() {
-	autotools-utils_src_install HAVE_LIBXC=1
-}
diff --git a/sci-libs/bigdft/bigdft-1.7_pre12.ebuild b/sci-libs/bigdft/bigdft-1.7_pre12.ebuild
index 45623f061..702845390 100644
--- a/sci-libs/bigdft/bigdft-1.7_pre12.ebuild
+++ b/sci-libs/bigdft/bigdft-1.7_pre12.ebuild
@@ -40,7 +40,7 @@ RDEPEND="
 				)
 			)"
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
+	virtual/pkgconfig
 	>=sys-devel/autoconf-2.59
 	doc? ( virtual/latex-base )
 	cuda? ( ${PYTHON_DEPS} )
@@ -65,9 +65,8 @@ pkg_setup() {
 	fi
 
 	fortran-2_pkg_setup
-	if use openmp; then
-                tc-has-openmp || \
-                        die "Please select an openmp capable compiler like gcc[openmp]"
+	if use openmp && [[ $(tc-getCC)$ == *gcc* ]] &&	! tc-has-openmp; then
+		die "Please select an openmp capable compiler like gcc[openmp]"
 	fi
 	python-any-r1_pkg_setup
 }
@@ -99,10 +98,10 @@ src_configure() {
 		--disable-internal-libyaml
 		--enable-internal-libabinit
 		--with-moduledir="${modules}"
-		--with-ext-linalg="$(pkg-config --libs-only-l lapack) \
-			$(pkg-config --libs-only-l blas)"
-		--with-ext-linalg-path="$(pkg-config --libs-only-L lapack) \
-			$(pkg-config --libs-only-L blas)"
+		--with-ext-linalg="$($(tc-getPKG_CONFIG) --libs-only-l lapack) \
+			$($(tc-getPKG_CONFIG) --libs-only-l blas)"
+		--with-ext-linalg-path="$($(tc-getPKG_CONFIG) --libs-only-L lapack) \
+			$($(tc-getPKG_CONFIG) --libs-only-L blas)"
 		--enable-libxc
 		--disable-internal-libxc
 		--with-libxc-include="${modules}"
@@ -111,8 +110,8 @@ src_configure() {
 		$(use_with cuda nvcc-flags "${nvcflags}")
 		$(use_enable opencl)
 		$(use_with etsf_io etsf-io)
-		"$(use etsf_io && echo "--with-netcdf-libs=$(pkg-config --libs netcdf) ${netcdff_libs}")"
-		FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O2}} ${openmp} -I${modules}"
+		"$(use etsf_io && echo "--with-netcdf-libs=$($(tc-getPKG_CONFIG) --libs netcdf) ${netcdff_libs}")"
+		FCFLAGS+=" ${openmp} -I${modules}"
 		LD="$(tc-getLD)"
 		CPP="$(tc-getCPP)"
 		)
diff --git a/sci-libs/bigdft/metadata.xml b/sci-libs/bigdft/metadata.xml
index 3c0615542..71f04f476 100644
--- a/sci-libs/bigdft/metadata.xml
+++ b/sci-libs/bigdft/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>sci@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="cuda">Add cuda support</flag>
-	</use>
+  <herd>sci</herd>
+  <maintainer>
+    <email>sci@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="cuda">Add cuda support</flag>
+  </use>
+  <use>
+    <flag name="etsf_io">Undocumented USE</flag>
+  </use>
+  <use>
+    <flag name="opencl">Undocumented USE</flag>
+  </use>
 </pkgmetadata>