Install pc files for threads

Package-Manager: portage-2.2.0_alpha6/cvs/Linux x86_64

4 files changed, 161 insertions, 2 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 67d771b935ac..5e8bcf0e2b17 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.105 2010/11/03 07:02:32 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.106 2010/12/02 21:50:49 jlec Exp $
+
+*fftw-3.2.2-r1 (02 Dec 2010)
+
+  02 Dec 2010; Justin Lecher <jlec@gentoo.org> +fftw-3.2.2-r1.ebuild,
+  +files/fftw-3.2.2-pc-threads.patch:
+  Install pc files for threads
 
 *fftw-2.1.5-r7 (03 Nov 2010)
 
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 8be0b0266558..094a245691b9 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -1,13 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX fftw-2.1.5-as-needed.patch 4374 RMD160 b9bc387a322cec9d36d7d7ff54e556e907767742 SHA1 3274a914d3532190fb8c2c96d944c85b5ab47237 SHA256 b1d65b2dca62257db5c78e81577fb87b7d79f6eb75b8899de48faabfc702e9f0
 AUX fftw-2.1.5-cc.patch 546 RMD160 55dc73f7191330c0c580edc58e754963afd0d181 SHA1 c2faf5d00139e0904e1b61b9491f3e8430f151cc SHA256 52b2ba8a140e46e9a1f1c71d8e85faaac70e6d783ba8e45f4423ba6f70f04dbe
 AUX fftw-2.1.5-configure.in.patch 8208 RMD160 a1b764dcee85ce7c70b4145feb7c19c82f820562 SHA1 0cddf5f0a3aa6ac196b9ebb9e2af9a9f3202d391 SHA256 67a153b67cd8aef3fedd92da09185063ac0cb17d63f1a06c5f480873e037d6cd
 AUX fftw-2.1.5-no-test.patch 1247 RMD160 deeb232de9301eaf6363b3ae86fa2e940bd46018 SHA1 271d92082832b522a9abad89652c9ccf1167964f SHA256 9a6cad5e81b4a68ef6c8e137a189ffad462cbbea4850211969417b03768eede1
 AUX fftw-3.2.1-as-needed.patch 3184 RMD160 fe4e353851780d1520cfa95cd4403ec7045d9c73 SHA1 c831f88d297579f6feed13a726184dea7f2362f8 SHA256 c70c4544a060f134d88930019562b4b4f413382e33b373e8389036be6aefb91c
+AUX fftw-3.2.2-pc-threads.patch 650 RMD160 3d0bb0caa62d29e2d0e8b5cff9c126276b537f81 SHA1 dd960030a8e49b87fc94c80cc541068c8b9466dd SHA256 26a442c168324623a60d1fc986f9c70ddf2d66d91e5d4a620ded1982bd22a593
 DIST fftw-2.1.5.tar.gz 1256888 RMD160 723308722d76c12710db6473979adf8d086b0909 SHA1 12020b58edc1b0490a83db4aa912fac5dfdfb26b SHA256 f8057fae1c7df8b99116783ef3e94a6a44518d49c72e2e630c24b689c6022630
 DIST fftw-3.2.2.tar.gz 3495117 RMD160 27af9b97072fa3a41b91b9430d093f671a1cd359 SHA1 d43b799eedfb9408f62f9f056f5e8a645618467b SHA256 6aa7ae65ee49eb99004f15899f9bb77f54759122f1a350041e81e096157d768f
 EBUILD fftw-2.1.5-r5.ebuild 3826 RMD160 3348225ac8f5dd9b4d056b69746912a3f0f926e7 SHA1 21d67ff376abbbdca4cdeec4bd97f8de62f67103 SHA256 73dd0e71e3fa40e6ac065a0833d68abe84a3eae36f330a1aa53667b346c9f9b1
 EBUILD fftw-2.1.5-r6.ebuild 3916 RMD160 2549d62e7ac2ada8a805f3c93fb85695081fbdb0 SHA1 47fa223825248081c747d1fa835112b787ac0a75 SHA256 b9b437d2a44b904a4ec4f69d8e2adf81b3d674b1c843e6a2c17bada0c4bca641
 EBUILD fftw-2.1.5-r7.ebuild 4006 RMD160 9ab79abf78dbef3f064a397e6d433f64b4f4759d SHA1 a57614cbfbb85ae8af46c2bf35638e0a95120789 SHA256 e5c99e669f476d586c8d16a4c791dfcbee951736976efbc10bee86f05135f318
+EBUILD fftw-3.2.2-r1.ebuild 3598 RMD160 4ff36f2502f9341f3a68c14f195dd4a5bb8f816e SHA1 d66cabc7c4372a7fcd5e2718255fa3ac3badf08b SHA256 a5601eac7e49514fa167ad6bd4f32c7bdc62a5955a8d63ccca773b109005c970
 EBUILD fftw-3.2.2.ebuild 3685 RMD160 db06629f8b5fc82a6bdc04cadf6ec394ecd9fbae SHA1 7303b2c50ae2d9c20eb82891b59c3096cf4958ad SHA256 cb2c19e17fbe422769f43ca631708361c438f22f532bdda1639802fc9c0627e8
-MISC ChangeLog 20118 RMD160 b326771e89f17d4f9b29428577427eb7bd3f5f46 SHA1 4030b76b91ea837155d219635f64401b41d08a2e SHA256 f4b70dc8d742b771044a6df27592fd357a495f9c77e213593deac09620ebc205
+MISC ChangeLog 20289 RMD160 c9126484626959b8c2436c90d609c31908cfb825 SHA1 64f8427a8ca5c841b3510f64159832e157a99d7b SHA256 e1c9c40d3e876c6cc19ff428581c6d6df1298f5752d30c5801e25a7a9dff4954
 MISC metadata.xml 770 RMD160 ca19408a763b8f3db20849456d67c3027cfdba5e SHA1 8c6d41e762d4cc86eaaeee10a2fc9c4743e0e828 SHA256 129a4af8bed71473f17cf323cb11763e09cf9b63eaa764643a1412c649a8c0bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkz4FL8ACgkQgAnW8HDreRZPIgCcDlwyZVIWC+cmR6FQzCwUFtSU
+I8MAoL1OcALymSrfrECkLOnbM3GEdECG
+=rzsA
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/fftw/fftw-3.2.2-r1.ebuild b/sci-libs/fftw/fftw-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..db0fe04b6fbb
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.2.2-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.2.2-r1.ebuild,v 1.1 2010/12/02 21:50:49 jlec Exp $
+
+EAPI=2
+
+inherit autotools eutils flag-o-matic toolchain-funcs
+
+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 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="altivec doc fortran openmp sse sse2 threads"
+
+pkg_setup() {
+	FFTW_THREADS="--disable-threads --disable-openmp"
+	if use openmp; then
+		FFTW_THREADS="--disable-threads --enable-openmp"
+	elif use threads; then
+		FFTW_THREADS="--enable-threads --disable-openmp"
+	fi
+	if use openmp && ! tc-has-openmp; then
+		ewarn "You are using gcc and OpenMP is only available with gcc >= 4.2 "
+		ewarn "If you want to build fftw with OpenMP, abort now,"
+		ewarn "and switch CC to an OpenMP capable compiler"
+		ewarn "Otherwise, we will build using POSIX threads."
+		epause 5
+		FFTW_THREADS="--enable-threads --disable-openmp"
+	fi
+	FFTW_DIRS="single double longdouble"
+	use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
+}
+
+src_prepare() {
+	use threads && epatch "${FILESDIR}"/${P}-pc-threads.patch
+	epatch "${FILESDIR}"/${PN}-3.2.1-as-needed.patch
+
+	# 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
+	for x in ${FFTW_DIRS}; do
+		mkdir "${S}-${x}" || die
+	done
+}
+
+src_configure() {
+	# filter -Os according to docs
+	replace-flags -Os -O2
+
+	local myconfcommon="--enable-shared
+		$(use_enable fortran)
+		${FFTW_THREADS}"
+
+	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 singles, not doubles
+	if use altivec; then
+		myconfsingle="${myconfsingle} --enable-altivec"
+	fi
+
+	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 () {
+	# 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"
+	#		${testbase} -${p}d || die "Failure: $n"
+	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 x in ${FFTW_DIRS}; do
+		cd "${S}-${x}"
+		emake DESTDIR="${D}" install || die "emake install for ${x} failed"
+	done
+
+	cd "${S}"
+	dodoc AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS
+	if use doc; then
+		cd doc
+		insinto /usr/share/doc/${PF}
+		doins -r html fftw3.pdf || die "doc install failed"
+		insinto /usr/share/doc/${PF}/faq
+		doins FAQ/fftw-faq.html/*
+	fi
+}
diff --git a/sci-libs/fftw/files/fftw-3.2.2-pc-threads.patch b/sci-libs/fftw/files/fftw-3.2.2-pc-threads.patch
new file mode 100644
index 000000000000..d3fe6aa47260
--- /dev/null
+++ b/sci-libs/fftw/files/fftw-3.2.2-pc-threads.patch
@@ -0,0 +1,19 @@
+diff --git a/Makefile.am b/Makefile.am
+index 0231ab8..2e26035 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -61,9 +61,12 @@ libfftw3@PREC_SUFFIX@_la_LDFLAGS = -no-undefined -version-info	\
+ 
+ fftw3@PREC_SUFFIX@.pc: fftw.pc
+ 	cp -f fftw.pc fftw3@PREC_SUFFIX@.pc
++fftw3@PREC_SUFFIX@_threads.pc: fftw.pc
++	cp -f fftw.pc fftw3@PREC_SUFFIX@_threads.pc
++	sed 's|-lfftw3@PREC_SUFFIX@|-lfftw3@PREC_SUFFIX@_threads|g' \
++	-i fftw3@PREC_SUFFIX@_threads.pc
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = fftw3@PREC_SUFFIX@.pc
+-
++pkgconfig_DATA = fftw3@PREC_SUFFIX@.pc fftw3@PREC_SUFFIX@_threads.pc
+ WISDOM_DIR = /etc/fftw
+ WISDOM = wisdom@PREC_SUFFIX@
+