paired-single is only supported in fftw-3.2.*

Package-Manager: portage-2.2.0_alpha85/cvs/Linux i686

4 files changed, 150 insertions, 13 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 6296598ee985..64e3a502e642 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.121 2012/02/04 21:45:07 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.122 2012/02/05 20:39:36 ottxor Exp $
+
+*fftw-3.2.2-r2 (05 Feb 2012)
+
+  05 Feb 2012; Christoph Junghans <ottxor@gentoo.org> +fftw-3.2.2-r2.ebuild,
+  fftw-3.3-r2.ebuild:
+  paired-single is only supported in fftw-3.2.*
 
 *fftw-3.3-r2 (04 Feb 2012)
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 639d849dcc1d..7ca2f4c33563 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -13,19 +13,20 @@ DIST fftw-3.3.tar.gz 3965713 RMD160 2a4969019d0b1eda5a09cf68f0a012d3fe30fff8 SHA
 EBUILD fftw-2.1.5-r5.ebuild 3843 RMD160 b87a1e45f8a7fa45a9bd663cccb576e6b787f2be SHA1 1b52fcbc0438e8b2b9a9041baf743e561437c0dc SHA256 aecf18a3fff53f1325d4e797aad819a1ac9fcae672007841223997d4e423125d
 EBUILD fftw-2.1.5-r8.ebuild 3984 RMD160 41b0fd4d44bb9434ec7bb7758c684e3463783933 SHA1 085fe378d09980d5dbea2e60bfaf50e047834685 SHA256 1e49dce881c7618eea3a2465c20c900d19841ca4668e91a652d4eb280690115f
 EBUILD fftw-3.2.2-r1.ebuild 3742 RMD160 14eddca1aec8e6a162b3abf8c01960844d1948b8 SHA1 4cb3dfe4c956a4c3d050bd47b7ce645f3b43b798 SHA256 205acef88b09537bcd1a02dcf00a5cad6ce31cddc690722c21cb59b92071f7e3
+EBUILD fftw-3.2.2-r2.ebuild 3882 RMD160 0b7d62f39d5b7260a5a3584bdda0458f7e01af74 SHA1 1fb28862cec37f206ac0ac986513527f6aabd99d SHA256 138a36550195be5b73b5b9c759f01975a8a4a2aa4c8f3dde0de105954de5e411
 EBUILD fftw-3.2.2.ebuild 3671 RMD160 fd0ec2757bd63b7f5bcee6d34c46de084a8acb37 SHA1 c246551b1b6ddb9ccdc282be2ff5df71d8c82a5d SHA256 eafead37266419279bba2187d5b3c81f903540d16a89e31182c64171faa512a5
 EBUILD fftw-3.3-r1.ebuild 3693 RMD160 0ebd449e2631a2a261977338227758014155d2ed SHA1 08ab702f2f4b278f7108d82365287fd137999c81 SHA256 f0022a04feb2ab1164510d1f1042d74911c91db6f2a518e360fc0df346e44c85
-EBUILD fftw-3.3-r2.ebuild 3484 RMD160 9a67647e0be15f382d333c0af41662d77c10e8b9 SHA1 17904f42ac801e237caa84848126c5f9a8706398 SHA256 6397c31d3a294f98df4fe343468ae47fdb06d4007754612a27e4487a314f2ec7
-MISC ChangeLog 22465 RMD160 4ed23a4ce232d61c96855a924f30a2f7d8e8229e SHA1 28d713a9b3ed19b8486d6dd840ff89e0200e2ff6 SHA256 1f5404ba8cfe9ea9b442258e1bde84284df3f428742766fa50d576e219d842bc
+EBUILD fftw-3.3-r2.ebuild 3430 RMD160 d18103a5796fad73a3ce8b34e891ade6ac33df91 SHA1 e3a5da5238fc21e8d6c50f9a0c5222f0fcaf7677 SHA256 a7b63dd2112a6af0155259af0178d2c8156376d95f35d8793b8d81e589e694be
+MISC ChangeLog 22643 RMD160 9c4ad4cf88f70a24aec0aff6d5a9e37a0db201c9 SHA1 115b1f87d625ba3efd936994bad4e032f37d1c87 SHA256 b6604b18108332e45d00f8db691db963c6086c8c2d494ddc65f6ea6e4e90cee7
 MISC metadata.xml 1056 RMD160 0e2473b1d5087b8453838a27422493ba3423d840 SHA1 0eda7ff79cafd68f383785a91b94faa86ba7def8 SHA256 f0adfac91df27dcce0ef9232b15da9fcabb738e6d4158abe5906e7caea532c98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPLab0AAoJEOeBhlrCAAWGxZ4H/iNci0It1RSrzgpycb/5l0XE
-5lSaO2G1bpbYgpdZ/RlTCSR5qx68QB1ih35SxGHNHAhDfYWNzYZfKKQ4jiWlJJ7j
-pQBLIleBeuS5soZAQcRXC7FnfQshBAYwQzNlYl9GagvuZ6y9eHhR/hUuV2TOH7Qw
-sSNav7kdPxDOrSA7oWBpHMYkP8n77+jcu0RMBqUr0tfSG5yucvLo/biH1mZjhcNa
-eTuE0rsqi/M9vPW6xIhBRu608mwjDFJN8fUMI784RVPnqLq800UZg5uPrnTWuzdL
-MBFJGIHSjlVR9ioA4M+ps/gj2cbeZCxR3QLp5znxQQdL9gmnfJTQbkEcI2hQoYE=
-=U5IZ
+iQEcBAEBAgAGBQJPLukOAAoJEOeBhlrCAAWGE8wH/2VmmyeyNuA0+JKvfGrJ/V0P
+3AquF+6gx4m7SkRqTIzFBvWn24nQ9Z686zUUwHeN3w2tSrcoitUXFTgg4O93zhE9
+taUUEXgp7i1nnp+HtKpjPTjqFVqtMpAVAP1jjZQqAm/B5pNWWM2u5MDaF/jwheGp
+47jHpOq86T+ZIg6T86ZOopGI90pi+RGcoFF18QujHe7HSto2vq/P6UjbvzrJEaE0
+nYH+z4F4aLJHdlpfZncKveDy329YaUcrH++yhZbS3kzCplApgU2TIAovTlV9mJWa
+mgxpqaHEJa1LvOfaDG09EaJRAEgK1ZOcquSRAOTY0g6VGpmgoE2Cd72q2LbFVgc=
+=486P
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.2.2-r2.ebuild b/sci-libs/fftw/fftw-3.2.2-r2.ebuild
new file mode 100644
index 000000000000..3da83fe3bcfd
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.2.2-r2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2-r2.ebuild,v 1.1 2012/02/05 20:39:36 ottxor Exp $
+
+EAPI=2
+
+inherit autotools eutils flag-o-matic fortran-2 toolchain-funcs
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="altivec doc fortran openmp paired-single sse sse2 threads zbus"
+
+DEPEND="fortran? ( virtual/fortran )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use openmp && FORTRAN_NEED_OPENMP="1"
+	use fortran && fortran-2_pkg_setup
+	FFTW_THREADS="--disable-threads --disable-openmp"
+	if use openmp; then
+		FFTW_THREADS="--disable-threads --enable-openmp"
+	elif use threads; then
+		FFTW_THREADS="--enable-threads --disable-openmp"
+	fi
+	if use openmp && ! tc-has-openmp; then
+		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
+		ewarn "If you want to build fftw with OpenMP, abort now,"
+		ewarn "and switch CC to an OpenMP capable compiler"
+		ewarn "Otherwise, we will build using POSIX threads."
+		epause 5
+		FFTW_THREADS="--enable-threads --disable-openmp"
+	fi
+	FFTW_DIRS="single double longdouble"
+	use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	use threads && epatch "${FILESDIR}"/${P}-pc-threads.patch
+	epatch "${FILESDIR}"/${PN}-3.2.1-as-needed.patch
+
+	# fix info file for category directory
+	sed -i \
+		-e 's/Texinfo documentation system/Libraries/' \
+		doc/fftw3.info || die "failed to fix info file"
+
+	rm m4/lt* m4/libtool.m4
+
+	AT_M4DIR=m4 eautoreconf
+	for x in ${FFTW_DIRS}; do
+		mkdir "${S}-${x}" || die
+	done
+}
+
+src_configure() {
+	# filter -Os according to docs
+	replace-flags -Os -O2
+
+	local myconfcommon="--enable-shared
+		$(use_enable fortran)
+		$(use_enable zbus mips-zbus-timer)
+		${FFTW_THREADS}"
+
+	local myconfsingle="${myconfcommon} --enable-single"
+	local myconfdouble="${myconfcommon}"
+	local myconflongdouble="${myconfcommon} --enable-long-double"
+	if use sse2; then
+		myconfsingle="${myconfsingle} --enable-sse"
+		myconfdouble="${myconfdouble} --enable-sse2"
+	elif use sse; then
+		myconfsingle="${myconfsingle} --enable-sse"
+	fi
+	# altivec only helps singles, not doubles
+	if use altivec; then
+		myconfsingle="${myconfsingle} --enable-altivec"
+	fi
+	if use paired-single; then
+		myconfsingle="${myconfsingle} --enable-mips-ps"
+	fi
+
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}"
+		einfo "Configuring for ${x} precision"
+		local p=myconf${x}
+		ECONF_SOURCE="${S}" econf ${!p}
+	done
+}
+
+src_compile() {
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}"
+		einfo "Compiling for ${x} precision"
+		emake || die "emake for ${x} precision failed"
+	done
+}
+
+src_test () {
+	# We want this to be a reasonably quick test, but that is still hard...
+	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
+	# Do not increase the number of threads, it will not help your performance
+	#local testbase="perl check.pl --nthreads=1 --estimate"
+	#		${testbase} -${p}d || die "Failure: $n"
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}/tests"
+		einfo "Testing ${x} precision"
+		emake -j1 check || die "emake test ${x} failed"
+	done
+}
+
+src_install () {
+	# all builds are installed in the same place
+	# libs have distinuguished names; include files, docs etc. identical.
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}"
+		emake DESTDIR="${D}" install || die "emake install for ${x} failed"
+	done
+
+	cd "${S}"
+	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS
+	if use doc; then
+		cd doc
+		insinto /usr/share/doc/${PF}
+		doins -r html fftw3.pdf || die "doc install failed"
+		insinto /usr/share/doc/${PF}/faq
+		doins FAQ/fftw-faq.html/*
+	fi
+}
diff --git a/sci-libs/fftw/fftw-3.3-r2.ebuild b/sci-libs/fftw/fftw-3.3-r2.ebuild
index 02623b9cf343..833ca33f11cc 100644
--- a/sci-libs/fftw/fftw-3.3-r2.ebuild
+++ b/sci-libs/fftw/fftw-3.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3-r2.ebuild,v 1.1 2012/02/04 21:45:07 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3-r2.ebuild,v 1.2 2012/02/05 20:39:36 ottxor Exp $
 
 EAPI=4
 
@@ -13,7 +13,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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="altivec avx doc fortran mpi openmp paired-single quad sse sse2 static-libs threads zbus"
+IUSE="altivec avx doc fortran mpi openmp quad sse sse2 static-libs threads zbus"
 
 DEPEND="
 	fortran? ( virtual/fortran[openmp?] )
@@ -68,7 +68,6 @@ src_configure() {
 				$(use_enable altivec)
 				$(use_enable avx)
 				$(use_enable sse)
-				$(use_enable paired-single mips-ps)
 				$(use_enable mpi)
 			)
 		elif [[ $x == double ]]; then