diff options
Diffstat (limited to 'sci-libs/armadillo')
| -rw-r--r-- | sci-libs/armadillo/Manifest | 6 | ||||
| -rw-r--r-- | sci-libs/armadillo/armadillo-7.950.0.ebuild | 144 | ||||
| -rw-r--r-- | sci-libs/armadillo/armadillo-8.300.2.ebuild (renamed from sci-libs/armadillo/armadillo-7.800.2-r1.ebuild) | 21 |
3 files changed, 12 insertions, 159 deletions
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index 1d5ecb360c65..7909ae08559b 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1,11 +1,9 @@ DIST armadillo-6.200.3.tar.gz 5442342 BLAKE2B b67b942dcf5da9b878465b2458ce78a61acc1fbc8a05a345a3df70c467e7ac4c3c8a6bac745897fd3b8786dfbce71dabca0d11f9d101df46e9a1d59f7242e84d SHA512 598ba8be19971fc0e44703b17be922568e697c592ed85d0148c31f8476ecd7b5a0e6185918763bc063ba68244330b17594333c1453e9c1cfd39b9fefe85be222 -DIST armadillo-7.800.2.tar.xz 4001664 BLAKE2B 52284f1fa76c3e079cc5d765595b373c20ca4eea3b5f77146709b4fdc0f4322388655ca55dd245513e46b9c8386da0af867db18daf730288e5e9a72ff56ef219 SHA512 bd6a718d9aff5d87ae3bb792405e634e58249e74c8b49e31e6c3a1d77f7537b3e2f04f9fb10fc34279673126a1069cd43e991fb03fdf82ce77a00541ab6bd2fc -DIST armadillo-7.950.0.tar.xz 4022536 BLAKE2B 1518a59f4d898d3065ca6daf20b87f599d827a9a4e05989852798f1d9128910e7735cd020cdf1c3ba1f4e11ca418078a236bc1effb6fda2f07ab008a55e7de23 SHA512 e92d5f75000a978381aa279485f35371388ae0812d1116fb79cc902a68037ef96a48aa5954598959e9c88ab74d569d7b6984537f8514e4cc507e07ec8fe3d26b DIST armadillo-7.950.1.tar.xz 4022716 BLAKE2B 9f6961c9745caa4c7347082f77934a90487daf1c03fc342133ef06e13dbfad38cc9e2f8713015b93fc277ae2ccd61302d7ba55f2a82ccd997b67eae481f6442c SHA512 e061a09ba45359c6a1d422cbb1586b2c1d3d5edaec8a0a885030c4aa3295eb5b90b45df6e4d5bec6ca57d290020a33afc8ed9a940a08b3ec0f0736a278b0484d DIST armadillo-8.200.0.tar.xz 4456824 BLAKE2B a9124c8e15807a00b8495e90934d71a3b270e8bf5c9319fe3a28c2e65ed4d8f23e7ca61992a661e8e7f65244203da65d85514ebd91b9adf7edb055551d9177d0 SHA512 d7b49e79a40a50de99c3b227eada7d628bd325aaab5bc4b016c0bd957475fc042518edf88e2f749fa8851d54d3e2269c705175afde3942fa3818f8a7f931d0b9 +DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c EBUILD armadillo-6.200.3.ebuild 2992 BLAKE2B 29a1dd94fee4f8e82447a65921cfa8ad3d3c632fa86adfb6c29b98ece345f60042768e793d0df5ba3af4f0d24ddc1f7b19f0eae7b3b957acc304174cb9300b59 SHA512 39ac3f773cee2493e4511f51fa9a37bad89b2507aad03298bccacec1d4f76992dc3805b3a79fe81d0bd7fcc02db2c879e9237cb88c8925f6562712ce895da918 -EBUILD armadillo-7.800.2-r1.ebuild 3241 BLAKE2B c60c308c02a416fd56e99f50a4ed5c30d8f36ebe7ae1f8c616d151a11337a4dae229124cbd85294c84309c84fae5628497a7c1f61e80b7a2cb95c0dce05fd3bf SHA512 3d1f6175aea58ae4d6187ec93cde013762a8c6d193be33b530142831bd1cf1e44433776a7985abca052903c19ac8afe8216de04c6dfddc1d8544412bd3b5a37d -EBUILD armadillo-7.950.0.ebuild 3241 BLAKE2B c60c308c02a416fd56e99f50a4ed5c30d8f36ebe7ae1f8c616d151a11337a4dae229124cbd85294c84309c84fae5628497a7c1f61e80b7a2cb95c0dce05fd3bf SHA512 3d1f6175aea58ae4d6187ec93cde013762a8c6d193be33b530142831bd1cf1e44433776a7985abca052903c19ac8afe8216de04c6dfddc1d8544412bd3b5a37d EBUILD armadillo-7.950.1.ebuild 3377 BLAKE2B 7cb31f807a6e4c9114eda569b74795bf94f806b2640485be49069793f4b100b611166724d1ef6d8f78aa1afacbed73834f6d2e82e8ed268123d9222e7b52773d SHA512 e585c4981c3c8338594f6cbb3feffdd869afd4c9bd41446f2c33f22443fca24ea747514e27c5e5e4fb9b02f3cacf3ccc0cfeffd89843a8dceabc6a837715fdc6 EBUILD armadillo-8.200.0.ebuild 3379 BLAKE2B 5975e874dc9569ff03f71601c9af9d14cc0ac6407bccebc6e3379ca5e152735fdfd18947756e1898cb72e29b76b9b91be692f82d6942377d5492805555685002 SHA512 74d5355a77a1edf9ad891fcc978e043b12415490822fc2e3914f87196ac42773e82f6e10687134be5995a394c7c521fcce603b3de17465b8a6a5ee493df57738 +EBUILD armadillo-8.300.2.ebuild 3379 BLAKE2B 5975e874dc9569ff03f71601c9af9d14cc0ac6407bccebc6e3379ca5e152735fdfd18947756e1898cb72e29b76b9b91be692f82d6942377d5492805555685002 SHA512 74d5355a77a1edf9ad891fcc978e043b12415490822fc2e3914f87196ac42773e82f6e10687134be5995a394c7c521fcce603b3de17465b8a6a5ee493df57738 MISC metadata.xml 1537 BLAKE2B 5116cb259f8e27fb11430cc2b3ab3a351afcefa0734e7997c962596aab226cfdd052ba3186ea068d8d31d501520d063037185909bcf02de72f57b4c8dfd86e31 SHA512 206e3f8912bd753837b0e8301c1db0f94e3480d0f50ba83c1b9a4be44498507ccade8f0b317c3bf2baa8aa782a93c88806ddbe710eed9d8fecb135494c26bc71 diff --git a/sci-libs/armadillo/armadillo-7.950.0.ebuild b/sci-libs/armadillo/armadillo-7.950.0.ebuild deleted file mode 100644 index d582395e08ec..000000000000 --- a/sci-libs/armadillo/armadillo-7.950.0.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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.xz" - -LICENSE="Apache-2.0" -SLOT="0/7" -KEYWORDS="~amd64 ~arm ~ppc64 ~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-5 ) -" - -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)" - -DARMA_EXTRA_DEBUG="$(usex debug)" - -DARMA_USE_MKL_ALLOC="$(usex mkl)" - -DARMA_USE_TBB_ALLOC="$(usex tbb)" - ) - if use arpack; then - mycmakeargs+=( - -DARPACK_FOUND=ON - -DARPACK_LIBRARY="$($(tc-getPKG_CONFIG) --libs arpack)" - ) - else - mycmakeargs+=( - -DARPACK_FOUND=OFF - ) - 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)" - ) - else - mycmakeargs+=( - -DBLAS_FOUND=OFF - ) - fi - if use hdf5; then - mycmakeargs+=( - -DHDF5_FOUND=ON - -DHDF5_LIBRARIES="-lhdf5" - ) - else - mycmakeargs+=( - -DHDF5_FOUND=OFF - ) - fi - if use lapack; then - mycmakeargs+=( - -DLAPACK_FOUND=ON - -DLAPACK_LIBRARIES="$($(tc-getPKG_CONFIG) --libs lapack)" - ) - else - mycmakeargs+=( - -DLAPACK_FOUND=OFF - ) - fi - if use superlu; then - mycmakeargs+=( - -DSuperLU_FOUND=ON - -DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)" - ) - else - mycmakeargs+=( - -DSuperLU_FOUND=OFF - ) - 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 - - if use doc ; then - dodoc *pdf - dodoc *html - fi - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins -r examples/* - fi -} diff --git a/sci-libs/armadillo/armadillo-7.800.2-r1.ebuild b/sci-libs/armadillo/armadillo-8.300.2.ebuild index d582395e08ec..dccb43520ea1 100644 --- a/sci-libs/armadillo/armadillo-7.800.2-r1.ebuild +++ b/sci-libs/armadillo/armadillo-8.300.2.ebuild @@ -12,17 +12,19 @@ HOMEPAGE="http://arma.sourceforge.net/" SRC_URI="mirror://sourceforge/arma/${P}.tar.xz" LICENSE="Apache-2.0" -SLOT="0/7" +SLOT="0/8" KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux" IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test" REQUIRED_USE="test? ( lapack )" +# atlas? ( sci-libs/atlas[lapack] ) + RDEPEND=" dev-libs/boost arpack? ( sci-libs/arpack ) blas? ( virtual/blas ) lapack? ( virtual/lapack ) - superlu? ( >=sci-libs/superlu-5 ) + superlu? ( >=sci-libs/superlu-5.2 ) " DEPEND="${RDEPEND} @@ -106,7 +108,8 @@ src_configure() { if use superlu; then mycmakeargs+=( -DSuperLU_FOUND=ON - -DSuperLU_LIBRARIES="$($(tc-getPKG_CONFIG) --libs superlu)" + -DSuperLU_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)" + -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')" ) else mycmakeargs+=( @@ -120,10 +123,10 @@ src_configure() { src_test() { pushd examples > /dev/null emake \ + CXX="$(tc-getCXX)" \ CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ - EXTRA_LIB_FLAGS="-L.. $($(tc-getPKG_CONFIG) --libs blas lapack)" + LIB_FLAGS="-L.. -larmadillo $($(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 } @@ -131,14 +134,10 @@ src_test() { src_install() { cmake-utils_src_install dodoc README.txt - - if use doc ; then - dodoc *pdf - dodoc *html - fi - + use doc && dodoc *pdf *html if use examples; then insinto /usr/share/doc/${PF}/examples doins -r examples/* + docompress -x /usr/share/doc/${PF}/examples fi } |