Revamped ebuild for version 2: x86 hacks now only for x86 arches, added a

Package-Manager: portage-2.1.2.2

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 7ff3a88e5be33e9ed996607f9f448a91df516f43..330894018bce3fd6e62c4c9db04bbb21f1da207d 100644 (file)
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.48 2007/04/27 04:09:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.49 2007/04/30 16:44:54 bicatali Exp $
+
+*fftw-2.1.5-r3 (30 Apr 2007)
+
+  30 Apr 2007; Sébastien Fabbro <bicatali@gentoo.org>
+  files/fftw-2.1.5-as-needed.patch, metadata.xml, +fftw-2.1.5-r3.ebuild:
+  Revamped ebuild for version 2: x86 hacks now only for x86 arches, added a
+  doc flag, added a float USE flag instead of the SINGLE env variable,
+  switched to virtual/mpi, added a src_test, fixed the as-needed patch,
+  general cleaning and added longdescription in metadata.xml. Closing bugs
+  #130381 and bug #152393.
 
   27 Apr 2007; Jeroen Roovers <jer@gentoo.org> fftw-2.1.5-r2.ebuild:
   Marked ~hppa.

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index ee56081710ffd97c7235dfa32217ff97d08e93fc..bc822d7ab8bac2b15b9be9bcfb07e8207a7b07e4 100644 (file)
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,11 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3-tmpfile.patch 538 RMD160 e87f7b414a4cb9371c970bf140f87074f8024f25 SHA1 b2fc4017eabde077534c9ef1a9050b71c301014f SHA256 c51956fc0ce2bb25cf84e4929ab76de27dca47efeef659d57d7513e0099f99d1
 MD5 1395bb17e5d04e7050eab24d5b7b25d1 files/3-tmpfile.patch 538
 RMD160 e87f7b414a4cb9371c970bf140f87074f8024f25 files/3-tmpfile.patch 538
 SHA256 c51956fc0ce2bb25cf84e4929ab76de27dca47efeef659d57d7513e0099f99d1 files/3-tmpfile.patch 538
-AUX fftw-2.1.5-as-needed.patch 534 RMD160 4de28f755a2de41b08f7dbdacf606029789a9f37 SHA1 b0db5ee9667e3d49a5c4fd665c416b3415012610 SHA256 79b39df78cc5c643785945e5951fca6e45adf726aa6cd2a8e673d214c4abd5b1
-MD5 b5bc998092cab120de1660a6d68012d4 files/fftw-2.1.5-as-needed.patch 534
-RMD160 4de28f755a2de41b08f7dbdacf606029789a9f37 files/fftw-2.1.5-as-needed.patch 534
-SHA256 79b39df78cc5c643785945e5951fca6e45adf726aa6cd2a8e673d214c4abd5b1 files/fftw-2.1.5-as-needed.patch 534
+AUX fftw-2.1.5-as-needed.patch 493 RMD160 3eb126276b2a9daa93c1911588a18048d2271ae0 SHA1 061abb3c648422fdc786dd659023351885346e1e SHA256 2bf39ed6ff2a416eeaa9d6639d4e0d04dec3942db9d17cc504f359d9da1e7d4c
+MD5 b9fe37e7a937d8f65b2789d29e620a63 files/fftw-2.1.5-as-needed.patch 493
+RMD160 3eb126276b2a9daa93c1911588a18048d2271ae0 files/fftw-2.1.5-as-needed.patch 493
+SHA256 2bf39ed6ff2a416eeaa9d6639d4e0d04dec3942db9d17cc504f359d9da1e7d4c files/fftw-2.1.5-as-needed.patch 493
 AUX fftw-3.0.1-altivec.patch 2585 RMD160 ac3e6a4edd4183570c214e39ec900da432162cfb SHA1 288ad9ac30f47aa3bfd86bcbec09ada45ee09c05 SHA256 48bbd87433b208490f907fc340ab53cabcb8e4259776eadfdf15d963e4af0a27
 MD5 49836a250acfcc913276a29736c68a3b files/fftw-3.0.1-altivec.patch 2585
 RMD160 ac3e6a4edd4183570c214e39ec900da432162cfb files/fftw-3.0.1-altivec.patch 2585
@@ -31,6 +34,10 @@ EBUILD fftw-2.1.5-r2.ebuild 4241 RMD160 938cf3b77ce31b41844e6d645488926b1c25eee9
 MD5 d091d67c05fd1bef3b480fe8b189fa42 fftw-2.1.5-r2.ebuild 4241
 RMD160 938cf3b77ce31b41844e6d645488926b1c25eee9 fftw-2.1.5-r2.ebuild 4241
 SHA256 9b3eecde48dc3c72c1ff7c8e3535fdbabb03990be06a619773d85513041a3b67 fftw-2.1.5-r2.ebuild 4241
+EBUILD fftw-2.1.5-r3.ebuild 3803 RMD160 aa293282ae2a21a8f6145ee0c8c29f742cb6773e SHA1 b544757e710830725ca069a2649501b0b2eed383 SHA256 9783ce547f72052d6acaa9bc2e6f5f3573e9a0f92d4fd6e781be2b5ec28c5760
+MD5 f4fc0808c1f338592c3d8cf8b16962b3 fftw-2.1.5-r3.ebuild 3803
+RMD160 aa293282ae2a21a8f6145ee0c8c29f742cb6773e fftw-2.1.5-r3.ebuild 3803
+SHA256 9783ce547f72052d6acaa9bc2e6f5f3573e9a0f92d4fd6e781be2b5ec28c5760 fftw-2.1.5-r3.ebuild 3803
 EBUILD fftw-3.0.1-r1.ebuild 2759 RMD160 508aea7c5b721ef415fc4d5121cfb057aba7aaef SHA1 f6123e5e3501c6934d7c226988fb067b13f72bf3 SHA256 d53c2fa4f8ecc2430588e6138a2c256eb6c9e4ffcd2314a73b9d8207ed0766b8
 MD5 4a8f8342448809b69143f66d02e7f2d2 fftw-3.0.1-r1.ebuild 2759
 RMD160 508aea7c5b721ef415fc4d5121cfb057aba7aaef fftw-3.0.1-r1.ebuild 2759
@@ -55,17 +62,20 @@ EBUILD fftw-3.1.ebuild 2151 RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 SHA1
 MD5 23256637dd0ccf113b366717c812e44e fftw-3.1.ebuild 2151
 RMD160 3349ccfe88c06635e50bbc5fddc840bcdae2b5d3 fftw-3.1.ebuild 2151
 SHA256 24f733e442a086a4a4e473d5d6d4319302ba0abf1c40cefc0e9d7039635836ad fftw-3.1.ebuild 2151
-MISC ChangeLog 11092 RMD160 1e818592b0194d3b6ae3e46487b25e299146b67f SHA1 c1912cd96107306ba5dd01714bf6a2bb87176c46 SHA256 948e1e8535162b02192f22b928670c83566d08365887f30a438a29594f01ba29
-MD5 fda67b376f206efc4831dcff3c505936 ChangeLog 11092
-RMD160 1e818592b0194d3b6ae3e46487b25e299146b67f ChangeLog 11092
-SHA256 948e1e8535162b02192f22b928670c83566d08365887f30a438a29594f01ba29 ChangeLog 11092
-MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
-MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
-SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900 metadata.xml 156
+MISC ChangeLog 11577 RMD160 e5ae0a55353e70fafbeb5aa576a64ce6a5cd0ad7 SHA1 218d009ea5c690efc72b0c4b29158992143e7630 SHA256 9066a78c27ff84b2041ef1924910751eea3187d81fca9084f99da4d7cece36bf
+MD5 4677127b054793821ec5e2cf31702c85 ChangeLog 11577
+RMD160 e5ae0a55353e70fafbeb5aa576a64ce6a5cd0ad7 ChangeLog 11577
+SHA256 9066a78c27ff84b2041ef1924910751eea3187d81fca9084f99da4d7cece36bf ChangeLog 11577
+MISC metadata.xml 623 RMD160 b40059457be8478f7b38eeee889f7bb852d5bc93 SHA1 c6a16ef68d3289360da4ce23b0c050c50914e85b SHA256 d6d16c5ca65ba8d7f3f951bdd129c43357a502685dd9bdc0fd60ab43257e3278
+MD5 397f895dc6e131d55e424063ef2016ff metadata.xml 623
+RMD160 b40059457be8478f7b38eeee889f7bb852d5bc93 metadata.xml 623
+SHA256 d6d16c5ca65ba8d7f3f951bdd129c43357a502685dd9bdc0fd60ab43257e3278 metadata.xml 623
 MD5 e8cb5e91d1ddf875789f95dfbdce7059 files/digest-fftw-2.1.5-r2 235
 RMD160 a854a6665474fce2b3601a6d956ea2c63bb77376 files/digest-fftw-2.1.5-r2 235
 SHA256 b7f8db8489af7206824f9b6353bbae681a17d3cb089a42617d0cfa425e78e5c6 files/digest-fftw-2.1.5-r2 235
+MD5 e8cb5e91d1ddf875789f95dfbdce7059 files/digest-fftw-2.1.5-r3 235
+RMD160 a854a6665474fce2b3601a6d956ea2c63bb77376 files/digest-fftw-2.1.5-r3 235
+SHA256 b7f8db8489af7206824f9b6353bbae681a17d3cb089a42617d0cfa425e78e5c6 files/digest-fftw-2.1.5-r3 235
 MD5 d79d7261a50d0b3c10659e5beacd0ab4 files/digest-fftw-3.0.1 235
 RMD160 583f42a9b329e5113a76834c8e94fd33d162faf6 files/digest-fftw-3.0.1 235
 SHA256 312aec81b01e5fc0f42721ef933f2f89347d8e3d27c07394ddbc717be7577368 files/digest-fftw-3.0.1 235
@@ -84,3 +94,10 @@ SHA256 5756b978bf8b840ec07b71fe2caa22919afc66a970fa69e76ed20dfa96a72b1d files/di
 MD5 e03cdf0ef064939e4df4bdbc91efc583 files/digest-fftw-3.1.2 235
 RMD160 559ef1b1533981db0a1b926b8b689b3589a7fe2a files/digest-fftw-3.1.2 235
 SHA256 7aeabf836fd80094bd20daf14a0ca5778d6416887fc3f7a67b849643d12de0a1 files/digest-fftw-3.1.2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQFGNh0P1ycZbhPLE2ARAv7hAKCDVk75cbk7Pmo91O3T7XY1UBlg0wCeN+A1
+1K9OLaF0V4+N0jK5yNbQro4=
+=arZk
+-----END PGP SIGNATURE-----

diff --git a/sci-libs/fftw/fftw-2.1.5-r3.ebuild b/sci-libs/fftw/fftw-2.1.5-r3.ebuild
new file mode 100644 (file)
index 0000000..080a180
--- /dev/null
+++ b/sci-libs/fftw/fftw-2.1.5-r3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2007 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-r3.ebuild,v 1.1 2007/04/30 16:44:54 bicatali Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit flag-o-matic multilib autotools
+
+IUSE="doc mpi float"
+
+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"
+
+# hppa does not have yet a virtual/mpi, and just got ~.
+DEPEND="mpi? ( !hppa? ( virtual/mpi ) )
+       mpi? ( hppa? ( sys-cluster/lam-mpi ) )"
+
+SLOT="2.1"
+LICENSE="GPL-2"
+
+KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
+
+pkg_setup() {
+       # 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}" == "x86" ]; then
+               is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
+       fi
+}
+
+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 ${A}
+       cd "${S}"
+       epatch "${FILESDIR}/${P}-as-needed.patch"
+       # fix info files
+       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
+
+       eautoreconf
+
+       cd "${WORKDIR}"
+       cp -R ${P} ${P}-double
+       mv ${P} ${P}-single
+}
+
+
+src_compile() {
+       cd "${S}-single"
+       econf \
+               --enable-float \
+               --enable-shared \
+               --enable-type-prefix \
+               --enable-vec-recurse \
+               --enable-threads \
+               $(use_enable mpi) \
+               $(use_enable x86 i386-hacks) \
+               || die "econf for float failed"
+       emake || die "emake for float failed"
+
+       # the only difference here is no --enable-float
+       cd "${S}-double"
+       econf \
+               --enable-shared \
+               --enable-type-prefix \
+               --enable-vec-recurse \
+               --enable-threads \
+               $(use_enable mpi) \
+               $(use_enable x86 i386-hacks) \
+               || die "econf for double failed"
+       emake || die "emake for double failed"
+}
+
+src_test() {
+       cd "${S}-single"
+       emake check || die "emake check single failed"
+       cd "${S}-double"
+       emake check || die "emake check double failed"
+}
+
+src_install () {
+
+       # both builds are installed in the same place
+       # libs are distinguished by prefix (s or d), see docs for details
+
+       cd "${S}-single"
+       emake DESTDIR="${D}" install || die "emake install float failed"
+       insinto /usr/include
+       doins fortran/fftw_f77.i || die "doins failed"
+       dodoc AUTHORS ChangeLog NEWS TODO README README.hacks || die "dodoc failed"
+       use doc && dohtml doc/*
+
+       cd "${S}-double"
+       emake DESTDIR="${D}" install || die "emake install double failed"
+
+       if use float; then
+               dosym sfftw.h /usr/include/fftw.h
+               dosym srfftw.h /usr/include/rfftw.h
+               dosym libsfftw.so /usr/$(get_libdir)/libfftw.so
+               dosym libsrfftw.so /usr/$(get_libdir)/librfftw.so
+               dosym sfftw_threads.h /usr/include/fftw_threads.h
+               dosym srfftw_threads.h /usr/include/rfftw_threads.h
+               dosym libsfftw_threads.so /usr/$(get_libdir)/libfftw_threads.so
+               dosym libsrfftw_threads.so /usr/$(get_libdir)/librfftw_threads.so
+       else
+               dosym dfftw.h /usr/include/fftw.h
+               dosym drfftw.h /usr/include/rfftw.h
+               dosym libdfftw.so /usr/$(get_libdir)/libfftw.so
+               dosym libdrfftw.so /usr/$(get_libdir)/librfftw.so
+               dosym dfftw_threads.h /usr/include/fftw_threads.h
+               dosym drfftw_threads.h /usr/include/rfftw_threads.h
+               dosym libdfftw_threads.so /usr/$(get_libdir)/libfftw_threads.so
+               dosym libdrfftw_threads.so /usr/$(get_libdir)/librfftw_threads.so
+       fi
+}

diff --git a/sci-libs/fftw/files/digest-fftw-2.1.5-r3 b/sci-libs/fftw/files/digest-fftw-2.1.5-r3
new file mode 100644 (file)
index 0000000..949efae
--- /dev/null
+++ b/sci-libs/fftw/files/digest-fftw-2.1.5-r3
@@ -0,0 +1,3 @@
+MD5 8d16a84f3ca02a785ef9eb36249ba433 fftw-2.1.5.tar.gz 1256888
+RMD160 723308722d76c12710db6473979adf8d086b0909 fftw-2.1.5.tar.gz 1256888
+SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630 fftw-2.1.5.tar.gz 1256888

diff --git a/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch b/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch
index f34ee1237e8d34a9fa564cc161a41b5eb6b4e2a8..1f25232bc05d71ce3ab9144f6e33434283ff5a6f 100644 (file)
--- a/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch
+++ b/sci-libs/fftw/files/fftw-2.1.5-as-needed.patch
@@ -1,11 +1,12 @@
---- fftw-2.1.5-single/rfftw/Makefile.in.old    2006-10-22 18:30:13.000000000 +0200
-+++ fftw-2.1.5-single/rfftw/Makefile.in        2006-10-22 18:45:49.000000000 +0200
-@@ -177,7 +177,7 @@
- CONFIG_CLEAN_FILES =
- LTLIBRARIES = $(lib_LTLIBRARIES)
+Index: fftw-2.1.5/rfftw/Makefile.am
+===================================================================
+--- fftw-2.1.5.orig/rfftw/Makefile.am
++++ fftw-2.1.5/rfftw/Makefile.am
+@@ -18,6 +18,7 @@ lib@FFTW_PREFIX@rfftw_la_SOURCES = $(COD
+                                        rfftw.h                   
  
--lib@FFTW_PREFIX@rfftw_la_LIBADD =
+ lib@FFTW_PREFIX@rfftw_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
 +lib@FFTW_PREFIX@rfftw_la_LIBADD = ../fftw/lib@FFTW_PREFIX@fftw.la
- am__objects_1 = frc_1.lo frc_2.lo frc_3.lo frc_4.lo frc_5.lo frc_6.lo \
-       frc_7.lo frc_8.lo frc_9.lo frc_10.lo frc_11.lo frc_12.lo \
-       frc_13.lo frc_14.lo frc_15.lo frc_16.lo frc_32.lo frc_64.lo \
+ MAINTAINERCLEANFILES = $(CODELETS) rconfig.c
+ DISTCLEANFILES = srfftw.h drfftw.h
+ 

diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index b229aec85b8f3ba91e4c79b34cc4c8485e2d6e49..9c91dfbff0ebd6d24e728981ccc3429aa54050c0 100644 (file)
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -2,4 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>sci</herd>
+<longdescription lang="en">
+The Fastest Fourier Transform in the West is a C subroutine library
+for computing the Discrete Fourier Transform (DFT) in one or more
+dimensions, of both real and complex data, and of arbitrary input
+size. It is becoming the FFT library of choice for most
+applications. Benchmarks, performed on a variety of platforms, show
+that FFTW's performance is typically superior to that of other
+publicly available FFT software.
+</longdescription>
 </pkgmetadata>