Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/opencv_tests/
Date: Wed, 23 Sep 2015 13:15:04
Message-Id: 1443014049.0c5dd17a885d1e2f2e5caaec9a55d09a7e6124fc.aballier@gentoo
1 commit: 0c5dd17a885d1e2f2e5caaec9a55d09a7e6124fc
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 23 13:14:09 2015 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 23 13:14:09 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c5dd17a
7
8 dev-ros/opencv_tests: Fix broken deps on opencv.
9
10 Package-Manager: portage-2.2.21
11
12 dev-ros/opencv_tests/opencv_tests-1.11.8.ebuild | 3 ++-
13 dev-ros/opencv_tests/opencv_tests-9999.ebuild | 3 ++-
14 2 files changed, 4 insertions(+), 2 deletions(-)
15
16 diff --git a/dev-ros/opencv_tests/opencv_tests-1.11.8.ebuild b/dev-ros/opencv_tests/opencv_tests-1.11.8.ebuild
17 index 9c9cf25..770ea0b 100644
18 --- a/dev-ros/opencv_tests/opencv_tests-1.11.8.ebuild
19 +++ b/dev-ros/opencv_tests/opencv_tests-1.11.8.ebuild
20 @@ -5,6 +5,7 @@
21 EAPI=5
22 ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
23 KEYWORDS="~amd64 ~arm"
24 +# Be careful: It needs opencv with python support but opencv is python-single-r1
25 PYTHON_COMPAT=( python2_7 )
26 ROS_SUBDIR=${PN}
27
28 @@ -18,7 +19,7 @@ IUSE=""
29 RDEPEND="
30 dev-ros/cv_bridge[${PYTHON_USEDEP}]
31 dev-ros/rospy[${PYTHON_USEDEP}]
32 - media-libs/opencv[python,${PYTHON_USEDEP}]
33 + media-libs/opencv[python,python_single_target_python2_7]
34 dev-python/numpy[${PYTHON_USEDEP}]
35 "
36 DEPEND="${RDEPEND}"
37
38 diff --git a/dev-ros/opencv_tests/opencv_tests-9999.ebuild b/dev-ros/opencv_tests/opencv_tests-9999.ebuild
39 index 9c9cf25..770ea0b 100644
40 --- a/dev-ros/opencv_tests/opencv_tests-9999.ebuild
41 +++ b/dev-ros/opencv_tests/opencv_tests-9999.ebuild
42 @@ -5,6 +5,7 @@
43 EAPI=5
44 ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
45 KEYWORDS="~amd64 ~arm"
46 +# Be careful: It needs opencv with python support but opencv is python-single-r1
47 PYTHON_COMPAT=( python2_7 )
48 ROS_SUBDIR=${PN}
49
50 @@ -18,7 +19,7 @@ IUSE=""
51 RDEPEND="
52 dev-ros/cv_bridge[${PYTHON_USEDEP}]
53 dev-ros/rospy[${PYTHON_USEDEP}]
54 - media-libs/opencv[python,${PYTHON_USEDEP}]
55 + media-libs/opencv[python,python_single_target_python2_7]
56 dev-python/numpy[${PYTHON_USEDEP}]
57 "
58 DEPEND="${RDEPEND}"