dilfridge 15/02/27 13:13:27 Modified: metadata.xml ChangeLog Added: armadillo-4.600.4.ebuild Removed: armadillo-3.6.1.ebuild armadillo-3.6.0.ebuild Log: Version bump from science overlay (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 94BFDF4484AD142F)
Revision Changes Path 1.6 sci-libs/armadillo/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?r1=1.5&r2=1.6 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/metadata.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- metadata.xml 10 Apr 2013 06:04:30 -0000 1.5 +++ metadata.xml 27 Feb 2015 13:13:27 -0000 1.6 @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <herd>sci</herd> - <longdescription lang="en"> +<herd>sci</herd> +<maintainer><email>[email protected]</email></maintainer> +<longdescription lang="en"> Armadillo is a C++ linear algebra library (matrix maths) aiming towards a good balance between speed and ease of use. Integer, floating point and complex numbers are supported, as well as a @@ -14,4 +15,20 @@ need for temporaries. This is accomplished through recursive templates and template meta-programming. </longdescription> +<use> + <flag name="atlas"> + Link with <pkg>sci-libs/atlas</pkg> libraries for cblas and + clapack + </flag> + <flag name="arpack"> + Link with <pkg>sci-libs/arpack</pkg> libraries for eigen decomposition + </flag> + <flag name='mkl'> + Use matrix allocation from the Intel MKL <pkg>sci-libs/mkl</pkg> + </flag> + <flag name='tbb'> + Use matrix allocation from the Threads Building Blocks + <pkg>dev-cpp/tbb</pkg> + </flag> +</use> </pkgmetadata> 1.30 sci-libs/armadillo/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.30&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.30&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?r1=1.29&r2=1.30 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- ChangeLog 5 Jan 2015 16:30:03 -0000 1.29 +++ ChangeLog 27 Feb 2015 13:13:27 -0000 1.30 @@ -1,6 +1,13 @@ # ChangeLog for sci-libs/armadillo # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.29 2015/01/05 16:30:03 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.30 2015/02/27 13:13:27 dilfridge Exp $ + +*armadillo-4.600.4 (27 Feb 2015) + + 27 Feb 2015; Andreas K. Huettel <[email protected]> + +armadillo-4.600.4.ebuild, -armadillo-3.6.0.ebuild, -armadillo-3.6.1.ebuild, + metadata.xml: + Version bump from science overlay 05 Jan 2015; Alexis Ballier <[email protected]> armadillo-3.6.2.ebuild: keyword ~arm 1.1 sci-libs/armadillo/armadillo-4.600.4.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild?rev=1.1&content-type=text/plain Index: armadillo-4.600.4.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/armadillo-4.600.4.ebuild,v 1.1 2015/02/27 13:13:27 dilfridge Exp $ 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 }
