Version bump. This fixes bug #120763.

(Portage version: 2.1_pre4-r1)

5 files changed, 161 insertions, 13 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index adf3f15be7dc..1428d1e97bd3 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/fftw
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.25 2005/11/12 03:12:15 lu_zero Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.26 2006/02/11 20:19:56 markusle Exp $
+
+*fftw-3.1 (11 Feb 2006)
+
+  11 Feb 2006; Markus Dittrich <markusle@gentoo.org>
+  +files/fftw-ppc-macos.1.patch, +fftw-3.1.ebuild:
+  Version bump. This fixes bug #120763.
 
   12 Nov 2005; Luca Barbato <lu_zero@gentoo.org>
   +files/fftw-3.0.1-altivec.patch, fftw-3.0.1-r2.ebuild:
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 0870572b3903..bb1ad23f7bb9 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,23 +1,48 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d328e0995bfcc888fb0beb2f6ed7e685 ChangeLog 7067
+MD5 419369d1616e0b7a11403086d6d17858 ChangeLog 7237
+RMD160 8df778da26bd26ac027311f9ce30e95dbfbc5f90 ChangeLog 7237
+SHA256 21ad25f5dc68a42279e86866505bea0b34ce8994f75a11b59682f1c0653e28f6 ChangeLog 7237
 MD5 b0b309c7dfe2c8566424e91792350f95 fftw-2.1.5-r1.ebuild 4141
+RMD160 72b227d25d9871b5d1d09cfd062d67cd636ddccf fftw-2.1.5-r1.ebuild 4141
+SHA256 6d354780d0c0e6b341842fc1941266db9dd3c90d867b77813b9e1c63d7aa069e fftw-2.1.5-r1.ebuild 4141
 MD5 4a8f8342448809b69143f66d02e7f2d2 fftw-3.0.1-r1.ebuild 2759
+RMD160 508aea7c5b721ef415fc4d5121cfb057aba7aaef fftw-3.0.1-r1.ebuild 2759
+SHA256 d53c2fa4f8ecc2430588e6138a2c256eb6c9e4ffcd2314a73b9d8207ed0766b8 fftw-3.0.1-r1.ebuild 2759
 MD5 7ba717c52d52fb424509a7046a52350a fftw-3.0.1-r2.ebuild 2790
+RMD160 03f593bd2961ea1520e8cb267a43d72cd83252ac fftw-3.0.1-r2.ebuild 2790
+SHA256 cce35d30515b257d3a97c06ad84391af23101a9ab142b3022ca0b0d0a103e501 fftw-3.0.1-r2.ebuild 2790
 MD5 7b8ca418c402f3091eeb2cefd710e739 fftw-3.0.1.ebuild 2363
+RMD160 dfb874adc905a8d302ae21f08e25fa72303b12d6 fftw-3.0.1.ebuild 2363
+SHA256 2faf09c55c721d55f0755453bad2eb3cd07c593df97312cc2e89e6b1a7c958c4 fftw-3.0.1.ebuild 2363
+MD5 9ece627571f918cdd29e0a80f0f2260f fftw-3.1.ebuild 2013
+RMD160 ce22f0c8adddc72ecde980396a463126db2e050e fftw-3.1.ebuild 2013
+SHA256 cbd6a69d3d7a9193fcc40ac132bf7e12f8a062404daa245ec81b754806e8e561 fftw-3.1.ebuild 2013
 MD5 1395bb17e5d04e7050eab24d5b7b25d1 files/3-tmpfile.patch 538
+RMD160 e87f7b414a4cb9371c970bf140f87074f8024f25 files/3-tmpfile.patch 538
+SHA256 c51956fc0ce2bb25cf84e4929ab76de27dca47efeef659d57d7513e0099f99d1 files/3-tmpfile.patch 538
 MD5 236dda9695005c9f306fb2c55f020686 files/digest-fftw-2.1.5-r1 63
+RMD160 993eb088f674d8b9822cee53d21b8ac1f73c417a files/digest-fftw-2.1.5-r1 63
+SHA256 86f53a934b5d8a5d7b3730f7ef7c30767f82a6df25490bf200f4aeb921c7e869 files/digest-fftw-2.1.5-r1 63
 MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1 63
+RMD160 bfe28400278296372a6b3e9650882603d033a91c files/digest-fftw-3.0.1 63
+SHA256 1b01f67cdbb46602819d54d78dc247067f9e742deebf041ee10187761535caf2 files/digest-fftw-3.0.1 63
 MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1-r1 63
+RMD160 bfe28400278296372a6b3e9650882603d033a91c files/digest-fftw-3.0.1-r1 63
+SHA256 1b01f67cdbb46602819d54d78dc247067f9e742deebf041ee10187761535caf2 files/digest-fftw-3.0.1-r1 63
 MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1-r2 63
+RMD160 bfe28400278296372a6b3e9650882603d033a91c files/digest-fftw-3.0.1-r2 63
+SHA256 1b01f67cdbb46602819d54d78dc247067f9e742deebf041ee10187761535caf2 files/digest-fftw-3.0.1-r2 63
+MD5 b6f14bee47f3ad6a9914ddecd88cff86 files/digest-fftw-3.1 229
+RMD160 2015193cc44504a587fdcbeb70e949843666a4dc files/digest-fftw-3.1 229
+SHA256 2adbf2c5de2e51f7f10d93adba3fc399c82a0e68f5229c5fbcbbb42495b9ee14 files/digest-fftw-3.1 229
 MD5 49836a250acfcc913276a29736c68a3b files/fftw-3.0.1-altivec.patch 2585
+RMD160 ac3e6a4edd4183570c214e39ec900da432162cfb files/fftw-3.0.1-altivec.patch 2585
+SHA256 48bbd87433b208490f907fc340ab53cabcb8e4259776eadfdf15d963e4af0a27 files/fftw-3.0.1-altivec.patch 2585
+MD5 148e5318eca8afb3a4856c820727e69c files/fftw-ppc-macos.1.patch 1429
+RMD160 c61bedd5ba54e526f138525eb7d77bcbb3264a28 files/fftw-ppc-macos.1.patch 1429
+SHA256 d16d27be36800fa582402847e4b6fb0210bcc9718ac750c980b12e1de1419dfb files/fftw-ppc-macos.1.patch 1429
 MD5 7718e5a1330e574b38daecb472bffa17 files/fftw-ppc-macos.patch 1356
+RMD160 edd7e7fc6e6fb1dfed5cda10a35b1b95eceed47b files/fftw-ppc-macos.patch 1356
+SHA256 e66aa8b594bcc756404f28205d595b78fcb3209dd3c9cdc01ce8efe704426a70 files/fftw-ppc-macos.patch 1356
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDvxtF2+ySkm8kpY0RAmEhAJ43zIaSkllx0zADJIMxk1ImkO1DDACeO3C+
-mC7pC3OprGNHbdEKgpVRVtc=
-=FGFm
------END PGP SIGNATURE-----
+RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
+SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
diff --git a/sci-libs/fftw/fftw-3.1.ebuild b/sci-libs/fftw/fftw-3.1.ebuild
new file mode 100644
index 000000000000..737da03196e5
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.ebuild,v 1.1 2006/02/11 20:19:56 markusle Exp $
+
+inherit flag-o-matic eutils toolchain-funcs
+
+DESCRIPTION="C subroutine library for computing the Discrete Fourier Transform (DFT)"
+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 ~ppc-macos ~ppc64 ~sparc ~x86"
+IUSE="3dnow altivec sse sse2"
+
+DEPEND=""
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}"
+	cd "${WORKDIR}"
+	use ppc-macos && epatch "${FILESDIR}"/${PN}-ppc-macos.patch
+	mv ${P} ${P}-single
+	cp -pPR ${P}-single ${P}-double
+}
+
+src_compile() {
+	# filter -Os according to docs
+	replace-flags -Os -O2
+
+	local myconfsingle=""
+	local myconfdouble=""
+
+	if use sse2; then
+		myconfsingle="$myconfsingle --enable-sse"
+		myconfdouble="$myconfdouble --enable-sse2"
+	elif use sse; then
+		myconfsingle="$myconfsingle --enable-sse"
+	elif use 3dnow; then
+		myconfsingle="$myconfsingle --enable-k7"
+	fi
+
+	# Altivec-support in fftw is currently broken
+	# with gcc 3.4
+	if [ "`gcc-version`" != "3.4" ]; then
+		myconfsingle="$myconfsingle `use_enable altivec`"
+	fi
+
+	cd "${S}-single"
+	econf \
+		--enable-shared \
+		--enable-threads \
+		--enable-float \
+		${myconfsingle} || \
+			die "./configure in single failed"
+	emake || die
+
+	#the only difference here is no --enable-float
+	cd "${S}-double"
+	econf \
+		--enable-shared \
+		--enable-threads \
+		${myconfdouble} || \
+		die "./configure in double failed"
+	emake || die
+}
+
+src_install () {
+	#both builds are installed in the same place
+	#libs have distinuguished names; include files, docs etc. identical.
+	cd "${S}-single"
+	make DESTDIR=${D} install || die
+
+	cd "${S}-double"
+	make DESTDIR=${D} install || die
+
+	# Install documentation.
+	cd "${S}-single"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS
+
+	cd doc/html
+	dohtml -r .
+}
diff --git a/sci-libs/fftw/files/digest-fftw-3.1 b/sci-libs/fftw/files/digest-fftw-3.1
new file mode 100644
index 000000000000..5fec32e2df5b
--- /dev/null
+++ b/sci-libs/fftw/files/digest-fftw-3.1
@@ -0,0 +1,3 @@
+MD5 911515569a8abdc7dbb207d53f34e60b fftw-3.1.tar.gz 2692325
+RMD160 af9f8a720daa60597416ca3ed3a54b8a789a6d44 fftw-3.1.tar.gz 2692325
+SHA256 e961dd3f7df9ec11cebf3a9c80752caee22a00fd149b36c7680f8da708e76bf7 fftw-3.1.tar.gz 2692325
diff --git a/sci-libs/fftw/files/fftw-ppc-macos.1.patch b/sci-libs/fftw/files/fftw-ppc-macos.1.patch
new file mode 100644
index 000000000000..bb068bdec222
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-ppc-macos.1.patch
@@ -0,0 +1,30 @@
+diff -Naur fftw-3.1/tests/Makefile.in fftw-3.1-new/tests/Makefile.in
+--- fftw-3.1/tests/Makefile.in	2006-01-28 00:19:55.000000000 +0000
++++ fftw-3.1-new/tests/Makefile.in	2006-02-11 05:39:29.000000000 +0000
+@@ -233,9 +233,9 @@
+ @COMBINED_THREADS_FALSE@@THREADS_TRUE@LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la
+ @THREADS_FALSE@LIBFFTWTHREADS = 
+ bench_SOURCES = bench.c hook.c
+-bench_LDADD = $(LIBFFTWTHREADS)				\
++bench_LDADD = $(top_builddir)/libbench2/libbench2.a $(LIBFFTWTHREADS) \
+ $(top_builddir)/libfftw3@PREC_SUFFIX@.la		\
+-$(top_builddir)/libbench2/libbench2.a $(THREADLIBS)
++$(THREADLIBS)
+ 
+ all: all-am
+ 
+diff -Naur fftw-3.1/tools/Makefile.in fftw-3.1-new/tools/Makefile.in
+--- fftw-3.1/tools/Makefile.in	2006-01-28 00:19:56.000000000 +0000
++++ fftw-3.1-new/tools/Makefile.in	2006-02-11 05:40:41.000000000 +0000
+@@ -246,9 +246,9 @@
+ @COMBINED_THREADS_FALSE@@THREADS_TRUE@LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la
+ @THREADS_FALSE@LIBFFTWTHREADS = 
+ fftw@PREC_SUFFIX@_wisdom_SOURCES = fftw-wisdom.c
+-fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench.o	\
++fftw@PREC_SUFFIX@_wisdom_LDADD = $(top_builddir)/tests/bench.o $(top_builddir)/libbench2/libbench2.a \
+ $(LIBFFTWTHREADS) $(top_builddir)/libfftw3@PREC_SUFFIX@.la	\
+-$(top_builddir)/libbench2/libbench2.a $(THREADLIBS)
++$(THREADLIBS)
+ 
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-am