From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1141716-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 5F793138351
for <garchives@archives.gentoo.org>; Thu, 30 Jan 2020 21:26:26 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id CB86DE08C8;
Thu, 30 Jan 2020 21:26:20 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A83CCE08C8
for <gentoo-commits@lists.gentoo.org>; Thu, 30 Jan 2020 21:26:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 5F2E534E5E4
for <gentoo-commits@lists.gentoo.org>; Thu, 30 Jan 2020 21:26:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D043512A
for <gentoo-commits@lists.gentoo.org>; Thu, 30 Jan 2020 21:26:16 +0000 (UTC)
From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org>
Message-ID: <1580419572.1bd6dd295318d207480428a27a2a14d2146fc017.mgorny@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/opencv/opencv-2.4.13-r3.ebuild
X-VCS-Directories: media-libs/opencv/
X-VCS-Committer: mgorny
X-VCS-Committer-Name: Michał Górny
X-VCS-Revision: 1bd6dd295318d207480428a27a2a14d2146fc017
X-VCS-Branch: master
Date: Thu, 30 Jan 2020 21:26:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0aed16df-33e2-42d6-8503-2d7fab6c8fbf
X-Archives-Hash: 2cfbac4c8250984b0d02c40e30dcea03
commit: 1bd6dd295318d207480428a27a2a14d2146fc017
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 21:16:55 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 21:26:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd6dd29
media-libs/opencv: Permit numpy-python2 in 2*
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/opencv/opencv-2.4.13-r3.ebuild | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index d4379a93e73..caceec0fd66 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -51,7 +51,13 @@ RDEPEND="
openexr? ( media-libs/openexr )
opengl? ( virtual/opengl virtual/glu )
png? ( media-libs/libpng:0= )
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
+ python? (
+ ${PYTHON_DEPS}
+ || (
+ dev-python/numpy-python2[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ )
+ )
qt5? (
dev-qt/qtconcurrent:5
dev-qt/qtcore:5