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

Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-libs/armadillo: metadata.xml armadillo-4.600.4.ebuild ChangeLog armadillo-3.6.1.ebuild armadillo-3.6.0.ebuild
Date: Fri, 27 Feb 2015 13:13:30
Message-Id: 20150227131327.14A4312AA4@oystercatcher.gentoo.org
1 dilfridge 15/02/27 13:13:27
2
3 Modified: metadata.xml ChangeLog
4 Added: armadillo-4.600.4.ebuild
5 Removed: armadillo-3.6.1.ebuild armadillo-3.6.0.ebuild
6 Log:
7 Version bump from science overlay
8
9 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 94BFDF4484AD142F)
10
11 Revision Changes Path
12 1.6 sci-libs/armadillo/metadata.xml
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?rev=1.6&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?rev=1.6&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?r1=1.5&r2=1.6
17
18 Index: metadata.xml
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/metadata.xml,v
21 retrieving revision 1.5
22 retrieving revision 1.6
23 diff -u -r1.5 -r1.6
24 --- metadata.xml 10 Apr 2013 06:04:30 -0000 1.5
25 +++ metadata.xml 27 Feb 2015 13:13:27 -0000 1.6
26 @@ -1,8 +1,9 @@
27 <?xml version="1.0" encoding="UTF-8"?>
28 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
29 <pkgmetadata>
30 - <herd>sci</herd>
31 - <longdescription lang="en">
32 +<herd>sci</herd>
33 +<maintainer><email>dilfridge@g.o</email></maintainer>
34 +<longdescription lang="en">
35 Armadillo is a C++ linear algebra library (matrix maths) aiming
36 towards a good balance between speed and ease of use. Integer,
37 floating point and complex numbers are supported, as well as a
38 @@ -14,4 +15,20 @@
39 need for temporaries. This is accomplished through recursive
40 templates and template meta-programming.
41 </longdescription>
42 +<use>
43 + <flag name="atlas">
44 + Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and
45 + clapack
46 + </flag>
47 + <flag name="arpack">
48 + Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition
49 + </flag>
50 + <flag name='mkl'>
51 + Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg>
52 + </flag>
53 + <flag name='tbb'>
54 + Use matrix allocation from the Threads Building Blocks
55 + <pkg>dev-cpp/tbb</pkg>
56 + </flag>
57 +</use>
58 </pkgmetadata>
59
60
61
62 1.30 sci-libs/armadillo/ChangeLog
63
64 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.30&view=markup
65 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.30&content-type=text/plain
66 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?r1=1.29&r2=1.30
67
68 Index: ChangeLog
69 ===================================================================
70 RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v
71 retrieving revision 1.29
72 retrieving revision 1.30
73 diff -u -r1.29 -r1.30
74 --- ChangeLog 5 Jan 2015 16:30:03 -0000 1.29
75 +++ ChangeLog 27 Feb 2015 13:13:27 -0000 1.30
76 @@ -1,6 +1,13 @@
77 # ChangeLog for sci-libs/armadillo
78 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
79 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.29 2015/01/05 16:30:03 aballier Exp $
80 +# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.30 2015/02/27 13:13:27 dilfridge Exp $
81 +
82 +*armadillo-4.600.4 (27 Feb 2015)
83 +
84 + 27 Feb 2015; Andreas K. Huettel <dilfridge@g.o>
85 + +armadillo-4.600.4.ebuild, -armadillo-3.6.0.ebuild, -armadillo-3.6.1.ebuild,
86 + metadata.xml:
87 + Version bump from science overlay
88
89 05 Jan 2015; Alexis Ballier <aballier@g.o> armadillo-3.6.2.ebuild:
90 keyword ~arm
91
92
93
94 1.1 sci-libs/armadillo/armadillo-4.600.4.ebuild
95
96 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild?rev=1.1&view=markup
97 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild?rev=1.1&content-type=text/plain
98
99 Index: armadillo-4.600.4.ebuild
100 ===================================================================
101 # Copyright 1999-2015 Gentoo Foundation
102 # Distributed under the terms of the GNU General Public License v2
103 # $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild,v 1.1 2015/02/27 13:13:27 dilfridge Exp $
104
105 EAPI=5
106
107 CMAKE_IN_SOURCE_BUILD=1
108
109 inherit cmake-utils toolchain-funcs multilib eutils
110
111 DESCRIPTION="Streamlined C++ linear algebra library"
112 HOMEPAGE="http://arma.sourceforge.net/"
113 SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
114
115 LICENSE="MPL-2.0"
116 SLOT="0/4"
117 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
118 IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
119 REQUIRED_USE="test? ( lapack )"
120
121 RDEPEND="
122 dev-libs/boost
123 arpack? ( sci-libs/arpack )
124 atlas? ( sci-libs/atlas[lapack] )
125 blas? ( virtual/blas )
126 lapack? ( virtual/lapack )"
127 DEPEND="${RDEPEND}
128 arpack? ( virtual/pkgconfig )
129 atlas? ( virtual/pkgconfig )
130 blas? ( virtual/pkgconfig )
131 hdf5? ( sci-libs/hdf5 )
132 lapack? ( virtual/pkgconfig )
133 mkl? ( sci-libs/mkl )
134 tbb? ( dev-cpp/tbb )"
135 PDEPEND="${RDEPEND}
136 hdf5? ( sci-libs/hdf5 )
137 mkl? ( sci-libs/mkl )
138 tbb? ( dev-cpp/tbb )"
139
140 src_prepare() {
141 # avoid the automagic cmake macros
142 sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
143 cmake-utils_src_prepare
144 }
145
146 src_configure() {
147 local mycmakeargs=(
148 -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
149 $(cmake-utils_use debug ARMA_EXTRA_DEBUG)
150 $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
151 $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
152 )
153 if use arpack; then
154 mycmakeargs+=(
155 -DARPACK_FOUND=ON
156 -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
157 )
158 fi
159 if use atlas; then
160 local c=atlas-cblas l=atlas-clapack
161 $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
162 $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
163 mycmakeargs+=(
164 -DCBLAS_FOUND=ON
165 -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
166 -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
167 -DCLAPACK_FOUND=ON
168 -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
169 -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
170 )
171 fi
172 if use blas; then
173 mycmakeargs+=(
174 -DBLAS_FOUND=ON
175 -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
176 )
177 fi
178 if use hdf5; then
179 mycmakeargs+=(
180 -DHDF5_FOUND=ON
181 -DHDF5_LIBRARIES="-lhdf5"
182 )
183 fi
184 if use lapack; then
185 mycmakeargs+=(
186 -DLAPACK_FOUND=ON
187 -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
188 )
189 fi
190 cmake-utils_src_configure
191 }
192
193 src_test() {
194 pushd examples > /dev/null
195 emake \
196 CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
197 EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
198 LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
199 LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
200 emake clean
201 popd > /dev/null
202 }
203
204 src_install() {
205 cmake-utils_src_install
206 dodoc README.txt
207 use doc && dodoc *pdf && dohtml *html
208 if use examples; then
209 insinto /usr/share/examples/${PF}
210 doins -r examples/*
211 fi
212 }
Report Message
Find on MARC Find on Google Groups