| 1 |
commit: 6bf94b61ed79c56b38ce68f579ac93d75421bd65 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Nov 26 22:02:01 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 27 00:12:46 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf94b61 |
| 7 |
|
| 8 |
media-libs/vigra: Add python3_7, drop python2_7 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.79, Repoman-2.3.18 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
media-libs/vigra/vigra-9999.ebuild | 18 +++++++++++------- |
| 14 |
1 file changed, 11 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild |
| 17 |
index e384297bbb8..363de89451a 100644 |
| 18 |
--- a/media-libs/vigra/vigra-9999.ebuild |
| 19 |
+++ b/media-libs/vigra/vigra-9999.ebuild |
| 20 |
@@ -5,8 +5,8 @@ EAPI=7 |
| 21 |
|
| 22 |
MY_P="${P}-src" |
| 23 |
MY_V="${PV//\./-}" |
| 24 |
-PYTHON_COMPAT=( python2_7 python3_6 ) |
| 25 |
-PYTHON_REQ_USE="threads,xml" |
| 26 |
+PYTHON_COMPAT=( python3_{6,7} ) |
| 27 |
+PYTHON_REQ_USE="threads(+),xml" |
| 28 |
inherit cmake-utils python-r1 |
| 29 |
|
| 30 |
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" |
| 31 |
@@ -39,26 +39,27 @@ BDEPEND=" |
| 32 |
valgrind? ( dev-util/valgrind ) |
| 33 |
) |
| 34 |
" |
| 35 |
-# runtime dependency on python:2.7 is required by the vigra-config script |
| 36 |
+# runtime dependency on python is required by the vigra-config script |
| 37 |
DEPEND=" |
| 38 |
- dev-lang/python:2.7 |
| 39 |
fftw? ( sci-libs/fftw:3.0 ) |
| 40 |
hdf5? ( >=sci-libs/hdf5-1.8.0:=[mpi=] ) |
| 41 |
jpeg? ( virtual/jpeg:0 ) |
| 42 |
openexr? ( |
| 43 |
- media-libs/openexr:= |
| 44 |
media-libs/ilmbase:= |
| 45 |
+ media-libs/openexr:= |
| 46 |
) |
| 47 |
png? ( media-libs/libpng:0= ) |
| 48 |
python? ( |
| 49 |
+ ${PYTHON_DEPS} |
| 50 |
dev-libs/boost:=[python?,${PYTHON_USEDEP}] |
| 51 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 52 |
- ${PYTHON_DEPS} |
| 53 |
) |
| 54 |
tiff? ( media-libs/tiff:0= ) |
| 55 |
zlib? ( sys-libs/zlib ) |
| 56 |
" |
| 57 |
-RDEPEND="${DEPEND}" |
| 58 |
+RDEPEND="${PYTHON_DEPS} |
| 59 |
+ ${DEPEND} |
| 60 |
+" |
| 61 |
|
| 62 |
# Severely broken, also disabled in Fedora, bugs #390447, #653442 |
| 63 |
RESTRICT="test" |
| 64 |
@@ -91,6 +92,9 @@ src_prepare() { |
| 65 |
vigra_disable png |
| 66 |
vigra_disable tiff |
| 67 |
vigra_disable zlib |
| 68 |
+ |
| 69 |
+ # Don't use python_fix_shebang because we can't put this behind USE="python" |
| 70 |
+ sed -i -e '/env/s:python:python3:' config/vigra-config.in || die |
| 71 |
} |
| 72 |
|
| 73 |
src_configure() { |
Archives