Version bump

(Portage version: 2.2_rc36/cvs/Linux x86_64)

7 files changed, 53 insertions, 376 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index d1f2b008d52d..045f1a556945 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/fftw
-# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.86 2009/05/01 12:07:57 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.87 2009/08/09 04:48:24 bicatali Exp $
+
+*fftw-3.2.2 (09 Aug 2009)
+
+  09 Aug 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  -fftw-2.1.5-r4.ebuild, -fftw-3.1.2.ebuild, -fftw-3.2.ebuild,
+  +fftw-3.2.2.ebuild, -files/fftw-3.2-as-needed.patch,
+  -files/fftw-3.2-cppflags.patch, -files/fftw-3.2-openmp.patch:
+  Version bump
 
   01 May 2009; Raúl Porcel <armin76@gentoo.org> fftw-2.1.5-r5.ebuild:
   Add ~arm/~s390 wrt #267990
diff --git a/sci-libs/fftw/fftw-2.1.5-r4.ebuild b/sci-libs/fftw/fftw-2.1.5-r4.ebuild
deleted file mode 100644
index afd0f5945947..000000000000
--- a/sci-libs/fftw/fftw-2.1.5-r4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# 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-r4.ebuild,v 1.2 2008/06/23 14:31:13 bicatali Exp $
-
-inherit eutils flag-o-matic multilib autotools fortran
-
-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
-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"
-
-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
-	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?)
-
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	epatch "${FILESDIR}/${P}-configure.in.patch"
-	epatch "${FILESDIR}/${P}-no-test.patch"
-
-	# fix info files
-	for infofile in doc/fftw*info*; do
-		cat >> ${infofile} <<-EOF
-			INFO-DIR-SECTION Libraries
-			START-INFO-DIR-ENTRY
-			* fftw: (fftw).				${DESCRIPTION}
-			END-INFO-DIR-ENTRY
-		EOF
-	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 fortran) \
-		$(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 fortran) \
-		$(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 -j1 check || die "emake check single failed"
-	cd "${S}-double"
-	emake -j1 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
-		for f in "${D}"/usr/{include,$(get_libdir)}/*sfft*; do
-			ln -s $(basename ${f}) ${f/sfft/fft}
-		done
-		for f in "${D}"/usr/{include,$(get_libdir)}/*srfft*; do
-			ln -s $(basename ${f}) ${f/srfft/rfft}
-		done
-	else
-		for f in "${D}"/usr/{include,$(get_libdir)}/*dfft*; do
-			ln -s $(basename ${f}) ${f/dfft/fft}
-		done
-		for f in "${D}"/usr/{include,$(get_libdir)}/*drfft*; do
-			ln -s $(basename ${f}) ${f/drfft/rfft}
-		done
-	fi
-}
diff --git a/sci-libs/fftw/fftw-3.1.2.ebuild b/sci-libs/fftw/fftw-3.1.2.ebuild
deleted file mode 100644
index 183ff1e1b3f3..000000000000
--- a/sci-libs/fftw/fftw-3.1.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# 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.13 2008/06/23 14:31:13 bicatali Exp $
-
-inherit flag-o-matic eutils toolchain-funcs autotools fortran
-
-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 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
-	cp -pPR ${P}-single ${P}-longdouble
-}
-
-src_compile() {
-	# filter -Os according to docs
-	replace-flags -Os -O2
-
-	local myconfcommon="--enable-shared --enable-threads $(use_enable fortran)"
-	local myconfsingle=""
-	local myconfdouble=""
-	local myconflongdouble=""
-
-	if use sse2; then
-		myconfsingle="$myconfsingle --enable-sse"
-		myconfdouble="$myconfdouble --enable-sse2"
-	elif use sse; then
-		myconfsingle="$myconfsingle --enable-sse"
-	fi
-	# altivec only helps floats, not doubles
-	if use altivec; then
-		myconfsingle="$myconfsingle --enable-altivec"
-	fi
-
-	cd "${S}-single"
-	econf \
-		${myconfcommon} \
-		--enable-float \
-		${myconfsingle} || \
-			die "./configure in single failed"
-	emake || die "emake single failed"
-
-	#the only difference here is no --enable-float
-	cd "${S}-double"
-	econf \
-		${myconfcommon} \
-		${myconfdouble} || \
-		die "./configure in double failed"
-	emake || die "emake double failed"
-
-	#the only difference here is --enable-long-double
-	cd "${S}-longdouble"
-	econf \
-		${myconfcommon} \
-		--enable-long-double \
-		${myconflongdouble} || \
-		die "./configure in long double failed"
-	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.
-	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 || die
-	cd doc/html
-	dohtml -r .
-}
-
-src_test () {
-	# We want this to be a reasonably quick test, but that is still hard...
-	ewarn "This test series will take 30 minutes on a modern 2.5Ghz machine"
-	# Do not increase the number of threads, it will not help your performance
-	local testbase="perl check.pl --nthreads=1 --estimate"
-	for d in single double longdouble; do
-		cd "${S}-${d}"/tests
-		for p in 0 1 2; do
-			n="${d/longdouble/long double} / ${p}-D"
-			einfo "Testing $n"
-			${testbase} -${p}d || die "Failure: $n"
-		done
-	done
-}
diff --git a/sci-libs/fftw/fftw-3.2.ebuild b/sci-libs/fftw/fftw-3.2.2.ebuild
index 6dc56fa75194..fd5d1e1f25c9 100644
--- a/sci-libs/fftw/fftw-3.2.ebuild
+++ b/sci-libs/fftw/fftw-3.2.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.ebuild,v 1.2 2008/11/27 10:39:28 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2.ebuild,v 1.1 2009/08/09 04:48:24 bicatali Exp $
 
-inherit flag-o-matic eutils toolchain-funcs autotools fortran
+EAPI=2
+inherit flag-o-matic eutils toolchain-funcs autotools
 
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
@@ -32,78 +33,61 @@ pkg_setup() {
 		epause 5
 		FFTW_THREADS="--enable-threads --disable-openmp"
 	fi
-	FORTRAN="gfortran ifc g77"
-	use fortran && fortran_pkg_setup
+	FFTW_DIRS="single double longdouble"
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-openmp.patch
-	epatch "${FILESDIR}"/${P}-as-needed.patch
-	epatch "${FILESDIR}"/${P}-cppflags.patch
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2.1-as-needed.patch
 
-	# fix info file
-	sed -e 's/Texinfo documentation system/Libraries/' \
-		-i doc/fftw3.info || die "failed to fix info file"
+	# fix info file for category directory
+	sed -i \
+		-e 's/Texinfo documentation system/Libraries/' \
+		doc/fftw3.info || die "failed to fix info file"
 
 	rm m4/lt* m4/libtool.m4
 
 	AT_M4DIR=m4 eautoreconf
-	cd "${WORKDIR}"
-	mv ${P} ${P}-single
-	cp -pPR ${P}-single ${P}-double
-	cp -pPR ${P}-single ${P}-longdouble
+	for x in ${FFTW_DIRS}; do
+		mkdir "${S}-${x}" || die
+	done
 }
 
-src_compile() {
+src_configure() {
 	# filter -Os according to docs
 	replace-flags -Os -O2
 
-	local myconfcommon="
-		--enable-shared
+	local myconfcommon="--enable-shared
 		$(use_enable fortran)
 		${FFTW_THREADS}"
 
-	local myconfsingle=""
-	local myconfdouble=""
-	local myconflongdouble=""
-
+	local myconfsingle="${myconfcommon} --enable-single"
+	local myconfdouble="${myconfcommon}"
+	local myconflongdouble="${myconfcommon} --enable-long-double"
 	if use sse2; then
 		myconfsingle="${myconfsingle} --enable-sse"
 		myconfdouble="${myconfdouble} --enable-sse2"
 	elif use sse; then
 		myconfsingle="${myconfsingle} --enable-sse"
 	fi
-	# altivec only helps floats, not doubles
+	# altivec only helps singles, not doubles
 	if use altivec; then
 		myconfsingle="${myconfsingle} --enable-altivec"
 	fi
 
-	cd "${S}-single"
-	econf \
-		--enable-float \
-		${myconfcommon} \
-		${myconfsingle} || \
-			die "econf single failed"
-	emake || die "emake single failed"
-
-	# the only difference here is no --enable-float
-	cd "${S}-double"
-	econf \
-		${myconfcommon} \
-		${myconfdouble} || \
-		die "econf double failed"
-	emake || die "emake double failed"
-
-	# the only difference here is --enable-long-double
-	cd "${S}-longdouble"
-	econf \
-		--enable-long-double \
-		${myconfcommon} \
-		${myconflongdouble} || \
-		die "econf long double failed"
-	emake || die "emake long double failed"
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}"
+		einfo "Configuring for ${x} precision"
+		local p=myconf${x}
+		ECONF_SOURCE="${S}" econf ${!p}
+	done
+}
+
+src_compile() {
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}"
+		einfo "Compiling for ${x} precision"
+		emake || die "emake for ${x} precision failed"
+	done
 }
 
 src_test () {
@@ -112,24 +96,23 @@ src_test () {
 	# Do not increase the number of threads, it will not help your performance
 	#local testbase="perl check.pl --nthreads=1 --estimate"
 	#		${testbase} -${p}d || die "Failure: $n"
-	for d in single double longdouble; do
-		cd "${S}-${d}"/tests
-		einfo "Testing ${PN}-${d}"
-		emake -j1 check || die "emake test failed"
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}/tests"
+		einfo "Testing ${x} precision"
+		emake -j1 check || die "emake test ${x} failed"
 	done
 }
 
 src_install () {
 	# 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"
+	for x in ${FFTW_DIRS}; do
+		cd "${S}-${x}"
+		emake DESTDIR="${D}" install || die "emake install for ${x} failed"
 	done
 
-	# Install documentation.
-	cd "${S}-single"
-	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS || die
+	cd "${S}"
+	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS
 	if use doc; then
 		cd doc
 		insinto /usr/share/doc/${PF}
diff --git a/sci-libs/fftw/files/fftw-3.2-as-needed.patch b/sci-libs/fftw/files/fftw-3.2-as-needed.patch
deleted file mode 100644
index c991b20f2396..000000000000
--- a/sci-libs/fftw/files/fftw-3.2-as-needed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.am.orig	2008-11-19 10:05:22.000000000 +0100
-+++ Makefile.am	2008-11-19 10:06:56.000000000 +0100
-@@ -37,6 +37,13 @@
- if SMP
- if COMBINED_THREADS
- COMBINED_THREADLIBS=threads/libfftw3@PREC_SUFFIX@_threads.la
-+else
-+lib_LTLIBRARIES += libfftw3@PREC_SUFFIX@_threads.la
-+libfftw3@PREC_SUFFIX@_threads_la_SOURCES = 
-+libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
-+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = \
-+	libfftw3@PREC_SUFFIX@.la \
-+	threads/libfftw3@PREC_SUFFIX@_threads.la
- endif
- endif
- 
---- threads/Makefile.am.orig	2008-11-19 10:03:43.000000000 +0100
-+++ threads/Makefile.am	2008-11-19 10:05:13.000000000 +0100
-@@ -2,11 +2,7 @@
- -I$(top_srcdir)/rdft -I$(top_srcdir)/api
- 
- if SMP
--if COMBINED_THREADS
- noinst_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
--else
--lib_LTLIBRARIES = libfftw3@PREC_SUFFIX@_threads.la
--endif
- endif
- 
- # pkgincludedir = $(includedir)/fftw3@PREC_SUFFIX@
-@@ -16,4 +12,5 @@
- openmp.c threads.h dft-vrank-geq1.c ct.c rdft-vrank-geq1.c hc2hc.c	\
- vrank-geq1-rdft2.c f77api.c f77funcs.h
- 
-+libfftw3@PREC_SUFFIX@_threads_la_LIBADD = $(THREADLIBS)
- libfftw3@PREC_SUFFIX@_threads_la_LDFLAGS = -version-info @SHARED_VERSION_INFO@
diff --git a/sci-libs/fftw/files/fftw-3.2-cppflags.patch b/sci-libs/fftw/files/fftw-3.2-cppflags.patch
deleted file mode 100644
index 4d9a1b01c028..000000000000
--- a/sci-libs/fftw/files/fftw-3.2-cppflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.ac.orig	2008-11-19 09:57:26.000000000 +0100
-+++ configure.ac	2008-11-19 09:59:08.000000000 +0100
-@@ -264,6 +264,8 @@
- fi
- fi
- AC_SUBST(SIMD_CFLAGS)
-+# pass simd flags to preprocessor/compiler for proper intrinsics detection.
-+CPPFLAGS="$CPPFLAGS $SIMD_CFLAGS"
- 
- dnl Checks for header files.
- AC_HEADER_STDC
diff --git a/sci-libs/fftw/files/fftw-3.2-openmp.patch b/sci-libs/fftw/files/fftw-3.2-openmp.patch
deleted file mode 100644
index 254b9a05a28b..000000000000
--- a/sci-libs/fftw/files/fftw-3.2-openmp.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- configure.ac.orig	2008-11-19 09:57:26.000000000 +0100
-+++ configure.ac	2008-11-19 09:59:08.000000000 +0100
-@@ -435,10 +437,10 @@
- AC_ARG_WITH(combined-threads, [AC_HELP_STRING([--with-combined-threads],[combine threads into main libfftw3])], with_combined_threads=$withval, with_combined_threads=no)
- 
- if test "$enable_openmp"x != nox; then
--   AX_OPENMP([THREADLIBS=" "
-+   AX_OPENMP([THREADLIBS="$OPENMP_LIBS"
-      AC_DEFINE(USING_OPENMP_THREADS, 1, [Define if we have and are using OpenMP multithreading directives])
-      CFLAGS="$CFLAGS $OPENMP_CFLAGS"],
--     [AC_MSG_ERROR([don't know how to enable OpenMP])])
-+     [AC_MSG_WARN([don't know how to enable OpenMP, reverting to POSIX threads])])
- fi
- 
- dnl Check for threads library...
---- m4/ax_openmp.m4.orig	2008-07-10 11:33:17.361562576 +0100
-+++ m4/ax_openmp.m4	2008-07-10 12:05:14.280159723 +0100
-@@ -59,6 +59,10 @@
- else
-   if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then
-     OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp
-+    OPENMP_LIBS=" "
-+    if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "x-fopenmp"; then
-+        OPENMP_LIBS="-lgomp"
-+    fi
-   fi
-   m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])])
- fi