Added a patch to avoid building tests if not requested (bug #226325), and mips is now ~ for 3.1.2

(Portage version: 2.1.4.4)

4 files changed, 59 insertions, 6 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index f3faf0a3ac97..93c99bca0a48 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.65 2008/04/14 13:56:14 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.66 2008/06/23 14:31:13 bicatali Exp $
+
+  23 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/fftw-2.1.5-no-test.patch, fftw-2.1.5-r4.ebuild, fftw-3.1.2.ebuild:
+  mips is now dev
+
+  23 Jun 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/fftw-2.1.5-no-test.patch, fftw-2.1.5-r4.ebuild:
+  Added a patch to avoid building tests if not requested (bug #226325).
+  (fftw-3.1.2 needs to build the test to build the fftw-wisdom binary.)
 
   14 Apr 2008; Sébastien Fabbro <bicatali@gentoo.org> fftw-2.1.5-r3.ebuild:
   Fixed a link for rfftw, thanks Justin for noticing
diff --git a/sci-libs/fftw/fftw-2.1.5-r4.ebuild b/sci-libs/fftw/fftw-2.1.5-r4.ebuild
index aabc695fb017..afd0f5945947 100644
--- a/sci-libs/fftw/fftw-2.1.5-r4.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r4.ebuild,v 1.1 2008/04/29 22:11:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r4.ebuild,v 1.2 2008/06/23 14:31:13 bicatali Exp $
 
 inherit eutils flag-o-matic multilib autotools fortran
 
@@ -41,6 +41,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-as-needed.patch"
 	epatch "${FILESDIR}/${P}-configure.in.patch"
+	epatch "${FILESDIR}/${P}-no-test.patch"
 
 	# fix info files
 	for infofile in doc/fftw*info*; do
@@ -89,9 +90,9 @@ src_compile() {
 
 src_test() {
 	cd "${S}-single"
-	emake check || die "emake check single failed"
+	emake -j1 check || die "emake check single failed"
 	cd "${S}-double"
-	emake check || die "emake check double failed"
+	emake -j1 check || die "emake check double failed"
 }
 
 src_install () {
diff --git a/sci-libs/fftw/fftw-3.1.2.ebuild b/sci-libs/fftw/fftw-3.1.2.ebuild
index ef482cbc779e..183ff1e1b3f3 100644
--- a/sci-libs/fftw/fftw-3.1.2.ebuild
+++ b/sci-libs/fftw/fftw-3.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.2.ebuild,v 1.12 2008/04/01 22:10:25 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.2.ebuild,v 1.13 2008/06/23 14:31:13 bicatali Exp $
 
 inherit flag-o-matic eutils toolchain-funcs autotools fortran
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3.0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="altivec fortran sse sse2 test"
 
 DEPEND="test? ( dev-lang/perl )"
diff --git a/sci-libs/fftw/files/fftw-2.1.5-no-test.patch b/sci-libs/fftw/files/fftw-2.1.5-no-test.patch
new file mode 100644
index 000000000000..146d83a371b9
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-2.1.5-no-test.patch
@@ -0,0 +1,43 @@
+--- tests/Makefile.am.orig	2008-06-22 12:29:53.149138283 +0100
++++ tests/Makefile.am	2008-06-22 12:30:32.731595087 +0100
+@@ -1,4 +1,4 @@
+-noinst_PROGRAMS = fftw_test rfftw_test
++check_PROGRAMS = fftw_test rfftw_test
+ noinst_HEADERS = test_main.h
+ 
+ FFTWDIR=../fftw
+--- mpi/Makefile.am.orig	2008-06-22 17:21:16.998466390 +0100
++++ mpi/Makefile.am	2008-06-22 17:27:42.996463162 +0100
+@@ -4,12 +4,12 @@
+ 
+ lib_LTLIBRARIES = @FFTW_MPI_LIBLIST@
+ include_HEADERS = @FFTW_MPI_INCLUDELIST@
+-noinst_PROGRAMS = @FFTW_MPI_PROGLIST@
++check_PROGRAMS = @FFTW_MPI_PROGLIST@
+ 
+ EXTRA_LTLIBRARIES = lib@FFTW_PREFIX@fftw_mpi.la \
+                     lib@FFTW_PREFIX@rfftw_mpi.la
+ EXTRA_HEADERS = @FFTW_PREFIX@fftw_mpi.h @FFTW_PREFIX@rfftw_mpi.h 
+-EXTRA_PROGRAMS = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test
++check_PROGRAMS = test_sched test_transpose_mpi fftw_mpi_test rfftw_mpi_test
+ EXTRA_DIST = README.f77
+ 
+ CC=@MPICC@
+--- threads/Makefile.am.orig	2008-06-22 17:18:18.940409610 +0100
++++ threads/Makefile.am	2008-06-22 17:28:00.485459803 +0100
+@@ -4,13 +4,13 @@
+ 
+ lib_LTLIBRARIES = @FFTW_THREADS_LIBLIST@
+ include_HEADERS = @FFTW_THREADS_INCLUDELIST@
+-noinst_PROGRAMS = @FFTW_THREADS_PROGLIST@
++check_PROGRAMS = @FFTW_THREADS_PROGLIST@
+ 
+ EXTRA_LTLIBRARIES = lib@FFTW_PREFIX@fftw_threads.la \
+                     lib@FFTW_PREFIX@rfftw_threads.la
+ EXTRA_HEADERS = @FFTW_PREFIX@fftw_threads.h \
+                 @FFTW_PREFIX@rfftw_threads.h
+-EXTRA_PROGRAMS = fftw_threads_test rfftw_threads_test
++check_PROGRAMS = fftw_threads_test rfftw_threads_test
+ 
+ FFTWDIR=../fftw
+ RFFTWDIR=../rfftw