Version bump. This fixes bug #127925.

Package-Manager: portage-2.1_pre7-r3

4 files changed, 108 insertions, 4 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 3de085bcde52..4b7825bc56c6 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.29 2006/03/07 22:01:43 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.30 2006/04/03 19:46:41 markusle Exp $
+
+*fftw-3.1.1 (03 Apr 2006)
+
+  03 Apr 2006; Markus Dittrich <markusle@gentoo.org> +fftw-3.1.1.ebuild:
+  Version bump. Thanks to Raphael <gentoo@lesshaste.plus.com>
+  for reporting. This fixes bug #127925.
 
   07 Mar 2006; Markus Dittrich <markusle@gentoo.org> fftw-3.1.ebuild:
   Disabled building of shared libraries on k7 architecture. Thanks
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index fcb0f37d4d12..f2f205ca832f 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,6 +1,6 @@
-MD5 c60615bbe1e3d6b3b3f8d79c41184726 ChangeLog 7834
-RMD160 a618099b525ce1c63bc12de11d45184681b6819a ChangeLog 7834
-SHA256 417606b7fd5053bd1dd83e8ee84c8fed950dc55ee25e5eb8cf90a39ef5840120 ChangeLog 7834
+MD5 630fb21502236a506d411740257f03ea ChangeLog 8038
+RMD160 0de48b93199a6935810dfba10bb43acb1fbfb2e1 ChangeLog 8038
+SHA256 509434a4593340d9943cd6e8173f2d1d371ac88d4674591d466ef02109248152 ChangeLog 8038
 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
@@ -13,6 +13,9 @@ SHA256 cce35d30515b257d3a97c06ad84391af23101a9ab142b3022ca0b0d0a103e501 fftw-3.0
 MD5 1b3f7c7f367fa0164bf31ab90e61d8f5 fftw-3.0.1.ebuild 2103
 RMD160 a32b0e8965d3f48bc2f0b5aac931ffcf96aa1302 fftw-3.0.1.ebuild 2103
 SHA256 46a5f84b3a0e8a357c0580a5c56edc610b516733e062947418fbb4515a22aef9 fftw-3.0.1.ebuild 2103
+MD5 c683abcab0df2db4da719daa20cb6487 fftw-3.1.1.ebuild 2153
+RMD160 37064d67130b58a04ccb17c41847b38df5ae1504 fftw-3.1.1.ebuild 2153
+SHA256 4cc9fe5e367dbc97be7018f425436b234ce89a4e9dcedbbe6c1cea2b1fff08fa fftw-3.1.1.ebuild 2153
 MD5 23256637dd0ccf113b366717c812e44e fftw-3.1.ebuild 2151
 RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 fftw-3.1.ebuild 2151
 SHA256 24f733e442a086a4a4e473d5d6d4319302ba0abf1c40cefc0e9d7039635836ad fftw-3.1.ebuild 2151
@@ -34,6 +37,9 @@ SHA256 1b01f67cdbb46602819d54d78dc247067f9e742deebf041ee10187761535caf2 files/di
 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 3d28f883cdd1484bb8098a14a3fb4706 files/digest-fftw-3.1.1 235
+RMD160 05e7ed5f10d5b2211c20fcddb4ef8ffab609df53 files/digest-fftw-3.1.1 235
+SHA256 5756b978bf8b840ec07b71fe2caa22919afc66a970fa69e76ed20dfa96a72b1d files/digest-fftw-3.1.1 235
 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
diff --git a/sci-libs/fftw/fftw-3.1.1.ebuild b/sci-libs/fftw/fftw-3.1.1.ebuild
new file mode 100644
index 000000000000..eec83b3daeca
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.1.1.ebuild
@@ -0,0 +1,89 @@
+# 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.1.ebuild,v 1.1 2006/04/03 19:46:42 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
+
+	# disable building of shared libs for k7 (c.f. bug #125218)
+	if ! use 3dnow; then
+		myconfsingle="$myconfsingle --enable-shared"
+		myconfdouble="$myconfdouble --enable-shared"
+	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-threads \
+		--enable-float \
+		${myconfsingle} || \
+			die "./configure in single failed"
+	emake || die
+
+	#the only difference here is no --enable-float
+	cd "${S}-double"
+	econf \
+		--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.1 b/sci-libs/fftw/files/digest-fftw-3.1.1
new file mode 100644
index 000000000000..1889f2e3babf
--- /dev/null
+++ b/sci-libs/fftw/files/digest-fftw-3.1.1
@@ -0,0 +1,3 @@
+MD5 b35813b88a046e4e74a603017794ddcd fftw-3.1.1.tar.gz 2719997
+RMD160 4236f43159a39e3bd9d34bda1b95ce82609d26b6 fftw-3.1.1.tar.gz 2719997
+SHA256 1d3e90da1aab15928586ef814784e217ac91bbac878906d82392b0d2e64aff0c fftw-3.1.1.tar.gz 2719997