[sci-libs/fftw] version bump

(Portage version: 2.1.10.3/git/Linux i686, signed Manifest commit with key C2000586)

4 files changed, 35 insertions, 107 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 99038b101..1ad3dbce7 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*fftw-3.3 (20 Aug 2011)
+
+  20 Aug 2011; Christoph Junghans <ottxor@gentoo.org>
+  -files/fftw-3.2.1-as-needed.patch, -fftw-3.3_alpha1.ebuild, +fftw-3.3.ebuild:
+  version bump
+
   24 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-3.3_alpha1.ebuild:
   Streamlined fortran-2 eclass usage
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 02b5c2872..a0ca14f4e 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX fftw-3.2.1-as-needed.patch 3184 RMD160 fe4e353851780d1520cfa95cd4403ec7045d9c73 SHA1 c831f88d297579f6feed13a726184dea7f2362f8 SHA256 c70c4544a060f134d88930019562b4b4f413382e33b373e8389036be6aefb91c
-DIST fftw-3.3alpha1.tar.gz 3466915 RMD160 97abe5966b86193bbe52a550bb18d180fdaa8a5d SHA1 a782c2b2f17780bccf491090e80dee22994776cc SHA256 b5e64e261e0379deb165fa56ec61cfb0990b6a8963b8ebec9a0f3e6bfbc76e4b
-EBUILD fftw-3.3_alpha1.ebuild 3711 RMD160 0389cc2136512a271f0a3fa74dc635dad9965aa6 SHA1 25de1f6ae74c892ba53a6917ccf0df24a8de84f0 SHA256 454ff66802a231d649fbf9816416b0884bab5f64b842d618cf6152ec33163d0a
-MISC ChangeLog 503 RMD160 1e17190d5aa7ab23b6c3ab1306b60483ff6f3590 SHA1 036156b5cdfcb586cfc14e867bbf00fd275417bc SHA256 6abf39e19cfad9b67372c0878064c2f58853c369f3d7851bbd6bc1f935ab2e66
+DIST fftw-3.3.tar.gz 3965713 RMD160 2a4969019d0b1eda5a09cf68f0a012d3fe30fff8 SHA1 e44493ba4babeacba184568e727876d9aed44205 SHA256 d25a98521a13933e678ce19319d03ddc915826764e1e59abd12d172c239b6aea
+EBUILD fftw-3.3.ebuild 3594 RMD160 65a374c8f9edebc9907f7833b6748bf02b125411 SHA1 27b75006331f863cbfd182697ce133451f42aa92 SHA256 570d6276c56d591462da214445ff8d7d4a0a70e093ec83516b7c013565f88e56
+MISC ChangeLog 678 RMD160 d35c871b2411cc07d14b22afd8aa3fd4f7ecae08 SHA1 5e6bcdb78333e4c22690ba465ca377ce2afdcfb0 SHA256 465e08796d54ed7c35c694856e5b785271877a03cf52f9ae49654bb521f30786
 MISC metadata.xml 637 RMD160 a7f1ab3fce5eae79531875234ca77532d0fd2cfa SHA1 b1cce6af4d119fc1b4f640b33e4ef1a8318a736c SHA256 a2798427fe8d4cbe97cf588e66bf54cc37d9650b9451290c2b6846cc6bb81e50
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4EgNkACgkQgAnW8HDreRYcFQCfXNfWxek5Rvr//yWrxkqbXEzj
-QzMAn0r9MAeZY+IdSkaVE3t/fY7PPSCU
-=wyTJ
+iQEcBAEBAgAGBQJOT4wVAAoJEOeBhlrCAAWGcHYH/jAWWCpc9XMsosKxvoeNwq0L
+Z8eSilaW7BLpzJl1fiXlyLXyFgxqTfOI/3krm7wmrSff5t5/YueiwNMGw+LY6ZTz
+9or7WuFwwNVL9S/xjCd+8SLjiDdUxD5BljxmarTUgORRFgIDuN8z+dEBgjAQMCMj
+X2Esnw3cmSlflavby6Z0KZQFxjuSTBgd8uqPMVhIp/IlGhOOeXdC+pWqP9fQ7N4H
+5horpdpvUimpwmZd2ATLyXPBOHQlnpHLDdefC2mK9k38SZVmKC8uvnSWRaoYSBq0
+l9z4QaE8TVA4EDDxtEPo3pT+/rMO7/H5eKkRj1eTtDIoJy6YeZZrLBNK0GyrSDg=
+=mRSu
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.3_alpha1.ebuild b/sci-libs/fftw/fftw-3.3.ebuild
index 3d9e309d5..7c0e4c94b 100644
--- a/sci-libs/fftw/fftw-3.3_alpha1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.ebuild
@@ -2,13 +2,13 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=2
+EAPI=4
 
 inherit autotools 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"
+SRC_URI="http://www.fftw.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="3.0"
@@ -20,32 +20,23 @@ DEPEND="
 	mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${P//_}"
-
 pkg_setup() {
 	use openmp && FORTRAN_NEED_OPENMP="1"
 	use fortran && fortran-2_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
+	use openmp && FFTW_OPENMP="--enable-openmp"
 	if use openmp && ! tc-has-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"
+		FFTW_THREADS="--disable-openmp"
 	fi
 	FFTW_DIRS="single double longdouble"
 	use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.2.1-as-needed.patch
-
 	# fix info file for category directory
 	sed -i \
 		-e 's/Texinfo documentation system/Libraries/' \
@@ -67,7 +58,8 @@ src_configure() {
 		$(use_enable static-libs static)
 		$(use_enable fortran)
 		$(use_enable mpi)
-		${FFTW_THREADS}"
+		$(use_enable threads)
+		${FFTW_OPENMP}"
 
 	local myconfsingle="${myconfcommon} --enable-single"
 	local myconfdouble="${myconfcommon}"
@@ -95,7 +87,7 @@ src_compile() {
 	for x in ${FFTW_DIRS}; do
 		cd "${S}-${x}"
 		einfo "Compiling for ${x} precision"
-		emake || die "emake for ${x} precision failed"
+		emake
 	done
 }
 
@@ -108,16 +100,18 @@ src_test () {
 	for x in ${FFTW_DIRS}; do
 		cd "${S}-${x}/tests"
 		einfo "Testing ${x} precision"
-		emake -j1 check || die "emake test ${x} failed"
+		emake -j1 check
 	done
 }
 
 src_install () {
+	local f u
+
 	# 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"
+		emake DESTDIR="${D}" install
 	done
 
 	cd "${S}"
@@ -125,8 +119,15 @@ src_install () {
 	if use doc; then
 		cd doc
 		insinto /usr/share/doc/${PF}
-		doins -r html fftw3.pdf || die "doc install failed"
+		doins -r html fftw3.pdf
 		insinto /usr/share/doc/${PF}/faq
 		doins FAQ/fftw-faq.html/*
 	fi
+
+	use openmp && [[ ${FFTW_OPENMP} = "--enable-openmp" ]] && u="omp"
+	for f in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+		for u in $(usev mpi) $(usev threads) ${u}; do
+		    sed "s|-lfftw3[lf]\?|&_$u|" "$f" > "${f%.pc}_$u.pc" || die
+		done
+	done
 }
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
deleted file mode 100644
index ee9c12a4d..000000000
--- a/sci-libs/fftw/files/fftw-3.2.1-as-needed.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-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@