From 716f1f2c35aa172d293c3957a8dcbb5ea2034f50 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Thu, 20 Oct 2016 14:10:09 +0200
Subject: [PATCH] dev-ros/rviz_plugin_tutorials: install ressources in
 /usr/share/ros_packages since they are expected here.

Package-Manager: portage-2.3.2
---
 .../files/install_loc.patch                   | 24 +++++++++++++++++++
 ...=> rviz_plugin_tutorials-0.10.1-r1.ebuild} |  3 ++-
 .../rviz_plugin_tutorials-9999.ebuild         |  3 ++-
 3 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 dev-ros/rviz_plugin_tutorials/files/install_loc.patch
 rename dev-ros/rviz_plugin_tutorials/{rviz_plugin_tutorials-0.10.1.ebuild => rviz_plugin_tutorials-0.10.1-r1.ebuild} (82%)

diff --git a/dev-ros/rviz_plugin_tutorials/files/install_loc.patch b/dev-ros/rviz_plugin_tutorials/files/install_loc.patch
new file mode 100644
index 0000000000000..8ebf1233956c2
--- /dev/null
+++ b/dev-ros/rviz_plugin_tutorials/files/install_loc.patch
@@ -0,0 +1,24 @@
+Install ressources in ros_packages subdir. We force catkin to install packages
+there, so move them too.
+
+Index: rviz_plugin_tutorials/CMakeLists.txt
+===================================================================
+--- rviz_plugin_tutorials.orig/CMakeLists.txt
++++ rviz_plugin_tutorials/CMakeLists.txt
+@@ -73,13 +73,13 @@ install(TARGETS
+ 
+ install(FILES
+   plugin_description.xml
+-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
++  DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME})
+ 
+ install(DIRECTORY media/
+-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/media)
++  DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}/media)
+ 
+ install(DIRECTORY icons/
+-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/icons)
++  DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}/icons)
+ 
+ install(PROGRAMS scripts/send_test_msgs.py
+   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild
similarity index 82%
rename from dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1.ebuild
rename to dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild
index 770d6853e776b..666d6023e647a 100644
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1.ebuild
+++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.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$
 
@@ -20,3 +20,4 @@ RDEPEND="
 	dev-qt/qtgui:4
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/install_loc.patch" )
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
index 770d6853e776b..666d6023e647a 100644
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
+++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-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$
 
@@ -20,3 +20,4 @@ RDEPEND="
 	dev-qt/qtgui:4
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/install_loc.patch" )