1 |
commit: fbec2d140834b04eee6c2a306993d1ec65f820da |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 8 18:39:00 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=fbec2d14 |
7 |
|
8 |
media-libs/vigra: EAPI-7 bump |
9 |
|
10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
media-libs/vigra/vigra-9999.ebuild | 45 +++++++++++++++++++------------------- |
14 |
1 file changed, 23 insertions(+), 22 deletions(-) |
15 |
|
16 |
diff --git a/media-libs/vigra/vigra-9999.ebuild b/media-libs/vigra/vigra-9999.ebuild |
17 |
index 4073587b713..120f0cc2429 100644 |
18 |
--- a/media-libs/vigra/vigra-9999.ebuild |
19 |
+++ b/media-libs/vigra/vigra-9999.ebuild |
20 |
@@ -1,12 +1,12 @@ |
21 |
-# Copyright 1999-2018 Gentoo Authors |
22 |
+# Copyright 1999-2019 Gentoo Authors |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
|
25 |
-EAPI=6 |
26 |
+EAPI=7 |
27 |
+ |
28 |
MY_P="${P}-src" |
29 |
MY_V="${PV//\./-}" |
30 |
PYTHON_COMPAT=( python2_7 ) |
31 |
PYTHON_REQ_USE="threads,xml" |
32 |
- |
33 |
inherit cmake-utils python-r1 |
34 |
|
35 |
DESCRIPTION="C++ computer vision library emphasizing customizable algorithms and structures" |
36 |
@@ -24,8 +24,20 @@ LICENSE="MIT" |
37 |
SLOT="0" |
38 |
IUSE="doc +fftw +hdf5 +jpeg mpi openexr +png +python test +tiff valgrind" |
39 |
|
40 |
+REQUIRED_USE=" |
41 |
+ doc? ( hdf5 fftw ) |
42 |
+ python? ( hdf5 ${PYTHON_REQUIRED_USE} ) |
43 |
+ test? ( hdf5 python fftw )" |
44 |
+ |
45 |
+BDEPEND=" |
46 |
+ doc? ( |
47 |
+ app-doc/doxygen |
48 |
+ python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] ) |
49 |
+ ) |
50 |
+ test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] ) |
51 |
+" |
52 |
# runtime dependency on python:2.7 is required by the vigra-config script |
53 |
-RDEPEND=" |
54 |
+DEPEND=" |
55 |
dev-lang/python:2.7 |
56 |
>=dev-libs/boost-1.52.0-r6:=[python?,${PYTHON_USEDEP}] |
57 |
fftw? ( sci-libs/fftw:3.0 ) |
58 |
@@ -35,35 +47,24 @@ RDEPEND=" |
59 |
png? ( media-libs/libpng:0= ) |
60 |
python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) |
61 |
tiff? ( media-libs/tiff:0= ) |
62 |
- valgrind? ( dev-util/valgrind )" |
63 |
- |
64 |
-DEPEND="${RDEPEND} |
65 |
- doc? ( |
66 |
- app-doc/doxygen |
67 |
- python? ( >=dev-python/sphinx-1.1.3-r5[${PYTHON_USEDEP}] ) |
68 |
- ) |
69 |
- test? ( >=dev-python/nose-1.1.2-r1[${PYTHON_USEDEP}] )" |
70 |
- |
71 |
-REQUIRED_USE=" |
72 |
- doc? ( hdf5 fftw ) |
73 |
- python? ( hdf5 ${PYTHON_REQUIRED_USE} ) |
74 |
- test? ( hdf5 python fftw )" |
75 |
+ valgrind? ( dev-util/valgrind ) |
76 |
+" |
77 |
+RDEPEND="${DEPEND}" |
78 |
|
79 |
# Severely broken, also disabled in Fedora, bugs #390447, #653442 |
80 |
RESTRICT="test" |
81 |
|
82 |
-DOCS=( README.md ) |
83 |
- |
84 |
pkg_setup() { |
85 |
use python && python_setup |
86 |
} |
87 |
|
88 |
src_prepare() { |
89 |
- einfo "Removing shipped docs and VCS files" |
90 |
- rm -rf doc || die |
91 |
- |
92 |
cmake-utils_src_prepare |
93 |
|
94 |
+ if [[ ${PV} != *9999 ]]; then |
95 |
+ rm -r doc || die "failed to remove shipped docs" |
96 |
+ fi |
97 |
+ |
98 |
# Don't use python_fix_shebang because we can't put this behind USE="python" |
99 |
sed -i -e '/env/s:python:python2:' config/vigra-config.in || die |
100 |
} |