Removed old and filter as-needed when building with Intel compilers

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

9 files changed, 26 insertions, 367 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 7224b44ad345..52d20cf6b257 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.94 2009/10/11 16:01:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.95 2009/10/15 17:11:21 bicatali Exp $
+
+  15 Oct 2009; Sébastien Fabbro <bicatali@gentoo.org> fftw-2.1.5-r5.ebuild,
+  -files/fftw-3.1.2-as-needed.patch, -files/fftw-3.1.2-configure.ac.patch,
+  -files/fftw-3.1.2-openmp.patch, -fftw-3.1.3.ebuild, -fftw-3.2.1.ebuild,
+  fftw-3.2.2.ebuild:
+  Removed old and filter as-needed when building with Intel compilers
 
   11 Oct 2009; Raúl Porcel <armin76@gentoo.org> fftw-3.2.2.ebuild:
   ia64/sparc stable wrt #285806
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index f9367ce969d9..ff5e1f9a102e 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,17 +1,20 @@
+-----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.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.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.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.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.2.ebuild 3528 RMD160 be18a61b3963ef74fd0be95545fcf6ba7f7f6b89 SHA1 7807f4300e483867f99eac7311243798297a3f96 SHA256 f9ba33fe6da58a71cfeaa7308e0f70f966b819554c1e30adbbc19021bb81beb0
-MISC ChangeLog 18685 RMD160 e735d8e4c4e3c141d7fc45a43d33c85143e7e8ad SHA1 b1dcba702edeed1a5c55ba36c049afca86c7ecec SHA256 ff633936d60e51fcd54c2c140076ba95563f2cdf54c12a316be2e8d12d7e32a9
+EBUILD fftw-2.1.5-r5.ebuild 3810 RMD160 ad815a0557551d56eca4cd493fc021558d92ae5b SHA1 69189f4ca3d0eebe72b97c3961519b8f05aed4b3 SHA256 1513421bd4c4ee7903ea440e4bf32456bde4b186244effc7750e2e235fbdf68f
+EBUILD fftw-3.2.2.ebuild 3587 RMD160 a983ebf70d820fbd19bf833cf896807fac9d10fb SHA1 6b9da745dbc39ee3faaba6e45cfbd987579566ce SHA256 a2794f8e4f0efe783c20a7ba164eb5ccd52a7317ad2e0221336c36bb7735f552
+MISC ChangeLog 19004 RMD160 add68ae21cb6a346594996d29063a563a213ae58 SHA1 8c877b2bf56cdb8e95e9f806ef4e2bc50cf29e78 SHA256 05fc9145c9129eb4ff553e43b8f070d82d96068d7603e89df28af3c8c21745be
 MISC metadata.xml 770 RMD160 ca19408a763b8f3db20849456d67c3027cfdba5e SHA1 8c6d41e762d4cc86eaaeee10a2fc9c4743e0e828 SHA256 129a4af8bed71473f17cf323cb11763e09cf9b63eaa764643a1412c649a8c0bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkrXV8MACgkQ1ycZbhPLE2CMVQCfU/FITnFhTnvkUj+33Ni5x2q9
+sd0An2jq3bn7jozSAGMf5jS+71NlS27+
+=rVbn
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-2.1.5-r5.ebuild b/sci-libs/fftw/fftw-2.1.5-r5.ebuild
index 406856374545..8eeec2631a3e 100644
--- a/sci-libs/fftw/fftw-2.1.5-r5.ebuild
+++ b/sci-libs/fftw/fftw-2.1.5-r5.ebuild
@@ -1,15 +1,15 @@
 # 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-2.1.5-r5.ebuild,v 1.10 2009/05/01 12:07:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r5.ebuild,v 1.11 2009/10/15 17:11:21 bicatali Exp $
 
-inherit eutils flag-o-matic multilib autotools fortran toolchain-funcs
+inherit eutils flag-o-matic autotools toolchain-funcs
 
 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? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
 
 SLOT="2.1"
 LICENSE="GPL-2"
@@ -37,9 +37,7 @@ then
 		ewarn "Otherwise the configure script will select POSIX threads."
 		epause 5
 	fi
-
-	FORTRAN="gfortran ifc g77"
-	use fortran && fortran_pkg_setup
+	use openmp && [[ $(tc-getCC)$ == icc* ]] && no-as-needed
 }
 
 src_unpack() {
diff --git a/sci-libs/fftw/fftw-3.1.3.ebuild b/sci-libs/fftw/fftw-3.1.3.ebuild
deleted file mode 100644
index c10386ed6848..000000000000
--- a/sci-libs/fftw/fftw-3.1.3.ebuild
+++ /dev/null
@@ -1,143 +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.3.ebuild,v 1.1 2008/10/20 21:45:12 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 doc fortran openmp sse sse2 threads"
-
-pkg_setup() {
-	if use openmp &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-			! built_with_use sys-devel/gcc 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 the configure script will select POSIX threads."
-		epause 5
-	fi
-	FORTRAN="gfortran ifc g77"
-	use fortran && fortran_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-3.1.2-configure.ac.patch
-	epatch "${FILESDIR}"/${PN}-3.1.2-openmp.patch
-	epatch "${FILESDIR}"/${PN}-3.1.2-as-needed.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
-		$(use_enable threads)
-		$(use_enable fortran)"
-
-	if use openmp; then
-		myconfcommon="${myconfcommon}
-			--enable-threads
-			--with-openmp"
-	elif use threads; then
-		myconfcommon="${myconfcommon}
-			--enable-threads
-			--without-openmp"
-	else
-		myconfcommon="${myconfcommon}
-			--disable-threads
-			--without-openmp"
-	fi
-	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 \
-		--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"
-}
-
-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 d in single double longdouble; do
-		cd "${S}-${d}"/tests
-		einfo "Testing ${PN}-${d}"
-		emake -j1 check || die "emake test 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"
-	done
-
-	# Install documentation.
-	cd "${S}-single"
-	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS || die
-	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.2.1.ebuild b/sci-libs/fftw/fftw-3.2.1.ebuild
deleted file mode 100644
index 9eb4c845a1f1..000000000000
--- a/sci-libs/fftw/fftw-3.2.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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.1.ebuild,v 1.7 2009/04/27 18:15:00 armin76 Exp $
-
-EAPI=2
-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 doc fortran openmp sse sse2 threads"
-
-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-getCC)$ == *gcc* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-			! built_with_use sys-devel/gcc 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
-	FORTRAN="gfortran ifc g77"
-	use fortran && fortran_pkg_setup
-	FFTW_DIRS="single double longdouble"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-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)
-		${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
-
-	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.2.2.ebuild b/sci-libs/fftw/fftw-3.2.2.ebuild
index 876b72f60bb5..e2d4e5d57c27 100644
--- a/sci-libs/fftw/fftw-3.2.2.ebuild
+++ b/sci-libs/fftw/fftw-3.2.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.8 2009/10/11 16:01:00 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2.ebuild,v 1.9 2009/10/15 17:11:21 bicatali Exp $
 
 EAPI=2
 inherit flag-o-matic eutils toolchain-funcs autotools
@@ -34,6 +34,7 @@ pkg_setup() {
 		FFTW_THREADS="--enable-threads --disable-openmp"
 	fi
 	FFTW_DIRS="single double longdouble"
+	use openmp && [[ $(tc-getCC)$ == icc* ]] && no-as-needed
 }
 
 src_prepare() {
diff --git a/sci-libs/fftw/files/fftw-3.1.2-as-needed.patch b/sci-libs/fftw/files/fftw-3.1.2-as-needed.patch
deleted file mode 100644
index fca95715827c..000000000000
--- a/sci-libs/fftw/files/fftw-3.1.2-as-needed.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- Makefile.am.orig	2008-06-22 14:49:18.725790127 +0100
-+++ Makefile.am	2008-06-22 15:09:37.339234950 +0100
-@@ -35,6 +35,13 @@
- if THREADS
- 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-07-01 11:46:56.464637525 +0100
-+++ threads/Makefile.am	2008-07-01 11:48:02.268387467 +0100
-@@ -2,15 +2,12 @@
- -I$(top_srcdir)/rdft -I$(top_srcdir)/api
- 
- if THREADS
--if COMBINED_THREADS
- noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
--else
--lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
--endif
- endif
- 
- libfftw3@PREC_SUFFIX@_threads_la_SOURCES = api.c conf.c threads.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.1.2-configure.ac.patch b/sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch
deleted file mode 100644
index 713c2a7d7ed7..000000000000
--- a/sci-libs/fftw/files/fftw-3.1.2-configure.ac.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.ac.orig	2008-07-10 11:29:58.506230457 +0100
-+++ configure.ac	2008-07-10 11:49:45.171417438 +0100
-@@ -135,7 +135,7 @@
- AC_PROG_CC
- AX_COMPILER_VENDOR
- AC_PROG_CC_STDC
--AMX_PROG_AS     dnl AM_PROG_AS breaks at least one version of libtool
-+AM_PROG_AS
- AC_PROG_INSTALL
- AC_PROG_LN_S
- AC_PROG_MAKE_SET
-@@ -229,6 +229,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
-@@ -362,10 +364,10 @@
- THREADLIBS=""
- if test "$enable_threads" = "yes"; then
- 	if test "$with_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
- 
- 	# POSIX threads, the default choice:
diff --git a/sci-libs/fftw/files/fftw-3.1.2-openmp.patch b/sci-libs/fftw/files/fftw-3.1.2-openmp.patch
deleted file mode 100644
index b1948b3ca463..000000000000
--- a/sci-libs/fftw/files/fftw-3.1.2-openmp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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