dev-ros/rviz_plugin_tutorials: install ressources in /usr/share/ros_p…

…ackages since they are expected here. Package-Manager: portage-2.3.2
johu · Oct 20, 2016 · 716f1f2 · 716f1f2
1 parent b93b648
commit 716f1f2
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/dev-ros/rviz_plugin_tutorials/files/install_loc.patch 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/...rials/rviz_plugin_tutorials-0.10.1.ebuild → ...ls/rviz_plugin_tutorials-0.10.1-r1.ebuild b/...rials/rviz_plugin_tutorials-0.10.1.ebuild → ...ls/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
@@ -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" )