Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/armadillo/
Date: Sun, 14 Oct 2018 13:38:25
Message-Id: 1539524286.a69178ea530edb435a82abf6df3bc4db24a5f35f.asturm@gentoo
1 commit: a69178ea530edb435a82abf6df3bc4db24a5f35f
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 14 13:37:37 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 14 13:38:06 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a69178ea
7
8 sci-libs/armadillo: Drop old
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 sci-libs/armadillo/Manifest | 3 -
14 sci-libs/armadillo/armadillo-6.200.3.ebuild | 118 -----------------------
15 sci-libs/armadillo/armadillo-7.950.1.ebuild | 143 ----------------------------
16 sci-libs/armadillo/armadillo-8.200.0.ebuild | 143 ----------------------------
17 4 files changed, 407 deletions(-)
18
19 diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
20 index 5b4febf2e38..cae261b2c87 100644
21 --- a/sci-libs/armadillo/Manifest
22 +++ b/sci-libs/armadillo/Manifest
23 @@ -1,4 +1 @@
24 -DIST armadillo-6.200.3.tar.gz 5442342 BLAKE2B b67b942dcf5da9b878465b2458ce78a61acc1fbc8a05a345a3df70c467e7ac4c3c8a6bac745897fd3b8786dfbce71dabca0d11f9d101df46e9a1d59f7242e84d SHA512 598ba8be19971fc0e44703b17be922568e697c592ed85d0148c31f8476ecd7b5a0e6185918763bc063ba68244330b17594333c1453e9c1cfd39b9fefe85be222
25 -DIST armadillo-7.950.1.tar.xz 4022716 BLAKE2B 9f6961c9745caa4c7347082f77934a90487daf1c03fc342133ef06e13dbfad38cc9e2f8713015b93fc277ae2ccd61302d7ba55f2a82ccd997b67eae481f6442c SHA512 e061a09ba45359c6a1d422cbb1586b2c1d3d5edaec8a0a885030c4aa3295eb5b90b45df6e4d5bec6ca57d290020a33afc8ed9a940a08b3ec0f0736a278b0484d
26 -DIST armadillo-8.200.0.tar.xz 4456824 BLAKE2B a9124c8e15807a00b8495e90934d71a3b270e8bf5c9319fe3a28c2e65ed4d8f23e7ca61992a661e8e7f65244203da65d85514ebd91b9adf7edb055551d9177d0 SHA512 d7b49e79a40a50de99c3b227eada7d628bd325aaab5bc4b016c0bd957475fc042518edf88e2f749fa8851d54d3e2269c705175afde3942fa3818f8a7f931d0b9
27 DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c
28
29 diff --git a/sci-libs/armadillo/armadillo-6.200.3.ebuild b/sci-libs/armadillo/armadillo-6.200.3.ebuild
30 deleted file mode 100644
31 index 74c00365c04..00000000000
32 --- a/sci-libs/armadillo/armadillo-6.200.3.ebuild
33 +++ /dev/null
34 @@ -1,118 +0,0 @@
35 -# Copyright 1999-2017 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=5
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.gz"
47 -
48 -LICENSE="MPL-2.0"
49 -SLOT="0/6"
50 -KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-linux ~x86-linux"
51 -IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
52 -REQUIRED_USE="test? ( lapack )"
53 -
54 -RDEPEND="
55 - dev-libs/boost
56 - arpack? ( sci-libs/arpack )
57 - blas? ( virtual/blas )
58 - lapack? ( virtual/lapack )
59 - superlu? ( sci-libs/superlu )
60 -"
61 -DEPEND="${RDEPEND}
62 - arpack? ( virtual/pkgconfig )
63 - blas? ( virtual/pkgconfig )
64 - hdf5? ( sci-libs/hdf5 )
65 - lapack? ( virtual/pkgconfig )
66 - mkl? ( sci-libs/mkl )
67 - tbb? ( dev-cpp/tbb )"
68 -PDEPEND="${RDEPEND}
69 - hdf5? ( sci-libs/hdf5 )
70 - mkl? ( sci-libs/mkl )
71 - tbb? ( dev-cpp/tbb )"
72 -
73 -src_prepare() {
74 - # avoid the automagic cmake macros
75 - sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
76 - cmake-utils_src_prepare
77 -}
78 -
79 -src_configure() {
80 - local mycmakeargs=(
81 - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
82 - $(cmake-utils_use debug ARMA_EXTRA_DEBUG)
83 - $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
84 - $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
85 - )
86 - if use arpack; then
87 - mycmakeargs+=(
88 - -DARPACK_FOUND=ON
89 - -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
90 - )
91 - fi
92 -# if use atlas; then
93 -# local c=atlas-cblas l=atlas-clapack
94 -# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
95 -# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
96 -# mycmakeargs+=(
97 -# -DCBLAS_FOUND=ON
98 -# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
99 -# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
100 -# -DCLAPACK_FOUND=ON
101 -# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
102 -# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
103 -# )
104 -# fi
105 - if use blas; then
106 - mycmakeargs+=(
107 - -DBLAS_FOUND=ON
108 - -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
109 - )
110 - fi
111 - if use hdf5; then
112 - mycmakeargs+=(
113 - -DHDF5_FOUND=ON
114 - -DHDF5_LIBRARIES="-lhdf5"
115 - )
116 - fi
117 - if use lapack; then
118 - mycmakeargs+=(
119 - -DLAPACK_FOUND=ON
120 - -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
121 - )
122 - fi
123 - if use superlu; then
124 - mycmakeargs+=(
125 - -DSuperLU_FOUND=ON
126 - -DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)"
127 - )
128 - fi
129 -
130 - cmake-utils_src_configure
131 -}
132 -
133 -src_test() {
134 - pushd examples > /dev/null
135 - emake \
136 - CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
137 - EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
138 - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
139 - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
140 - emake clean
141 - popd > /dev/null
142 -}
143 -
144 -src_install() {
145 - cmake-utils_src_install
146 - dodoc README.txt
147 - use doc && dodoc *pdf && dohtml *html
148 - if use examples; then
149 - insinto /usr/share/examples/${PF}
150 - doins -r examples/*
151 - fi
152 -}
153
154 diff --git a/sci-libs/armadillo/armadillo-7.950.1.ebuild b/sci-libs/armadillo/armadillo-7.950.1.ebuild
155 deleted file mode 100644
156 index f51cc63bdf4..00000000000
157 --- a/sci-libs/armadillo/armadillo-7.950.1.ebuild
158 +++ /dev/null
159 @@ -1,143 +0,0 @@
160 -# Copyright 1999-2017 Gentoo Foundation
161 -# Distributed under the terms of the GNU General Public License v2
162 -
163 -EAPI=6
164 -
165 -CMAKE_IN_SOURCE_BUILD=1
166 -
167 -inherit cmake-utils toolchain-funcs multilib eutils
168 -
169 -DESCRIPTION="Streamlined C++ linear algebra library"
170 -HOMEPAGE="http://arma.sourceforge.net/"
171 -SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
172 -
173 -LICENSE="Apache-2.0"
174 -SLOT="0/7"
175 -KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
176 -IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
177 -REQUIRED_USE="test? ( lapack )"
178 -
179 -# atlas? ( sci-libs/atlas[lapack] )
180 -
181 -RDEPEND="
182 - dev-libs/boost
183 - arpack? ( sci-libs/arpack )
184 - blas? ( virtual/blas )
185 - lapack? ( virtual/lapack )
186 - superlu? ( >=sci-libs/superlu-5 )
187 -"
188 -
189 -DEPEND="${RDEPEND}
190 - arpack? ( virtual/pkgconfig )
191 - blas? ( virtual/pkgconfig )
192 - hdf5? ( sci-libs/hdf5 )
193 - lapack? ( virtual/pkgconfig )
194 - mkl? ( sci-libs/mkl )
195 - tbb? ( dev-cpp/tbb )"
196 -PDEPEND="${RDEPEND}
197 - hdf5? ( sci-libs/hdf5 )
198 - mkl? ( sci-libs/mkl )
199 - tbb? ( dev-cpp/tbb )"
200 -
201 -src_prepare() {
202 - # avoid the automagic cmake macros
203 - sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
204 - cmake-utils_src_prepare
205 -}
206 -
207 -src_configure() {
208 - local mycmakeargs=(
209 - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
210 - -DARMA_EXTRA_DEBUG="$(usex debug)"
211 - -DARMA_USE_MKL_ALLOC="$(usex mkl)"
212 - -DARMA_USE_TBB_ALLOC="$(usex tbb)"
213 - )
214 - if use arpack; then
215 - mycmakeargs+=(
216 - -DARPACK_FOUND=ON
217 - -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
218 - )
219 - else
220 - mycmakeargs+=(
221 - -DARPACK_FOUND=OFF
222 - )
223 - fi
224 -# if use atlas; then
225 -# local c=atlas-cblas l=atlas-clapack
226 -# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
227 -# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
228 -# mycmakeargs+=(
229 -# -DCBLAS_FOUND=ON
230 -# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
231 -# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
232 -# -DCLAPACK_FOUND=ON
233 -# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
234 -# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
235 -# )
236 -# fi
237 - if use blas; then
238 - mycmakeargs+=(
239 - -DBLAS_FOUND=ON
240 - -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
241 - )
242 - else
243 - mycmakeargs+=(
244 - -DBLAS_FOUND=OFF
245 - )
246 - fi
247 - if use hdf5; then
248 - mycmakeargs+=(
249 - -DHDF5_FOUND=ON
250 - -DHDF5_LIBRARIES="-lhdf5"
251 - )
252 - else
253 - mycmakeargs+=(
254 - -DHDF5_FOUND=OFF
255 - )
256 - fi
257 - if use lapack; then
258 - mycmakeargs+=(
259 - -DLAPACK_FOUND=ON
260 - -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
261 - )
262 - else
263 - mycmakeargs+=(
264 - -DLAPACK_FOUND=OFF
265 - )
266 - fi
267 - if use superlu; then
268 - mycmakeargs+=(
269 - -DSuperLU_FOUND=ON
270 - -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
271 - -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
272 - )
273 - else
274 - mycmakeargs+=(
275 - -DSuperLU_FOUND=OFF
276 - )
277 - fi
278 -
279 - cmake-utils_src_configure
280 -}
281 -
282 -src_test() {
283 - pushd examples > /dev/null
284 - emake \
285 - CXX="$(tc-getCXX)" \
286 - CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
287 - LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
288 - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
289 - emake clean
290 - popd > /dev/null
291 -}
292 -
293 -src_install() {
294 - cmake-utils_src_install
295 - dodoc README.txt
296 - use doc && dodoc *pdf *html
297 - if use examples; then
298 - insinto /usr/share/doc/${PF}/examples
299 - doins -r examples/*
300 - docompress -x /usr/share/doc/${PF}/examples
301 - fi
302 -}
303
304 diff --git a/sci-libs/armadillo/armadillo-8.200.0.ebuild b/sci-libs/armadillo/armadillo-8.200.0.ebuild
305 deleted file mode 100644
306 index dccb43520ea..00000000000
307 --- a/sci-libs/armadillo/armadillo-8.200.0.ebuild
308 +++ /dev/null
309 @@ -1,143 +0,0 @@
310 -# Copyright 1999-2017 Gentoo Foundation
311 -# Distributed under the terms of the GNU General Public License v2
312 -
313 -EAPI=6
314 -
315 -CMAKE_IN_SOURCE_BUILD=1
316 -
317 -inherit cmake-utils toolchain-funcs multilib eutils
318 -
319 -DESCRIPTION="Streamlined C++ linear algebra library"
320 -HOMEPAGE="http://arma.sourceforge.net/"
321 -SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
322 -
323 -LICENSE="Apache-2.0"
324 -SLOT="0/8"
325 -KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
326 -IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test"
327 -REQUIRED_USE="test? ( lapack )"
328 -
329 -# atlas? ( sci-libs/atlas[lapack] )
330 -
331 -RDEPEND="
332 - dev-libs/boost
333 - arpack? ( sci-libs/arpack )
334 - blas? ( virtual/blas )
335 - lapack? ( virtual/lapack )
336 - superlu? ( >=sci-libs/superlu-5.2 )
337 -"
338 -
339 -DEPEND="${RDEPEND}
340 - arpack? ( virtual/pkgconfig )
341 - blas? ( virtual/pkgconfig )
342 - hdf5? ( sci-libs/hdf5 )
343 - lapack? ( virtual/pkgconfig )
344 - mkl? ( sci-libs/mkl )
345 - tbb? ( dev-cpp/tbb )"
346 -PDEPEND="${RDEPEND}
347 - hdf5? ( sci-libs/hdf5 )
348 - mkl? ( sci-libs/mkl )
349 - tbb? ( dev-cpp/tbb )"
350 -
351 -src_prepare() {
352 - # avoid the automagic cmake macros
353 - sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
354 - cmake-utils_src_prepare
355 -}
356 -
357 -src_configure() {
358 - local mycmakeargs=(
359 - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
360 - -DARMA_EXTRA_DEBUG="$(usex debug)"
361 - -DARMA_USE_MKL_ALLOC="$(usex mkl)"
362 - -DARMA_USE_TBB_ALLOC="$(usex tbb)"
363 - )
364 - if use arpack; then
365 - mycmakeargs+=(
366 - -DARPACK_FOUND=ON
367 - -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
368 - )
369 - else
370 - mycmakeargs+=(
371 - -DARPACK_FOUND=OFF
372 - )
373 - fi
374 -# if use atlas; then
375 -# local c=atlas-cblas l=atlas-clapack
376 -# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
377 -# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
378 -# mycmakeargs+=(
379 -# -DCBLAS_FOUND=ON
380 -# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
381 -# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
382 -# -DCLAPACK_FOUND=ON
383 -# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
384 -# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
385 -# )
386 -# fi
387 - if use blas; then
388 - mycmakeargs+=(
389 - -DBLAS_FOUND=ON
390 - -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
391 - )
392 - else
393 - mycmakeargs+=(
394 - -DBLAS_FOUND=OFF
395 - )
396 - fi
397 - if use hdf5; then
398 - mycmakeargs+=(
399 - -DHDF5_FOUND=ON
400 - -DHDF5_LIBRARIES="-lhdf5"
401 - )
402 - else
403 - mycmakeargs+=(
404 - -DHDF5_FOUND=OFF
405 - )
406 - fi
407 - if use lapack; then
408 - mycmakeargs+=(
409 - -DLAPACK_FOUND=ON
410 - -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
411 - )
412 - else
413 - mycmakeargs+=(
414 - -DLAPACK_FOUND=OFF
415 - )
416 - fi
417 - if use superlu; then
418 - mycmakeargs+=(
419 - -DSuperLU_FOUND=ON
420 - -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
421 - -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
422 - )
423 - else
424 - mycmakeargs+=(
425 - -DSuperLU_FOUND=OFF
426 - )
427 - fi
428 -
429 - cmake-utils_src_configure
430 -}
431 -
432 -src_test() {
433 - pushd examples > /dev/null
434 - emake \
435 - CXX="$(tc-getCXX)" \
436 - CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
437 - LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
438 - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
439 - emake clean
440 - popd > /dev/null
441 -}
442 -
443 -src_install() {
444 - cmake-utils_src_install
445 - dodoc README.txt
446 - use doc && dodoc *pdf *html
447 - if use examples; then
448 - insinto /usr/share/doc/${PF}/examples
449 - doins -r examples/*
450 - docompress -x /usr/share/doc/${PF}/examples
451 - fi
452 -}
Report Message
Find on MARC Find on Google Groups