Version bump. Thanks to Adam Pi#tyszek, closing bug #247561

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

6 files changed, 98 insertions, 12 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index d33aec098a9b..ce5aec033233 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,13 @@
 # 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.73 2008/10/20 21:45:12 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.74 2008/11/24 11:02:05 bicatali Exp $
+
+*fftw-3.2 (21 Nov 2008)
+
+  21 Nov 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  +files/fftw-3.2-as-needed.patch, +files/fftw-3.2-cppflags.patch,
+  +files/fftw-3.2-openmp.patch, -fftw-3.1.2-r1.ebuild, +fftw-3.2.ebuild:
+  Version bump. Thanks to Adam Piątyszek, closing bug #247561
 
 *fftw-3.1.3 (20 Oct 2008)
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 596c82a28f5d..6fd9ff1d605a 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -7,20 +7,24 @@ AUX fftw-2.1.5-no-test.patch 1247 RMD160 deeb232de9301eaf6363b3ae86fa2e940bd4601
 AUX fftw-3.1.2-as-needed.patch 1199 RMD160 9132ee7cb555967dd852dd2a9be11a7b13dd900b SHA1 abace49a909a24a735c4768b0454c7b8b560f443 SHA256 5d5e6ff5dff0faa01f7dd81634c5f4a9bc1e0532161ece7112f514dedfe0ff03
 AUX fftw-3.1.2-configure.ac.patch 1055 RMD160 fc8d8b2504b5004d08f2d08b41862010378ce210 SHA1 88fe0e5daa3ea19ebd2441f1226400eb63a6c3cd SHA256 3e8010503aecf10c43b82dfda7b937068d5fe961a70c8406b86aa54bb1cda33d
 AUX fftw-3.1.2-openmp.patch 495 RMD160 bd45753520f1ca051459c66fc5bc54ee02936a5f SHA1 b484fccd298d24c50d8fd6dafd195eb96e2d857a SHA256 b17eb6b21c46b5309b3f215edf368fedb8320663c3d995d58ee6563850170786
+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
 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.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-r1.ebuild 3938 RMD160 6d728a0d7b0263c709fa3bc062ec4b9d47e3733d SHA1 aad7e8ffe3d30c021af59f06d7d66d042cd216d6 SHA256 365a015d29797ffb9e55d4f209389bb38d675c488f55fe298e8f6a929a8f43d0
 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
-MISC ChangeLog 15892 RMD160 f3b1f797119cdafaaad4210c119d84290e8df2e3 SHA1 4d395be08757236cb74ee83568a90bdb6eb0b315 SHA256 57e823166b9be39f100c21dd30ff16b70c451015a9c0232670795ef389ca6039
+EBUILD fftw-3.2.ebuild 3932 RMD160 29b35808655e34357e080ea54cc473311fcf16ab SHA1 86bfc94dfa2f06820081d39e612cea8b274adce0 SHA256 661bf0e287ffbcb0748203359d4a84aaca7c48b77aca3cef248db1a5f95be610
+MISC ChangeLog 16176 RMD160 3550c59d5ad99acf3e65214cfdba3478ca6bc4f4 SHA1 630fbe1752c83b6ec249c334c7f058d5c490b4f8 SHA256 b4518f64719f65f4d997e0805478e211dfe0151d9d069a733d280702faad04cf
 MISC metadata.xml 770 RMD160 ca19408a763b8f3db20849456d67c3027cfdba5e SHA1 8c6d41e762d4cc86eaaeee10a2fc9c4743e0e828 SHA256 129a4af8bed71473f17cf323cb11763e09cf9b63eaa764643a1412c649a8c0bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkj8+/EACgkQ1ycZbhPLE2BhEgCdGWOc3rPOjg/A5Zd4+2Bbn1FL
-eCAAoLQsnZ6QRrftdmPyQeIUChvh6oJp
-=ObrX
+iEYEARECAAYFAkkqibcACgkQ1ycZbhPLE2DeKQCgot83nu51Uyg3nkdKCMN6vhKK
+hHoAn1vWclaeSn1WygGv75jipcy4Kemy
+=B7DA
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.1.2-r1.ebuild b/sci-libs/fftw/fftw-3.2.ebuild
index e4c4bcad25e6..a3556fe09eae 100644
--- a/sci-libs/fftw/fftw-3.1.2-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r1.ebuild,v 1.4 2008/08/28 13:49:20 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild,v 1.1 2008/11/24 11:02:05 bicatali Exp $
 
 inherit flag-o-matic eutils toolchain-funcs autotools fortran
 
@@ -32,9 +32,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-configure.ac.patch
 	epatch "${FILESDIR}"/${P}-openmp.patch
 	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-cppflags.patch
 
 	# fix info file
 	sed -e 's/Texinfo documentation system/Libraries/' \
@@ -57,16 +57,16 @@ src_compile() {
 
 	if use openmp; then
 		myconfcommon="${myconfcommon}
-			--enable-threads
-			--with-openmp"
+			--disable-threads
+			--enable-openmp"
 	elif use threads; then
 		myconfcommon="${myconfcommon}
 			--enable-threads
-			--without-openmp"
+			--disable-openmp"
 	else
 		myconfcommon="${myconfcommon}
 			--disable-threads
-			--without-openmp"
+			--disable-openmp"
 	fi
 	local myconfsingle=""
 	local myconfdouble=""
diff --git a/sci-libs/fftw/files/fftw-3.2-as-needed.patch b/sci-libs/fftw/files/fftw-3.2-as-needed.patch
new file mode 100644
index 000000000000..c991b20f2396
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-3.2-as-needed.patch
@@ -0,0 +1,36 @@
+--- Makefile.am.orig	2008-11-19 10:05:22.000000000 +0100
++++ Makefile.am	2008-11-19 10:06:56.000000000 +0100
+@@ -37,6 +37,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
+ 
+--- threads/Makefile.am.orig	2008-11-19 10:03:43.000000000 +0100
++++ threads/Makefile.am	2008-11-19 10:05:13.000000000 +0100
+@@ -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@
diff --git a/sci-libs/fftw/files/fftw-3.2-cppflags.patch b/sci-libs/fftw/files/fftw-3.2-cppflags.patch
new file mode 100644
index 000000000000..4d9a1b01c028
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-3.2-cppflags.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2008-11-19 09:57:26.000000000 +0100
++++ configure.ac	2008-11-19 09:59:08.000000000 +0100
+@@ -264,6 +264,8 @@
+ fi
+ fi
+ AC_SUBST(SIMD_CFLAGS)
++# pass simd flags to preprocessor/compiler for proper intrinsics detection.
++CPPFLAGS="$CPPFLAGS $SIMD_CFLAGS"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
diff --git a/sci-libs/fftw/files/fftw-3.2-openmp.patch b/sci-libs/fftw/files/fftw-3.2-openmp.patch
new file mode 100644
index 000000000000..254b9a05a28b
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-3.2-openmp.patch
@@ -0,0 +1,28 @@
+--- configure.ac.orig	2008-11-19 09:57:26.000000000 +0100
++++ configure.ac	2008-11-19 09:59:08.000000000 +0100
+@@ -435,10 +437,10 @@
+ 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])])
+ fi
+ 
+ dnl Check for threads library...
+--- m4/ax_openmp.m4.orig	2008-07-10 11:33:17.361562576 +0100
++++ m4/ax_openmp.m4	2008-07-10 12:05:14.280159723 +0100
+@@ -59,6 +59,10 @@
+ else
+   if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then
+     OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp
++    OPENMP_LIBS=" "
++    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