Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci; github.com:gentoo-science/sci

13 files changed, 41 insertions, 293 deletions

diff --git a/sci-libs/nfft/ChangeLog b/sci-libs/nfft/ChangeLog
index 6d1482ea6..a0d25f7f1 100644
--- a/sci-libs/nfft/ChangeLog
+++ b/sci-libs/nfft/ChangeLog
@@ -1,11 +1,17 @@
 # ChangeLog for sci-libs/nfft
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*nfft-3.2.0 (07 Jul 2012)
+
+  07 Jul 2012; Christoph Junghans <ottxor@gentoo.org> +nfft-3.2.0.ebuild,
+  -files/nfft-3.1.3-install.patch,
+  -files/nfft-3.1.3-remove-maintainer-mode.patch, -nfft-3.1.3.ebuild:
+  version bump
+
 *nfft-3.1.3 (12 Sep 2010)
 
   12 Sep 2010; Christoph Junghans <kleiner_otti@gmx.de> +nfft-3.1.3.ebuild,
   +files/nfft-3.1.3-install.patch,
   +files/nfft-3.1.3-remove-maintainer-mode.patch, +metadata.xml:
   Initial commit
-
diff --git a/sci-libs/nfft/Manifest b/sci-libs/nfft/Manifest
index f2549ab92..ad1e81701 100644
--- a/sci-libs/nfft/Manifest
+++ b/sci-libs/nfft/Manifest
@@ -1 +1 @@
-DIST nfft-3.1.3.tar.gz 1659745 RMD160 fd43df4bf42e464caccdf10eeb5b9c55e9c7920e SHA1 45ce0e0ae3eeb49ccb2f3ba37b8ad427f08cf9ac SHA256 e4f65f0d1aa81cf76a506f10a9ac68bdcd770a4426671274d372101dca497382
+DIST nfft-3.2.0.tar.gz 2053826 SHA256 8f35288affefd853c0c14c98445405c0acfe14360a9d19f7411865fc6f026126 SHA512 d26e4470cd3ef3b3a2cb4f0d11f32446690628010c87fec0093aa1f7392a94e122da44f89f30f97de482e8e777e8f5b694f4b0b6f47e028412277800d13d3334 WHIRLPOOL f3625d972e711e9522cb5f21da8409b03a781a482a6b6e29d0a94bd9923e5cc55efb035bc099483d31ed65365ec21e984641a30016a386f5e799a2eab157845d
diff --git a/sci-libs/nfft/files/nfft-3.1.3-install.patch b/sci-libs/nfft/files/nfft-3.1.3-install.patch
deleted file mode 100644
index 7da362890..000000000
--- a/sci-libs/nfft/files/nfft-3.1.3-install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur nfft-3.1.3.orig/Makefile.am nfft-3.1.3/Makefile.am
---- nfft-3.1.3.orig/Makefile.am	2009-12-23 11:57:40.000000000 +0100
-+++ nfft-3.1.3/Makefile.am	2010-09-12 20:46:27.000000000 +0200
-@@ -31,8 +27,8 @@
- EXTRA_DIST = bootstrap.sh VERSION doxygen.c
- 
- install-data-hook:
--	mkdir -p $(pkgdatadir)
--	cp -R doc $(pkgdatadir)
-+	mkdir -p $(DESTDIR)$(pkgdatadir)
-+	cp -R doc $(DESTDIR)$(pkgdatadir)
- 
- maintainer-clean-local:
- 	rm -f doc/api/html/*.html
diff --git a/sci-libs/nfft/files/nfft-3.1.3-remove-maintainer-mode.patch b/sci-libs/nfft/files/nfft-3.1.3-remove-maintainer-mode.patch
deleted file mode 100644
index c1e89eb60..000000000
--- a/sci-libs/nfft/files/nfft-3.1.3-remove-maintainer-mode.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -Naur nfft-3.1.3.orig/Makefile.am nfft-3.1.3/Makefile.am
---- nfft-3.1.3.orig/Makefile.am	2009-12-23 11:57:40.000000000 +0100
-+++ nfft-3.1.3/Makefile.am	2010-09-12 20:27:01.000000000 +0200
-@@ -8,11 +8,7 @@
- # Subdirectories
- DIST_SUBDIRS= 3rdparty include util kernel . examples applications matlab
- 
--if MAINTAINER_MODE
--  EXTRA_DIRS= tests
--else
--  EXTRA_DIRS=
--endif
-+EXTRA_DIRS=
- 
- if HAVE_MATLAB
-   MATLAB_DIRS= matlab
-diff -Naur nfft-3.1.3.orig/applications/Makefile.am nfft-3.1.3/applications/Makefile.am
---- nfft-3.1.3.orig/applications/Makefile.am	2009-10-13 07:54:19.000000000 +0200
-+++ nfft-3.1.3/applications/Makefile.am	2010-09-12 20:27:37.000000000 +0200
-@@ -17,12 +17,7 @@
- DIST_SUBDIRS = fastgauss fastsum $(DIR_FASTSUMS2) $(DIR_MRI) polarFFT \
-   $(DIR_QUADRATURES2) radon 
- 
--if MAINTAINER_MODE 
--  EXTRA_DIRS= $(DIR_ITERS2)
--#  EXTRA_DIRS= texture iterS2
--else
--  EXTRA_DIRS=   
--endif 
-+EXTRA_DIRS=   
- 
- SUBDIRS= $(DIST_SUBDIRS) $(EXTRA_DIRS)
- 
-diff -Naur nfft-3.1.3.orig/configure.ac nfft-3.1.3/configure.ac
---- nfft-3.1.3.orig/configure.ac	2009-12-15 16:39:45.000000000 +0100
-+++ nfft-3.1.3/configure.ac	2010-09-12 20:32:27.000000000 +0200
-@@ -439,32 +439,3 @@
-           matlab/nfsft/@f_hat/Makefile
- )
- 
--if test "x$USE_MAINTAINER_MODE" = "xyes"; then
--AC_OUTPUT(tests/Makefile \
--          VERSION
--          doxygen/doxygen.Doxyfile
--          tests/kernel/Makefile \
--          tests/kernel/fpt/Makefile \
--          tests/lowlevel/Makefile \
--          tests/lowlevel/nfsft/Makefile \
--          applications/iterS2/Makefile \
--          applications/texture/Makefile \
--          applications/texture/examplesTexture/Makefile \
--          applications/texture/examplesTexture/correctness/Makefile \
--          applications/texture/examplesTexture/data/Makefile \
--          applications/texture/examplesTexture/data/data_publication/Makefile \
--          applications/texture/examplesTexture/data/util/Makefile \
--          applications/texture/examplesTexture/data_creator/Makefile \
--          applications/texture/examplesTexture/interpolation/Makefile \
--          applications/texture/examplesTexture/matrix/Makefile \
--          applications/texture/examplesTexture/paper1/Makefile \
--          applications/texture/examplesTexture/paper1/data/Makefile \
--          applications/texture/examplesTexture/paper1/reconstruction/Makefile \
--          applications/texture/examplesTexture/paper1/texture/Makefile \
--          applications/texture/examplesTexture/performance/Makefile \
--          applications/texture/examplesTexture/regularity/Makefile \
--          applications/texture/examplesTexture/regularity2/Makefile \
--          applications/texture/examplesTexture/regularity3/Makefile \
--          applications/texture/examplesTexture/texture_util/Makefile
--)
--fi
diff --git a/sci-libs/nfft/nfft-3.1.3.ebuild b/sci-libs/nfft/nfft-3.1.3.ebuild
deleted file mode 100644
index eb5f5a4f9..000000000
--- a/sci-libs/nfft/nfft-3.1.3.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="3"
-
-inherit autotools eutils
-
-DESCRIPTION="library for nonequispaced discrete Fourier transform"
-HOMEPAGE="http://www-user.tu-chemnitz.de/~potts/nfft"
-SRC_URI="http://www-user.tu-chemnitz.de/~potts/nfft/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="static-libs"
-
-RDEPEND="sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	#file for maintainer mode are not in the tarball
-	epatch "${FILESDIR}"/"${P}"-remove-maintainer-mode.patch
-	epatch "${FILESDIR}"/"${P}"-install.patch
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	local myconf
-	myconf="--enable-shared $(use_enable static-libs static)"
-
-	econf ${myconf} || die "econf failed"
-}
-
-src_compile() {
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-}
diff --git a/sci-libs/nfft/nfft-3.2.0.ebuild b/sci-libs/nfft/nfft-3.2.0.ebuild
new file mode 100644
index 000000000..1c739f777
--- /dev/null
+++ b/sci-libs/nfft/nfft-3.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit autotools-utils eutils toolchain-funcs
+
+DESCRIPTION="library for nonequispaced discrete Fourier transform"
+HOMEPAGE="http://www-user.tu-chemnitz.de/~potts/nfft"
+SRC_URI="http://www-user.tu-chemnitz.de/~potts/nfft/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="openmp static-libs"
+
+RDEPEND="sci-libs/fftw:3.0"
+DEPEND="${RDEPEND}"
+
+pkg_pretend() {
+	use openmp && ! tc-has-openmp && \
+		die "Please switch to an openmp compatible compiler"
+}
+
+src_configure() {
+	local myeconfargs=(
+	    --enable-all
+		$(use_enable openmp)
+	)
+	autotools-utils_src_configure
+}
diff --git a/sci-libs/pfft/ChangeLog b/sci-libs/pfft/ChangeLog
deleted file mode 100644
index c5d945ae7..000000000
--- a/sci-libs/pfft/ChangeLog
+++ /dev/null
@@ -1,28 +0,0 @@
-# ChangeLog for sci-libs/pfft
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*pfft-1.0_alpha2 (11 Sep 2011)
-
-  11 Sep 2011; Christoph Junghans <ottxor@gentoo.org> -pfft-1.0_alpha1.ebuild,
-  +pfft-1.0_alpha2.ebuild, -files/pfft-1.0alpha1-Makefile.am,
-  -files/pfft-1.0alpha1-configure.ac, -files/pfft-1.0alpha1-libpfft.pc.in,
-  +files/pfft-1.0alpha2-Makefile.am, +files/pfft-1.0alpha2-configure.ac,
-  +files/pfft-1.0alpha2-libpfft.pc.in, metadata.xml:
-  version bump
-
-  24 Jun 2011; Justin Lecher <jlec@gentoo.org> pfft-1.0_alpha1.ebuild:
-  Fixed Manifest and cleaned ebuild
-
-  15 Sep 2010; Christoph Junghans <kleiner_otti@gmx.de>
-  pfft-1.0_alpha1.ebuild, files/pfft-1.0alpha1-Makefile.am,
-  files/pfft-1.0alpha1-configure.ac, +files/pfft-1.0alpha1-libpfft.pc.in:
-  added --disable-la-files option
-
-*pfft-1.0_alpha1 (12 Sep 2010)
-
-  12 Sep 2010; Christoph Junghans <kleiner_otti@gmx.de>
-  +pfft-1.0_alpha1.ebuild, +files/pfft-1.0alpha1-Makefile.am,
-  +files/pfft-1.0alpha1-configure.ac, +metadata.xml, +metadata.xml~:
-  Initial commit
-
diff --git a/sci-libs/pfft/Manifest b/sci-libs/pfft/Manifest
deleted file mode 100644
index f153e5d5d..000000000
--- a/sci-libs/pfft/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST pfft-1.0alpha2.tar.gz 44185 RMD160 3d64fe52221ac58377c28e4cc723c1dff0bac9b5 SHA1 117157c90645e7e37dca1b8faf2c2ff99f582250 SHA256 906f7aa12672a0a4fe677f7cfae3466f03a09a2bc132ba08423d8dfadbff4ffa
diff --git a/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am b/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am
deleted file mode 100644
index 6325c83e7..000000000
--- a/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-ACLOCAL_AMFLAGS = -I config
-
-lib_LTLIBRARIES = libpfft.la
-
-libpfft_la_LDFLAGS = -no-undefined -version-info @SHARED_VERSION_INFO@
-libpfft_la_SOURCES = \
-	check.c profiles.c transpose.c \
-	dft-parallel.c dft-serial.c \
-	api-basic.c api-adv.c api-guru.c \
-	utils.c timer.c gctimer.c block.c malloc.c getargs.c \
-	gcells_plan.c gcells_sendrecv.c gcells_RMA.c \
-	fortran_api.c
-
-include_HEADERS = pfft.h pfft.f
-noinst_HEADERS = ipfft.h
-
-check_PROGRAMS = simple_test sample_ghost \
-	fortran_simple_test fortran_ghost_test
-
-fortran_simple_test_SOURCES = fortran_simple_test.F90
-
-fortran_ghost_test_SOURCES = fortran_ghost_test.F90
-
-PTRDIFF_T_KIND = 8
-pfft.f: pfft.f.in
-	echo "      integer, parameter :: ptrdiff_t_kind =" $(PTRDIFF_T_KIND) > $@
-	cat $< >> $@
-
-BUILT_SOURCES = pfft.f
-
-LDADD = libpfft.la
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpfft.pc
-
diff --git a/sci-libs/pfft/files/pfft-1.0alpha2-configure.ac b/sci-libs/pfft/files/pfft-1.0alpha2-configure.ac
deleted file mode 100644
index 24d5abdba..000000000
--- a/sci-libs/pfft/files/pfft-1.0alpha2-configure.ac
+++ /dev/null
@@ -1,40 +0,0 @@
-AC_PREREQ([2.65])
-AC_INIT([pfft], [1.0alpha1], [michael.pippig@mathematik.tu-chemnitz.de])
-
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_MACRO_DIR(config)
-AC_CONFIG_HEADERS([config.h])
-
-AM_INIT_AUTOMAKE([1.8 foreign])
-
-SHARED_VERSION_INFO="1:0:0"
-AC_SUBST(SHARED_VERSION_INFO)
-
-# Checks for programs.
-AC_PROG_CC(mpicc)
-AC_PROG_CC_C99
-if test "$ac_cv_prog_cc_c99" = "no"; then
-  AC_MSG_ERROR([Compiler does not understand c99])
-fi
-AC_PROG_FC(mpif90)
-
-LT_INIT
-# Checks for libraries.
-AC_CHECK_HEADERS([fftw3.h])
-AC_CHECK_LIB([fftw3],main,,AC_MSG_ERROR([Cannot find fftw3 library]))
-AC_CHECK_HEADERS([fftw3-mpi.h])
-AC_CHECK_LIB([fftw3_mpi],main,,AC_MSG_ERROR([Cannot find fftw3_mpi library]))
-
-# Checks for header files.
-AC_CHECK_HEADERS([stddef.h stdlib.h string.h])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_TYPE_SIZE_T
-AC_CHECK_TYPES([ptrdiff_t])
-
-# Checks for library functions.
-AC_CHECK_FUNCS([pow sqrt])
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([libpfft.pc])
-AC_OUTPUT
diff --git a/sci-libs/pfft/files/pfft-1.0alpha2-libpfft.pc.in b/sci-libs/pfft/files/pfft-1.0alpha2-libpfft.pc.in
deleted file mode 100644
index f2c7f90ba..000000000
--- a/sci-libs/pfft/files/pfft-1.0alpha2-libpfft.pc.in
+++ /dev/null
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: libpfft
-Description: parallel 3d FFT
-URL: http://www-user.tu-chemnitz.de/~mpip/software.php
-Version: @VERSION@
-Requires: fftw_mpi
-Libs: -L${libdir} -lpfft
-Libs.private: -lm
-Cflags: -I${includedir}
diff --git a/sci-libs/pfft/metadata.xml b/sci-libs/pfft/metadata.xml
deleted file mode 100644
index 119d0fde1..000000000
--- a/sci-libs/pfft/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>sci</herd>
-	<maintainer>
-		<email>ottxor@gentoo.org</email>
-		<name>Christoph Junghans</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/sci-libs/pfft/pfft-1.0_alpha2.ebuild b/sci-libs/pfft/pfft-1.0_alpha2.ebuild
deleted file mode 100644
index c84b6f0db..000000000
--- a/sci-libs/pfft/pfft-1.0_alpha2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit autotools-utils eutils flag-o-matic fortran-2
-
-DESCRIPTION="Parallel 3d FFT"
-HOMEPAGE="http://www-user.tu-chemnitz.de/~mpip/software.php"
-SRC_URI="http://www-user.tu-chemnitz.de/~mpip/software/${P//_}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="static-libs test"
-
-RDEPEND="
-	=sci-libs/fftw-3.3*[mpi,fortran]
-	virtual/mpi
-	"
-
-DEPEND="
-	${RDEPEND}
-	test? ( virtual/fortran )
-	"
-
-S="${WORKDIR}/${P//_}"
-
-src_prepare() {
-	local i
-	use test && fortran-2_pkg_setup
-	for i in Makefile.am configure.ac libpfft.pc.in; do
-		cp "${FILESDIR}"/"${PF//_}"-"${i}" "${i}" || die
-	done
-
-	append-cppflags "-I${EROOT}/usr/include"
-
-	eautoreconf
-}