gentoo resync : 30.12.2017

5 files changed, 7 insertions, 54 deletions

diff --git a/dev-ros/urdf/Manifest b/dev-ros/urdf/Manifest
index 4a7f3f4efeb8..ae9c34ad845d 100644
--- a/dev-ros/urdf/Manifest
+++ b/dev-ros/urdf/Manifest
@@ -1,7 +1,4 @@
-AUX forward_decl.patch 685 BLAKE2B 0a8a8132226b377ad79322b51a8e8ae4d4e532857b026c419cb254fc795c9b5e5985dfd94fbf60c15ebe4bc1695ad18fc54e9e847d7687710307ecdc1c534c37 SHA512 042b7bdb4adba13c66423dd7b9f3378d7cdf53f6b5aae47e9a9ba02c6f3639ec0ebb827317b94f404c99d46b5a4cf7497b44ca43189247ffe3014ed546637584
-DIST robot_model-1.12.10.tar.gz 277362 BLAKE2B 48c81b3ed4e8b1d9d94f487fd750f9b1ecb6b555c162d0ee8a90f464589bf30a4c37d80d169f13ec3029715ddd910b3f1bd2bcb5f879d3ee39e44ece35ca3f63 SHA512 cf81bbb63472804f6302d009785b36230e19e17472666332a2b6de40f4365b736c77d766540a471c42f9f98d8ba8b68753c3aadb7e052838fcdb5b4ac6595984
 DIST robot_model-1.12.11.tar.gz 277822 BLAKE2B 3bdd2b931ddfd062594ccb2be4ce6d4863a5fa66f538c3ee48c3600b3be249d267f9d03aa9a701bc6ab22c4297d659a24da668fedcd25c75fe128c43cc781be0 SHA512 8dea6fc72e9beaddbf9a82cb177561cb89c69ef8f58f0c4882598f6cc33a0e10564d9696f07b6f4e3e3404d3f1f5236e54eea4b8d249be0a216cd3ce12a03cde
-EBUILD urdf-1.12.10.ebuild 698 BLAKE2B dccb1e428a1effc773d37cc3a8c48c1e2dda580a814a3c553c32b66ed2d451ac498a56dfec996f227789198339d400e54edecf018447ba3b7770f7b4f8500f44 SHA512 cae43289ea0d7c3241ebb69a17a0366d9e348ddedf05b9b5aae5a8dbbc714ab2544c66de0306fb7a4c2fca27d9c17856ff63b71988f145861db265bc7f7b826f
-EBUILD urdf-1.12.11.ebuild 652 BLAKE2B 9d4e0e5da1979e02dc69238488c44461fd6108c64059e029d5ab3ac1df16286147563d9c97d06f6fbada2a22a77670f52b189d3e2ad79a368704b8a0699a3261 SHA512 780ac6b177f16888698dd6f4ca8703b53c9b6d1f19a23b14b00fd98c2d54dcf657405c50d01fdbc6a5c34749b2c030de8750fc159b2a9c094f87eb9971c7f65b
-EBUILD urdf-9999.ebuild 652 BLAKE2B 1207da8873ebbc0030afa29a60881cd74a299c745b3b4b20aeeffe2eb57ddd63ddc504331a7d130829ace5622241bb48848d356186c22bada9fe528f7d4caa3e SHA512 ab1238012c707aa466cfc548ed2125cc1c0f50927de7f54aa4f08683265fe72dee50a8b71b6144b07797f8e71ced13e719a36fdc2a8b740e66a23bbd523fe5ab
+EBUILD urdf-1.12.11-r1.ebuild 702 BLAKE2B 7921eda8bf3a0a9a2891e0b2b02975f77506a184792d220e73c34bc0999fd9286449c6c22f7c82aa4647650cdac4be22450aab5cf54f91a979bb6e8b74a6ecfa SHA512 7e576f53801f417cada819553989d3f0bd8d71bf1285a9f3eba2b16efa24bd11f575a5b427ba5ef0cdd2b208e019f407bf33bc3dd0a0f1513f6b339751e0e829
+EBUILD urdf-9999.ebuild 702 BLAKE2B 7921eda8bf3a0a9a2891e0b2b02975f77506a184792d220e73c34bc0999fd9286449c6c22f7c82aa4647650cdac4be22450aab5cf54f91a979bb6e8b74a6ecfa SHA512 7e576f53801f417cada819553989d3f0bd8d71bf1285a9f3eba2b16efa24bd11f575a5b427ba5ef0cdd2b208e019f407bf33bc3dd0a0f1513f6b339751e0e829
 MISC metadata.xml 329 BLAKE2B 19512b3b7a48d304223106030d772e2616dcf31024149fa8139bf66cedd5ed39c56e16f09f36e15280b774ce71c3c9965ac48ba0d543df365e559a4643f2fb59 SHA512 901cb37bff7bfd07cd7b6ec49833301caea33cf9696e3a644a1b128d4371b31eee2f3afdab937d39b6da925bab51604a8bb6ea370407d0170133655e9222d988
diff --git a/dev-ros/urdf/files/forward_decl.patch b/dev-ros/urdf/files/forward_decl.patch
deleted file mode 100644
index 8aef13eb92d4..000000000000
--- a/dev-ros/urdf/files/forward_decl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: urdf/urdfdom_compatibility.h.in
-===================================================================
---- urdf.orig/urdfdom_compatibility.h.in
-+++ urdf/urdfdom_compatibility.h.in
-@@ -85,10 +85,12 @@ URDF_TYPEDEF_CLASS_POINTER(Model);
- #include <urdf_world/types.h>
- 
- namespace urdf {
-+class ModelInterface;
- typedef std::shared_ptr<ModelInterface> ModelInterfaceSharedPtr;
- typedef std::shared_ptr<const ModelInterface> ModelInterfaceConstSharedPtr;
- typedef std::weak_ptr<ModelInterface> ModelInterfaceWeakPtr;
- 
-+class Model;
- typedef std::shared_ptr<Model> ModelSharedPtr;
- typedef std::shared_ptr<const Model> ModelConstSharedPtr;
- typedef std::weak_ptr<Model> ModelWeakPtr;
diff --git a/dev-ros/urdf/urdf-1.12.10.ebuild b/dev-ros/urdf/urdf-1.12.11-r1.ebuild
index 260fee45fc0f..eaa16e63dedc 100644
--- a/dev-ros/urdf/urdf-1.12.10.ebuild
+++ b/dev-ros/urdf/urdf-1.12.11-r1.ebuild
@@ -20,12 +20,12 @@ RDEPEND="
 	dev-libs/urdfdom_headers
 	dev-ros/urdf_parser_plugin
 	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
 	dev-ros/rosconsole_bridge
+		dev-libs/console_bridge:=
 	dev-ros/roscpp
 	dev-libs/tinyxml
 "
 DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}/forward_decl.patch" )
diff --git a/dev-ros/urdf/urdf-1.12.11.ebuild b/dev-ros/urdf/urdf-1.12.11.ebuild
deleted file mode 100644
index 7e228f156c7d..000000000000
--- a/dev-ros/urdf/urdf-1.12.11.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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-9999.ebuild b/dev-ros/urdf/urdf-9999.ebuild
index 3e7efcdf9807..eaa16e63dedc 100644
--- a/dev-ros/urdf/urdf-9999.ebuild
+++ b/dev-ros/urdf/urdf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -20,7 +20,9 @@ RDEPEND="
 	dev-libs/urdfdom_headers
 	dev-ros/urdf_parser_plugin
 	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
 	dev-ros/rosconsole_bridge
+		dev-libs/console_bridge:=
 	dev-ros/roscpp
 	dev-libs/tinyxml
 "