From b12c2eefa7918914d610e06154fb399f02e9a743 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Mon, 28 Nov 2016 15:32:24 +0100
Subject: dev-ros/rviz_plugin_tutorials: drop install path patch now that
 rospack returns a correct one.

Package-Manager: portage-2.3.2
---
 .../rviz_plugin_tutorials/files/install_loc.patch  | 24 ----------------------
 .../rviz_plugin_tutorials-0.10.1-r1.ebuild         | 23 ---------------------
 .../rviz_plugin_tutorials-0.10.1-r2.ebuild         | 22 ++++++++++++++++++++
 .../rviz_plugin_tutorials-9999.ebuild              |  1 -
 4 files changed, 22 insertions(+), 48 deletions(-)
 delete mode 100644 dev-ros/rviz_plugin_tutorials/files/install_loc.patch
 delete mode 100644 dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild
 create mode 100644 dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r2.ebuild

diff --git a/dev-ros/rviz_plugin_tutorials/files/install_loc.patch b/dev-ros/rviz_plugin_tutorials/files/install_loc.patch
deleted file mode 100644
index 8ebf1233956c..000000000000
--- a/dev-ros/rviz_plugin_tutorials/files/install_loc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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-r1.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild
deleted file mode 100644
index 666d6023e647..000000000000
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Tutorials showing how to write plugins for RViz"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rviz
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/install_loc.patch" )
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r2.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r2.ebuild
new file mode 100644
index 000000000000..5c64654ad3a3
--- /dev/null
+++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.1-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-visualization/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tutorials showing how to write plugins for RViz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rviz
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+"
+DEPEND="${RDEPEND}"
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 666d6023e647..5c64654ad3a3 100644
--- a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
+++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
@@ -20,4 +20,3 @@ RDEPEND="
 	dev-qt/qtgui:4
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/install_loc.patch" )
-- 
cgit v1.2.3-65-gdbad