commit: 0cf66cd0e42739374d9e55e28a3f2cfd1abc6553 Author: Sébastien Fabbro <bicatali <AT> gentoo <DOT> org> AuthorDate: Mon Jun 2 17:02:26 2014 +0000 Commit: Sebastien Fabbro <bicatali <AT> gentoo <DOT> org> CommitDate: Mon Jun 2 17:02:26 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=0cf66cd0
Version bump Package-Manager: portage-HEAD --- sci-libs/armadillo/ChangeLog | 7 ++ sci-libs/armadillo/armadillo-3.930.0.ebuild | 92 ----------------- sci-libs/armadillo/armadillo-4.100.2.ebuild | 114 --------------------- ...llo-4.300.0.ebuild => armadillo-4.300.8.ebuild} | 0 .../armadillo/files/armadillo-3.820.1-hdf5.patch | 19 ---- 5 files changed, 7 insertions(+), 225 deletions(-) diff --git a/sci-libs/armadillo/ChangeLog b/sci-libs/armadillo/ChangeLog index a75b8d9..e7b3f37 100644 --- a/sci-libs/armadillo/ChangeLog +++ b/sci-libs/armadillo/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*armadillo-4.300.8 (02 Jun 2014) + + 02 Jun 2014; Sébastien Fabbro <[email protected]> +armadillo-4.300.8.ebuild, + -armadillo-3.930.0.ebuild, -armadillo-4.100.2.ebuild, + -armadillo-4.300.0.ebuild, -files/armadillo-3.820.1-hdf5.patch: + Version bump + *armadillo-4.300.0 (06 May 2014) 06 May 2014; Sébastien Fabbro <[email protected]> +armadillo-4.300.0.ebuild: diff --git a/sci-libs/armadillo/armadillo-3.930.0.ebuild b/sci-libs/armadillo/armadillo-3.930.0.ebuild deleted file mode 100644 index 59be372..0000000 --- a/sci-libs/armadillo/armadillo-3.930.0.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2014 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 - -DCBLAS_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${c} | sed 's/-I//')" - -DCLAPACK_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I ${l} | 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-4.100.2.ebuild b/sci-libs/armadillo/armadillo-4.100.2.ebuild deleted file mode 100644 index 6dab248..0000000 --- a/sci-libs/armadillo/armadillo-4.100.2.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2014 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() { - epatch \ - "${FILESDIR}"/${PN}-4.000.3-hdf5.patch \ - "${FILESDIR}"/${PN}-3.820.1-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 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/doc/${PF} - doins -r examples - fi -} diff --git a/sci-libs/armadillo/armadillo-4.300.0.ebuild b/sci-libs/armadillo/armadillo-4.300.8.ebuild similarity index 100% rename from sci-libs/armadillo/armadillo-4.300.0.ebuild rename to sci-libs/armadillo/armadillo-4.300.8.ebuild diff --git a/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch b/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch deleted file mode 100644 index f294e7b..0000000 --- a/sci-libs/armadillo/files/armadillo-3.820.1-hdf5.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- CMakeLists.txt.orig 2013-05-24 21:14:49.626395820 -0700 -+++ CMakeLists.txt 2013-05-24 21:15:10.724511364 -0700 -@@ -222,11 +222,11 @@ - # find_package(HDF5) - # message(STATUS "HDF5_FOUND = ${HDF5_FOUND}") - # --# if(HDF5_FOUND) --# set(ARMA_USE_HDF5 true) --# set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS}) --# set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES}) --# endif() -+if(HDF5_FOUND) -+ set(ARMA_USE_HDF5 true) -+ set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${HDF5_INCLUDE_DIRS}) -+ set(ARMA_LIBS ${ARMA_LIBS} ${HDF5_LIBRARIES}) -+endif() - # endif() - -
