aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Brehler <marbre@linux.sungazer.de>2015-01-11 12:38:08 +0100
committerMarius Brehler <marbre@linux.sungazer.de>2015-01-11 12:38:08 +0100
commite4c30c6ad4e407eae2da64e589ed7c951f0dafbc (patch)
tree3c3c178c9abb0c0a82cd356fb9c2db2ae251542c /sci-libs
parentMerge pull request #322 from marbre/libfac (diff)
downloadsci-e4c30c6ad4e407eae2da64e589ed7c951f0dafbc.tar.gz
sci-e4c30c6ad4e407eae2da64e589ed7c951f0dafbc.tar.bz2
sci-e4c30c6ad4e407eae2da64e589ed7c951f0dafbc.zip
sci-libs/armadillo-4.600.2: Version bump, fix examples install location
Diffstat (limited to 'sci-libs')
-rw-r--r--sci-libs/armadillo/ChangeLog8
-rw-r--r--sci-libs/armadillo/Manifest1
-rw-r--r--sci-libs/armadillo/armadillo-4.600.2.ebuild112
3 files changed, 120 insertions, 1 deletions
diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog
index ce386e2b2..92146ca41 100644
--- a/sci-libs/armadillo/ChangeLog
+++ b/sci-libs/armadillo/ChangeLog
@@ -1,7 +1,13 @@
# ChangeLog for sci-libs/armadillo
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*armadillo-4.600.2 (11 Jan 2015)
+
+ 11 Jan 2015; Marius Brehler <marbre@linux.sungazer.de>
+ +armadillo-4.600.2.ebuild:
+ Version bump, fix examples install location
+
*armadillo-4.300.9 (28 Jun 2014)
28 Jun 2014; Jauhien Piatlicki <jauhien@gentoo.org>
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index f380fb985..355b29400 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,3 +1,4 @@
DIST armadillo-4.200.0.tar.gz 5479492 SHA256 77d4c64346da9fb90d1150c290919e49530cef45713e830375e04566218335ff SHA512 83afccbf0ed4b8a7873b5fc5d47975600a71d7130e59716d9f044a2cd58343e4d0f5c0037abd1e6d110413d0192c5f0f87a2f3af8183189bd82032414237244d WHIRLPOOL c785cc5b89a542c276ec3cddd56ee40a766960353d7174356c0e891dd8744d08bff350405c3b629a7a4b66a4a8b7564697faa7e9600e57065a3f1cd5e1180bd9
DIST armadillo-4.300.8.tar.gz 5484286 SHA256 1d1a77ad7a74e8b4a74d7b71c5e3fe488e26283907b316618de0a8558c60173a SHA512 3b5d6c9bcefb427e1dc15c259bd24154b6d2138a75be49275e2be5a456f4e2357852c7520b171109ee2b6a716c8ef2a19dea8c2a9b908b13fc2a1624500d54f3 WHIRLPOOL 90789113a10ca0e0264af3212f2c59f6f0b68cf726c22935433bc5d396c763143e6bd1b9d961ee6e5fd78adad3ee58bf1b532931761d9fbe51e99179beebf789
DIST armadillo-4.300.9.tar.gz 5484297 SHA256 1cc96e7eb1cd3872c193f3954561e6d8539d2a4120235213c42c6db44b650d27 SHA512 5129c9ac8e76b6d367691380315d3f4e80e643349a9013238c0672b4d93aabc395d20b9fd95678dcc9172baa793eba5b54011bbf35f69913a7381ca2f62638d0 WHIRLPOOL a3c6c24cbbf85a585bb20c0773800f24065cf57976759543653bddbee0e09559cfad7de30829bc1b5db5583fe1d8c17112b5a463924deaaad5bebf41ec525f7f
+DIST armadillo-4.600.2.tar.gz 5347346 SHA256 d5f85cac54db16d3cf25af54460eb5fde190c81ddbb8690a6c453012934891bf SHA512 b077ad19b7a3e996e9edeceaf980bea53ecaccb012dd2438a70bfc863bd8113e8308325ca91ce033c152bc757a0ac847d81ba99d87b5e4af28ae44dc71ed595b WHIRLPOOL 1d41ab103a7b89e2c11fc4b5b0a9649a690d704dcdd073bcc2de4ddb996a560e6e397309987c848443f294e83af2ae3e269c323ff68c1c8d512ad698861fa35a
diff --git a/sci-libs/armadillo/armadillo-4.600.2.ebuild b/sci-libs/armadillo/armadillo-4.600.2.ebuild
new file mode 100644
index 000000000..35856d707
--- /dev/null
+++ b/sci-libs/armadillo/armadillo-4.600.2.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake-utils toolchain-funcs multilib eutils
+
+DESCRIPTION="Streamlined C++ linear algebra library"
+HOMEPAGE="http://arma.sourceforge.net/"
+SRC_URI="mirror://sourceforge/arma/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0/4"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl tbb test"
+REQUIRED_USE="test? ( lapack )"
+
+RDEPEND="
+ dev-libs/boost
+ arpack? ( sci-libs/arpack )
+ atlas? ( sci-libs/atlas[lapack] )
+ blas? ( virtual/blas )
+ lapack? ( virtual/lapack )"
+DEPEND="${RDEPEND}
+ arpack? ( virtual/pkgconfig )
+ atlas? ( virtual/pkgconfig )
+ blas? ( virtual/pkgconfig )
+ hdf5? ( sci-libs/hdf5 )
+ lapack? ( virtual/pkgconfig )
+ mkl? ( sci-libs/mkl )
+ tbb? ( dev-cpp/tbb )"
+PDEPEND="${RDEPEND}
+ hdf5? ( sci-libs/hdf5 )
+ mkl? ( sci-libs/mkl )
+ tbb? ( dev-cpp/tbb )"
+
+src_prepare() {
+ # avoid the automagic cmake macros
+ sed -i -e '/ARMA_Find/d' CMakeLists.txt || die
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)"
+ $(cmake-utils_use debug ARMA_EXTRA_DEBUG)
+ $(cmake-utils_use mkl ARMA_USE_MKL_ALLOC)
+ $(cmake-utils_use tbb ARMA_USE_TBB_ALLOC)
+ )
+ if use arpack; then
+ mycmakeargs+=(
+ -DARPACK_FOUND=ON
+ -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)"
+ )
+ fi
+ if use atlas; then
+ local c=atlas-cblas l=atlas-clapack
+ $(tc-getPKG_CONFIG) --exists ${c}-threads && c+=-threads
+ $(tc-getPKG_CONFIG) --exists ${l}-threads && l+=-threads
+ mycmakeargs+=(
+ -DCBLAS_FOUND=ON
+ -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')"
+ -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})"
+ -DCLAPACK_FOUND=ON
+ -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | sed 's/-I//')"
+ -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})"
+ )
+ fi
+ if use blas; then
+ mycmakeargs+=(
+ -DBLAS_FOUND=ON
+ -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+ )
+ fi
+ if use hdf5; then
+ mycmakeargs+=(
+ -DHDF5_FOUND=ON
+ -DHDF5_LIBRARIES="-lhdf5"
+ )
+ fi
+ if use lapack; then
+ mycmakeargs+=(
+ -DLAPACK_FOUND=ON
+ -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)"
+ )
+ fi
+ cmake-utils_src_configure
+}
+
+src_test() {
+ pushd examples > /dev/null
+ emake \
+ CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \
+ EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)"
+ LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die
+ LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example2 || die
+ emake clean
+ popd > /dev/null
+}
+
+src_install() {
+ cmake-utils_src_install
+ dodoc README.txt
+ use doc && dodoc *pdf && dohtml *html
+ if use examples; then
+ insinto /usr/share/examples/${PF}
+ doins -r examples/*
+ fi
+}