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