commit: 07055b1af07758e8af60a2853f87021fe224fb04 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 19 16:26:07 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jul 21 10:03:15 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07055b1a
sci-libs/spqr: Drop 1.2.3-r1 and 1.3.1 Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> sci-libs/spqr/Manifest | 2 - sci-libs/spqr/files/spqr-1.2.3-autotools.patch | 203 ------------------------- sci-libs/spqr/metadata.xml | 4 +- sci-libs/spqr/spqr-1.2.3-r1.ebuild | 39 ----- sci-libs/spqr/spqr-1.3.1.ebuild | 31 ---- 5 files changed, 1 insertion(+), 278 deletions(-) diff --git a/sci-libs/spqr/Manifest b/sci-libs/spqr/Manifest index 0e91983a946..2463ac3152e 100644 --- a/sci-libs/spqr/Manifest +++ b/sci-libs/spqr/Manifest @@ -1,3 +1 @@ -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 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 be5d15f188c..00000000000 --- 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, [email protected]) -+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 0d8618db411..080353cff1a 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 9f722944c3d..00000000000 --- 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 a22737b28bf..00000000000 --- 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 -}
