1 |
commit: b5a14b3c1a93bb6dfa0e2fb2ec9179a50bd1dfe8 |
2 |
Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> |
3 |
AuthorDate: Sat Jul 25 09:30:14 2015 +0000 |
4 |
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 25 09:30:55 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b5a14b3c |
7 |
|
8 |
sci-libs/armadillo: Drop old |
9 |
|
10 |
Package-Manager: portage-2.2.20 |
11 |
|
12 |
sci-libs/armadillo/ChangeLog | 4 + |
13 |
sci-libs/armadillo/armadillo-5.200.1.ebuild | 112 ---------------------------- |
14 |
sci-libs/armadillo/armadillo-5.200.2.ebuild | 112 ---------------------------- |
15 |
3 files changed, 4 insertions(+), 224 deletions(-) |
16 |
|
17 |
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog |
18 |
index f38652d..c192624 100644 |
19 |
--- a/sci-libs/armadillo/ChangeLog |
20 |
+++ b/sci-libs/armadillo/ChangeLog |
21 |
@@ -2,6 +2,10 @@ |
22 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
23 |
# $Header: $ |
24 |
|
25 |
+ 25 Jul 2015; Marius Brehler <marbre@××××××××××××××.de> |
26 |
+ -armadillo-5.200.1.ebuild, -armadillo-5.200.2.ebuild: |
27 |
+ sci-libs/armadillo: Drop old |
28 |
+ |
29 |
*armadillo-5.200.2-r1 (25 Jul 2015) |
30 |
|
31 |
25 Jul 2015; Marius Brehler <marbre@××××××××××××××.de> |
32 |
|
33 |
diff --git a/sci-libs/armadillo/armadillo-5.200.1.ebuild b/sci-libs/armadillo/armadillo-5.200.1.ebuild |
34 |
deleted file mode 100644 |
35 |
index 913504f..0000000 |
36 |
--- a/sci-libs/armadillo/armadillo-5.200.1.ebuild |
37 |
+++ /dev/null |
38 |
@@ -1,112 +0,0 @@ |
39 |
-# Copyright 1999-2015 Gentoo Foundation |
40 |
-# Distributed under the terms of the GNU General Public License v2 |
41 |
-# $Header: $ |
42 |
- |
43 |
-EAPI=5 |
44 |
- |
45 |
-CMAKE_IN_SOURCE_BUILD=1 |
46 |
- |
47 |
-inherit cmake-utils toolchain-funcs multilib eutils |
48 |
- |
49 |
-DESCRIPTION="Streamlined C++ linear algebra library" |
50 |
-HOMEPAGE="http://arma.sourceforge.net/" |
51 |
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" |
52 |
- |
53 |
-LICENSE="MPL-2.0" |
54 |
-SLOT="0/5" |
55 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
56 |
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test" |
57 |
-REQUIRED_USE="test? ( lapack )" |
58 |
- |
59 |
-RDEPEND=" |
60 |
- dev-libs/boost |
61 |
- arpack? ( sci-libs/arpack ) |
62 |
- atlas? ( sci-libs/atlas[lapack] ) |
63 |
- blas? ( virtual/blas ) |
64 |
- lapack? ( virtual/lapack )" |
65 |
-DEPEND="${RDEPEND} |
66 |
- arpack? ( virtual/pkgconfig ) |
67 |
- atlas? ( virtual/pkgconfig ) |
68 |
- blas? ( virtual/pkgconfig ) |
69 |
- hdf5? ( sci-libs/hdf5 ) |
70 |
- lapack? ( virtual/pkgconfig ) |
71 |
- mkl? ( sci-libs/mkl ) |
72 |
- tbb? ( dev-cpp/tbb )" |
73 |
-PDEPEND="${RDEPEND} |
74 |
- hdf5? ( sci-libs/hdf5 ) |
75 |
- mkl? ( sci-libs/mkl ) |
76 |
- tbb? ( dev-cpp/tbb )" |
77 |
- |
78 |
-src_prepare() { |
79 |
- # avoid the automagic cmake macros |
80 |
- sed -i -e '/ARMA_Find/d' CMakeLists.txt || die |
81 |
- cmake-utils_src_prepare |
82 |
-} |
83 |
- |
84 |
-src_configure() { |
85 |
- local mycmakeargs=( |
86 |
- -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" |
87 |
- $(cmake-utils_use debug ARMA_EXTRA_DEBUG) |
88 |
- $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC) |
89 |
- $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC) |
90 |
- ) |
91 |
- if use arpack; then |
92 |
- mycmakeargs+=( |
93 |
- -DARPACK_FOUND=ON |
94 |
- -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" |
95 |
- ) |
96 |
- fi |
97 |
- if use atlas; then |
98 |
- local c=atlas-cblas l=atlas-clapack |
99 |
- $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads |
100 |
- $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads |
101 |
- mycmakeargs+=( |
102 |
- -DCBLAS_FOUND=ON |
103 |
- -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" |
104 |
- -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" |
105 |
- -DCLAPACK_FOUND=ON |
106 |
- -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" |
107 |
- -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" |
108 |
- ) |
109 |
- fi |
110 |
- if use blas; then |
111 |
- mycmakeargs+=( |
112 |
- -DBLAS_FOUND=ON |
113 |
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
114 |
- ) |
115 |
- fi |
116 |
- if use hdf5; then |
117 |
- mycmakeargs+=( |
118 |
- -DHDF5_FOUND=ON |
119 |
- -DHDF5_LIBRARIES="-lhdf5" |
120 |
- ) |
121 |
- fi |
122 |
- if use lapack; then |
123 |
- mycmakeargs+=( |
124 |
- -DLAPACK_FOUND=ON |
125 |
- -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" |
126 |
- ) |
127 |
- fi |
128 |
- cmake-utils_src_configure |
129 |
-} |
130 |
- |
131 |
-src_test() { |
132 |
- pushd examples > /dev/null |
133 |
- emake \ |
134 |
- CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ |
135 |
- EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)" |
136 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die |
137 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die |
138 |
- emake clean |
139 |
- popd > /dev/null |
140 |
-} |
141 |
- |
142 |
-src_install() { |
143 |
- cmake-utils_src_install |
144 |
- dodoc README.txt |
145 |
- use doc && dodoc *pdf && dohtml *html |
146 |
- if use examples; then |
147 |
- insinto /usr/share/examples/${PF} |
148 |
- doins -r examples/* |
149 |
- fi |
150 |
-} |
151 |
|
152 |
diff --git a/sci-libs/armadillo/armadillo-5.200.2.ebuild b/sci-libs/armadillo/armadillo-5.200.2.ebuild |
153 |
deleted file mode 100644 |
154 |
index ceebe9c..0000000 |
155 |
--- a/sci-libs/armadillo/armadillo-5.200.2.ebuild |
156 |
+++ /dev/null |
157 |
@@ -1,112 +0,0 @@ |
158 |
-# Copyright 1999-2015 Gentoo Foundation |
159 |
-# Distributed under the terms of the GNU General Public License v2 |
160 |
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.650.4.ebuild,v 1.1 2015/04/03 12:32:07 jlec Exp $ |
161 |
- |
162 |
-EAPI=5 |
163 |
- |
164 |
-CMAKE_IN_SOURCE_BUILD=1 |
165 |
- |
166 |
-inherit cmake-utils toolchain-funcs multilib eutils |
167 |
- |
168 |
-DESCRIPTION="Streamlined C++ linear algebra library" |
169 |
-HOMEPAGE="http://arma.sourceforge.net/" |
170 |
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" |
171 |
- |
172 |
-LICENSE="MPL-2.0" |
173 |
-SLOT="0/5" |
174 |
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
175 |
-IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test" |
176 |
-REQUIRED_USE="test? ( lapack )" |
177 |
- |
178 |
-RDEPEND=" |
179 |
- dev-libs/boost |
180 |
- arpack? ( sci-libs/arpack ) |
181 |
- atlas? ( sci-libs/atlas[lapack] ) |
182 |
- blas? ( virtual/blas ) |
183 |
- lapack? ( virtual/lapack )" |
184 |
-DEPEND="${RDEPEND} |
185 |
- arpack? ( virtual/pkgconfig ) |
186 |
- atlas? ( virtual/pkgconfig ) |
187 |
- blas? ( virtual/pkgconfig ) |
188 |
- hdf5? ( sci-libs/hdf5 ) |
189 |
- lapack? ( virtual/pkgconfig ) |
190 |
- mkl? ( sci-libs/mkl ) |
191 |
- tbb? ( dev-cpp/tbb )" |
192 |
-PDEPEND="${RDEPEND} |
193 |
- hdf5? ( sci-libs/hdf5 ) |
194 |
- mkl? ( sci-libs/mkl ) |
195 |
- tbb? ( dev-cpp/tbb )" |
196 |
- |
197 |
-src_prepare() { |
198 |
- # avoid the automagic cmake macros |
199 |
- sed -i -e '/ARMA_Find/d' CMakeLists.txt || die |
200 |
- cmake-utils_src_prepare |
201 |
-} |
202 |
- |
203 |
-src_configure() { |
204 |
- local mycmakeargs=( |
205 |
- -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" |
206 |
- $(cmake-utils_use debug ARMA_EXTRA_DEBUG) |
207 |
- $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC) |
208 |
- $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC) |
209 |
- ) |
210 |
- if use arpack; then |
211 |
- mycmakeargs+=( |
212 |
- -DARPACK_FOUND=ON |
213 |
- -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" |
214 |
- ) |
215 |
- fi |
216 |
- if use atlas; then |
217 |
- local c=atlas-cblas l=atlas-clapack |
218 |
- $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads |
219 |
- $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads |
220 |
- mycmakeargs+=( |
221 |
- -DCBLAS_FOUND=ON |
222 |
- -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" |
223 |
- -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" |
224 |
- -DCLAPACK_FOUND=ON |
225 |
- -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')" |
226 |
- -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" |
227 |
- ) |
228 |
- fi |
229 |
- if use blas; then |
230 |
- mycmakeargs+=( |
231 |
- -DBLAS_FOUND=ON |
232 |
- -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" |
233 |
- ) |
234 |
- fi |
235 |
- if use hdf5; then |
236 |
- mycmakeargs+=( |
237 |
- -DHDF5_FOUND=ON |
238 |
- -DHDF5_LIBRARIES="-lhdf5" |
239 |
- ) |
240 |
- fi |
241 |
- if use lapack; then |
242 |
- mycmakeargs+=( |
243 |
- -DLAPACK_FOUND=ON |
244 |
- -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" |
245 |
- ) |
246 |
- fi |
247 |
- cmake-utils_src_configure |
248 |
-} |
249 |
- |
250 |
-src_test() { |
251 |
- pushd examples > /dev/null |
252 |
- emake \ |
253 |
- CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ |
254 |
- EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)" |
255 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die |
256 |
- LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die |
257 |
- emake clean |
258 |
- popd > /dev/null |
259 |
-} |
260 |
- |
261 |
-src_install() { |
262 |
- cmake-utils_src_install |
263 |
- dodoc README.txt |
264 |
- use doc && dodoc *pdf && dohtml *html |
265 |
- if use examples; then |
266 |
- insinto /usr/share/examples/${PF} |
267 |
- doins -r examples/* |
268 |
- fi |
269 |
-} |