Removed a non robust test, bug #261568

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

4 files changed, 10 insertions, 130 deletions

diff --git a/sci-libs/amd/ChangeLog b/sci-libs/amd/ChangeLog
index 7d5896fad485..1bcec1b48fbe 100644
--- a/sci-libs/amd/ChangeLog
+++ b/sci-libs/amd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/amd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/ChangeLog,v 1.11 2009/02/08 15:36:23 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/ChangeLog,v 1.12 2009/03/09 10:40:40 bicatali Exp $
+
+  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
diff --git a/sci-libs/amd/amd-2.0.4.ebuild b/sci-libs/amd/amd-2.0.4.ebuild
deleted file mode 100644
index 77350afdf132..000000000000
--- a/sci-libs/amd/amd-2.0.4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/amd/amd-2.0.4.ebuild,v 1.3 2008/06/29 08:13:40 tove Exp $
-
-inherit autotools eutils fortran
-
-MY_PN=AMD
-DESCRIPTION="Library to order a sparse matrix prior to Cholesky factorization"
-HOMEPAGE="http://www.cise.ufl.edu/research/sparse/amd"
-SRC_URI="http://www.cise.ufl.edu/research/sparse/${PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-DEPEND="sci-libs/ufconfig"
-
-S="${WORKDIR}/${MY_PN}"
-
-FORTRAN="gfortran g77 ifc"
-
-src_unpack() {
-	fortran_src_unpack
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}"/${P}-autotools.patch
-	cd "${S}"
-	rm -f Makefile */*akefile
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc README.txt Doc/ChangeLog
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins Doc/AMD_UserGuide.pdf
-	fi
-}
diff --git a/sci-libs/amd/files/amd-2.0.4-autotools.patch b/sci-libs/amd/files/amd-2.0.4-autotools.patch
deleted file mode 100644
index 9beb832f899f..000000000000
--- a/sci-libs/amd/files/amd-2.0.4-autotools.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -Nur AMD.orig/Demo/Makefile.am AMD/Demo/Makefile.am
---- AMD.orig/Demo/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ AMD/Demo/Makefile.am	2007-02-16 18:09:36.000000000 +0000
-@@ -0,0 +1,42 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
-+AM_LDFLAGS = -lm
-+check_PROGRAMS = \
-+	amd_simple \
-+	amd_demo \
-+	amd_demo2 \
-+	amd_l_demo \
-+	amd_f77demo \
-+	amd_f77simple \
-+	amd_f77cross
-+
-+amd_demo_SOURCES = amd_demo.c
-+amd_demo_LDADD = $(top_builddir)/Source/libamd.la
-+
-+amd_l_demo_SOURCES = amd_l_demo.c
-+amd_l_demo_LDADD = $(top_builddir)/Source/libamd.la
-+
-+amd_demo2_SOURCES = amd_demo2.c
-+amd_demo2_LDADD = $(top_builddir)/Source/libamd.la
-+
-+amd_simple_SOURCES = amd_simple.c
-+amd_simple_LDADD = $(top_builddir)/Source/libamd.la
-+
-+amd_f77demo_SOURCES = amd_f77demo.f
-+amd_f77demo_LDADD = $(top_builddir)/Source/libamd.la $(top_builddir)/Source/libamdf77.la
-+
-+amd_f77simple_SOURCES = amd_f77simple.f
-+amd_f77simple_LDADD = $(top_builddir)/Source/libamd.la $(top_builddir)/Source/libamdf77.la
-+
-+amd_f77wrapper_CPPFLAGS = -DDINT
-+amd_f77cross_SOURCES = amd_f77cross.f amd_f77wrapper.f
-+amd_f77cross_LDADD = $(top_builddir)/Source/libamd.la \
-+	$(top_builddir)/Source/libamdf77.la
-+
-+check-local:
-+	@for i in $(ALL_TEST); do \
-+		$$i > my_$$i.out; \
-+		- diff $$i.out my_$$i.out; \
-+	done;
-+
-+clean-local:
-+	rm -f my*.out
-diff -Nur AMD.orig/Makefile.am AMD/Makefile.am
---- AMD.orig/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ AMD/Makefile.am	2007-02-17 19:42:32.000000000 +0000
-@@ -0,0 +1,3 @@
-+SUBDIRS = Demo Source
-+EXTRA_DIST = README.txt
-+include_HEADERS = Include/amd.h Include/amd_internal.h
-diff -Nur AMD.orig/Source/Makefile.am AMD/Source/Makefile.am
---- AMD.orig/Source/Makefile.am	1970-01-01 01:00:00.000000000 +0100
-+++ AMD/Source/Makefile.am	2007-02-19 00:20:25.000000000 +0000
-@@ -0,0 +1,15 @@
-+AMDCSRC = amd_aat.c amd_1.c amd_2.c amd_dump.c amd_postorder.c amd_post_tree.c amd_defaults.c \
-+	amd_order.c amd_control.c amd_info.c amd_valid.c amd_preprocess.c
-+
-+lib_LTLIBRARIES = libamd.la libamdf77.la
-+noinst_LTLIBRARIES = libamdi.la libamdl.la
-+AM_CPPFLAGS = -I$(top_srcdir)/Include
-+
-+libamdi_la_SOURCES = $(AMDCSRC)
-+libamdi_la_CPPFLAGS = $(AM_CPPFLAGS) -DDINT
-+libamdl_la_SOURCES = $(AMDCSRC)
-+libamdl_la_CPPFLAGS = $(AM_CPPFLAGS) -DDLONG
-+
-+libamd_la_SOURCES = amd_global.c
-+libamd_la_LIBADD = libamdl.la libamdi.la
-+libamdf77_la_SOURCES = amd.f amdbar.f
-diff -Nur AMD.orig/configure.ac AMD/configure.ac
---- AMD.orig/configure.ac	1970-01-01 01:00:00.000000000 +0100
-+++ AMD/configure.ac	2007-02-18 23:30:10.000000000 +0000
-@@ -0,0 +1,12 @@
-+#                                               -*- Autoconf -*-
-+AC_PREREQ(2.59)
-+AC_INIT(amd, 2.0.4, davis@cise.ufl.edu)
-+AM_INIT_AUTOMAKE([foreign])
-+AC_PROG_INSTALL
-+AC_PROG_F77
-+AC_PROG_LIBTOOL
-+AC_CHECK_LIB(m, sqrt)
-+AC_CONFIG_FILES([Source/Makefile
-+		 Demo/Makefile
-+		 Makefile])
-+AC_OUTPUT
diff --git a/sci-libs/amd/files/amd-2.2.0-autotools.patch b/sci-libs/amd/files/amd-2.2.0-autotools.patch
index 13a1e4109f40..8e53f9cf42f4 100644
--- a/sci-libs/amd/files/amd-2.2.0-autotools.patch
+++ b/sci-libs/amd/files/amd-2.2.0-autotools.patch
@@ -19,20 +19,21 @@ diff -Nur ../AMD.orig/configure.ac ./configure.ac
 diff -Nur ../AMD.orig/Demo/Makefile.am ./Demo/Makefile.am
 --- ../AMD.orig/Demo/Makefile.am	1970-01-01 01:00:00.000000000 +0100
 +++ ./Demo/Makefile.am	2007-08-18 17:58:28.566755030 +0100
-@@ -0,0 +1,44 @@
+@@ -0,0 +1,45 @@
 +AM_CPPFLAGS = -I$(top_srcdir)/Include
 +LDADD = $(top_builddir)/Source/libamd.la -lm
 +check_PROGRAMS = \
 +	amd_simple \
 +	amd_demo \
 +	amd_demo2 \
-+	amd_l_demo \
 +	amd_f77demo \
 +	amd_f77simple \
 +	amd_f77cross
++# buggy demo
++#	amd_l_demo
 +
 +amd_demo_SOURCES = amd_demo.c
-+amd_l_demo_SOURCES = amd_l_demo.c
++#amd_l_demo_SOURCES = amd_l_demo.c
 +amd_demo2_SOURCES = amd_demo2.c
 +amd_simple_SOURCES = amd_simple.c
 +amd_f77demo_SOURCES = amd_f77demo.f