diff options
| -rw-r--r-- | sci-libs/amd/ChangeLog | 77 | ||||
| -rw-r--r-- | sci-libs/amd/amd-2.2.1.ebuild | 6 | ||||
| -rw-r--r-- | sci-libs/amd/files/2.2.1-test.patch | 13 | ||||
| -rw-r--r-- | sci-libs/amd/files/amd-2.2.0-tests.patch | 49 |
4 files changed, 28 insertions, 117 deletions
diff --git a/sci-libs/amd/ChangeLog b/sci-libs/amd/ChangeLog index 3e151adf25cb..6089ed826421 100644 --- a/sci-libs/amd/ChangeLog +++ b/sci-libs/amd/ChangeLog @@ -1,77 +1,8 @@ # ChangeLog for sci-libs/amd # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/ChangeLog,v 1.20 2010/10/31 12:01:00 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/ChangeLog,v 1.21 2010/12/02 11:14:44 jlec Exp $ -*amd-2.2.1 (31 Oct 2010) - - 31 Oct 2010; Justin Lecher <jlec@gentoo.org> +amd-2.2.1.ebuild: - Version Bump - - 09 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> amd-2.2.0.ebuild: - ppc64 stable wrt #318649 - - 02 Jan 2010; Christian Faulhammer <fauli@gentoo.org> amd-2.2.0.ebuild: - Transfer Prefix keywords - - 12 Oct 2009; Jeroen Roovers <jer@gentoo.org> amd-2.2.0.ebuild: - Stable for HPPA (bug #245707). - - 17 May 2009; nixnut <nixnut@gentoo.org> amd-2.2.0.ebuild: - ppc stable #245707 - - 20 Apr 2009; Markus Meier <maekke@gentoo.org> amd-2.2.0: - x86 stable, bug #245707 - - 27 Mar 2009; Ferris McCormick <fmccor@gentoo.org> amd-2.2.0.ebuild: - Sparc stable, preparation for bug #245707. - - 23 Mar 2009; Jeremy Olexa <darkside@gentoo.org> amd-2.2.0.ebuild: - amd64 stable, bug 245707 - - 09 Mar 2009; Sébastien Fabbro <bicatali@gentoo.org> - -files/amd-2.0.4-autotools.patch, files/amd-2.2.0-autotools.patch, - -amd-2.0.4.ebuild: - Removed a non robust test, bug #261568 - - 08 Feb 2009; Tobias Klausmann <klausman@gentoo.org> amd-2.2.0.ebuild: - Stable on alpha, bug #245707 - - 29 Jun 2008; Torsten Veller <tove@gentoo.org> amd-2.0.4.ebuild, - amd-2.2.0.ebuild: - Add missing die: || "..." -> || die "..." - - 15 Apr 2008; Jeroen Roovers <jer@gentoo.org> amd-2.2.0.ebuild: - Marked ~hppa (bug #215841). - - 12 Apr 2008; Raúl Porcel <armin76@gentoo.org> amd-2.2.0.ebuild: - Add ~sparc wrt #215841 - - 07 Apr 2008; Tobias Klausmann <klausman@gentoo.org> amd-2.2.0.ebuild: - Keyworded on alpha, bug #215841 - - 26 Mar 2008; Markus Rothe <corsair@gentoo.org> amd-2.2.0.ebuild: - Added ~ppc64; bug #213350 - - 15 Mar 2008; Sébastien Fabbro <bicatali@gentoo.org> - +files/amd-2.2.0-tests.patch, amd-2.2.0.ebuild: - Added patch for tests - - 03 Mar 2008; Daniel Drake <dsd@gentoo.org> amd-2.0.4.ebuild, - amd-2.2.0.ebuild: - Correct license from LGPL-2 to LGPL-2.1 - - 09 Sep 2007; Joseph Jezak <josejx@gentoo.org> amd-2.2.0.ebuild: - Marked ~ppc for bug #191600. - -*amd-2.2.0 (18 Aug 2007) - - 18 Aug 2007; Sébastien Fabbro <bicatali@gentoo.org> - +files/amd-2.2.0-autotools.patch, +amd-2.2.0.ebuild: - Version bump, and fixed the patch for tests - -*amd-2.0.4 (19 Feb 2007) - - 19 Feb 2007; Sébastien Fabbro <bicatali@gentoo.org> - +files/amd-2.0.4-autotools.patch, +metadata.xml, +amd-2.0.4.ebuild: - Initial import, with autotoolization. + 02 Dec 2010; Justin Lecher <jlec@gentoo.org> +files/2.2.1-test.patch, + files/amd-2.2.0-tests.patch, amd-2.2.1.ebuild: + Fixes for tests, 343821 diff --git a/sci-libs/amd/amd-2.2.1.ebuild b/sci-libs/amd/amd-2.2.1.ebuild index 8b86b36addd3..36a15148ba29 100644 --- a/sci-libs/amd/amd-2.2.1.ebuild +++ b/sci-libs/amd/amd-2.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.1.ebuild,v 1.2 2010/10/31 20:16:21 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.2.1.ebuild,v 1.3 2010/12/02 11:14:44 jlec Exp $ EAPI="3" @@ -25,7 +25,9 @@ DEPEND="${RDEPEND}" S="${WORKDIR}/${MY_PN}" src_prepare() { - epatch "${FILESDIR}"/${PN}-2.2.0-autotools.patch + epatch \ + "${FILESDIR}"/${PN}-2.2.0-autotools.patch \ + "${FILESDIR}"/${PV}-test.patch eautoreconf } diff --git a/sci-libs/amd/files/2.2.1-test.patch b/sci-libs/amd/files/2.2.1-test.patch new file mode 100644 index 000000000000..f3bb66b0d9fb --- /dev/null +++ b/sci-libs/amd/files/2.2.1-test.patch @@ -0,0 +1,13 @@ +diff --git a/Demo/amd_f77cross.out b/Demo/amd_f77cross.out +index 6d8a670..79496d1 100644 +--- a/Demo/amd_f77cross.out ++++ b/Demo/amd_f77cross.out +@@ -15,7 +15,7 @@ Column: 4 number of entries: 2 with row indices in AI ( 11 ... 12) + Column: 5 number of entries: 2 with row indices in AI ( 13 ... 14) + row indices: 2 5 + +-amd: approximate minimum degree ordering, results: ++AMD version 2.2.1, Nov 30, 2009, results: + status: OK + n, dimension of A: 5 + nz, number of nonzeros in A: 14 diff --git a/sci-libs/amd/files/amd-2.2.0-tests.patch b/sci-libs/amd/files/amd-2.2.0-tests.patch index 36455bdec8bc..e188a5ea3ac0 100644 --- a/sci-libs/amd/files/amd-2.2.0-tests.patch +++ b/sci-libs/amd/files/amd-2.2.0-tests.patch @@ -1,48 +1,13 @@ ---- Demo/amd_f77cross.out.orig 2008-03-15 15:36:15.767078743 +0000 -+++ Demo/amd_f77cross.out 2008-03-15 15:35:35.496783869 +0000 -@@ -1,21 +1,5 @@ --Input matrix: 5-by- 5 with 14 entries -- --Column: 1 number of entries: 2 with row indices in AI ( 1 ... 2) -- row indices: 1 2 -- --Column: 2 number of entries: 4 with row indices in AI ( 3 ... 6) -- row indices: 1 2 3 5 -- --Column: 3 number of entries: 4 with row indices in AI ( 7 ... 10) -- row indices: 2 3 4 5 -- --Column: 4 number of entries: 2 with row indices in AI ( 11 ... 12) -- row indices: 3 4 -- --Column: 5 number of entries: 2 with row indices in AI ( 13 ... 14) -- row indices: 2 5 +diff --git a/Demo/amd_f77cross.out b/Demo/amd_f77cross.out +index 6d8a670..5e92f32 100644 +--- a/Demo/amd_f77cross.out ++++ b/Demo/amd_f77cross.out +@@ -15,7 +15,7 @@ Column: 4 number of entries: 2 with row indices in AI ( 11 ... 12) + Column: 5 number of entries: 2 with row indices in AI ( 13 ... 14) + row indices: 2 5 -amd: approximate minimum degree ordering, results: +AMD version 2.2.0, May 31, 2007, results: status: OK n, dimension of A: 5 nz, number of nonzeros in A: 14 -@@ -44,6 +28,22 @@ - LU flop count for real A (with no pivoting): 19 - LU flop count for complex A (with no pivoting): 101 - -+Input matrix: 5-by- 5 with 14 entries -+ -+Column: 1 number of entries: 2 with row indices in AI ( 1 ... 2) -+ row indices: 1 2 -+ -+Column: 2 number of entries: 4 with row indices in AI ( 3 ... 6) -+ row indices: 1 2 3 5 -+ -+Column: 3 number of entries: 4 with row indices in AI ( 7 ... 10) -+ row indices: 2 3 4 5 -+ -+Column: 4 number of entries: 2 with row indices in AI ( 11 ... 12) -+ row indices: 3 4 -+ -+Column: 5 number of entries: 2 with row indices in AI ( 13 ... 14) -+ row indices: 2 5 - PERM ( 1) = 1 - PERM ( 2) = 4 - PERM ( 3) = 3 |