[sci-libs/pfft] added --disable-la-files option

(Portage version: 2.1.8.3/git/Linux i686)
 (Signed Manifest commit)

6 files changed, 44 insertions, 12 deletions

diff --git a/sci-libs/pfft/ChangeLog b/sci-libs/pfft/ChangeLog
index ec6d34c49..0de13e649 100644
--- a/sci-libs/pfft/ChangeLog
+++ b/sci-libs/pfft/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  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>
diff --git a/sci-libs/pfft/Manifest b/sci-libs/pfft/Manifest
index 3778a1480..ee4d1d5b7 100644
--- a/sci-libs/pfft/Manifest
+++ b/sci-libs/pfft/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pfft-1.0alpha1-Makefile.am 450 RMD160 67a78c31b56207483779b778eda00394a22899f5 SHA1 8c23087a636e0ed2e54476c4e1afe06c557def8c SHA256 e57952f5d18a821ad25280719b3acf46e444a5273c7f5a0c34f8166570936400
-AUX pfft-1.0alpha1-configure.ac 945 RMD160 496e839b79f34d615c76a5b3d319bd915167cc4a SHA1 6cacbd28b4049551d515e22714def6c2504f5e0c SHA256 8d12bd1b0de5e6b3b28be26c25536ca2f38c1773d2b9df0dad8fee56abc00552
+AUX pfft-1.0alpha1-Makefile.am 594 RMD160 52dd29a74c0449e08e3a0ed901b20d0ee1dfa1db SHA1 269519e0fe6927ed007bfee92f384399f847f440 SHA256 acbfe46b4edd4077654dcbcea6cac879826f00f134ffbf086eafd5fad983162a
+AUX pfft-1.0alpha1-configure.ac 1166 RMD160 44e2c18eb5cd41c51c263ede72cb2e6e10b5dbc7 SHA1 a805dee3a82968fd453ae3c8845fec34256398a7 SHA256 bde312db82ab7f4c90f73749baef4affbf3b69650feb78e9f23fff25c131dfaf
+AUX pfft-1.0alpha1-libpfft.pc.in 286 RMD160 06fae27f51eda49d3fb5d51b3871080a192dcd49 SHA1 dd61a3fab7df5901f608c8d836b551dbf27955ac SHA256 596058e43e945bbc06752161dbd94ed11b2e2b3b751fbd43fd0c5da705a0625d
 DIST pfft-1.0alpha1.tar.gz 29635 RMD160 b17066560d267f2b58a7b10a7db47c8c72e5c545 SHA1 bdd35a2dae1e1a1d9177f1e5a238fe6ce38f4b64 SHA256 83e201717506e0857bb4c6f986a6b9e98ea418d05454a34914175e61d0b3b395
-EBUILD pfft-1.0_alpha1.ebuild 912 RMD160 270ab16e4e035368a6f69eda24ead0a510d416be SHA1 cdaf3fc9c9479a53a6e46de04f0c3f6319068506 SHA256 d38f3c27d8d3a00f922fada4a13e298afc0fca4d6c07f49813a8b733c1020e81
-MISC ChangeLog 351 RMD160 099d1f7d4206944c2a425bc736a08ca882e20a42 SHA1 8448ccf54981c9cdf868b68e15bf91539e92aa9e SHA256 12853fc732d2db399751a6d5bb699bac24594d21a1f1bace8b96575d2493a4f4
+EBUILD pfft-1.0_alpha1.ebuild 912 RMD160 6c69c58da70f499dc5e6ab040c56f98e2f80a1d1 SHA1 ff0a79dab2d6092d8127b978f76d25e2a2c678e1 SHA256 3397c2779b86e9c81ded4264658bd8537c39a2f7402b82509be02aa98e369509
+MISC ChangeLog 576 RMD160 1dfeab5d7166efa32d85943ee00a333fb949a59a SHA1 f2870e245178acb697bdfc9b311ee4d20723d940 SHA256 77253e68892931283d2df888295e171169049be95681a88a70d2e4528deea670
 MISC metadata.xml 256 RMD160 53a5d04f6246118e052c9cae27b7070de9b88529 SHA1 563e3277f01cc3bf484d46a6da50719855a5a689 SHA256 e683c0d7d2051297085cdbb7444ce887044c7ed0ba02cf04be170cdf62919c74
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyNIuoACgkQy0OE/ans1/ncwwCfULjVCIa1jnj30TplUfKWCwoN
-rtkAnR3jVGYss2D7wcGCC7OBullYEjdv
-=Wxfd
+iEYEARECAAYFAkyRGdwACgkQy0OE/ans1/mR0gCePuhvT1g7i/lYsp+qoQzIMOgk
+jygAoIAK9GPnmzee5w420gUXc5d+7vfN
+=c/mF
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am b/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am
index f3fe64851..25516948d 100644
--- a/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am
+++ b/sci-libs/pfft/files/pfft-1.0alpha1-Makefile.am
@@ -15,3 +15,12 @@ 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.0alpha1-configure.ac b/sci-libs/pfft/files/pfft-1.0alpha1-configure.ac
index 74fa6c68a..99554133e 100644
--- a/sci-libs/pfft/files/pfft-1.0alpha1-configure.ac
+++ b/sci-libs/pfft/files/pfft-1.0alpha1-configure.ac
@@ -10,6 +10,12 @@ 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
@@ -35,4 +41,5 @@ AC_CHECK_TYPES([ptrdiff_t])
 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.0alpha1-libpfft.pc.in b/sci-libs/pfft/files/pfft-1.0alpha1-libpfft.pc.in
new file mode 100644
index 000000000..f2c7f90ba
--- /dev/null
+++ b/sci-libs/pfft/files/pfft-1.0alpha1-libpfft.pc.in
@@ -0,0 +1,13 @@
+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/pfft-1.0_alpha1.ebuild b/sci-libs/pfft/pfft-1.0_alpha1.ebuild
index 46dc07535..a8f94c5ab 100644
--- a/sci-libs/pfft/pfft-1.0_alpha1.ebuild
+++ b/sci-libs/pfft/pfft-1.0_alpha1.ebuild
@@ -24,7 +24,7 @@ S="${WORKDIR}/${P//_}"
 
 src_prepare() {
 	local i
-	for i in Makefile.am configure.ac; do
+	for i in Makefile.am configure.ac libpfft.pc.in; do
 		cp "${FILESDIR}"/"${PF//_}"-"${i}" "${i}" || die "cp of ${i} failed"
 	done
 
@@ -32,10 +32,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
-	myconf="$(use_enable static-libs static)"
-
-	econf ${myconf} || die "econf failed"
+	econf --disable-la-files "$(use_enable static-libs static)" || die "econf failed"
 }
 
 src_compile() {