[gentoo-commits] proj/sci:master commit in: sci-libs/fftw/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2015-11-21 15:14 Christoph Junghans
  0 siblings, 0 replies; 13+ messages in thread
From: Christoph Junghans @ 2015-11-21 15:14 UTC (permalink / raw
  To: gentoo-commits

commit:     5cbb1d662a2e02a3f941b9ef180f96a42aaeb327
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 15:12:33 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Nov 21 15:12:33 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5cbb1d66

sci-libs/fftw: bye bye mpi multilib version

Package-Manager: portage-2.2.20.1

 sci-libs/fftw/ChangeLog            |   4 +
 sci-libs/fftw/fftw-3.3.4-r1.ebuild | 160 -------------------------------------
 2 files changed, 4 insertions(+), 160 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 5ef85a5..700c4e6 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Id$
 
+  21 Nov 2015; Christoph Junghans <ottxor@gentoo.org> -Manifest,
+  -fftw-3.3.4-r1.ebuild:
+  virtual/mpi: bye bye mpi multilib version
+
   13 Apr 2015; Justin Lecher <jlec@gentoo.org> fftw-3.3.4-r1.ebuild:
   sci-libs/fftw: Drop emul package support
 

diff --git a/sci-libs/fftw/fftw-3.3.4-r1.ebuild b/sci-libs/fftw/fftw-3.3.4-r1.ebuild
deleted file mode 100644
index 319b9da..0000000
--- a/sci-libs/fftw/fftw-3.3.4-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-FORTRAN_NEEDED=fortran
-
-inherit autotools-multilib eutils flag-o-matic fortran-2 multibuild toolchain-funcs versionator
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-	KEYWORDS=""
-	AUTOTOOLS_AUTORECONF=1
-else
-	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="3.0/3"
-IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
-
-RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-pkg_setup() {
-	# XXX: this looks like it should be used with BUILD_TYPE!=binary
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	# fix info file for category directory
-	[[ ${PV} = *9999 ]] || sed -i \
-		-e 's/Texinfo documentation system/Libraries/' \
-		doc/fftw3."info" || die "failed to fix info file"
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local x
-
-	# filter -Os according to docs
-	replace-flags -Os -O2
-
-	my_configure() {
-		#a bit hacky improve after #483758 is solved
-		local x=${BUILD_DIR%-*}
-		x=${x##*-}
-		# there is no abi_x86_32 port of virtual/mpi right now
-
-		#jlec reported USE=quad on abi_x86_32 has too less registers
-		#stub Makefiles
-		if [[ ${ABI} == x86 && ${x} == quad ]]; then
-			mkdir -p "${BUILD_DIR}/tests" || die
-			echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-			echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-			echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-			return 0
-		fi
-
-		local myeconfargs=(
-			$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
-			$(use_enable fortran)
-			$(use_enable zbus mips-zbus-timer)
-			$(use_enable threads)
-			$(use_enable openmp)
-		)
-		if [[ $x == single ]]; then
-			#altivec, sse, single-paired only work for single
-			myeconfargs+=(
-				--enable-single
-				$(use_enable altivec)
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_sse sse)
-				$(use_enable mpi)
-				$(use_enable neon)
-			)
-		elif [[ $x == double ]]; then
-			myeconfargs+=(
-				$(use_enable cpu_flags_x86_avx avx)
-				$(use_enable cpu_flags_x86_sse2 sse2)
-				$(use_enable mpi)
-			)
-		elif [[ $x == longdouble ]]; then
-			myeconfargs+=(
-				--enable-long-double
-				$(use_enable mpi)
-				)
-		elif [[ $x == quad ]]; then
-			#quad does not support mpi
-			myeconfargs+=( --enable-quad-precision )
-		else
-			die "${x} precision not implemented in this ebuild"
-		fi
-
-		autotools-utils_src_configure MPICC="$(tc-getCC -lmpi)"
-	}
-
-	multibuild_foreach_variant multilib_parallel_foreach_abi my_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant autotools-multilib_src_compile
-}
-
-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"
-	multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck
-}
-
-src_install () {
-	local u x
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
-	multibuild_foreach_variant multilib_foreach_abi autotools-utils_src_install
-
-	if use doc; then
-		dodoc doc/*.pdf
-		insinto /usr/share/doc/${PF}/faq
-		doins -r doc/FAQ/fftw-faq.html/*
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/html
-	fi
-
-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die
-		done
-	done
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2015-04-13  6:34 Justin Lecher
  0 siblings, 0 replies; 13+ messages in thread
From: Justin Lecher @ 2015-04-13  6:34 UTC (permalink / raw
  To: gentoo-commits

commit:     7c63156b2e6ba1dd83c55b622c0f509a16074178
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 06:33:11 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 06:33:11 2015 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=7c63156b

sci-libs/fftw: Drop emul package support

Package-Manager: portage-2.2.18

 sci-libs/fftw/ChangeLog            | 3 +++
 sci-libs/fftw/fftw-3.3.4-r1.ebuild | 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 0504f2f..918dd73 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  13 Apr 2015; Justin Lecher <jlec@gentoo.org> fftw-3.3.4-r1.ebuild:
+  sci-libs/fftw: Drop emul package support
+
   19 Feb 2015; Christoph Junghans <ottxor@gentoo.org> fftw-3.3.4-r1.ebuild:
   dropped sparc
 

diff --git a/sci-libs/fftw/fftw-3.3.4-r1.ebuild b/sci-libs/fftw/fftw-3.3.4-r1.ebuild
index 071fd45..973b846 100644
--- a/sci-libs/fftw/fftw-3.3.4-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.4-r1.ebuild
@@ -26,9 +26,7 @@ SLOT="3.0/3"
 IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
 
 RDEPEND="
-	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2015-02-19 21:12 Christoph Junghans
  0 siblings, 0 replies; 13+ messages in thread
From: Christoph Junghans @ 2015-02-19 21:12 UTC (permalink / raw
  To: gentoo-commits

commit:     a842211203c53c17c5dbe03cdd1ba5696040f6f8
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 19 21:10:05 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Thu Feb 19 21:10:05 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a8422112

dropped sparc

Package-Manager: portage-2.2.14

---
 sci-libs/fftw/ChangeLog            | 3 +++
 sci-libs/fftw/fftw-3.3.4-r1.ebuild | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 971318c..0504f2f 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  19 Feb 2015; Christoph Junghans <ottxor@gentoo.org> fftw-3.3.4-r1.ebuild:
+  dropped sparc
+
 *fftw-3.3.4-r1 (17 Feb 2015)
 
   17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +fftw-3.3.4-r1.ebuild:

diff --git a/sci-libs/fftw/fftw-3.3.4-r1.ebuild b/sci-libs/fftw/fftw-3.3.4-r1.ebuild
index cd36caa..071fd45 100644
--- a/sci-libs/fftw/fftw-3.3.4-r1.ebuild
+++ b/sci-libs/fftw/fftw-3.3.4-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} = *9999 ]]; then
 	AUTOTOOLS_AUTORECONF=1
 else
 	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
 LICENSE="GPL-2"


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2015-02-17  0:13 Christoph Junghans
  0 siblings, 0 replies; 13+ messages in thread
From: Christoph Junghans @ 2015-02-17  0:13 UTC (permalink / raw
  To: gentoo-commits

commit:     fe437b145d974151440f213cdb5029ac8af8244d
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 17 00:13:07 2015 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Feb 17 00:13:07 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=fe437b14

added full multilib version

Package-Manager: portage-2.2.14

---
 sci-libs/fftw/ChangeLog            |   5 ++
 sci-libs/fftw/fftw-3.3.4-r1.ebuild | 162 +++++++++++++++++++++++++++++++++++++
 2 files changed, 167 insertions(+)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index cae3ff9..971318c 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*fftw-3.3.4-r1 (17 Feb 2015)
+
+  17 Feb 2015; Christoph Junghans <ottxor@gentoo.org> +fftw-3.3.4-r1.ebuild:
+  added full multilib version
+
   29 Jan 2015; Marius Brehler <marbre@linux.sungazer.de> fftw-9999.ebuild,
   metadata.xml:
   Convert to CPU_FLAGS_X86 (adopted from tree)

diff --git a/sci-libs/fftw/fftw-3.3.4-r1.ebuild b/sci-libs/fftw/fftw-3.3.4-r1.ebuild
new file mode 100644
index 0000000..cd36caa
--- /dev/null
+++ b/sci-libs/fftw/fftw-3.3.4-r1.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.7 2015/02/08 06:33:37 jer Exp $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit autotools-multilib eutils flag-o-matic fortran-2 multibuild toolchain-funcs versionator
+
+DESCRIPTION="Fast C library for the Discrete Fourier Transform"
+HOMEPAGE="http://www.fftw.org/"
+
+if [[ ${PV} = *9999 ]]; then
+	inherit git-2
+	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
+	KEYWORDS=""
+	AUTOTOOLS_AUTORECONF=1
+else
+	SRC_URI="http://www.fftw.org/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+fi
+
+LICENSE="GPL-2"
+SLOT="3.0/3"
+IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
+
+RDEPEND="
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
+					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	test? ( dev-lang/perl )"
+
+pkg_setup() {
+	# XXX: this looks like it should be used with BUILD_TYPE!=binary
+	if use openmp; then
+		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
+			ewarn "OpenMP is not available in your current selected gcc"
+			die "need openmp capable gcc"
+		fi
+		FORTRAN_NEED_OPENMP=1
+	fi
+
+	fortran-2_pkg_setup
+
+	MULTIBUILD_VARIANTS=( single double longdouble )
+	if use quad; then
+		if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then
+			ewarn "quad precision only available for gcc >= 4.6"
+			die "need quad precision capable gcc"
+		fi
+		MULTIBUILD_VARIANTS+=( quad )
+	fi
+}
+
+src_prepare() {
+	# fix info file for category directory
+	[[ ${PV} = *9999 ]] || sed -i \
+		-e 's/Texinfo documentation system/Libraries/' \
+		doc/fftw3."info" || die "failed to fix info file"
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local x
+
+	# filter -Os according to docs
+	replace-flags -Os -O2
+
+	my_configure() {
+		#a bit hacky improve after #483758 is solved
+		local x=${BUILD_DIR%-*}
+		x=${x##*-}
+		# there is no abi_x86_32 port of virtual/mpi right now
+
+		#jlec reported USE=quad on abi_x86_32 has too less registers
+		#stub Makefiles
+		if [[ ${ABI} == x86 && ${x} == quad ]]; then
+			mkdir -p "${BUILD_DIR}/tests" || die
+			echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+			echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+			echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+			return 0
+		fi
+
+		local myeconfargs=(
+			$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
+			$(use_enable fortran)
+			$(use_enable zbus mips-zbus-timer)
+			$(use_enable threads)
+			$(use_enable openmp)
+		)
+		if [[ $x == single ]]; then
+			#altivec, sse, single-paired only work for single
+			myeconfargs+=(
+				--enable-single
+				$(use_enable altivec)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_sse sse)
+				$(use_enable mpi)
+				$(use_enable neon)
+			)
+		elif [[ $x == double ]]; then
+			myeconfargs+=(
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_sse2 sse2)
+				$(use_enable mpi)
+			)
+		elif [[ $x == longdouble ]]; then
+			myeconfargs+=(
+				--enable-long-double
+				$(use_enable mpi)
+				)
+		elif [[ $x == quad ]]; then
+			#quad does not support mpi
+			myeconfargs+=( --enable-quad-precision )
+		else
+			die "${x} precision not implemented in this ebuild"
+		fi
+
+		autotools-utils_src_configure MPICC="$(tc-getCC -lmpi)"
+	}
+
+	multibuild_foreach_variant multilib_parallel_foreach_abi my_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant autotools-multilib_src_compile
+}
+
+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"
+	multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck
+}
+
+src_install () {
+	local u x
+	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
+	HTML_DOCS=( doc/html/ )
+
+	multibuild_foreach_variant multilib_foreach_abi autotools-utils_src_install
+
+	if use doc; then
+		dodoc doc/*.pdf
+		insinto /usr/share/doc/${PF}/faq
+		doins -r doc/FAQ/fftw-faq.html/*
+	else
+		rm -r "${ED}"/usr/share/doc/${PF}/html
+	fi
+
+	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
+			sed -e "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die
+		done
+	done
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2015-02-02 12:06 Justin Lecher
  0 siblings, 0 replies; 13+ messages in thread
From: Justin Lecher @ 2015-02-02 12:06 UTC (permalink / raw
  To: gentoo-commits

commit:     c555a18358d85d307fae9f4f0b13ef2d9b8376b5
Author:     Marius Brehler <marbre <AT> linux <DOT> sungazer <DOT> de>
AuthorDate: Sun Feb  1 12:28:19 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sun Feb  1 12:28:19 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=c555a183

sci-libs/fftw: Convert to CPU_FLAGS_X86

---
 sci-libs/fftw/ChangeLog        |  6 +++++-
 sci-libs/fftw/fftw-9999.ebuild | 14 +++++++-------
 sci-libs/fftw/metadata.xml     |  2 --
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index cedc57e..cae3ff9 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-libs/fftw
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  29 Jan 2015; Marius Brehler <marbre@linux.sungazer.de> fftw-9999.ebuild,
+  metadata.xml:
+  Convert to CPU_FLAGS_X86 (adopted from tree)
+
   04 Jul 2014; Justin Lecher <jlec@gentoo.org> fftw-9999.ebuild:
   Drop reference to app-emulation/emul-linux-x86-soundlibs
 

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 1b02b62..78a157e 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -24,7 +24,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="3.0"
-IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
+IUSE="altivec cpu_flags_x86_avx doc cpu_flags_x86_fma3 cpu_flags_x86_fma4 fortran mpi neon openmp quad cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs test threads zbus"
 
 RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
@@ -95,7 +95,7 @@ src_configure() {
 		fi
 
 		myeconfargs=(
-			$(use_enable fma)
+			$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 			$(use_enable fortran)
 			$(use_enable zbus mips-zbus-timer)
 			$(use_enable threads)
@@ -106,15 +106,15 @@ src_configure() {
 			myeconfargs+=(
 				--enable-single
 				$(use_enable altivec)
-				$(use_enable avx)
-				$(use_enable sse)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_sse sse)
 				${enable_mpi}
 				$(use_enable neon)
 			)
 		elif [[ $x == double ]]; then
 			myeconfargs+=(
-				$(use_enable avx)
-				$(use_enable sse2)
+				$(use_enable cpu_flags_x86_avx avx)
+				$(use_enable cpu_flags_x86_sse2 sse2)
 				${enable_mpi}
 			)
 		elif [[ $x == longdouble ]]; then

diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
index 50e74c1..c6b1bd0 100644
--- a/sci-libs/fftw/metadata.xml
+++ b/sci-libs/fftw/metadata.xml
@@ -12,8 +12,6 @@
   publicly available FFT software.
 </longdescription>
   <use>
-    <flag name="avx">Adds support for Advanced Vector Extensions</flag>
-    <flag name="fma">Use the Fused Multiply Add instruction set (fma3/fma4 either one)</flag>
     <flag name="quad">Build quadruple precision lib</flag>
     <flag name="zbus">Adds support for ZBus cycle-counter of mips</flag>
   </use>


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2014-07-04  7:10 Justin Lecher
  0 siblings, 0 replies; 13+ messages in thread
From: Justin Lecher @ 2014-07-04  7:10 UTC (permalink / raw
  To: gentoo-commits

commit:     835c77a0b634b31e01c792c6a1e0c18011789fe6
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jul  4 06:39:08 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jul  4 06:39:08 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=835c77a0

sci-libs/fftw: Drop reference to app-emulation/emul-linux-x86-soundlibs

Package-Manager: portage-2.2.10

---
 sci-libs/fftw/ChangeLog        | 3 +++
 sci-libs/fftw/fftw-9999.ebuild | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index c22b85c..cedc57e 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jul 2014; Justin Lecher <jlec@gentoo.org> fftw-9999.ebuild:
+  Drop reference to app-emulation/emul-linux-x86-soundlibs
+
   06 Jan 2014; Justin Lecher <jlec@gentoo.org> fftw-9999.ebuild:
   Switch from git-2 to git-r3
 

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 891b6a1..1b02b62 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -26,10 +26,7 @@ LICENSE="GPL-2"
 SLOT="3.0"
 IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
 
-RDEPEND="
-	mpi? ( virtual/mpi )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
+RDEPEND="mpi? ( virtual/mpi )"
 DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2014-01-06 18:33 Justin Lecher
  0 siblings, 0 replies; 13+ messages in thread
From: Justin Lecher @ 2014-01-06 18:33 UTC (permalink / raw
  To: gentoo-commits

commit:     182ffee039521922548d1f0d4ccd570630d3e21d
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 18:29:52 2014 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 18:29:52 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=182ffee0

sci-libs/fftw: Switch from git-2 to git-r3

Package-Manager: portage-2.2.8

---
 sci-libs/fftw/ChangeLog        | 5 ++++-
 sci-libs/fftw/fftw-9999.ebuild | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 45dfa9a..c22b85c 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-libs/fftw
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  06 Jan 2014; Justin Lecher <jlec@gentoo.org> fftw-9999.ebuild:
+  Switch from git-2 to git-r3
+
   17 Sep 2013; Christoph Junghans <ottxor@gentoo.org> -Manifest,
   -fftw-3.3.3-r3.ebuild:
   moved to gx86

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index fb35995..b7862ac 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.3 2013/06/27 14:30:29 aballier Exp $
 
@@ -13,7 +13,7 @@ DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
 
 if [[ ${PV} = *9999 ]]; then
-	inherit git-2
+	inherit git-r3
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 	KEYWORDS=""
 	AUTOTOOLS_AUTORECONF=1


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2013-09-17 19:13 Christoph Junghans
  0 siblings, 0 replies; 13+ messages in thread
From: Christoph Junghans @ 2013-09-17 19:13 UTC (permalink / raw
  To: gentoo-commits

commit:     ada0b642cc563d7384b3df8eb2aeb7be4ec0eeb0
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 19:13:05 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 19:13:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=ada0b642

moved to gx86

Package-Manager: portage-2.2.1

---
 sci-libs/fftw/ChangeLog            |   4 +
 sci-libs/fftw/fftw-3.3.3-r3.ebuild | 187 -------------------------------------
 2 files changed, 4 insertions(+), 187 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 5bac252..45dfa9a 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  17 Sep 2013; Christoph Junghans <ottxor@gentoo.org> -Manifest,
+  -fftw-3.3.3-r3.ebuild:
+  moved to gx86
+
   07 Sep 2013; Christoph Junghans <ottxor@gentoo.org> fftw-3.3.3-r3.ebuild,
   fftw-9999.ebuild:
   final clean up

diff --git a/sci-libs/fftw/fftw-3.3.3-r3.ebuild b/sci-libs/fftw/fftw-3.3.3-r3.ebuild
deleted file mode 100644
index fb35995..0000000
--- a/sci-libs/fftw/fftw-3.3.3-r3.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.3-r2.ebuild,v 1.3 2013/06/27 14:30:29 aballier Exp $
-
-EAPI=5
-
-#AUTOTOOLS_AUTORECONF=1
-FORTRAN_NEEDED=fortran
-
-inherit autotools-multilib eutils flag-o-matic fortran-2 multibuild toolchain-funcs versionator
-
-DESCRIPTION="Fast C library for the Discrete Fourier Transform"
-HOMEPAGE="http://www.fftw.org/"
-
-if [[ ${PV} = *9999 ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
-	KEYWORDS=""
-	AUTOTOOLS_AUTORECONF=1
-else
-	SRC_URI="http://www.fftw.org/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-fi
-
-LICENSE="GPL-2"
-SLOT="3.0"
-IUSE="altivec avx doc fma fortran mpi neon openmp quad sse sse2 static-libs test threads zbus"
-
-RDEPEND="
-	mpi? ( virtual/mpi )
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-soundlibs-20130224-r2
-					!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	test? ( dev-lang/perl )"
-
-#can go once mpi is multlib
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/fftw3-mpi.h
-	/usr/include/fftw3l-mpi.f03
-	/usr/include/fftw3-mpi.f03
-	/usr/include/fftw3q.f03
-)
-
-pkg_setup() {
-	# XXX: this looks like it should be used with BUILD_TYPE!=binary
-
-	if use openmp; then
-		if [[ $(tc-getCC) == *gcc ]] && ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected gcc"
-			die "need openmp capable gcc"
-		fi
-		FORTRAN_NEED_OPENMP=1
-	fi
-
-	fortran-2_pkg_setup
-
-	MULTIBUILD_VARIANTS=( single double longdouble )
-	if use quad; then
-		if [[ $(tc-getCC) == *gcc ]] && ! version_is_at_least 4.6 $(gcc-version); then
-			ewarn "quad precision only available for gcc >= 4.6"
-			die "need quad precision capable gcc"
-		fi
-		MULTIBUILD_VARIANTS+=( quad )
-	fi
-}
-
-src_prepare() {
-	# fix info file for category directory
-	[[ ${PV} = *9999 ]] || sed -i \
-		-e 's/Texinfo documentation system/Libraries/' \
-		doc/fftw3."info" || die "failed to fix info file"
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local x
-
-	# filter -Os according to docs
-	replace-flags -Os -O2
-
-	my_configure() {
-		#a bit hacky improve after #483758 is solved
-		local x=${BUILD_DIR%-${ABI}}
-		x=${x##*-}
-		# there is no abi_x86_32 port of virtual/mpi right now
-		local enable_mpi=$(use_enable mpi)
-		multilib_is_native_abi || enable_mpi="--disable-mpi"
-
-		#jlec reported USE=quad on abi_x86_32 has too less registers
-		#stub Makefiles
-		if use amd64 && ! multilib_is_native_abi && [[ $x = quad ]]; then
-			mkdir -p "${BUILD_DIR}/tests" || die
-			echo "all: ;" > "${BUILD_DIR}/Makefile" || die
-			echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
-			echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
-			return 0
-		fi
-
-		myeconfargs=(
-			$(use_enable fma)
-			$(use_enable fortran)
-			$(use_enable zbus mips-zbus-timer)
-			$(use_enable threads)
-			$(use_enable openmp)
-		)
-		if [[ $x == single ]]; then
-			#altivec, sse, single-paired only work for single
-			myeconfargs+=(
-				--enable-single
-				$(use_enable altivec)
-				$(use_enable avx)
-				$(use_enable sse)
-				${enable_mpi}
-				$(use_enable neon)
-			)
-		elif [[ $x == double ]]; then
-			myeconfargs+=(
-				$(use_enable avx)
-				$(use_enable sse2)
-				${enable_mpi}
-			)
-		elif [[ $x == longdouble ]]; then
-			myeconfargs+=(
-				--enable-long-double
-				${enable_mpi}
-				)
-		elif [[ $x == quad ]]; then
-			#quad does not support mpi
-			myeconfargs+=( --enable-quad-precision )
-		else
-			die "${x} precision not implemented in this ebuild"
-		fi
-
-		autotools-utils_src_configure
-	}
-
-	multibuild_foreach_variant multilib_parallel_foreach_abi my_configure
-}
-
-src_compile() {
-	multibuild_foreach_variant autotools-multilib_src_compile
-}
-
-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"
-	multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck
-}
-
-src_install () {
-	local u x
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
-	#copied from autotools-multilib_secure_install
-	my_abi_src_install() {
-		autotools-utils_src_install
-		#https://github.com/FFTW/fftw3/pull/6
-		# f03 are installed unconditionally, not a big problem as the quad
-		# header is the only one to be wrapped.
-		[[ ${BUILD_DIR} = *-quad* ]] || rm -f "${ED}/usr/include/fftw3q.f03"
-		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-			multilib_prepare_wrappers
-			multilib_check_headers
-		fi
-	}
-	multibuild_foreach_variant multilib_foreach_abi my_abi_src_install
-	multilib_install_wrappers
-
-	if use doc; then
-		dodoc doc/*.pdf
-		insinto /usr/share/doc/${PF}/faq
-		doins -r doc/FAQ/fftw-faq.html/*
-	else
-		rm -r "${ED}"/usr/share/doc/${PF}/html
-	fi
-
-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
-		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
-			sed -e "s|-lfftw3[flq]\?|&_$u &|" "$x" > "${x%.pc}_$u.pc" || die
-		done
-	done
-}


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2013-09-07 20:19 Christoph Junghans
  0 siblings, 0 replies; 13+ messages in thread
From: Christoph Junghans @ 2013-09-07 20:19 UTC (permalink / raw
  To: gentoo-commits

commit:     10348efec41c894a27c192ed2d94233119eac89e
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  7 20:19:20 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Sat Sep  7 20:19:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=10348efe

final clean up

Package-Manager: portage-2.2.1

---
 sci-libs/fftw/ChangeLog            |  4 ++++
 sci-libs/fftw/fftw-3.3.3-r3.ebuild | 26 ++++++++++----------------
 sci-libs/fftw/fftw-9999.ebuild     | 26 ++++++++++----------------
 3 files changed, 24 insertions(+), 32 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index 1d66bfd..5bac252 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  07 Sep 2013; Christoph Junghans <ottxor@gentoo.org> fftw-3.3.3-r3.ebuild,
+  fftw-9999.ebuild:
+  final clean up
+
   02 Sep 2013; Christoph Junghans <ottxor@gentoo.org> fftw-3.3.3-r3.ebuild,
   fftw-9999.ebuild:
   clean up

diff --git a/sci-libs/fftw/fftw-3.3.3-r3.ebuild b/sci-libs/fftw/fftw-3.3.3-r3.ebuild
index c839eb5..fb35995 100644
--- a/sci-libs/fftw/fftw-3.3.3-r3.ebuild
+++ b/sci-libs/fftw/fftw-3.3.3-r3.ebuild
@@ -20,8 +20,6 @@ if [[ ${PV} = *9999 ]]; then
 else
 	SRC_URI="http://www.fftw.org/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-	PATCHES=( "${FILESDIR}/${P}-install-header.patch" )
-	AUTOTOOLS_AUTORECONF=1
 fi
 
 LICENSE="GPL-2"
@@ -40,7 +38,6 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/fftw3-mpi.h
 	/usr/include/fftw3l-mpi.f03
 	/usr/include/fftw3-mpi.f03
-	/usr/include/fftw3l.f03
 	/usr/include/fftw3q.f03
 )
 
@@ -68,12 +65,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	local ext="info"
-	[[ ${PV} = *9999 ]] && ext="texi"
 	# fix info file for category directory
-	sed -i \
+	[[ ${PV} = *9999 ]] || sed -i \
 		-e 's/Texinfo documentation system/Libraries/' \
-		doc/fftw3."${ext}" || die "failed to fix info file"
+		doc/fftw3."info" || die "failed to fix info file"
 
 	autotools-utils_src_prepare
 }
@@ -85,7 +80,9 @@ src_configure() {
 	replace-flags -Os -O2
 
 	my_configure() {
-		local x=${FFTW_PRECISION}
+		#a bit hacky improve after #483758 is solved
+		local x=${BUILD_DIR%-${ABI}}
+		x=${x##*-}
 		# there is no abi_x86_32 port of virtual/mpi right now
 		local enable_mpi=$(use_enable mpi)
 		multilib_is_native_abi || enable_mpi="--disable-mpi"
@@ -138,14 +135,7 @@ src_configure() {
 		autotools-utils_src_configure
 	}
 
-	my_abi_configure() {
-		#multilib_parallel_foreach_abi changes MULTIBUILD_VARIANT
-		export FFTW_PRECISION=${MULTIBUILD_VARIANT}
-		multilib_parallel_foreach_abi my_configure
-		unset FFTW_PRECISION
-	}
-
-	multibuild_foreach_variant my_abi_configure
+	multibuild_foreach_variant multilib_parallel_foreach_abi my_configure
 }
 
 src_compile() {
@@ -169,6 +159,10 @@ src_install () {
 	#copied from autotools-multilib_secure_install
 	my_abi_src_install() {
 		autotools-utils_src_install
+		#https://github.com/FFTW/fftw3/pull/6
+		# f03 are installed unconditionally, not a big problem as the quad
+		# header is the only one to be wrapped.
+		[[ ${BUILD_DIR} = *-quad* ]] || rm -f "${ED}/usr/include/fftw3q.f03"
 		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
 			multilib_prepare_wrappers
 			multilib_check_headers

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index c839eb5..fb35995 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -20,8 +20,6 @@ if [[ ${PV} = *9999 ]]; then
 else
 	SRC_URI="http://www.fftw.org/${P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-	PATCHES=( "${FILESDIR}/${P}-install-header.patch" )
-	AUTOTOOLS_AUTORECONF=1
 fi
 
 LICENSE="GPL-2"
@@ -40,7 +38,6 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/fftw3-mpi.h
 	/usr/include/fftw3l-mpi.f03
 	/usr/include/fftw3-mpi.f03
-	/usr/include/fftw3l.f03
 	/usr/include/fftw3q.f03
 )
 
@@ -68,12 +65,10 @@ pkg_setup() {
 }
 
 src_prepare() {
-	local ext="info"
-	[[ ${PV} = *9999 ]] && ext="texi"
 	# fix info file for category directory
-	sed -i \
+	[[ ${PV} = *9999 ]] || sed -i \
 		-e 's/Texinfo documentation system/Libraries/' \
-		doc/fftw3."${ext}" || die "failed to fix info file"
+		doc/fftw3."info" || die "failed to fix info file"
 
 	autotools-utils_src_prepare
 }
@@ -85,7 +80,9 @@ src_configure() {
 	replace-flags -Os -O2
 
 	my_configure() {
-		local x=${FFTW_PRECISION}
+		#a bit hacky improve after #483758 is solved
+		local x=${BUILD_DIR%-${ABI}}
+		x=${x##*-}
 		# there is no abi_x86_32 port of virtual/mpi right now
 		local enable_mpi=$(use_enable mpi)
 		multilib_is_native_abi || enable_mpi="--disable-mpi"
@@ -138,14 +135,7 @@ src_configure() {
 		autotools-utils_src_configure
 	}
 
-	my_abi_configure() {
-		#multilib_parallel_foreach_abi changes MULTIBUILD_VARIANT
-		export FFTW_PRECISION=${MULTIBUILD_VARIANT}
-		multilib_parallel_foreach_abi my_configure
-		unset FFTW_PRECISION
-	}
-
-	multibuild_foreach_variant my_abi_configure
+	multibuild_foreach_variant multilib_parallel_foreach_abi my_configure
 }
 
 src_compile() {
@@ -169,6 +159,10 @@ src_install () {
 	#copied from autotools-multilib_secure_install
 	my_abi_src_install() {
 		autotools-utils_src_install
+		#https://github.com/FFTW/fftw3/pull/6
+		# f03 are installed unconditionally, not a big problem as the quad
+		# header is the only one to be wrapped.
+		[[ ${BUILD_DIR} = *-quad* ]] || rm -f "${ED}/usr/include/fftw3q.f03"
 		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
 			multilib_prepare_wrappers
 			multilib_check_headers


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2013-09-02 19:17 Christoph Junghans
  0 siblings, 0 replies; 13+ messages in thread
From: Christoph Junghans @ 2013-09-02 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     36d95ed46734e64b54d67cde8bd3b40fe093f8e0
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  2 19:11:49 2013 +0000
Commit:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
CommitDate: Mon Sep  2 19:17:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=36d95ed4

clean up

Package-Manager: portage-2.2.1

---
 sci-libs/fftw/ChangeLog            |  4 ++++
 sci-libs/fftw/fftw-3.3.3-r3.ebuild | 38 +++++++++++++++++---------------------
 sci-libs/fftw/fftw-9999.ebuild     | 38 +++++++++++++++++---------------------
 3 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index d82a81d..1d66bfd 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  02 Sep 2013; Christoph Junghans <ottxor@gentoo.org> fftw-3.3.3-r3.ebuild,
+  fftw-9999.ebuild:
+  clean up
+
 *fftw-3.3.3-r3 (01 Sep 2013)
 *fftw-9999 (01 Sep 2013)
 

diff --git a/sci-libs/fftw/fftw-3.3.3-r3.ebuild b/sci-libs/fftw/fftw-3.3.3-r3.ebuild
index 9af7694..c839eb5 100644
--- a/sci-libs/fftw/fftw-3.3.3-r3.ebuild
+++ b/sci-libs/fftw/fftw-3.3.3-r3.ebuild
@@ -40,6 +40,7 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/fftw3-mpi.h
 	/usr/include/fftw3l-mpi.f03
 	/usr/include/fftw3-mpi.f03
+	/usr/include/fftw3l.f03
 	/usr/include/fftw3q.f03
 )
 
@@ -90,7 +91,14 @@ src_configure() {
 		multilib_is_native_abi || enable_mpi="--disable-mpi"
 
 		#jlec reported USE=quad on abi_x86_32 has too less registers
-		multilib_is_native_abi || [[ $x != quad ]] || return 0
+		#stub Makefiles
+		if use amd64 && ! multilib_is_native_abi && [[ $x = quad ]]; then
+			mkdir -p "${BUILD_DIR}/tests" || die
+			echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+			echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+			echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+			return 0
+		fi
 
 		myeconfargs=(
 			$(use_enable fma)
@@ -140,14 +148,8 @@ src_configure() {
 	multibuild_foreach_variant my_abi_configure
 }
 
-abi_has_precision() {
-	#not all abi have all precisions
-	[[ -f ${BUILD_DIR}/Makefile ]] || return 0
-	"$@"
-}
-
 src_compile() {
-	multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile
+	multibuild_foreach_variant autotools-multilib_src_compile
 }
 
 src_test () {
@@ -156,7 +158,7 @@ src_test () {
 	# 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"
-	multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile -C tests smallcheck
+	multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck
 }
 
 src_install () {
@@ -166,19 +168,13 @@ src_install () {
 
 	#copied from autotools-multilib_secure_install
 	my_abi_src_install() {
-		my_abi_secure_install() {
-			autotools-utils_src_install
-			if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-				multilib_prepare_wrappers
-				multilib_check_headers
-			fi
-		}
-
-		multilib_foreach_abi abi_has_precision my_abi_secure_install
-		#don't mix checksum	of different precisions
-		rm -f "${T}"/.multilib_header_cksum
+		autotools-utils_src_install
+		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+			multilib_prepare_wrappers
+			multilib_check_headers
+		fi
 	}
-	multibuild_foreach_variant my_abi_src_install
+	multibuild_foreach_variant multilib_foreach_abi my_abi_src_install
 	multilib_install_wrappers
 
 	if use doc; then

diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index 9af7694..c839eb5 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -40,6 +40,7 @@ MULTILIB_WRAPPED_HEADERS=(
 	/usr/include/fftw3-mpi.h
 	/usr/include/fftw3l-mpi.f03
 	/usr/include/fftw3-mpi.f03
+	/usr/include/fftw3l.f03
 	/usr/include/fftw3q.f03
 )
 
@@ -90,7 +91,14 @@ src_configure() {
 		multilib_is_native_abi || enable_mpi="--disable-mpi"
 
 		#jlec reported USE=quad on abi_x86_32 has too less registers
-		multilib_is_native_abi || [[ $x != quad ]] || return 0
+		#stub Makefiles
+		if use amd64 && ! multilib_is_native_abi && [[ $x = quad ]]; then
+			mkdir -p "${BUILD_DIR}/tests" || die
+			echo "all: ;" > "${BUILD_DIR}/Makefile" || die
+			echo "install: ;" >> "${BUILD_DIR}/Makefile" || die
+			echo "smallcheck: ;" > "${BUILD_DIR}/tests/Makefile" || die
+			return 0
+		fi
 
 		myeconfargs=(
 			$(use_enable fma)
@@ -140,14 +148,8 @@ src_configure() {
 	multibuild_foreach_variant my_abi_configure
 }
 
-abi_has_precision() {
-	#not all abi have all precisions
-	[[ -f ${BUILD_DIR}/Makefile ]] || return 0
-	"$@"
-}
-
 src_compile() {
-	multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile
+	multibuild_foreach_variant autotools-multilib_src_compile
 }
 
 src_test () {
@@ -156,7 +158,7 @@ src_test () {
 	# 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"
-	multibuild_foreach_variant multilib_foreach_abi abi_has_precision autotools-utils_src_compile -C tests smallcheck
+	multibuild_foreach_variant autotools-multilib_src_compile -C tests smallcheck
 }
 
 src_install () {
@@ -166,19 +168,13 @@ src_install () {
 
 	#copied from autotools-multilib_secure_install
 	my_abi_src_install() {
-		my_abi_secure_install() {
-			autotools-utils_src_install
-			if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
-				multilib_prepare_wrappers
-				multilib_check_headers
-			fi
-		}
-
-		multilib_foreach_abi abi_has_precision my_abi_secure_install
-		#don't mix checksum	of different precisions
-		rm -f "${T}"/.multilib_header_cksum
+		autotools-utils_src_install
+		if [[ ${#MULTIBUILD_VARIANTS[@]} -gt 1 ]]; then
+			multilib_prepare_wrappers
+			multilib_check_headers
+		fi
 	}
-	multibuild_foreach_variant my_abi_src_install
+	multibuild_foreach_variant multilib_foreach_abi my_abi_src_install
 	multilib_install_wrappers
 
 	if use doc; then


^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2011-08-31 19:37 Christoph Junghans
  0 siblings, 0 replies; 13+ messages in thread
From: Christoph Junghans @ 2011-08-31 19:37 UTC (permalink / raw
  To: gentoo-commits

commit:     a26afad3ab7e58a9e7affa56a6753e4b403c6255
Author:     Christoph Junghans <ottxor <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 19:37:16 2011 +0000
Commit:     Christoph Junghans <kleiner_otti <AT> gmx <DOT> de>
CommitDate: Wed Aug 31 19:37:16 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=a26afad3

[sci-libs/fftw] in tree

---
 sci-libs/fftw/ChangeLog       |   22 -------
 sci-libs/fftw/fftw-3.3.ebuild |  133 -----------------------------------------
 sci-libs/fftw/metadata.xml    |   14 ----
 3 files changed, 0 insertions(+), 169 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
deleted file mode 100644
index 1ad3dbc..0000000
--- a/sci-libs/fftw/ChangeLog
+++ /dev/null
@@ -1,22 +0,0 @@
-# ChangeLog for sci-libs/fftw
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-*fftw-3.3 (20 Aug 2011)
-
-  20 Aug 2011; Christoph Junghans <ottxor@gentoo.org>
-  -files/fftw-3.2.1-as-needed.patch, -fftw-3.3_alpha1.ebuild, +fftw-3.3.ebuild:
-  version bump
-
-  24 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-3.3_alpha1.ebuild:
-  Streamlined fortran-2 eclass usage
-
-  21 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-3.3_alpha1.ebuild:
-  Added fortran-2.eclass support
-
-*fftw-3.3_alpha1 (12 Sep 2010)
-
-  12 Sep 2010; Christoph Junghans <kleiner_otti@gmx.de>
-  +fftw-3.3_alpha1.ebuild, +metadata.xml:
-  Added alpha version to test mpi interface
-

diff --git a/sci-libs/fftw/fftw-3.3.ebuild b/sci-libs/fftw/fftw-3.3.ebuild
deleted file mode 100644
index 7c0e4c9..0000000
--- a/sci-libs/fftw/fftw-3.3.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic fortran-2 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 mpi openmp sse sse2 static-libs threads"
-
-DEPEND="
-	fortran? ( virtual/fortran )
-	mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	use openmp && FORTRAN_NEED_OPENMP="1"
-	use fortran && fortran-2_pkg_setup
-	use openmp && FFTW_OPENMP="--enable-openmp"
-	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="--disable-openmp"
-	fi
-	FFTW_DIRS="single double longdouble"
-	use openmp && [[ $(tc-getCC)$ == icc* ]] && append-ldflags $(no-as-needed)
-}
-
-src_prepare() {
-	# 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 static-libs static)
-		$(use_enable fortran)
-		$(use_enable mpi)
-		$(use_enable threads)
-		${FFTW_OPENMP}"
-
-	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
-	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
-	done
-}
-
-src_install () {
-	local f u
-
-	# 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
-	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
-		insinto /usr/share/doc/${PF}/faq
-		doins FAQ/fftw-faq.html/*
-	fi
-
-	use openmp && [[ ${FFTW_OPENMP} = "--enable-openmp" ]] && u="omp"
-	for f in "${ED}"/usr/lib*/pkgconfig/*.pc; do
-		for u in $(usev mpi) $(usev threads) ${u}; do
-		    sed "s|-lfftw3[lf]\?|&_$u|" "$f" > "${f%.pc}_$u.pc" || die
-		done
-	done
-}

diff --git a/sci-libs/fftw/metadata.xml b/sci-libs/fftw/metadata.xml
deleted file mode 100644
index d7ac5d1..0000000
--- a/sci-libs/fftw/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
-  The Fastest Fourier Transform in the West is a C subroutine library
-  for computing the Discrete Fourier Transform (DFT) in one or more
-  dimensions, of both real and complex data, and of arbitrary input
-  size. It is becoming the FFT library of choice for most
-  applications. Benchmarks, performed on a variety of platforms, show
-  that FFTW's performance is typically superior to that of other
-  publicly available FFT software.
-</longdescription>
-</pkgmetadata>



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2011-06-24 17:09 Justin Lecher
  0 siblings, 0 replies; 13+ messages in thread
From: Justin Lecher @ 2011-06-24 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     b53ef5955af95fd7543f7b4ac691afff0b8b1504
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 12:19:37 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 12:19:37 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b53ef595

Streamlined fortran-2 eclass usage

(Portage version: 2.2.0_alpha41/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)

---
 sci-libs/fftw/ChangeLog              |    3 +++
 sci-libs/fftw/fftw-3.3_alpha1.ebuild |   12 +++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index d1d8a04..99038b1 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-3.3_alpha1.ebuild:
+  Streamlined fortran-2 eclass usage
+
   21 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-3.3_alpha1.ebuild:
   Added fortran-2.eclass support
 

diff --git a/sci-libs/fftw/fftw-3.3_alpha1.ebuild b/sci-libs/fftw/fftw-3.3_alpha1.ebuild
index 700e8ab..3d9e309 100644
--- a/sci-libs/fftw/fftw-3.3_alpha1.ebuild
+++ b/sci-libs/fftw/fftw-3.3_alpha1.ebuild
@@ -15,12 +15,15 @@ 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 mpi openmp sse sse2 static-libs threads"
 
-DEPEND="mpi? ( virtual/mpi )"
+DEPEND="
+	fortran? ( virtual/fortran )
+	mpi? ( virtual/mpi )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P//_}"
 
 pkg_setup() {
+	use openmp && FORTRAN_NEED_OPENMP="1"
 	use fortran && fortran-2_pkg_setup
 	FFTW_THREADS="--disable-threads --disable-openmp"
 	if use openmp; then
@@ -28,12 +31,7 @@ pkg_setup() {
 	elif use threads; then
 		FFTW_THREADS="--enable-threads --disable-openmp"
 	fi
-	if use openmp &&
-		[[ $(tc-getCC)$ == *gcc* ]] &&
-		[[ $(tc-getCC)$ != *apple* ]] &&
-		( [[ $(gcc-major-version)$(gcc-minor-version) -lt 42 ]] ||
-			! has_version sys-devel/gcc[openmp] )
-	then
+	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"



^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/
@ 2011-06-21 11:54 Justin Lecher
  0 siblings, 0 replies; 13+ messages in thread
From: Justin Lecher @ 2011-06-21 11:54 UTC (permalink / raw
  To: gentoo-commits

commit:     98459df51562bca28ce7cf4521fed627b445cb49
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 11:42:02 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 11:42:02 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=98459df5

Added fortran-2.eclass support

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-libs/fftw/ChangeLog              |    5 ++++-
 sci-libs/fftw/fftw-3.3_alpha1.ebuild |   12 +++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index cf0de93..d1d8a04 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,7 +1,10 @@
 # ChangeLog for sci-libs/fftw
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Jun 2011; Justin Lecher <jlec@gentoo.org> fftw-3.3_alpha1.ebuild:
+  Added fortran-2.eclass support
+
 *fftw-3.3_alpha1 (12 Sep 2010)
 
   12 Sep 2010; Christoph Junghans <kleiner_otti@gmx.de>

diff --git a/sci-libs/fftw/fftw-3.3_alpha1.ebuild b/sci-libs/fftw/fftw-3.3_alpha1.ebuild
index 2c6abdd..700e8ab 100644
--- a/sci-libs/fftw/fftw-3.3_alpha1.ebuild
+++ b/sci-libs/fftw/fftw-3.3_alpha1.ebuild
@@ -1,25 +1,27 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=2
-inherit flag-o-matic eutils toolchain-funcs autotools
+
+inherit autotools eutils flag-o-matic fortran-2 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"
 
-DEPEND="mpi? ( virtual/mpi )"
-RDEPEND="${DEPEND}"
-
 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 mpi openmp sse sse2 static-libs threads"
 
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
 S="${WORKDIR}/${P//_}"
 
 pkg_setup() {
+	use fortran && fortran-2_pkg_setup
 	FFTW_THREADS="--disable-threads --disable-openmp"
 	if use openmp; then
 		FFTW_THREADS="--disable-threads --enable-openmp"



^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2015-11-21 15:14 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-21 15:14 [gentoo-commits] proj/sci:master commit in: sci-libs/fftw/ Christoph Junghans
  -- strict thread matches above, loose matches on Subject: below --
2015-04-13  6:34 Justin Lecher
2015-02-19 21:12 Christoph Junghans
2015-02-17  0:13 Christoph Junghans
2015-02-02 12:06 Justin Lecher
2014-07-04  7:10 Justin Lecher
2014-01-06 18:33 Justin Lecher
2013-09-17 19:13 Christoph Junghans
2013-09-07 20:19 Christoph Junghans
2013-09-02 19:17 Christoph Junghans
2011-08-31 19:37 Christoph Junghans
2011-06-24 17:09 Justin Lecher
2011-06-21 11:54 Justin Lecher

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox