[gentoo-commits] gentoo-x86 commit in sci-libs/fftw: ChangeLog fftw-2.1.5-r3.ebuild fftw-3.1.2.ebuild metadata.xml fftw-3.0.1-r2.ebuild

[Sebastien Fabbro (bicatali)]

bicatali    08/04/01 22:10:26

  Modified:             ChangeLog fftw-2.1.5-r3.ebuild fftw-3.1.2.ebuild
                        metadata.xml
  Removed:              fftw-3.0.1-r2.ebuild
  Log:
  fftw-2.1.5-r3: Fix more as-needed stuff for mpi, added fortran use flag, link more libs and headers, changed float use flag to single. fftw-3.1.2: Added a configure.ac patch in hope of fixing bug #215269, added a fortran use flag. Cleaning ebuilds and removed 3.0 version.
  (Portage version: 2.1.4.4)

Revision  Changes    Path
1.63                 sci-libs/fftw/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.63&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?rev=1.63&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/ChangeLog?r1=1.62&r2=1.63

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- ChangeLog	26 Oct 2007 13:40:02 -0000	1.62
+++ ChangeLog	1 Apr 2008 22:10:25 -0000	1.63
@@ -1,6 +1,17 @@
 # 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.62 2007/10/26 13:40:02 markusle Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.63 2008/04/01 22:10:25 bicatali Exp $
+
+  01 Apr 2008; Sébastien Fabbro <bicatali@g.o>
+  +files/fftw-2.1.5-configure.in.patch, -files/3-tmpfile.patch,
+  files/fftw-2.1.5-as-needed.patch, -files/fftw-3.0.1-altivec.patch,
+  -files/fftw-3.0.1-amd64.patch, +files/fftw-3.1.2-configure.ac.patch,
+  -files/fftw-altivec-headers.patch, metadata.xml, fftw-2.1.5-r3.ebuild,
+  -fftw-3.0.1-r2.ebuild, fftw-3.1.2.ebuild:
+  fftw-2.1.5-r3: Fix more as-needed stuff for mpi, added fortran use flag,
+  link more libs and headers, changed float use flag to single. fftw-3.1.2:
+  Added a configure.ac patch in hope of fixing bug #215269, added a fortran
+  use flag. Cleaning ebuilds and removed 3.0 version.
 
   26 Oct 2007; Markus Dittrich <markusle@g.o> fftw-3.0.1-r2.ebuild:
   Added missing quotation marks.



1.5                  sci-libs/fftw/fftw-2.1.5-r3.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r3.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r3.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r3.ebuild?r1=1.4&r2=1.5

Index: fftw-2.1.5-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r3.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fftw-2.1.5-r3.ebuild	13 Jul 2007 06:57:51 -0000	1.4
+++ fftw-2.1.5-r3.ebuild	1 Apr 2008 22:10:25 -0000	1.5
@@ -1,24 +1,20 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.4 2007/07/13 06:57:51 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-2.1.5-r3.ebuild,v 1.5 2008/04/01 22:10:25 bicatali Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+inherit eutils flag-o-matic multilib autotools fortran
 
-inherit flag-o-matic multilib autotools
-
-IUSE="doc mpi float"
-
-DESCRIPTION="C subroutine library for computing the Discrete Fourier Transform (DFT)"
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 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 ~.
+# hppa does not have yet a virtual/mpi
 DEPEND="mpi? ( !hppa? ( virtual/mpi ) )
 	mpi? ( hppa? ( sys-cluster/lam-mpi ) )"
 
 SLOT="2.1"
 LICENSE="GPL-2"
+IUSE="doc fortran mpi float"
 
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 
@@ -31,22 +27,29 @@
 	if [ "${ARCH}" == "x86" ]; then
 		is-flag "-fomit-frame-pointer" || append-flags "-fomit-frame-pointer"
 	fi
+	FORTRAN="gfortran ifc g77"
+	use fortran && fortran_pkg_setup
 }
 
 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?)
+	# 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"
+	epatch "${FILESDIR}/${P}-configure.in.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}
+		cat >> ${infofile} <<-EOF
+			INFO-DIR-SECTION Libraries
+			START-INFO-DIR-ENTRY
+			* fftw: (fftw).				${DESCRIPTION}
+			END-INFO-DIR-ENTRY
+		EOF
 	done
 
 	eautoreconf
@@ -64,6 +67,7 @@
 		--enable-type-prefix \
 		--enable-vec-recurse \
 		--enable-threads \
+		$(use_enable fortran) \
 		$(use_enable mpi) \
 		$(use_enable x86 i386-hacks) \
 		|| die "econf for float failed"
@@ -76,6 +80,7 @@
 		--enable-type-prefix \
 		--enable-vec-recurse \
 		--enable-threads \
+		$(use_enable fortran) \
 		$(use_enable mpi) \
 		$(use_enable x86 i386-hacks) \
 		|| die "econf for double failed"
@@ -105,22 +110,12 @@
 	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
+		for f in "${D}"/usr/{include,$(get_libdir)}/*sfft*; do
+			ln -s $(basename ${f}) ${f/sfft/fft}
+		done
 	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
+		for f in "${D}"/usr/{include,$(get_libdir)}/*dfft*; do
+			ln -s $(basename ${f}) ${f/dfft/fft}
+		done
 	fi
 }



1.12                 sci-libs/fftw/fftw-3.1.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-3.1.2.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-3.1.2.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/fftw-3.1.2.ebuild?r1=1.11&r2=1.12

Index: fftw-3.1.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.2.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- fftw-3.1.2.ebuild	25 Aug 2007 14:28:17 -0000	1.11
+++ fftw-3.1.2.ebuild	1 Apr 2008 22:10:25 -0000	1.12
@@ -1,28 +1,33 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.2.ebuild,v 1.11 2007/08/25 14:28:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.1.2.ebuild,v 1.12 2008/04/01 22:10:25 bicatali Exp $
 
-inherit flag-o-matic eutils toolchain-funcs autotools
+inherit flag-o-matic eutils toolchain-funcs autotools fortran
 
-DESCRIPTION="C subroutine library for computing the Discrete Fourier Transform (DFT)"
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 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 ppc64 sparc x86"
-IUSE="altivec sse sse2 test"
+IUSE="altivec fortran sse sse2 test"
 
 DEPEND="test? ( dev-lang/perl )"
 
+pkg_setup() {
+	FORTRAN="gfortran ifc g77"
+	use fortran && fortran_pkg_setup
+}
+
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
+	epatch "${FILESDIR}"/${P}-configure.ac.patch
 	# fix info file
 	sed -e 's/Texinfo documentation system/Libraries/' \
 		-i doc/fftw3.info || die "failed to fix info file"
-
+	AT_M4DIR=m4 eautoreconf
 	cd "${WORKDIR}"
 	mv ${P} ${P}-single
 	cp -pPR ${P}-single ${P}-double
@@ -33,7 +38,7 @@
 	# filter -Os according to docs
 	replace-flags -Os -O2
 
-	local myconfcommon="--enable-shared --enable-threads"
+	local myconfcommon="--enable-shared --enable-threads $(use_enable fortran)"
 	local myconfsingle=""
 	local myconfdouble=""
 	local myconflongdouble=""
@@ -55,7 +60,7 @@
 		--enable-float \
 		${myconfsingle} || \
 			die "./configure in single failed"
-	emake || die
+	emake || die "emake single failed"
 
 	#the only difference here is no --enable-float
 	cd "${S}-double"
@@ -63,7 +68,7 @@
 		${myconfcommon} \
 		${myconfdouble} || \
 		die "./configure in double failed"
-	emake || die
+	emake || die "emake double failed"
 
 	#the only difference here is --enable-long-double
 	cd "${S}-longdouble"
@@ -72,26 +77,20 @@
 		--enable-long-double \
 		${myconflongdouble} || \
 		die "./configure in long double failed"
-	emake || die
+	emake || die "emake long double failed"
 }
 
 src_install () {
-	#all builds are installed in the same place
-	#libs have distinuguished names; include files, docs etc. identical.
-	cd "${S}-single"
-	emake DESTDIR="${D}" install || die
-
-	cd "${S}-double"
-	emake DESTDIR="${D}" install || die
-
-	cd "${S}-longdouble"
-	emake DESTDIR="${D}" install || die
+	# all builds are installed in the same place
+	# libs have distinuguished names; include files, docs etc. identical.
+	for i in single double longdouble; do
+		cd "${S}-${i}"
+		emake DESTDIR="${D}" install || die "emake install for ${i} failed"
+	done
 
 	# Install documentation.
 	cd "${S}-single"
-
-	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS
-
+	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS || die
 	cd doc/html
 	dohtml -r .
 }



1.3                  sci-libs/fftw/metadata.xml

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-libs/fftw/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-libs/fftw/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	30 Apr 2007 16:44:54 -0000	1.2
+++ metadata.xml	1 Apr 2008 22:10:25 -0000	1.3
@@ -3,12 +3,12 @@
 <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.
+  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>



-- 
gentoo-commits@l.g.o mailing list