[gentoo-commits] repo/gentoo:master commit in: dev-ros/rviz/, dev-ros/rviz/files/

[Alexis Ballier]

commit:     87c4ac3e7b69fa9b6141f93d38461ce846431ab2
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 20 12:02:04 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 20 12:12:19 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87c4ac3e

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 ++++++++++++++++++++++
 .../{rviz-1.12.3.ebuild => rviz-1.12.3-r1.ebuild}  |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/dev-ros/rviz/files/install_loc.patch 
b/dev-ros/rviz/files/install_loc.patch
new file mode 100644
index 00000000..a77968d
--- /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 91649dd..9a57761 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" )