Version bump

(Portage version: 2.1.10.10/cvs/Linux x86_64)

5 files changed, 218 insertions, 106 deletions

diff --git a/sci-libs/spqr/ChangeLog b/sci-libs/spqr/ChangeLog
index 2d536d6ada5b..eb96d29a34ce 100644
--- a/sci-libs/spqr/ChangeLog
+++ b/sci-libs/spqr/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/spqr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/ChangeLog,v 1.6 2011/02/23 20:16:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/ChangeLog,v 1.7 2011/08/07 03:47:10 bicatali Exp $
+
+*spqr-1.2.2 (07 Aug 2011)
+
+  07 Aug 2011; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/1.2.2-autotools.patch, -spqr-1.1.0.ebuild, -spqr-1.1.2.ebuild,
+  -spqr-1.2.0.ebuild, +spqr-1.2.2.ebuild:
+  Version bump
 
 *spqr-1.2.1 (23 Feb 2011)
 
diff --git a/sci-libs/spqr/files/1.2.2-autotools.patch b/sci-libs/spqr/files/1.2.2-autotools.patch
new file mode 100644
index 000000000000..d56ecdc54313
--- /dev/null
+++ b/sci-libs/spqr/files/1.2.2-autotools.patch
@@ -0,0 +1,203 @@
+--- 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 < ../Matrix/ash219.mtx || exit 1
++	./qrsimplec < ../Matrix/ash219.mtx || exit 1
++	./qrsimple < ../Matrix/west0067.mtx || exit 1
++	./qrsimplec < ../Matrix/west0067.mtx || exit 1
++	./qrdemo < ../Matrix/a2.mtx || exit 1
++	./qrdemo < ../Matrix/r2.mtx || exit 1
++	./qrdemo < ../Matrix/a04.mtx || exit 1
++	./qrdemo < ../Matrix/a2.mtx || exit 1
++	./qrdemo < ../Matrix/west0067.mtx || exit 1
++	./qrdemo < ../Matrix/c2.mtx || exit 1
++	./qrdemo < ../Matrix/a0.mtx || exit 1
++	./qrdemo < ../Matrix/lfat5b.mtx || exit 1
++	./qrdemo < ../Matrix/bfwa62.mtx || exit 1
++	./qrdemo < ../Matrix/LFAT5.mtx || exit 1
++	./qrdemo < ../Matrix/b1_ss.mtx || exit 1
++	./qrdemo < ../Matrix/bcspwr01.mtx || exit 1
++	./qrdemo < ../Matrix/lpi_galenet.mtx || exit 1
++	./qrdemo < ../Matrix/lpi_itest6.mtx || exit 1
++	./qrdemo < ../Matrix/ash219.mtx || exit 1
++	./qrdemo < ../Matrix/a4.mtx || exit 1
++	./qrdemo < ../Matrix/s32.mtx || exit 1
++	./qrdemo < ../Matrix/c32.mtx || exit 1
++	./qrdemo < ../Matrix/lp_share1b.mtx || exit 1
++	./qrdemo < ../Matrix/a1.mtx || exit 1
++	./qrdemo < ../Matrix/GD06_theory.mtx || exit 1
++	./qrdemo < ../Matrix/GD01_b.mtx || exit 1
++	./qrdemo < ../Matrix/Tina_AskCal_perm.mtx || exit 1
++	./qrdemo < ../Matrix/Tina_AskCal.mtx || exit 1
++	./qrdemo < ../Matrix/GD98_a.mtx || exit 1
++	./qrdemo < ../Matrix/Ragusa16.mtx || exit 1
++	./qrdemo < ../Matrix/young1c.mtx || exit 1
++	./qrdemoc < ../Matrix/a2.mtx || exit 1
++	./qrdemoc < ../Matrix/r2.mtx || exit 1
++	./qrdemoc < ../Matrix/a04.mtx || exit 1
++	./qrdemoc < ../Matrix/a2.mtx || exit 1
++	./qrdemoc < ../Matrix/west0067.mtx || exit 1
++	./qrdemoc < ../Matrix/c2.mtx || exit 1
++	./qrdemoc < ../Matrix/a0.mtx || exit 1
++	./qrdemoc < ../Matrix/lfat5b.mtx || exit 1
++	./qrdemoc < ../Matrix/bfwa62.mtx || exit 1
++	./qrdemoc < ../Matrix/LFAT5.mtx || exit 1
++	./qrdemoc < ../Matrix/b1_ss.mtx || exit 1
++	./qrdemoc < ../Matrix/bcspwr01.mtx || exit 1
++	./qrdemoc < ../Matrix/lpi_galenet.mtx || exit 1
++	./qrdemoc < ../Matrix/lpi_itest6.mtx || exit 1
++	./qrdemoc < ../Matrix/ash219.mtx || exit 1
++	./qrdemoc < ../Matrix/a4.mtx || exit 1
++	./qrdemoc < ../Matrix/s32.mtx || exit 1
++	./qrdemoc < ../Matrix/c32.mtx || exit 1
++	./qrdemoc < ../Matrix/lp_share1b.mtx || exit 1
++	./qrdemoc < ../Matrix/a1.mtx || exit 1
++	./qrdemoc < ../Matrix/GD06_theory.mtx || exit 1
++	./qrdemoc < ../Matrix/GD01_b.mtx || exit 1
++	./qrdemoc < ../Matrix/Tina_AskCal_perm.mtx || exit 1
++	./qrdemoc < ../Matrix/Tina_AskCal.mtx || exit 1
++	./qrdemoc < ../Matrix/GD98_a.mtx || exit 1
++	./qrdemoc < ../Matrix/Ragusa16.mtx || exit 1
++	./qrdemoc < ../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.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/spqr-1.1.0.ebuild b/sci-libs/spqr/spqr-1.1.0.ebuild
deleted file mode 100644
index e34745952ee1..000000000000
--- a/sci-libs/spqr/spqr-1.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.1.0.ebuild,v 1.2 2009/10/23 03:48:29 markusle Exp $
-
-EAPI=2
-inherit eutils autotools
-
-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 tbb"
-RDEPEND="sci-libs/cholmod[supernodal]
-	tbb? ( dev-cpp/tbb )
-	metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-	cd "${S}"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with metis) \
-		$(use_with tbb)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins Doc/*.pdf || die
-	fi
-}
diff --git a/sci-libs/spqr/spqr-1.1.2.ebuild b/sci-libs/spqr/spqr-1.1.2.ebuild
deleted file mode 100644
index 73aab760aaa2..000000000000
--- a/sci-libs/spqr/spqr-1.1.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.1.2.ebuild,v 1.1 2009/11/21 07:58:34 bicatali Exp $
-
-EAPI=2
-inherit eutils autotools
-
-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 tbb"
-RDEPEND="sci-libs/cholmod[supernodal]
-	tbb? ( dev-cpp/tbb )
-	metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}"
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${PN}-1.1.0-autotools.patch
-	epatch "${FILESDIR}"/${PN}-1.1.0-gcc43.patch
-	cd "${S}"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_with metis) \
-		$(use_with tbb)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins Doc/*.pdf || die
-	fi
-}
diff --git a/sci-libs/spqr/spqr-1.2.0.ebuild b/sci-libs/spqr/spqr-1.2.2.ebuild
index 612723554c0e..9c14cf026b6d 100644
--- a/sci-libs/spqr/spqr-1.2.0.ebuild
+++ b/sci-libs/spqr/spqr-1.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.2.0.ebuild,v 1.2 2010/12/25 18:51:56 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/spqr/spqr-1.2.2.ebuild,v 1.1 2011/08/07 03:47:10 bicatali Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils autotools
 
 MY_PN=SPQR
@@ -23,10 +23,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_PN}"
 
 src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${PN}-1.1.0-autotools.patch
-	epatch "${FILESDIR}"/${PN}-1.1.0-gcc43.patch
-	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-autotools.patch
 	eautoreconf
 }
 
@@ -38,10 +35,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins Doc/*.pdf || die
-	fi
+	default
+	dodoc README.txt Doc/ChangeLog
+	use doc && doins Doc/*.pdf
 }