Gentoo Archives: gentoo-commits

From: Horea Christian <horea.christ@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/wannier90/
Date: Mon, 28 Sep 2020 10:12:24
Message-Id: 1601287705.42c49460f202ef0b13e5d091e5c0258417101876.chymera@gentoo
1 commit: 42c49460f202ef0b13e5d091e5c0258417101876
2 Author: Horea Christian <chr <AT> chymera <DOT> eu>
3 AuthorDate: Mon Sep 28 10:08:25 2020 +0000
4 Commit: Horea Christian <horea.christ <AT> gmail <DOT> com>
5 CommitDate: Mon Sep 28 10:08:25 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=42c49460
7
8 sci-libs/wannier90: rm old version and doc USE due to missing dep
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: Horea Christian <chr <AT> chymera.eu>
12
13 sci-libs/wannier90/wannier90-1.2-r3.ebuild | 70 -----------------------------
14 sci-libs/wannier90/wannier90-2.0.1.1.ebuild | 27 ++---------
15 sci-libs/wannier90/wannier90-2.0.1.ebuild | 15 ++-----
16 3 files changed, 6 insertions(+), 106 deletions(-)
17
18 diff --git a/sci-libs/wannier90/wannier90-1.2-r3.ebuild b/sci-libs/wannier90/wannier90-1.2-r3.ebuild
19 deleted file mode 100644
20 index 952c9baaf..000000000
21 --- a/sci-libs/wannier90/wannier90-1.2-r3.ebuild
22 +++ /dev/null
23 @@ -1,70 +0,0 @@
24 -# Copyright 1999-2015 Gentoo Foundation
25 -# Distributed under the terms of the GNU General Public License v2
26 -
27 -EAPI=5
28 -
29 -inherit eutils fortran-2 multilib toolchain-funcs
30 -
31 -DESCRIPTION="Calculates maximally localized Wannier functions (MLWFs)"
32 -HOMEPAGE="http://www.wannier.org/"
33 -SRC_URI="http://wannier.org/code/${P}.tar.gz"
34 -
35 -LICENSE="GPL-2"
36 -SLOT="0"
37 -KEYWORDS="~amd64 ~x86 ~amd64-linux"
38 -IUSE="doc examples perl static-libs test"
39 -
40 -RDEPEND="
41 - virtual/blas
42 - virtual/lapack
43 - perl? ( dev-lang/perl )"
44 -DEPEND="${RDEPEND}
45 - virtual/pkgconfig
46 - doc? ( virtual/latex-base
47 - dev-texlive/texlive-latexextra
48 - )"
49 -
50 -src_prepare() {
51 - # Patch taken from sci-physics/abinit-5.7.3 bundled version
52 - epatch \
53 - "${FILESDIR}"/${PN}-1.1-0001.patch \
54 - "${FILESDIR}"/${PN}-1.1-0002.patch
55 -}
56 -
57 -src_configure() {
58 - cat <<- EOF >> "${S}"/make.sys
59 - F90 = $(tc-getFC)
60 - FCOPTS = ${FCFLAGS:- ${FFLAGS:- -O2}}
61 - LDOPTS = ${LDFLAGS}
62 - LIBS = $($(tc-getPKG_CONFIG) --libs blas lapack)
63 - EOF
64 -}
65 -
66 -src_compile() {
67 - emake -j1 wannier
68 - emake -j1 lib
69 - if use doc; then
70 - VARTEXFONTS="${T}/fonts"
71 - emake -j1 doc
72 - fi
73 -}
74 -
75 -src_test() {
76 - einfo "Compare the 'Standard' and 'Current' outputs of this test."
77 - cd tests
78 - emake test
79 - cat wantest.log
80 -}
81 -
82 -src_install() {
83 - dobin wannier90.x
84 - use perl && dobin utility/kmesh.pl
85 - use static-libs && dolib.a libwannier.a
86 - doheader src/*.mod
87 - if use examples; then
88 - insinto /usr/share/${PN}
89 - doins -r examples
90 - fi
91 - use doc && dodoc doc/*.pdf
92 - dodoc README README.install CHANGE.log
93 -}
94
95 diff --git a/sci-libs/wannier90/wannier90-2.0.1.1.ebuild b/sci-libs/wannier90/wannier90-2.0.1.1.ebuild
96 index cd58f4bcd..096bf6645 100644
97 --- a/sci-libs/wannier90/wannier90-2.0.1.1.ebuild
98 +++ b/sci-libs/wannier90/wannier90-2.0.1.1.ebuild
99 @@ -1,4 +1,4 @@
100 -# Copyright 1999-2017 Gentoo Foundation
101 +# Copyright 1999-2020 Gentoo Authors
102 # Distributed under the terms of the GNU General Public License v2
103
104 EAPI=5
105 @@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/2.0/${PV}/+download/${P}.tar.gz"
106 LICENSE="GPL-2"
107 SLOT="0"
108 KEYWORDS="~amd64 ~x86 ~amd64-linux"
109 -IUSE="doc mpi perl test"
110 +IUSE="mpi perl test"
111
112 RDEPEND="
113 virtual/blas
114 @@ -21,10 +21,7 @@ RDEPEND="
115 perl? ( dev-lang/perl )"
116 DEPEND="${RDEPEND}
117 virtual/pkgconfig
118 - doc? ( virtual/latex-base
119 - dev-texlive/texlive-latexextra
120 - dev-tex/revtex
121 - )"
122 +"
123
124 pkg_setup() {
125 # fortran-2.eclass does not handle mpi wrappers
126 @@ -60,18 +57,6 @@ src_compile() {
127 pushd "${BUILD_DIR}"/utility > /dev/null || die
128 emake || die "emake in utility failed"
129 popd > /dev/null || die
130 - if use doc; then
131 - VARTEXFONTS="${T}/fonts"
132 - pushd "${BUILD_DIR}"/doc/user_guide > /dev/null || die
133 - emake || die 'emake in doc/user_guide failed'
134 - cd "${BUILD_DIR}"/doc/tutorial
135 - emake || die 'emake in doc/tutorial failed'
136 - cd "${BUILD_DIR}"/utility/w90vdw/doc
137 - emake || die 'emake in utility/w90vdw/doc failed'
138 - cd "${BUILD_DIR}"/utility/w90pov/doc
139 - emake || die 'emake in utility/w90pov/doc failed'
140 - popd > /dev/null || die
141 - fi
142 }
143
144 src_test() {
145 @@ -87,10 +72,4 @@ src_install() {
146 dobin "${BUILD_DIR}"/utility/w90pov/src/w90pov.x
147 dobin "${BUILD_DIR}"/utility/PL_assessment/w90_pl_assess.x
148 use perl && dobin "$S"/utility/w90_kmesh.pl
149 - if use doc; then
150 - dodoc "${BUILD_DIR}"/doc/tutorial/tutorial.pdf
151 - dodoc "${BUILD_DIR}"/doc/user_guide/user_guide.pdf
152 - dodoc "${BUILD_DIR}"/utility/w90vdw/doc/w90vdw.pdf
153 - dodoc "${BUILD_DIR}"/utility/w90pov/doc/w90pov.pdf
154 - fi
155 }
156
157 diff --git a/sci-libs/wannier90/wannier90-2.0.1.ebuild b/sci-libs/wannier90/wannier90-2.0.1.ebuild
158 index 3eafd6a88..fe9e598fe 100644
159 --- a/sci-libs/wannier90/wannier90-2.0.1.ebuild
160 +++ b/sci-libs/wannier90/wannier90-2.0.1.ebuild
161 @@ -1,4 +1,4 @@
162 -# Copyright 1999-2015 Gentoo Foundation
163 +# Copyright 1999-2020 Gentoo Authors
164 # Distributed under the terms of the GNU General Public License v2
165
166 EAPI=5
167 @@ -12,7 +12,7 @@ SRC_URI="http://wannier.org/code/${P}.tar.gz"
168 LICENSE="GPL-2"
169 SLOT="0"
170 KEYWORDS="~amd64 ~x86 ~amd64-linux"
171 -IUSE="doc examples perl static-libs test"
172 +IUSE="examples perl static-libs test"
173
174 RDEPEND="
175 virtual/blas
176 @@ -20,10 +20,7 @@ RDEPEND="
177 perl? ( dev-lang/perl )"
178 DEPEND="${RDEPEND}
179 virtual/pkgconfig
180 - doc? ( virtual/latex-base
181 - dev-texlive/texlive-latexextra
182 - dev-tex/revtex
183 - )"
184 +"
185
186 src_configure() {
187 cat <<- EOF >> "${S}"/make.sys
188 @@ -37,10 +34,6 @@ src_configure() {
189 src_compile() {
190 emake -j1 wannier
191 emake -j1 lib
192 - if use doc; then
193 - VARTEXFONTS="${T}/fonts"
194 - emake -j1 doc
195 - fi
196 }
197
198 src_test() {
199 @@ -59,6 +52,4 @@ src_install() {
200 insinto /usr/share/${PN}
201 doins -r examples
202 fi
203 - use doc && dodoc doc/*.pdf
204 - dodoc README README.install CHANGE.log
205 }