Version bump

Package-Manager: portage-2.2.8-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

3 files changed, 199 insertions, 7 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index ceadaf3847ed..c0268ad30870 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,11 @@
 # 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.155 2013/10/21 13:29:10 grobian Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.156 2014/04/22 19:42:37 bicatali Exp $
+
+*fftw-3.3.4 (22 Apr 2014)
+
+  22 Apr 2014; Sébastien Fabbro <bicatali@gentoo.org> +fftw-3.3.4.ebuild:
+  Version bump
 
   21 Oct 2013; Fabian Groffen <grobian@gentoo.org> fftw-3.3.3-r3.ebuild:
   Marked ~x64-macos, bug #486818
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 7108a13851a5..a9d3017197a0 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -8,15 +8,17 @@ AUX fftw-2.1.5-no-test.patch 1247 SHA256 9a6cad5e81b4a68ef6c8e137a189ffad462cbbe
 AUX fftw-2.1.5-texinfo5.1.patch 596 SHA256 00e61fd86bd0e742efb72212c005615964da4eade40c3024443504e50b9c7186 SHA512 71dd3c13784f9bd1b518827a6784e2619145377cbc88764c69830519096f61863140b90c8138d6a65e3994487cb12cd06baba826d48735c2cbddc1d2320a4214 WHIRLPOOL 9f382908ab6dac7c41c80c7e88a391bb2a71d1c3d8b0e38d153a5fdd8f48b46aee4a216860b599495275ef0f1e2c1501dbe2c12598eae0c637bb16f0878ce2a0
 DIST fftw-2.1.5.tar.gz 1256888 SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 SHA512 8724a7f66aa19b271aa0ffb0e3762919f08082ac4400f52d11b50aef9b9d23a7d4fc5d6b2eae0ac166e2bb30a4d38a52c878e8bf8e24aba01ab1c3ddf5ebec15 WHIRLPOOL 2ea64d246c12e14962b93e05411c5f06dd193a887acb3fe5e7f63231a1a2f1f21b3a41f75951e18c332b25105865633c87150f2107169f5487b6b9983b968e10
 DIST fftw-3.3.3.tar.gz 3920661 SHA256 85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832a9e3d5c0731fb5c54a97f3 SHA512 1d88b6376ba8c15cceafd3381de1d181a974b921b72b31dd89c297e5771e8d665aa3c121ef2504a70e7b0bb562b1e0612ac2a02121c412d27df06c4d687507c4 WHIRLPOOL b410cb4d854988f9a57f08344d9207ece4ebf218ec6fa605036235e472bef91f5037d852793fa6a7bc0f8a6a7081dc1e71b25b15ab1259e299bb95affca40d3b
+DIST fftw-3.3.4.tar.gz 3940427 SHA256 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 SHA512 1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1 WHIRLPOOL 2a5733f5537ff55a1830994431f1750dd790a4df3e8b3d1e9018c1afba2c5172f4e456eaee1c3427a2b170d23b6928da462e067a6f4e94792cfc7ff1cbc38938
 EBUILD fftw-2.1.5-r8.ebuild 3985 SHA256 cbb0c89c800ba8e33de782e4dbaa4870ac731f4d4a9ed7da677e693493112385 SHA512 f1a9a027d3e6408f8e45b885e4909dcb82356a574be8faebf719f87f51ed85693dd3bc3eefafd92c9fd6066e4d75be59bf55b14b360a7053564c47c9fafe28f4 WHIRLPOOL aeb2fda6ea435b4fd25fef07923f23964244f311437efba1bde49806ee83461d9db6ea913c79fb345e3102b0fd60be6ba3035ab84e21ae608509291d39e410e7
 EBUILD fftw-3.3.3-r2.ebuild 3904 SHA256 17cf3c43681d1db09388800e51fe0e46a696563ceee92ecb77638bdfe27bea16 SHA512 c8a4fe2249d4fd7e849659ce016924d5c4746d5a74e8a7ae97ab6d7d1a2e3b2f517336ad4cfa00b382652ed16906ac9252d11484f5c402dab398a86ac401a73e WHIRLPOOL 86f5919fcc0e692eb0cbca5e72f26cd5216d5b8d54f6dbfbab8d52608c39679aa450323de69dec5895835ed21c39494beeeac806e8ef07c1223615bd9dd02e42
 EBUILD fftw-3.3.3-r3.ebuild 5224 SHA256 2ceca198b8475d0261482a1c45c46e5721aaae346dfad765a27319eaca594225 SHA512 6b4c2e925ee235bd01494dce2950562e3f72ab044c8017f89622bf00cbdc7f017996fee48f79248992b149ea2aec05506ab04e2215fbbb31db25a4f633ec93ad WHIRLPOOL 02475286f5a8d41ab46db017710490161ec5403a9eff154efb081bc901c4bbf988d298f1a34537d240094b8869c838b8349043ad56fad348fff927a30d68f612
-MISC ChangeLog 27469 SHA256 368cbfe1aabd4300c7708e889d43956218138a90c56a0d7da42fbf79f6ad6cd0 SHA512 0d7e9bdd673bafa202bdc86c60d35968040751cfc62eefa971b47778f476e22e17bffaa6d93a4b4138b8e856670630dadfa158163c7e7e4f5eab0d47d2fb3db2 WHIRLPOOL 0c256a1f1a4ea2eb4c5b9cdb2b2027c92e34212d107735f59f71ba50db5eb2f18c9b9619eed7f796d1c52d0b85fcf779b0400f0447c470d465f8dc896eda4407
+EBUILD fftw-3.3.4.ebuild 5205 SHA256 86c4ddda0b78bc0cd9f52cf034f668cf4488fac8e15fb8e72e4e7d579a2846a5 SHA512 eb0823fee04e239113ecfa0f23c48f7cca7c3c89ad9140d170bea541dd676c74ae0ff6fb8d42b28e1b3bee0e70a1b22f37c111170ccf9031e355f0bc91678ca0 WHIRLPOOL 531a58744b1e195f28e6f9360d65a85ccee24264cd645f1735f515217af0254ab16ca5efb56c440b2f6d8a641786ef61e731a9a371d83725ba881e70927be9df
+MISC ChangeLog 27588 SHA256 aabc08866cc6edda666bba8e9c8332d6618cfad4b5bab46875b006e80643bcaf SHA512 6d590229ea250617d7cedfe390301bbb2a8cbce9137bbf2fc7144c15d23b5c7e2f7f059123a461ed8cf265d73ef7086d2df1bf4637293ed0be65bf39f1316fe9 WHIRLPOOL 0603b08ecd645ef3466afe3cadbf5a43b1e75c3a2a20383fc548431da9d8c4ddbb62734e3588a9b89045414bc63fafe90fd3a02e32923349dfca758410044979
 MISC metadata.xml 1153 SHA256 4098cfa7c224af2bafc5dac8c1834e4f53b4c992f2dcfe20ce494b0ecbc3caf4 SHA512 e1f7f672f1f185781fbe4135a787b03800199caea1ad8e9287182a0605401db8f61de96372a106d92f608900aa158ebaa96b3256d6d7566fdd5f183f0be91b88 WHIRLPOOL 50140233feb932045fc2bf97d3a254628fe6afff32c3c30ddb524d03442ba84aaf4f10e5e3868ba416f8928f81718901ad68b2ca45db442467ab26942a74196f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (SunOS)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlJlLCcACgkQX3X2B8XHTomKEwCfYCVTki/c2EarJ9LR0O9yqXrI
-Fm0An1tTs7ZTAwhYDw0Ul/ZWcLm71v9l
-=glkP
+iEYEAREIAAYFAlNWxjMACgkQ1ycZbhPLE2C91ACfWAKDEf0BsywyRVqTqlbQ8gJS
+KnAAn0iZz95a8r+YQeyuChQv8z0t9dVI
+=hrLB
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.3.4.ebuild b/sci-libs/fftw/fftw-3.3.4.ebuild
new file mode 100644
index 000000000000..e17539412f31
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.4.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.1 2014/04/22 19:42:37 bicatali Exp $
+
+EAPI=5
+
+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/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+	KEYWORDS=""
+	AUTOTOOLS_AUTORECONF=1
+else
+	SRC_URI="http://www.fftw.org/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="3.0/3"
+IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
+
+RDEPEND="
+	mpi? ( virtual/mpi )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+#can go once mpi is multlib
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/fftw3-mpi.h
+	/usr/include/fftw3l-mpi.f03
+	/usr/include/fftw3-mpi.f03
+	/usr/include/fftw3q.f03
+)
+
+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
+	[[ ${PV} = *9999 ]] || 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() {
+		#a bit hacky improve after #483758 is solved
+		local x=${BUILD_DIR%-${ABI}}
+		x=${x##*-}
+		# there is no abi_x86_32 port of virtual/mpi right now
+		local enable_mpi=$(use_enable mpi)
+		multilib_is_native_abi || enable_mpi="--disable-mpi"
+
+		#jlec reported USE=quad on abi_x86_32 has too less registers
+		#stub Makefiles
+		if use amd64 && ! multilib_is_native_abi && [[ $x = quad ]]; then
+			mkdir -p "${BUILD_DIR}/tests" || die
+			echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+			echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+			echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+			return 0
+		fi
+
+		local 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)
+				${enable_mpi}
+				$(use_enable neon)
+			)
+		elif [[ $x == double ]]; then
+			myeconfargs+=(
+				$(use_enable avx)
+				$(use_enable sse2)
+				${enable_mpi}
+			)
+		elif [[ $x == longdouble ]]; then
+			myeconfargs+=(
+				--enable-long-double
+				${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-utils_src_configure
+	}
+
+	multibuild_foreach_variant multilib_parallel_foreach_abi 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/ )
+
+	#copied from autotools-multilib_secure_install
+	my_abi_src_install() {
+		autotools-utils_src_install
+		#https://github.com/FFTW/fftw3/pull/6
+		# f03 are installed unconditionally, not a big problem as the quad
+		# header is the only one to be wrapped.
+		[[ ${BUILD_DIR} = *-quad* ]] || rm -f "${ED}/usr/include/fftw3q.f03"
+		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+			multilib_prepare_wrappers
+			multilib_check_headers
+		fi
+	}
+	multibuild_foreach_variant multilib_foreach_abi my_abi_src_install
+	multilib_install_wrappers
+
+	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
+}