Version bump (missing features)

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

4 files changed, 160 insertions, 10 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index d677e35215f8..6296598ee985 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,12 @@
 # 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.120 2011/10/09 11:56:41 xarthisius Exp $
+# 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 $
+
+*fftw-3.3-r2 (04 Feb 2012)
+
+  04 Feb 2012; Christoph Junghans <ottxor@gentoo.org> +fftw-3.3-r2.ebuild,
+  metadata.xml:
+  Version bump (missing features)
 
 *fftw-3.3-r1 (09 Oct 2011)
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 395c1622f358..639d849dcc1d 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -15,14 +15,17 @@ EBUILD fftw-2.1.5-r8.ebuild 3984 RMD160 41b0fd4d44bb9434ec7bb7758c684e3463783933
 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
 EBUILD fftw-3.3-r1.ebuild 3693 RMD160 0ebd449e2631a2a261977338227758014155d2ed SHA1 08ab702f2f4b278f7108d82365287fd137999c81 SHA256 f0022a04feb2ab1164510d1f1042d74911c91db6f2a518e360fc0df346e44c85
-MISC ChangeLog 22315 RMD160 3471d127f9a1513566f1f17d7137fe01d09af913 SHA1 9526c6e8806529982b1b23728ab8a85682ed2e05 SHA256 4f24f23f9062e5c2d55c288d010f68bc9e19558fbc9d55d1400dad3dcddacb78
-MISC metadata.xml 770 RMD160 ca19408a763b8f3db20849456d67c3027cfdba5e SHA1 8c6d41e762d4cc86eaaeee10a2fc9c4743e0e828 SHA256 129a4af8bed71473f17cf323cb11763e09cf9b63eaa764643a1412c649a8c0bb
+EBUILD fftw-3.3-r2.ebuild 3484 RMD160 9a67647e0be15f382d333c0af41662d77c10e8b9 SHA1 17904f42ac801e237caa84848126c5f9a8706398 SHA256 6397c31d3a294f98df4fe343468ae47fdb06d4007754612a27e4487a314f2ec7
+MISC ChangeLog 22465 RMD160 4ed23a4ce232d61c96855a924f30a2f7d8e8229e SHA1 28d713a9b3ed19b8486d6dd840ff89e0200e2ff6 SHA256 1f5404ba8cfe9ea9b442258e1bde84284df3f428742766fa50d576e219d842bc
+MISC metadata.xml 1056 RMD160 0e2473b1d5087b8453838a27422493ba3423d840 SHA1 0eda7ff79cafd68f383785a91b94faa86ba7def8 SHA256 f0adfac91df27dcce0ef9232b15da9fcabb738e6d4158abe5906e7caea532c98
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk6RjAIACgkQIiMqcbOVdxQqwgQAg3fSBQtCo8i+/eF3w7fQ363m
-C/UP55ohJBzYPP/p1cFMQ0dPkuQ7NXVoR+rBSdJJ7zFpq5V27tyZGKETMKXmhuK4
-1eZPzZNWIF+wz5LTQYytfAHPW8RWqn7/7xfzi7rRJwZjzZVtjZI0Za48m4yOrXSr
-Wl7/TtuTcGkwKnu6YoE=
-=OsVp
+iQEcBAEBAgAGBQJPLab0AAoJEOeBhlrCAAWGxZ4H/iNci0It1RSrzgpycb/5l0XE
+5lSaO2G1bpbYgpdZ/RlTCSR5qx68QB1ih35SxGHNHAhDfYWNzYZfKKQ4jiWlJJ7j
+pQBLIleBeuS5soZAQcRXC7FnfQshBAYwQzNlYl9GagvuZ6y9eHhR/hUuV2TOH7Qw
+sSNav7kdPxDOrSA7oWBpHMYkP8n77+jcu0RMBqUr0tfSG5yucvLo/biH1mZjhcNa
+eTuE0rsqi/M9vPW6xIhBRu608mwjDFJN8fUMI784RVPnqLq800UZg5uPrnTWuzdL
+MBFJGIHSjlVR9ioA4M+ps/gj2cbeZCxR3QLp5znxQQdL9gmnfJTQbkEcI2hQoYE=
+=U5IZ
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.3-r2.ebuild b/sci-libs/fftw/fftw-3.3-r2.ebuild
new file mode 100644
index 000000000000..02623b9cf343
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3-r2.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-r2.ebuild,v 1.1 2012/02/04 21:45:07 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 openmp paired-single 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 paired-single mips-ps)
+				$(use_enable mpi)
+			)
+		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
+}
diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index 93dab2f205b9..adf47d40fd4c 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -12,7 +12,11 @@
   publicly available FFT software.
 </longdescription>
 <use>
+  <flag name='avx'>Adds support for Advanced Vector Extensions</flag>
   <flag name='float'>Link default library to single precision instead of
     double (symlinks only and fftw-2.1)</flag>
+  <flag name='paired-single'>Adds support for  pair-single optimizations of mips</flag>
+  <flag name='quad'>Build quadruple precision lib</flag>
+  <flag name='zbus'>Adds support for ZBus cycle-counter of mips</flag>
 </use>
 </pkgmetadata>