Cleanup and a minor bugfix
authorPatrick Kursawe <phosphan@gentoo.org>
Tue, 16 Nov 2004 08:36:24 +0000 (08:36 +0000)
committerPatrick Kursawe <phosphan@gentoo.org>
Tue, 16 Nov 2004 08:36:24 +0000 (08:36 +0000)
dev-libs/fftw/ChangeLog
dev-libs/fftw/Manifest
dev-libs/fftw/fftw-2.1.3-r1.ebuild [deleted file]
dev-libs/fftw/fftw-2.1.5-r1.ebuild
dev-libs/fftw/fftw-2.1.5.ebuild [deleted file]
dev-libs/fftw/files/digest-fftw-2.1.3-r1 [deleted file]
dev-libs/fftw/files/digest-fftw-2.1.5 [deleted file]

index 7872f310284e66121bbde212ed96679b31cce1a1..c7dbee7a1e21ad60f8f8b385e6175f3e60165ea4 100644 (file)
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/fftw
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/ChangeLog,v 1.28 2004/10/01 22:25:10 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/ChangeLog,v 1.29 2004/11/16 08:36:24 phosphan Exp $
+
+  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:
index c7f37d138eaf751e6854348120e5b601ff1148a4..ce8910e3da00c2929655678909d3fec355d3dfd5 100644 (file)
@@ -1,13 +1,9 @@
-MD5 4bf2623b0d4641aea1ea4bdfc9123447 ChangeLog 3806
-MD5 95b2c0e78c058b1e66b385197a91fa90 fftw-2.1.3-r1.ebuild 3320
-MD5 16c5ea8857c638b185e8bde27d14553e fftw-2.1.5-r1.ebuild 4046
-MD5 0eda42f04f2c30ef081d57225d027194 fftw-2.1.5.ebuild 3864
-MD5 0a87854c3a86522590b4f524752e1787 fftw-3.0.1-r1.ebuild 2672
 MD5 d26b7537be168a3fb6e61a49968eaafc fftw-3.0.1.ebuild 2364
+MD5 0a87854c3a86522590b4f524752e1787 fftw-3.0.1-r1.ebuild 2672
+MD5 c0d2cf9b97a5ac438c99c8b7ac7afab6 fftw-2.1.5-r1.ebuild 4118
+MD5 d56b6aa30795339b6a32557f45235f13 ChangeLog 3994
 MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
-MD5 4fe6c4cc41aedf02139d010087125ec2 files/digest-fftw-2.1.3-r1 63
-MD5 236dda9695005c9f306fb2c55f020686 files/digest-fftw-2.1.5 63
-MD5 236dda9695005c9f306fb2c55f020686 files/digest-fftw-2.1.5-r1 63
 MD5 cd32698a34d886267d48a8ccb99747b1 files/digest-fftw-3.0.1 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
diff --git a/dev-libs/fftw/fftw-2.1.3-r1.ebuild b/dev-libs/fftw/fftw-2.1.3-r1.ebuild
deleted file mode 100644 (file)
index da50661..0000000
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/fftw-2.1.3-r1.ebuild,v 1.8 2004/07/14 14:25:56 agriffis Exp $
-
-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"
-#lam compiled fine on uniprocessor (drobbins, 01 Aug 2002)
-DEPEND="mpi? ( >=sys-cluster/lam-mpi-6.5.6 )"
-SLOT="2.1"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc ~alpha"
-
-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() {
-
-       #here I need (surprise) to increase optimization:
-       #--enable-i386-hacks requires -fomit-frame-pointer to work properly
-       export CFLAGS="${CFLAGS/-fomit-frame-pointer/} -fomit-frame-pointer"
-
-       local myconf=""
-       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
-
-       cd "${S}-single"
-       econf \
-               --enable-shared \
-               --enable-threads \
-               --enable-type-prefix \
-               --enable-float \
-               --enable-i386-hacks \
-               --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-i386-hacks \
-               --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
-       echo "INFO-DIR-SECTION Libraries" >>$fftw.info
-       echo "START-INFO-DIR-ENTRY" >>doc/fftw.info
-       echo "* fftw: (fftw).                  C subroutine library for computing the Discrete Fourier Transform (DFT)" >>doc/fftw.info
-       echo "END-INFO-DIR-ENTRY" >>doc/fftw.info
-
-       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
-}
index 2a3e25be083931a302d66f457144f21115f4ca9d..52041e6f0f8d9d5814f60a3d15a072a99faee1d2 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.5 2004/06/24 23:10:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/fftw-2.1.5-r1.ebuild,v 1.6 2004/11/16 08:36:24 phosphan Exp $
 
 inherit flag-o-matic
 
@@ -134,4 +134,8 @@ src_install () {
                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/dev-libs/fftw/fftw-2.1.5.ebuild b/dev-libs/fftw/fftw-2.1.5.ebuild
deleted file mode 100644 (file)
index ff8fdc3..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fftw/fftw-2.1.5.ebuild,v 1.8 2004/07/14 14:25:56 agriffis 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"
-
-#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
-is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
-
-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"
-       #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-i386-hacks \
-               --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-i386-hacks \
-               --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
-       echo "INFO-DIR-SECTION Libraries" >>$fftw.info
-       echo "START-INFO-DIR-ENTRY" >>doc/fftw.info
-       echo "* fftw: (fftw).                  C subroutine library for computing the Discrete Fourier Transform (DFT)" >>doc/fftw.info
-       echo "END-INFO-DIR-ENTRY" >>doc/fftw.info
-
-       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
-}
diff --git a/dev-libs/fftw/files/digest-fftw-2.1.3-r1 b/dev-libs/fftw/files/digest-fftw-2.1.3-r1
deleted file mode 100644 (file)
index 6490784..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c6c51a4243f0f998ae4c9416108ebba0 fftw-2.1.3.tar.gz 1139406
diff --git a/dev-libs/fftw/files/digest-fftw-2.1.5 b/dev-libs/fftw/files/digest-fftw-2.1.5
deleted file mode 100644 (file)
index 957213b..0000000
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8d16a84f3ca02a785ef9eb36249ba433 fftw-2.1.5.tar.gz 1256888