summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-09-23 15:14:30 +0200
committerAlexis Ballier <aballier@gentoo.org>2015-09-23 15:14:30 +0200
commitf0389beb3a10f8b8d638fccf0e6a5a1a467cbd43 (patch)
tree38b8a73304f8e9f34b25c468cb5fd90e5aa384d0
parentdev-ros/opencv_tests: Fix broken deps on opencv. (diff)
downloadgentoo-f0389beb3a10f8b8d638fccf0e6a5a1a467cbd43.tar.gz
gentoo-f0389beb3a10f8b8d638fccf0e6a5a1a467cbd43.tar.bz2
gentoo-f0389beb3a10f8b8d638fccf0e6a5a1a467cbd43.zip
Revert "dev-ros/camera_calibration: fix broken deps on opencv"
It was actually correct. This reverts commit 40fd31c292c5652251bbdfefa6602002f427df0c.
-rw-r--r--dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild2
-rw-r--r--dev-ros/camera_calibration/camera_calibration-9999.ebuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild
index 83717d53305..417e035b19b 100644
--- a/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild
+++ b/dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild
@@ -18,7 +18,7 @@ IUSE=""
RDEPEND="
dev-ros/cv_bridge[${PYTHON_USEDEP}]
dev-ros/image_geometry[${PYTHON_USEDEP}]
- media-libs/opencv[python,${PYTHON_USEDEP}]
+ || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
dev-ros/message_filters[${PYTHON_USEDEP}]
dev-ros/rospy[${PYTHON_USEDEP}]
dev-ros/std_srvs[${PYTHON_USEDEP}]
diff --git a/dev-ros/camera_calibration/camera_calibration-9999.ebuild b/dev-ros/camera_calibration/camera_calibration-9999.ebuild
index 83717d53305..417e035b19b 100644
--- a/dev-ros/camera_calibration/camera_calibration-9999.ebuild
+++ b/dev-ros/camera_calibration/camera_calibration-9999.ebuild
@@ -18,7 +18,7 @@ IUSE=""
RDEPEND="
dev-ros/cv_bridge[${PYTHON_USEDEP}]
dev-ros/image_geometry[${PYTHON_USEDEP}]
- media-libs/opencv[python,${PYTHON_USEDEP}]
+ || ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
dev-ros/message_filters[${PYTHON_USEDEP}]
dev-ros/rospy[${PYTHON_USEDEP}]
dev-ros/std_srvs[${PYTHON_USEDEP}]