version bump

Package-Manager: portage-2.1.10.11/cvs/Linux i686

3 files changed, 149 insertions, 5 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 038bfbbde19c..93e2a40189d5 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.118 2011/06/24 10:58:37 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.119 2011/08/31 16:58:27 ottxor Exp $
+
+*fftw-3.3 (31 Aug 2011)
+
+  31 Aug 2011; Christoph Junghans <ottxor@gentoo.org> +fftw-3.3.ebuild:
+  version bump (import from sci-overlay)
 
   24 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-2.1.5-r5.ebuild,
   fftw-2.1.5-r8.ebuild, fftw-3.2.2.ebuild, fftw-3.2.2-r1.ebuild:
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 3094f7cc9ce1..fab76cd68b84 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -9,16 +9,22 @@ AUX fftw-3.2.1-as-needed.patch 3184 RMD160 fe4e353851780d1520cfa95cd4403ec7045d9
 AUX fftw-3.2.2-pc-threads.patch 650 RMD160 3d0bb0caa62d29e2d0e8b5cff9c126276b537f81 SHA1 dd960030a8e49b87fc94c80cc541068c8b9466dd SHA256 26a442c168324623a60d1fc986f9c70ddf2d66d91e5d4a620ded1982bd22a593
 DIST fftw-2.1.5.tar.gz 1256888 RMD160 723308722d76c12710db6473979adf8d086b0909 SHA1 12020b58edc1b0490a83db4aa912fac5dfdfb26b SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630
 DIST fftw-3.2.2.tar.gz 3495117 RMD160 27af9b97072fa3a41b91b9430d093f671a1cd359 SHA1 d43b799eedfb9408f62f9f056f5e8a645618467b SHA256 6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f
+DIST fftw-3.3.tar.gz 3965713 RMD160 2a4969019d0b1eda5a09cf68f0a012d3fe30fff8 SHA1 e44493ba4babeacba184568e727876d9aed44205 SHA256 d25a98521a13933e678ce19319d03ddc915826764e1e59abd12d172c239b6aea
 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.ebuild 3671 RMD160 fd0ec2757bd63b7f5bcee6d34c46de084a8acb37 SHA1 c246551b1b6ddb9ccdc282be2ff5df71d8c82a5d SHA256 eafead37266419279bba2187d5b3c81f903540d16a89e31182c64171faa512a5
-MISC ChangeLog 21972 RMD160 66cddb234ca8082680c52a93431481f874892bb2 SHA1 8d51db7849b2561d6b48f4698d0e8020678ec922 SHA256 522e014f424bd1f04953b3100d55c80a90129b08a23e5666e153380d254a29b4
+EBUILD fftw-3.3.ebuild 3684 RMD160 14047519cc0ffb60c655680bc39c71107f6fae47 SHA1 abf0cad070b126934a61a52a287dfd5f152b4791 SHA256 b580e580603239849ab62f5ab4142a7f4fdc38b14e57193c6444128ac0eabb66
+MISC ChangeLog 22113 RMD160 3a61bd335b6b11db2f40b7ed122e6c3b0c9cebf6 SHA1 f4248e2886a353fb2eb08bea055327da617c08b0 SHA256 717cfd179994bb1760b4f8707808c849d1728019479636c91beb8b949ab120a0
 MISC metadata.xml 770 RMD160 ca19408a763b8f3db20849456d67c3027cfdba5e SHA1 8c6d41e762d4cc86eaaeee10a2fc9c4743e0e828 SHA256 129a4af8bed71473f17cf323cb11763e09cf9b63eaa764643a1412c649a8c0bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4EbeQACgkQgAnW8HDreRaI3gCfYSbCN8bpsw4EMzSIoBgmIJSp
-v0oAnRJf3Id8u74I1MOmZ6SOlveygYTR
-=rg2H
+iQEcBAEBAgAGBQJOXmg5AAoJEOeBhlrCAAWGVxQH/RoiQIQGdV3LVN/D7foN14au
+uugN5KSUbTofkXB9uMaXlsxrUMiJFnNXtMhzzwuWN96dAZ1WezYWXKuqdfkGURs7
+LaGm9UokHwkrbiVlsieCQ2AQIWqH2Hde0mi5KMwt75HAM5CbzavCd7y7ihVWDhuG
+RpzdaUdmh1g3VAB0x/pmyip9gTrvMWZHPPLINFKOD0zEyRkimrp2NCJRRZPoGsIz
+M7sJhlIZ/bIBNnQjA69naJShLw3MJ1hp51ThdvM0CBl9q2abKhIr317Nls/mPW0O
+9QwXob6HoQw8eDmJ1IHbA318kgakkb0wHik7XqKCM3PwLuzL2U0G98I2jkV4Y24=
+=2PZV
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.3.ebuild b/sci-libs/fftw/fftw-3.3.ebuild
new file mode 100644
index 000000000000..5760435d3a30
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.ebuild,v 1.1 2011/08/31 16:58:27 ottxor Exp $
+
+EAPI=4
+
+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 mpi openmp sse sse2 static-libs threads"
+
+DEPEND="
+	fortran? ( virtual/fortran )
+	mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	use openmp && FORTRAN_NEED_OPENMP="1"
+	use fortran && fortran-2_pkg_setup
+	use openmp && FFTW_OPENMP="--enable-openmp"
+	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_OPENMP="--disable-openmp"
+	fi
+	FFTW_DIRS="single double longdouble"
+	use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	# 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 static-libs static)
+		$(use_enable fortran)
+		$(use_enable mpi)
+		$(use_enable threads)
+		${FFTW_OPENMP}"
+
+	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
+	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
+	done
+}
+
+src_install () {
+	local f u
+
+	# 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
+	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
+		insinto /usr/share/doc/${PF}/faq
+		doins FAQ/fftw-faq.html/*
+	fi
+
+	use openmp && [[ ${FFTW_OPENMP} = "--enable-openmp" ]] && u="omp"
+	for f in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+		for u in $(usev mpi) $(usev threads) ${u}; do
+		    sed "s|-lfftw3[lf]\?|&_$u|" "$f" > "${f%.pc}_$u.pc" || die
+		done
+	done
+}