commit: 1e554b8b088f15c731c6a1254024ddc884dc9684 Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> AuthorDate: Sat Jan 30 10:49:00 2021 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> CommitDate: Sat Jan 30 10:49:00 2021 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1e554b8b
sci-libs/wannier90: version bump, EAPI bump Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> sci-libs/wannier90/wannier90-2.0.1.1.ebuild | 77 ---------------------- ...nnier90-2.0.1.ebuild => wannier90-3.1.0.ebuild} | 31 +++++---- 2 files changed, 15 insertions(+), 93 deletions(-) diff --git a/sci-libs/wannier90/wannier90-2.0.1.1.ebuild b/sci-libs/wannier90/wannier90-2.0.1.1.ebuild deleted file mode 100644 index bc7e9c399..000000000 --- a/sci-libs/wannier90/wannier90-2.0.1.1.ebuild +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools-utils eutils fortran-2 multilib toolchain-funcs - -DESCRIPTION="Calculates maximally localized Wannier functions (MLWFs)" -HOMEPAGE="http://www.wannier.org/"; -#SRC_URI="http://wannier.org/code/${P}.tar.gz"; -SRC_URI="https://launchpad.net/${PN}/2.0/${PV}/+download/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" - -IUSE="mpi perl test" -RESTRICT="!test? ( test )" - -RDEPEND=" - virtual/blas - virtual/lapack - perl? ( dev-lang/perl )" -DEPEND="${RDEPEND} - virtual/pkgconfig -" - -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++" - export MPIFC="mpif90" - export MPICC="mpicc" - else - tc-export FC F77 CC CXX - fi - - # Preprocesor macross can make some lines really long - append-fflags -ffree-line-length-none - - fortran-2_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}"/"$P"-runtest.patch -} - -src_configure() { - export LINALG_INCLUDES="$($(tc-getPKG_CONFIG) --cflags blas lapack)" - export LINALG_LIBS="$($(tc-getPKG_CONFIG) --libs blas lapack)" - autotools-utils_src_configure -} - -src_compile() { - autotools-utils_src_compile - pushd "${BUILD_DIR}"/utility > /dev/null || die - emake || die "emake in utility failed" - popd > /dev/null || die -} - -src_test() { - einfo "Compare the 'Standard' and 'Current' outputs of this test." -# cd tests -# emake test - autotools-utils_src_compile check - cat "${BUILD_DIR}"/tests/wantest.log -} - -src_install() { - autotools-utils_src_install - dobin "${BUILD_DIR}"/utility/w90pov/src/w90pov.x - dobin "${BUILD_DIR}"/utility/PL_assessment/w90_pl_assess.x - use perl && dobin "$S"/utility/w90_kmesh.pl -} diff --git a/sci-libs/wannier90/wannier90-2.0.1.ebuild b/sci-libs/wannier90/wannier90-3.1.0.ebuild similarity index 67% rename from sci-libs/wannier90/wannier90-2.0.1.ebuild rename to sci-libs/wannier90/wannier90-3.1.0.ebuild index 306e619b4..28bd897c4 100644 --- a/sci-libs/wannier90/wannier90-2.0.1.ebuild +++ b/sci-libs/wannier90/wannier90-3.1.0.ebuild @@ -1,28 +1,33 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit eutils fortran-2 multilib toolchain-funcs +inherit fortran-2 multilib toolchain-funcs DESCRIPTION="Calculates maximally localized Wannier functions (MLWFs)" HOMEPAGE="http://www.wannier.org/"; -SRC_URI="http://wannier.org/code/${P}.tar.gz"; +SRC_URI="https://github.com/wannier-developers/wannier90/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="examples perl static-libs test" -RESTRICT="!test? ( test )" +IUSE="examples perl static-libs" RDEPEND=" virtual/blas virtual/lapack - perl? ( dev-lang/perl )" -DEPEND="${RDEPEND} - virtual/pkgconfig + virtual/mpi + perl? ( dev-lang/perl ) " +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +src_prepare() { + default + cp config/make.inc.gfort make.inc || die +} src_configure() { cat <<- EOF >> "${S}"/make.sys @@ -33,16 +38,10 @@ src_configure() { EOF } -src_compile() { - emake -j1 wannier - emake -j1 lib -} - src_test() { einfo "Compare the 'Standard' and 'Current' outputs of this test." - cd tests - emake test - cat wantest.log + cd test-suite || die + ./run_tests --default || die } src_install() {
