From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B4F96138359 for ; Mon, 28 Sep 2020 10:12:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F20ABE085A; Mon, 28 Sep 2020 10:12:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C73F7E085A for ; Mon, 28 Sep 2020 10:12:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9E53134085A for ; Mon, 28 Sep 2020 10:12:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18E86339 for ; Mon, 28 Sep 2020 10:12:21 +0000 (UTC) From: "Horea Christian" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Horea Christian" Message-ID: <1601287705.42c49460f202ef0b13e5d091e5c0258417101876.chymera@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/wannier90/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/wannier90/wannier90-1.2-r3.ebuild sci-libs/wannier90/wannier90-2.0.1.1.ebuild sci-libs/wannier90/wannier90-2.0.1.ebuild X-VCS-Directories: sci-libs/wannier90/ X-VCS-Committer: chymera X-VCS-Committer-Name: Horea Christian X-VCS-Revision: 42c49460f202ef0b13e5d091e5c0258417101876 X-VCS-Branch: master Date: Mon, 28 Sep 2020 10:12:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9fedf074-e563-4fb3-82e5-3333c4393e83 X-Archives-Hash: c3ac0275a061fc3a2f3f38c05551af5b commit: 42c49460f202ef0b13e5d091e5c0258417101876 Author: Horea Christian chymera eu> AuthorDate: Mon Sep 28 10:08:25 2020 +0000 Commit: Horea Christian gmail com> CommitDate: Mon Sep 28 10:08:25 2020 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=42c49460 sci-libs/wannier90: rm old version and doc USE due to missing dep Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Horea Christian chymera.eu> sci-libs/wannier90/wannier90-1.2-r3.ebuild | 70 ----------------------------- sci-libs/wannier90/wannier90-2.0.1.1.ebuild | 27 ++--------- sci-libs/wannier90/wannier90-2.0.1.ebuild | 15 ++----- 3 files changed, 6 insertions(+), 106 deletions(-) diff --git a/sci-libs/wannier90/wannier90-1.2-r3.ebuild b/sci-libs/wannier90/wannier90-1.2-r3.ebuild deleted file mode 100644 index 952c9baaf..000000000 --- a/sci-libs/wannier90/wannier90-1.2-r3.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit 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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="doc examples perl static-libs test" - -RDEPEND=" - virtual/blas - virtual/lapack - perl? ( dev-lang/perl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( virtual/latex-base - dev-texlive/texlive-latexextra - )" - -src_prepare() { - # Patch taken from sci-physics/abinit-5.7.3 bundled version - epatch \ - "${FILESDIR}"/${PN}-1.1-0001.patch \ - "${FILESDIR}"/${PN}-1.1-0002.patch -} - -src_configure() { - cat <<- EOF >> "${S}"/make.sys - F90 = $(tc-getFC) - FCOPTS = ${FCFLAGS:- ${FFLAGS:- -O2}} - LDOPTS = ${LDFLAGS} - LIBS = $($(tc-getPKG_CONFIG) --libs blas lapack) - EOF -} - -src_compile() { - emake -j1 wannier - emake -j1 lib - if use doc; then - VARTEXFONTS="${T}/fonts" - emake -j1 doc - fi -} - -src_test() { - einfo "Compare the 'Standard' and 'Current' outputs of this test." - cd tests - emake test - cat wantest.log -} - -src_install() { - dobin wannier90.x - use perl && dobin utility/kmesh.pl - use static-libs && dolib.a libwannier.a - doheader src/*.mod - if use examples; then - insinto /usr/share/${PN} - doins -r examples - fi - use doc && dodoc doc/*.pdf - dodoc README README.install CHANGE.log -} diff --git a/sci-libs/wannier90/wannier90-2.0.1.1.ebuild b/sci-libs/wannier90/wannier90-2.0.1.1.ebuild index cd58f4bcd..096bf6645 100644 --- a/sci-libs/wannier90/wannier90-2.0.1.1.ebuild +++ b/sci-libs/wannier90/wannier90-2.0.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/2.0/${PV}/+download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="doc mpi perl test" +IUSE="mpi perl test" RDEPEND=" virtual/blas @@ -21,10 +21,7 @@ RDEPEND=" perl? ( dev-lang/perl )" DEPEND="${RDEPEND} virtual/pkgconfig - doc? ( virtual/latex-base - dev-texlive/texlive-latexextra - dev-tex/revtex - )" +" pkg_setup() { # fortran-2.eclass does not handle mpi wrappers @@ -60,18 +57,6 @@ src_compile() { pushd "${BUILD_DIR}"/utility > /dev/null || die emake || die "emake in utility failed" popd > /dev/null || die - if use doc; then - VARTEXFONTS="${T}/fonts" - pushd "${BUILD_DIR}"/doc/user_guide > /dev/null || die - emake || die 'emake in doc/user_guide failed' - cd "${BUILD_DIR}"/doc/tutorial - emake || die 'emake in doc/tutorial failed' - cd "${BUILD_DIR}"/utility/w90vdw/doc - emake || die 'emake in utility/w90vdw/doc failed' - cd "${BUILD_DIR}"/utility/w90pov/doc - emake || die 'emake in utility/w90pov/doc failed' - popd > /dev/null || die - fi } src_test() { @@ -87,10 +72,4 @@ 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 - if use doc; then - dodoc "${BUILD_DIR}"/doc/tutorial/tutorial.pdf - dodoc "${BUILD_DIR}"/doc/user_guide/user_guide.pdf - dodoc "${BUILD_DIR}"/utility/w90vdw/doc/w90vdw.pdf - dodoc "${BUILD_DIR}"/utility/w90pov/doc/w90pov.pdf - fi } diff --git a/sci-libs/wannier90/wannier90-2.0.1.ebuild b/sci-libs/wannier90/wannier90-2.0.1.ebuild index 3eafd6a88..fe9e598fe 100644 --- a/sci-libs/wannier90/wannier90-2.0.1.ebuild +++ b/sci-libs/wannier90/wannier90-2.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://wannier.org/code/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="doc examples perl static-libs test" +IUSE="examples perl static-libs test" RDEPEND=" virtual/blas @@ -20,10 +20,7 @@ RDEPEND=" perl? ( dev-lang/perl )" DEPEND="${RDEPEND} virtual/pkgconfig - doc? ( virtual/latex-base - dev-texlive/texlive-latexextra - dev-tex/revtex - )" +" src_configure() { cat <<- EOF >> "${S}"/make.sys @@ -37,10 +34,6 @@ src_configure() { src_compile() { emake -j1 wannier emake -j1 lib - if use doc; then - VARTEXFONTS="${T}/fonts" - emake -j1 doc - fi } src_test() { @@ -59,6 +52,4 @@ src_install() { insinto /usr/share/${PN} doins -r examples fi - use doc && dodoc doc/*.pdf - dodoc README README.install CHANGE.log }