[gentoo-commits] proj/sci:master commit in: sci-libs/nfft/, sci-libs/nfft/files/

[Christoph Junghans]

commit:     22e724f160ca334a25b35e07c77da93660b57792
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  7 23:09:51 2012 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Sat Jul  7 23:12:37 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=22e724f1

version bump

(Portage version: 2.2.0_alpha116/git/Linux i686, unsigned Manifest commit)

---
 sci-libs/nfft/ChangeLog                            |   10 ++-
 sci-libs/nfft/files/nfft-3.1.3-install.patch       |   14 ----
 .../files/nfft-3.1.3-remove-maintainer-mode.patch  |   69 --------------------
 sci-libs/nfft/nfft-3.1.3.ebuild                    |   41 ------------
 sci-libs/nfft/nfft-3.2.0.ebuild                    |   32 +++++++++
 5 files changed, 40 insertions(+), 126 deletions(-)

diff --git a/sci-libs/nfft/ChangeLog b/sci-libs/nfft/ChangeLog
index 6d1482e..a0d25f7 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@g.o> +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@×××.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/files/nfft-3.1.3-install.patch b/sci-libs/nfft/files/nfft-3.1.3-install.patch
deleted file mode 100644
index 7da3628..0000000
--- 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 c1e89eb..0000000
--- 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 eb5f5a4..0000000
--- 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 0000000..1c739f7
--- /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
+}