Version bump

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.25-gentoo-r7 x86_64

3 files changed, 155 insertions, 5 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index a1cd029db5e5..d33aec098a9b 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.72 2008/10/17 18:44:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.73 2008/10/20 21:45:12 bicatali Exp $
+
+*fftw-3.1.3 (20 Oct 2008)
+
+  20 Oct 2008; Sébastien Fabbro <bicatali@gentoo.org> +fftw-3.1.3.ebuild:
+  Version bump
 
   17 Oct 2008; Markus Meier <maekke@gentoo.org> metadata.xml:
   openmp USE-flag is global now
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index c6db7b67fb06..596c82a28f5d 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -9,16 +9,18 @@ AUX fftw-3.1.2-configure.ac.patch 1055 RMD160 fc8d8b2504b5004d08f2d08b4186201037
 AUX fftw-3.1.2-openmp.patch 495 RMD160 bd45753520f1ca051459c66fc5bc54ee02936a5f SHA1 b484fccd298d24c50d8fd6dafd195eb96e2d857a SHA256 b17eb6b21c46b5309b3f215edf368fedb8320663c3d995d58ee6563850170786
 DIST fftw-2.1.5.tar.gz 1256888 RMD160 723308722d76c12710db6473979adf8d086b0909 SHA1 12020b58edc1b0490a83db4aa912fac5dfdfb26b SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630
 DIST fftw-3.1.2.tar.gz 2736360 RMD160 13069b3582eeaa1fba1614cdca2dfbc2e45ab585 SHA1 3e4c64009ffb48123a0f30f46c1d89da7810dc67 SHA256 e1b92e97fe27efcbd150212d0d287ac907bd2fef0af32e16284fef5d1c1c26bf
+DIST fftw-3.1.3.tar.gz 2810399 RMD160 6df354a7fba100f14361d5ce1bfc18f393979690 SHA1 4ac7f2d4f08e253a1a60f336c8e1879955d93816 SHA256 96cc33243c6b9da6c9955a751402e62d973dbc654c275cc05fdbca65aba0bad5
 EBUILD fftw-2.1.5-r4.ebuild 3435 RMD160 6dec3455cbb6e4804d1d0899a9816a7c771aef03 SHA1 e385b611622d2f4fa0f5c16bdf12df516fb60ade SHA256 9cc764af059cd98c3902d0e483b4f909b6269824a43201f9a776ff30541b8e10
 EBUILD fftw-2.1.5-r5.ebuild 3847 RMD160 ade95322bf17aa8c911587b364424622ed69356f SHA1 70a0051b49e07e02bf2b124df4cc8d0451bf9211 SHA256 7706bc77b28e03847e5d8cf04f3114c070ac3a8d79c54c4ea6797076ef142f2f
 EBUILD fftw-3.1.2-r1.ebuild 3938 RMD160 6d728a0d7b0263c709fa3bc062ec4b9d47e3733d SHA1 aad7e8ffe3d30c021af59f06d7d66d042cd216d6 SHA256 365a015d29797ffb9e55d4f209389bb38d675c488f55fe298e8f6a929a8f43d0
 EBUILD fftw-3.1.2.ebuild 3028 RMD160 ccae2a7aa9987a6dadac0de1b6c22d70f267c14d SHA1 a099a89a2fe1164b78b05b2a41d29b4a8c4a776a SHA256 96b29aa7df715b9765596d0e9c69a69013232e412d255afbc71e58feb3160804
-MISC ChangeLog 15772 RMD160 95dde7951fb6c80207f2871f75f4a8cb561f6d59 SHA1 af448d9c943d325edae97d825a07685030d717b5 SHA256 f522876d4d5a30c7de526a2fdc10faaa799ad7615c50dd569872a979aedc5165
+EBUILD fftw-3.1.3.ebuild 3956 RMD160 1a26e82f159bbd9354e429edb50257bec385d514 SHA1 68d221a2ce8638bac8016bad7ae09a91ef0aa330 SHA256 c982e9c98cc5b4c1dc4109b5b36b0a4b4cf2e3674a3f13bc4161d159364a65fb
+MISC ChangeLog 15892 RMD160 f3b1f797119cdafaaad4210c119d84290e8df2e3 SHA1 4d395be08757236cb74ee83568a90bdb6eb0b315 SHA256 57e823166b9be39f100c21dd30ff16b70c451015a9c0232670795ef389ca6039
 MISC metadata.xml 770 RMD160 ca19408a763b8f3db20849456d67c3027cfdba5e SHA1 8c6d41e762d4cc86eaaeee10a2fc9c4743e0e828 SHA256 129a4af8bed71473f17cf323cb11763e09cf9b63eaa764643a1412c649a8c0bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj43UwACgkQkKaRLQcq0GIe2QCffynxsSGAWd28Z0yRqzJ0bv4B
-YG4An1favj6EcTf6p7tN5iyDQqCDBgRF
-=SgtY
+iEYEARECAAYFAkj8+/EACgkQ1ycZbhPLE2BhEgCdGWOc3rPOjg/A5Zd4+2Bbn1FL
+eCAAoLQsnZ6QRrftdmPyQeIUChvh6oJp
+=ObrX
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.1.3.ebuild b/sci-libs/fftw/fftw-3.1.3.ebuild
new file mode 100644
index 000000000000..c10386ed6848
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.1.3.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.3.ebuild,v 1.1 2008/10/20 21:45:12 bicatali Exp $
+
+inherit flag-o-matic eutils toolchain-funcs autotools fortran
+
+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"
+IUSE="altivec doc fortran openmp sse sse2 threads"
+
+pkg_setup() {
+	if use openmp &&
+		[[ $(tc-getCC)$ == *gcc* ]] &&
+		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
+			! built_with_use sys-devel/gcc openmp )
+	then
+		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
+		ewarn "If you want to build fftw with OpenMP, abort now,"
+		ewarn "and switch CC to an OpenMP capable compiler"
+		ewarn "Otherwise the configure script will select POSIX threads."
+		epause 5
+	fi
+	FORTRAN="gfortran ifc g77"
+	use fortran && fortran_pkg_setup
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.1.2-configure.ac.patch
+	epatch "${FILESDIR}"/${PN}-3.1.2-openmp.patch
+	epatch "${FILESDIR}"/${PN}-3.1.2-as-needed.patch
+
+	# fix info file
+	sed -e 's/Texinfo documentation system/Libraries/' \
+		-i doc/fftw3.info || die "failed to fix info file"
+	AT_M4DIR=m4 eautoreconf
+	cd "${WORKDIR}"
+	mv ${P} ${P}-single
+	cp -pPR ${P}-single ${P}-double
+	cp -pPR ${P}-single ${P}-longdouble
+}
+
+src_compile() {
+	# filter -Os according to docs
+	replace-flags -Os -O2
+
+	local myconfcommon="
+		--enable-shared
+		$(use_enable threads)
+		$(use_enable fortran)"
+
+	if use openmp; then
+		myconfcommon="${myconfcommon}
+			--enable-threads
+			--with-openmp"
+	elif use threads; then
+		myconfcommon="${myconfcommon}
+			--enable-threads
+			--without-openmp"
+	else
+		myconfcommon="${myconfcommon}
+			--disable-threads
+			--without-openmp"
+	fi
+	local myconfsingle=""
+	local myconfdouble=""
+	local myconflongdouble=""
+
+	if use sse2; then
+		myconfsingle="${myconfsingle} --enable-sse"
+		myconfdouble="${myconfdouble} --enable-sse2"
+	elif use sse; then
+		myconfsingle="${myconfsingle} --enable-sse"
+	fi
+	# altivec only helps floats, not doubles
+	if use altivec; then
+		myconfsingle="${myconfsingle} --enable-altivec"
+	fi
+
+	cd "${S}-single"
+	econf \
+		--enable-float \
+		${myconfcommon} \
+		${myconfsingle} || \
+			die "econf single failed"
+	emake || die "emake single failed"
+
+	# the only difference here is no --enable-float
+	cd "${S}-double"
+	econf \
+		${myconfcommon} \
+		${myconfdouble} || \
+		die "econf double failed"
+	emake || die "emake double failed"
+
+	# the only difference here is --enable-long-double
+	cd "${S}-longdouble"
+	econf \
+		--enable-long-double \
+		${myconfcommon} \
+		${myconflongdouble} || \
+		die "econf long double failed"
+	emake || die "emake long double failed"
+}
+
+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 d in single double longdouble; do
+		cd "${S}-${d}"/tests
+		einfo "Testing ${PN}-${d}"
+		emake -j1 check || die "emake test failed"
+	done
+}
+
+src_install () {
+	# all builds are installed in the same place
+	# libs have distinuguished names; include files, docs etc. identical.
+	for i in single double longdouble; do
+		cd "${S}-${i}"
+		emake DESTDIR="${D}" install || die "emake install for ${i} failed"
+	done
+
+	# Install documentation.
+	cd "${S}-single"
+	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS || die
+	if use doc; then
+		cd doc
+		insinto /usr/share/doc/${PF}
+		doins -r html fftw3.pdf || die "doc install failed"
+		insinto /usr/share/doc/${PF}/faq
+		doins FAQ/fftw-faq.html/*
+	fi
+}