gentoo resync : 17.08.2021

4 files changed, 71 insertions, 17 deletions

diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index df4217b8b2eb..e05981442e63 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,5 +1,6 @@
-AUX qrupdate-1.1.1-Makefiles.patch 2350 BLAKE2B 9d1e21e0118f1fd47699c94e242fb53df5e6fa26b85a56bd13718ce409ade64e618a858fab780a2c927f4ef988273a883872d5ecca57b62b90b16f132dce5bae SHA512 40945650175668ab5155c330a5e6be20059e90d8bb5f47173d14b385710703693b1c5fb77bc01f08328e064301e2fc0c90438a9fac7f6f1222e6b35835137682
-AUX qrupdate-1.1.2-install.patch 1263 BLAKE2B e9d18cda34264374e9456a2c3ed5f849bafe8ef461e1577e1cda4b04695f2c8ef03d0ef47d2d9ba6a56db7251b8a37cafc061a47b751e7947a94f1479df2a2d0 SHA512 3274d57666b2f453f50f0b5244c9f3dd5ea29a2fc05233dedfd43940945744a675d3bbd50e3a1aef7ec8613df16f97c05e0983c711db63364f8b45125e246bb8
+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
 MISC metadata.xml 331 BLAKE2B 7cb0302f290048b91c8777184229fa2f0af2647f5cd1d4f9f88f7afc0168b4c51a4ab01b08cfb695be567838f1a6025cf47e2e43df67d434cf676c47c537cc3e SHA512 59818fe84d5fc4b73f29b45e14152e52d7d4afeaef9200e862e2414213b8c05bd63119befabc3a68b67b0aced7e60ab0fe3f7e657966a58a44d751571c4828df
diff --git a/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch b/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch
index 9c9ef9317342..1fdbd946e99e 100644
--- a/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch
+++ b/sci-libs/qrupdate/files/qrupdate-1.1.1-Makefiles.patch
@@ -1,7 +1,8 @@
-diff -Nur qrupdate-1.1.1.orig/Makefile qrupdate-1.1.1/Makefile
---- qrupdate-1.1.1.orig/Makefile	2009-02-06 09:12:00.000000000 +0000
-+++ qrupdate-1.1.1/Makefile	2010-05-13 17:27:15.000000000 +0100
-@@ -32,22 +32,22 @@
+diff --git a/Makefile b/Makefile
+index f9dbe86..2b11b59 100644
+--- a/Makefile
++++ b/Makefile
+@@ -32,22 +32,22 @@ help:
  	@echo "   make install - installs everything"
  
  lib:
@@ -32,10 +33,11 @@ diff -Nur qrupdate-1.1.1.orig/Makefile qrupdate-1.1.1/Makefile
  install-staticlib:
 -	make -C src/ install-staticlib
 +	$(MAKE) -C src install-staticlib
-diff -Nur qrupdate-1.1.1.orig/src/Makefile qrupdate-1.1.1/src/Makefile
---- qrupdate-1.1.1.orig/src/Makefile	2010-01-19 11:32:35.000000000 +0000
-+++ qrupdate-1.1.1/src/Makefile	2010-05-13 17:28:30.000000000 +0100
-@@ -34,6 +34,8 @@
+diff --git a/src/Makefile b/src/Makefile
+index 65ef49a..c338882 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -34,6 +34,8 @@ clup1up.f dlup1up.f slup1up.f zlup1up.f
  
  OBJS = $(SRC:%.f=%.o)
  
@@ -44,7 +46,7 @@ diff -Nur qrupdate-1.1.1.orig/src/Makefile qrupdate-1.1.1/src/Makefile
  lib: ../libqrupdate.a
  
  ifeq ($(shell uname),Darwin)
-@@ -46,19 +48,22 @@
+@@ -46,19 +48,22 @@ solib: ../libqrupdate$(SOEXT)
  ../libqrupdate.a: $(OBJS)
  	ar -cr $@ $(OBJS)
  
@@ -73,10 +75,11 @@ diff -Nur qrupdate-1.1.1.orig/src/Makefile qrupdate-1.1.1/src/Makefile
  
  install: install-shlib install-staticlib
  
-diff -Nur qrupdate-1.1.1.orig/test/Makefile qrupdate-1.1.1/test/Makefile
---- qrupdate-1.1.1.orig/test/Makefile	2010-02-11 08:25:37.000000000 +0000
-+++ qrupdate-1.1.1/test/Makefile	2010-05-13 17:15:51.000000000 +0100
-@@ -41,7 +41,7 @@
+diff --git a/test/Makefile b/test/Makefile
+index 45a843d..3be917f 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -41,7 +41,7 @@ utils.o: utils.f
  	$(FC) $(FFLAGS) -c $<
  
  ../libqrupdate.a:
diff --git a/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch b/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch
index 0eee49ae68f4..67c5b8f007e1 100644
--- a/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch
+++ b/sci-libs/qrupdate/files/qrupdate-1.1.2-install.patch
@@ -1,5 +1,5 @@
---- src/Makefile.orig	2010-02-07 15:58:01 +0100
-+++ src/Makefile	2010-02-07 16:02:18 +0100
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -65,14 +65,17 @@
  install-shlib: ../libqrupdate$(SOEXT) install-lib$(SOEXT)
  
diff --git a/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
new file mode 100644
index 000000000000..3206fe22ce8e
--- /dev/null
+++ b/sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fortran-2 flag-o-matic multilib 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"
+
+RDEPEND="virtual/lapack"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-Makefiles.patch
+	"${FILESDIR}"/${PN}-1.1.2-install.patch
+)
+
+src_prepare() {
+	default
+
+	# 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
+}
+
+src_install() {
+	emake DESTDIR="${D}" install-shlib
+	dosym libqrupdate.so.$(ver_cut 1) /usr/$(get_libdir)/libqrupdate.so
+	dodoc README ChangeLog
+}