8 files changed, 22 insertions, 157 deletions
diff --git a/dev-ros/urdf/Manifest b/dev-ros/urdf/Manifest
index 4943c9c4053e..e1808ab34552 100644
--- a/dev-ros/urdf/Manifest
+++ b/dev-ros/urdf/Manifest
@@ -1,6 +1 @@
-DIST robot_model-1.11.10.tar.gz 1292754 SHA256 a43a17e8f19a41fba5660f94eb40e89f2b3fecab81fe8b54f657d430dd936cd4 SHA512 95770807d22de4581a87e7297fc9f9e0e781ad2a8f273a3f4781ac2864f53b73b408dde9c696aa934bab1dada5bac396a8c65d62e4a941884cc9966c680da4a8 WHIRLPOOL c41f637723ac00331abf0d52d9b6d6546205d25e0adc972b4cc793ce4a9351e0246bf42d59a5755532ca54bdc186b6055b2412777601bcbfc09d1399a0b46292
-DIST robot_model-1.11.8.tar.gz 364741 SHA256 781a0510136a820d217862f7491183b3deeadaf18aa0fabeb28d79e365510e12 SHA512 65471bb58c7383987f587a61f9e32fbd991c4eb26f1d5a819db8a5f456def7566ab9d16ab343a885fba73e0a017f5729815501356ef85b6aff0b4f0544a41212 WHIRLPOOL 95a9e654c1e7324593d2671a37b4c16aeee373450d5cb52508435b643c80c72c7263506914459c3c320af47355129dc0e906cdfb30d0e3bda1fd418e016e3a39
-DIST robot_model-1.11.9.tar.gz 1292675 SHA256 145d43c32cb93888f8555bdcbce48ea417515fb17dbd2445fa1ed7ac32e2399b SHA512 10afe675739746ba313d5c3b4758940c9896bd96fbd3b81fb4809d18cf39d49b36e9b24b28af38f700a65c7c2fb572186dc3920ab2cbd190cc79b485c54eb78d WHIRLPOOL cc176a18819258d6c2af33024b1f92e301f656949d0073f90659b22dd7532708b65b1fefaa3d684bf0f425acb66225eb25bc96bf6272bacbd733451e7e549ec5
-DIST robot_model-1.12.0.tar.gz 1292282 SHA256 942edd173fde0efd3c7dab03a30cc1b96b9aa513ed914f00b45f603476ec46fe SHA512 6faf6219788d6cbd6765ff1cb55e7cbc1f3bc414f3f83ac0d46ff7a8617cfe477871104eef846c9a47ffb09c69a948d080e199d455d1269fe043ed11a7d1e335 WHIRLPOOL c487eaea77598b8663d3239142864da9b2dd02d8f6ec321e9beb88ec31fa03d90d77e1fcd7bc0ea7b9afda168a4c46ee4f27b4f8867e70ef9f7ab3d3e00a9e3e
-DIST robot_model-1.12.2.tar.gz 1291779 SHA256 49543ae6f31a2e0f02730e00b926a1a0d3b7e97aa98e1ce27ff3bfd1114806f9 SHA512 39c7c893047ea5e21e9598e3e0b8ca3d2f8a256d1d06ddf419f953bffafb73199f8865f872416ec9c0570cf6cad180d5e1498af13033d1c42b54a640b14e9020 WHIRLPOOL 08b387d4aeca0f97315ad33f2f3efc7ac2323a05ca7ea3cb9e3bd36be858be454882508553a9bd4ad42d0650e43d31fd4e90800fff719877172f5ffc7efd5048
 DIST robot_model-1.12.3.tar.gz 1292139 SHA256 4b2bf070e4d07450fd9977a62c260e8abb40645ff9fcf5f5781f505a8b61b194 SHA512 eae18db87bdd7fc867868493f54f1812358f1a301c88fc7eae611fa75bc2418165b5cb2f5c5839f3cb644d4c1f560f85d84b635ffbecaa631c78a3176d1fb6db WHIRLPOOL c555faee5282942db894866a08aa3a675c6db618fce2acdd1f67d622cf1c0a8e5747f5f9a5217b4fc83997f9bb9125f1c7f2ca6b77e9fd75244f121b48a77f66
diff --git a/dev-ros/urdf/files/urdfdom1.patch b/dev-ros/urdf/files/urdfdom1.patch
new file mode 100644
index 000000000000..aa1d31ce9788
--- /dev/null
+++ b/dev-ros/urdf/files/urdfdom1.patch
@@ -0,0 +1,13 @@
+Index: urdf/src/model.cpp
+===================================================================
+--- urdf.orig/src/model.cpp
++++ urdf/src/model.cpp
+@@ -136,7 +136,7 @@ bool Model::initXml(TiXmlElement *robot_
+ 
+ bool Model::initString(const std::string& xml_string)
+ {
+-  boost::shared_ptr<ModelInterface> model;
++  std::shared_ptr<ModelInterface> model;
+ 
+   // necessary for COLLADA compatibility
+   if( IsColladaData(xml_string) ) {
diff --git a/dev-ros/urdf/urdf-1.11.10.ebuild b/dev-ros/urdf/urdf-1.11.10.ebuild
deleted file mode 100644
index e406d8de61e2..000000000000
--- a/dev-ros/urdf/urdf-1.11.10.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-libs/urdfdom
-	dev-libs/urdfdom_headers
-	dev-ros/urdf_parser_plugin
-	dev-ros/pluginlib
-	dev-ros/rosconsole_bridge
-	dev-ros/roscpp
-	dev-libs/tinyxml
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf/urdf-1.11.8.ebuild b/dev-ros/urdf/urdf-1.11.8.ebuild
deleted file mode 100644
index e0ec2afa5395..000000000000
--- a/dev-ros/urdf/urdf-1.11.8.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-libs/urdfdom
-	dev-libs/urdfdom_headers
-	dev-ros/urdf_parser_plugin
-	dev-ros/pluginlib
-	dev-ros/rosconsole_bridge
-	dev-ros/roscpp
-	dev-libs/tinyxml
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest dev-cpp/gtest )"
diff --git a/dev-ros/urdf/urdf-1.11.9.ebuild b/dev-ros/urdf/urdf-1.11.9.ebuild
deleted file mode 100644
index e406d8de61e2..000000000000
--- a/dev-ros/urdf/urdf-1.11.9.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-libs/urdfdom
-	dev-libs/urdfdom_headers
-	dev-ros/urdf_parser_plugin
-	dev-ros/pluginlib
-	dev-ros/rosconsole_bridge
-	dev-ros/roscpp
-	dev-libs/tinyxml
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf/urdf-1.12.0.ebuild b/dev-ros/urdf/urdf-1.12.0.ebuild
deleted file mode 100644
index e406d8de61e2..000000000000
--- a/dev-ros/urdf/urdf-1.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-libs/urdfdom
-	dev-libs/urdfdom_headers
-	dev-ros/urdf_parser_plugin
-	dev-ros/pluginlib
-	dev-ros/rosconsole_bridge
-	dev-ros/roscpp
-	dev-libs/tinyxml
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf/urdf-1.12.2.ebuild b/dev-ros/urdf/urdf-1.12.2.ebuild
deleted file mode 100644
index e406d8de61e2..000000000000
--- a/dev-ros/urdf/urdf-1.12.2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/robot_model"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="C++ parser for the Unified Robot Description Format (URDF)"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-libs/urdfdom
-	dev-libs/urdfdom_headers
-	dev-ros/urdf_parser_plugin
-	dev-ros/pluginlib
-	dev-ros/rosconsole_bridge
-	dev-ros/roscpp
-	dev-libs/tinyxml
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/urdf/urdf-1.12.3.ebuild b/dev-ros/urdf/urdf-1.12.3-r1.ebuild
index e6cb39f0afa6..eb2263d99d4d 100644
--- a/dev-ros/urdf/urdf-1.12.3.ebuild
+++ b/dev-ros/urdf/urdf-1.12.3-r1.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" )
+
+src_configure() {
+	append-cxxflags -std=c++11
+	ros-catkin_src_configure
+}