[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/ - gentoo-commits

From:	Sam James <sam@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] repo/gentoo:master commit in: sci-libs/fftw/
Date:	Thu, 16 Sep 2021 01:45:07
Message-Id:	`1631756482.a580532de52c209b8dc15a164a9bcba141fc69d1.sam@gentoo`

1

commit:     a580532de52c209b8dc15a164a9bcba141fc69d1

2

Author:     Sam James <sam <AT> gentoo <DOT> org>

3

AuthorDate: Thu Sep 16 01:41:22 2021 +0000

4

Commit:     Sam James <sam <AT> gentoo <DOT> org>

5

CommitDate: Thu Sep 16 01:41:22 2021 +0000

6

URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a580532d

7

8

sci-libs/fftw: add 3.3.10, sync live

9

10

Signed-off-by: Sam James <sam <AT> gentoo.org>

11

12

 sci-libs/fftw/Manifest                             |  1 +

13

 .../fftw/{fftw-3.3.9.ebuild => fftw-3.3.10.ebuild} | 16 +++++------

14

 sci-libs/fftw/fftw-3.3.9.ebuild                    |  4 +--

15

 sci-libs/fftw/fftw-9999.ebuild                     | 31 ++++++++++++----------

16

 4 files changed, 28 insertions(+), 24 deletions(-)

17

18

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest

19

index a4327766903..77f9c12fde3 100644

20

--- a/sci-libs/fftw/Manifest

21

+++ b/sci-libs/fftw/Manifest

22

@@ -1 +1,2 @@

23

+DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40

24

 DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf

25

26

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild

27

similarity index 92%

28

copy from sci-libs/fftw/fftw-3.3.9.ebuild

29

copy to sci-libs/fftw/fftw-3.3.10.ebuild

30

index cbd8e2451a7..c8a32cdc88e 100644

31

--- a/sci-libs/fftw/fftw-3.3.9.ebuild

32

+++ b/sci-libs/fftw/fftw-3.3.10.ebuild

33

@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran

34

 inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs

35

36

 DESCRIPTION="Fast C library for the Discrete Fourier Transform"

37

-HOMEPAGE="http://www.fftw.org/"

38

+HOMEPAGE="https://www.fftw.org/"

39

40

 MY_P=${PN}-${PV/_p/-pl}

41

42

@@ -16,22 +16,21 @@ if [[ ${PV} == *9999 ]]; then

43

 	inherit autotools git-r3

44

 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"

45

 else

46

-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"

47

-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

48

+	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"

49

+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

50

fi

51

52

+S="${WORKDIR}/${MY_P}"

53

+

54

 LICENSE="GPL-2+"

55

 SLOT="3.0/3"

56

 IUSE="cpu_flags_arm_neon 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 openmp test threads zbus"

57

 RESTRICT="!test? ( test )"

58

59

-RDEPEND="

60

-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"

61

+RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"

62

 DEPEND="${RDEPEND}"

63

-BDEPEND="

64

-	test? ( dev-lang/perl )"

65

+BDEPEND="test? ( dev-lang/perl )"

66

67

-S="${WORKDIR}/${MY_P}"

68

 HTML_DOCS=( doc/html/. )

69

70

 pkg_pretend() {

71

@@ -65,6 +64,7 @@ multilib_src_configure() {

72

 		$(use_enable threads)

73

 		$(use_enable openmp)

74

)

75

+

76

 	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )

77

78

 	# --enable-quad-precision is a brittle feature that requires

79

80

diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild

81

index cbd8e2451a7..e377ed60541 100644

82

--- a/sci-libs/fftw/fftw-3.3.9.ebuild

83

+++ b/sci-libs/fftw/fftw-3.3.9.ebuild

84

@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran

85

 inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs

86

87

 DESCRIPTION="Fast C library for the Discrete Fourier Transform"

88

-HOMEPAGE="http://www.fftw.org/"

89

+HOMEPAGE="https://www.fftw.org/"

90

91

 MY_P=${PN}-${PV/_p/-pl}

92

93

@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then

94

 	inherit autotools git-r3

95

 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"

96

 else

97

-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"

98

+	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"

99

 	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

100

fi

101

102

103

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild

104

index 23c52fd7f3d..c8a32cdc88e 100644

105

--- a/sci-libs/fftw/fftw-9999.ebuild

106

+++ b/sci-libs/fftw/fftw-9999.ebuild

107

@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran

108

 inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs

109

110

 DESCRIPTION="Fast C library for the Discrete Fourier Transform"

111

-HOMEPAGE="http://www.fftw.org/"

112

+HOMEPAGE="https://www.fftw.org/"

113

114

 MY_P=${PN}-${PV/_p/-pl}

115

116

@@ -16,22 +16,21 @@ if [[ ${PV} == *9999 ]]; then

117

 	inherit autotools git-r3

118

 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"

119

 else

120

-	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"

121

-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

122

+	SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"

123

+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"

124

fi

125

126

+S="${WORKDIR}/${MY_P}"

127

+

128

 LICENSE="GPL-2+"

129

 SLOT="3.0/3"

130

 IUSE="cpu_flags_arm_neon 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 openmp test threads zbus"

131

 RESTRICT="!test? ( test )"

132

133

-RDEPEND="

134

-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"

135

+RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"

136

 DEPEND="${RDEPEND}"

137

-BDEPEND="

138

-	test? ( dev-lang/perl )"

139

+BDEPEND="test? ( dev-lang/perl )"

140

141

-S="${WORKDIR}/${MY_P}"

142

 HTML_DOCS=( doc/html/. )

143

144

 pkg_pretend() {

145

@@ -65,6 +64,7 @@ multilib_src_configure() {

146

 		$(use_enable threads)

147

 		$(use_enable openmp)

148

)

149

+

150

 	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )

151

152

 	# --enable-quad-precision is a brittle feature that requires

153

@@ -147,13 +147,16 @@ src_install() {

154

 		rm -r "${ED}"/usr/share/doc/${PF}/html || die

155

fi

156

157

-	local x

158

-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do

159

-		local u

160

-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do

161

-			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die

162

+	augment_pc_files() {

163

+		local x

164

+		for x in "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc; do

165

+			local u

166

+			for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do

167

+				sed -e "s|-lfftw3[flq]\?|&_${u} &|" "${x}" > "${x%.pc}_${u}.pc" || die

168

+			done

169

 		done

170

-	done

171

+	}

172

+	multilib_foreach_abi augment_pc_files

173

174

 	# fftw uses pkg-config to record its private dependencies

175

 	find "${ED}" -name '*.la' -delete || die

1	commit: a580532de52c209b8dc15a164a9bcba141fc69d1
2	Author: Sam James <sam <AT> gentoo <DOT> org>
3	AuthorDate: Thu Sep 16 01:41:22 2021 +0000
4	Commit: Sam James <sam <AT> gentoo <DOT> org>
5	CommitDate: Thu Sep 16 01:41:22 2021 +0000
6	URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a580532d
7
8	sci-libs/fftw: add 3.3.10, sync live
9
10	Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12	sci-libs/fftw/Manifest \| 1 +
13	.../fftw/{fftw-3.3.9.ebuild => fftw-3.3.10.ebuild} \| 16 +++++------
14	sci-libs/fftw/fftw-3.3.9.ebuild \| 4 +--
15	sci-libs/fftw/fftw-9999.ebuild \| 31 ++++++++++++----------
16	4 files changed, 28 insertions(+), 24 deletions(-)
17
18	diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
19	index a4327766903..77f9c12fde3 100644
20	--- a/sci-libs/fftw/Manifest
21	+++ b/sci-libs/fftw/Manifest
22	@@ -1 +1,2 @@
23	+DIST fftw-3.3.10.tar.gz 4144100 BLAKE2B 3663872bd95a01d2c79af185f53918e1d1a9c91c620082402772c07f25b9b77d4920a78dc686fac6b51aa961b8d62b7e2cef3f3031e096bed40ced80b59b29d5 SHA512 2d34b5ccac7b08740dbdacc6ebe451d8a34cf9d9bfec85a5e776e87adf94abfd803c222412d8e10fbaa4ed46f504aa87180396af1b108666cde4314a55610b40
24	DIST fftw-3.3.9.tar.gz 4146999 BLAKE2B 6ea6966f3c5056102e6c3e4628b072c7e9832e3250b292808ed934b3a82515fd77658cbaff50d7b1268fb8c9444b10e39b22d100b7c31ea2452f3cee59c9f280 SHA512 52ebc2a33063a41fd478f6ea2acbf3b511867f736591d273dd57f9dfca5d3e0b0c73157921b3a36f1a7cfd741a8a6bde0fd80de578040ae730ea168b5ba466cf
25
26	diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.10.ebuild
27	similarity index 92%
28	copy from sci-libs/fftw/fftw-3.3.9.ebuild
29	copy to sci-libs/fftw/fftw-3.3.10.ebuild
30	index cbd8e2451a7..c8a32cdc88e 100644
31	--- a/sci-libs/fftw/fftw-3.3.9.ebuild
32	+++ b/sci-libs/fftw/fftw-3.3.10.ebuild
33	@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
34	inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
35
36	DESCRIPTION="Fast C library for the Discrete Fourier Transform"
37	-HOMEPAGE="http://www.fftw.org/"
38	+HOMEPAGE="https://www.fftw.org/"
39
40	MY_P=${PN}-${PV/_p/-pl}
41
42	@@ -16,22 +16,21 @@ if [[ ${PV} == *9999 ]]; then
43	inherit autotools git-r3
44	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
45	else
46	- SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
47	- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
48	+ SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
49	+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
50	fi
51
52	+S="${WORKDIR}/${MY_P}"
53	+
54	LICENSE="GPL-2+"
55	SLOT="3.0/3"
56	IUSE="cpu_flags_arm_neon 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 openmp test threads zbus"
57	RESTRICT="!test? ( test )"
58
59	-RDEPEND="
60	- mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
61	+RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
62	DEPEND="${RDEPEND}"
63	-BDEPEND="
64	- test? ( dev-lang/perl )"
65	+BDEPEND="test? ( dev-lang/perl )"
66
67	-S="${WORKDIR}/${MY_P}"
68	HTML_DOCS=( doc/html/. )
69
70	pkg_pretend() {
71	@@ -65,6 +64,7 @@ multilib_src_configure() {
72	$(use_enable threads)
73	$(use_enable openmp)
74	)
75	+
76	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
77
78	# --enable-quad-precision is a brittle feature that requires
79
80	diff --git a/sci-libs/fftw/fftw-3.3.9.ebuild b/sci-libs/fftw/fftw-3.3.9.ebuild
81	index cbd8e2451a7..e377ed60541 100644
82	--- a/sci-libs/fftw/fftw-3.3.9.ebuild
83	+++ b/sci-libs/fftw/fftw-3.3.9.ebuild
84	@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
85	inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
86
87	DESCRIPTION="Fast C library for the Discrete Fourier Transform"
88	-HOMEPAGE="http://www.fftw.org/"
89	+HOMEPAGE="https://www.fftw.org/"
90
91	MY_P=${PN}-${PV/_p/-pl}
92
93	@@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then
94	inherit autotools git-r3
95	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
96	else
97	- SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
98	+ SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
99	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
100	fi
101
102
103	diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
104	index 23c52fd7f3d..c8a32cdc88e 100644
105	--- a/sci-libs/fftw/fftw-9999.ebuild
106	+++ b/sci-libs/fftw/fftw-9999.ebuild
107	@@ -8,7 +8,7 @@ FORTRAN_NEEDED=fortran
108	inherit flag-o-matic fortran-2 multibuild multilib-minimal toolchain-funcs
109
110	DESCRIPTION="Fast C library for the Discrete Fourier Transform"
111	-HOMEPAGE="http://www.fftw.org/"
112	+HOMEPAGE="https://www.fftw.org/"
113
114	MY_P=${PN}-${PV/_p/-pl}
115
116	@@ -16,22 +16,21 @@ if [[ ${PV} == *9999 ]]; then
117	inherit autotools git-r3
118	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
119	else
120	- SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
121	- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
122	+ SRC_URI="https://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
123	+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
124	fi
125
126	+S="${WORKDIR}/${MY_P}"
127	+
128	LICENSE="GPL-2+"
129	SLOT="3.0/3"
130	IUSE="cpu_flags_arm_neon 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 openmp test threads zbus"
131	RESTRICT="!test? ( test )"
132
133	-RDEPEND="
134	- mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
135	+RDEPEND="mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
136	DEPEND="${RDEPEND}"
137	-BDEPEND="
138	- test? ( dev-lang/perl )"
139	+BDEPEND="test? ( dev-lang/perl )"
140
141	-S="${WORKDIR}/${MY_P}"
142	HTML_DOCS=( doc/html/. )
143
144	pkg_pretend() {
145	@@ -65,6 +64,7 @@ multilib_src_configure() {
146	$(use_enable threads)
147	$(use_enable openmp)
148	)
149	+
150	[[ ${PV} == *9999 ]] && myconf+=( --enable-maintainer-mode )
151
152	# --enable-quad-precision is a brittle feature that requires
153	@@ -147,13 +147,16 @@ src_install() {
154	rm -r "${ED}"/usr/share/doc/${PF}/html \|\| die
155	fi
156
157	- local x
158	- for x in "${ED}"/usr/lib/pkgconfig/.pc; do
159	- local u
160	- for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
161	- sed -e "s\|-lfftw3[flq]\?\|&_${u} &\|" "$x" > "${x%.pc}_${u}.pc" \|\| die
162	+ augment_pc_files() {
163	+ local x
164	+ for x in "${ED}"/usr/$(get_libdir)/pkgconfig/*.pc; do
165	+ local u
166	+ for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
167	+ sed -e "s\|-lfftw3[flq]\?\|&_${u} &\|" "${x}" > "${x%.pc}_${u}.pc" \|\| die
168	+ done
169	done
170	- done
171	+ }
172	+ multilib_foreach_abi augment_pc_files
173
174	# fftw uses pkg-config to record its private dependencies
175	find "${ED}" -name '*.la' -delete \|\| die

Gentoo Archives: gentoo-commits