From 1084b1d5b0308a875483d2a3bb90334c5051d7cf Mon Sep 17 00:00:00 2001 From: Sébastien Fabbro Date: Fri, 6 Dec 2013 21:19:17 -0800 Subject: sci-libs/armadillo: Version bump Package-Manager: portage-2.2.7-prefix RepoMan-Options: --force --- sci-libs/armadillo/ChangeLog | 6 ++ sci-libs/armadillo/Manifest | 2 +- sci-libs/armadillo/armadillo-3.910.0.ebuild | 91 ----------------------------- sci-libs/armadillo/armadillo-3.930.0.ebuild | 91 +++++++++++++++++++++++++++++ 4 files changed, 98 insertions(+), 92 deletions(-) delete mode 100644 sci-libs/armadillo/armadillo-3.910.0.ebuild create mode 100644 sci-libs/armadillo/armadillo-3.930.0.ebuild (limited to 'sci-libs/armadillo') diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog index a55f90d4d..f8b3e97ff 100644 --- a/sci-libs/armadillo/ChangeLog +++ b/sci-libs/armadillo/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*armadillo-3.930.0 (07 Dec 2013) + + 07 Dec 2013; Sébastien Fabbro +armadillo-3.930.0.ebuild, + -armadillo-3.910.0.ebuild: + sci-libs/armadillo: Version bump + *armadillo-3.910.0 (19 Aug 2013) 19 Aug 2013; Sébastien Fabbro +armadillo-3.910.0.ebuild, diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index 6a3f8934d..ae7f9e779 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1 +1 @@ -DIST armadillo-3.910.0.tar.gz 3231589 SHA256 34e6b4e649a8da787c1136fdfd35ffd618ae0536af6855d2acfd4042429d5ceb SHA512 4952dfedc851744e267239ee211dea2be504b8344db8d4fd552b33821b0419cac2a989d51ab5e05b60bd2849cd86db57247837b7e01514cfb56d6d7c1a0b3cf5 WHIRLPOOL 6d6b6d023c1765f263f2ee04cc37e90bad4990fc1c9d0d528c364c547a7fc7b01d6d4796cf135afd4a3ffe6beecfec3d9f720977c00ca74a65d9ee4072618126 +DIST armadillo-3.930.0.tar.gz 3250101 SHA256 3d0bdb313fa2f553536a5d978f8d56e0284f6ec423cfd4ad1200336d848ba95e SHA512 44bae7ea03a28b7f2613fb9525b8167b5446842e1d6573f857340db30667bbf847d90837bcca20b04fa990cfb818ab33b2372088880bc4d6c676019719bd66a7 WHIRLPOOL c96b555a24311f7f76d422ff5c749420f6c8c6d80524720e279a72597e9b0841b80d93fd410f6246d03d7752617e85f0ffbd521c7b5c6edca978935098767b19 diff --git a/sci-libs/armadillo/armadillo-3.910.0.ebuild b/sci-libs/armadillo/armadillo-3.910.0.ebuild deleted file mode 100644 index f7213753c..000000000 --- a/sci-libs/armadillo/armadillo-3.910.0.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2013 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" -KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="atlas blas debug doc examples hdf5 int64 lapack tbb" - -RDEPEND=" - dev-libs/boost - atlas? ( sci-libs/atlas[lapack] ) - blas? ( virtual/blas ) - lapack? ( virtual/lapack )" -DEPEND="${DEPEND} - atlas? ( virtual/pkgconfig ) - blas? ( virtual/pkgconfig ) - lapack? ( virtual/pkgconfig )" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5 ) - tbb? ( dev-cpp/tbb )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-3.820.1-{hdf5,example-makefile}.patch - # avoid the automagic cmake macros - sed -i -e '/ARMA_Find/d' CMakeLists.txt || die -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - $(cmake-utils_use debug ARMA_EXTRA_DEBUG) - $(cmake-utils_use hdf5 ARMA_USE_HDF5) - $(cmake-utils_use int64 ARMA_64BIT_WORD) - $(cmake-utils_use tbb ARMA_TBB_ALLOC) - ) - if use blas; then - mycmakeargs+=( - -DBLAS_FOUND=ON - -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" - ) - fi - if use lapack; then - mycmakeargs+=( - -DLAPACK_FOUND=ON - -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - 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 - -DCLAPACK_FOUND=ON - -DATLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags ${c} | sed 's/-I//')" - -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" - -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" - ) - fi - cmake-utils_src_configure -} - -src_test() { - pushd examples > /dev/null - emake CXXFLAGS="-I../include ${CXXFLAGS}" EXTRA_LIB_FLAGS="-L.." - 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/doc/${PF} - doins -r examples - fi -} diff --git a/sci-libs/armadillo/armadillo-3.930.0.ebuild b/sci-libs/armadillo/armadillo-3.930.0.ebuild new file mode 100644 index 000000000..c6cd9b3d3 --- /dev/null +++ b/sci-libs/armadillo/armadillo-3.930.0.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2013 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/3" +KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" +IUSE="atlas blas debug doc examples hdf5 int64 lapack tbb" + +RDEPEND=" + dev-libs/boost + atlas? ( sci-libs/atlas[lapack] ) + blas? ( virtual/blas ) + lapack? ( virtual/lapack )" +DEPEND="${DEPEND} + atlas? ( virtual/pkgconfig ) + blas? ( virtual/pkgconfig ) + lapack? ( virtual/pkgconfig )" +PDEPEND="${RDEPEND} + hdf5? ( sci-libs/hdf5 ) + tbb? ( dev-cpp/tbb )" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-3.820.1-{hdf5,example-makefile}.patch + # avoid the automagic cmake macros + sed -i -e '/ARMA_Find/d' CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" + $(cmake-utils_use debug ARMA_EXTRA_DEBUG) + $(cmake-utils_use hdf5 ARMA_USE_HDF5) + $(cmake-utils_use int64 ARMA_64BIT_WORD) + $(cmake-utils_use tbb ARMA_TBB_ALLOC) + ) + if use blas; then + mycmakeargs+=( + -DBLAS_FOUND=ON + -DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)" + ) + fi + if use lapack; then + mycmakeargs+=( + -DLAPACK_FOUND=ON + -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" + ) + 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 + -DCLAPACK_FOUND=ON + -DATLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags ${c} | sed 's/-I//')" + -DCBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${c})" + -DCLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs ${l})" + ) + fi + cmake-utils_src_configure +} + +src_test() { + pushd examples > /dev/null + emake CXXFLAGS="-I../include ${CXXFLAGS}" EXTRA_LIB_FLAGS="-L.." + 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/doc/${PF} + doins -r examples + fi +} -- cgit v1.2.3-65-gdbad