| 1 |
commit: 1bd6dd295318d207480428a27a2a14d2146fc017 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jan 30 21:16:55 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 30 21:26:12 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd6dd29 |
| 7 |
|
| 8 |
media-libs/opencv: Permit numpy-python2 in 2* |
| 9 |
|
| 10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 11 |
|
| 12 |
media-libs/opencv/opencv-2.4.13-r3.ebuild | 10 ++++++++-- |
| 13 |
1 file changed, 8 insertions(+), 2 deletions(-) |
| 14 |
|
| 15 |
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild |
| 16 |
index d4379a93e73..caceec0fd66 100644 |
| 17 |
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild |
| 18 |
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild |
| 19 |
@@ -1,4 +1,4 @@ |
| 20 |
-# Copyright 1999-2019 Gentoo Authors |
| 21 |
+# Copyright 1999-2020 Gentoo Authors |
| 22 |
# Distributed under the terms of the GNU General Public License v2 |
| 23 |
|
| 24 |
EAPI=6 |
| 25 |
@@ -51,7 +51,13 @@ RDEPEND=" |
| 26 |
openexr? ( media-libs/openexr ) |
| 27 |
opengl? ( virtual/opengl virtual/glu ) |
| 28 |
png? ( media-libs/libpng:0= ) |
| 29 |
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) |
| 30 |
+ python? ( |
| 31 |
+ ${PYTHON_DEPS} |
| 32 |
+ || ( |
| 33 |
+ dev-python/numpy-python2[${PYTHON_USEDEP}] |
| 34 |
+ dev-python/numpy[${PYTHON_USEDEP}] |
| 35 |
+ ) |
| 36 |
+ ) |
| 37 |
qt5? ( |
| 38 |
dev-qt/qtconcurrent:5 |
| 39 |
dev-qt/qtcore:5 |
Archives