[gentoo-commits] repo/gentoo:master commit in: dev-ros/collada_urdf/

[Alexis Ballier]

commit:     95fea4f3d4f6d9db9719d5b44e46f15ee13fc047
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 14:44:42 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 14:54:20 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95fea4f3

dev-ros/collada_urdf: forward port urdfdom1 fix.

Package-Manager: portage-2.3.2

 dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild
index bea7a16..ccf46f3 100644
--- a/dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild
+++ b/dev-ros/collada_urdf/collada_urdf-1.12.5.ebuild
@@ -7,7 +7,7 @@ ROS_REPO_URI="https://github.com/ros/robot_model"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=${PN}
 
-inherit ros-catkin
+inherit ros-catkin flag-o-matic
 
 DESCRIPTION="Tool to convert Unified Robot Description Format (URDF) documents into COLLADA documents"
 LICENSE="BSD"
@@ -19,11 +19,20 @@ RDEPEND="
 	dev-ros/angles
 	dev-ros/collada_parser
 	dev-ros/resource_retriever
-	dev-ros/urdf
+	>=dev-ros/urdf-1.12.3-r1
 	dev-ros/geometric_shapes
 	dev-ros/tf
 	media-libs/assimp
 	dev-libs/tinyxml
 	dev-libs/collada-dom
+	>=dev-libs/urdfdom-1:=
+	dev-cpp/eigen:3
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/urdfdom1.patch" )
+
+src_configure() {
+	append-cppflags `pkg-config --cflags eigen3`
+	append-cxxflags -std=gnu++11
+	ros-catkin_src_configure
+}