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

Package-Manager: portage-2.1.4.4

5 files changed, 67 insertions, 13 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/Manifest b/sci-libs/fftw/Manifest
index b2a264b3568c..89541145fe27 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -3,17 +3,18 @@ Hash: SHA1
 
 AUX fftw-2.1.5-as-needed.patch 4374 RMD160 b9bc387a322cec9d36d7d7ff54e556e907767742 SHA1 3274a914d3532190fb8c2c96d944c85b5ab47237 SHA256 b1d65b2dca62257db5c78e81577fb87b7d79f6eb75b8899de48faabfc702e9f0
 AUX fftw-2.1.5-configure.in.patch 6456 RMD160 18d01f44617cc5d7bfd7c34d944caefcd6fd2be0 SHA1 8ebbf4fd43558bd2ec3a9f7402be78d75074eabe SHA256 04aa10f41edb1e5a1c4513021f24fe953c7f2a740a4d15363a6ae24b94bf2a3e
+AUX fftw-2.1.5-no-test.patch 1592 RMD160 86ec7b7fd58a1c67ecc7b53f4927bb23cf88d668 SHA1 356283400cd80bcdd90d32a6dee0aa43d34cfe4f SHA256 e56d733196008b8d0366cae20a3d1966cc4f16d2276a93c37b59086a8322b83a
 AUX fftw-3.1.2-configure.ac.patch 523 RMD160 1b4936d4bdbdc0ee7c39a6b54a3d27a681013a4f SHA1 f77634e1cc92d1e42c368cdfd78af995fcbfa6e2 SHA256 e203086198ec9cb65caddb432dcfe2cc207bb197d22c7ca21c0bc37a0c725ea5
 DIST fftw-2.1.5.tar.gz 1256888 RMD160 723308722d76c12710db6473979adf8d086b0909 SHA1 12020b58edc1b0490a83db4aa912fac5dfdfb26b SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630
 DIST fftw-3.1.2.tar.gz 2736360 RMD160 13069b3582eeaa1fba1614cdca2dfbc2e45ab585 SHA1 3e4c64009ffb48123a0f30f46c1d89da7810dc67 SHA256 e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf
-EBUILD fftw-2.1.5-r4.ebuild 3386 RMD160 477a23f980328f1334ba276dee6b0cc7147115b2 SHA1 447bcb4ef75f018a08742bbeaef3ef9ad27440a7 SHA256 5d24454ab15698ffb4195802ec9f64b13c48cd54cf37c3d403a029cb8c75b0d2
-EBUILD fftw-3.1.2.ebuild 3027 RMD160 6994d9259a730ad222c7756abbf276a1f196cfbb SHA1 7d7138e59f56affb4ed20e5bd4d31a468d69546b SHA256 e5d064befd168788f76f5099263d8c7503d12f94bd124d12a5e53d1b3779f7fd
-MISC ChangeLog 14082 RMD160 7b578be3372ab93361ca570b801f619ac6167e03 SHA1 8ab6ab1dc691bc1c76c36f56b9f702d56e4d0b12 SHA256 f0a08bde5e1c3421cbb8e67cec9332d4281660721f8851998cdc9a746621ee06
+EBUILD fftw-2.1.5-r4.ebuild 3435 RMD160 6dec3455cbb6e4804d1d0899a9816a7c771aef03 SHA1 e385b611622d2f4fa0f5c16bdf12df516fb60ade SHA256 9cc764af059cd98c3902d0e483b4f909b6269824a43201f9a776ff30541b8e10
+EBUILD fftw-3.1.2.ebuild 3028 RMD160 ccae2a7aa9987a6dadac0de1b6c22d70f267c14d SHA1 a099a89a2fe1164b78b05b2a41d29b4a8c4a776a SHA256 96b29aa7df715b9765596d0e9c69a69013232e412d255afbc71e58feb3160804
+MISC ChangeLog 14489 RMD160 a5d23ba48a849d66ff2384beaae052266d4051df SHA1 adfbb6e5d8c61017246a69018684a4ad3158c99e SHA256 24bac7fcd6cf0ad9b4a237f8d93c0448de6416541e3b214453761022dfd346f6
 MISC metadata.xml 637 RMD160 a7f1ab3fce5eae79531875234ca77532d0fd2cfa SHA1 b1cce6af4d119fc1b4f640b33e4ef1a8318a736c SHA256 a2798427fe8d4cbe97cf588e66bf54cc37d9650b9451290c2b6846cc6bb81e50
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.9 (GNU/Linux)
 
-iD8DBQFIF5021ycZbhPLE2ARAgxoAKChNA0LVeltD0kQ72bguaZ+fpaqYQCfTso4
-m2AwG2GIapWi2a0UHywTuw0=
-=CNgD
+iEYEARECAAYFAkhftCYACgkQ1ycZbhPLE2BXVQCeOWU6V5SDPguTSYvx193xXUd1
+MqsAn2FCx/0gYFZ2pCm5g/kVRPZ3Y1kP
+=qxCV
 -----END PGP SIGNATURE-----
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