Moved from dev-libs/fftw to sci-libs/fftw.
authorOlivier Fisette <ribosome@gentoo.org>
Wed, 29 Dec 2004 01:12:04 +0000 (01:12 +0000)
committerOlivier Fisette <ribosome@gentoo.org>
Wed, 29 Dec 2004 01:12:04 +0000 (01:12 +0000)
sci-libs/fftw/ChangeLog [new file with mode: 0644]
sci-libs/fftw/Manifest
sci-libs/fftw/fftw-2.1.5-r1.ebuild [new file with mode: 0644]
sci-libs/fftw/fftw-3.0.1-r1.ebuild [new file with mode: 0644]
sci-libs/fftw/fftw-3.0.1.ebuild [new file with mode: 0644]
sci-libs/fftw/files/digest-fftw-2.1.5-r1 [new file with mode: 0644]
sci-libs/fftw/files/digest-fftw-3.0.1 [new file with mode: 0644]
sci-libs/fftw/files/digest-fftw-3.0.1-r1 [new file with mode: 0644]
sci-libs/fftw/files/fftw-ppc-macos.patch [new file with mode: 0644]
sci-libs/fftw/metadata.xml [new file with mode: 0644]

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
new file mode 100644 (file)
index 0000000..a9850f6
--- /dev/null
@@ -0,0 +1,122 @@
+# ChangeLog for dev-libs/fftw
+# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.1 2004/12/29 01:12:04 ribosome Exp $
+
+*fftw-3.0.1 (28 Dec 2004)
+
+  28 Dec 2004; Olivier Fisette <ribosome@gentoo.org> +metadata.xml,
+  +files/fftw-ppc-macos.patch, +fftw-2.1.5-r1.ebuild, +fftw-3.0.1-r1.ebuild,
+  +fftw-3.0.1.ebuild:
+  Moved from dev-libs/fftw to sci-libs/fftw.
+
+  23 Nov 2004; Guy Martin <gmsoft@gentoo.org> fftw-3.0.1-r1.ebuild:
+  Added ~hppa to KEYWORDS.
+
+  16 Nov 2004; Patrick Kursawe <phosphan@gentoo.org> -fftw-2.1.3-r1.ebuild,
+  fftw-2.1.5-r1.ebuild, -fftw-2.1.5.ebuild:
+  Cleanup.
+  Fixing bug #70817 (missing fortran include file).
+
+  01 Oct 2004; kito@gentoo.org +files/fftw-ppc-macos.patch,
+  fftw-3.0.1-r1.ebuild:
+  added ~ppc-macos keyword and patch
+
+  09 Jul 2004; Michael Hanselmann <hansmi@gentoo.org> fftw-3.0.1-r1.ebuild:
+  Fixed a compilation-error with Altivec and gcc 3.4.1
+
+  03 Jul 2004; Bryan Ã˜stergaard <kloeri@gentoo.org> fftw-3.0.1.ebuild:
+  Stable on alpha.
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> fftw-3.0.1-r1.ebuild,
+  fftw-3.0.1.ebuild:
+  virtual/glibc -> virtual/libc
+
+  06 Jun 2004; Michael Hanselmann <hansmi@gentoo.org> fftw-3.0.1-r1.ebuild:
+  Added --enable-altivec to econf, if USE="altivec"
+
+  06 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> fftw-2.1.5-r1.ebuild,
+  fftw-3.0.1-r1.ebuild:
+  Marked stable on amd64.
+
+  03 Jun 2004; Aron Griffis <agriffis@gentoo.org> fftw-3.0.1-r1.ebuild,
+  fftw-3.0.1.ebuild:
+  Fix use invocation
+
+*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
+
+  19 Apr 2004; Patrick Kursawe <phosphan@gentoo.org> fftw-2.1.5-r1.ebuild:
+  Removing S=... with no effect
+
+  22 Mar 2004; Jason Wever <weeve@gentoo.org> fftw-3.0.1.ebuild:
+  Marked stable on sparc.
+
+  09 Mar 2004; Daniel Ahlberg <aliz@gentoo.org> fftw-2.1.5-r1.ebuild:
+  Adding amd64 keyword. Closing #44068.
+
+*fftw-2.1.5-r1 (04 Mar 2004)
+
+  04 Mar 2004; Patrick Kursawe <phosphan@gentoo.org> fftw-2.1.5-r1.ebuild:
+  Fixing info dir entries, changing keywords according to the comment (all
+  arches -> stable)
+
+  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> fftw-3.0.1.ebuild:
+  add ~ia64
+
+  31 Dec 2003; George Shapovalov <george@gentoo.org> fftw-3.0.1.ebuild :
+  marked stable.
+  Note, stuff that needs MPI should DEPEND on 2.15 still! (but this is a task of 
+  dependatnt packages)
+
+*fftw-3.0.1 (23 Aug 2003)
+
+  23 Aug 2003; George Shapovalov <george@gentoo.org> fftw-3.0.1.ebuild, metadata.xml :
+  new version (#20048)
+  thanks to Ingo Luetkebohle gentoo@blank.pages.de and  Sam Yates <sam@quux.dropbear.id.au>
+  for ebuild submissions
+  added metadata.xml (herd sci)
+
+  22 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> fftw-2.1.5.ebuild :
+  Changed flag altering.
+
+  07 May 2003; George Shapovalov <george@gentoo.org> fftw-2.1.5.ebuild :
+  apparently fftw doesn't like -fpmath=sse on pentium-4 M based systems (#19523)
+  added corresponding filter, thanks to Christian Birchinger <joker@gentoo.org> for report.
+
+*fftw-2.1.5 (23 Mar 2003)
+
+  23 Mar 2003; George Shapovalov <george@gentoo.org> fftw-2.1.5.ebuild :
+  updated to latest stable
+
+*fftw-2.1.3-r1 (13 Feb 2003)
+
+  13 Feb 2003; Nick Hadaway <raker@gentoo.org> fftw-2.1.3-r1.ebuild,
+  files/digest-fftw-2.1.3 :
+  New ebuild which creates links to the standard fftw include/lib names.
+  If you specify SINGLE=yes on the emerge commandline the links will
+  be created to the single precision libs/includes, otherwise by default
+  to the double precision libs/includes.
+
+  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+ 
+*fftw-2.1.3.ebuild (20 June 2002)
+
+  10 Feb 2003; Peter Johanson <latexer@gentoo.org> fftw-2.1.3.ebuild :
+  Added ~alpha to KEYWORDS.
+
+  19 Sep 2002; Owen Stampflee <owen@gentoo.org> :
+  Added PPC to KEYWORDS.
+
+  20 June 2002; George Shapovalov <george@gentoo.org> fftw-2.1.3.ebuild :
+
+  updated ebuild to fix the top info file 
+  (added menu entry, thanks to Daniel Ahlberg)
+
+  27 Apr 2002; George Shapovalov <george@gentoo.org> fftw-2.1.3.ebuild :
+
+  Initial release
index 3c6778ea0ee4d8eccfbc81ed2eeb03c34a77d0fa..642c27949c258acea18c2753763a622c3e73f75c 100644 (file)
@@ -1,9 +1,19 @@
-MD5 3b52e94bc3c4e79f900fe1c6666fe279 fftw-3.0.1.ebuild 2366
-MD5 cd4d637ed42cdf1cb6f721f59ba34608 fftw-3.0.1-r1.ebuild 2691
-MD5 4d2bf0edf416bdf7ad08508d495dac46 fftw-2.1.5-r1.ebuild 4118
-MD5 8d6311383456143c4045ce101044d825 ChangeLog 4329
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d5e816a150650b63e3f636d8deb41e0d ChangeLog 4088
+MD5 d26b7537be168a3fb6e61a49968eaafc fftw-3.0.1.ebuild 2364
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
+MD5 c0d2cf9b97a5ac438c99c8b7ac7afab6 fftw-2.1.5-r1.ebuild 4118
+MD5 e3365b047cf1bdfc5c043fa40efe2e8d fftw-3.0.1-r1.ebuild 2690
 MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1 63
+MD5 236dda9695005c9f306fb2c55f020686 files/digest-fftw-2.1.5-r1 63
 MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1-r1 63
 MD5 7718e5a1330e574b38daecb472bffa17 files/fftw-ppc-macos.patch 1356
-MD5 236dda9695005c9f306fb2c55f020686 files/digest-fftw-2.1.5-r1 63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.9.10 (GNU/Linux)
+
+iD8DBQFBxv0KroRuSHgZdywRAryRAJ9EhM8zRkvUT3k0vylvrIjdokWq+ACgjJkc
+tiGyDElcklSsC3/thbuSvUk=
+=uQca
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-2.1.5-r1.ebuild b/sci-libs/fftw/fftw-2.1.5-r1.ebuild
new file mode 100644 (file)
index 0000000..8cffc6b
--- /dev/null
@@ -0,0 +1,141 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.1 2004/12/29 01:12:04 ribosome Exp $
+
+inherit flag-o-matic
+
+IUSE="mpi"
+
+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"
+
+DEPEND="mpi? ( >=sys-cluster/lam-mpi-6.5.6 )"
+SLOT="2.1"
+LICENSE="GPL-2"
+
+#remove ~'s on ppc and sparc when removig on x86 (as per recent discussion on -core)
+KEYWORDS="x86 ppc sparc alpha amd64"
+
+#this one is reported to cause trouble on pentium4 m series
+filter-mfpmath "sse"
+
+#here I need (surprise) to increase optimization:
+#--enable-i386-hacks requires -fomit-frame-pointer to work properly
+if [ "${ARCH}" != "amd64" ]; then
+       is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
+fi
+
+pkg_setup() {
+       einfo ""
+       einfo "This ebuild installs double and single precision versions of library"
+       einfo "This involves some name mangling, as supported by package and required"
+       einfo "by some apps that use it."
+       einfo "By default, the symlinks to non-mangled names will be created off"
+       einfo "double-precision version. In order to symlink to single-precision use"
+       einfo "SINGLE=yes emerge fftw"
+       einfo ""
+}
+
+src_unpack() {
+       #doc suggests installing single and double precision versions via separate compilations
+       #will do in two separate source trees
+       #since some sed'ing is done during the build (?if --enable-type-prefix is set?)
+
+       unpack "${P}.tar.gz"
+       cd "${WORKDIR}"
+       mv ${P} ${P}-single
+
+       unpack "${P}.tar.gz"
+       cd "${WORKDIR}"
+       mv ${P} ${P}-double
+}
+
+
+src_compile() {
+       local myconf=""
+       use mpi && myconf="${myconf} --enable-mpi"
+
+       if [ "${ARCH}" == "amd64" ]; then
+               myconf="${myconf} --disable-i386-hacks"
+       else
+               myconf="${myconf} --enable-i386-hacks"
+       fi
+
+       #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
+
+       cd "${S}-single"
+       econf \
+               --enable-shared \
+               --enable-threads \
+               --enable-type-prefix \
+               --enable-float \
+               --enable-vec-recurse \
+               ${myconf} || die "./configure failed"
+       emake || die
+
+       #the only difference here is no --enable-float
+       cd "${S}-double"
+       econf \
+               --enable-shared \
+               --enable-threads \
+               --enable-type-prefix \
+               --enable-vec-recurse \
+               ${myconf} || die "./configure failed"
+       emake || die
+}
+
+src_install () {
+       #both builds are installed in the same place
+       #libs are distinguished by preffix (s or d), see docs for details
+       cd "${S}-single"
+
+       make DESTDIR=${D} install || die
+
+       cd "${S}-double"
+
+       # fix info file
+       local infofile
+       for infofile in doc/fftw*info*; do
+               echo "INFO-DIR-SECTION Libraries" >>${infofile}
+               echo "START-INFO-DIR-ENTRY" >>${infofile}
+               echo "* fftw: (fftw).                  C subroutine library for computing the Discrete Fourier Transform (DFT)" >>${infofile}
+               echo "END-INFO-DIR-ENTRY" >>${infofile}
+       done
+       make DESTDIR=${D} install || die
+
+       # Install documentation.
+       cd "${S}-single"
+
+       dodoc AUTHORS ChangeLog COPYING INSTALL NEWS  TODO
+       dohtml doc/fftw*.html
+
+       if [ "$SINGLE" = "yes" ]; then
+               cd ${D}usr/include
+               dosym sfftw.h /usr/include/fftw.h
+               dosym srfftw.h /usr/include/rfftw.h
+               dosym sfftw_threads.h /usr/include/fftw_threads.h
+               dosym srfftw_threads.h /usr/include/rfftw_threads.h
+               cd ${D}usr/lib
+               dosym libsfftw.so /usr/lib/libfftw.so
+               dosym libsrfftw.so /usr/lib/librfftw.so
+               dosym libsfftw_threads.so /usr/lib/libfftw_threads.so
+               dosym libsrfftw_threads.so /usr/lib/librfftw_threads.so
+       else
+               cd ${D}usr/include
+               dosym dfftw.h /usr/include/fftw.h
+               dosym drfftw.h /usr/include/rfftw.h
+               dosym dfftw_threads.h /usr/include/fftw_threads.h
+               dosym drfftw_threads.h /usr/include/rfftw_threads.h
+               cd ${D}usr/lib
+               dosym libdfftw.so /usr/lib/libfftw.so
+               dosym libdrfftw.so /usr/lib/librfftw.so
+               dosym libdfftw_threads.so /usr/lib/libfftw_threads.so
+               dosym libdrfftw_threads.so /usr/lib/librfftw_threads.so
+       fi
+
+       cd "${S}-single/fortran"
+       insinto "${D}usr/include"
+       doins fftw_f77.i
+}
diff --git a/sci-libs/fftw/fftw-3.0.1-r1.ebuild b/sci-libs/fftw/fftw-3.0.1-r1.ebuild
new file mode 100644 (file)
index 0000000..279468a
--- /dev/null
@@ -0,0 +1,100 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.0.1-r1.ebuild,v 1.1 2004/12/29 01:12:04 ribosome Exp $
+
+inherit flag-o-matic eutils gcc
+
+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="~x86 ~ppc ~sparc ~alpha ~ia64 amd64 ~ppc-macos hppa"
+IUSE="3dnow altivec mpi sse"
+
+DEPEND="virtual/libc"
+
+src_unpack() {
+       unpack "${P}.tar.gz"
+       cd "${WORKDIR}"
+       use ppc-macos && epatch ${FILESDIR}/${PN}-ppc-macos.patch
+       mv ${P} ${P}-single
+
+       unpack "${P}.tar.gz"
+       cd "${WORKDIR}"
+       use ppc-macos && epatch ${FILESDIR}/${PN}-ppc-macos.patch
+       mv ${P} ${P}-double
+}
+
+src_compile() {
+       #-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
+
+       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
+
+       # 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 \
+               ${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/sci-libs/fftw/fftw-3.0.1.ebuild b/sci-libs/fftw/fftw-3.0.1.ebuild
new file mode 100644 (file)
index 0000000..be17ca2
--- /dev/null
@@ -0,0 +1,95 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.0.1.ebuild,v 1.1 2004/12/29 01:12:04 ribosome 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/libc"
+
+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-3dnow"
+       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/sci-libs/fftw/files/digest-fftw-2.1.5-r1 b/sci-libs/fftw/files/digest-fftw-2.1.5-r1
new file mode 100644 (file)
index 0000000..957213b
--- /dev/null
@@ -0,0 +1 @@
+MD5 8d16a84f3ca02a785ef9eb36249ba433 fftw-2.1.5.tar.gz 1256888
diff --git a/sci-libs/fftw/files/digest-fftw-3.0.1 b/sci-libs/fftw/files/digest-fftw-3.0.1
new file mode 100644 (file)
index 0000000..0dcc37d
--- /dev/null
@@ -0,0 +1 @@
+MD5 76cd21ecc9a7bed6343566c473c36477 fftw-3.0.1.tar.gz 1946361
diff --git a/sci-libs/fftw/files/digest-fftw-3.0.1-r1 b/sci-libs/fftw/files/digest-fftw-3.0.1-r1
new file mode 100644 (file)
index 0000000..0dcc37d
--- /dev/null
@@ -0,0 +1 @@
+MD5 76cd21ecc9a7bed6343566c473c36477 fftw-3.0.1.tar.gz 1946361
diff --git a/sci-libs/fftw/files/fftw-ppc-macos.patch b/sci-libs/fftw/files/fftw-ppc-macos.patch
new file mode 100644 (file)
index 0000000..6bcd966
--- /dev/null
@@ -0,0 +1,30 @@
+diff -uNr fftw-3.0.1/tests/Makefile.in fftw-3.0.1-new/tests/Makefile.in
+--- fftw-3.0.1/tests/Makefile.in       Sat Jul  5 19:29:48 2003
++++ fftw-3.0.1-new/tests/Makefile.in   Fri Oct  1 16:20:40 2004
+@@ -174,9 +174,9 @@
+ @THREADS_TRUE@LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la
+ 
+ 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)
+ 
+ subdir = tests
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+diff -uNr fftw-3.0.1/tools/Makefile.in fftw-3.0.1-new/tools/Makefile.in
+--- fftw-3.0.1/tools/Makefile.in       Sat Jul  5 19:29:49 2003
++++ fftw-3.0.1-new/tools/Makefile.in   Fri Oct  1 16:23:49 2004
+@@ -177,9 +177,9 @@
+ @THREADS_TRUE@LIBFFTWTHREADS = $(top_builddir)/threads/libfftw3@PREC_SUFFIX@_threads.la
+ 
+ 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)
+ 
+ subdir = tools
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
new file mode 100644 (file)
index 0000000..b229aec
--- /dev/null
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+</pkgmetadata>