commit:     f1677714164a7061d7413acbac69381703971412
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  8 18:59:22 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr  8 21:10:46 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1677714

media-libs/vigra: Fix USE fftw, jpeg, png, tiff (automagic, unused)

Bug: https://bugs.gentoo.org/665380
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-libs/vigra/vigra-9999.ebuild | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/media-libs/vigra/vigra-9999.ebuild 
b/media-libs/vigra/vigra-9999.ebuild
index 120f0cc2429..13ec1ef25a5 100644
--- a/media-libs/vigra/vigra-9999.ebuild
+++ b/media-libs/vigra/vigra-9999.ebuild
@@ -59,12 +59,25 @@ pkg_setup() {
 }
 
 src_prepare() {
+       vigra_disable() {
+               if ! use ${1}; then
+                       sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled 
by USE=${1}: /" \
+                               -i CMakeLists.txt || die "failed to disable 
${1}"
+               fi
+       }
+
        cmake-utils_src_prepare
 
        if [[ ${PV} != *9999 ]]; then
                rm -r doc || die "failed to remove shipped docs"
        fi
 
+       vigra_disable fftw fftw3
+       vigra_disable fftw fftw3f
+       vigra_disable jpeg
+       vigra_disable png
+       vigra_disable tiff
+
        # Don't use python_fix_shebang because we can't put this behind 
USE="python"
        sed -i -e '/env/s:python:python2:' config/vigra-config.in || die
 }
@@ -79,11 +92,7 @@ src_configure() {
                        -DDOCINSTALL="share/doc/${P}"
                        -DLIBDIR_SUFFIX="${libdir/lib}"
                        -DUSE_DOC=$(usex doc ON OFF) # unused
-                       -DUSE_FFTW3=$(usex fftw ON OFF) # unused
-                       -DUSE_JPEG=$(usex jpeg ON OFF) # unused
                        -DUSE_MPI=$(usex mpi ON OFF) # unused
-                       -DUSE_PNG=$(usex png ON OFF) # unused
-                       -DUSE_TIFF=$(usex tiff ON OFF) # unused
                        -DWITH_HDF5=$(usex hdf5 ON OFF)
                        -DWITH_OPENEXR=$(usex openexr ON OFF)
                        -DWITH_VALGRIND=$(usex valgrind ON OFF)

Reply via email to