version bump

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

3 files changed, 155 insertions, 7 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 12de60aa87f5..888b30d01b4d 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,11 @@
 # 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.124 2012/03/29 04:02:19 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.125 2012/05/24 07:18:19 ottxor Exp $
+
+*fftw-3.3.2 (24 May 2012)
+
+  24 May 2012; Christoph Junghans <ottxor@gentoo.org> +fftw-3.3.2.ebuild:
+  version bump
 
 *fftw-3.3.1 (29 Mar 2012)
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 684464bdb077..79b374314e92 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX fftw-2.1.5-as-needed.patch 4374 RMD160 b9bc387a322cec9d36d7d7ff54e556e907767742 SHA1 3274a914d3532190fb8c2c96d944c85b5ab47237 SHA256 b1d65b2dca62257db5c78e81577fb87b7d79f6eb75b8899de48faabfc702e9f0
 AUX fftw-2.1.5-cc.patch 546 RMD160 55dc73f7191330c0c580edc58e754963afd0d181 SHA1 c2faf5d00139e0904e1b61b9491f3e8430f151cc SHA256 52b2ba8a140e46e9a1f1c71d8e85faaac70e6d783ba8e45f4423ba6f70f04dbe
@@ -10,6 +10,7 @@ AUX fftw-3.2.2-pc-threads.patch 650 RMD160 3d0bb0caa62d29e2d0e8b5cff9c126276b537
 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.1.tar.gz 4039988 RMD160 86ef73f8f934d5f0e5d21f07fc05683f7b3c1d82 SHA1 3fecc492f576503a6a509d2073bd82b3fe0aef13 SHA256 c77fc5cda6ce868857aa565cb9b0df0d7a4fcf388ce5c6d482acd80e2452b739
+DIST fftw-3.3.2.tar.gz 3908279 RMD160 dbf87fcb7812024b80744335d433ade53bad8a4f SHA1 11a8c31186ff5a7d686a79a3f21b2530888e0dc2 SHA256 b1236a780ca6e66fc5f8eda6ef0665d680e8253d9f01d7bf211b714a50032d01
 DIST fftw-3.3.tar.gz 3965713 RMD160 2a4969019d0b1eda5a09cf68f0a012d3fe30fff8 SHA1 e44493ba4babeacba184568e727876d9aed44205 SHA256 d25a98521a13933e678ce19319d03ddc915826764e1e59abd12d172c239b6aea
 EBUILD fftw-2.1.5-r5.ebuild 3778 RMD160 868c63f5f0cdb9a609a6ef9a9dc8a6b73f94cf82 SHA1 351af5c67f97e0b1d228daf323a0a6202cb156af SHA256 3b90f3597ab6c9c167d8e4773e604472df21848e6772dd4b21c042b4e3c9b932
 EBUILD fftw-2.1.5-r8.ebuild 3984 RMD160 41b0fd4d44bb9434ec7bb7758c684e3463783933 SHA1 085fe378d09980d5dbea2e60bfaf50e047834685 SHA256 1e49dce881c7618eea3a2465c20c900d19841ca4668e91a652d4eb280690115f
@@ -19,12 +20,17 @@ EBUILD fftw-3.2.2.ebuild 3671 RMD160 fd0ec2757bd63b7f5bcee6d34c46de084a8acb37 SH
 EBUILD fftw-3.3-r1.ebuild 3693 RMD160 0ebd449e2631a2a261977338227758014155d2ed SHA1 08ab702f2f4b278f7108d82365287fd137999c81 SHA256 f0022a04feb2ab1164510d1f1042d74911c91db6f2a518e360fc0df346e44c85
 EBUILD fftw-3.3-r2.ebuild 3430 RMD160 d18103a5796fad73a3ce8b34e891ade6ac33df91 SHA1 e3a5da5238fc21e8d6c50f9a0c5222f0fcaf7677 SHA256 a7b63dd2112a6af0155259af0178d2c8156376d95f35d8793b8d81e589e694be
 EBUILD fftw-3.3.1.ebuild 3457 RMD160 2c9e03f4aac1516bb08a463bdf9415c931969115 SHA1 f32a165fc83bde59c5e0e76022332b07abd2c164 SHA256 67ccab894f2165b01b15ac9a8fbf0a452735da6f9674b4abf9535965f13cb496
-MISC ChangeLog 22940 RMD160 5affd38bd5c51442e74980fc09b50079a4192fea SHA1 ff193a68315a788d874c1295743cdf71d045e13a SHA256 a38dd27189433dc344f428d4e69429defafb41b78f5e7cbdbcbeed2f7a152dc4
+EBUILD fftw-3.3.2.ebuild 3457 RMD160 1170034e5ab47fa78989ccd32418f5061a2e874a SHA1 3e14771fe99c8f1c4c4a7b4216026692e1602936 SHA256 1aaf1197a17de06a1116445bec9535d5a2d8ba3986f6939f6f9529c0bc1dc7b6
+MISC ChangeLog 23057 RMD160 baa5aef23396b188b8c68ae54d9a6af0b1ea2a99 SHA1 8eb9e1d92fefef24eb4b64eab6a09b6639905caa SHA256 46de5964a5a2967ec3d10b04a42b4b4bad1a371b9a5d18501144da151a732c3e
 MISC metadata.xml 1060 RMD160 eeb13e9d280ea29f22c39cb47afec72bf63288cd SHA1 22e12789336e5b9822f92aa83f74d97af99f54b1 SHA256 73dd3265f42295ac4ed3d64ff3541bee16b8643718a0d8cc9e57c36dec7b0344
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk+YOO8ACgkQgAnW8HDreRY0KgCgg1VkE7KVsYeddlopIid4JRRV
-oGAAnjGKooV0+JksKVjrCnCfqPX2hOkJ
-=rbQu
+iQEcBAEBAgAGBQJPveDBAAoJEOeBhlrCAAWGMKYH/ippLdV5SXSn+uewMQ9sZrIF
+ynKrLXX518P2QBw6xEXvaLt13/CvHbzp/dpvoce8vS4LTki4AdCrKQTjipq5QqMt
+oqTaaLH+XCPzyo3SfRJ45T8vlMhDsODeyFUbwORrZF/9p5AmhyEJutbTvk1GX3Ui
+oZIuniFlLvCUy3BEQwFyg9sYThFoLZpVjp2znoxJXmMZy3xJbYVrxdxtQ6JXZaj6
+BFHpYu/+TH5Ut4aSPa7Tivdchlb5PFr7rSMzicRYw1VFg5kClQo0/a0UuFeSJxIa
+Zbzq5AyO9Sw9pIIWpIi3R8N9TEfmqwq79HHLAZRHndLtEULlEudfUoxvcuCiEb4=
+=WHCm
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.3.2.ebuild b/sci-libs/fftw/fftw-3.3.2.ebuild
new file mode 100644
index 000000000000..b6487c680f92
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.2.ebuild
@@ -0,0 +1,137 @@
+# 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.2.ebuild,v 1.1 2012/05/24 07:18:19 ottxor Exp $
+
+EAPI=4
+
+inherit autotools-utils 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 avx doc fortran mpi neon openmp quad sse sse2 static-libs threads zbus"
+
+DEPEND="
+	fortran? ( virtual/fortran[openmp?] )
+	mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P/_/-}
+
+AUTOTOOLS_AUTORECONF=1
+
+DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS doc/fftw3.pdf )
+
+HTML_DOCS=( doc/html/ )
+
+pkg_setup() {
+	if use openmp; then
+		tc-has-openmp || die "Please ensure your compiler has openmp support"
+		FORTRAN_NEED_OPENMP="1"
+		[[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
+	fi
+	use fortran && fortran-2_pkg_setup
+	FFTW_DIRS="single double longdouble"
+	use quad && FFTW_DIRS+= "quad"
+}
+
+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 -f m4/lt* m4/libtool.m4
+}
+
+src_configure() {
+	local x
+
+	# filter -Os according to docs
+	replace-flags -Os -O2
+
+	for x in ${FFTW_DIRS}; do
+		myeconfargs=(
+			$(use_enable fortran)
+			$(use_enable zbus mips-zbus-timer)
+			$(use_enable threads)
+			$(use_enable openmp)
+		)
+		if [[ $x == single ]]; then
+			#altivec, sse, single-paired only work for single
+			myeconfargs+=(
+				--enable-single
+				$(use_enable altivec)
+				$(use_enable avx)
+				$(use_enable sse)
+				$(use_enable mpi)
+				$(use_enable neon)
+			)
+		elif [[ $x == double ]]; then
+			myeconfargs+=(
+				$(use_enable avx)
+				$(use_enable sse2)
+				$(use_enable mpi)
+			)
+		elif [[ $x == longdouble ]]; then
+			myeconfargs+=(
+				--enable-long-double
+				$(use_enable mpi)
+				)
+		elif [[ $x == quad ]]; then
+			#quad does not support mpi
+			myeconfargs+=( --enable-quad-precision )
+		else
+			die "${x} precision not implemented in this ebuild"
+		fi
+
+		einfo "Configuring for ${x} precision"
+		AUTOTOOLS_BUILD_DIR="${S}-${x}" \
+			autotools-utils_src_configure
+	done
+}
+
+src_compile() {
+	for x in ${FFTW_DIRS}; do
+		einfo "Compiling for ${x} precision"
+		AUTOTOOLS_BUILD_DIR="${S}-${x}" \
+			autotools-utils_src_compile
+	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 u x
+
+	for x in ${FFTW_DIRS}; do
+		AUTOTOOLS_BUILD_DIR="${S}-${x}" \
+			autotools-utils_src_install
+	done
+
+	if use doc; then
+		insinto /usr/share/doc/"${PF}"/faq
+		doins -r "${S}"/doc/FAQ/fftw-faq.html/*
+	fi
+
+	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+		    sed "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die
+		done
+	done
+}