From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 78C491382C5 for ; Sun, 17 Jan 2021 11:52:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8E21E08BD; Sun, 17 Jan 2021 11:52:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADE68E08BD for ; Sun, 17 Jan 2021 11:52:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B8D5340F87 for ; Sun, 17 Jan 2021 11:52:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3A9524B3 for ; Sun, 17 Jan 2021 11:52:07 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1610884294.e3fb44a6f01bbae9a3c60b85065993a722c9aeac.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/armadillo/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-libs/armadillo/Manifest sci-libs/armadillo/armadillo-9.800.3.ebuild X-VCS-Directories: sci-libs/armadillo/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: e3fb44a6f01bbae9a3c60b85065993a722c9aeac X-VCS-Branch: master Date: Sun, 17 Jan 2021 11:52:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 47c49ca9-c44f-447d-9dad-0a35705402d7 X-Archives-Hash: 27f64f2bbbcb50255221e3cb4e03fbba commit: e3fb44a6f01bbae9a3c60b85065993a722c9aeac Author: Jakov Smolic sartura hr> AuthorDate: Sun Jan 17 11:51:34 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Jan 17 11:51:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3fb44a6 sci-libs/armadillo: Remove old Signed-off-by: Jakov Smolic sartura.hr> Signed-off-by: David Seifert gentoo.org> sci-libs/armadillo/Manifest | 1 - sci-libs/armadillo/armadillo-9.800.3.ebuild | 147 ---------------------------- 2 files changed, 148 deletions(-) diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest index 05da76241a0..b81f29c2eae 100644 --- a/sci-libs/armadillo/Manifest +++ b/sci-libs/armadillo/Manifest @@ -1,3 +1,2 @@ DIST armadillo-8.300.2.tar.xz 4593916 BLAKE2B 0cb9082d9452b43599dea810036a1cdcd8ef4ab6ce5b2bc7b9d9201f1f396666a2aecb81ffa62388e1ee3de9a8c7df083df594224af47e5df7ee4d3c2743d6cc SHA512 df069634db377e95e02dfca02312b082b34cab91bae0b1fd04a97339477074fc50c74f8adf92786ac6f0fc148044d527461617f382cc996523251b6d1287e41c -DIST armadillo-9.800.3.tar.xz 4716468 BLAKE2B 4909cbcf1f8d6aedb366bb9b21784e865d9e68a3c833263d1c1df942e96ef679e31191ea9dbd8bcddab6086bd26c80915546c29dfdd16188f0d9e865e7b3c03f SHA512 6088f7254c54067421fcc0b69751c6d37ffe484474ab5955755fa5b3dd38ed4246e353701fb614c820d192675ec75f134e3bbb511a70612e4fbf133a89cacc21 DIST armadillo-9.850.1.tar.xz 4715832 BLAKE2B 41256d8f54ec1f2d4f7cfdf58bd67e66cc2ffbe0f1daf259a4d76e0816d89708fa5528d57b244000393404108c8d0d613d03321f14e5653163d0c1cc6ec7e273 SHA512 b2b9f0290f8f39a687db71a02b127086d5ff22cee77fba5211da2ea8a8d8a5edc256b31b7fce8e98aa1955a84c63e488adcd22f8cd070015a6fcd4b4f1cb37c7 diff --git a/sci-libs/armadillo/armadillo-9.800.3.ebuild b/sci-libs/armadillo/armadillo-9.800.3.ebuild deleted file mode 100644 index ac58225faa5..00000000000 --- a/sci-libs/armadillo/armadillo-9.800.3.ebuild +++ /dev/null @@ -1,147 +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 's/^ *include(ARMA_Find/# No automagic include(ARMA_Find/g' CMakeLists.txt || die - - # ... except for mkl, since without a license it's hard to figure out what to do there - if use mkl; then - sed -i -e 's/^# No automagic include(ARMA_FindMKL)/include(ARMA_FindMKL)/g' CMakeLists.txt || die - fi - - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_LIB_DIR="${EPREFIX}/usr/$(get_libdir)" - ) - 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 - docinto /usr/share/doc/${PF}/examples - dodoc -r examples/* - docompress -x /usr/share/doc/${PF}/examples - fi -}