dev-ros/rviz: install ressources in /usr/share/ros_packages since the…

…y are expected here.

Package-Manager: portage-2.3.2

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}
+ )

dev-ros/rviz/rviz-1.12.3.ebuild → 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" )