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

["Christoph Junghans" <kleiner_otti@gmx.de>]

commit:     506fe16bf225496925fa4a7a4f535d7ed2127ca8
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 12 18:09:14 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Mon Sep 12 18:09:14 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=506fe16b

[sci-libs/pfft] version bump

(Portage version: 2.1.10.11/git/Linux i686, signed Manifest commit with key C2000586)

---
 sci-libs/pfft/ChangeLog                            |    9 +++++
 sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am     |   26 --------------
 sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am     |   35 ++++++++++++++++++++
 ...a1-configure.ac => pfft-1.0alpha2-configure.ac} |    7 +---
 ...-libpfft.pc.in => pfft-1.0alpha2-libpfft.pc.in} |    0
 sci-libs/pfft/metadata.xml                         |    4 +-
 ...ft-1.0_alpha1.ebuild => pfft-1.0_alpha2.ebuild} |   24 ++++++++------
 7 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/sci-libs/pfft/ChangeLog b/sci-libs/pfft/ChangeLog
index 4ba70e3..c5d945a 100644
--- a/sci-libs/pfft/ChangeLog
+++ b/sci-libs/pfft/ChangeLog
@@ -2,6 +2,15 @@
 # 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
 

diff --git a/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am b/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am
deleted file mode 100644
index 2551694..0000000
--- a/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am
+++ /dev/null
@@ -1,26 +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 block.c malloc.c getargs.c \
-	gcells_plan.c gcells_sendrecv.c gcells_RMA.c
-
-include_HEADERS = pfft.h
-noinst_HEADERS = ipfft.h
-
-noinst_PROGRAMS = simple_test sample_ghost
-
-LDADD = libpfft.la
-
-install-exec-hook:
-if NO_LA_FILES
-	rm -f $(DESTDIR)$(libdir)/libpfft.la
-endif
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libpfft.pc
-

diff --git a/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am b/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am
new file mode 100644
index 0000000..6325c83
--- /dev/null
+++ b/sci-libs/pfft/files/pfft-1.0alpha2-Makefile.am
@@ -0,0 +1,35 @@
+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.0alpha1-configure.ac b/sci-libs/pfft/files/pfft-1.0alpha2-configure.ac
similarity index 83%
rename from sci-libs/pfft/files/pfft-1.0alpha1-configure.ac
rename to sci-libs/pfft/files/pfft-1.0alpha2-configure.ac
index 9955413..24d5abd 100644
--- a/sci-libs/pfft/files/pfft-1.0alpha1-configure.ac
+++ b/sci-libs/pfft/files/pfft-1.0alpha2-configure.ac
@@ -10,18 +10,13 @@ AM_INIT_AUTOMAKE([1.8 foreign])
 SHARED_VERSION_INFO="1:0:0"
 AC_SUBST(SHARED_VERSION_INFO)
 
-AC_ARG_ENABLE(la-files,
-	[AS_HELP_STRING([--disable-la-files],[Do NOT install GNU libtool's la files])],,
-	[enable_la_files=yes])
-
-AM_CONDITIONAL(NO_LA_FILES,[test "$enable_la_files" = no])
-
 # 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.

diff --git a/sci-libs/pfft/files/pfft-1.0alpha1-libpfft.pc.in b/sci-libs/pfft/files/pfft-1.0alpha2-libpfft.pc.in
similarity index 100%
rename from sci-libs/pfft/files/pfft-1.0alpha1-libpfft.pc.in
rename to sci-libs/pfft/files/pfft-1.0alpha2-libpfft.pc.in

diff --git a/sci-libs/pfft/metadata.xml b/sci-libs/pfft/metadata.xml
index 69b66cb..119d0fd 100644
--- a/sci-libs/pfft/metadata.xml
+++ b/sci-libs/pfft/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
+	<herd>sci</herd>
 	<maintainer>
-		<email>kleiner_otti@gmx.de</email>
+		<email>ottxor@gentoo.org</email>
 		<name>Christoph Junghans</name>
 	</maintainer>
 </pkgmetadata>

diff --git a/sci-libs/pfft/pfft-1.0_alpha1.ebuild b/sci-libs/pfft/pfft-1.0_alpha2.ebuild
similarity index 60%
rename from sci-libs/pfft/pfft-1.0_alpha1.ebuild
rename to sci-libs/pfft/pfft-1.0_alpha2.ebuild
index d44f96a..c84b6f0 100644
--- a/sci-libs/pfft/pfft-1.0_alpha1.ebuild
+++ b/sci-libs/pfft/pfft-1.0_alpha2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI=4
 
-inherit autotools eutils
+inherit autotools-utils eutils flag-o-matic fortran-2
 
 DESCRIPTION="Parallel 3d FFT"
 HOMEPAGE="http://www-user.tu-chemnitz.de/~mpip/software.php"
@@ -13,24 +13,28 @@ SRC_URI="http://www-user.tu-chemnitz.de/~mpip/software/${P//_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE="static-libs"
+IUSE="static-libs test"
 
 RDEPEND="
-	=sci-libs/fftw-3.3*[mpi]
-	virtual/mpi"
-DEPEND="${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 "cp of ${i} failed"
+		cp "${FILESDIR}"/"${PF//_}"-"${i}" "${i}" || die
 	done
 
-	eautoreconf
-}
+	append-cppflags "-I${EROOT}/usr/include"
 
-src_configure() {
-	econf --disable-la-files "$(use_enable static-libs static)"
+	eautoreconf
 }