commit: bfd5670ae9c0b6dbba6693924670b8f89c40120b Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Sun Dec 22 13:42:54 2019 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Dec 22 13:43:58 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfd5670a
sci-libs/armadillo: Remove old Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sci-libs/armadillo/Manifest | 2 - sci-libs/armadillo/armadillo-9.200.5.ebuild | 144 --------------------------- sci-libs/armadillo/armadillo-9.200.6.ebuild | 146 ---------------------------- 3 files changed, 292 deletions(-) diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index b43f3bef8a8..8489f1247a5 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1,4 +1,2 @@ DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c -DIST armadillo-9.200.5.tar.xz 4786264 BLAKE2B 3ac5e7e50c82927ba311860915d65426e5b71e6235a041b949166e02aa50dd50a6c32d34d44761052829471ce66df9a4a9a495e1da18deff2abfbd8d67b72d0f SHA512 31110ac0d9ef9e6cf6fcf97a846ad4bb7545aa2d16fc847d85d481d605942af62994562ba8b083d76b051002d6693c966ee4b4ad398711fe1d68d31bf12daea2 -DIST armadillo-9.200.6.tar.xz 4786904 BLAKE2B 4cd6245476b674ea325037fed4b9d613be399036328b72616631b26fec7b0d3d30a788689312d0c8f4bc8ce2041454ce5ff129523f1e3ef25de16c0668d7c958 SHA512 9375a5d8414ec6d34dfa07faa472ca8c56a0ed62761d6bdcb2c584f255fc212fadf00e5380e7b10e67836b93d17e609fe6714a7b233b6f0e5d9355ff504a15fd DIST armadillo-9.800.3.tar.xz 4716468 BLAKE2B 4909cbcf1f8d6aedb366bb9b21784e865d9e68a3c833263d1c1df942e96ef679e31191ea9dbd8bcddab6086bd26c80915546c29dfdd16188f0d9e865e7b3c03f SHA512 6088f7254c54067421fcc0b69751c6d37ffe484474ab5955755fa5b3dd38ed4246e353701fb614c820d192675ec75f134e3bbb511a70612e4fbf133a89cacc21 diff --git a/sci-libs/armadillo/armadillo-9.200.5.ebuild b/sci-libs/armadillo/armadillo-9.200.5.ebuild deleted file mode 100644 index 06e6051e920..00000000000 --- a/sci-libs/armadillo/armadillo-9.200.5.ebuild +++ /dev/null @@ -1,144 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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/9" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="arpack blas debug doc examples hdf5 lapack mkl superlu tbb test" -RESTRICT="!test? ( 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.2 ) -" - -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_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)" - -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')" - ) - else - mycmakeargs+=( - -DSuperLU_FOUND=OFF - ) - fi - - cmake-utils_src_configure -} - -src_test() { - pushd examples > /dev/null - emake \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ - LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)" - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die - emake clean - popd > /dev/null -} - -src_install() { - cmake-utils_src_install - dodoc README.md - 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 -} diff --git a/sci-libs/armadillo/armadillo-9.200.6.ebuild b/sci-libs/armadillo/armadillo-9.200.6.ebuild deleted file mode 100644 index eb5ccd3061d..00000000000 --- a/sci-libs/armadillo/armadillo-9.200.6.ebuild +++ /dev/null @@ -1,146 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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/9" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="arpack blas doc examples hdf5 lapack mkl superlu test" -RESTRICT="!test? ( 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.2 ) -" - -DEPEND="${RDEPEND} - arpack? ( virtual/pkgconfig ) - blas? ( virtual/pkgconfig ) - hdf5? ( sci-libs/hdf5 ) - lapack? ( virtual/pkgconfig ) - mkl? ( sci-libs/mkl ) -" -PDEPEND="${RDEPEND} - hdf5? ( sci-libs/hdf5 ) - mkl? ( sci-libs/mkl ) -" - -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)" - ) - if ! use mkl; then - mycmakeargs+=( - -DMKL_FOUND=OFF - ) - fi - 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_LIBRARY="$($(tc-getPKG_CONFIG) --libs superlu)" - -DSuperLU_INCLUDE_DIR="$($(tc-getPKG_CONFIG) --cflags-only-I superlu | awk '{print $1}' | sed 's/-I//')" - ) - else - mycmakeargs+=( - -DSuperLU_FOUND=OFF - ) - fi - - cmake-utils_src_configure -} - -src_test() { - pushd examples > /dev/null - emake \ - CXX="$(tc-getCXX)" \ - CXXFLAGS="-I../include ${CXXFLAGS} -DARMA_USE_BLAS -DARMA_USE_LAPACK" \ - LIB_FLAGS="-L.. -larmadillo $($(tc-getPKG_CONFIG) --libs blas lapack)" - LD_LIBRARY_PATH="..:${LD_LIBRARY_PATH}" ./example1 || die - emake clean - popd > /dev/null -} - -src_install() { - cmake-utils_src_install - dodoc README.md - 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 -}
