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

["Christoph Junghans" <ottxor@gentoo.org>]

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