Version bump. More as-needed fixes, and general cleanup.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 223 insertions, 7 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index f7ba701c8629..53df34f7e726 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,12 @@
 # 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.75 2008/11/27 10:39:28 bicatali Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.76 2009/02/26 17:38:05 bicatali Exp $
+
+*fftw-3.2.1 (26 Feb 2009)
+
+  26 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/fftw-3.2.1-as-needed.patch, +fftw-3.2.1.ebuild:
+  Version bump. More as-needed fixes, and general cleanup.
 
   27 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org> fftw-3.2.ebuild:
   Fixed for older libtool versions and forcing posix threads in the ebuild
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 127dc6fa79bb..114017baf04e 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -10,21 +10,24 @@ AUX fftw-3.1.2-openmp.patch 495 RMD160 bd45753520f1ca051459c66fc5bc54ee02936a5f
 AUX fftw-3.2-as-needed.patch 1199 RMD160 0f22f2a66c23ebc830ec887ee1b4a94a82c02576 SHA1 c3cea571bfa3a90239f6580793751e4eacf8837a SHA256 5ff736816d452fd1e9f57826a45e49e2efbe7ede41f35e16d4b62d3f2edd19a2
 AUX fftw-3.2-cppflags.patch 322 RMD160 0c61bf71cfe2520c390c4c6c116bc780e22c0912 SHA1 f4a58b2b6139cba53f11a7f8f3891c4e71c6a53a SHA256 b232d06e88b14e29dc87b9978ac0136cccff83b58c1782c56aeb3c2858011c40
 AUX fftw-3.2-openmp.patch 1242 RMD160 b60a6af903289599195bc0232e3106d2cce27e78 SHA1 e6b77e08fcfba7f9750391443142b310bceeddee SHA256 29e71cc4f5485dbcd3f1cfe0c71ba2621a4249448820a6afca43b27652ba3fd7
+AUX fftw-3.2.1-as-needed.patch 3184 RMD160 fe4e353851780d1520cfa95cd4403ec7045d9c73 SHA1 c831f88d297579f6feed13a726184dea7f2362f8 SHA256 c70c4544a060f134d88930019562b4b4f413382e33b373e8389036be6aefb91c
 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
+DIST fftw-3.2.1.tar.gz 3476044 RMD160 b8537c9a245638ea01bbac7ca56862844be674be SHA1 690a7cb4fb947a555eaf166cd098a43b61796723 SHA256 076a43a8000d331076181ea9e72a56a9cd050400535b7bb3fc2f53b707e712f5
 DIST fftw-3.2.tar.gz 3670044 RMD160 26f686e793f0fafedefa352b38058e76c9ca698c SHA1 7ec19356191ffa3719294a5373f27b75c04c301b SHA256 205a021a87cae27146741d15bff260353497d219332a97718c0c649ab81483d0
 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.ebuild 3028 RMD160 ccae2a7aa9987a6dadac0de1b6c22d70f267c14d SHA1 a099a89a2fe1164b78b05b2a41d29b4a8c4a776a SHA256 96b29aa7df715b9765596d0e9c69a69013232e412d255afbc71e58feb3160804
 EBUILD fftw-3.1.3.ebuild 3956 RMD160 1a26e82f159bbd9354e429edb50257bec385d514 SHA1 68d221a2ce8638bac8016bad7ae09a91ef0aa330 SHA256 c982e9c98cc5b4c1dc4109b5b36b0a4b4cf2e3674a3f13bc4161d159364a65fb
+EBUILD fftw-3.2.1.ebuild 3601 RMD160 c11807e15a1b5b1d0f8fd9be030d1edcdae30291 SHA1 d2374b9abe1aa8d794aa0f89e48c3696b4992eb1 SHA256 fe715e0f00d08cf9f154ceb1a48524b8d02f914c1fb00fa4805b787a90decb99
 EBUILD fftw-3.2.ebuild 3919 RMD160 06eec7f1692940765b79696c4b41656708db8102 SHA1 9d4f696c9ca2aaa5d142e348e132b2a8e9939b66 SHA256 c35a94d183821cc41d34e661979388513fa02a6932a6beca75cba7904ca256bf
-MISC ChangeLog 16358 RMD160 337bca10a77f9fddbb3fa7b5457b65b35adc8f71 SHA1 443519709a70f62a2fc111b379a664f581330a77 SHA256 52b93f73603ca499c6387bc6c556d56547a908d57c371095b940d97ff959d2b1
+MISC ChangeLog 16557 RMD160 88459e72af1a38fee5597b23440ca0105e077cc1 SHA1 dfdaff3afdf9d3fdccd53f0251ab14b1363f9ceb SHA256 35c7921ab3ed0126bfed11469453482c339820932769dfdc8a88e8d416910f8e
 MISC metadata.xml 770 RMD160 ca19408a763b8f3db20849456d67c3027cfdba5e SHA1 8c6d41e762d4cc86eaaeee10a2fc9c4743e0e828 SHA256 129a4af8bed71473f17cf323cb11763e09cf9b63eaa764643a1412c649a8c0bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkkueOkACgkQ1ycZbhPLE2DFyACdGp7brYdfya5kTLsf7CXyhasv
-ARQAoLPqgKLwad7Tskxw2v4qLTQyaCy7
-=RzBM
+iEYEARECAAYFAkmm04cACgkQ1ycZbhPLE2CbwgCfQPdExO1UTc3tzinrPLudYGU0
+wMkAn1bFreVH0+gY1AZYibW1WNn2SEZx
+=LkVz
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.2.1.ebuild b/sci-libs/fftw/fftw-3.2.1.ebuild
new file mode 100644
index 000000000000..cf5aaaa1ebd9
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.2.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.1.ebuild,v 1.1 2009/02/26 17:38:05 bicatali Exp $
+
+EAPI=2
+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() {
+	FFTW_THREADS="--disable-threads --disable-openmp"
+	if use openmp; then
+		FFTW_THREADS="--disable-threads --enable-openmp"
+	elif use threads; then
+		FFTW_THREADS="--enable-threads --disable-openmp"
+	fi
+	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, we will build using POSIX threads."
+		epause 5
+		FFTW_THREADS="--enable-threads --disable-openmp"
+	fi
+	FORTRAN="gfortran ifc g77"
+	use fortran && fortran_pkg_setup
+	FFTW_DIRS="single double longdouble"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+
+	# fix info file for category directory
+	sed -i \
+		-e 's/Texinfo documentation system/Libraries/' \
+		doc/fftw3.info || die "failed to fix info file"
+
+	rm m4/lt* m4/libtool.m4
+
+	AT_M4DIR=m4 eautoreconf
+	for x in ${FFTW_DIRS}; do
+		mkdir "${S}-${x}" || die
+	done
+}
+
+src_configure() {
+	# filter -Os according to docs
+	replace-flags -Os -O2
+
+	local myconfcommon="--enable-shared
+		$(use_enable fortran)
+		${FFTW_THREADS}"
+
+	local myconfsingle="${myconfcommon} --enable-single"
+	local myconfdouble="${myconfcommon}"
+	local myconflongdouble="${myconfcommon} --enable-long-double"
+	if use sse2; then
+		myconfsingle="${myconfsingle} --enable-sse"
+		myconfdouble="${myconfdouble} --enable-sse2"
+	elif use sse; then
+		myconfsingle="${myconfsingle} --enable-sse"
+	fi
+	# altivec only helps singles, not doubles
+	if use altivec; then
+		myconfsingle="${myconfsingle} --enable-altivec"
+	fi
+
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}"
+		einfo "Configuring for ${x} precision"
+		local p=myconf${x}
+		ECONF_SOURCE="${S}" econf ${!p}
+	done
+}
+
+src_compile() {
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}"
+		einfo "Compiling for ${x} precision"
+		emake || die "emake for ${x} precision failed"
+	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 || die "emake test ${x} failed"
+	done
+}
+
+src_install () {
+	# all builds are installed in the same place
+	# libs have distinuguished names; include files, docs etc. identical.
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}"
+		emake DESTDIR="${D}" install || die "emake install for ${x} failed"
+	done
+
+	cd "${S}"
+	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS
+	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
+}
diff --git a/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch b/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch
new file mode 100644
index 000000000000..ee9c12a4df59
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch
@@ -0,0 +1,82 @@
+diff -Nur fftw-3.2.1.orig/configure.ac fftw-3.2.1/configure.ac
+--- fftw-3.2.1.orig/configure.ac	2009-02-20 19:28:55.832163268 +0000
++++ fftw-3.2.1/configure.ac	2009-02-26 15:02:37.533259854 +0000
+@@ -440,14 +440,15 @@
+ AC_ARG_WITH(combined-threads, [AC_HELP_STRING([--with-combined-threads],[combine threads into main libfftw3])], with_combined_threads=$withval, with_combined_threads=no)
+ 
+ if test "$enable_openmp"x != nox; then
+-   AX_OPENMP([THREADLIBS=" "
++   AX_OPENMP([THREADLIBS="$OPENMP_LIBS"
+      AC_DEFINE(USING_OPENMP_THREADS, 1, [Define if we have and are using OpenMP multithreading directives])
+      CFLAGS="$CFLAGS $OPENMP_CFLAGS"],
+-     [AC_MSG_ERROR([don't know how to enable OpenMP])])
++     [AC_MSG_WARN([don't know how to enable OpenMP, reverting to POSIX threads])])
++else
++   THREADLIBS=""
+ fi
+ 
+ dnl Check for threads library...
+-THREADLIBS=""
+ if test "$enable_threads" = "yes"; then
+ 	# POSIX threads, the default choice:
+ 	if test -z "$THREADLIBS"; then
+diff -Nur fftw-3.2.1.orig/m4/ax_openmp.m4 fftw-3.2.1/m4/ax_openmp.m4
+--- fftw-3.2.1.orig/m4/ax_openmp.m4	2009-02-20 19:28:55.792160754 +0000
++++ fftw-3.2.1/m4/ax_openmp.m4	2009-02-26 15:02:08.887255943 +0000
+@@ -54,13 +54,18 @@
+ done
+ []_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS
+ ])
++OPENMP_LIBS=" "
+ if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "xunknown"; then
+   m4_default([$2],:)
+ else
+   if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then
+     OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp
++    if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "x-fopenmp"; then
++        OPENMP_LIBS="-lgomp"
++    fi
+   fi
+   m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])])
+ fi
+ AC_SUBST(OPENMP_[]_AC_LANG_PREFIX[]FLAGS)
++AC_SUBST(OPENMP_LIBS)
+ ])dnl AX_OPENMP
+diff -Nur fftw-3.2.1.orig/Makefile.am fftw-3.2.1/Makefile.am
+--- fftw-3.2.1.orig/Makefile.am	2009-02-20 19:28:56.040169973 +0000
++++ fftw-3.2.1/Makefile.am	2009-02-26 15:02:08.887255943 +0000
+@@ -36,6 +36,13 @@
+ if SMP
+ if COMBINED_THREADS
+ COMBINED_THREADLIBS=threads/libfftw3@PREC_SUFFIX@_threads.la
++else
++lib_LTLIBRARIES += libfftw3@PREC_SUFFIX@_threads.la
++libfftw3@PREC_SUFFIX@_threads_la_SOURCES = 
++libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
++libfftw3@PREC_SUFFIX@_threads_la_LIBADD = \
++	libfftw3@PREC_SUFFIX@.la \
++	threads/libfftw3@PREC_SUFFIX@_threads.la
+ endif
+ endif
+ 
+diff -Nur fftw-3.2.1.orig/threads/Makefile.am fftw-3.2.1/threads/Makefile.am
+--- fftw-3.2.1.orig/threads/Makefile.am	2009-02-20 19:28:55.832163268 +0000
++++ fftw-3.2.1/threads/Makefile.am	2009-02-26 15:02:08.887255943 +0000
+@@ -2,11 +2,7 @@
+ -I$(top_srcdir)/rdft -I$(top_srcdir)/api
+ 
+ if SMP
+-if COMBINED_THREADS
+ noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
+-else
+-lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
+-endif
+ endif
+ 
+ # pkgincludedir = $(includedir)/fftw3@PREC_SUFFIX@
+@@ -16,4 +12,5 @@
+ openmp.c threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c	\
+ vrank-geq1-rdft2.c f77api.c f77funcs.h
+ 
++libfftw3@PREC_SUFFIX@_threads_la_LIBADD = $(THREADLIBS)
+ libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@