diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2012-12-16 10:55:08 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2012-12-16 10:55:08 +0000 |
| commit | 03ab89b48046d8ce6b00c0156a572ea92d6d9d4c (patch) | |
| tree | 00ba5517742eba8fc4ed1f251be53b9816be8e7b /sci-libs | |
| parent | Update license; change "as-is" to "HPND" as recommended at http://article.gma... (diff) | |
| download | gentoo-2-03ab89b48046d8ce6b00c0156a572ea92d6d9d4c.tar.gz gentoo-2-03ab89b48046d8ce6b00c0156a572ea92d6d9d4c.tar.bz2 gentoo-2-03ab89b48046d8ce6b00c0156a572ea92d6d9d4c.zip | |
sci-libs/armadillo: Drop atlas support completely
(Portage version: 2.2.0_alpha147/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'sci-libs')
| -rw-r--r-- | sci-libs/armadillo/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-libs/armadillo/armadillo-3.0.2.ebuild | 14 | ||||
| -rw-r--r-- | sci-libs/armadillo/metadata.xml | 10 |
3 files changed, 12 insertions, 18 deletions
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog index a0e230319e8c..eee9ddd0bc01 100644 --- a/sci-libs/armadillo/ChangeLog +++ b/sci-libs/armadillo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sci-libs/armadillo # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.21 2012/12/16 10:43:20 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.22 2012/12/16 10:55:08 jlec Exp $ + + 16 Dec 2012; Justin Lecher <jlec@gentoo.org> armadillo-3.0.2.ebuild, + metadata.xml: + Drop atlas support completely 16 Dec 2012; Markos Chandras <hwoarang@gentoo.org> armadillo-3.4.4.ebuild: stable on amd64 wrt bug #447130. Forced commit to workaround QA warnings due diff --git a/sci-libs/armadillo/armadillo-3.0.2.ebuild b/sci-libs/armadillo/armadillo-3.0.2.ebuild index d553af09c836..0e33904d78d1 100644 --- a/sci-libs/armadillo/armadillo-3.0.2.ebuild +++ b/sci-libs/armadillo/armadillo-3.0.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.0.2.ebuild,v 1.4 2012/05/25 18:50:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.0.2.ebuild,v 1.5 2012/12/16 10:55:08 jlec Exp $ EAPI=4 @@ -15,10 +15,9 @@ SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0" KEYWORDS="amd64 ~ppc ~ppc64 x86" -IUSE="atlas blas doc lapack" +IUSE="blas doc lapack" RDEPEND=">=dev-libs/boost-1.34 - atlas? ( sci-libs/lapack-atlas ) blas? ( virtual/blas ) lapack? ( virtual/lapack )" @@ -44,15 +43,6 @@ src_configure() { -DLAPACK_LIBRARIES="$(pkg-config --libs lapack)" ) fi - if use atlas; then - mycmakeargs=( - -DCBLAS_FOUND=ON - -DCLAPACK_FOUND=ON - -DATLAS_INCLUDE_DIR="${EPREFIX}/usr/include/atlas/" - -DCBLAS_LIBRARIES="$(pkg-config --libs cblas)" - -DCLAPACK_LIBRARIES="-L${EPREFIX}/usr/lib64/lapack/atlas -llapack" - ) - fi cmake-utils_src_configure } diff --git a/sci-libs/armadillo/metadata.xml b/sci-libs/armadillo/metadata.xml index 4a8f6b75bedb..c598db146c17 100644 --- a/sci-libs/armadillo/metadata.xml +++ b/sci-libs/armadillo/metadata.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci</herd> -<longdescription lang="en"> + <herd>sci</herd> + <longdescription lang="en"> Armadillo is a C++ linear algebra library (matrix maths) aiming towards a good balance between speed and ease of use. Integer, floating point and complex numbers are supported, as well as a @@ -14,7 +14,7 @@ need for temporaries. This is accomplished through recursive templates and template meta-programming. </longdescription> -<use> - <flag name="atlas">Link with ATLAS libraries for cblas and clapack (needs <pkg>sci-libs/lapack-atlas</pkg>)</flag> -</use> + <use> + <flag name="atlas">Link with ATLAS libraries for cblas and clapack (needs <pkg>sci-libs/lapack-atlas</pkg>)</flag> + </use> </pkgmetadata> |