From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1541673-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id B7D9A15800A
for <garchives@archives.gentoo.org>; Thu, 27 Jul 2023 19:42:52 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E10EEE09C0;
Thu, 27 Jul 2023 19:42:51 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C2F32E09AE
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Jul 2023 19:42:51 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 006C134132C
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Jul 2023 19:42:50 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C50EE69
for <gentoo-commits@lists.gentoo.org>; Thu, 27 Jul 2023 19:42:49 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1690486959.aac501cd33b3b34004e0438811e589e3c50c7456.asturm@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-10.8.2.ebuild sci-libs/armadillo/armadillo-12.0.1.ebuild
X-VCS-Directories: sci-libs/armadillo/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: aac501cd33b3b34004e0438811e589e3c50c7456
X-VCS-Branch: master
Date: Thu, 27 Jul 2023 19:42:49 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b81e149d-c57d-4a00-99e8-524a35f0d6dd
X-Archives-Hash: 2aed9f9db4233bc164f86d5a6e54bbdd
commit: aac501cd33b3b34004e0438811e589e3c50c7456
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 18:25:42 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 27 19:42:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac501cd
sci-libs/armadillo: drop 10.8.2, 12.0.1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sci-libs/armadillo/Manifest | 2 -
sci-libs/armadillo/armadillo-10.8.2.ebuild | 150 ---------------------------
sci-libs/armadillo/armadillo-12.0.1.ebuild | 156 -----------------------------
3 files changed, 308 deletions(-)
diff --git a/sci-libs/armadillo/Manifest b/sci-libs/armadillo/Manifest
index 0aeae6ccd7a6..c022195aa4e6 100644
--- a/sci-libs/armadillo/Manifest
+++ b/sci-libs/armadillo/Manifest
@@ -1,5 +1,3 @@
DIST armadillo-10.2.0.tar.xz 6042348 BLAKE2B e85f24ca7137c3a8c8fc53db15b382f2e4d468673c99e036ef9b4a4436be47d24a37664dfa88ff9effa08a4c868bd212d03c204dda09cd26038a0f8ccbf61375 SHA512 c5d6f4bac0acba63fbd7681653d521249fd303ffbbc5b18df71500eb111514c1d09db600a580091d6a23c83748c109c30938bbcd80a3a0b2c25e2fdea932f2cd
-DIST armadillo-10.8.2.tar.xz 6262832 BLAKE2B f8a5a66464614661bcccffb8138434d117ad07dcea5f89ddde45df293df5dd4f10def2085b85d37386337fd8bd0152914a957e0b1b7919a47ec8b1a79e92b90b SHA512 720fadad491dfeeb894544b0305cd64a0e0402e66fc788949ecd54c0b1a3b9c3ede9f75b081f832931d59d2bd59529cebb9d5b57b8582df869765cac01c2979b
DIST armadillo-11.4.0.tar.xz 6804388 BLAKE2B cb44d248cf817f66cc0b6aa968535e266282775b20035f46f3158687100c0f49c6cf4fad8d1f2ec1741f9bceb06c5a841f20f3b7e59146f2fe57c86d00741434 SHA512 21d58b383229f55bf6a3b217c04901982b484b6d806dd3c4a72ebe5a9614f63f9429ca31ea7cfc26672b70e01a0b9263a9d4edf69a0080706ade87852f94970c
-DIST armadillo-12.0.1.tar.xz 6802568 BLAKE2B c6025fe3bcabfa6d08efd864c4b9b129c84e8941b7cb237b76ed83f74062c06cdbb98bdf09796f3340fbdbb37a36f82826a53e778dbc589af9e868a2348bd7f3 SHA512 b1b9fbce6bdacc3340ab190605aba77e821629e0a51e0c6277840eaf803d037a778b9243c02c5b55d67976c203808a5fc34894f3928b707685f6d8695ef0bc0d
DIST armadillo-12.4.0.tar.xz 6803968 BLAKE2B ca45b2284b5a31c745b2ad924235af24f855039cc81c3300c83e5e932ee4cda233731b53623303c1c739feae9b007f8f6309c09debe79923e3876e8145015152 SHA512 a9f8cd19384eed787787b9e189901a1800e6e1dd06917f4f13e8a215c83f317de3e5b0ae8625783f88d9a7b0ab25f5c7784ccf0493c08a9ee3ea7fdfbbe36195
diff --git a/sci-libs/armadillo/armadillo-10.8.2.ebuild b/sci-libs/armadillo/armadillo-10.8.2.ebuild
deleted file mode 100644
index 5f6bd3b57605..000000000000
--- a/sci-libs/armadillo/armadillo-10.8.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake toolchain-funcs multilib
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="https://arma.sourceforge.net"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/10"
-KEYWORDS="amd64 ~arm ~ppc64 ~riscv ~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_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+=(
- -DDETECT_HDF5=ON
- -DHDF5_LIBRARIES="-lhdf5"
- -DHDF5_INCLUDE_DIRS=/usr/include
- )
- else
- mycmakeargs+=(
- -DDETECT_HDF5=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_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_src_install
-
- dodoc README.md
- use doc && dodoc *pdf *html
-
- if use examples; then
- docinto examples
- dodoc -r examples/*
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/sci-libs/armadillo/armadillo-12.0.1.ebuild b/sci-libs/armadillo/armadillo-12.0.1.ebuild
deleted file mode 100644
index a1399cb8445a..000000000000
--- a/sci-libs/armadillo/armadillo-12.0.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit cmake toolchain-funcs multilib
-
-DESCRIPTION="Streamlined C++ linear algebra library"
-HOMEPAGE="https://arma.sourceforge.net"
-SRC_URI="mirror://sourceforge/arma/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0/12"
-KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
-IUSE="arpack blas doc examples hdf5 lapack mkl superlu test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( arpack lapack superlu )"
-
-# 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 )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-extratests.patch"
-)
-
-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_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+=(
- -DDETECT_HDF5=ON
- -DHDF5_LIBRARIES="-lhdf5"
- -DHDF5_INCLUDE_DIRS=/usr/include
- )
- else
- mycmakeargs+=(
- -DDETECT_HDF5=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_src_configure
-}
-
-src_test() {
- cmake_src_test || die
-
- pushd tests2 > /dev/null
- emake \
- CXX="$(tc-getCXX)" \
- CXX_FLAGS="-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}" ./main || die
- emake clean
- popd > /dev/null
-}
-
-src_install() {
- cmake_src_install
-
- dodoc README.md
- use doc && dodoc *pdf *html
-
- if use examples; then
- docinto examples
- dodoc -r examples/*
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}