From: Alexis Ballier <aballier@gentoo.org>
Date: Tue, 6 Feb 2018 15:50:11 +0000 (+0100)
Subject: dev-ros/roslib: follow upstream and depend on ros_environment
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8b852669d1ec7313b9774bdc0e87c2dcf78e2371;p=gentoo.git

dev-ros/roslib: follow upstream and depend on ros_environment

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---

diff --git a/dev-ros/roslib/roslib-1.14.3.ebuild b/dev-ros/roslib/roslib-1.14.3.ebuild
index 6289b8f1d50c..f7f039b0555d 100644
--- a/dev-ros/roslib/roslib-1.14.3.ebuild
+++ b/dev-ros/roslib/roslib-1.14.3.ebuild
@@ -19,10 +19,10 @@ RDEPEND="
 	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
 	dev-libs/boost:=[threads]
 	dev-ros/rospack
+	dev-ros/ros_environment
 "
 DEPEND="${RDEPEND}
 	test? (
 		dev-cpp/gtest
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
-PATCHES=( "${FILESDIR}/envhook.patch" )
diff --git a/dev-ros/roslib/roslib-9999.ebuild b/dev-ros/roslib/roslib-9999.ebuild
index 1866c312cfe9..f7f039b0555d 100644
--- a/dev-ros/roslib/roslib-9999.ebuild
+++ b/dev-ros/roslib/roslib-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,10 +19,10 @@ RDEPEND="
 	>=dev-python/rospkg-1.0.37[${PYTHON_USEDEP}]
 	dev-libs/boost:=[threads]
 	dev-ros/rospack
+	dev-ros/ros_environment
 "
 DEPEND="${RDEPEND}
 	test? (
 		dev-cpp/gtest
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
-PATCHES=( "${FILESDIR}/envhook.patch" )