1 |
commit: dee3f453d0b812ef2c1b4f0808971718b9ef72c0 |
2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
3 |
AuthorDate: Sat Jan 30 11:50:01 2021 +0000 |
4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
5 |
CommitDate: Sat Jan 30 11:50:01 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=dee3f453 |
7 |
|
8 |
sci-libs/pfft: 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 |
...-1.0.7_alpha.ebuild => pfft-1.0.8_alpha.ebuild} | 23 ++++++++------------ |
14 |
sci-libs/pfft/pfft-9999.ebuild | 25 +++++++++------------- |
15 |
2 files changed, 19 insertions(+), 29 deletions(-) |
16 |
|
17 |
diff --git a/sci-libs/pfft/pfft-1.0.7_alpha.ebuild b/sci-libs/pfft/pfft-1.0.8_alpha.ebuild |
18 |
similarity index 61% |
19 |
rename from sci-libs/pfft/pfft-1.0.7_alpha.ebuild |
20 |
rename to sci-libs/pfft/pfft-1.0.8_alpha.ebuild |
21 |
index 612564e0b..e71ab975f 100644 |
22 |
--- a/sci-libs/pfft/pfft-1.0.7_alpha.ebuild |
23 |
+++ b/sci-libs/pfft/pfft-1.0.8_alpha.ebuild |
24 |
@@ -1,9 +1,9 @@ |
25 |
-# Copyright 1999-2017 Gentoo Foundation |
26 |
+# Copyright 1999-2021 Gentoo Authors |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
|
29 |
-EAPI=5 |
30 |
+EAPI=7 |
31 |
|
32 |
-inherit autotools-utils fortran-2 multibuild |
33 |
+inherit fortran-2 multibuild |
34 |
|
35 |
DESCRIPTION="Parallel 3d FFT" |
36 |
HOMEPAGE="https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software.php.en" |
37 |
@@ -26,28 +26,23 @@ IUSE="static-libs" |
38 |
RDEPEND=" |
39 |
sci-libs/fftw:3.0[mpi,fortran] |
40 |
virtual/mpi |
41 |
- " |
42 |
+" |
43 |
|
44 |
-DEPEND=" |
45 |
- ${RDEPEND} |
46 |
- " |
47 |
+DEPEND="${RDEPEND}" |
48 |
|
49 |
src_configure() { |
50 |
MULTIBUILD_VARIANTS=( single double long-double ) |
51 |
my_src_configure() { |
52 |
- local myeconfargs=( |
53 |
- $([[ ${MULTIBUILD_VARIANT} != double ]] && echo "--enable-${MULTIBUILD_VARIANT}") |
54 |
- ) |
55 |
- autotools-utils_src_configure |
56 |
+ econf $([[ ${MULTIBUILD_VARIANT} != double ]] && echo "--enable-${MULTIBUILD_VARIANT}") |
57 |
} |
58 |
|
59 |
- multibuild_parallel_foreach_variant my_src_configure |
60 |
+ multibuild_foreach_variant my_src_configure |
61 |
} |
62 |
|
63 |
src_compile() { |
64 |
- multibuild_foreach_variant autotools-utils_src_compile |
65 |
+ multibuild_foreach_variant emake |
66 |
} |
67 |
|
68 |
src_install() { |
69 |
- multibuild_parallel_foreach_variant autotools-utils_src_install |
70 |
+ multibuild_foreach_variant emake install DESTDIR="${D}" |
71 |
} |
72 |
|
73 |
diff --git a/sci-libs/pfft/pfft-9999.ebuild b/sci-libs/pfft/pfft-9999.ebuild |
74 |
index 1ad55311a..e71ab975f 100644 |
75 |
--- a/sci-libs/pfft/pfft-9999.ebuild |
76 |
+++ b/sci-libs/pfft/pfft-9999.ebuild |
77 |
@@ -1,9 +1,9 @@ |
78 |
-# Copyright 1999-2014 Gentoo Foundation |
79 |
+# Copyright 1999-2021 Gentoo Authors |
80 |
# Distributed under the terms of the GNU General Public License v2 |
81 |
|
82 |
-EAPI=5 |
83 |
+EAPI=7 |
84 |
|
85 |
-inherit autotools-utils fortran-2 multibuild |
86 |
+inherit fortran-2 multibuild |
87 |
|
88 |
DESCRIPTION="Parallel 3d FFT" |
89 |
HOMEPAGE="https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software.php.en" |
90 |
@@ -15,7 +15,7 @@ if [[ $PV = *9999 ]] ; then |
91 |
AUTOTOOLS_AUTORECONF=1 |
92 |
else |
93 |
SRC_URI="https://www-user.tu-chemnitz.de/~potts/workgroup/pippig/software/${P//_/-}.tar.gz" |
94 |
- KEYWORDS="~x86 ~amd64" |
95 |
+ KEYWORDS="~amd64 ~x86" |
96 |
S="${WORKDIR}/${P//_/-}" |
97 |
fi |
98 |
|
99 |
@@ -26,28 +26,23 @@ IUSE="static-libs" |
100 |
RDEPEND=" |
101 |
sci-libs/fftw:3.0[mpi,fortran] |
102 |
virtual/mpi |
103 |
- " |
104 |
+" |
105 |
|
106 |
-DEPEND=" |
107 |
- ${RDEPEND} |
108 |
- " |
109 |
+DEPEND="${RDEPEND}" |
110 |
|
111 |
src_configure() { |
112 |
MULTIBUILD_VARIANTS=( single double long-double ) |
113 |
my_src_configure() { |
114 |
- local myeconfargs=( |
115 |
- $([[ ${MULTIBUILD_VARIANT} != double ]] && echo "--enable-${MULTIBUILD_VARIANT}") |
116 |
- ) |
117 |
- autotools-utils_src_configure |
118 |
+ econf $([[ ${MULTIBUILD_VARIANT} != double ]] && echo "--enable-${MULTIBUILD_VARIANT}") |
119 |
} |
120 |
|
121 |
- multibuild_parallel_foreach_variant my_src_configure |
122 |
+ multibuild_foreach_variant my_src_configure |
123 |
} |
124 |
|
125 |
src_compile() { |
126 |
- multibuild_foreach_variant autotools-utils_src_compile |
127 |
+ multibuild_foreach_variant emake |
128 |
} |
129 |
|
130 |
src_install() { |
131 |
- multibuild_parallel_foreach_variant autotools-utils_src_install |
132 |
+ multibuild_foreach_variant emake install DESTDIR="${D}" |
133 |
} |