Substituting --enable-3dnow by --enable-k7 because of bug #38076

4 files changed, 104 insertions, 1 deletions

diff --git a/dev-libs/fftw/ChangeLog b/dev-libs/fftw/ChangeLog
index 01dcdbdd5cca..18adad08677f 100644
--- a/dev-libs/fftw/ChangeLog
+++ b/dev-libs/fftw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/fftw
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/ChangeLog,v 1.19 2004/04/19 13:05:46 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/ChangeLog,v 1.20 2004/04/19 14:16:07 phosphan Exp $
+
+*fftw-3.0.1-r1 (19 Apr 2004)
+
+  19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> fftw-3.0.1-r1.ebuild:
+  Substituting --enable-3dnow by --enable-k7 because of bug #38076
 
   19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> fftw-2.1.5-r1.ebuild:
   Removing S=... with no effect
diff --git a/dev-libs/fftw/Manifest b/dev-libs/fftw/Manifest
index 79bbf8913871..29941eb57976 100644
--- a/dev-libs/fftw/Manifest
+++ b/dev-libs/fftw/Manifest
@@ -1,10 +1,12 @@
 MD5 4d5ac300c1c4571e5d944b8c551c9f8e fftw-3.0.1.ebuild 2392
 MD5 258b451cd01490ce7b8303a8a2e5d437 fftw-2.1.3-r1.ebuild 3349
+MD5 4d5ac300c1c4571e5d944b8c551c9f8e fftw-3.0.1-r1.ebuild 2392
 MD5 ba3ca7e172f059ad37b320344167d588 fftw-2.1.5-r1.ebuild 4056
 MD5 9e62b2fde5336fb8cbd0769051dad906 fftw-2.1.5.ebuild 3889
 MD5 f3dbb1fad52bf7ce6ab375669b40aaa3 ChangeLog 2799
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
 MD5 236dda9695005c9f306fb2c55f020686 files/digest-fftw-2.1.5 63
 MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1 63
+MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1-r1 63
 MD5 4fe6c4cc41aedf02139d010087125ec2 files/digest-fftw-2.1.3-r1 63
 MD5 236dda9695005c9f306fb2c55f020686 files/digest-fftw-2.1.5-r1 63
diff --git a/dev-libs/fftw/fftw-3.0.1-r1.ebuild b/dev-libs/fftw/fftw-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..f4e4159e3570
--- /dev/null
+++ b/dev-libs/fftw/fftw-3.0.1-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/fftw-3.0.1-r1.ebuild,v 1.1 2004/04/19 14:16:08 phosphan Exp $
+
+IUSE="3dnow sse mpi"
+
+inherit flag-o-matic
+
+DESCRIPTION="C subroutine library for computing the Discrete Fourier Transform (DFT)"
+SRC_URI="http://www.fftw.org/${P}.tar.gz"
+HOMEPAGE="http://www.fftw.org"
+
+SLOT="3.0"
+LICENSE="GPL-2"
+DEPEND="virtual/glibc"
+
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~ia64 ~amd64"
+
+#-fpmath=xx is reported to cause trouble on pentium4 m series
+#(for 3.0.x: this sort of thing should be handled by the --enable-sse
+#style configure flags. these are set below using the use variables,
+#but under gcc-3.2.x, sse2 seems to cause trouble.)
+filter-mfpmath
+
+# in gcc 3.2.3 at least, using sse or sse2 causes trouble with -O3
+# according to the docs, -O0 can cause trouble too! So pending further
+# testing, ...
+
+if [ `use sse` ]; then
+	filter-flags -O3 -O1 -O -Os
+	append-flags -O2
+fi
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${WORKDIR}"
+	mv ${P} ${P}-single
+
+	unpack "${P}.tar.gz"
+	cd "${WORKDIR}"
+	mv ${P} ${P}-double
+}
+
+
+src_compile() {
+	local myconf=""
+	local myconfsingle=""
+	local myconfdouble=""
+
+	use mpi && myconf="${myconf} --enable-mpi"
+	#mpi is not a valid flag yet. In this revision it is used merely to block --enable-mpi option
+	#it might be needed if it is decided that lam is an optional dependence
+
+	if [ `use sse` ]; then
+		myconfsingle="$myconfsingle --enable-sse"
+		myconfdouble="$myconfdouble --enable-sse2"
+	elif [ `use 3dnow` ]; then
+		myconfsingle="$myconfsingle --enable-k7"
+	fi
+
+	cd "${S}-single"
+	econf \
+		--enable-shared \
+		--enable-threads \
+		--enable-float \
+		${myconf} ${myconfsingle} || die "./configure failed"
+	emake || die
+
+	#the only difference here is no --enable-float
+	cd "${S}-double"
+	econf \
+		--enable-shared \
+		--enable-threads \
+		${myconf} ${myconfdouble} || die "./configure 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 COPYING INSTALL NEWS README TODO
+	dodoc COPYRIGHT CONVENTIONS
+
+	cd doc/html
+	dohtml -r .
+}
diff --git a/dev-libs/fftw/files/digest-fftw-3.0.1-r1 b/dev-libs/fftw/files/digest-fftw-3.0.1-r1
new file mode 100644
index 000000000000..0dcc37da443b
--- /dev/null
+++ b/dev-libs/fftw/files/digest-fftw-3.0.1-r1
@@ -0,0 +1 @@
+MD5 76cd21ecc9a7bed6343566c473c36477 fftw-3.0.1.tar.gz 1946361