gentoo resync : 13.11.2021

3 files changed, 2 insertions, 202 deletions

diff --git a/sci-libs/openblas/Manifest b/sci-libs/openblas/Manifest
index 206653550e05..34ada6e9fffb 100644
--- a/sci-libs/openblas/Manifest
+++ b/sci-libs/openblas/Manifest
@@ -2,8 +2,6 @@ AUX dont-clobber-fflags.patch 1251 BLAKE2B 7451d67e8676be33c2070b9eea767d24d961e
 AUX openblas-0.3.10-dont-clobber-fflags.patch 1209 BLAKE2B 8759226f8a2b9371a89434f14e5db6e10b079dec5b260b438811f476ceeded67bcf2a596c7f4892ec2b3388a3437c9cd276592bb01ebb84af69977002e0bbe88 SHA512 6b239e750a6c5baf6dfca58dc8036a1de34efd917839558d2b2ff1d6fab00067dfe953bfb0837d8f19e1f52cf5ab7f92f9e3f65f3963fd3ae9052c0a00d6065d
 AUX openblas-0.3.12-shared-blas-lapack.patch 2008 BLAKE2B 2d3a4a90d8144cbf149b7711b67364176a94287f26448930b5a4fd29fe761fb250e9007c580fb1ffa8148c477e2f4057f9cd8d7aa07efeb85caa842802d358fd SHA512 3f0d4b480549565c838eba6371e0990c162f56a226f9d26e1639e012ae3f39809f8c6badcf8fdfbb1258f45367dbaff9c4c611b8b44bac27d341aea954f0133e
 AUX shared-blas-lapack.patch 5557 BLAKE2B 1e41b18e5a9c12eec9283c835e9b09e4ca89c6512f47a2f158f29c8a8a822d0365ad350177e379bec13f7c7574d8debd55a2f612027ff661c67ac7b226bb2370 SHA512 baa23f0c2bc8b7bc3384d7b8fa20eb5e095f20e1d8859badb55e680ccd435a851da6099b20aa203e46d62096ac93663ea130bea04dabf19432522e53139d393b
-DIST openblas-0.3.17.tar.gz 12513037 BLAKE2B bb3a89500f242613a6bed73519702995cf1e82dcfec49f9469ecfd6647121260a4364582dbc257a75212320b5690ba93e75a0f2762dce7f398ef6443b169b4e4 SHA512 a97745c1f050ea44fce5f1722810de469612d374a29796a874d12673d6ad189872160cc2b5d0885790e6562d9d7ade629144c86f2649e668b0d4def36aa74495
 DIST openblas-0.3.18.tar.gz 12619822 BLAKE2B 38a5e7b861eb0063a4494c1cfb6f7f5723741437ecdd5cb1fb42645eb73bceb472b3a8c11eec3d0ba4f676981ac89de4ff1ee0d7ea42d1e234746f34ce8fb6b8 SHA512 df9a14026a61bdc5285636bfd7a52dce244d24fcf4a0c870ef4e58b8b50e412849828ca5aeac2a2435f635e78e60559762e8bae22ea7bc5dff2e865a96d81152
-EBUILD openblas-0.3.17.ebuild 5733 BLAKE2B b272b29e82e16ba4a47e16e78d97e4049dec58fddee0cad16d963012ef6344772f3661751ae796b6f28247172edd94d5db2b1eb3d84e195ec617f447d02b1b15 SHA512 3794725cf6daedb442892fe8971303d6d6fde25f0d55aec63f2ce7c8c5ffdb2cf48640a96d6f2ca839590bd1de1321e382ec47c4545cecef8573b9030d5ed692
-EBUILD openblas-0.3.18.ebuild 5680 BLAKE2B 1da504eb60a8e08526c85a4ceb15bbfad4f0518cefc9bd33471c7dabe4b913d789f1f5aa7507b50b92004fb21f99862234466089ba4d6ebb7dfbdc15b2e8ac93 SHA512 2372e6dc6be860fbc7c46d00a089083722d83dfa1af07626474b76ed775731bc46e558b6cd81ace9b9a5bf516f8007cd73261c0254e907299892a2bb54760f27
+EBUILD openblas-0.3.18.ebuild 5679 BLAKE2B 08e30894d5c3d7eb488f008388aeae506eb7ee421a9b591b9738d3ba38bb1440dd382d5c7c8e3c79c655cb7c6a2432f954dee0c0d65fc8f93bbb17e165dc920f SHA512 a23a6d112452702b570a8c30a888e70afffe2ae7e24da58ee915ceb4b2cc5d11914fdfc653ab7c225878af8ab6202cca5d03cb1cbd17792a82f5916a8d5fc91c
 MISC metadata.xml 1561 BLAKE2B 5ba7ec66dd8ba7ca8bc29bc0193b48b6a82b4949bb79bab461400040667aa66aac3cfd2ad9c7323798048fd43d18ac96a562d53b68f3f7ae8bf8505ac7a04691 SHA512 05272eb56480ff82b240d0f430df3df03981e24b971dbd37c13d464f4f4b334bac19b54915446a09326a334aa76249bb79a4fa389d26150365f21389992f9a48
diff --git a/sci-libs/openblas/openblas-0.3.17.ebuild b/sci-libs/openblas/openblas-0.3.17.ebuild
deleted file mode 100644
index 4d8d73725fd1..000000000000
--- a/sci-libs/openblas/openblas-0.3.17.ebuild
+++ /dev/null
@@ -1,198 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic fortran-2 toolchain-funcs
-
-DESCRIPTION="Optimized BLAS library based on GotoBLAS2"
-HOMEPAGE="http://xianyi.github.com/OpenBLAS/"
-SRC_URI="https://github.com/xianyi/OpenBLAS/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/OpenBLAS-${PV}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test"
-REQUIRED_USE="?? ( openmp pthread )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	eselect-ldso? (
-		>=app-eselect/eselect-blas-0.2
-		>=app-eselect/eselect-lapack-0.2
-	)
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.3.12-shared-blas-lapack.patch"
-	"${FILESDIR}/${PN}-0.3.10-dont-clobber-fflags.patch"
-)
-
-pkg_pretend() {
-	elog "This software has a massive number of options that"
-	elog "are configurable and it is *impossible* for all of"
-	elog "those to fit inside any manageable ebuild."
-	elog "The Gentoo provided package has enough to build"
-	elog "a fully optimized library for your targeted CPU."
-	elog "You can set the CPU target using the environment"
-	elog "variable - OPENBLAS_TARGET or it will be detected"
-	elog "automatically from the target toolchain (supports"
-	elog "cross compilation toolchains)."
-	elog "You can control the maximum number of threads"
-	elog "using OPENBLAS_NTHREAD, default=64 and number of "
-	elog "parallel calls to allow before further calls wait"
-	elog "using OPENBLAS_NPARALLEL, default=8."
-}
-
-pkg_setup() {
-	fortran-2_pkg_setup
-
-	# List of most configurable options - Makefile.rule
-
-	# https://github.com/xianyi/OpenBLAS/pull/2663
-	tc-export CC FC LD AR AS RANLIB
-
-	# HOSTCC is used for scripting
-	export HOSTCC=$(tc-getBUILD_CC)
-
-	# threading options
-	use openmp && tc-check-openmp
-	USE_THREAD=0
-	if use openmp; then
-		USE_THREAD=1; USE_OPENMP=1;
-	elif use pthread; then
-		USE_THREAD=1; USE_OPENMP=0;
-	fi
-	export USE_THREAD USE_OPENMP
-
-	# We need to filter these while building the library, and not just
-	# while building the test suite. Will hopefully get fixed upstream:
-	# https://github.com/xianyi/OpenBLAS/issues/2657
-	use test && filter-flags "-fbounds-check" "-fcheck=bounds" "-fcheck=all"
-
-	# disable submake with -j and default optimization flags
-	# in Makefile.system
-	# Makefile.rule says to not modify COMMON_OPT/FCOMMON_OPT...
-	export MAKE_NB_JOBS=-1 \
-	       COMMON_OPT=" " \
-	       FCOMMON_OPT=" "
-
-	# Target CPU ARCH options
-	# generally detected automatically from cross toolchain
-	use dynamic && \
-		export DYNAMIC_ARCH=1 \
-		       NO_AFFINITY=1 \
-		       TARGET=GENERIC
-
-	export NUM_PARALLEL=${OPENBLAS_NPARALLEL:-8} \
-	       NUM_THREADS=${OPENBLAS_NTHREAD:-64}
-
-	# setting OPENBLAS_TARGET to override auto detection
-	# in case the toolchain is not enough to detect
-	# https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt
-	if ! use dynamic && [[ ! -z "${OPENBLAS_TARGET}" ]] ; then
-		export TARGET="${OPENBLAS_TARGET}"
-	fi
-
-	export NO_STATIC=1
-
-	BUILD_RELAPACK=1
-	if ! use relapack; then
-		BUILD_RELAPACK=0
-	fi
-
-	export PREFIX="${EPREFIX}/usr" BUILD_RELAPACK
-}
-
-src_prepare() {
-	default
-
-	# Disable tests by default
-	sed -e "/^all ::/s/tests //" -i Makefile || die
-
-	# if 64bit-index is needed, create second library
-	# with LIBPREFIX=libopenblas64
-	if use index-64bit; then
-		cp -aL "${S}" "${S}-index-64bit" || die
-	fi
-}
-
-src_compile() {
-	default
-	cd interface || die
-	emake shared-blas-lapack
-
-	if use index-64bit; then
-		emake -C"${S}-index-64bit" \
-		      INTERFACE64=1 \
-		      LIBPREFIX=libopenblas64
-	fi
-}
-
-src_test() {
-	emake tests
-}
-
-src_install() {
-	emake install DESTDIR="${D}" \
-	              OPENBLAS_INCLUDE_DIR='$(PREFIX)'/include/${PN} \
-	              OPENBLAS_LIBRARY_DIR='$(PREFIX)'/$(get_libdir)
-
-	dodoc GotoBLAS_*.txt *.md Changelog.txt
-
-	if use index-64bit; then
-		dolib.so "${S}-index-64bit"/libopenblas64*.so*
-	fi
-
-	if use eselect-ldso; then
-		insinto /usr/$(get_libdir)/blas/openblas/
-		doins interface/libblas.so.3
-		dosym libblas.so.3 usr/$(get_libdir)/blas/openblas/libblas.so
-		doins interface/libcblas.so.3
-		dosym libcblas.so.3 usr/$(get_libdir)/blas/openblas/libcblas.so
-
-		insinto /usr/$(get_libdir)/lapack/openblas/
-		doins interface/liblapack.so.3
-		dosym liblapack.so.3 usr/$(get_libdir)/lapack/openblas/liblapack.so
-		doins interface/liblapacke.so.3
-		dosym liblapacke.so.3 usr/$(get_libdir)/lapack/openblas/liblapacke.so
-	fi
-}
-
-pkg_postinst() {
-	use eselect-ldso || return
-	local libdir=$(get_libdir) me="openblas"
-
-	# check blas
-	eselect blas add ${libdir} "${EROOT}"/usr/${libdir}/blas/${me} ${me}
-	local current_blas=$(eselect blas show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_blas} == "${me}" || -z ${current_blas} ]]; then
-		eselect blas set ${libdir} ${me}
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-	else
-		elog "Current eselect: BLAS/CBLAS ($libdir) -> [${current_blas}]."
-		elog "To use blas [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect blas set ${libdir} ${me}"
-	fi
-
-	# check lapack
-	eselect lapack add ${libdir} "${EROOT}"/usr/${libdir}/lapack/${me} ${me}
-	local current_lapack=$(eselect lapack show ${libdir} | cut -d' ' -f2)
-	if [[ ${current_lapack} == "${me}" || -z ${current_lapack} ]]; then
-		eselect lapack set ${libdir} ${me}
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-	else
-		elog "Current eselect: LAPACK ($libdir) -> [${current_lapack}]."
-		elog "To use lapack [${me}] implementation, you have to issue (as root):"
-		elog "\t eselect lapack set ${libdir} ${me}"
-	fi
-}
-
-pkg_postrm() {
-	if use eselect-ldso; then
-		eselect blas validate
-		eselect lapack validate
-	fi
-}
diff --git a/sci-libs/openblas/openblas-0.3.18.ebuild b/sci-libs/openblas/openblas-0.3.18.ebuild
index 7d76564474ca..fa3c14f13223 100644
--- a/sci-libs/openblas/openblas-0.3.18.ebuild
+++ b/sci-libs/openblas/openblas-0.3.18.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/OpenBLAS-${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="dynamic eselect-ldso index-64bit openmp pthread relapack test"
 REQUIRED_USE="?? ( openmp pthread )"
 RESTRICT="!test? ( test )"