1 |
commit: 1e554b8b088f15c731c6a1254024ddc884dc9684 |
2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
3 |
AuthorDate: Sat Jan 30 10:49:00 2021 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
5 |
CommitDate: Sat Jan 30 10:49:00 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1e554b8b |
7 |
|
8 |
sci-libs/wannier90: version bump, EAPI bump |
9 |
|
10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
11 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
12 |
|
13 |
sci-libs/wannier90/wannier90-2.0.1.1.ebuild | 77 ---------------------- |
14 |
...nnier90-2.0.1.ebuild => wannier90-3.1.0.ebuild} | 31 +++++---- |
15 |
2 files changed, 15 insertions(+), 93 deletions(-) |
16 |
|
17 |
diff --git a/sci-libs/wannier90/wannier90-2.0.1.1.ebuild b/sci-libs/wannier90/wannier90-2.0.1.1.ebuild |
18 |
deleted file mode 100644 |
19 |
index bc7e9c399..000000000 |
20 |
--- a/sci-libs/wannier90/wannier90-2.0.1.1.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,77 +0,0 @@ |
23 |
-# Copyright 1999-2021 Gentoo Authors |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
- |
26 |
-EAPI=5 |
27 |
- |
28 |
-inherit autotools-utils eutils fortran-2 multilib toolchain-funcs |
29 |
- |
30 |
-DESCRIPTION="Calculates maximally localized Wannier functions (MLWFs)" |
31 |
-HOMEPAGE="http://www.wannier.org/" |
32 |
-#SRC_URI="http://wannier.org/code/${P}.tar.gz" |
33 |
-SRC_URI="https://launchpad.net/${PN}/2.0/${PV}/+download/${P}.tar.gz" |
34 |
- |
35 |
-LICENSE="GPL-2" |
36 |
-SLOT="0" |
37 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux" |
38 |
- |
39 |
-IUSE="mpi perl test" |
40 |
-RESTRICT="!test? ( test )" |
41 |
- |
42 |
-RDEPEND=" |
43 |
- virtual/blas |
44 |
- virtual/lapack |
45 |
- perl? ( dev-lang/perl )" |
46 |
-DEPEND="${RDEPEND} |
47 |
- virtual/pkgconfig |
48 |
-" |
49 |
- |
50 |
-pkg_setup() { |
51 |
- # fortran-2.eclass does not handle mpi wrappers |
52 |
- if use mpi; then |
53 |
- export FC="mpif90" |
54 |
- export F77="mpif77" |
55 |
- export CC="mpicc" |
56 |
- export CXX="mpic++" |
57 |
- export MPIFC="mpif90" |
58 |
- export MPICC="mpicc" |
59 |
- else |
60 |
- tc-export FC F77 CC CXX |
61 |
- fi |
62 |
- |
63 |
- # Preprocesor macross can make some lines really long |
64 |
- append-fflags -ffree-line-length-none |
65 |
- |
66 |
- fortran-2_pkg_setup |
67 |
-} |
68 |
- |
69 |
-src_prepare() { |
70 |
- epatch "${FILESDIR}"/"$P"-runtest.patch |
71 |
-} |
72 |
- |
73 |
-src_configure() { |
74 |
- export LINALG_INCLUDES="$($(tc-getPKG_CONFIG) --cflags blas lapack)" |
75 |
- export LINALG_LIBS="$($(tc-getPKG_CONFIG) --libs blas lapack)" |
76 |
- autotools-utils_src_configure |
77 |
-} |
78 |
- |
79 |
-src_compile() { |
80 |
- autotools-utils_src_compile |
81 |
- pushd "${BUILD_DIR}"/utility > /dev/null || die |
82 |
- emake || die "emake in utility failed" |
83 |
- popd > /dev/null || die |
84 |
-} |
85 |
- |
86 |
-src_test() { |
87 |
- einfo "Compare the 'Standard' and 'Current' outputs of this test." |
88 |
-# cd tests |
89 |
-# emake test |
90 |
- autotools-utils_src_compile check |
91 |
- cat "${BUILD_DIR}"/tests/wantest.log |
92 |
-} |
93 |
- |
94 |
-src_install() { |
95 |
- autotools-utils_src_install |
96 |
- dobin "${BUILD_DIR}"/utility/w90pov/src/w90pov.x |
97 |
- dobin "${BUILD_DIR}"/utility/PL_assessment/w90_pl_assess.x |
98 |
- use perl && dobin "$S"/utility/w90_kmesh.pl |
99 |
-} |
100 |
|
101 |
diff --git a/sci-libs/wannier90/wannier90-2.0.1.ebuild b/sci-libs/wannier90/wannier90-3.1.0.ebuild |
102 |
similarity index 67% |
103 |
rename from sci-libs/wannier90/wannier90-2.0.1.ebuild |
104 |
rename to sci-libs/wannier90/wannier90-3.1.0.ebuild |
105 |
index 306e619b4..28bd897c4 100644 |
106 |
--- a/sci-libs/wannier90/wannier90-2.0.1.ebuild |
107 |
+++ b/sci-libs/wannier90/wannier90-3.1.0.ebuild |
108 |
@@ -1,28 +1,33 @@ |
109 |
# Copyright 1999-2021 Gentoo Authors |
110 |
# Distributed under the terms of the GNU General Public License v2 |
111 |
|
112 |
-EAPI=5 |
113 |
+EAPI=7 |
114 |
|
115 |
-inherit eutils fortran-2 multilib toolchain-funcs |
116 |
+inherit fortran-2 multilib toolchain-funcs |
117 |
|
118 |
DESCRIPTION="Calculates maximally localized Wannier functions (MLWFs)" |
119 |
HOMEPAGE="http://www.wannier.org/" |
120 |
-SRC_URI="http://wannier.org/code/${P}.tar.gz" |
121 |
+SRC_URI="https://github.com/wannier-developers/wannier90/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
122 |
|
123 |
LICENSE="GPL-2" |
124 |
SLOT="0" |
125 |
KEYWORDS="~amd64 ~x86 ~amd64-linux" |
126 |
|
127 |
-IUSE="examples perl static-libs test" |
128 |
-RESTRICT="!test? ( test )" |
129 |
+IUSE="examples perl static-libs" |
130 |
|
131 |
RDEPEND=" |
132 |
virtual/blas |
133 |
virtual/lapack |
134 |
- perl? ( dev-lang/perl )" |
135 |
-DEPEND="${RDEPEND} |
136 |
- virtual/pkgconfig |
137 |
+ virtual/mpi |
138 |
+ perl? ( dev-lang/perl ) |
139 |
" |
140 |
+DEPEND="${RDEPEND}" |
141 |
+BDEPEND="virtual/pkgconfig" |
142 |
+ |
143 |
+src_prepare() { |
144 |
+ default |
145 |
+ cp config/make.inc.gfort make.inc || die |
146 |
+} |
147 |
|
148 |
src_configure() { |
149 |
cat <<- EOF >> "${S}"/make.sys |
150 |
@@ -33,16 +38,10 @@ src_configure() { |
151 |
EOF |
152 |
} |
153 |
|
154 |
-src_compile() { |
155 |
- emake -j1 wannier |
156 |
- emake -j1 lib |
157 |
-} |
158 |
- |
159 |
src_test() { |
160 |
einfo "Compare the 'Standard' and 'Current' outputs of this test." |
161 |
- cd tests |
162 |
- emake test |
163 |
- cat wantest.log |
164 |
+ cd test-suite || die |
165 |
+ ./run_tests --default || die |
166 |
} |
167 |
|
168 |
src_install() { |