From: "Alexis Ballier" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ros/camera_calibration/
Date: Wed, 23 Sep 2015 13:14:56 +0000 (UTC) [thread overview]
Message-ID: <1443014070.f0389beb3a10f8b8d638fccf0e6a5a1a467cbd43.aballier@gentoo> (raw)
commit: f0389beb3a10f8b8d638fccf0e6a5a1a467cbd43
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 23 13:14:30 2015 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 23 13:14:30 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0389beb
Revert "dev-ros/camera_calibration: fix broken deps on opencv"
It was actually correct.
This reverts commit 40fd31c292c5652251bbdfefa6602002f427df0c.
dev-ros/camera_calibration/camera_calibration-1.12.14.ebuild | 2 +-
dev-ros/camera_calibration/camera_calibration-9999.ebuild | 2 +-
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 83717d5..417e035 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 83717d5..417e035 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}]
next reply other threads:[~2015-09-23 13:15 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-23 13:14 Alexis Ballier [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-27 14:05 [gentoo-commits] repo/gentoo:master commit in: dev-ros/camera_calibration/ Alexis Ballier
2022-03-08 18:03 Alexis Ballier
2021-01-05 20:03 Alexis Ballier
2020-08-25 12:37 Alexis Ballier
2020-08-05 15:30 Alexis Ballier
2020-07-09 11:45 Alexis Ballier
2020-07-09 11:45 Alexis Ballier
2020-07-09 11:45 Alexis Ballier
2019-12-10 17:35 Alexis Ballier
2018-05-15 6:37 Alexis Ballier
2017-12-20 16:54 Alexis Ballier
2017-11-07 19:24 Alexis Ballier
2017-05-02 10:22 Alexis Ballier
2016-07-26 10:04 Alexis Ballier
2016-07-18 12:13 Alexis Ballier
2016-03-24 11:18 Alexis Ballier
2016-01-19 12:18 Alexis Ballier
2015-09-23 13:10 Alexis Ballier
2015-09-23 12:05 Alexis Ballier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1443014070.f0389beb3a10f8b8d638fccf0e6a5a1a467cbd43.aballier@gentoo \
--to=aballier@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox