Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/
Date: Sun, 04 Oct 2020 13:23:48
Message-Id: 1601817670.cfdef48f8c68e3cacfbccf3e9290f171494d292e.soap@gentoo
1 commit: cfdef48f8c68e3cacfbccf3e9290f171494d292e
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 4 13:21:10 2020 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 4 13:21:10 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfdef48f
7
8 sci-libs/fftw: Remove old
9
10 Package-Manager: Portage-3.0.8, Repoman-3.0.1
11 Signed-off-by: David Seifert <soap <AT> gentoo.org>
12
13 sci-libs/fftw/Manifest | 1 -
14 sci-libs/fftw/fftw-3.3.6_p2.ebuild | 181 ------------------------------------
15 sci-libs/fftw/fftw-3.3.8.ebuild | 182 -------------------------------------
16 3 files changed, 364 deletions(-)
17
18 diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
19 index 6eebda50fbe..e65017032f3 100644
20 --- a/sci-libs/fftw/Manifest
21 +++ b/sci-libs/fftw/Manifest
22 @@ -1,3 +1,2 @@
23 DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0466fa0a59fccfa2cec930e8870a5febfccfacfe44e876e40534c34e05dc62b8e7bf188b43fe3a65c6a7bdba SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15
24 -DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
25 DIST fftw-3.3.8.tar.gz 4110137 BLAKE2B 555ac1401a5a41b7661afd0288c2353398f2c9b73695742459079ebf050dfa4c371484ea65324fd4b7d374f70d88a5942ff8abaad167b0d44d485bf1dc9e208c SHA512 ab918b742a7c7dcb56390a0a0014f517a6dff9a2e4b4591060deeb2c652bf3c6868aa74559a422a276b853289b4b701bdcbd3d4d8c08943acf29167a7be81a38
26
27 diff --git a/sci-libs/fftw/fftw-3.3.6_p2.ebuild b/sci-libs/fftw/fftw-3.3.6_p2.ebuild
28 deleted file mode 100644
29 index 3d8aa290235..00000000000
30 --- a/sci-libs/fftw/fftw-3.3.6_p2.ebuild
31 +++ /dev/null
32 @@ -1,181 +0,0 @@
33 -# Copyright 1999-2020 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -FORTRAN_NEEDED=fortran
39 -
40 -inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-minimal
41 -
42 -DESCRIPTION="Fast C library for the Discrete Fourier Transform"
43 -HOMEPAGE="http://www.fftw.org/"
44 -
45 -MY_P=${PN}-${PV/_p/-pl}
46 -
47 -if [[ ${PV} = *9999 ]]; then
48 - inherit autotools git-r3
49 - EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
50 -else
51 - SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
52 - KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
53 -fi
54 -
55 -LICENSE="GPL-2+"
56 -SLOT="3.0/3"
57 -IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
58 -RESTRICT="!test? ( test )"
59 -
60 -RDEPEND="
61 - mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
62 -DEPEND="${RDEPEND}
63 - test? ( dev-lang/perl )"
64 -
65 -S=${WORKDIR}/${MY_P}
66 -HTML_DOCS=( doc/html/. )
67 -
68 -pkg_pretend() {
69 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
70 -}
71 -
72 -pkg_setup() {
73 - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
74 - tc-check-openmp
75 - FORTRAN_NEED_OPENMP=1
76 - fi
77 -
78 - fortran-2_pkg_setup
79 -
80 - MULTIBUILD_VARIANTS=( single double longdouble )
81 - if use quad; then
82 - if ! tc-is-gcc; then
83 - ewarn "quad precision only available for gcc >= 4.6"
84 - die "need quad precision capable gcc"
85 - fi
86 - MULTIBUILD_VARIANTS+=( quad )
87 - fi
88 -}
89 -
90 -src_prepare() {
91 - default
92 -
93 - # fix info file for category directory
94 - if [[ ${PV} = *9999 ]]; then
95 - sed -i -e
96 - 's/Texinfo documentation system/Libraries/' \
97 - doc/fftw3."info" || die "failed to fix info file"
98 -
99 - eautoreconf
100 - fi
101 -}
102 -
103 -multilib_src_configure() {
104 - # jlec reported USE=quad on abi_x86_32 has too few registers
105 - # stub Makefiles
106 - if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
107 - mkdir -p "${BUILD_DIR}/tests" || die
108 - echo "all: ;" > "${BUILD_DIR}/Makefile" || die
109 - echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
110 - echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
111 - return 0
112 - fi
113 -
114 - local myconf=(
115 - --enable-shared
116 - $(use_enable static-libs static)
117 - $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
118 - $(use_enable fortran)
119 - $(use_enable zbus mips-zbus-timer)
120 - $(use_enable threads)
121 - $(use_enable openmp)
122 - )
123 - case "${MULTIBUILD_ID}" in
124 - single-*)
125 - # altivec, sse, single-paired only work for single
126 - myconf+=(
127 - --enable-single
128 - $(use_enable altivec)
129 - $(use_enable cpu_flags_x86_avx avx)
130 - $(use_enable cpu_flags_x86_avx2 avx2)
131 - $(use_enable cpu_flags_x86_sse sse)
132 - $(use_enable cpu_flags_x86_sse2 sse2)
133 - $(use_enable neon)
134 - $(use_enable mpi)
135 - )
136 - ;;
137 -
138 - double-*)
139 - myconf+=(
140 - $(use_enable cpu_flags_x86_avx avx)
141 - $(use_enable cpu_flags_x86_avx2 avx2)
142 - $(use_enable cpu_flags_x86_sse2 sse2)
143 - $(use_enable mpi)
144 - )
145 - ;;
146 -
147 - longdouble-*)
148 - myconf+=(
149 - --enable-long-double
150 - $(use_enable mpi)
151 - )
152 - ;;
153 -
154 - quad-*)
155 - # quad does not support mpi
156 - myconf+=(
157 - --enable-quad-precision
158 - )
159 - ;;
160 -
161 - *)
162 - die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
163 - ;;
164 - esac
165 -
166 - ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
167 -}
168 -
169 -src_configure() {
170 - multibuild_foreach_variant multilib-minimal_src_configure
171 -}
172 -
173 -src_compile() {
174 - multibuild_foreach_variant multilib-minimal_src_compile
175 -}
176 -
177 -multilib_src_test() {
178 - emake -C tests smallcheck
179 -}
180 -
181 -src_test() {
182 - # We want this to be a reasonably quick test, but that is still hard...
183 - ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
184 - # Do not increase the number of threads, it will not help your performance
185 - # local testbase="perl check.pl --nthreads=1 --estimate"
186 - # ${testbase} -${p}d || die "Failure: $n"
187 -
188 - multibuild_foreach_variant multilib-minimal_src_test
189 -}
190 -
191 -src_install() {
192 - multibuild_foreach_variant multilib-minimal_src_install
193 - dodoc CONVENTIONS
194 -
195 - if use doc; then
196 - dodoc doc/*.pdf
197 - docinto faq
198 - dodoc -r doc/FAQ/fftw-faq.html/.
199 - else
200 - rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
201 - fi
202 -
203 - local x
204 - for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
205 - local u
206 - for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
207 - sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
208 - done
209 - done
210 -
211 - # fftw uses pkg-config to record its private dependencies
212 - find "${D}" -name '*.la' -delete || die
213 -}
214
215 diff --git a/sci-libs/fftw/fftw-3.3.8.ebuild b/sci-libs/fftw/fftw-3.3.8.ebuild
216 deleted file mode 100644
217 index e54af4af14b..00000000000
218 --- a/sci-libs/fftw/fftw-3.3.8.ebuild
219 +++ /dev/null
220 @@ -1,182 +0,0 @@
221 -# Copyright 1999-2020 Gentoo Authors
222 -# Distributed under the terms of the GNU General Public License v2
223 -
224 -EAPI=6
225 -
226 -FORTRAN_NEEDED=fortran
227 -
228 -inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
229 -
230 -DESCRIPTION="Fast C library for the Discrete Fourier Transform"
231 -HOMEPAGE="http://www.fftw.org/"
232 -
233 -MY_P=${PN}-${PV/_p/-pl}
234 -
235 -if [[ ${PV} = *9999 ]]; then
236 - inherit autotools git-r3
237 - EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
238 -else
239 - SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
240 - KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
241 -fi
242 -
243 -LICENSE="GPL-2+"
244 -SLOT="3.0/3"
245 -IUSE="cpu_flags_ppc_altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
246 -RESTRICT="!test? ( test )"
247 -
248 -RDEPEND="
249 - mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
250 -DEPEND="${RDEPEND}
251 - quad? ( sys-devel/gcc[fortran] )
252 - test? ( dev-lang/perl )"
253 -
254 -S=${WORKDIR}/${MY_P}
255 -HTML_DOCS=( doc/html/. )
256 -
257 -pkg_pretend() {
258 - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
259 -}
260 -
261 -pkg_setup() {
262 - if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
263 - tc-check-openmp
264 - FORTRAN_NEED_OPENMP=1
265 - fi
266 -
267 - fortran-2_pkg_setup
268 -
269 - MULTIBUILD_VARIANTS=( single double longdouble )
270 - if use quad; then
271 - if ! tc-is-gcc; then
272 - ewarn "quad precision only available for gcc >= 4.6"
273 - die "need quad precision capable gcc"
274 - fi
275 - MULTIBUILD_VARIANTS+=( quad )
276 - fi
277 -}
278 -
279 -src_prepare() {
280 - default
281 -
282 - # fix info file for category directory
283 - if [[ ${PV} = *9999 ]]; then
284 - sed -i -e
285 - 's/Texinfo documentation system/Libraries/' \
286 - doc/fftw3."info" || die "failed to fix info file"
287 -
288 - eautoreconf
289 - fi
290 -}
291 -
292 -multilib_src_configure() {
293 - # jlec reported USE=quad on abi_x86_32 has too few registers
294 - # stub Makefiles
295 - if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
296 - mkdir -p "${BUILD_DIR}/tests" || die
297 - echo "all: ;" > "${BUILD_DIR}/Makefile" || die
298 - echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
299 - echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
300 - return 0
301 - fi
302 -
303 - local myconf=(
304 - --enable-shared
305 - $(use_enable static-libs static)
306 - $(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
307 - $(use_enable fortran)
308 - $(use_enable zbus mips-zbus-timer)
309 - $(use_enable threads)
310 - $(use_enable openmp)
311 - )
312 - case "${MULTIBUILD_ID}" in
313 - single-*)
314 - # altivec, sse, single-paired only work for single
315 - myconf+=(
316 - --enable-single
317 - $(use_enable cpu_flags_ppc_altivec altivec)
318 - $(use_enable cpu_flags_x86_avx avx)
319 - $(use_enable cpu_flags_x86_avx2 avx2)
320 - $(use_enable cpu_flags_x86_sse sse)
321 - $(use_enable cpu_flags_x86_sse2 sse2)
322 - $(use_enable neon)
323 - $(use_enable mpi)
324 - )
325 - ;;
326 -
327 - double-*)
328 - myconf+=(
329 - $(use_enable cpu_flags_x86_avx avx)
330 - $(use_enable cpu_flags_x86_avx2 avx2)
331 - $(use_enable cpu_flags_x86_sse2 sse2)
332 - $(use_enable mpi)
333 - )
334 - ;;
335 -
336 - longdouble-*)
337 - myconf+=(
338 - --enable-long-double
339 - $(use_enable mpi)
340 - )
341 - ;;
342 -
343 - quad-*)
344 - # quad does not support mpi
345 - myconf+=(
346 - --enable-quad-precision
347 - )
348 - ;;
349 -
350 - *)
351 - die "${MULTIBUILD_ID%-*} precision not implemented in this ebuild"
352 - ;;
353 - esac
354 -
355 - ECONF_SOURCE="${S}" econf "${myconf[@]}" MPICC="$(tc-getCC) -lmpi"
356 -}
357 -
358 -src_configure() {
359 - multibuild_foreach_variant multilib-minimal_src_configure
360 -}
361 -
362 -src_compile() {
363 - multibuild_foreach_variant multilib-minimal_src_compile
364 -}
365 -
366 -multilib_src_test() {
367 - emake -C tests smallcheck
368 -}
369 -
370 -src_test() {
371 - # We want this to be a reasonably quick test, but that is still hard...
372 - ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
373 - # Do not increase the number of threads, it will not help your performance
374 - # local testbase="perl check.pl --nthreads=1 --estimate"
375 - # ${testbase} -${p}d || die "Failure: $n"
376 -
377 - multibuild_foreach_variant multilib-minimal_src_test
378 -}
379 -
380 -src_install() {
381 - multibuild_foreach_variant multilib-minimal_src_install
382 - dodoc CONVENTIONS
383 -
384 - if use doc; then
385 - dodoc doc/*.pdf
386 - docinto faq
387 - dodoc -r doc/FAQ/fftw-faq.html/.
388 - else
389 - rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
390 - fi
391 -
392 - local x
393 - for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
394 - local u
395 - for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
396 - sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
397 - done
398 - done
399 -
400 - # fftw uses pkg-config to record its private dependencies
401 - find "${D}" -name '*.la' -delete || die
402 -}