added 3.3.1_beta1 with neon support

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

3 files changed, 153 insertions, 9 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 64e3a502e642..9b3272c69c4a 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.122 2012/02/05 20:39:36 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.123 2012/02/05 20:54:57 ottxor Exp $
+
+*fftw-3.3.1_beta1 (05 Feb 2012)
+
+  05 Feb 2012; Christoph Junghans <ottxor@gentoo.org> +fftw-3.3.1_beta1.ebuild:
+  added 3.3.1_beta1 with neon support
 
 *fftw-3.2.2-r2 (05 Feb 2012)
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 7ca2f4c33563..ba53945d319c 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -9,6 +9,7 @@ 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.1-beta1.tar.gz 3992174 RMD160 5c7e0717827b9623d9950fd3712173b0acaabc12 SHA1 6b2546ae9caa99095229b230104266ac68b12189 SHA256 d346c272b0aae61500bcddcb05a03a25808ff5176f4df0ad407c1d730bf314a2
 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
@@ -17,16 +18,17 @@ EBUILD fftw-3.2.2-r2.ebuild 3882 RMD160 0b7d62f39d5b7260a5a3584bdda0458f7e01af74
 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
 EBUILD fftw-3.3-r2.ebuild 3430 RMD160 d18103a5796fad73a3ce8b34e891ade6ac33df91 SHA1 e3a5da5238fc21e8d6c50f9a0c5222f0fcaf7677 SHA256 a7b63dd2112a6af0155259af0178d2c8156376d95f35d8793b8d81e589e694be
-MISC ChangeLog 22643 RMD160 9c4ad4cf88f70a24aec0aff6d5a9e37a0db201c9 SHA1 115b1f87d625ba3efd936994bad4e032f37d1c87 SHA256 b6604b18108332e45d00f8db691db963c6086c8c2d494ddc65f6ea6e4e90cee7
+EBUILD fftw-3.3.1_beta1.ebuild 3463 RMD160 dff9bf49397de5d16896c6af835360dd9d78634d SHA1 075d36b636cbe2d26ba0a7f17e768057f1d5e6f3 SHA256 a00efa66160019bc251e101d059aef8e4abc7f345aadfb6a524a01e1caaa41ed
+MISC ChangeLog 22795 RMD160 c3db9e7b6615df941ef880891e1ca951354ce2a1 SHA1 55a82451a4fb3092aebb93028adf9e042157d50e SHA256 fc8e77fbf2adbdac8c6e60a72241cf076ac68b107a18f5d29caa6a60658556a3
 MISC metadata.xml 1056 RMD160 0e2473b1d5087b8453838a27422493ba3423d840 SHA1 0eda7ff79cafd68f383785a91b94faa86ba7def8 SHA256 f0adfac91df27dcce0ef9232b15da9fcabb738e6d4158abe5906e7caea532c98
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPLukOAAoJEOeBhlrCAAWGE8wH/2VmmyeyNuA0+JKvfGrJ/V0P
-3AquF+6gx4m7SkRqTIzFBvWn24nQ9Z686zUUwHeN3w2tSrcoitUXFTgg4O93zhE9
-taUUEXgp7i1nnp+HtKpjPTjqFVqtMpAVAP1jjZQqAm/B5pNWWM2u5MDaF/jwheGp
-47jHpOq86T+ZIg6T86ZOopGI90pi+RGcoFF18QujHe7HSto2vq/P6UjbvzrJEaE0
-nYH+z4F4aLJHdlpfZncKveDy329YaUcrH++yhZbS3kzCplApgU2TIAovTlV9mJWa
-mgxpqaHEJa1LvOfaDG09EaJRAEgK1ZOcquSRAOTY0g6VGpmgoE2Cd72q2LbFVgc=
-=486P
+iQEcBAEBAgAGBQJPLuynAAoJEOeBhlrCAAWGG44H/RDYd2d0SQhCYFO5rcVnQTOf
+kezFWy0xJ6lH3o6bdwc3upQSpfEPRyyxOYMKHYeo6bN4vhtiYFOJTAQ5KvXaK5ao
+rZh4Der9KMa/72RzUrN9EhVBKbTXxia7PQyr5VPtoSrXnkWDcAr4UdUAJTlNUfU9
+XbLVkBppK5QSa6gB5lJCXcDJpKfihga9aeu6BYH0CDqEAfEeTs3id6NC7O9tVKAU
+6PPXRV3XeDGkoo23UpQ4suwrFBlQ48hXPfsXAIs5OZfEy3PLFpIbDI4AqtTYflxS
+B55xRS5hu3p71dajYGuihpFWM4Qk/VdUXI3f+GDI9kmZEl/DtejTL8RvTnrpIVQ=
+=zYLq
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.3.1_beta1.ebuild b/sci-libs/fftw/fftw-3.3.1_beta1.ebuild
new file mode 100644
index 000000000000..8b1569dcd7ce
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.1_beta1.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.1_beta1.ebuild,v 1.1 2012/02/05 20:54:57 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
+}