Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/armadillo/
Date: Mon, 28 Feb 2022 23:21:18
Message-Id: 1646090451.e9a2655423f43dc1e0e37e8082ca341c29ed7a62.dilfridge@gentoo
1 commit: e9a2655423f43dc1e0e37e8082ca341c29ed7a62
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 28 23:20:51 2022 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 28 23:20:51 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9a26554
7
8 sci-libs/armadillo: Remove old
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
12
13 sci-libs/armadillo/Manifest | 1 -
14 sci-libs/armadillo/armadillo-10.3.0-r1.ebuild | 150 --------------------------
15 2 files changed, 151 deletions(-)
16
17 diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
18 index 684cb4fe5754..09b6ea909b92 100644
19 --- a/sci-libs/armadillo/Manifest
20 +++ b/sci-libs/armadillo/Manifest
21 @@ -1,4 +1,3 @@
22 DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
23 -DIST armadillo-10.3.0.tar.xz 6214388 BLAKE2B 212d543e8d1845c974cf11302a944a151f63c7f301046910da6b2f27684080df520e5be10f8490a1cc27071ec84b1a91a2431e33960b561c56b291575bb003e8 SHA512 99877ff6581d3effea282d1c4e258883618f4107d84cfe85ed877afc62ba445793e760693c0c6c2113a1822881160cb10adb90087e97b4e31d3a1e64344a6353
24 DIST armadillo-10.7.1.tar.xz 6258792 BLAKE2B cc820638dd7b571b5654e14bb82ced3586cb2950b1fb5aebf6bdd9439151353c4750296aaa4d15144ade6ed13e52743ac41e3cf34b824809931c3c031804bddf SHA512 b9be6a38165a4d23a61715a3c3f970dcb9b813bebd51b7372a4e8349ab2c351cd5c74f662d860911b30b2b816f2eb1255768fab1497ec087a63a07f56f74327f
25 DIST armadillo-10.8.2.tar.xz 6262832 BLAKE2B f8a5a66464614661bcccffb8138434d117ad07dcea5f89ddde45df293df5dd4f10def2085b85d37386337fd8bd0152914a957e0b1b7919a47ec8b1a79e92b90b SHA512 720fadad491dfeeb894544b0305cd64a0e0402e66fc788949ecd54c0b1a3b9c3ede9f75b081f832931d59d2bd59529cebb9d5b57b8582df869765cac01c2979b
26
27 diff --git a/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild b/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild
28 deleted file mode 100644
29 index d85588ffb610..000000000000
30 --- a/sci-libs/armadillo/armadillo-10.3.0-r1.ebuild
31 +++ /dev/null
32 @@ -1,150 +0,0 @@
33 -# Copyright 1999-2021 Gentoo Authors
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=7
37 -
38 -CMAKE_IN_SOURCE_BUILD=1
39 -
40 -inherit cmake toolchain-funcs multilib
41 -
42 -DESCRIPTION="Streamlined C++ linear algebra library"
43 -HOMEPAGE="http://arma.sourceforge.net/"
44 -SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
45 -
46 -LICENSE="Apache-2.0"
47 -SLOT="0/10"
48 -KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
49 -IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
50 -RESTRICT="!test? ( test )"
51 -REQUIRED_USE="test? ( lapack )"
52 -
53 -# atlas? ( sci-libs/atlas[lapack] )
54 -
55 -RDEPEND="
56 - dev-libs/boost
57 - arpack? ( sci-libs/arpack )
58 - blas? ( virtual/blas )
59 - lapack? ( virtual/lapack )
60 - superlu? ( >=sci-libs/superlu-5.2 )
61 -"
62 -
63 -DEPEND="${RDEPEND}
64 - arpack? ( virtual/pkgconfig )
65 - blas? ( virtual/pkgconfig )
66 - hdf5? ( sci-libs/hdf5 )
67 - lapack? ( virtual/pkgconfig )
68 - mkl? ( sci-libs/mkl )
69 -"
70 -PDEPEND="${RDEPEND}
71 - hdf5? ( sci-libs/hdf5 )
72 - mkl? ( sci-libs/mkl )
73 -"
74 -
75 -src_prepare() {
76 - # avoid the automagic cmake macros...
77 - sed -i -e 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die
78 -
79 - # ... except for mkl, since without a license it's hard to figure out what to do there
80 - if use mkl; then
81 - sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die
82 - fi
83 -
84 - cmake_src_prepare
85 -}
86 -
87 -src_configure() {
88 - local mycmakeargs=(
89 - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
90 - )
91 - if use arpack; then
92 - mycmakeargs+=(
93 - -DARPACK_FOUND=ON
94 - -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
95 - )
96 - else
97 - mycmakeargs+=(
98 - -DARPACK_FOUND=OFF
99 - )
100 - fi
101 -# if use atlas; then
102 -# local c=atlas-cblas l=atlas-clapack
103 -# $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
104 -# $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
105 -# mycmakeargs+=(
106 -# -DCBLAS_FOUND=ON
107 -# -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
108 -# -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
109 -# -DCLAPACK_FOUND=ON
110 -# -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
111 -# -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
112 -# )
113 -# fi
114 - if use blas; then
115 - mycmakeargs+=(
116 - -DBLAS_FOUND=ON
117 - -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
118 - )
119 - else
120 - mycmakeargs+=(
121 - -DBLAS_FOUND=OFF
122 - )
123 - fi
124 - if use hdf5; then
125 - mycmakeargs+=(
126 - -DDETECT_HDF5=ON
127 - -DHDF5_LIBRARIES="-lhdf5"
128 - -DHDF5_INCLUDE_DIRS=/usr/include
129 - )
130 - else
131 - mycmakeargs+=(
132 - -DDETECT_HDF5=OFF
133 - )
134 - fi
135 - if use lapack; then
136 - mycmakeargs+=(
137 - -DLAPACK_FOUND=ON
138 - -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
139 - )
140 - else
141 - mycmakeargs+=(
142 - -DLAPACK_FOUND=OFF
143 - )
144 - fi
145 - if use superlu; then
146 - mycmakeargs+=(
147 - -DSuperLU_FOUND=ON
148 - -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)"
149 - -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')"
150 - )
151 - else
152 - mycmakeargs+=(
153 - -DSuperLU_FOUND=OFF
154 - )
155 - fi
156 -
157 - cmake_src_configure
158 -}
159 -
160 -src_test() {
161 - pushd examples > /dev/null
162 - emake \
163 - CXX="$(tc-getCXX)" \
164 - CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
165 - LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)"
166 - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
167 - emake clean
168 - popd > /dev/null
169 -}
170 -
171 -src_install() {
172 - cmake_src_install
173 -
174 - dodoc README.md
175 - use doc && dodoc *pdf *html
176 -
177 - if use examples; then
178 - docinto examples
179 - dodoc -r examples/*
180 - docompress -x /usr/share/doc/${PF}/examples
181 - fi
182 -}