commit: b8cc54780393c27f8cb11cdba5d3b78b934d93be Author: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> AuthorDate: Fri Nov 13 08:34:49 2015 +0000 Commit: Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de> CommitDate: Fri Nov 13 08:34:49 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=b8cc5478
sci-libs/armadillo: Version bump; remove old Package-Manager: portage-2.2.20.1 sci-libs/armadillo/ChangeLog | 7 ++ sci-libs/armadillo/armadillo-5.500.2.ebuild | 121 --------------------- ...llo-5.400.2.ebuild => armadillo-6.200.3.ebuild} | 2 +- 3 files changed, 8 insertions(+), 122 deletions(-) diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog index daba68a..78f1e70 100644 --- a/sci-libs/armadillo/ChangeLog +++ b/sci-libs/armadillo/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Id$ +*armadillo-6.200.3 (13 Nov 2015) + + 13 Nov 2015; Marius Brehler <[email protected]> + +armadillo-6.200.3.ebuild, -armadillo-5.400.2.ebuild, + -armadillo-5.500.2.ebuild: + sci-libs/armadillo: Version bump; remove old + *armadillo-5.600.2 (21 Sep 2015) 21 Sep 2015; Marius Brehler <[email protected]> diff --git a/sci-libs/armadillo/armadillo-5.500.2.ebuild b/sci-libs/armadillo/armadillo-5.500.2.ebuild deleted file mode 100644 index 6682a81..0000000 --- a/sci-libs/armadillo/armadillo-5.500.2.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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/5" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu 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 ) - superlu? ( sci-libs/superlu ) -" -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 - if use superlu; then - mycmakeargs+=( - -DSuperLU_FOUND=ON - -DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)" - ) - 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 -} diff --git a/sci-libs/armadillo/armadillo-5.400.2.ebuild b/sci-libs/armadillo/armadillo-6.200.3.ebuild similarity index 99% rename from sci-libs/armadillo/armadillo-5.400.2.ebuild rename to sci-libs/armadillo/armadillo-6.200.3.ebuild index 6682a81..aba1f7b 100644 --- a/sci-libs/armadillo/armadillo-5.400.2.ebuild +++ b/sci-libs/armadillo/armadillo-6.200.3.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://arma.sourceforge.net/"; SRC_URI="mirror://sourceforge/arma/${P}.tar.gz" LICENSE="MPL-2.0" -SLOT="0/5" +SLOT="0/6" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="arpack atlas blas debug doc examples hdf5 lapack mkl superlu tbb test" REQUIRED_USE="test? ( lapack )"
