Gentoo Archives: gentoo-commits

From: Amy Winston <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencv/
Date: Wed, 16 Dec 2015 09:06:21
Message-Id: 1450256666.fb0c3bf29f49a48f01f7880023baacd88249d8bd.amynka@gentoo
1 commit: fb0c3bf29f49a48f01f7880023baacd88249d8bd
2 Author: Amy Winston <amynka <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 16 09:04:26 2015 +0000
4 Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 16 09:04:26 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb0c3bf2
7
8 media-libs/opencv: required_use qt changed to at-most-one-of
9
10 Package-Manager: portage-2.2.20.1
11
12 media-libs/opencv/opencv-3.0.0.ebuild | 3 +--
13 1 file changed, 1 insertion(+), 2 deletions(-)
14
15 diff --git a/media-libs/opencv/opencv-3.0.0.ebuild b/media-libs/opencv/opencv-3.0.0.ebuild
16 index aec55eb..c5587ae 100644
17 --- a/media-libs/opencv/opencv-3.0.0.ebuild
18 +++ b/media-libs/opencv/opencv-3.0.0.ebuild
19 @@ -21,8 +21,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
20 IUSE="contrib cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt4 qt5 testprograms threads tiff v4l vtk xine"
21 REQUIRED_USE="
22 python? ( ${PYTHON_REQUIRED_USE} )
23 - qt4? ( !qt5 )
24 - qt5? ( !qt4 )
25 + ?? ( qt4 qt5 )
26 "
27
28 # The following logic is intrinsic in the build system, but we do not enforce