From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C87C6138A1A for ; Tue, 27 Jan 2015 16:01:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F706E0835; Tue, 27 Jan 2015 16:01:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B56C7E07FA for ; Tue, 27 Jan 2015 16:01:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADFC93406DD for ; Tue, 27 Jan 2015 16:01:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 64A7B107E1 for ; Tue, 27 Jan 2015 16:00:59 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1422356905.fceb3700383ef72d5e6bf991c0d40ffa02b08d93.ottxor@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/armadillo/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/armadillo/ChangeLog sci-libs/armadillo/armadillo-4.600.4.ebuild X-VCS-Directories: sci-libs/armadillo/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: fceb3700383ef72d5e6bf991c0d40ffa02b08d93 X-VCS-Branch: master Date: Tue, 27 Jan 2015 16:00:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7c631799-6a16-489c-bb1b-04c9e6beffb3 X-Archives-Hash: 7163c8ae8f7a9f96930c17a4f5c3b14b commit: fceb3700383ef72d5e6bf991c0d40ffa02b08d93 Author: Marius Brehler linux sungazer de> AuthorDate: Tue Jan 27 11:08:25 2015 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Tue Jan 27 11:08:25 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fceb3700 sci-libs/armadillo-4.600.4: Version bump --- sci-libs/armadillo/ChangeLog | 6 ++ sci-libs/armadillo/armadillo-4.600.4.ebuild | 112 ++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog index 92146ca..51b024f 100644 --- a/sci-libs/armadillo/ChangeLog +++ b/sci-libs/armadillo/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*armadillo-4.600.4 (27 Jan 2015) + + 27 Jan 2015; Marius Brehler + +armadillo-4.600.4.ebuild: + Version bump + *armadillo-4.600.2 (11 Jan 2015) 11 Jan 2015; Marius Brehler diff --git a/sci-libs/armadillo/armadillo-4.600.4.ebuild b/sci-libs/armadillo/armadillo-4.600.4.ebuild new file mode 100644 index 0000000..35856d7 --- /dev/null +++ b/sci-libs/armadillo/armadillo-4.600.4.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 +}