From: Alexis Ballier Date: Wed, 23 Sep 2015 13:14:30 +0000 (+0200) Subject: Revert "dev-ros/camera_calibration: fix broken deps on opencv" X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f0389beb3a10f8b8d638fccf0e6a5a1a467cbd43;p=gentoo.git Revert "dev-ros/camera_calibration: fix broken deps on opencv" It was actually correct. This reverts commit 40fd31c292c5652251bbdfefa6602002f427df0c. --- 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 83717d533054..417e035b19bc 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 83717d533054..417e035b19bc 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}]