From 8be70107efbb417f839292165ee39d07a062046f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 13 Jan 2018 06:19:51 +0000
Subject: gentoo resync : 13.01.2018

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

(limited to 'sci-libs/fftw')

diff --git a/sci-libs/fftw/Manifest b/sci-libs/fftw/Manifest
index 6678840894a2..0c4bae34922a 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 4629 BLAKE2B f4330901801b3a0fccd943915f7efa4a28b82b317a3e90f00ed05a90fa56515c758ec2e714cc280cc335c10f25019bcf4a7fd6ceccb985a4a1330041f7a615bd SHA512 3eb9c89f8bb1ff625f0c5dceb3286a59a61e5561f4ef29da8f4b860a3212ca315b582660a50cd647bf4676758654ce3124eaa0ec6c78dbbc852169d4a79b8079
+EBUILD fftw-9999.ebuild 4654 BLAKE2B b4118a314849101394a263073a661735c3e2ed85ff0b1b55ac3f62e23d295bd92259cca9f21f4e65839d3f264febdadd4198789fa5728c5c71a7c305ecac0bcd SHA512 b19cb97bbc3cd97e3d8c0500bf667e960ae252c6b3ef083736ba903f8bfacb284dd0369b15f3013754978cc9fe71f8dc5f21441e1854bea9967fbfb5a898f94f
 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 bef41e83ea09..c08278dde801 100644
--- a/sci-libs/fftw/fftw-9999.ebuild
+++ b/sci-libs/fftw/fftw-9999.ebuild
@@ -30,11 +30,11 @@ DEPEND="${RDEPEND}
 	test? ( dev-lang/perl )"
 if [[ ${PV} = *9999 ]]; then
 	DEPEND="${DEPEND}
-		dev-ml/ocamlbuild"
+		dev-ml/ocamlbuild
+		doc? ( media-gfx/transfig )"
 fi
 
 S=${WORKDIR}/${MY_P}
-HTML_DOCS=( doc/html/. )
 
 pkg_pretend() {
 	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
@@ -146,7 +146,7 @@ src_configure() {
 }
 
 src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
+	multibuild_foreach_variant multilib-minimal_src_compile all $([[ ${PV} = *9999 ]] && usev doc)
 }
 
 multilib_src_test() {
@@ -164,6 +164,7 @@ src_test() {
 }
 
 src_install() {
+	use doc && HTML_DOCS=( doc/html/. )
 	multibuild_foreach_variant multilib-minimal_src_install
 	dodoc CONVENTIONS
 
@@ -171,8 +172,6 @@ src_install() {
 		dodoc doc/*.pdf
 		docinto faq
 		dodoc -r doc/FAQ/fftw-faq.html/.
-	else
-		rm -r "${ED%/}"/usr/share/doc/${PF}/html || die
 	fi
 
 	local x
-- 
cgit v1.2.3