From: Alexis Ballier <aballier@gentoo.org>
Date: Tue, 1 Nov 2016 14:43:12 +0000 (+0100)
Subject: dev-ros/urdf: forward port urdfdom1 fix.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8d9c9f21d37199f0b7a93bd51cfe8259e4723089;p=gentoo.git

dev-ros/urdf: forward port urdfdom1 fix.

Package-Manager: portage-2.3.2
---

diff --git a/dev-ros/urdf/files/ns.patch b/dev-ros/urdf/files/ns.patch
new file mode 100644
index 000000000000..b8d482b1aed0
--- /dev/null
+++ b/dev-ros/urdf/files/ns.patch
@@ -0,0 +1,17 @@
+Index: urdf/urdfdom_compatibility.h.in
+===================================================================
+--- urdf.orig/urdfdom_compatibility.h.in
++++ urdf/urdfdom_compatibility.h.in
+@@ -75,9 +75,9 @@ URDF_TYPEDEF_CLASS_POINTER(ModelInterfac
+ 
+ #else // urdfdom <= 0.4
+ 
+-typedef std::shared_ptr<ModelInterface> ModelInterfaceSharedPtr;
+-typedef std::shared_ptr<const ModelInterface> ModelInterfaceConstSharedPtr;
+-typedef std::weak_ptr<ModelInterface> ModelInterfaceWeakPtr;
++typedef std::shared_ptr<urdf::ModelInterface> ModelInterfaceSharedPtr;
++typedef std::shared_ptr<const urdf::ModelInterface> ModelInterfaceConstSharedPtr;
++typedef std::weak_ptr<urdf::ModelInterface> ModelInterfaceWeakPtr;
+ 
+ #endif // urdfdom > 0.4
+ 
diff --git a/dev-ros/urdf/urdf-1.12.5.ebuild b/dev-ros/urdf/urdf-1.12.5.ebuild
index e6cb39f0afa6..5e70f568f76e 100644
--- a/dev-ros/urdf/urdf-1.12.5.ebuild
+++ b/dev-ros/urdf/urdf-1.12.5.ebuild
@@ -8,7 +8,7 @@ KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 PYTHON_COMPAT=( python2_7 )
 
-inherit ros-catkin
+inherit ros-catkin flag-o-matic
 
 DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
 LICENSE="BSD"
@@ -17,9 +17,9 @@ IUSE=""
 
 RDEPEND="
 	dev-libs/boost:=[threads]
-	dev-libs/urdfdom
+	>=dev-libs/urdfdom-1
 	dev-libs/urdfdom_headers
-	dev-ros/urdf_parser_plugin
+	>=dev-ros/urdf_parser_plugin-1.12.3-r1
 	dev-ros/pluginlib
 	dev-ros/rosconsole_bridge
 	dev-ros/roscpp
@@ -28,3 +28,9 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/urdfdom1.patch" "${FILESDIR}/ns.patch" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	ros-catkin_src_configure
+}