sci-libs/fftw: Multibuild for the precision builds, thanks mgorny to prepare the patch; restrict USE=quad for x86 as there are to less registers

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

3 files changed, 155 insertions, 4 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index dadb32d94b92..414502efbabf 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.138 2013/03/01 19:03:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.139 2013/03/10 18:47:22 jlec Exp $
+
+*fftw-3.3.3-r2 (10 Mar 2013)
+
+  10 Mar 2013; Justin Lecher <jlec@gentoo.org> fftw-3.3.3-r1.ebuild,
+  +fftw-3.3.3-r2.ebuild:
+  Multibuild for the precision builds, thanks mgorny to prepare the patch;
+  restrict USE=quad for x86 as there are to less registers
 
   01 Mar 2013; Justin Lecher <jlec@gentoo.org> fftw-3.3.3-r1.ebuild:
   Block 32bit ABI with USE=mpi on amd64, #459758
diff --git a/sci-libs/fftw/fftw-3.3.3-r1.ebuild b/sci-libs/fftw/fftw-3.3.3-r1.ebuild
index 51cae77fa230..df2831175c2a 100644
--- a/sci-libs/fftw/fftw-3.3.3-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.2 2013/03/01 19:03:46 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r1.ebuild,v 1.3 2013/03/10 18:47:22 jlec Exp $
 
 EAPI=5
 
@@ -18,8 +18,8 @@ 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 fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
 
-# there is no abi_x86_32 vort virtual/mpi right now
-REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi ) )"
+# there is no abi_x86_32 port of virtual/mpi right now
+REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )"
 
 RDEPEND="mpi? ( virtual/mpi )
 	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20121202 )"
diff --git a/sci-libs/fftw/fftw-3.3.3-r2.ebuild b/sci-libs/fftw/fftw-3.3.3-r2.ebuild
new file mode 100644
index 000000000000..975d7333d8c1
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.3-r2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.1 2013/03/10 18:47:22 jlec Exp $
+
+EAPI=5
+
+#AUTOTOOLS_AUTORECONF=1
+FORTRAN_NEEDED=fortran
+
+inherit autotools-multilib eutils flag-o-matic fortran-2 multibuild toolchain-funcs versionator
+
+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 fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
+
+# there is no abi_x86_32 port of virtual/mpi right now
+REQUIRED_USE="amd64? ( abi_x86_32? ( !mpi !quad ) )"
+
+RDEPEND="
+	mpi? ( virtual/mpi )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20121202 )"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+pkg_setup() {
+	# XXX: this looks like it should be used with BUILD_TYPE!=binary
+
+	if use openmp; then
+		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+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"
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local x
+
+	# filter -Os according to docs
+	replace-flags -Os -O2
+
+	my_configure() {
+		local x=${MULTIBUILD_VARIANT}
+
+		myeconfargs=(
+			$(use_enable fma)
+			$(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
+
+		autotools-multilib_src_configure
+	}
+
+	multibuild_foreach_variant my_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant autotools-multilib_src_compile
+}
+
+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"
+	multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck
+}
+
+src_install () {
+	local u x
+	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
+	HTML_DOCS=( doc/html/ )
+	multibuild_foreach_variant autotools-multilib_src_install
+
+	if use doc; then
+		dodoc doc/*.pdf
+		insinto /usr/share/doc/${PF}/faq
+		doins -r doc/FAQ/fftw-faq.html/*
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/html
+	fi
+
+	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die
+		done
+	done
+}