summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Fabbro <bicatali@gentoo.org>2012-04-13 01:07:46 +0000
committerSebastien Fabbro <bicatali@gentoo.org>2012-04-13 01:07:46 +0000
commit2f161255470810230fcd56152819d7a154116523 (patch)
tree44da26f13b69fcbe8f8e8837f608a39da2699b5b /sci-libs/armadillo
parentInitial import (bug 141462). (diff)
downloadgentoo-2-2f161255470810230fcd56152819d7a154116523.tar.gz
gentoo-2-2f161255470810230fcd56152819d7a154116523.tar.bz2
gentoo-2-2f161255470810230fcd56152819d7a154116523.zip
Version bump
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'sci-libs/armadillo')
-rw-r--r--sci-libs/armadillo/ChangeLog8
-rw-r--r--sci-libs/armadillo/armadillo-2.2.5.ebuild63
-rw-r--r--sci-libs/armadillo/armadillo-3.0.1.ebuild (renamed from sci-libs/armadillo/armadillo-2.4.3.ebuild)2
3 files changed, 8 insertions, 65 deletions
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index e2acafd96d40..b7103d4d5a70 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,6 +1,12 @@
# 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.9 2012/03/06 17:10:24 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.10 2012/04/13 01:07:46 bicatali Exp $
+
+*armadillo-3.0.1 (13 Apr 2012)
+
+ 13 Apr 2012; Sébastien Fabbro <bicatali@gentoo.org> -armadillo-2.2.5.ebuild,
+ -armadillo-2.4.3.ebuild, +armadillo-3.0.1.ebuild:
+ Version bump
*armadillo-2.4.4 (06 Mar 2012)
diff --git a/sci-libs/armadillo/armadillo-2.2.5.ebuild b/sci-libs/armadillo/armadillo-2.2.5.ebuild
deleted file mode 100644
index f7b5603dad53..000000000000
--- a/sci-libs/armadillo/armadillo-2.2.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-2.2.5.ebuild,v 1.1 2011/11/27 06:09:39 bicatali Exp $
-
-EAPI=4
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake-utils
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="http://arma.sourceforge.net/"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="atlas blas doc lapack"
-
-RDEPEND="
- >=dev-libs/boost-1.34
- atlas? ( sci-libs/lapack-atlas )
- blas? ( virtual/blas )
- lapack? ( virtual/lapack )"
-
-DEPEND="${DEPEND}
- dev-util/pkgconfig"
-
-src_prepare() {
- # avoid the automagic cmake macros
- sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=()
- if use blas; then
- mycmakeargs+=(
- -DBLAS_FOUND=ON
- -DBLAS_LIBRARIES="$(pkg-config --libs blas)"
- )
- fi
- if use lapack; then
- mycmakeargs+=(
- -DLAPACK_FOUND=ON
- -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
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dodoc docs/*pdf
-}
diff --git a/sci-libs/armadillo/armadillo-2.4.3.ebuild b/sci-libs/armadillo/armadillo-3.0.1.ebuild
index 01726623f330..16fe676eb2af 100644
--- a/sci-libs/armadillo/armadillo-2.4.3.ebuild
+++ b/sci-libs/armadillo/armadillo-3.0.1.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-2.4.3.ebuild,v 1.1 2012/02/15 17:04:32 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-3.0.1.ebuild,v 1.1 2012/04/13 01:07:46 bicatali Exp $
EAPI=4