11 files changed, 34 insertions, 334 deletions
diff --git a/sci-libs/bigdft/ChangeLog b/sci-libs/bigdft/ChangeLog
index 5334648c2..1d25edefd 100644
--- a/sci-libs/bigdft/ChangeLog
+++ b/sci-libs/bigdft/ChangeLog
@@ -2,6 +2,14 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*bigdft-1.6.0-r2 (19 Jun 2012)
+*bigdft-1.6_pre1-r2 (19 Jun 2012)
+
+  19 Jun 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+  -bigdft-1.6_pre1-r1.ebuild, +bigdft-1.6_pre1-r2.ebuild,
+  -bigdft-1.6.0-r1.ebuild, +bigdft-1.6.0-r2.ebuild:
+  Reflect the split of the fortran interface out of sci-libs/netcdf
+
   22 May 2012; Justin Lecher <jlec@gentoo.org> bigdft-1.6_pre1-r1.ebuild,
   bigdft-1.6.0-r1.ebuild:
   Add missing eutils.eclass, bump to EAPI=4, remove unnecessary bits
diff --git a/sci-libs/bigdft/Manifest b/sci-libs/bigdft/Manifest
index 5f1f645ce..02177f45a 100644
--- a/sci-libs/bigdft/Manifest
+++ b/sci-libs/bigdft/Manifest
@@ -1,2 +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.6-tuto.1.tar.gz 7510733 RMD160 1f759a7590491e2f143c592db01d0263646bae82 SHA1 5308af2e44b15a9a2c5d9cb14eec9b934a16c9f0 SHA256 32020c7e58b36fe1f58a47ef02af99bd0da81c6da7d6f15e89b8075494d39d87 SHA512 48684413b0807b5dcee4b97b5b83d9a839c44043801b923c5f0ce7c8a92024cfee64c1065d4d2ffc67cb249cfcd485680b5526aaaedba06e6a88ccc52ba290f2 WHIRLPOOL d6efcc6f9ded331c42e8e3b13a9260e2acd922c4fa0bf303455e33924a930df6aa01abec897c1d190d5016a5bb3781c491e8a17d500e5485717989bddd4f579d
+DIST bigdft-1.6.0.tar.gz 8876759 RMD160 6cc9f8c87447d540e0677311dfb9a1da6c7f0150 SHA1 b4c75d0bf95ddf66d8cade96f4c1c625a2b71f1b SHA256 2d3212ef5f1ebc10fe7c627397ac6282ad41e1433ec6e66905f9d39a302913c0 SHA512 facbb78d126885dd04fed6451aa9cd1f5c755055e146cda1d2d4e90e3310fc3066b661635477db96d5b143ffaaa3ebb01107681437fd9965f3c764cf1b034361 WHIRLPOOL 97bc6c28296a92b09139e3a65266daa583011620fad5aed208e0e48627ab1d9c0ef9993d6c4c3cce5696d5c707bcdfb4b8ca7e64379909b3cf073206e32f9572
diff --git a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
index cdb304961..b4e40f540 100644
--- a/sci-libs/bigdft/bigdft-1.6.0-r1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6.0-r2.ebuild
@@ -31,7 +31,11 @@ RDEPEND="
 			)
 		)
 	etsf_io? ( sci-libs/etsf_io )
-	netcdf? ( sci-libs/netcdf[fortran] )"
+	netcdf? ( || (
+				sci-libs/netcdf[fortran]
+				sci-libs/netcdf-fortran
+				)
+			)"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-devel/autoconf-2.59
diff --git a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
index 6cdd6e4e3..f9860f679 100644
--- a/sci-libs/bigdft/bigdft-1.6_pre1-r1.ebuild
+++ b/sci-libs/bigdft/bigdft-1.6_pre1-r2.ebuild
@@ -32,7 +32,11 @@ RDEPEND="
 			)
 		)
 	etsf_io? ( sci-libs/etsf_io )
-	netcdf? ( sci-libs/netcdf[fortran] )"
+	netcdf? ( || (
+				sci-libs/netcdf[fortran]
+				sci-libs/netcdf-fortran
+				)
+			)"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	>=sys-devel/autoconf-2.59
diff --git a/sci-libs/etsf_io/ChangeLog b/sci-libs/etsf_io/ChangeLog
index b4391ae02..19ac5b64a 100644
--- a/sci-libs/etsf_io/ChangeLog
+++ b/sci-libs/etsf_io/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-libs/etsf_io
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*etsf_io-1.0.3-r1 (19 Jun 2012)
+
+  19 Jun 2012; Honza Macháček <Hloupy.Honza@centrum.cz>
+  -etsf_io-1.0.3.ebuild, +etsf_io-1.0.3-r1.ebuild:
+  Reflect the split of the fortran interface out of sci-libs/netcdf
+
   25 Jun 2011; Justin Lecher <jlec@gentoo.org> etsf_io-1.0.3.ebuild,
   metadata.xml:
   Fixed Malformed CVS Header on line: 3
diff --git a/sci-libs/etsf_io/Manifest b/sci-libs/etsf_io/Manifest
index b63a2dba4..45b7f5717 100644
--- a/sci-libs/etsf_io/Manifest
+++ b/sci-libs/etsf_io/Manifest
@@ -1 +1 @@
-DIST etsf_io-1.0.3.tar 453734 RMD160 df90acd34b0de104a07844ae2c9694edf27519c6 SHA1 ab3c4cb22ea2fc2498b396f186f221edd2463fcc SHA256 a02ead44b9634bdb6e47e50d76f35d56c10df468743e6fe5259c0dc478f7b32e
+DIST etsf_io-1.0.3.tar 453734 RMD160 df90acd34b0de104a07844ae2c9694edf27519c6 SHA1 ab3c4cb22ea2fc2498b396f186f221edd2463fcc SHA256 a02ead44b9634bdb6e47e50d76f35d56c10df468743e6fe5259c0dc478f7b32e SHA512 2a60533a588587da5629687942044ed58b72a554c484d3c22263314cbeb21aa819d5097e6637b599de06474d4d92cc84ea94fa365123e677311be3bf7b8e7bf5 WHIRLPOOL 714cfa983b5f3411a04df88ad54513f71b482368cba93b790d5d93388a9aea346cd83de80311ed0fe5fdc51fac4af8be4428764119a0cf9f17df24e91f2ae74a
diff --git a/sci-libs/etsf_io/etsf_io-1.0.3.ebuild b/sci-libs/etsf_io/etsf_io-1.0.3-r1.ebuild
index 402389b9e..a3c62340d 100644
--- a/sci-libs/etsf_io/etsf_io-1.0.3.ebuild
+++ b/sci-libs/etsf_io/etsf_io-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,7 +16,10 @@ IUSE="examples"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	sci-libs/netcdf[fortran]
+	|| (
+		sci-libs/netcdf[fortran]
+		sci-libs/netcdf-fortran
+	)
 	virtual/fortran"
 DEPEND="${RDEPEND}"
 
diff --git a/sci-physics/elk/Manifest b/sci-physics/elk/Manifest
index 88dada474..b0fce503e 100644
--- a/sci-physics/elk/Manifest
+++ b/sci-physics/elk/Manifest
@@ -1,3 +1 @@
-DIST elk-1.3.15.tgz 1834503 SHA256 6e35d1c3830aeea0fe8016e25efa9debddf0e4bd90fe910520a35608a2f81fcf SHA512 ab18c78616447abdba7f82215cf4f10ff26eb052e47693266246b60225a436d21f877f5b97f3e62c0a91d2fd267c9e017568e8d5a80e488835d279d40494cf1e WHIRLPOOL fc528cd6e4ca0ddf42996f126aaf7cbcfd65bcc284faa9c0eb84cfcfae1055f20c83aea8dc5bfefeacb4a29755980f5881ec2fecc8fabb648727780c4b1cea93
-DIST elk-1.4.18.tgz 1855415 SHA256 14df155a254f0d0b24ffa98a3a25130e1d55f652f87f1f20781bb45169a20281 SHA512 5bcae5903aa6880fa43000f43e2f6aa5789d20107e0dd004104821ae39e663d6e1172441c3b69ed214fde0b6786450be16800116c0905288afc6fe644c8190a2 WHIRLPOOL dddb8b8eca84484bb1d8906ba2ccb53659509f7624b7b602758857c81a3f7e81c0f8b17037c1dd760c5bfdec47e57e92d88fda956bd1c2feb3b41bb42812925f
-DIST elk-1.4.5.tgz 1851444 SHA256 84c4e19da2d76e25f0395343aa6e7ecf883a9a870d7b1c5256336e220d1fbb9e SHA512 8fdecd8e11a3b53e8a891963d005d753cc06ce3c5a27cfe581f2d64edbdc620551d3a91ce31be31f50fce60beb402562662b215e64ae93e4dbf507910c31e7be WHIRLPOOL 6b463d09e1e5e75e8a08cc9224a57d93927ce1998653872ace73f1bf9bcf3f9a826eaea284319bdb85f19da16523430ff62496171a4b497103f8bc45d00e2391
+DIST elk-1.4.22.tgz 1866287 RMD160 6af2454eab5af8c97447529db013fbfe41f016fb SHA1 71c9b7cb1ddd5ab2eb7d83e1922a7aa0c2e0ddf8 SHA256 bc8b70d42924c77c9328418bd133285fe2caa4a8b14df4016eecff647ca15ec0 SHA512 7c512ac6738d883fe1c76964c8bd44ef34269f58f4c8d97ee63949949391ef1040dc41cf0c2626492f6c94649b696d7b67eef8292011dc75c312a3c4b3c21da6 WHIRLPOOL 392804fc8bc3ce03208f9689ffafb84d4a61b343d80c09d787adcd23f25ab824dd0d6477bbad41ae2e61ab0acc9cba2f965d6c576fd7d69bb976fd29770e4a1d
diff --git a/sci-physics/elk/elk-1.3.15.ebuild b/sci-physics/elk/elk-1.3.15.ebuild
deleted file mode 100644
index ac1b4f0e6..000000000
--- a/sci-physics/elk/elk-1.3.15.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="All-electron full-potential linearised augmented-plane wave (FP-LAPW) code with advanced features."
-HOMEPAGE="http://elk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-debug lapack libxc mpi openmp test"
-
-RDEPEND="lapack? ( virtual/blas
-		virtual/lapack )
-	libxc? ( =sci-libs/libxc-1*[fortran] )
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	if use openmp; then
-		tc-has-openmp || \
-		die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
-}
-
-src_prepare() {
-	if use libxc; then
-		sed -i -e's/^\(SRC_libxc =\)/#\1/' "${S}/src/Makefile"
-	fi
-	if use mpi; then
-		sed -i -e's/^\(SRC_mpi =\)/#\1/' "${S}/src/Makefile"
-	fi
-}
-
-src_configure() {
-	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
-	if use openmp; then
-		MY_FC="${MY_FC} -fopenmp"
-		MY_CC="${MY_CC} -fopenmp"
-		MY_CXX="${MY_CXX} -fopenmp"
-	fi
-	MY_FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O3 -funroll-loops -ffast-math}}"
-	MY_FCFLAGS="${MY_FCFLAGS} -I/usr/include -I/usr/$(get_libdir)/finclude"
-	MY_CFLAGS="${CFLAGS:- -O3 -funroll-loops -ffast-math}"
-	MY_CXXFLAGS="${CXXFLAGS:- ${CFLAGS:- -O3 -funroll-loops -ffast-math}}"
-	echo "MAKE = make" > make.inc
-	echo "F90 = $MY_FC" >> make.inc
-	echo "F90_OPTS = $MY_FCFLAGS" >> make.inc
-	echo "F77 = $MY_FC" >> make.inc
-	echo "F77_OPTS = $MY_FCFLAGS" >> make.inc
-	echo "CC = ${MY_CC}" >> make.inc
-	echo "CXX = ${MY_CXX}" >> make.inc
-	echo "CFLAGS = ${MY_CFLAGS}" >> make.inc
-	echo "CXXFLAGS = ${MY_CXXFLAGS}" >> make.inc
-	echo "LD = $(tc-getLD)" >> make.inc
-	echo "AR = ar" >> make.inc
-	echo "LIB_SYS = " >> make.inc
-	if use lapack; then
-		echo "LIB_LPK = $(pkg-config --libs lapack)" >> make.inc
-	else
-		echo "LIB_LPK = lapack.a blas.a" >> make.inc
-	fi
-	echo "LIB_FFT = fftlib.a" >> make.inc
-	if use libxc; then
-		echo "LIB_XC = -L/usr/$(get_libdir) -lxc" >> make.inc
-		echo "SRC_libxc = libxc_funcs.f90 libxc.f90 libxcifc.f90" >>make.inc
-	fi
-}
-
-src_compile() {
-	emake -j1 || die "make failed"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin src/elk src/eos/eos src/spacegroup/spacegroup utilities/elk-bands
-	dodoc README
-	for doc in docs/*; do
-		dodoc $doc
-	done
-	insinto /usr/share/${P}
-	doins -r species
-	doins -r utilities
-	doins -r examples
-	doins -r tests
-}
diff --git a/sci-physics/elk/elk-1.4.18.ebuild b/sci-physics/elk/elk-1.4.18.ebuild
deleted file mode 100644
index 27b3f3af5..000000000
--- a/sci-physics/elk/elk-1.4.18.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="All-electron full-potential linearised augmented-plane wave (FP-LAPW) code with advanced features."
-HOMEPAGE="http://elk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-debug lapack libxc mpi openmp perl test"
-
-RDEPEND="lapack? ( virtual/blas
-		virtual/lapack )
-	libxc? ( =sci-libs/libxc-1*[fortran] )
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/perl )
-	dev-util/pkgconfig"
-
-DOCS=( README  )
-
-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"
-		export CXX="mpic++"
-	else
-		tc-export FC F77 CC CXX
-	fi
-
-	if use openmp; then
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	if use openmp; then
-		export FC="${FC} -fopenmp"
-		export F77="${F77} -fopenmp"
-		export CC="${CC} -fopenmp"
-		export CXX="${CXX} -fopenmp"
-	fi
-}
-
-src_prepare() {
-	if use libxc; then
-		sed -i -e's/^\(SRC_libxc =\)/#\1/' "${S}/src/Makefile"
-	fi
-	if use mpi; then
-		sed -i -e's/^\(SRC_mpi =\)/#\1/' "${S}/src/Makefile"
-	fi
-}
-
-src_configure() {
-	FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O3 -funroll-loops -ffast-math}}"
-	FCFLAGS="${FCFLAGS} -I/usr/include -I/usr/$(get_libdir)/finclude"
-	CFLAGS="${CFLAGS:- -O3 -funroll-loops -ffast-math}"
-	CXXFLAGS="${CXXFLAGS:- ${CFLAGS}}"
-	export FCFLAGS CFLAGS CXXFLAGS
-	echo "MAKE = make" > make.inc
-	echo "F90 = $FC" >> make.inc
-	echo "F90_OPTS = $FCFLAGS" >> make.inc
-	echo "F77 = $FC" >> make.inc
-	echo "F77_OPTS = $FCFLAGS" >> make.inc
-	echo "CC = ${CC}" >> make.inc
-	echo "CXX = ${CXX}" >> make.inc
-	echo "CFLAGS = ${CFLAGS}" >> make.inc
-	echo "CXXFLAGS = ${CXXFLAGS}" >> make.inc
-	echo "LD = $(tc-getLD)" >> make.inc
-	echo "AR = ar" >> make.inc
-	echo "LIB_SYS = " >> make.inc
-	if use lapack; then
-		echo "LIB_LPK = $(pkg-config --libs lapack)" >> make.inc
-	else
-		echo "LIB_LPK = lapack.a blas.a" >> make.inc
-	fi
-	echo "LIB_FFT = fftlib.a" >> make.inc
-	if use libxc; then
-		echo "LIB_XC = -L/usr/$(get_libdir) -lxc" >> make.inc
-		echo "SRC_libxc = libxc_funcs.f90 libxc.f90 libxcifc.f90" >>make.inc
-	fi
-}
-
-src_compile() {
-	emake -j1 || die "make failed"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin src/elk src/protex src/eos/eos src/spacegroup/spacegroup
-	dobin utilities/elk-bands
-	use perl && dobin utilities/xps_exc.pl utilities/se.pl
-	dodoc README
-	for doc in docs/*; do
-		dodoc $doc
-	done
-	insinto /usr/share/${P}
-	doins -r species
-	doins -r utilities
-	doins -r examples
-	doins -r tests
-}
diff --git a/sci-physics/elk/elk-1.4.5.ebuild b/sci-physics/elk/elk-1.4.5.ebuild
deleted file mode 100644
index ac1b4f0e6..000000000
--- a/sci-physics/elk/elk-1.4.5.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit eutils fortran-2 multilib toolchain-funcs
-
-DESCRIPTION="All-electron full-potential linearised augmented-plane wave (FP-LAPW) code with advanced features."
-HOMEPAGE="http://elk.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-debug lapack libxc mpi openmp test"
-
-RDEPEND="lapack? ( virtual/blas
-		virtual/lapack )
-	libxc? ( =sci-libs/libxc-1*[fortran] )
-	mpi? ( virtual/mpi )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	if use openmp; then
-		tc-has-openmp || \
-		die "Please select an openmp capable compiler like gcc[openmp]"
-	fi
-}
-
-src_prepare() {
-	if use libxc; then
-		sed -i -e's/^\(SRC_libxc =\)/#\1/' "${S}/src/Makefile"
-	fi
-	if use mpi; then
-		sed -i -e's/^\(SRC_mpi =\)/#\1/' "${S}/src/Makefile"
-	fi
-}
-
-src_configure() {
-	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
-	if use openmp; then
-		MY_FC="${MY_FC} -fopenmp"
-		MY_CC="${MY_CC} -fopenmp"
-		MY_CXX="${MY_CXX} -fopenmp"
-	fi
-	MY_FCFLAGS="${FCFLAGS:- ${FFLAGS:- -O3 -funroll-loops -ffast-math}}"
-	MY_FCFLAGS="${MY_FCFLAGS} -I/usr/include -I/usr/$(get_libdir)/finclude"
-	MY_CFLAGS="${CFLAGS:- -O3 -funroll-loops -ffast-math}"
-	MY_CXXFLAGS="${CXXFLAGS:- ${CFLAGS:- -O3 -funroll-loops -ffast-math}}"
-	echo "MAKE = make" > make.inc
-	echo "F90 = $MY_FC" >> make.inc
-	echo "F90_OPTS = $MY_FCFLAGS" >> make.inc
-	echo "F77 = $MY_FC" >> make.inc
-	echo "F77_OPTS = $MY_FCFLAGS" >> make.inc
-	echo "CC = ${MY_CC}" >> make.inc
-	echo "CXX = ${MY_CXX}" >> make.inc
-	echo "CFLAGS = ${MY_CFLAGS}" >> make.inc
-	echo "CXXFLAGS = ${MY_CXXFLAGS}" >> make.inc
-	echo "LD = $(tc-getLD)" >> make.inc
-	echo "AR = ar" >> make.inc
-	echo "LIB_SYS = " >> make.inc
-	if use lapack; then
-		echo "LIB_LPK = $(pkg-config --libs lapack)" >> make.inc
-	else
-		echo "LIB_LPK = lapack.a blas.a" >> make.inc
-	fi
-	echo "LIB_FFT = fftlib.a" >> make.inc
-	if use libxc; then
-		echo "LIB_XC = -L/usr/$(get_libdir) -lxc" >> make.inc
-		echo "SRC_libxc = libxc_funcs.f90 libxc.f90 libxcifc.f90" >>make.inc
-	fi
-}
-
-src_compile() {
-	emake -j1 || die "make failed"
-}
-
-src_test() {
-	emake test
-}
-
-src_install() {
-	dobin src/elk src/eos/eos src/spacegroup/spacegroup utilities/elk-bands
-	dodoc README
-	for doc in docs/*; do
-		dodoc $doc
-	done
-	insinto /usr/share/${P}
-	doins -r species
-	doins -r utilities
-	doins -r examples
-	doins -r tests
-}