From 50372df13f4e7fad89af8087b41382d01f590bb1 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Tue, 28 Jul 2020 16:59:09 +0200 Subject: dev-ros/roswtf: convert to python-single-r1 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Alexis Ballier --- dev-ros/roswtf/roswtf-1.15.7.ebuild | 15 ++++++++------- dev-ros/roswtf/roswtf-9999.ebuild | 15 ++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) (limited to 'dev-ros/roswtf') diff --git a/dev-ros/roswtf/roswtf-1.15.7.ebuild b/dev-ros/roswtf/roswtf-1.15.7.ebuild index 6bad78a650a1..c9baf4196f78 100644 --- a/dev-ros/roswtf/roswtf-1.15.7.ebuild +++ b/dev-ros/roswtf/roswtf-1.15.7.ebuild @@ -15,13 +15,14 @@ SLOT="0" IUSE="" RDEPEND=" - dev-python/paramiko[${PYTHON_USEDEP}] - dev-ros/roslib[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}]" + $(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]") + dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]") +" DEPEND="${RDEPEND} test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-util/rosdep[${PYTHON_USEDEP}] - dev-util/rosinstall[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]") + $(python_gen_cond_dep "dev-util/rosinstall[\${PYTHON_USEDEP}]") + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )" diff --git a/dev-ros/roswtf/roswtf-9999.ebuild b/dev-ros/roswtf/roswtf-9999.ebuild index 6bad78a650a1..c9baf4196f78 100644 --- a/dev-ros/roswtf/roswtf-9999.ebuild +++ b/dev-ros/roswtf/roswtf-9999.ebuild @@ -15,13 +15,14 @@ SLOT="0" IUSE="" RDEPEND=" - dev-python/paramiko[${PYTHON_USEDEP}] - dev-ros/roslib[${PYTHON_USEDEP}] - dev-python/rospkg[${PYTHON_USEDEP}]" + $(python_gen_cond_dep "dev-python/paramiko[\${PYTHON_USEDEP}]") + dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]") +" DEPEND="${RDEPEND} test? ( - dev-ros/rostest[${PYTHON_USEDEP}] - dev-util/rosdep[${PYTHON_USEDEP}] - dev-util/rosinstall[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_SINGLE_USEDEP}] + $(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]") + $(python_gen_cond_dep "dev-util/rosinstall[\${PYTHON_USEDEP}]") + $(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]") )" -- cgit v1.2.3-65-gdbad