abinit: Handle plugins right, other cleanup.

- Plugin handling code from a contributor on the abinit 5.6 bug. This
  makes external builds work right.
- Add split libxc.
- Drop die messages, they're redundant.
- Show more useful output in src_test() by only showing summary info and
  hiding successes.

2 files changed, 30 insertions, 25 deletions

diff --git a/sci-physics/abinit/Manifest b/sci-physics/abinit/Manifest
index 6be3462..9e7854a 100644
--- a/sci-physics/abinit/Manifest
+++ b/sci-physics/abinit/Manifest
@@ -1,3 +1,3 @@
 AUX 5.3.4-change-default-directories.patch 1550 RMD160 02abf8695d4a12b0d47b96f86fedb05f65f0fde8 SHA1 03c6200cbe0458040cd3f7af42a28515b4c17b57 SHA256 3d493ed6f49924c248694d0de5aa0c66ac693b4ce5c6b3ce892471c9b2d7fbf7
 DIST abinit-5.7.3.tar.gz 31683174 RMD160 e2a6094a0034b9ccedac845be86b2f85b188f300 SHA1 94410b006038d55531a1d352df63ba7cb0680da9 SHA256 caac56530ceaa5e16326fd4407adcd0b1aede07ded51017f3eb6a6a3696c2867
-EBUILD abinit-5.7.3.ebuild 1962 RMD160 373ad604580ca5598fffd03d88e2e7d81aaa02ae SHA1 8321a10e3049fe282d0720a926cdc4211cbc20d5 SHA256 503bcc13c56f9258312b03e7c47b746445bc31191d7eb3dac58de2d6ce08d21d
+EBUILD abinit-5.7.3.ebuild 2360 RMD160 a2211584ce6b990a3874e5eb6a0584f2007a9897 SHA1 7b65c21f2f68253fd12cde8da609301a5fda0b53 SHA256 1ef9ee66d8b68221b7e843faa78765e81041663b8061688c7a5153203de0526f
diff --git a/sci-physics/abinit/abinit-5.7.3.ebuild b/sci-physics/abinit/abinit-5.7.3.ebuild
index 7e0f8ea..408ee40 100644
--- a/sci-physics/abinit/abinit-5.7.3.ebuild
+++ b/sci-physics/abinit/abinit-5.7.3.ebuild
@@ -14,14 +14,14 @@ IUSE="mpi test"
 
 RDEPEND="sci-libs/bigdft
 	sci-libs/etsf_io
+	sci-libs/libxc
 	sci-libs/fox
 	sci-libs/netcdf
 	sci-libs/wannier90
 	virtual/blas
 	virtual/lapack
 	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	"
+DEPEND="${RDEPEND}"
 
 # F90 code, g77 won't work
 FORTRAN="gfortran ifc mpif90"
@@ -35,56 +35,61 @@ src_unpack() {
 }
 
 src_compile() {
-	# Plugins: xmlf90 is obsoleted by fox, another plugin.
-	# Plugins: disable all except etsf_xc, which has no release.
 	econf \
 		$(use_enable mpi) \
-		--disable-bigdft \
-		--disable-etsf_io \
-		--disable-fox \
-		--disable-netcdf \
-		--disable-wannier90 \
-		--disable-xmlf90 \
-		--with-linalg-libs="-L/usr/lib -lblas -llapack" \
+		--with-linalg-libs="-lblas -llapack" \
+		--with-netcdf-includes="-I/usr/include" \
+		--with-netcdf-libs="-lnetcdff" \
+		--with-fox-includes="-I/usr/lib/finclude" \
+		--with-fox-libs="-lwcml" \
+		--with-etsf-io-includes="-I/usr/lib/finclude" \
+		--with-etsf-io-libs="-letsf_io -letsf_io_low_level -letsf_io_utils" \
+		--with-etsf-xc-includes="-I/usr/lib/finclude" \
+		--with-etsf-xc-libs="-lxc -lstring_f" \
+		--with-bigdft-includes="-I/usr/lib/finclude" \
+		--with-bigdft-libs="-lpoissonsolver -lbigdft" \
+		--with-wannier90="/usr/bin/wannier90.x" \
+		--with-wannier90-includes="-I/usr/lib/finclude" \
+		--with-wannier90-libs="-lwannier" \
 		--with-cc-optflags="${CFLAGS}" \
 		--with-fc-optflags="${FFLAGS}" \
 		--with-fc-ld-optlibs='-lpthread' \
 		FC="${FORTRANC}" \
 		CC="$(tc-getCC)" \
-		LD="$(tc-getLD)" \
-		|| die "configure failed"
+		LD="$(tc-getLD)"
 
 	if use mpi; then
-		emake multi || die "make multi failed"
+		emake multi || die
 	else
-		emake || die "make failed"
+		emake || die
 	fi
 }
 
 src_test() {
-	einfo "The tests take quite a while, on the order of 2-3 hours"
-	einfo "on a dual Athlon 2000+."
+	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_dev
 
 	local REPORT
-	for REPORT in $(find . -name *fl*); do
-		elog "Results for ${REPORT%%/*} tests"
+	for REPORT in $(find . -name summary*); do
+		REPORT=${REPORT#*/}
+		elog "Parameters and unusual results for ${REPORT%%/*} tests"
 		while read line; do
 			elog "${line}"
 		done \
-			< <(cat ${REPORT} )
+			< <(grep -v 'no significant difference has been found' ${REPORT})
 	done
 
-	elog "The test results will be installed as summary_tests.tar.gz."
+	elog "The full test results will be installed as summary_tests.tar.gz."
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	emake DESTDIR="${D}" install || die
 
 	if use test; then
-		dodoc tests/summary_tests.tar.gz
+		dodoc tests/summary_tests.tar.gz || die
 	fi
 
-	dodoc KNOWN_PROBLEMS README
+	dodoc KNOWN_PROBLEMS README || die
 }