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/camera_calibration/
Date: Wed, 23 Sep 2015 13:10:27
Message-Id: 1443013815.40fd31c292c5652251bbdfefa6602002f427df0c.aballier@gentoo
1 commit: 40fd31c292c5652251bbdfefa6602002f427df0c
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 23 13:10:01 2015 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 23 13:10:15 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40fd31c2
7
8 dev-ros/camera_calibration: fix broken deps on opencv
9
10 Package-Manager: portage-2.2.21
11
12 dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild | 2 +-
13 dev-ros/camera_calibration/camera_calibration-9999.ebuild | 2 +-
14 2 files changed, 2 insertions(+), 2 deletions(-)
15
16 diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild
17 index 417e035..83717d5 100644
18 --- a/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild
19 +++ b/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild
20 @@ -18,7 +18,7 @@ IUSE=""
21 RDEPEND="
22 dev-ros/cv_bridge[${PYTHON_USEDEP}]
23 dev-ros/image_geometry[${PYTHON_USEDEP}]
24 - || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
25 + media-libs/opencv[python,${PYTHON_USEDEP}]
26 dev-ros/message_filters[${PYTHON_USEDEP}]
27 dev-ros/rospy[${PYTHON_USEDEP}]
28 dev-ros/std_srvs[${PYTHON_USEDEP}]
29
30 diff --git a/dev-ros/camera_calibration/camera_calibration-9999.ebuild b/dev-ros/camera_calibration/camera_calibration-9999.ebuild
31 index 417e035..83717d5 100644
32 --- a/dev-ros/camera_calibration/camera_calibration-9999.ebuild
33 +++ b/dev-ros/camera_calibration/camera_calibration-9999.ebuild
34 @@ -18,7 +18,7 @@ IUSE=""
35 RDEPEND="
36 dev-ros/cv_bridge[${PYTHON_USEDEP}]
37 dev-ros/image_geometry[${PYTHON_USEDEP}]
38 - || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
39 + media-libs/opencv[python,${PYTHON_USEDEP}]
40 dev-ros/message_filters[${PYTHON_USEDEP}]
41 dev-ros/rospy[${PYTHON_USEDEP}]
42 dev-ros/std_srvs[${PYTHON_USEDEP}]