Removed fortran eclass use. Now really use autotools, propagate mpi variables, and re-added missing netcdf flag. Also use the Gentoo blas/lapack infrastructure.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 25 insertions, 25 deletions

diff --git a/sci-physics/abinit/ChangeLog b/sci-physics/abinit/ChangeLog
index 9b3fc95a62d3..96f1df39215a 100644
--- a/sci-physics/abinit/ChangeLog
+++ b/sci-physics/abinit/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-physics/abinit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/abinit/ChangeLog,v 1.11 2010/06/26 10:53:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/abinit/ChangeLog,v 1.12 2010/07/16 22:27:55 bicatali Exp $
+
+  16 Jul 2010; Sébastien Fabbro <bicatali@gentoo.org> abinit-6.0.4.ebuild:
+  Removed fortran eclass use. Now really use autotools, propagate mpi
+  variables, and re-added missing netcdf flag. Also use the Gentoo
+  blas/lapack infrastructure.
 
 *abinit-6.0.4 (26 Jun 2010)
 
diff --git a/sci-physics/abinit/Manifest b/sci-physics/abinit/Manifest
index d44b4d035e8d..45fb83a480a9 100644
--- a/sci-physics/abinit/Manifest
+++ b/sci-physics/abinit/Manifest
@@ -12,13 +12,13 @@ DIST abinit-6.0.4.tar.gz 40546752 RMD160 2e0b554fa762a4ebd6d3d91e4d87cacbe533d20
 EBUILD abinit-5.3.4.ebuild 2411 RMD160 019034070111714d8350d03120002f87ed8b9cb4 SHA1 7a960e629fa7edc2bc3dfc93386cb26424ee1597 SHA256 04a1139eb8b19e50e782e622a15002d96b0ec7e04f614be0b61e7ebfea5af135
 EBUILD abinit-5.4.4-r1.ebuild 2690 RMD160 63d6e3f443285d0e5541934fd6719f9181032be2 SHA1 92eb3e245cdd0fe950ac66e908843353099fd733 SHA256 70bd6931078f01901ced49a27b3966e03c31ad657d827befb2e71721d91a58ea
 EBUILD abinit-5.4.4.ebuild 2777 RMD160 c84b0d707185913c5133f79d344153ae34dc5097 SHA1 3f48507edf453cc2f061890a40b4023d4ee8fbde SHA256 25c404075fb5fd3e509daed8762e33c96661012485999895879a266dac703b90
-EBUILD abinit-6.0.4.ebuild 2803 RMD160 329b341a84936bbf977dbce6cefc88cfcb24f6c9 SHA1 8489c4fae9a24e766d0eaed7efc7d9771fb8504b SHA256 06c460c9da4805b922fbaf4824e69531dd740ffc3d9e9aba7552580b185de9c9
-MISC ChangeLog 2652 RMD160 1b081bd4ead51f06ee802dd1ec215ac81d9e6e68 SHA1 01ed79689102accf2286158d909ba4fa8ab4c660 SHA256 cd2b8f99aaaece419bd22470f8e87b0f2d9f4be44a9e439a3124f99d778a5c23
+EBUILD abinit-6.0.4.ebuild 2846 RMD160 8db43a08fe3ea22682b077a2b7b2a5af8063d2ee SHA1 31646d3f70c048e86ed2e0250573121297aa137b SHA256 6feedb9a85af52c567d24c315819c3ce18672095d227350e8b9985196828c520
+MISC ChangeLog 2900 RMD160 f626a07c95a9d106baa3c53808107cddb0292519 SHA1 ae94d9f4445f97dc95f1ffb61e75ed4c011460f2 SHA256 6a83a40ce1b3209a0cd291a6b353bf23802995e05de68caacf735a3b552d1d71
 MISC metadata.xml 317 RMD160 8ddde8a8b700606001c8696da118429bcdf5675c SHA1 012bb07586bb4a9bc3abb3300352d8305e6be0b1 SHA256 3cf4ec6ae09941bacb3952010b44cf6c7d2b3103e55c4c09e9e95537b4981b5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwl3DAACgkQgAnW8HDreRbXuQCfZDPHNVY/EAEccUuGa3r55lNb
-vqcAmgJLAc52fCl/imNn3KMliT34GNJ+
-=96gG
+iEYEARECAAYFAkxA3QEACgkQ1ycZbhPLE2CO9wCffvu1vDHFCGxvvLwXlbg2/BNL
+pSoAn0M6Oc7NF8ZqivCXtqVNrg/WNvAS
+=eJsj
 -----END PGP SIGNATURE-----
diff --git a/sci-physics/abinit/abinit-6.0.4.ebuild b/sci-physics/abinit/abinit-6.0.4.ebuild
index 6047a3845735..294ac2e90d2d 100644
--- a/sci-physics/abinit/abinit-6.0.4.ebuild
+++ b/sci-physics/abinit/abinit-6.0.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/abinit/abinit-6.0.4.ebuild,v 1.1 2010/06/26 10:53:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/abinit/abinit-6.0.4.ebuild,v 1.2 2010/07/16 22:27:55 bicatali Exp $
 
 EAPI="3"
 
-inherit fortran toolchain-funcs
+inherit eutils toolchain-funcs autotools
 
 DESCRIPTION="Find total energy, charge density and electronic structure using density functional theory"
 HOMEPAGE="http://www.abinit.org/"
@@ -13,32 +13,25 @@ SRC_URI="http://ftp.abinit.org/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="debug mpi plugins test"
+IUSE="debug mpi netcdf plugins test"
 
-RDEPEND="
-	virtual/blas
+RDEPEND="virtual/blas
 	virtual/lapack"
-DEPEND="${RDEPEND}"
-
-# F90 code, g77 won't work
-FORTRAN="gfortran ifc"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
 pkg_setup() {
-	fortran_pkg_setup
-
 	# Doesn't compile with gcc-4.0, only >=4.1
-	local diemsg="Requires gcc-4.1 or newer"
-	if [[ "${FORTRANC}" = "gfortran" ]]; then
+	if [[ $(tc-getFC) == *gfortran ]]; then
 		if [[ $(gcc-major-version) -eq 4 ]] \
 			&& [[ $(gcc-minor-version) -lt 1  ]]; then
-				die "${diemsg}"
+				die "Requires gcc-4.1 or newer"
 		fi
 	fi
 }
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}-change-default-directories.patch
-#	epatch "${FILESDIR}"/5.2.3-fix-64bit-detection.patch
 	epatch "${FILESDIR}"/${PV}-test.patch
 
 	# bug #223111: Our eautoreconf directory detection breaks
@@ -56,20 +49,22 @@ src_prepare() {
 	if has_version '>=sys-devel/autoconf-2.60'; then
 		sed -i -e "s:_AC_SRCPATHS:_AC_SRCDIRS:g" config/scripts/make-macros-autotools
 	fi
-
 	eautoreconf
+	use mpi && export CC=mpicc FC=mpif90
 }
 
 src_configure() {
 	econf \
 		--disable-config-file \
+		--with-linalg-includes="$(pkg-config --cflags blas lapack)" \
+		--with-linalg-libs="$(pkg-config --libs blas lapack)" \
+		--with-cc-optflags="${CFLAGS}" \
+		--with-fc-optflags="${FFLAGS}" \
 		$(use_enable mpi) \
 		$(use_enable plugins all-plugins) \
 		$(use_enable netcdf) \
 		$(use_enable debug) \
-		--with-cc-optflags="${CFLAGS}" \
-		--with-fc-optflags="${FFLAGS}" \
-		FC="${FORTRANC}" \
+		FC="$(tc-getFC)" \
 		CC="$(tc-getCC)" \
 		LD="$(tc-getLD)"
 }