Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
Date: Sun, 09 Feb 2020 16:29:45
Message-Id: 1581265652.69de0da4f7f7b8a11e731acc4744585d5e74a9bb.mgorny@gentoo
1 commit: 69de0da4f7f7b8a11e731acc4744585d5e74a9bb
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Feb 7 16:41:56 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 9 16:27:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69de0da4
7
8 media-libs/opencv: Switch to PYTHON_MULTI_USEDEP API
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 .../{opencv-2.4.13-r3.ebuild => opencv-2.4.13-r4.ebuild} | 10 ++++++----
13 1 file changed, 6 insertions(+), 4 deletions(-)
14
15 diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r4.ebuild
16 similarity index 97%
17 rename from media-libs/opencv/opencv-2.4.13-r3.ebuild
18 rename to media-libs/opencv/opencv-2.4.13-r4.ebuild
19 index caceec0fd66..e678316f625 100644
20 --- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
21 +++ b/media-libs/opencv/opencv-2.4.13-r4.ebuild
22 @@ -53,10 +53,12 @@ RDEPEND="
23 png? ( media-libs/libpng:0= )
24 python? (
25 ${PYTHON_DEPS}
26 - || (
27 - dev-python/numpy-python2[${PYTHON_USEDEP}]
28 - dev-python/numpy[${PYTHON_USEDEP}]
29 - )
30 + $(python_gen_cond_dep '
31 + || (
32 + dev-python/numpy-python2[${PYTHON_MULTI_USEDEP}]
33 + dev-python/numpy[${PYTHON_MULTI_USEDEP}]
34 + )
35 + ')
36 )
37 qt5? (
38 dev-qt/qtconcurrent:5