gentoo resync : 11.01.2018

2 files changed, 36 insertions, 29 deletions

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 92906a3ab587..6678840894a2 100644
--- a/sci-libs/fftw/Manifest
+++ b/sci-libs/fftw/Manifest
@@ -8,5 +8,5 @@ DIST fftw-2.1.5.tar.gz 1256888 BLAKE2B 61e2eed91459479ab893a423c1a6f38dd7e9637e0
 DIST fftw-3.3.6-pl2.tar.gz 4185261 BLAKE2B e2f877c13ab441ddf1ae731cf3ebdc5d1565f8216f497694ea1fccc43b6a53fc02d39e17f97c56d15d03410b2005e6c693cb4b639399aac0f6ebdc63fed32d2e SHA512 e130309856752a1555b6d151c4d0ce9eb4b2c208fff7e3e89282ca8ef6104718f865cbb5e9c4af4367b3615b69b0d50fd001a26d74fd5324ff2faabe14fe3472
 EBUILD fftw-2.1.5-r9.ebuild 3148 BLAKE2B c6b8afd87370e5f46aa702cebf74f7daaed6234ec175e013046a9bf13c8168a3a8b223c8bd72cba2aabbee19f9a246bdf1954865945a90a94afdb4de21e09936 SHA512 bced55608e2635cb945ff22ccdcfd1aab37313edbf64728f53fc6653cde54c7863f2dee32f8a198205c46906363a1503ad604f2a3d47f79fdd97634a67caed59
 EBUILD fftw-3.3.6_p2.ebuild 4433 BLAKE2B ba57766a5fc3f4dbf6eb5545b55e2c8eeed8a5e63cc35746fb78d9b583f2ba7831062ccc471cc426f12c1635cd5b259967e1a855a9465d2b566847d7ce896322 SHA512 61dd69bd2e7d1b0aee3907775a231837b3012d6e31ed1cd02436e74d53c4d8db5e7dceea9cc4debde00d9a3390f58418047801202a616691cda6e4274e67f94b
-EBUILD fftw-9999.ebuild 4626 BLAKE2B cc8e04d30ea75aa0aec2e981b7ba79cd2ff2b96d84ad7014b9afd0287399bea3de801cfd6fb2f5ae0078059a740e24ae50f499092416888d94cde5174d0805c9 SHA512 361ca8659ee47d12a9964f5a12fc5552dc63f6dd493189bf776a8321358afe958e71ed297a61896db739bd3eb999b75a6e778b690dac77939ada9cd31da69d4d
+EBUILD fftw-9999.ebuild 4629 BLAKE2B f4330901801b3a0fccd943915f7efa4a28b82b317a3e90f00ed05a90fa56515c758ec2e714cc280cc335c10f25019bcf4a7fd6ceccb985a4a1330041f7a615bd SHA512 3eb9c89f8bb1ff625f0c5dceb3286a59a61e5561f4ef29da8f4b860a3212ca315b582660a50cd647bf4676758654ce3124eaa0ec6c78dbbc852169d4a79b8079
 MISC metadata.xml 1088 BLAKE2B 308c6b8e2b7388d41c5ee6c3336b7b61037277b4563cb212cccaf25c894d350434eaa0f282172f943cf26496345b4c7e58afa55f50b9cf07fc04aea7a5d25244 SHA512 df52860deccf7e7139affaad8cfb837b7f3770a22c621f668db24d916cee5b27acc1486884797e8d0881d8887874627b919816f8245101982e963a8db43f3c98
diff --git a/sci-libs/fftw/fftw-9999.ebuild b/sci-libs/fftw/fftw-9999.ebuild
index af34cba86168..bef41e83ea09 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -10,11 +10,13 @@ inherit flag-o-matic fortran-2 toolchain-funcs versionator multibuild multilib-m
 DESCRIPTION="Fast C library for the Discrete Fourier Transform"
 HOMEPAGE="http://www.fftw.org/"
 
+MY_P=${PN}-${PV/_p/-pl}
+
 if [[ ${PV} = *9999 ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/FFTW/fftw3.git"
 else
-	SRC_URI="http://www.fftw.org/${P}.tar.gz"
+	SRC_URI="http://www.fftw.org/${PN}-${PV/_p/-pl}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 fi
 
@@ -23,22 +25,24 @@ SLOT="3.0/3"
 IUSE="altivec cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_sse cpu_flags_x86_sse2 doc fortran mpi neon openmp quad static-libs test threads zbus"
 
 RDEPEND="
-	mpi? ( virtual/mpi )"
+	mpi? ( >=virtual/mpi-2.0-r4[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
+if [[ ${PV} = *9999 ]]; then
+	DEPEND="${DEPEND}
+		dev-ml/ocamlbuild"
+fi
 
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
-		if ! tc-has-openmp; then
-			ewarn "OpenMP is not available in your current selected compiler"
+S=${WORKDIR}/${MY_P}
+HTML_DOCS=( doc/html/. )
 
-			if tc-is-clang; then
-				ewarn "OpenMP support in sys-devel/clang is provided by sys-libs/libomp,"
-				ewarn "which you will need to build ${CATEGORY}/${PN} with USE=\"openmp\""
-			fi
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
 
-			die "need openmp capable compiler"
-		fi
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] && use openmp; then
+		tc-check-openmp
 		FORTRAN_NEED_OPENMP=1
 	fi
 
@@ -46,7 +50,7 @@ pkg_setup() {
 
 	MULTIBUILD_VARIANTS=( single double longdouble )
 	if use quad; then
-		if tc-is-gcc && ! version_is_at_least 4.6 $(gcc-version); then
+		if ! tc-is-gcc; then
 			ewarn "quad precision only available for gcc >= 4.6"
 			die "need quad precision capable gcc"
 		fi
@@ -64,9 +68,6 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	# there is no abi_x86_32 port of virtual/mpi right now, bug 519700
-	local enable_mpi=$(multilib_native_use_enable mpi)
-
 	# jlec reported USE=quad on abi_x86_32 has too few registers
 	# stub Makefiles
 	if [[ ${MULTILIB_ABI_FLAG} == abi_x86_32 && ${MULTIBUILD_ID} == quad-* ]]; then
@@ -79,6 +80,7 @@ multilib_src_configure() {
 
 	local myconf=(
 		--enable-shared
+		$([[ ${PV} = *9999 ]] && echo "--enable-maintainer-mode")
 		$(use_enable static-libs static)
 		$(use_enable "cpu_flags_x86_fma$(usex cpu_flags_x86_fma3 3 4)" fma)
 		$(use_enable fortran)
@@ -88,7 +90,7 @@ multilib_src_configure() {
 	)
 	case "${MULTIBUILD_ID}" in
 		single-*)
-			#altivec, sse, single-paired only work for single
+			# altivec, sse, single-paired only work for single
 			myconf+=(
 				--enable-single
 				$(use_enable altivec)
@@ -97,7 +99,7 @@ multilib_src_configure() {
 				$(use_enable cpu_flags_x86_sse sse)
 				$(use_enable cpu_flags_x86_sse2 sse2)
 				$(use_enable neon)
-				${enable_mpi}
+				$(use_enable mpi)
 			)
 			;;
 
@@ -106,19 +108,19 @@ multilib_src_configure() {
 				$(use_enable cpu_flags_x86_avx avx)
 				$(use_enable cpu_flags_x86_avx2 avx2)
 				$(use_enable cpu_flags_x86_sse2 sse2)
-				${enable_mpi}
+				$(use_enable mpi)
 			)
 			;;
 
 		longdouble-*)
 			myconf+=(
 				--enable-long-double
-				${enable_mpi}
+				$(use_enable mpi)
 			)
 			;;
 
 		quad-*)
-			#quad does not support mpi
+			# quad does not support mpi
 			myconf+=(
 				--enable-quad-precision
 			)
@@ -129,7 +131,14 @@ multilib_src_configure() {
 			;;
 	esac
 
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
+	local MY_S="${S}"
+	#out-of-source build is broken for 9999 due to maintainer mode
+	if [[ ${PV} = *9999 ]]; then
+		cp -al "${S}"/* "${BUILD_DIR}"/
+		MY_S="${BUILD_DIR}"
+	fi
+
+	ECONF_SOURCE="${MY_S}" econf "${myconf[@]}" MPICC="$(tc-getCC -lmpi)"
 }
 
 src_configure() {
@@ -155,21 +164,19 @@ src_test() {
 }
 
 src_install() {
-	DOCS=( AUTHORS ChangeLog NEWS README TODO COPYRIGHT CONVENTIONS )
-	HTML_DOCS=( doc/html/ )
-
 	multibuild_foreach_variant multilib-minimal_src_install
+	dodoc CONVENTIONS
 
 	if use doc; then
 		dodoc doc/*.pdf
 		docinto faq
 		dodoc -r doc/FAQ/fftw-faq.html/.
 	else
-		rm -r "${ED}"/usr/share/doc/${PF}/html || die
+		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
 	fi
 
 	local x
-	for x in "${ED}"/usr/lib*/pkgconfig/*.pc; do
+	for x in "${ED%/}"/usr/lib*/pkgconfig/*.pc; do
 		local u
 		for u in $(usev mpi) $(usev threads) $(usex openmp omp ""); do
 			sed -e "s|-lfftw3[flq]\?|&_${u} &|" "$x" > "${x%.pc}_${u}.pc" || die
@@ -177,5 +184,5 @@ src_install() {
 	done
 
 	# fftw uses pkg-config to record its private dependencies
-	find "${ED}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -delete || die
 }