Version bump

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

8 files changed, 66 insertions, 385 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index d1f2b008d52d..045f1a556945 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/fftw
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.86 2009/05/01 12:07:57 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.87 2009/08/09 04:48:24 bicatali Exp $
+
+*fftw-3.2.2 (09 Aug 2009)
+
+  09 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -fftw-2.1.5-r4.ebuild, -fftw-3.1.2.ebuild, -fftw-3.2.ebuild,
+  +fftw-3.2.2.ebuild, -files/fftw-3.2-as-needed.patch,
+  -files/fftw-3.2-cppflags.patch, -files/fftw-3.2-openmp.patch:
+  Version bump
 
   01 May 2009; Raúl Porcel <armin76@gentoo.org> fftw-2.1.5-r5.ebuild:
   Add ~arm/~s390 wrt #267990
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index ee13cd006704..53c89dcdfc5f 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,23 +1,27 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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 8208 RMD160 a1b764dcee85ce7c70b4145feb7c19c82f820562 SHA1 0cddf5f0a3aa6ac196b9ebb9e2af9a9f3202d391 SHA256 67a153b67cd8aef3fedd92da09185063ac0cb17d63f1a06c5f480873e037d6cd
 AUX fftw-2.1.5-no-test.patch 1247 RMD160 deeb232de9301eaf6363b3ae86fa2e940bd46018 SHA1 271d92082832b522a9abad89652c9ccf1167964f SHA256 9a6cad5e81b4a68ef6c8e137a189ffad462cbbea4850211969417b03768eede1
 AUX fftw-3.1.2-as-needed.patch 1199 RMD160 9132ee7cb555967dd852dd2a9be11a7b13dd900b SHA1 abace49a909a24a735c4768b0454c7b8b560f443 SHA256 5d5e6ff5dff0faa01f7dd81634c5f4a9bc1e0532161ece7112f514dedfe0ff03
 AUX fftw-3.1.2-configure.ac.patch 1055 RMD160 fc8d8b2504b5004d08f2d08b41862010378ce210 SHA1 88fe0e5daa3ea19ebd2441f1226400eb63a6c3cd SHA256 3e8010503aecf10c43b82dfda7b937068d5fe961a70c8406b86aa54bb1cda33d
 AUX fftw-3.1.2-openmp.patch 495 RMD160 bd45753520f1ca051459c66fc5bc54ee02936a5f SHA1 b484fccd298d24c50d8fd6dafd195eb96e2d857a SHA256 b17eb6b21c46b5309b3f215edf368fedb8320663c3d995d58ee6563850170786
-AUX fftw-3.2-as-needed.patch 1199 RMD160 0f22f2a66c23ebc830ec887ee1b4a94a82c02576 SHA1 c3cea571bfa3a90239f6580793751e4eacf8837a SHA256 5ff736816d452fd1e9f57826a45e49e2efbe7ede41f35e16d4b62d3f2edd19a2
-AUX fftw-3.2-cppflags.patch 322 RMD160 0c61bf71cfe2520c390c4c6c116bc780e22c0912 SHA1 f4a58b2b6139cba53f11a7f8f3891c4e71c6a53a SHA256 b232d06e88b14e29dc87b9978ac0136cccff83b58c1782c56aeb3c2858011c40
-AUX fftw-3.2-openmp.patch 1242 RMD160 b60a6af903289599195bc0232e3106d2cce27e78 SHA1 e6b77e08fcfba7f9750391443142b310bceeddee SHA256 29e71cc4f5485dbcd3f1cfe0c71ba2621a4249448820a6afca43b27652ba3fd7
 AUX fftw-3.2.1-as-needed.patch 3184 RMD160 fe4e353851780d1520cfa95cd4403ec7045d9c73 SHA1 c831f88d297579f6feed13a726184dea7f2362f8 SHA256 c70c4544a060f134d88930019562b4b4f413382e33b373e8389036be6aefb91c
 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
 DIST fftw-3.1.3.tar.gz 2810399 RMD160 6df354a7fba100f14361d5ce1bfc18f393979690 SHA1 4ac7f2d4f08e253a1a60f336c8e1879955d93816 SHA256 96cc33243c6b9da6c9955a751402e62d973dbc654c275cc05fdbca65aba0bad5
 DIST fftw-3.2.1.tar.gz 3476044 RMD160 b8537c9a245638ea01bbac7ca56862844be674be SHA1 690a7cb4fb947a555eaf166cd098a43b61796723 SHA256 076a43a8000d331076181ea9e72a56a9cd050400535b7bb3fc2f53b707e712f5
-DIST fftw-3.2.tar.gz 3670044 RMD160 26f686e793f0fafedefa352b38058e76c9ca698c SHA1 7ec19356191ffa3719294a5373f27b75c04c301b SHA256 205a021a87cae27146741d15bff260353497d219332a97718c0c649ab81483d0
-EBUILD fftw-2.1.5-r4.ebuild 3435 RMD160 6dec3455cbb6e4804d1d0899a9816a7c771aef03 SHA1 e385b611622d2f4fa0f5c16bdf12df516fb60ade SHA256 9cc764af059cd98c3902d0e483b4f909b6269824a43201f9a776ff30541b8e10
+DIST fftw-3.2.2.tar.gz 3495117 RMD160 27af9b97072fa3a41b91b9430d093f671a1cd359 SHA1 d43b799eedfb9408f62f9f056f5e8a645618467b SHA256 6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f
 EBUILD fftw-2.1.5-r5.ebuild 3850 RMD160 971cba647f73ef71f54aa8c17fdbfd28108fd44e SHA1 091fdb900a9a5aea7d13d1488e663ddf887e5109 SHA256 3cff0f558de8e5fc3e3d569a8791c2dfb10f35f0f29453441b26ed86e7ee8a55
-EBUILD fftw-3.1.2.ebuild 3028 RMD160 ccae2a7aa9987a6dadac0de1b6c22d70f267c14d SHA1 a099a89a2fe1164b78b05b2a41d29b4a8c4a776a SHA256 96b29aa7df715b9765596d0e9c69a69013232e412d255afbc71e58feb3160804
 EBUILD fftw-3.1.3.ebuild 3956 RMD160 1a26e82f159bbd9354e429edb50257bec385d514 SHA1 68d221a2ce8638bac8016bad7ae09a91ef0aa330 SHA256 c982e9c98cc5b4c1dc4109b5b36b0a4b4cf2e3674a3f13bc4161d159364a65fb
 EBUILD fftw-3.2.1.ebuild 3591 RMD160 97796db981cbc2ea790eae91c327f7c1cd45dc54 SHA1 ebefe3b4cff589bae81774de48310a3f8c2a1cbc SHA256 a026e92ea3a587095e90a7155078cd0ccf4f6717810d040c2eca7cde9d378de2
-EBUILD fftw-3.2.ebuild 3919 RMD160 06eec7f1692940765b79696c4b41656708db8102 SHA1 9d4f696c9ca2aaa5d142e348e132b2a8e9939b66 SHA256 c35a94d183821cc41d34e661979388513fa02a6932a6beca75cba7904ca256bf
-MISC ChangeLog 17713 RMD160 84f4aacf0d7087fdd5d8d9fe1ede911f9d83afc6 SHA1 6c3876acca3c1a824cc24e5105ff3140aa2e567f SHA256 6ef9887138060a20d406947723bf787986e6314418e9a9deb67f0d5caae604d9
+EBUILD fftw-3.2.2.ebuild 3538 RMD160 d1f15d55c03e573c3486b2621deb44a7770095e2 SHA1 4a1dfba91aebfebd5750857f87fcc81d50aa0773 SHA256 6ed531546fbbdfd978065bfbb090181be6d23e8bed78a0d4c4f8f13d9b345355
+MISC ChangeLog 17994 RMD160 95ca33b3f4cbe48f790c832aec02d9a48f815897 SHA1 0a91190de5e109def46209975ca807b0ed04a39e SHA256 4b0640cdc60aeb471e01f1e70b73ebf5125dd84de0b697fe7eb6982b70d91054
 MISC metadata.xml 770 RMD160 ca19408a763b8f3db20849456d67c3027cfdba5e SHA1 8c6d41e762d4cc86eaaeee10a2fc9c4743e0e828 SHA256 129a4af8bed71473f17cf323cb11763e09cf9b63eaa764643a1412c649a8c0bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkp+VTcACgkQ1ycZbhPLE2CmAACdHbXTGdHc70MxxwY9seKGn/mJ
+d5sAnRGPLsHpB2hylDA/BjHI4gmkZYhO
+=53k4
+-----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
deleted file mode 100644
index afd0f5945947..000000000000
--- a/sci-libs/fftw/fftw-2.1.5-r4.ebuild
+++ /dev/null
@@ -1,128 +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/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
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-SRC_URI="http://www.fftw.org/${P}.tar.gz"
-HOMEPAGE="http://www.fftw.org"
-
-# hppa does not have yet a virtual/mpi
-DEPEND="mpi? ( !hppa? ( virtual/mpi ) )
-	mpi? ( hppa? ( sys-cluster/lam-mpi ) )"
-
-SLOT="2.1"
-LICENSE="GPL-2"
-IUSE="doc fortran mpi float"
-
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-
-pkg_setup() {
-	# this one is reported to cause trouble on pentium4 m series
-	filter-mfpmath "sse"
-
-	# here I need (surprise) to increase optimization:
-	# --enable-i386-hacks requires -fomit-frame-pointer to work properly
-	if [ "${ARCH}" == "x86" ]; then
-		is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
-	fi
-	FORTRAN="gfortran ifc g77"
-	use fortran && fortran_pkg_setup
-}
-
-src_unpack() {
-	# doc suggests installing single and double precision versions
-	#  via separate compilations. will do in two separate source trees
-	# since some sed'ing is done during the build
-	# (?if --enable-type-prefix is set?)
-
-	unpack ${A}
-	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
-		cat >> ${infofile} <<-EOF
-			INFO-DIR-SECTION Libraries
-			START-INFO-DIR-ENTRY
-			* fftw: (fftw).				${DESCRIPTION}
-			END-INFO-DIR-ENTRY
-		EOF
-	done
-
-	eautoreconf
-
-	cd "${WORKDIR}"
-	cp -R ${P} ${P}-double
-	mv ${P} ${P}-single
-}
-
-src_compile() {
-	cd "${S}-single"
-	econf \
-		--enable-float \
-		--enable-shared \
-		--enable-type-prefix \
-		--enable-vec-recurse \
-		--enable-threads \
-		$(use_enable fortran) \
-		$(use_enable mpi) \
-		$(use_enable x86 i386-hacks) \
-		|| die "econf for float failed"
-	emake || die "emake for float failed"
-
-	# the only difference here is no --enable-float
-	cd "${S}-double"
-	econf \
-		--enable-shared \
-		--enable-type-prefix \
-		--enable-vec-recurse \
-		--enable-threads \
-		$(use_enable fortran) \
-		$(use_enable mpi) \
-		$(use_enable x86 i386-hacks) \
-		|| die "econf for double failed"
-	emake || die "emake for double failed"
-}
-
-src_test() {
-	cd "${S}-single"
-	emake -j1 check || die "emake check single failed"
-	cd "${S}-double"
-	emake -j1 check || die "emake check double failed"
-}
-
-src_install () {
-
-	# both builds are installed in the same place
-	# libs are distinguished by prefix (s or d), see docs for details
-
-	cd "${S}-single"
-	emake DESTDIR="${D}" install || die "emake install float failed"
-	insinto /usr/include
-	doins fortran/fftw_f77.i || die "doins failed"
-	dodoc AUTHORS ChangeLog NEWS TODO README README.hacks || die "dodoc failed"
-	use doc && dohtml doc/*
-
-	cd "${S}-double"
-	emake DESTDIR="${D}" install || die "emake install double failed"
-
-	if use float; then
-		for f in "${D}"/usr/{include,$(get_libdir)}/*sfft*; do
-			ln -s $(basename ${f}) ${f/sfft/fft}
-		done
-		for f in "${D}"/usr/{include,$(get_libdir)}/*srfft*; do
-			ln -s $(basename ${f}) ${f/srfft/rfft}
-		done
-	else
-		for f in "${D}"/usr/{include,$(get_libdir)}/*dfft*; do
-			ln -s $(basename ${f}) ${f/dfft/fft}
-		done
-		for f in "${D}"/usr/{include,$(get_libdir)}/*drfft*; do
-			ln -s $(basename ${f}) ${f/drfft/rfft}
-		done
-	fi
-}
diff --git a/sci-libs/fftw/fftw-3.1.2.ebuild b/sci-libs/fftw/fftw-3.1.2.ebuild
deleted file mode 100644
index 183ff1e1b3f3..000000000000
--- a/sci-libs/fftw/fftw-3.1.2.ebuild
+++ /dev/null
@@ -1,111 +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/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
-
-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"
-IUSE="altivec fortran sse sse2 test"
-
-DEPEND="test? ( dev-lang/perl )"
-
-pkg_setup() {
-	FORTRAN="gfortran ifc g77"
-	use fortran && fortran_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-configure.ac.patch
-	# fix info file
-	sed -e 's/Texinfo documentation system/Libraries/' \
-		-i doc/fftw3.info || die "failed to fix info file"
-	AT_M4DIR=m4 eautoreconf
-	cd "${WORKDIR}"
-	mv ${P} ${P}-single
-	cp -pPR ${P}-single ${P}-double
-	cp -pPR ${P}-single ${P}-longdouble
-}
-
-src_compile() {
-	# filter -Os according to docs
-	replace-flags -Os -O2
-
-	local myconfcommon="--enable-shared --enable-threads $(use_enable fortran)"
-	local myconfsingle=""
-	local myconfdouble=""
-	local myconflongdouble=""
-
-	if use sse2; then
-		myconfsingle="$myconfsingle --enable-sse"
-		myconfdouble="$myconfdouble --enable-sse2"
-	elif use sse; then
-		myconfsingle="$myconfsingle --enable-sse"
-	fi
-	# altivec only helps floats, not doubles
-	if use altivec; then
-		myconfsingle="$myconfsingle --enable-altivec"
-	fi
-
-	cd "${S}-single"
-	econf \
-		${myconfcommon} \
-		--enable-float \
-		${myconfsingle} || \
-			die "./configure in single failed"
-	emake || die "emake single failed"
-
-	#the only difference here is no --enable-float
-	cd "${S}-double"
-	econf \
-		${myconfcommon} \
-		${myconfdouble} || \
-		die "./configure in double failed"
-	emake || die "emake double failed"
-
-	#the only difference here is --enable-long-double
-	cd "${S}-longdouble"
-	econf \
-		${myconfcommon} \
-		--enable-long-double \
-		${myconflongdouble} || \
-		die "./configure in long double failed"
-	emake || die "emake long double failed"
-}
-
-src_install () {
-	# all builds are installed in the same place
-	# libs have distinuguished names; include files, docs etc. identical.
-	for i in single double longdouble; do
-		cd "${S}-${i}"
-		emake DESTDIR="${D}" install || die "emake install for ${i} failed"
-	done
-
-	# Install documentation.
-	cd "${S}-single"
-	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS || die
-	cd doc/html
-	dohtml -r .
-}
-
-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"
-	for d in single double longdouble; do
-		cd "${S}-${d}"/tests
-		for p in 0 1 2; do
-			n="${d/longdouble/long double} / ${p}-D"
-			einfo "Testing $n"
-			${testbase} -${p}d || die "Failure: $n"
-		done
-	done
-}
diff --git a/sci-libs/fftw/fftw-3.2.ebuild b/sci-libs/fftw/fftw-3.2.2.ebuild
index 6dc56fa75194..fd5d1e1f25c9 100644
--- a/sci-libs/fftw/fftw-3.2.ebuild
+++ b/sci-libs/fftw/fftw-3.2.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild,v 1.2 2008/11/27 10:39:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2.ebuild,v 1.1 2009/08/09 04:48:24 bicatali Exp $
 
-inherit flag-o-matic eutils toolchain-funcs autotools fortran
+EAPI=2
+inherit flag-o-matic eutils toolchain-funcs autotools
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
@@ -32,78 +33,61 @@ pkg_setup() {
 		epause 5
 		FFTW_THREADS="--enable-threads --disable-openmp"
 	fi
-	FORTRAN="gfortran ifc g77"
-	use fortran && fortran_pkg_setup
+	FFTW_DIRS="single double longdouble"
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-openmp.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-cppflags.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2.1-as-needed.patch
 
-	# fix info file
-	sed -e 's/Texinfo documentation system/Libraries/' \
-		-i doc/fftw3.info || die "failed to fix info file"
+	# 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
-	cd "${WORKDIR}"
-	mv ${P} ${P}-single
-	cp -pPR ${P}-single ${P}-double
-	cp -pPR ${P}-single ${P}-longdouble
+	for x in ${FFTW_DIRS}; do
+		mkdir "${S}-${x}" || die
+	done
 }
 
-src_compile() {
+src_configure() {
 	# filter -Os according to docs
 	replace-flags -Os -O2
 
-	local myconfcommon="
-		--enable-shared
+	local myconfcommon="--enable-shared
 		$(use_enable fortran)
 		${FFTW_THREADS}"
 
-	local myconfsingle=""
-	local myconfdouble=""
-	local myconflongdouble=""
-
+	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 floats, not doubles
+	# altivec only helps singles, not doubles
 	if use altivec; then
 		myconfsingle="${myconfsingle} --enable-altivec"
 	fi
 
-	cd "${S}-single"
-	econf \
-		--enable-float \
-		${myconfcommon} \
-		${myconfsingle} || \
-			die "econf single failed"
-	emake || die "emake single failed"
-
-	# the only difference here is no --enable-float
-	cd "${S}-double"
-	econf \
-		${myconfcommon} \
-		${myconfdouble} || \
-		die "econf double failed"
-	emake || die "emake double failed"
-
-	# the only difference here is --enable-long-double
-	cd "${S}-longdouble"
-	econf \
-		--enable-long-double \
-		${myconfcommon} \
-		${myconflongdouble} || \
-		die "econf long double failed"
-	emake || die "emake long double failed"
+	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 () {
@@ -112,24 +96,23 @@ src_test () {
 	# 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 d in single double longdouble; do
-		cd "${S}-${d}"/tests
-		einfo "Testing ${PN}-${d}"
-		emake -j1 check || die "emake test failed"
+	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 i in single double longdouble; do
-		cd "${S}-${i}"
-		emake DESTDIR="${D}" install || die "emake install for ${i} failed"
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}"
+		emake DESTDIR="${D}" install || die "emake install for ${x} failed"
 	done
 
-	# Install documentation.
-	cd "${S}-single"
-	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS || die
+	cd "${S}"
+	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS
 	if use doc; then
 		cd doc
 		insinto /usr/share/doc/${PF}
diff --git a/sci-libs/fftw/files/fftw-3.2-as-needed.patch b/sci-libs/fftw/files/fftw-3.2-as-needed.patch
deleted file mode 100644
index c991b20f2396..000000000000
--- a/sci-libs/fftw/files/fftw-3.2-as-needed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.am.orig	2008-11-19 10:05:22.000000000 +0100
-+++ Makefile.am	2008-11-19 10:06:56.000000000 +0100
-@@ -37,6 +37,13 @@
- if SMP
- if COMBINED_THREADS
- COMBINED_THREADLIBS=threads/libfftw3@PREC_SUFFIX@_threads.la
-+else
-+lib_LTLIBRARIES += libfftw3@PREC_SUFFIX@_threads.la
-+libfftw3@PREC_SUFFIX@_threads_la_SOURCES = 
-+libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
-+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = \
-+	libfftw3@PREC_SUFFIX@.la \
-+	threads/libfftw3@PREC_SUFFIX@_threads.la
- endif
- endif
- 
---- threads/Makefile.am.orig	2008-11-19 10:03:43.000000000 +0100
-+++ threads/Makefile.am	2008-11-19 10:05:13.000000000 +0100
-@@ -2,11 +2,7 @@
- -I$(top_srcdir)/rdft -I$(top_srcdir)/api
- 
- if SMP
--if COMBINED_THREADS
- noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
--else
--lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
--endif
- endif
- 
- # pkgincludedir = $(includedir)/fftw3@PREC_SUFFIX@
-@@ -16,4 +12,5 @@
- openmp.c threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c	\
- vrank-geq1-rdft2.c f77api.c f77funcs.h
- 
-+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = $(THREADLIBS)
- libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
diff --git a/sci-libs/fftw/files/fftw-3.2-cppflags.patch b/sci-libs/fftw/files/fftw-3.2-cppflags.patch
deleted file mode 100644
index 4d9a1b01c028..000000000000
--- a/sci-libs/fftw/files/fftw-3.2-cppflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2008-11-19 09:57:26.000000000 +0100
-+++ configure.ac	2008-11-19 09:59:08.000000000 +0100
-@@ -264,6 +264,8 @@
- fi
- fi
- AC_SUBST(SIMD_CFLAGS)
-+# pass simd flags to preprocessor/compiler for proper intrinsics detection.
-+CPPFLAGS="$CPPFLAGS $SIMD_CFLAGS"
- 
- dnl Checks for header files.
- AC_HEADER_STDC
diff --git a/sci-libs/fftw/files/fftw-3.2-openmp.patch b/sci-libs/fftw/files/fftw-3.2-openmp.patch
deleted file mode 100644
index 254b9a05a28b..000000000000
--- a/sci-libs/fftw/files/fftw-3.2-openmp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.ac.orig	2008-11-19 09:57:26.000000000 +0100
-+++ configure.ac	2008-11-19 09:59:08.000000000 +0100
-@@ -435,10 +437,10 @@
- AC_ARG_WITH(combined-threads, [AC_HELP_STRING([--with-combined-threads],[combine threads into main libfftw3])], with_combined_threads=$withval, with_combined_threads=no)
- 
- if test "$enable_openmp"x != nox; then
--   AX_OPENMP([THREADLIBS=" "
-+   AX_OPENMP([THREADLIBS="$OPENMP_LIBS"
-      AC_DEFINE(USING_OPENMP_THREADS, 1, [Define if we have and are using OpenMP multithreading directives])
-      CFLAGS="$CFLAGS $OPENMP_CFLAGS"],
--     [AC_MSG_ERROR([don't know how to enable OpenMP])])
-+     [AC_MSG_WARN([don't know how to enable OpenMP, reverting to POSIX threads])])
- fi
- 
- dnl Check for threads library...
---- m4/ax_openmp.m4.orig	2008-07-10 11:33:17.361562576 +0100
-+++ m4/ax_openmp.m4	2008-07-10 12:05:14.280159723 +0100
-@@ -59,6 +59,10 @@
- else
-   if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then
-     OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp
-+    OPENMP_LIBS=" "
-+    if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "x-fopenmp"; then
-+        OPENMP_LIBS="-lgomp"
-+    fi
-   fi
-   m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])])
- fi