disable header wrapping (bug #519094)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

4 files changed, 16 insertions, 229 deletions

diff --git a/sci-libs/fftw/ChangeLog b/sci-libs/fftw/ChangeLog
index ee0389fd5306..747d5c7774ad 100644
--- a/sci-libs/fftw/ChangeLog
+++ b/sci-libs/fftw/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/fftw
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.158 2014/06/17 15:52:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/ChangeLog,v 1.159 2014/08/06 22:10:47 ottxor Exp $
+
+  06 Aug 2014; Christoph Junghans <ottxor@gentoo.org> -fftw-3.3.3-r3.ebuild,
+  fftw-3.3.4.ebuild:
+  disable header wrapping (bug #519094)
 
   17 Jun 2014; Michał Górny <mgorny@gentoo.org> fftw-3.3.4.ebuild:
   Use ${ABI} to disable quad precision w/ abi_x86_32.
diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 27c00f796001..fb989d9bd9bd 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -11,26 +11,17 @@ DIST fftw-3.3.3.tar.gz 3920661 SHA256 85cdfc0a0ba10d8fa4f0f8e733aac1a5936c859832
 DIST fftw-3.3.4.tar.gz 3940427 SHA256 8f0cde90929bc05587c3368d2f15cd0530a60b8a9912a8e2979a72dbe5af0982 SHA512 1ee2c7bec3657f6846e63c6dfa71410563830d2b951966bf0123bd8f4f2f5d6b50f13b76d9a7b0eae70e44856f829ca6ceb3d080bb01649d1572c9f3f68e8eb1 WHIRLPOOL 2a5733f5537ff55a1830994431f1750dd790a4df3e8b3d1e9018c1afba2c5172f4e456eaee1c3427a2b170d23b6928da462e067a6f4e94792cfc7ff1cbc38938
 EBUILD fftw-2.1.5-r8.ebuild 3985 SHA256 cbb0c89c800ba8e33de782e4dbaa4870ac731f4d4a9ed7da677e693493112385 SHA512 f1a9a027d3e6408f8e45b885e4909dcb82356a574be8faebf719f87f51ed85693dd3bc3eefafd92c9fd6066e4d75be59bf55b14b360a7053564c47c9fafe28f4 WHIRLPOOL aeb2fda6ea435b4fd25fef07923f23964244f311437efba1bde49806ee83461d9db6ea913c79fb345e3102b0fd60be6ba3035ab84e21ae608509291d39e410e7
 EBUILD fftw-3.3.3-r2.ebuild 3904 SHA256 17cf3c43681d1db09388800e51fe0e46a696563ceee92ecb77638bdfe27bea16 SHA512 c8a4fe2249d4fd7e849659ce016924d5c4746d5a74e8a7ae97ab6d7d1a2e3b2f517336ad4cfa00b382652ed16906ac9252d11484f5c402dab398a86ac401a73e WHIRLPOOL 86f5919fcc0e692eb0cbca5e72f26cd5216d5b8d54f6dbfbab8d52608c39679aa450323de69dec5895835ed21c39494beeeac806e8ef07c1223615bd9dd02e42
-EBUILD fftw-3.3.3-r3.ebuild 5218 SHA256 560818899f3f0679a0ce783c57e6088e5ed778f39a4a81ca8cb62a40b512310b SHA512 001133989867083e8792442797d56b1de44f4fde6cbe9f7e1a17913b6c17b7f9cd4c11d4f5ae69f7d05afb269c541b31e8c04398a1e2c5737fb9210815a94696 WHIRLPOOL 27571e8472c65ea92628605042217ab4ee88dff3ae523fc371f2e27e1fe3ece02fd6e3129af8d6f778cfc4f655dcce53b74290d5bac197957d0b77238336b10e
-EBUILD fftw-3.3.4.ebuild 5177 SHA256 228c1c664c4ce4de0a57e00b258c2458def04304b899ac02da771aa802072418 SHA512 96f8f0e0aec570013c13f9c01ce0e3ed075999d6845bcda61b63aad0ff1d4ebf1871887babfcb245e39e2425bde2c1ffa11ed251e66d729c3d9e5edb41503eb5 WHIRLPOOL 4c7fca0652185d799b56e4251dcd80ce6e109a8df9d4d096b448142b29029b0d0db315641eedb14805b8a1c7628a4de8e3e30d73c31aed0c066fda1229e37828
-MISC ChangeLog 27906 SHA256 09129db6a8276b6cb21db2f1635681c3934c01057960d710b06fb758826e8079 SHA512 6852e4cbe06e555cc17092254ea9ef26cbf63df4c6f929b1653e8958d18de2e75309691bb96601983b871b011493c8ebd299452076dece010cea0a3c237d5a75 WHIRLPOOL 602ad8bd595b69166b93e376517e365d36f7663b157400bddcd7eeb6d25382bea891d258420333d1c53697864710584a970519531ea6bdc978aa9fb6e47e89c2
+EBUILD fftw-3.3.4.ebuild 4565 SHA256 d84afb4321793105341660d54d2ad8e85a1a5985ea4f88521b3752956c0a2938 SHA512 520893e423d1f59ebc67d5b74a3f60bd7e5fe5f52b3e3ccf36fd922dbc5b9af2bf412d8454786f366209fc18d56a2a2cc0c09895ed2a6ed203d501149fd36980 WHIRLPOOL 2e89f099cb36616adb1d9e31c115942ed3989ec1ecde19766cebcfa87f7d3bf9999f9ca985ab5e2f627c99d33590f2b8179b41d75371072430134bba7920584a
+MISC ChangeLog 28045 SHA256 1aba1fa53ead701158b4275f7a5256779e315bbfb4f950cd63e26442bc91254d SHA512 271d737bfd487c2d574d7d753815fee1e3338f45d958498c535efc1206d08c2b0edf79a77087eb3452c2d37893f86c4b1bc39fa91a5d5368bf5312423260dc08 WHIRLPOOL fdb912776ee7d0b05132e260b7eb6392240fbfba2dd6ef316a81162a0c91874fba7e36ecefe52124bb835d1c429a391f5b9513ae8cf2cb45f08df127be0099d6
 MISC metadata.xml 1153 SHA256 4098cfa7c224af2bafc5dac8c1834e4f53b4c992f2dcfe20ce494b0ecbc3caf4 SHA512 e1f7f672f1f185781fbe4135a787b03800199caea1ad8e9287182a0605401db8f61de96372a106d92f608900aa158ebaa96b3256d6d7566fdd5f183f0be91b88 WHIRLPOOL 50140233feb932045fc2bf97d3a254628fe6afff32c3c30ddb524d03442ba84aaf4f10e5e3868ba416f8928f81718901ad68b2ca45db442467ab26942a74196f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJToGQnXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZONjkQALyqgc1Kvb8QT3DELZdlFOiG
-QwWHh5JGCeJiaboa0+mvMbDMomHt7dSjvqzYtsscMYNxeQDP6Q/nWNoxWAJYdTeh
-1X4XTjp4ZzhV+Lj74l4jHhVRUZKXvEDSVQJBUCT1g4K8Q+t3JLYutqxDDBtzN6SH
-TPYEB9qw0Dgr1xLioDp1cb3P09xtzJfmU3I1BhogG3ookLXIRYP2lI591L7p4RVb
-T0vCfj4TGLgc1zT9tDUmiKLIgO73wSMSxSAsHso0EztD9UBxBrARvF7N5yhXvLmf
-vDdD98VB7hPbNUbhR/Bo9CGYFAT6kRmB8gByFHyvCTEA1+5dfxMYN+xAGYgxMsk4
-Mvz8xiem9qhFR2VD/wd65QFw3upNfitIoEvtITibs25SMD21Z/JYebEq7KiTY/DN
-ckgaPmpr6mMkAui88K26sdw+oJ3oH2GHlqpWQEQTyHMuqUTTgyqCuTo8oipJmT8H
-1mkMxNJC/n8/A5P6dj8Ff9EEBp+nEuMMA6SxS/4UcVhzI7Fff6u0vovq4dM5KHmZ
-5qS5o7Y+Z1y+q4d/CsXA3QqqbzEKiT/etFuJ8FNd54fXf4x+vpYwLf1cVKM8/n9P
-iC+ZN6038idvkz37pu/rtOJEgT+XpH/tY+hIzl0vUgIJVWkbZ3GaxnP/mPyYRDRq
-J9FSDc1RLd64uHNqV8cs
-=ezVK
+iQEcBAEBCAAGBQJT4qf2AAoJEOeBhlrCAAWGnq4H/jn45ErreANMPOKMjlOdItEc
+uxX8SfufskPX1l6aLs4J+0WcVKZHYwy0ALYlbBTSnzmYB8ILYWzMhJByyTFAUu6N
+8GeDQ6CCKYzK9WlSyNu/9pYi0b9XQZOkANX4+jiSBfP+HmShYbDUu4OqMxsuMQOs
+dTRrA6teka3Yz8jpq8d9c2SLDbMYITHNyPg1xfI2xm9k2Vd2SX2frtUyDa3k14hi
+IHU97pb6tWwkf/p2geyOcjkOCCqUGQWY8+KfaUHNbTFHivES/A2ikUREMhLN2XYr
+HqA83BKwejUliN2381vqGOI2PP5qQpoqnztV5DSUgM6NS5tuVt3Bp3OJKU2BeJ4=
+=hBFN
 -----END PGP SIGNATURE-----
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 ec38a873692b..000000000000
--- a/sci-libs/fftw/fftw-3.3.3-r3.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# 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-r3.ebuild,v 1.3 2014/05/24 22:14:53 mgorny 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 ~x64-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%-*}
-		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
-}
diff --git a/sci-libs/fftw/fftw-3.3.4.ebuild b/sci-libs/fftw/fftw-3.3.4.ebuild
index 12ec05557f93..b92f48b027e2 100644
--- a/sci-libs/fftw/fftw-3.3.4.ebuild
+++ b/sci-libs/fftw/fftw-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.3 2014/06/17 15:52:04 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/fftw/fftw-3.3.4.ebuild,v 1.4 2014/08/06 22:10:47 ottxor Exp $
 
 EAPI=5
 
@@ -32,14 +32,6 @@ RDEPEND="
 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
@@ -154,20 +146,7 @@ src_install () {
 	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
+	multibuild_foreach_variant multilib_parallel_foreach_abi autotools-utils_src_install
 
 	if use doc; then
 		dodoc doc/*.pdf