| 1 |
commit: f1677714164a7061d7413acbac69381703971412 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 8 18:59:22 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 8 21:10:46 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1677714 |
| 7 |
|
| 8 |
media-libs/vigra: Fix USE fftw, jpeg, png, tiff (automagic, unused) |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/665380 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/vigra/vigra-9999.ebuild | 17 +++++++++++++---- |
| 15 |
1 file changed, 13 insertions(+), 4 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild |
| 18 |
index 120f0cc2429..13ec1ef25a5 100644 |
| 19 |
--- a/media-libs/vigra/vigra-9999.ebuild |
| 20 |
+++ b/media-libs/vigra/vigra-9999.ebuild |
| 21 |
@@ -59,12 +59,25 @@ pkg_setup() { |
| 22 |
} |
| 23 |
|
| 24 |
src_prepare() { |
| 25 |
+ vigra_disable() { |
| 26 |
+ if ! use ${1}; then |
| 27 |
+ sed -e "/^VIGRA_FIND_PACKAGE.*${2:-$1}/Is/^/#disabled by USE=${1}: /" \ |
| 28 |
+ -i CMakeLists.txt || die "failed to disable ${1}" |
| 29 |
+ fi |
| 30 |
+ } |
| 31 |
+ |
| 32 |
cmake-utils_src_prepare |
| 33 |
|
| 34 |
if [[ ${PV} != *9999 ]]; then |
| 35 |
rm -r doc || die "failed to remove shipped docs" |
| 36 |
fi |
| 37 |
|
| 38 |
+ vigra_disable fftw fftw3 |
| 39 |
+ vigra_disable fftw fftw3f |
| 40 |
+ vigra_disable jpeg |
| 41 |
+ vigra_disable png |
| 42 |
+ vigra_disable tiff |
| 43 |
+ |
| 44 |
# Don't use python_fix_shebang because we can't put this behind USE="python" |
| 45 |
sed -i -e '/env/s:python:python2:' config/vigra-config.in || die |
| 46 |
} |
| 47 |
@@ -79,11 +92,7 @@ src_configure() { |
| 48 |
-DDOCINSTALL="share/doc/${P}" |
| 49 |
-DLIBDIR_SUFFIX="${libdir/lib}" |
| 50 |
-DUSE_DOC=$(usex doc ON OFF) # unused |
| 51 |
- -DUSE_FFTW3=$(usex fftw ON OFF) # unused |
| 52 |
- -DUSE_JPEG=$(usex jpeg ON OFF) # unused |
| 53 |
-DUSE_MPI=$(usex mpi ON OFF) # unused |
| 54 |
- -DUSE_PNG=$(usex png ON OFF) # unused |
| 55 |
- -DUSE_TIFF=$(usex tiff ON OFF) # unused |
| 56 |
-DWITH_HDF5=$(usex hdf5 ON OFF) |
| 57 |
-DWITH_OPENEXR=$(usex openexr ON OFF) |
| 58 |
-DWITH_VALGRIND=$(usex valgrind ON OFF) |
Archives