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

Package-Manager: portage-2.3.2
---
 dev-ros/rviz/files/install_loc.patch          | 30 +++++++++++++++++++
 ...iz-1.12.3.ebuild => rviz-1.12.3-r1.ebuild} |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 dev-ros/rviz/files/install_loc.patch
 rename dev-ros/rviz/{rviz-1.12.3.ebuild => rviz-1.12.3-r1.ebuild} (95%)

diff --git a/dev-ros/rviz/files/install_loc.patch b/dev-ros/rviz/files/install_loc.patch
new file mode 100644
index 000000000000..a77968db860a
--- /dev/null
+++ b/dev-ros/rviz/files/install_loc.patch
@@ -0,0 +1,30 @@
+Install ressources in ros_packages subdir. We force catkin to install packages
+there, so move them too.
+
+Index: rviz-1.12.3/CMakeLists.txt
+===================================================================
+--- rviz-1.12.3.orig/CMakeLists.txt
++++ rviz-1.12.3/CMakeLists.txt
+@@ -220,17 +220,17 @@ include_directories(src ${catkin_INCLUDE
+ add_subdirectory(src)
+ 
+ install(DIRECTORY ogre_media
+-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
++	DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}
+ )
+ install(DIRECTORY icons
+-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
++	DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}
+ )
+ install(DIRECTORY images
+-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
++	DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}
+ )
+ install(FILES default.rviz
+-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
++	DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}
+ )
+ install(FILES plugin_description.xml
+-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
++	DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/ros_packages/${PROJECT_NAME}
+ )
diff --git a/dev-ros/rviz/rviz-1.12.3.ebuild b/dev-ros/rviz/rviz-1.12.3-r1.ebuild
similarity index 95%
rename from dev-ros/rviz/rviz-1.12.3.ebuild
rename to dev-ros/rviz/rviz-1.12.3-r1.ebuild
index 91649dd6264e..9a57761fbe3e 100644
--- a/dev-ros/rviz/rviz-1.12.3.ebuild
+++ b/dev-ros/rviz/rviz-1.12.3-r1.ebuild
@@ -60,7 +60,7 @@ DEPEND="${RDEPEND}
 		dev-ros/rostest[${PYTHON_USEDEP}]
 		dev-cpp/gtest
 	)"
-PATCHES=( "${FILESDIR}/urdfdom1-2.patch" )
+PATCHES=( "${FILESDIR}/urdfdom1-2.patch" "${FILESDIR}/install_loc.patch" )
 
 src_configure() {
 	local mycatkincmakeargs=( "-DUseQt5=ON" )
-- 
2.26.2