From 389b589a7027a41c2499ece4a22081501b0758f5 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Wed, 28 Sep 2016 13:01:19 +0200
Subject: dev-ros/opencv_tests: use PYTHON_USEDEPS on opencv

Package-Manager: portage-2.3.1
---
 dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild | 33 ++++++++++++++++++++++
 dev-ros/opencv_tests/opencv_tests-1.12.1.ebuild    | 33 ----------------------
 dev-ros/opencv_tests/opencv_tests-9999.ebuild      |  4 +--
 3 files changed, 35 insertions(+), 35 deletions(-)
 create mode 100644 dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild
 delete mode 100644 dev-ros/opencv_tests/opencv_tests-1.12.1.ebuild

(limited to 'dev-ros/opencv_tests')

diff --git a/dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..00dc8ea01a28
--- /dev/null
+++ b/dev-ros/opencv_tests/opencv_tests-1.12.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+# Be careful: It needs opencv with python support but opencv is python-single-r1
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tests for ROS OpenCV integration"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	media-libs/opencv[python,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	insinto /usr/share/${PN}/launch
+	doins launch/*.launch
+	exeinto /usr/libexec/${PN}
+	doexe nodes/*
+}
diff --git a/dev-ros/opencv_tests/opencv_tests-1.12.1.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.1.ebuild
deleted file mode 100644
index 6080be574720..000000000000
--- a/dev-ros/opencv_tests/opencv_tests-1.12.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
-KEYWORDS="~amd64 ~arm"
-# Be careful: It needs opencv with python support but opencv is python-single-r1
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tests for ROS OpenCV integration"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,python_single_target_python2_7]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	ros-catkin_src_install
-	insinto /usr/share/${PN}/launch
-	doins launch/*.launch
-	exeinto /usr/libexec/${PN}
-	doexe nodes/*
-}
diff --git a/dev-ros/opencv_tests/opencv_tests-9999.ebuild b/dev-ros/opencv_tests/opencv_tests-9999.ebuild
index 770ea0be049c..00dc8ea01a28 100644
--- a/dev-ros/opencv_tests/opencv_tests-9999.ebuild
+++ b/dev-ros/opencv_tests/opencv_tests-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ IUSE=""
 RDEPEND="
 	dev-ros/cv_bridge[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
-	media-libs/opencv[python,python_single_target_python2_7]
+	media-libs/opencv[python,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
-- 
cgit v1.2.3-65-gdbad