[gentoo-commits] repo/gentoo:master commit in: sci-libs/qrupdate/, sci-libs/qrupdate/files/
commit: f7d59a51d40442b70744abca9bbb5639806f60ca
Author: Jakov Smolic sartura hr>
AuthorDate: Sat Aug 14 10:13:15 2021 +
Commit: David Seifert gentoo org>
CommitDate: Sat Aug 14 10:13:15 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7d59a51
sci-libs/qrupdate: Port to EAPI 8
- Remove static-libs and cleanup patches
- Replace ":" with "|" as sed delimiter
Closes: https://bugs.gentoo.org/710820
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
.../qrupdate/files/qrupdate-1.1.1-Makefiles.patch | 29 +++--
.../qrupdate/files/qrupdate-1.1.2-install.patch| 4 +-
sci-libs/qrupdate/qrupdate-1.1.2-r2.ebuild | 50 ++
3 files changed, 68 insertions(+), 15 deletions(-)
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 9c9ef931734..1fdbd946e99 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.0 +
-+++ qrupdate-1.1.1/Makefile2010-05-13 17:27:15.0 +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.0 +
-+++ qrupdate-1.1.1/src/Makefile2010-05-13 17:28:30.0 +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.0 +
-+++ qrupdate-1.1.1/test/Makefile 2010-05-13 17:15:51.0 +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 0eee49ae68f..67c5b8f007e 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 000..3206fe22ce8
--- /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)|" \
+
[gentoo-commits] repo/gentoo:master commit in: sci-libs/qrupdate/, sci-libs/qrupdate/files/
commit: 2740601c7efdbf434e15429a77a941afa94e6de7
Author: Justin Lecher gentoo org>
AuthorDate: Sat Apr 2 15:01:37 2016 +
Commit: Justin Lecher gentoo org>
CommitDate: Sat Apr 2 15:01:43 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2740601c
sci-libs/qrupdate: Drop old
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=478616
Package-Manager: portage-2.2.27
Signed-off-by: Justin Lecher gentoo.org>
sci-libs/qrupdate/Manifest | 2 -
.../qrupdate/files/qrupdate-1.0.1-makefile.patch | 24 ---
sci-libs/qrupdate/qrupdate-1.1.0.ebuild| 47 --
sci-libs/qrupdate/qrupdate-1.1.1.ebuild| 44
sci-libs/qrupdate/qrupdate-1.1.2.ebuild| 46 -
5 files changed, 163 deletions(-)
diff --git a/sci-libs/qrupdate/Manifest b/sci-libs/qrupdate/Manifest
index 4dc116b..222cb74 100644
--- a/sci-libs/qrupdate/Manifest
+++ b/sci-libs/qrupdate/Manifest
@@ -1,3 +1 @@
-DIST qrupdate-1.1.0.tar.gz 48830 SHA256
4048f17bb0cf084b74962c882aa6d1367568dc65900259fbea1407eb9ec28bd3 SHA512
4bbd3c179da62275710875865e753df6a32551ec8f46de9476d3d1919325638833194865e22cc3d33b97b4c2da894fee6cdf70255c474148dff2950bc3318cd5
WHIRLPOOL
b5f63ebc59804768e5af58945f681b67eb0bbec04bf6614bfc32856746369b910297e09d0b7f2d0d05a9560a5339a1ffdd63da4d9fe4b5c147d4f7e9f66a101c
-DIST qrupdate-1.1.1.tar.gz 50063 SHA256
9f0100d358f96cae9394c28c97dbf1fd359675671d2a2c9ac88cfd121a46662a SHA512
ee178afb43d9bf6a710f9df2353775261fc9e8272cf78c90b407418a1a7df43a3847ca7b022ceb53bc1769b61a2960bd328d845cb0f1bbade8da1787c3b2cf83
WHIRLPOOL
799f4c58f2cac0f30fd6f6d0a1624ce6e1c46440f21f594a6727b2a49963948f330d4858a49804b96cea8434478ab03ca91bb3e6a77167e0057bdb76ec8d09b6
DIST qrupdate-1.1.2.tar.gz 49734 SHA256
e2a1c711dc8ebc418e21195833814cb2f84b878b90a2774365f0166402308e08 SHA512
cc4e466ea91958e15c66be82b0c4c8ad813fbe4643f21259a9cb3ca8e0a411dd764bb2397ece848a7045f322d30316801d1540c4ebf7912030bef6995b44917c
WHIRLPOOL
9e6fb1d77c63e209816d42a864e3e9bf7fd6e238f672012a1dfc2235036c482291745e947a74afa316b9ef0e4a054fbcd7759d5620b75ac35fc2e4cfbd6467a9
diff --git a/sci-libs/qrupdate/files/qrupdate-1.0.1-makefile.patch
b/sci-libs/qrupdate/files/qrupdate-1.0.1-makefile.patch
deleted file mode 100644
index fa8925f..000
--- a/sci-libs/qrupdate/files/qrupdate-1.0.1-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur qrupdate-1.0.1/Makefile qrupdate-1.0.1.new/Makefile
qrupdate-1.0.1/Makefile2009-02-06 04:12:00.0 -0500
-+++ qrupdate-1.0.1.new/Makefile2009-09-10 09:55:32.0 -0400
-@@ -34,7 +34,7 @@
- lib:
- make -C src/ lib
- solib:
-- make -C src/ solib
-+ +make -C src/ solib
- test: lib
- make -C test/
-
-diff -Naur qrupdate-1.0.1/src/Makefile qrupdate-1.0.1.new/src/Makefile
qrupdate-1.0.1/src/Makefile2009-02-06 04:12:50.0 -0500
-+++ qrupdate-1.0.1.new/src/Makefile2009-09-10 09:49:29.0 -0400
-@@ -40,7 +40,7 @@
- ar -cr $@ $(OBJS)
-
- ../libqrupdate.so: $(OBJS)
-- $(FC) $(FFLAGS) -shared -o $@ -Wl,-soname=libqrupdate.so.$(MAJOR)
$(OBJS) \
-+ $(FC) $(FFLAGS) $(LDFLAGS) -shared -o $@
-Wl,-soname=libqrupdate.so.$(MAJOR) $(OBJS) \
- $(BLAS) $(LAPACK)
-
- $(OBJS): %.o: %.f
diff --git a/sci-libs/qrupdate/qrupdate-1.1.0.ebuild
b/sci-libs/qrupdate/qrupdate-1.1.0.ebuild
deleted file mode 100644
index 9750a6a..000
--- a/sci-libs/qrupdate/qrupdate-1.1.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils fortran-2 multilib toolchain-funcs versionator
-
-DESCRIPTION="A library for fast updating of QR and Cholesky decompositions"
-HOMEPAGE="http://sourceforge.net/projects/qrupdate;
-SRC_URI="mirror://sourceforge/qrupdate/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND="
- virtual/blas
- virtual/lapack"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0.1-makefile.patch
-
- local BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
- local LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)"
-
- sed -i Makeconf \
- -e "s:gfortran:$(tc-getFC):g" \
- -e "s:FFLAGS=.*:FFLAGS=${FFLAGS}:" \
- -e "s:BLAS=.*:BLAS=${BLAS_LIBS}:" \
- -e "s:LAPACK=.*:LAPACK=${LAPACK_LIBS}:" \
- || die "Failed to set up Makeconf"
-}
-
-src_compile() {
- emake solib || die "emake failed"
-}
-
-src_install() {
- newlib.so libqrupdate.so libqrupdate.so.1 \
- || die "Failed to install libqrupdate.so.1"
- dosym libqrupdate.so.1 /usr/$(get_libdir)/libqrupdate.so
- dodoc README ChangeLog || die "dodoc failed"
-}
diff --git
