Version bump. Fixed collision with cxsparse, rse, fixing bug #246589

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

5 files changed, 121 insertions, 10 deletions

diff --git a/sci-libs/csparse/ChangeLog b/sci-libs/csparse/ChangeLog
index 90bf19cad48c..f541d92378e1 100644
--- a/sci-libs/csparse/ChangeLog
+++ b/sci-libs/csparse/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/csparse
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/csparse/ChangeLog,v 1.1 2008/02/05 18:44:59 bicatali Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/csparse/ChangeLog,v 1.2 2009/03/09 16:45:31 bicatali Exp $
+
+*csparse-2.2.2 (09 Mar 2009)
+*csparse-2.2.1-r1 (09 Mar 2009)
+
+  09 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/csparse-2.2.2-autotools.patch, -csparse-2.2.1.ebuild,
+  +csparse-2.2.1-r1.ebuild, +csparse-2.2.2.ebuild:
+  Version bump. Fixed collision with cxsparse, rse, fixing bug #246589
 
 *csparse-2.2.1 (05 Feb 2008)
 
diff --git a/sci-libs/csparse/Manifest b/sci-libs/csparse/Manifest
index d1b300cab793..0c1c7b6ee126 100644
--- a/sci-libs/csparse/Manifest
+++ b/sci-libs/csparse/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 AUX csparse-2.2.1-autotools.patch 2262 RMD160 1cf4cfa1ce55946498d0d0ed6070093994856442 SHA1 0279b5c77c7f0ccb54e1ff2b0192a701eeb7c13f SHA256 8deecba19fe66a964841cc24dcfa89896019c58c2fd5ab965b40e5646f6629b3
+AUX csparse-2.2.2-autotools.patch 2262 RMD160 6bbfa2cdbbca8dee69f321bc012cb2eea29eb608 SHA1 2de16ce208433863f02e85dffbf631b4e6fe70e3 SHA256 d22cb09f824bd3e821c310aa560d49addc0ba3993826696b68d411a391eb14d3
 DIST CSparse-2.2.1.tar.gz 1365607 RMD160 17982a35c481235e67b669400c039acc39f4ecbe SHA1 731c062a8e804f7a1d2ccb666f9a436ba6f0cc83 SHA256 75aa04437444f2a829743c57387079641e7aa2ac107dc3e89673d76b3c15b77f
-EBUILD csparse-2.2.1.ebuild 782 RMD160 adb50eb906d0bfd0f82790b6da3e7804e3176d4f SHA1 3510cf300cfa5f9199068e3a89bb3d0d4458dfb4 SHA256 679a0c4c7636ebb7eb90a624107b78116c7cba72cf4f4e0f4b85cd24d01e1f52
-MISC ChangeLog 415 RMD160 8496eecf79c8df1dadfac4a8d696443794c8d7b2 SHA1 0f3154b0e61af19c250dd8a9463616a446dd1792 SHA256 4c3b10703b225dbc4147788faa924f960bb48ec1ad39b35589c6115725f236e6
+DIST CSparse-2.2.2.tar.gz 1368004 RMD160 883cd389f396db597a04c096c4101b74b3b546fe SHA1 e12963c872fe8b419ec5617d2fbd5c736ace290f SHA256 84b58f04d23dfe2b111af06cdcff22f10115c5d49b6431fddbc9ef57253b1ab3
+EBUILD csparse-2.2.1-r1.ebuild 909 RMD160 51a0faafc4da86c2b79cdb791c96c57c9cb35ffa SHA1 b1cde8313849917bb91219e38de64f683fe3f838 SHA256 df19ced72dfdcb14abb2c6aaf9631c8f305a2451a9a27cc5ccb9cf1c0424bde3
+EBUILD csparse-2.2.2.ebuild 874 RMD160 59ec693a048ffd46fe1b1e328a27e9508ec439e9 SHA1 2e52847a82521dc35c6d09fa2119da6ee58327ae SHA256 52a951cc3d291c6b16b5ec7c701461a4ae955e4ef343d278a2ccc1e8d16e79cd
+MISC ChangeLog 718 RMD160 6c81208ecef89479f699d1be39b44b71223c7b7c SHA1 2b11fd1f627dfa52651ec0e16cf71d7ab10d8ef1 SHA256 f0bd29935063b2e58ce506db9c6601336bee3db1153fcac82edc9f0d917e6242
 MISC metadata.xml 562 RMD160 d5bcb502069ef1fb8c018ddbb1a8ed2c054d2d36 SHA1 0df820628b5fa2b495e1c819a3295e655c8f02f4 SHA256 d19953c777c3646e149790954a1858494b9874f83b0d3b5ab447820e54e70308
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iD4DBQFHqK611ycZbhPLE2ARAo/hAKCvFodXq6ikKoeUe94lqCqSIld0sQCXaNuK
-c6R0VQgjgUqzHjMSXKD9cg==
-=ObWd
+iEYEARECAAYFAkm1R7YACgkQ1ycZbhPLE2CqcwCeKRHNMcRqcYRzcQO7Z0VROYn1
+SUIAn2ObEGXayq8mXxMW1rREapDLVWoa
+=vVxP
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/csparse/csparse-2.2.1.ebuild b/sci-libs/csparse/csparse-2.2.1-r1.ebuild
index 5e846e9af952..1a148153baaa 100644
--- a/sci-libs/csparse/csparse-2.2.1.ebuild
+++ b/sci-libs/csparse/csparse-2.2.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/csparse/csparse-2.2.1.ebuild,v 1.1 2008/02/05 18:44:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/csparse/csparse-2.2.1-r1.ebuild,v 1.1 2009/03/09 16:45:31 bicatali Exp $
 
 inherit autotools eutils
 
@@ -24,6 +24,12 @@ src_unpack() {
 	eautoreconf
 }
 
+src_compile() {
+	# avoid collision with cxsparse
+	econf --includedir="/usr/include/csparse"
+	emake || die "emake failed"
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
diff --git a/sci-libs/csparse/csparse-2.2.2.ebuild b/sci-libs/csparse/csparse-2.2.2.ebuild
new file mode 100644
index 000000000000..6f45cc77748e
--- /dev/null
+++ b/sci-libs/csparse/csparse-2.2.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/csparse/csparse-2.2.2.ebuild,v 1.1 2009/03/09 16:45:31 bicatali Exp $
+
+EAPI=2
+inherit autotools eutils
+
+MY_PN=CSparse
+DESCRIPTION="Concise sparse matrix package."
+HOMEPAGE="http://www.cise.ufl.edu/research/sparse/CSparse"
+SRC_URI="http://www.cise.ufl.edu/research/sparse/${MY_PN}/versions/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/${MY_PN}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-autotools.patch
+	eautoreconf
+}
+
+src_configure() {
+	# avoid collision with cxsparse
+	econf --includedir="/usr/include/csparse"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README.txt Doc/ChangeLog || die "dodoc failed"
+}
diff --git a/sci-libs/csparse/files/csparse-2.2.2-autotools.patch b/sci-libs/csparse/files/csparse-2.2.2-autotools.patch
new file mode 100644
index 000000000000..dc2846c66994
--- /dev/null
+++ b/sci-libs/csparse/files/csparse-2.2.2-autotools.patch
@@ -0,0 +1,59 @@
+--- configure.ac 	1970-01-01 01:00:00.000000000 +0100
++++ configure.ac	2008-01-30 18:34:40.659910749 +0000
+@@ -0,0 +1,10 @@
++# -*- Autoconf -*-
++AC_PREREQ(2.59)
++AC_INIT(csparse, 2.2.3, davis@cise.ufl.edu)
++AM_INIT_AUTOMAKE([foreign])
++AC_PROG_INSTALL
++AC_PROG_LIBTOOL
++AC_CHECK_LIB(m, sqrt)
++AC_CHECK_HEADERS(UFconfig.h)
++AC_CONFIG_FILES([Makefile Source/Makefile Demo/Makefile])
++AC_OUTPUT
+--- Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Makefile.am	2008-01-30 18:35:32.154594734 +0000
+@@ -0,0 +1,4 @@
++SUBDIRS = Source Demo
++EXTRA_DIST = README.txt
++include_HEADERS = Include/cs.h
++
+--- Source/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Source/Makefile.am	2008-01-30 18:45:50.337822988 +0000
+@@ -0,0 +1,12 @@
++AM_CPPFLAGS = -I$(top_builddir)/Include
++lib_LTLIBRARIES = libcsparse.la
++libcsparse_la_SOURCES = \
++	cs_add.c cs_amd.c cs_chol.c cs_cholsol.c cs_counts.c cs_cumsum.c \
++	cs_droptol.c cs_dropzeros.c cs_dupl.c cs_entry.c \
++	cs_etree.c cs_fkeep.c cs_gaxpy.c cs_happly.c cs_house.c cs_ipvec.c \
++	cs_lsolve.c cs_ltsolve.c cs_lu.c cs_lusol.c cs_util.c cs_multiply.c \
++	cs_permute.c cs_pinv.c cs_post.c cs_pvec.c cs_qr.c cs_qrsol.c \
++	cs_scatter.c cs_schol.c cs_sqr.c cs_symperm.c cs_tdfs.c cs_malloc.c \
++	cs_transpose.c cs_compress.c cs_usolve.c cs_utsolve.c cs_scc.c \
++	cs_maxtrans.c cs_dmperm.c cs_updown.c cs_print.c cs_norm.c cs_load.c \
++	cs_dfs.c cs_reach.c cs_spsolve.c cs_ereach.c cs_leaf.c cs_randperm.c
+--- Demo/Makefile.am 	1970-01-01 01:00:00.000000000 +0100
++++ Demo/Makefile.am	2008-01-31 11:11:28.880545257 +0000
+@@ -0,0 +1,21 @@
++AM_CPPFLAGS = -I$(top_srcdir)/Include
++LDADD = $(top_builddir)/Source/libcsparse.la -lm
++
++check_PROGRAMS = cs_demo1 cs_demo2 cs_demo3
++
++check-local: $(check_PROGRAMS)
++	- ./cs_demo1 < ../Matrix/t1
++	- ./cs_demo2 < ../Matrix/t1
++	- ./cs_demo2 < ../Matrix/ash219
++	- ./cs_demo2 < ../Matrix/bcsstk01
++	- ./cs_demo2 < ../Matrix/fs_183_1
++	- ./cs_demo2 < ../Matrix/mbeacxc
++	- ./cs_demo2 < ../Matrix/west0067
++	- ./cs_demo2 < ../Matrix/lp_afiro
++	- ./cs_demo2 < ../Matrix/bcsstk16
++	- ./cs_demo3 < ../Matrix/bcsstk01
++	- ./cs_demo3 < ../Matrix/bcsstk16
++
++cs_demo1_SOURCE = cs_demo1.c
++cs_demo2_SOURCES= cs_demo2.c cs_demo.c cs_demo.h
++cs_demo3_SOURCES = cs_demo3.c cs_demo.c cs_demo.h