dilfridge 15/05/21 15:46:31 Modified: metadata.xml ChangeLog Added: armadillo-5.100.2.ebuild Log: Version bump (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 94BFDF4484AD142F)
Revision Changes Path 1.9 sci-libs/armadillo/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/metadata.xml?r1=1.8&r2=1.9 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/metadata.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- metadata.xml 4 May 2015 13:57:42 -0000 1.8 +++ metadata.xml 21 May 2015 15:46:31 -0000 1.9 @@ -28,5 +28,9 @@ Use matrix allocation from the Threads Building Blocks <pkg>dev-cpp/tbb</pkg> </flag> + <flag name="superlu"> + Use SuperLU for sparse linear equation solving + <pkg>sci-libs/superlu</pkg> + </flag> </use> </pkgmetadata> 1.34 sci-libs/armadillo/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.34&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?rev=1.34&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/ChangeLog?r1=1.33&r2=1.34 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- ChangeLog 4 May 2015 13:57:42 -0000 1.33 +++ ChangeLog 21 May 2015 15:46:31 -0000 1.34 @@ -1,6 +1,12 @@ # 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.33 2015/05/04 13:57:42 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/armadillo/ChangeLog,v 1.34 2015/05/21 15:46:31 dilfridge Exp $ + +*armadillo-5.100.2 (21 May 2015) + + 21 May 2015; Andreas K. Hüttel <[email protected]> + +armadillo-5.100.2.ebuild, metadata.xml: + Version bump 04 May 2015; Justin Lecher <[email protected]> armadillo-4.600.4.ebuild, armadillo-4.650.2.ebuild, armadillo-4.650.4.ebuild, metadata.xml: 1.1 sci-libs/armadillo/armadillo-5.100.2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-5.100.2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-libs/armadillo/armadillo-5.100.2.ebuild?rev=1.1&content-type=text/plain Index: armadillo-5.100.2.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-5.100.2.ebuild,v 1.1 2015/05/21 15:46:31 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/5" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test" REQUIRED_USE="test? ( lapack )" RDEPEND=" dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) superlu? ( sci-libs/superlu ) " DEPEND="${RDEPEND} arpack? ( 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 }
