gentoo resync : 25.08.2020

6 files changed, 15 insertions, 287 deletions

diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest
index bbe7a68f69dd..5db0ee0ef71a 100644
--- a/sci-libs/spqr/Manifest
+++ b/sci-libs/spqr/Manifest
@@ -1,8 +1,3 @@
-AUX spqr-1.2.3-autotools.patch 7204 BLAKE2B 52d4a84bddc1fa24f4d783f72ce20a3f058d179f917b4fb5c3be590067ad93b9090679273dd9b34505587794470f7283d858effd9ce8c8d5b165be6bb7f01379 SHA512 23b07ce5bbc993dbb8c7811f04d0c8997c4293ad2ffb6fee07b4fc23d5306499bfe5a84683add88a8d7050cf0ae5ed5e9d5a3d03064ef8a049918b5f2a2d1250
-DIST SPQR-1.2.3.tar.gz 1090017 BLAKE2B 7ecd180f2147229bea7d9230c5f645c1d835e7260d58930ab8021c7d90b3b7992d708af942beaa728bce86e83e008db9ecb7d69cb7a3b1245bab1c9c9bf7c4c6 SHA512 1abcde88e157bc99445e3589cacd6aba875429f1cdef87e36e1d6943c1474a2f8df9a65eff99e92d72e346c02f11194b6ec6829c158f42f689f95845c9b11599
-DIST spqr-1.3.1.tar.bz2 1115795 BLAKE2B 027509745cd336d3ccff27a4f36e51493fb9008fabb84448ba559b561269861be97d86ec841674c2bc944eb86623675b223947fcccf0716052a899ce17850d32 SHA512 1c7644da2bb7a14b9bc26066b84355626ce5d7c396afe5ce496ae72a5ef54431dc817178bfe7dd69ddf586b661c44066ee0850c91dba846a32787d52607749bf
 DIST spqr-2.0.9.tar.bz2 2161068 BLAKE2B a662983d2543a65ce36a367749db5585308acb56b016f69a35c46a84e9c12a678f57a3cfd459cc2e887fff2819b00f99981efaadb73831f1b4c54cbef5e1c367 SHA512 54b203e0d68b266473b8a2b7b3b3a55476df54a3ebd5748b70faa7bad1d0a5a7387197f0674ba5f9a5d45887daa736117f8d6ffbbc2eb02482b3374a3babf721
-EBUILD spqr-1.2.3-r1.ebuild 909 BLAKE2B bf187af15da7e38f9b79f089768236f04c8794373d043b1fc13562ce0c5466bd80777bc0299973003306b87db45a7a9f3b2a4fdf6161ee2e11df2f3219d5de58 SHA512 752f56b943603df13cdfa90c428eb379adf004f893b1fd966193b6a650c07c0af1a8236f6d015fd451b848bddc5a9f18b408adcbd521c76f0e90792ebb585cbc
-EBUILD spqr-1.3.1.ebuild 752 BLAKE2B a96d5e8a948366fef4cc7fa2ba7d618f19f1bd17998a162e7501fe75fead8c697efe96cb0f78ed7a9329aa6d73bffea3106bdae9aeba489df92634c21b5ec98e SHA512 b97e9f20ceae34ce31edeed18eeaf1d809fbdaf883e5496ebd277f6c11b46fc139375cfca13718661fa36b127909a6e61cd9ee62d3b2b728d2dd402eb3593c97
-EBUILD spqr-2.0.9.ebuild 1019 BLAKE2B 3eae137cc4399e2d5793de65bea5838d3891a680c42272eda8a1c921de4e5345c1fb0792403adb1db4ab7d405e8dfa75701f622765916759da94273141674e37 SHA512 be62092f8accc27143fde71126c53c65d571edcc6ba14c664fd3c61aa01c646bb919ab8073bf5885c078c8da212b216126af41be6cd9b5f7f57c29200d403c6d
-MISC metadata.xml 962 BLAKE2B b7d87c2d66c17b1d3071b8b0a17e39fe77897a9af7e79caf784cd1c370c70467010718ad3ef60314dc6f0db5703b4a0035294fac5fc2552e9bb595132b7991ed SHA512 a8cbc5b0168b847b814c54b874d159fcfd349780d9b64907ffdb1d572babbee8b64f422328fa583ba9f7e0a60846249385acbccf5db2944f7c05bcd33f4ce757
+EBUILD spqr-2.0.9.ebuild 1084 BLAKE2B fc8915b515cac36436d02c89f36d6fc707685095cfba07602a81c0bd7735f9557b40ffc7696f276c45bc5db3ae08eda8aea0c0077ccbaf25be807f98511f1875 SHA512 54ba1edac7a24f2750fd18d73ee883f00b6c0a5447948140802826d969db8b1ea6a6c078cb3010957dd35af15df641b821698192df742ada788c445e0335ff8d
+MISC metadata.xml 851 BLAKE2B 9fcb15232c55f46ea54af4b61f977e2c4f98e34950b30ed63a559c28c82f8d2b29882224e08121a47dd5b9ff245aaeaafcb03545c6567fbe5462e941ed650654 SHA512 de53a20986b9063a61fc548fdd1c059ac598b9a7db72bca683494fe6d82701e69e30d682e98adf4a72a43f30157f71d37c29930f00156626d369b6560b6ccda6
diff --git a/sci-libs/spqr/files/spqr-1.2.3-autotools.patch b/sci-libs/spqr/files/spqr-1.2.3-autotools.patch
deleted file mode 100644
index be5d15f188c3..000000000000
--- a/sci-libs/spqr/files/spqr-1.2.3-autotools.patch
+++ /dev/null
@@ -1,203 +0,0 @@
---- Demo/Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ Demo/Makefile.am	2009-10-22 23:42:08.000000000 -0400
-@@ -0,0 +1,78 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
-+
-+LDADD = $(top_builddir)/Source/libspqr.la \
-+	$(CHOLMOD_LIBS) $(AMD_LIBS) $(CAMD_LIBS) \
-+	$(COLAMD_LIBS) $(CCOLAMD_LIBS) \
-+	$(METIS_LIBS) $(BLAS_LIBS) $(LAPACK_LIBS) $(TBB_LIBS)
-+
-+check_PROGRAMS = \
-+	qrsimple qrsimplec \
-+	qrdemo qrdemoc
-+
-+qrsimple_SOURCES = qrsimple.cpp
-+qrsimplec = qrsimplec.c
-+qrsimplec_CFLAGS = -ansi
-+qrdemo_SOURCES = qrdemo.cpp
-+qrdemoc_SOURCES = qrdemoc.c
-+qrdemoc_CFLAGS = -ansi
-+
-+
-+check-local: $(check_PROGRAMS)
-+	./qrsimple < $(top_srcdir)/Matrix/ash219.mtx || exit 1
-+	./qrsimplec < $(top_srcdir)/Matrix/ash219.mtx || exit 1
-+	./qrsimple < $(top_srcdir)/Matrix/west0067.mtx || exit 1
-+	./qrsimplec < $(top_srcdir)/Matrix/west0067.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a2.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/r2.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a04.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a2.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/west0067.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/c2.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a0.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/lfat5b.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/bfwa62.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/LFAT5.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/b1_ss.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/bcspwr01.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/lpi_galenet.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/lpi_itest6.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/ash219.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a4.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/s32.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/c32.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/lp_share1b.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/a1.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/GD06_theory.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/GD01_b.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/Tina_AskCal_perm.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/Tina_AskCal.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/GD98_a.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/Ragusa16.mtx || exit 1
-+	./qrdemo < $(top_srcdir)/Matrix/young1c.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a2.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/r2.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a04.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a2.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/west0067.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/c2.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a0.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/lfat5b.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/bfwa62.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/LFAT5.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/b1_ss.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/bcspwr01.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/lpi_galenet.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/lpi_itest6.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/ash219.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a4.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/s32.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/c32.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/lp_share1b.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/a1.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/GD06_theory.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/GD01_b.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/Tina_AskCal_perm.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/Tina_AskCal.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/GD98_a.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/Ragusa16.mtx || exit 1
-+	./qrdemoc < $(top_srcdir)/Matrix/young1c.mtx || exit 1
---- Include/Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ Include/Makefile.am	2009-10-22 23:42:08.000000000 -0400
-@@ -0,0 +1,5 @@
-+include_HEADERS = \
-+	spqr.hpp \
-+	SuiteSparseQR_C.h \
-+	SuiteSparseQR_definitions.h \
-+	SuiteSparseQR.hpp
---- Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ Makefile.am	2009-10-22 23:42:08.000000000 -0400
-@@ -0,0 +1,2 @@
-+SUBDIRS = Include Source Demo
-+EXTRA_DIST = README.txt
---- Source/Makefile.am	1969-12-31 19:00:00.000000000 -0500
-+++ Source/Makefile.am	2009-10-22 23:43:03.000000000 -0400
-@@ -0,0 +1,48 @@
-+AM_CPPFLAGS=-I$(top_srcdir)/Include
-+
-+lib_LTLIBRARIES = libspqr.la
-+
-+libspqr_la_SOURCES = \
-+    spqr_rmap.cpp \
-+    SuiteSparseQR_C.cpp \
-+    SuiteSparseQR_expert.cpp \
-+    spqr_parallel.cpp \
-+    spqr_kernel.cpp \
-+    spqr_analyze.cpp \
-+    spqr_assemble.cpp \
-+    spqr_cpack.cpp \
-+    spqr_csize.cpp \
-+    spqr_fcsize.cpp \
-+    spqr_debug.cpp \
-+    spqr_front.cpp \
-+    spqr_factorize.cpp \
-+    spqr_freenum.cpp \
-+    spqr_freesym.cpp \
-+    spqr_freefac.cpp \
-+    spqr_fsize.cpp \
-+    spqr_maxcolnorm.cpp \
-+    spqr_rconvert.cpp \
-+    spqr_rcount.cpp \
-+    spqr_rhpack.cpp \
-+    spqr_rsolve.cpp \
-+    spqr_stranspose1.cpp \
-+    spqr_stranspose2.cpp \
-+    spqr_hpinv.cpp \
-+    spqr_1fixed.cpp \
-+    spqr_1colamd.cpp \
-+    SuiteSparseQR.cpp \
-+    spqr_1factor.cpp \
-+    spqr_cumsum.cpp \
-+    spqr_shift.cpp \
-+    spqr_happly.cpp \
-+    spqr_panel.cpp \
-+    spqr_happly_work.cpp \
-+    SuiteSparseQR_qmult.cpp \
-+    spqr_trapezoidal.cpp \
-+    spqr_larftb.cpp \
-+    spqr_append.cpp \
-+    spqr_type.cpp \
-+    spqr_tol.cpp
-+
-+libspqr_la_CPPFLAGS = $(AM_CPPFLAGS) $(METIS_CFLAGS) $(TBB_CFLAGS) $(LAPACK_CFLAGS)
-+libspqr_la_LIBADD = $(METIS_LIBS) $(TBB_LIBS) $(LAPACK_LIBS)
---- configure.ac	1969-12-31 19:00:00.000000000 -0500
-+++ configure.ac	2009-10-22 23:42:32.000000000 -0400
-@@ -0,0 +1,55 @@
-+AC_PREREQ(2.59)
-+AC_INIT(spqr, 1.2, davis@cise.ufl.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_CONFIG_SRCDIR([Source/spqr_kernel.cpp])
-+AM_INIT_AUTOMAKE([foreign])
-+
-+AC_PROG_LIBTOOL
-+AC_PROG_CXX
-+AC_LANG(C++)
-+
-+AC_CHECK_LIB(m, sqrt)
-+AC_CHECK_LIB(lapack,zlarft_)
-+AC_CHECK_HEADERS(UFconfig.h)
-+AC_CHECK_HEADERS(cholmod.h)
-+AC_CHECK_LIB(cholmod, cholmod_solve, [], \
-+            [AC_MSG_ERROR([Cannot find libcholmod])])
-+
-+AC_ARG_WITH(metis,
-+    [AC_HELP_STRING([--with-metis],
-+		    [Use METIS for partitioning])],
-+     [with_metis=$withval],
-+     [with_metis="yes"])
-+if test x$with_metis = xyes; then
-+    PKG_PROG_PKG_CONFIG
-+    if test -n "$PKG_CONFIG"; then
-+       PKG_CHECK_MODULES([metis], [metis])
-+    else
-+	AC_CHECK_HEADERS(metis.h)
-+    	AC_CHECK_LIB(metis, METIS_NodeND, [METIS_LIBS=-lmetis], \
-+		[AC_MSG_ERROR([Cannot find libmetis])])
-+    fi
-+    AC_DEFINE(NPARTITION)
-+fi
-+AM_CONDITIONAL([METIS], [test x$with_metis = xyes])
-+
-+AC_ARG_WITH(tbb,
-+    [AC_HELP_STRING([--with-tbb],
-+		    [Use Intel Threading Building Block for multithreading])],
-+     [with_tbb=$withval],
-+     [with_tbb="yes"])
-+if test x$with_tbb = xyes; then
-+    AC_CHECK_HEADERS(tbb/task.h)
-+    TBB_CFLAGS=""
-+    TBB_LIBS="-ltbb"
-+    AC_SUBST(TBB_CFLAGS)
-+    AC_SUBST(TBB_LIBS)
-+    AC_DEFINE(HAVE_TBB)
-+fi
-+AM_CONDITIONAL([WITH_TBB], [test x$with_tbb = xyes])
-+
-+AC_CONFIG_FILES([Makefile
-+    Source/Makefile
-+    Include/Makefile
-+    Demo/Makefile])
-+AC_OUTPUT
diff --git a/sci-libs/spqr/metadata.xml b/sci-libs/spqr/metadata.xml
index 0d8618db4112..080353cff1a4 100644
--- a/sci-libs/spqr/metadata.xml
+++ b/sci-libs/spqr/metadata.xml
@@ -13,10 +13,8 @@
   peak performance of a multicore computer.
 </longdescription>
 <use>
-  <flag name="metis">Use <pkg>sci-libs/metis</pkg> or <pkg>sci-libs/parmetis</pkg> for partitioning</flag>
   <flag name="partition">
-    Use the partition module of <pkg>sci-libs/cholmod</pkg> for
-    partitioning
+    Use the partition module of <pkg>sci-libs/cholmod</pkg> for partitioning
   </flag>
   <flag name="tbb">Enable multithreading with the Intel Threads
   Building Block <pkg>dev-cpp/tbb</pkg></flag>
diff --git a/sci-libs/spqr/spqr-1.2.3-r1.ebuild b/sci-libs/spqr/spqr-1.2.3-r1.ebuild
deleted file mode 100644
index 9f722944c3d0..000000000000
--- a/sci-libs/spqr/spqr-1.2.3-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-AUTOTOOLS_AUTORECONF=yes
-inherit autotools-utils
-
-MY_PN=SPQR
-DESCRIPTION="Multithreaded multifrontal sparse QR factorization library"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SPQR"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="doc metis static-libs tbb"
-RDEPEND="sci-libs/cholmod[supernodal(+)]
-	tbb? ( dev-cpp/tbb )
-	metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( README.txt Doc/ChangeLog )
-PATCHES=( "${FILESDIR}"/${P}-autotools.patch )
-
-S="${WORKDIR}/${MY_PN}"
-
-src_configure() {
-	myeconfargs+=(
-		$(use_with metis)
-		$(use_with tbb)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install
-	use doc && doins Doc/*.pdf
-}
diff --git a/sci-libs/spqr/spqr-1.3.1.ebuild b/sci-libs/spqr/spqr-1.3.1.ebuild
deleted file mode 100644
index a22737b28bfa..000000000000
--- a/sci-libs/spqr/spqr-1.3.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Multithreaded multifrontal sparse QR factorization library"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/SPQR"
-SRC_URI="https://dev.gentoo.org/~bicatali/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc metis static-libs tbb"
-RDEPEND="
-	virtual/lapack
-	>=sci-libs/cholmod-2[metis?]
-	tbb? ( dev-cpp/tbb )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( virtual/latex-base )"
-
-src_configure() {
-	local myeconfargs+=(
-		$(use_with doc)
-		$(use_with metis partition)
-		$(use_with tbb)
-	)
-	autotools-utils_src_configure
-}
diff --git a/sci-libs/spqr/spqr-2.0.9.ebuild b/sci-libs/spqr/spqr-2.0.9.ebuild
index ae9b6c3adc4b..72475fd658a1 100644
--- a/sci-libs/spqr/spqr-2.0.9.ebuild
+++ b/sci-libs/spqr/spqr-2.0.9.ebuild
@@ -9,8 +9,8 @@ SRC_URI="http://202.36.178.9/sage/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc partition static-libs tbb"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc partition tbb"
 
 BDEPEND="virtual/pkgconfig
 	doc? ( virtual/latex-base )"
@@ -18,7 +18,8 @@ BDEPEND="virtual/pkgconfig
 # USE=lapack, and cholmod has to have partition support if spqr is going
 # to have it (the ./configure script for spqr checks this). Note that
 # spqr links to metis directly, too.
-DEPEND="virtual/lapack
+DEPEND="
+	virtual/lapack
 	>=sci-libs/cholmod-2[lapack,partition?]
 	partition? ( >=sci-libs/metis-5.1.0 )
 	tbb? ( dev-cpp/tbb )"
@@ -26,8 +27,15 @@ RDEPEND="${DEPEND}"
 
 src_configure() {
 	econf \
+		--disable-static \
 		$(use_with doc) \
-		$(use_enable static-libs static) \
 		$(use_with partition) \
 		$(use_with tbb)
 }
+
+src_install() {
+	default
+
+	# no static archives
+	find "${D}" -name '*.la' -delete || die
+}