1 |
commit: e1ea268f3df4d1b7cf436b077cbd9d5ebeaf2bf9 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Tue Mar 2 08:58:57 2021 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 2 09:05:42 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ea268f |
7 |
|
8 |
sci-libs/armadillo: Remove old |
9 |
|
10 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
11 |
Closes: https://github.com/gentoo/gentoo/pull/19731 |
12 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
13 |
|
14 |
sci-libs/armadillo/Manifest | 2 - |
15 |
sci-libs/armadillo/armadillo-8.300.2.ebuild | 144 --------------------------- |
16 |
sci-libs/armadillo/armadillo-9.850.1.ebuild | 148 ---------------------------- |
17 |
sci-libs/armadillo/metadata.xml | 40 ++++---- |
18 |
4 files changed, 18 insertions(+), 316 deletions(-) |
19 |
|
20 |
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest |
21 |
index d603294cedd..0eacdd62dab 100644 |
22 |
--- a/sci-libs/armadillo/Manifest |
23 |
+++ b/sci-libs/armadillo/Manifest |
24 |
@@ -1,3 +1 @@ |
25 |
DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd |
26 |
-DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c |
27 |
-DIST armadillo-9.850.1.tar.xz 4715832 BLAKE2B 41256d8f54ec1f2d4f7cfdf58bd67e66cc2ffbe0f1daf259a4d76e0816d89708fa5528d57b244000393404108c8d0d613d03321f14e5653163d0c1cc6ec7e273 SHA512 b2b9f0290f8f39a687db71a02b127086d5ff22cee77fba5211da2ea8a8d8a5edc256b31b7fce8e98aa1955a84c63e488adcd22f8cd070015a6fcd4b4f1cb37c7 |
28 |
|
29 |
diff --git a/sci-libs/armadillo/armadillo-8.300.2.ebuild b/sci-libs/armadillo/armadillo-8.300.2.ebuild |
30 |
deleted file mode 100644 |
31 |
index 1ff6d1fd7a2..00000000000 |
32 |
--- a/sci-libs/armadillo/armadillo-8.300.2.ebuild |
33 |
+++ /dev/null |
34 |
@@ -1,144 +0,0 @@ |
35 |
-# Copyright 1999-2019 Gentoo Authors |
36 |
-# Distributed under the terms of the GNU General Public License v2 |
37 |
- |
38 |
-EAPI=6 |
39 |
- |
40 |
-CMAKE_IN_SOURCE_BUILD=1 |
41 |
- |
42 |
-inherit cmake-utils toolchain-funcs multilib eutils |
43 |
- |
44 |
-DESCRIPTION="Streamlined C++ linear algebra library" |
45 |
-HOMEPAGE="http://arma.sourceforge.net/" |
46 |
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" |
47 |
- |
48 |
-LICENSE="Apache-2.0" |
49 |
-SLOT="0/8" |
50 |
-KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux" |
51 |
-IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test" |
52 |
-RESTRICT="!test? ( test )" |
53 |
-REQUIRED_USE="test? ( lapack )" |
54 |
- |
55 |
-# atlas? ( sci-libs/atlas[lapack] ) |
56 |
- |
57 |
-RDEPEND=" |
58 |
- dev-libs/boost |
59 |
- arpack? ( sci-libs/arpack ) |
60 |
- blas? ( virtual/blas ) |
61 |
- lapack? ( virtual/lapack ) |
62 |
- superlu? ( >=sci-libs/superlu-5.2 ) |
63 |
-" |
64 |
- |
65 |
-DEPEND="${RDEPEND} |
66 |
- arpack? ( virtual/pkgconfig ) |
67 |
- blas? ( virtual/pkgconfig ) |
68 |
- hdf5? ( sci-libs/hdf5 ) |
69 |
- lapack? ( virtual/pkgconfig ) |
70 |
- mkl? ( sci-libs/mkl ) |
71 |
- tbb? ( dev-cpp/tbb )" |
72 |
-PDEPEND="${RDEPEND} |
73 |
- hdf5? ( sci-libs/hdf5 ) |
74 |
- mkl? ( sci-libs/mkl ) |
75 |
- tbb? ( dev-cpp/tbb )" |
76 |
- |
77 |
-src_prepare() { |
78 |
- # avoid the automagic cmake macros |
79 |
- sed -i -e '/ARMA_Find/d' CMakeLists.txt || die |
80 |
- cmake-utils_src_prepare |
81 |
-} |
82 |
- |
83 |
-src_configure() { |
84 |
- local mycmakeargs=( |
85 |
- -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" |
86 |
- -DARMA_EXTRA_DEBUG="$(usex debug)" |
87 |
- -DARMA_USE_MKL_ALLOC="$(usex mkl)" |
88 |
- -DARMA_USE_TBB_ALLOC="$(usex tbb)" |
89 |
- ) |
90 |
- if use arpack; then |
91 |
- mycmakeargs+=( |
92 |
- -DARPACK_FOUND=ON |
93 |
- -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" |
94 |
- ) |
95 |
- else |
96 |
- mycmakeargs+=( |
97 |
- -DARPACK_FOUND=OFF |
98 |
- ) |
99 |
- fi |
100 |
-# if use atlas; then |
101 |
-# local c=atlas-cblas l=atlas-clapack |
102 |
-# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads |
103 |
-# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads |
104 |
-# mycmakeargs+=( |
105 |
-# -DCBLAS_FOUND=ON |
106 |
-# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" |
107 |
-# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" |
108 |
-# -DCLAPACK_FOUND=ON |
109 |
-# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" |
110 |
-# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" |
111 |
-# ) |
112 |
-# fi |
113 |
- if use blas; then |
114 |
- mycmakeargs+=( |
115 |
- -DBLAS_FOUND=ON |
116 |
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
117 |
- ) |
118 |
- else |
119 |
- mycmakeargs+=( |
120 |
- -DBLAS_FOUND=OFF |
121 |
- ) |
122 |
- fi |
123 |
- if use hdf5; then |
124 |
- mycmakeargs+=( |
125 |
- -DHDF5_FOUND=ON |
126 |
- -DHDF5_LIBRARIES="-lhdf5" |
127 |
- ) |
128 |
- else |
129 |
- mycmakeargs+=( |
130 |
- -DHDF5_FOUND=OFF |
131 |
- ) |
132 |
- fi |
133 |
- if use lapack; then |
134 |
- mycmakeargs+=( |
135 |
- -DLAPACK_FOUND=ON |
136 |
- -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" |
137 |
- ) |
138 |
- else |
139 |
- mycmakeargs+=( |
140 |
- -DLAPACK_FOUND=OFF |
141 |
- ) |
142 |
- fi |
143 |
- if use superlu; then |
144 |
- mycmakeargs+=( |
145 |
- -DSuperLU_FOUND=ON |
146 |
- -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)" |
147 |
- -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')" |
148 |
- ) |
149 |
- else |
150 |
- mycmakeargs+=( |
151 |
- -DSuperLU_FOUND=OFF |
152 |
- ) |
153 |
- fi |
154 |
- |
155 |
- cmake-utils_src_configure |
156 |
-} |
157 |
- |
158 |
-src_test() { |
159 |
- pushd examples > /dev/null |
160 |
- emake \ |
161 |
- CXX="$(tc-getCXX)" \ |
162 |
- CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ |
163 |
- LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)" |
164 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die |
165 |
- emake clean |
166 |
- popd > /dev/null |
167 |
-} |
168 |
- |
169 |
-src_install() { |
170 |
- cmake-utils_src_install |
171 |
- dodoc README.txt |
172 |
- use doc && dodoc *pdf *html |
173 |
- if use examples; then |
174 |
- insinto /usr/share/doc/${PF}/examples |
175 |
- doins -r examples/* |
176 |
- docompress -x /usr/share/doc/${PF}/examples |
177 |
- fi |
178 |
-} |
179 |
|
180 |
diff --git a/sci-libs/armadillo/armadillo-9.850.1.ebuild b/sci-libs/armadillo/armadillo-9.850.1.ebuild |
181 |
deleted file mode 100644 |
182 |
index 1450070b53c..00000000000 |
183 |
--- a/sci-libs/armadillo/armadillo-9.850.1.ebuild |
184 |
+++ /dev/null |
185 |
@@ -1,148 +0,0 @@ |
186 |
-# Copyright 1999-2021 Gentoo Authors |
187 |
-# Distributed under the terms of the GNU General Public License v2 |
188 |
- |
189 |
-EAPI=6 |
190 |
- |
191 |
-CMAKE_IN_SOURCE_BUILD=1 |
192 |
- |
193 |
-inherit cmake-utils toolchain-funcs multilib eutils |
194 |
- |
195 |
-DESCRIPTION="Streamlined C++ linear algebra library" |
196 |
-HOMEPAGE="http://arma.sourceforge.net/" |
197 |
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" |
198 |
- |
199 |
-LICENSE="Apache-2.0" |
200 |
-SLOT="0/9" |
201 |
-KEYWORDS="~amd64 ~arm ppc64 ~x86 ~amd64-linux ~x86-linux" |
202 |
-IUSE="arpack blas doc examples hdf5 lapack mkl superlu test" |
203 |
-RESTRICT="!test? ( test )" |
204 |
-REQUIRED_USE="test? ( lapack )" |
205 |
- |
206 |
-# atlas? ( sci-libs/atlas[lapack] ) |
207 |
- |
208 |
-RDEPEND=" |
209 |
- dev-libs/boost |
210 |
- arpack? ( sci-libs/arpack ) |
211 |
- blas? ( virtual/blas ) |
212 |
- lapack? ( virtual/lapack ) |
213 |
- superlu? ( >=sci-libs/superlu-5.2 ) |
214 |
-" |
215 |
- |
216 |
-DEPEND="${RDEPEND} |
217 |
- arpack? ( virtual/pkgconfig ) |
218 |
- blas? ( virtual/pkgconfig ) |
219 |
- hdf5? ( sci-libs/hdf5 ) |
220 |
- lapack? ( virtual/pkgconfig ) |
221 |
- mkl? ( sci-libs/mkl ) |
222 |
-" |
223 |
-PDEPEND="${RDEPEND} |
224 |
- hdf5? ( sci-libs/hdf5 ) |
225 |
- mkl? ( sci-libs/mkl ) |
226 |
-" |
227 |
- |
228 |
-src_prepare() { |
229 |
- # avoid the automagic cmake macros... |
230 |
- sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die |
231 |
- |
232 |
- # ... except for mkl, since without a license it's hard to figure out what to do there |
233 |
- if use mkl; then |
234 |
- sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die |
235 |
- fi |
236 |
- |
237 |
- cmake-utils_src_prepare |
238 |
-} |
239 |
- |
240 |
-src_configure() { |
241 |
- local mycmakeargs=( |
242 |
- -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" |
243 |
- ) |
244 |
- if use arpack; then |
245 |
- mycmakeargs+=( |
246 |
- -DARPACK_FOUND=ON |
247 |
- -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" |
248 |
- ) |
249 |
- else |
250 |
- mycmakeargs+=( |
251 |
- -DARPACK_FOUND=OFF |
252 |
- ) |
253 |
- fi |
254 |
-# if use atlas; then |
255 |
-# local c=atlas-cblas l=atlas-clapack |
256 |
-# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads |
257 |
-# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads |
258 |
-# mycmakeargs+=( |
259 |
-# -DCBLAS_FOUND=ON |
260 |
-# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" |
261 |
-# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" |
262 |
-# -DCLAPACK_FOUND=ON |
263 |
-# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" |
264 |
-# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" |
265 |
-# ) |
266 |
-# fi |
267 |
- if use blas; then |
268 |
- mycmakeargs+=( |
269 |
- -DBLAS_FOUND=ON |
270 |
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
271 |
- ) |
272 |
- else |
273 |
- mycmakeargs+=( |
274 |
- -DBLAS_FOUND=OFF |
275 |
- ) |
276 |
- fi |
277 |
- if use hdf5; then |
278 |
- mycmakeargs+=( |
279 |
- -DDETECT_HDF5=ON |
280 |
- -DHDF5_LIBRARIES="-lhdf5" |
281 |
- -DHDF5_INCLUDE_DIRS=/usr/include |
282 |
- ) |
283 |
- else |
284 |
- mycmakeargs+=( |
285 |
- -DDETECT_HDF5=OFF |
286 |
- ) |
287 |
- fi |
288 |
- if use lapack; then |
289 |
- mycmakeargs+=( |
290 |
- -DLAPACK_FOUND=ON |
291 |
- -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" |
292 |
- ) |
293 |
- else |
294 |
- mycmakeargs+=( |
295 |
- -DLAPACK_FOUND=OFF |
296 |
- ) |
297 |
- fi |
298 |
- if use superlu; then |
299 |
- mycmakeargs+=( |
300 |
- -DSuperLU_FOUND=ON |
301 |
- -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)" |
302 |
- -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')" |
303 |
- ) |
304 |
- else |
305 |
- mycmakeargs+=( |
306 |
- -DSuperLU_FOUND=OFF |
307 |
- ) |
308 |
- fi |
309 |
- |
310 |
- cmake-utils_src_configure |
311 |
-} |
312 |
- |
313 |
-src_test() { |
314 |
- pushd examples > /dev/null |
315 |
- emake \ |
316 |
- CXX="$(tc-getCXX)" \ |
317 |
- CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ |
318 |
- LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)" |
319 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die |
320 |
- emake clean |
321 |
- popd > /dev/null |
322 |
-} |
323 |
- |
324 |
-src_install() { |
325 |
- cmake-utils_src_install |
326 |
- dodoc README.md |
327 |
- use doc && dodoc *pdf *html |
328 |
- if use examples; then |
329 |
- docinto /usr/share/doc/${PF}/examples |
330 |
- dodoc -r examples/* |
331 |
- docompress -x /usr/share/doc/${PF}/examples |
332 |
- fi |
333 |
-} |
334 |
|
335 |
diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml |
336 |
index b2dad09a917..3daa0eb9658 100644 |
337 |
--- a/sci-libs/armadillo/metadata.xml |
338 |
+++ b/sci-libs/armadillo/metadata.xml |
339 |
@@ -9,32 +9,28 @@ |
340 |
<name>Gentoo Science Project</name> |
341 |
</maintainer> |
342 |
<longdescription lang="en"> |
343 |
- Armadillo is a C++ linear algebra library (matrix maths) aiming |
344 |
- towards a good balance between speed and ease of use. Integer, |
345 |
- floating point and complex numbers are supported, as well as a |
346 |
- subset of trigonometric and statistics functions. Various matrix |
347 |
- decompositions are provided through optional integration with LAPACK |
348 |
- and ATLAS libraries. |
349 |
- A delayed evaluation approach is employed (during compile time) to |
350 |
- combine several operations into one and reduce (or eliminate) the |
351 |
- need for temporaries. This is accomplished through recursive |
352 |
- templates and template meta-programming. |
353 |
-</longdescription> |
354 |
+ Armadillo is a C++ linear algebra library (matrix maths) aiming |
355 |
+ towards a good balance between speed and ease of use. Integer, |
356 |
+ floating point and complex numbers are supported, as well as a |
357 |
+ subset of trigonometric and statistics functions. Various matrix |
358 |
+ decompositions are provided through optional integration with LAPACK |
359 |
+ and ATLAS libraries. |
360 |
+ A delayed evaluation approach is employed (during compile time) to |
361 |
+ combine several operations into one and reduce (or eliminate) the |
362 |
+ need for temporaries. This is accomplished through recursive |
363 |
+ templates and template meta-programming. |
364 |
+ </longdescription> |
365 |
<use> |
366 |
<flag name="arpack"> |
367 |
- Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition |
368 |
- </flag> |
369 |
+ Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition |
370 |
+ </flag> |
371 |
<flag name="mkl"> |
372 |
- Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg> |
373 |
- </flag> |
374 |
- <flag name="tbb"> |
375 |
- Use matrix allocation from the Threads Building Blocks |
376 |
- <pkg>dev-cpp/tbb</pkg> |
377 |
- </flag> |
378 |
+ Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg> |
379 |
+ </flag> |
380 |
<flag name="superlu"> |
381 |
- Use SuperLU for sparse linear equation solving |
382 |
- <pkg>sci-libs/superlu</pkg> |
383 |
- </flag> |
384 |
+ Use SuperLU for sparse linear equation solving |
385 |
+ <pkg>sci-libs/superlu</pkg> |
386 |
+ </flag> |
387 |
</use> |
388 |
<upstream> |
389 |
<remote-id type="sourceforge">arma</remote-id> |