From dd3fd2c52b0a64b3371e534328f5baea43287177 Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@gentoo.org>
Date: Sat, 28 Jan 2017 16:39:52 +0100
Subject: [PATCH] dev-ros/visp_bridge: Bump to kinetic version and 0.9.3. Fix
 build with gcc6.

Package-Manager: Portage-2.3.3, Repoman-2.3.1
---
 dev-ros/visp_bridge/Manifest                 |  1 +
 dev-ros/visp_bridge/files/gcc6.patch         | 13 +++++++++
 dev-ros/visp_bridge/visp_bridge-0.9.3.ebuild | 30 ++++++++++++++++++++
 dev-ros/visp_bridge/visp_bridge-9999.ebuild  |  7 +++--
 4 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 dev-ros/visp_bridge/files/gcc6.patch
 create mode 100644 dev-ros/visp_bridge/visp_bridge-0.9.3.ebuild

diff --git a/dev-ros/visp_bridge/Manifest b/dev-ros/visp_bridge/Manifest
index bff3bdf7a880..14f6b62e9882 100644
--- a/dev-ros/visp_bridge/Manifest
+++ b/dev-ros/visp_bridge/Manifest
@@ -1,2 +1,3 @@
 DIST vision_visp-0.8.0.tar.gz 1010996 SHA256 5166e1f17601328d09716879ceb66135e07bdb71a375765a937e3b78a12b0e54 SHA512 2bf2d69b6e19de21b34869858672662162703ff8b2aea85fdb9a6dafa88d8fe1f97d18587e863f3f7c088697e931a1b6e4e2e37f31fc7caff0906e98debbad1a WHIRLPOOL 015778e4cff63a9dbb5bf5812e38f7564b68cb71886e472062be15ec31a87a7299bff7ef9df50124294e22906420f60075cf6cc69f77df1cd29267b401f655e5
 DIST vision_visp-0.9.1.tar.gz 1014625 SHA256 918bf731a2fab8bd9fa082c0d0f86800710c79eeb9ec5e8b0c8d5baaffb7988d SHA512 f9ce23286fd9c7706364e9d63e6fb3881bad759aeea72313e5d2a24347f152ba90aab1c73d1b468ed3319e99f0a2bcb81208302825c83be686b9528f3b07469e WHIRLPOOL 8af772091c1c3fec475f32ff0d7232b728b3154491c4ed56300221c0ca96661c63c19baa50d6cdf010d1ffc304049f0ea1e7f5c403f15fb028b1417e41ed88b4
+DIST vision_visp-0.9.3.tar.gz 1014883 SHA256 bf51470d167b1ee202dc55348ad54f6398f0f951b3af06fd32d0689b2fa98347 SHA512 e5775e410efefaaac00cdfaf07b65f9f77ade0e7d6f40b3d8345d7b594520f46741f56039c1eb0193c57287bafbddf8e755e10d6f85cc12ddefb2b997681f44a WHIRLPOOL 9163c1aa27f405213aa7290d9e7ecb4b4f6d0daf79879708bd9246fac9eeb3c6b816de3505729b17cb72357e684bb7af9db6688441c42b279089fbdd8116acc0
diff --git a/dev-ros/visp_bridge/files/gcc6.patch b/dev-ros/visp_bridge/files/gcc6.patch
new file mode 100644
index 000000000000..9840509437b5
--- /dev/null
+++ b/dev-ros/visp_bridge/files/gcc6.patch
@@ -0,0 +1,13 @@
+Index: visp_bridge/CMakeLists.txt
+===================================================================
+--- visp_bridge.orig/CMakeLists.txt
++++ visp_bridge/CMakeLists.txt
+@@ -36,7 +36,7 @@ catkin_package(
+ 
+ include_directories(include)
+ 
+-include_directories(SYSTEM
++include_directories(
+   ${VISP_INCLUDE_DIRS}
+   ${catkin_INCLUDE_DIRS}
+   ${Boost_INCLUDE_DIRS}
diff --git a/dev-ros/visp_bridge/visp_bridge-0.9.3.ebuild b/dev-ros/visp_bridge/visp_bridge-0.9.3.ebuild
new file mode 100644
index 000000000000..978d1a71dc44
--- /dev/null
+++ b/dev-ros/visp_bridge/visp_bridge-0.9.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts between ROS structures and ViSP structures"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-libs/ViSP:=[xml]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/camera_calibration_parsers
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_bridge/visp_bridge-9999.ebuild b/dev-ros/visp_bridge/visp_bridge-9999.ebuild
index 8569a26cc17b..978d1a71dc44 100644
--- a/dev-ros/visp_bridge/visp_bridge-9999.ebuild
+++ b/dev-ros/visp_bridge/visp_bridge-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
 ROS_REPO_URI="https://github.com/lagadic/vision_visp"
 KEYWORDS="~amd64 ~arm"
-VER_PREFIX="jade-"
+VER_PREFIX="kinetic-"
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -25,5 +25,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-jade-${PV}/${ROS_SUBDIR}"
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
 fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
-- 
2.26.2