From: Alexis Ballier <aballier@gentoo.org>
Date: Thu, 19 Nov 2015 09:47:48 +0000 (+0100)
Subject: dev-util/catkin: Add env.d file; moved from roslaunch.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e36fcade64d0da8cd1c0d121f83c1bf9fbc98025;p=gentoo.git

dev-util/catkin: Add env.d file; moved from roslaunch.

Package-Manager: portage-2.2.25
Signed-off-by: Alexis Ballier <aballier@gentoo.org>
---

diff --git a/dev-util/catkin/catkin-0.6.16.ebuild b/dev-util/catkin/catkin-0.6.16.ebuild
index 53f670a52f95..b4904c8bbb25 100644
--- a/dev-util/catkin/catkin-0.6.16.ebuild
+++ b/dev-util/catkin/catkin-0.6.16.ebuild
@@ -90,6 +90,9 @@ catkin_src_install_internal() {
 
 src_install() {
 	python_foreach_impl catkin_src_install_internal
+
+	doenvd "${FILESDIR}/40catkin"
+
 	# needed to be considered as a workspace
 	touch "${ED}/usr/.catkin"
 }
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index 53f670a52f95..b4904c8bbb25 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -90,6 +90,9 @@ catkin_src_install_internal() {
 
 src_install() {
 	python_foreach_impl catkin_src_install_internal
+
+	doenvd "${FILESDIR}/40catkin"
+
 	# needed to be considered as a workspace
 	touch "${ED}/usr/.catkin"
 }
diff --git a/dev-util/catkin/files/40catkin b/dev-util/catkin/files/40catkin
new file mode 100644
index 000000000000..46a6edf00ca1
--- /dev/null
+++ b/dev-util/catkin/files/40catkin
@@ -0,0 +1,3 @@
+CATKIN_PREFIX_PATH=/usr
+ROS_ROOT=/usr/share/ros
+ROS_PACKAGE_PATH=/usr/share