gentoo resync : 08.10.2021

3 files changed, 2 insertions, 53 deletions

diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index 0d31e41a9424..3d5c0eef92c2 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,6 +1,5 @@
 AUX qrupdate-1.1.1-Makefiles.patch 2134 BLAKE2B 36e3a94684bcbf7c6738f7af5a990102a56ee5250255c809b2f59bd4c1e96dd48476c9814fb8d33f914dbef5e4d3b70c455e015bd4fd323cd8c7ab6693a63216 SHA512 66b86960f90bce81839ef85a27ad0815b3f8417a0fd44b8027a02bce536aa6db4c250c665566d269150b504afdfb2fbad44b3344497947a193f961c33e63db8e
 AUX qrupdate-1.1.2-install.patch 1210 BLAKE2B 311a21fd3c99b875aca96d9bbb2c0432abb1867a47d58c32d33a423c91bc8460460bacf99fea97230fd3456830fef93c80539a6aca4315d73d949f61a7a0bf97 SHA512 3f53b1b0bbf04415a5f14f18f28a8264725296b4dcdc28c4d3e13852a4f12f3f2466df7ba58233b1e7279ec9d8075b0dd01fcf2d00bc9c13cf5d21f40f98f0f4
 DIST qrupdate-1.1.2.tar.gz 49734 BLAKE2B e5bf9fb39f6c97ee4b4084e664f929d95bee407f9f11ea4dc6da2bdb06d1694eddc1f2f52e5f673f22d097d11addb293b6dc0fd7c30d09acc84dd050fd1d72e9 SHA512 cc4e466ea91958e15c66be82b0c4c8ad813fbe4643f21259a9cb3ca8e0a411dd764bb2397ece848a7045f322d30316801d1540c4ebf7912030bef6995b44917c
-EBUILD qrupdate-1.1.2-r1.ebuild 1386 BLAKE2B 99ad2f1d5945c746ddf252c5e12983dad2eef6a99e9f1aecd1e0c3c80e8cf08924a84ddf78ef64851d6737ed4688cca7f11a920b465e3e1f5698a11221c744aa SHA512 6246e05702a13967279242bac9235840a000ab06ef3e02672c97fd1ebf5da7f75e127e3634b82ef14fd1f8d166ecb09e7057e1efb0f82b92f7fd1e57df8dd813
-EBUILD qrupdate-1.1.2-r2.ebuild 1275 BLAKE2B 09c9814bff69c65fc1e2e65cbdab782c42589bd73b9e8d4840cff5bb3d6b337af7ec2ffd00f166ecd2bc904bf3246bd64e1ab372c98f2d0a3b6fffd0aa525110 SHA512 6c35fbebab5841dc6388f0d259c008ae4a758cc50f67306d37491b8cea225f515abedf786cc7c196baefc47b33910e23816c98bc8f85fdfa023bde42fa906b4c
+EBUILD qrupdate-1.1.2-r2.ebuild 1268 BLAKE2B f60dc8f1cb4dc70fce8fd55dd8825823df377d50c7c620a357eac063ae10a8bcb0c5d45ad908d353ca55ac596119624133595b7dd4cafd427bc72bec77d421fc SHA512 78f771cbe7a2a74f3039646377307bd95136044df5609e20c2fc4af2cf0b975e52a98eb635a94c46d2752bb1d04425288de5c3fc68094dcd76f6994f35bf80d2
 MISC metadata.xml 332 BLAKE2B dda33ed8f8a63591e183723ca80d1550d104a4996cba185dbef3bbd2f57e287b1f0c1776296e324e3648f39378cc8fd17225cdb04962c99adda59bb0024f09e7 SHA512 5f787098bc13a29f7905d07e27464a966766fdd65e19ee07fa2ea96517b38da6cb77187fb4b60ed40c81a962a405ad4dcd472f114c7849c5aee730c405062f2e
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
deleted file mode 100644
index efcc931e3385..000000000000
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit epatch fortran-2 flag-o-matic multilib versionator toolchain-funcs
-
-DESCRIPTION="Library for updating of QR and Cholesky decompositions"
-HOMEPAGE="https://sourceforge.net/projects/qrupdate"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
-IUSE="static-libs"
-
-RDEPEND="virtual/lapack"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.1.1-Makefiles.patch \
-		"${FILESDIR}"/${PN}-1.1.2-install.patch
-
-	# GCC 10 workaround
-	# bug #741524
-	append-fflags $(test-flags-FC -fallow-argument-mismatch)
-
-	sed -i Makeconf \
-		-e "s:gfortran:$(tc-getFC):g" \
-		-e "s:FFLAGS=.*:FFLAGS=${FFLAGS}:" \
-		-e "s:BLAS=.*:BLAS=$($(tc-getPKG_CONFIG) --libs blas):" \
-		-e "s:LAPACK=.*:LAPACK=$($(tc-getPKG_CONFIG) --libs lapack):" \
-		-e "/^LIBDIR=/a\PREFIX=${EPREFIX}/usr" \
-		-e "s:LIBDIR=lib:LIBDIR=$(get_libdir):" \
-		|| die "Failed to set up Makeconf"
-}
-
-src_compile() {
-	emake solib
-	use static-libs && emake lib
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-shlib
-	dosym libqrupdate.so.$(get_major_version) /usr/$(get_libdir)/libqrupdate.so
-	use static-libs && emake DESTDIR="${D}" install-staticlib
-	dodoc README ChangeLog
-}
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
index 3206fe22ce8e..9d471abf2886 100644
--- a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos"
 
 RDEPEND="virtual/lapack"
 DEPEND="${RDEPEND}"