gentoo resync : 30.12.2017

6 files changed, 221 insertions, 65 deletions

diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index 0ea55e64c85c..afbd06f395b8 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1,8 +1,5 @@
-DIST geometric_shapes-0.5.1.tar.gz 57055 BLAKE2B 6d5ad2432294ab4c32e6b42022fd23ea26e2ff8718542b331f26cd1ac2f3121dc5e47cb31564191031801572b38a70170e487806bade0b52e54816881ba9f03f SHA512 40e5047f53dcc1d60174cbadffcca646fee8abf139dff8bb52c227e245ddebbb617b3b82e52dc493796f1cb376a2e3864b1c58c040987bb334b5f7f4e6461cc6
-DIST geometric_shapes-0.5.2.tar.gz 60624 BLAKE2B 5dea66604fa46d3e83b16123f8c5e9fdd60a005171f60ffbaef48ce548df255561763097ace9b58e578859e458abece3a3dfa19b75b57661d00ee8156f525fa6 SHA512 6ea061cd3bca555a82e99ad58616dc01a32d5240a41b249c006f6e8123977155ce00ae412f9038ac6b53e2755ce533a25fe2371b0e643e5a11493c1c2ffcb0ff
+AUX logging.patch 8504 BLAKE2B 5d1efc6613a64084c3d927b7e9e026e063de21b3e211c7f12fa26f6bc882390de47bfe7a4491f6096dd73ed73c84c2e1d4f08da9b9083351c45d910b709f02e2 SHA512 747925609a4e029344c1ba0e50fb50caf637720824aa0d086d853f9c0f5ab2ca03c98d9f1b9d79240d5b3536637ac8d604607d63613c028d1e91df6247796b4e
 DIST geometric_shapes-0.5.3.tar.gz 60799 BLAKE2B 77bfde8f7b1f3e11bd4bb12c82374e34ca0efc0f75125a1c5a58d4ce797feb70b70803526f4b8cbdf651d762082a4bbcb03df5e6ace2bdc69ed84be20a963731 SHA512 13c1b85cab4d0d5d35bd010927a5fd789312b4c11667ee73295722067968504054a8f24628db2f78782078ff3cbcd6878bd403979c29526b2183c3ae2414b2b1
-EBUILD geometric_shapes-0.5.1.ebuild 676 BLAKE2B 14be80a2cfe0f305056b811125dc47b47b4b7ed094f951972dbf02bed32d0da96f151bfadfd6b19e9de015a67e93575debe211358d539bc9b8f8cae55e2a7f1f SHA512 d6bcf383b6a4517c061a4f3ad2a716cdc5bc445f20af577bd7012ac93e7ea1d9ee8e67062238433a5679b6c69438a9e21bfc30fda153d68158048e7fbd515400
-EBUILD geometric_shapes-0.5.2.ebuild 676 BLAKE2B 14be80a2cfe0f305056b811125dc47b47b4b7ed094f951972dbf02bed32d0da96f151bfadfd6b19e9de015a67e93575debe211358d539bc9b8f8cae55e2a7f1f SHA512 d6bcf383b6a4517c061a4f3ad2a716cdc5bc445f20af577bd7012ac93e7ea1d9ee8e67062238433a5679b6c69438a9e21bfc30fda153d68158048e7fbd515400
-EBUILD geometric_shapes-0.5.3.ebuild 676 BLAKE2B 2a4c222128bf5789beff8553eb2d7b1dfb0c271e469d53dbe09256b74fbda14c2165162be056e87907a2237aedd20b05afa89333cb3b99afdd301e73199e506a SHA512 dc9b7f28a8d23013025b244159f39138402c94ea4ceea99d16d0d9d4666a03d0a423648c7f88e43144ed0672f9e79f7439198f72b7fd1e9c99f97ce81cd72084
-EBUILD geometric_shapes-9999.ebuild 676 BLAKE2B 14be80a2cfe0f305056b811125dc47b47b4b7ed094f951972dbf02bed32d0da96f151bfadfd6b19e9de015a67e93575debe211358d539bc9b8f8cae55e2a7f1f SHA512 d6bcf383b6a4517c061a4f3ad2a716cdc5bc445f20af577bd7012ac93e7ea1d9ee8e67062238433a5679b6c69438a9e21bfc30fda153d68158048e7fbd515400
+EBUILD geometric_shapes-0.5.3-r1.ebuild 743 BLAKE2B c1309d2ab2ae4dad4902ccfba8ed097c644918f5be10cd45a4ab1f5a218a73790ff6688176798f447a284a218120b4368fa1228f36f0d54872a8df921a9d2f81 SHA512 4bb3d115087ec084608da1a5c00e4023e9c91058d547406ed04b5c5a232cb52ef803edf73b07687209e033589a25bd37e0bc9193753064fcea36d0d44a0d5571
+EBUILD geometric_shapes-9999.ebuild 743 BLAKE2B c1309d2ab2ae4dad4902ccfba8ed097c644918f5be10cd45a4ab1f5a218a73790ff6688176798f447a284a218120b4368fa1228f36f0d54872a8df921a9d2f81 SHA512 4bb3d115087ec084608da1a5c00e4023e9c91058d547406ed04b5c5a232cb52ef803edf73b07687209e033589a25bd37e0bc9193753064fcea36d0d44a0d5571
 MISC metadata.xml 343 BLAKE2B 583ed67450346fcbca09f5714c29d20e728f827c1448ce275683f600b6f87d3f00337dfbf39b694906787b5db9dfc878a316121eb7922494ce631b9a8b9b3e2c SHA512 10c40ddc16c176ed5503b7d098bc133e85973301631878b36f793df95fe2c55576cacaaf2cbfcc9152cb0659394d7ab7c5fca72cbdba32c5310b4a2ce7b365c8
diff --git a/dev-ros/geometric_shapes/files/logging.patch b/dev-ros/geometric_shapes/files/logging.patch
new file mode 100644
index 000000000000..06036ad5dcee
--- /dev/null
+++ b/dev-ros/geometric_shapes/files/logging.patch
@@ -0,0 +1,213 @@
+https://github.com/ros-planning/geometric_shapes/issues/71
+
+Index: geometric_shapes-0.5.3/src/bodies.cpp
+===================================================================
+--- geometric_shapes-0.5.3.orig/src/bodies.cpp
++++ geometric_shapes-0.5.3/src/bodies.cpp
+@@ -788,7 +788,7 @@ void bodies::ConvexMesh::useDimensions(c
+ 
+   if (exitcode != 0)
+   {
+-    logWarn("Convex hull creation failed");
++    CONSOLE_BRIDGE_logWarn("Convex hull creation failed");
+     qh_freeqhull (!qh_ALL);
+     int curlong, totlong;
+     qh_memfreeshort (&curlong, &totlong);
+@@ -1174,7 +1174,7 @@ void bodies::BodyVector::setPose(unsigne
+ {
+   if (i >= bodies_.size())
+   {
+-    logError("There is no body at index %u", i);
++    CONSOLE_BRIDGE_logError("There is no body at index %u", i);
+     return;
+   }
+ 
+@@ -1185,7 +1185,7 @@ const bodies::Body* bodies::BodyVector::
+ {
+   if (i >= bodies_.size())
+   {
+-    logError("There is no body at index %u", i);
++    CONSOLE_BRIDGE_logError("There is no body at index %u", i);
+     return NULL;
+   }
+   else
+Index: geometric_shapes-0.5.3/src/body_operations.cpp
+===================================================================
+--- geometric_shapes-0.5.3.orig/src/body_operations.cpp
++++ geometric_shapes-0.5.3/src/body_operations.cpp
+@@ -59,7 +59,7 @@ bodies::Body* bodies::createBodyFromShap
+       body = new bodies::ConvexMesh(shape);
+       break;
+     default:
+-      logError("Creating body from shape: Unknown shape type %d", (int)shape->type);
++      CONSOLE_BRIDGE_logError("Creating body from shape: Unknown shape type %d", (int)shape->type);
+       break;
+     }
+ 
+@@ -112,7 +112,7 @@ Body* constructBodyFromMsgHelper(const T
+       Eigen::Quaterniond q(pose.orientation.w, pose.orientation.x, pose.orientation.y, pose.orientation.z);
+       if (fabs(q.squaredNorm() - 1.0) > 1e-3)
+       {
+-        logError("Quaternion is not normalized. Assuming identity.");
++        CONSOLE_BRIDGE_logError("Quaternion is not normalized. Assuming identity.");
+         q = Eigen::Quaterniond(1.0, 0.0, 0.0, 0.0);
+       }
+       Eigen::Affine3d af(Eigen::Translation3d(pose.position.x, pose.position.y, pose.position.z) * q.toRotationMatrix());
+Index: geometric_shapes-0.5.3/src/mesh_operations.cpp
+===================================================================
+--- geometric_shapes-0.5.3.orig/src/mesh_operations.cpp
++++ geometric_shapes-0.5.3/src/mesh_operations.cpp
+@@ -133,7 +133,7 @@ Mesh* createMeshFromVertices(const Eigen
+     return NULL;
+ 
+   if (source.size() % 3 != 0)
+-    logError("The number of vertices to construct a mesh from is not divisible by 3. Probably constructed triangles will not make sense.");
++    CONSOLE_BRIDGE_logError("The number of vertices to construct a mesh from is not divisible by 3. Probably constructed triangles will not make sense.");
+ 
+   std::set<detail::LocalVertexType, detail::ltLocalVertexValue> vertices;
+   std::vector<unsigned int> triangles;
+@@ -220,7 +220,7 @@ Mesh* createMeshFromBinary(const char *b
+ {
+   if (!buffer || size < 1)
+   {
+-    logWarn("Cannot construct mesh from empty binary buffer");
++    CONSOLE_BRIDGE_logWarn("Cannot construct mesh from empty binary buffer");
+     return NULL;
+   }
+ 
+@@ -285,21 +285,21 @@ Mesh* createMeshFromResource(const std::
+   }
+   catch (resource_retriever::Exception& e)
+   {
+-    logError("%s", e.what());
++    CONSOLE_BRIDGE_logError("%s", e.what());
+     return NULL;
+   }
+ 
+   if (res.size == 0)
+   {
+-    logWarn("Retrieved empty mesh for resource '%s'", resource.c_str());
++    CONSOLE_BRIDGE_logWarn("Retrieved empty mesh for resource '%s'", resource.c_str());
+     return NULL;
+   }
+ 
+   Mesh *m = createMeshFromBinary(reinterpret_cast<const char*>(res.data.get()), res.size, scale, resource);
+   if (!m)
+   {
+-    logWarn("Assimp reports no scene in %s.", resource.c_str());
+-    logWarn("This could be because of a resource filename that is too long for the Assimp library, a known bug. As a workaround shorten the filename/path.");
++    CONSOLE_BRIDGE_logWarn("Assimp reports no scene in %s.", resource.c_str());
++    CONSOLE_BRIDGE_logWarn("This could be because of a resource filename that is too long for the Assimp library, a known bug. As a workaround shorten the filename/path.");
+   }
+   return m;
+ }
+@@ -344,7 +344,7 @@ Mesh* createMeshFromAsset(const aiScene*
+ {
+   if (!scene->HasMeshes())
+   {
+-    logWarn("Assimp reports scene in %s has no meshes", resource_name.c_str());
++    CONSOLE_BRIDGE_logWarn("Assimp reports scene in %s has no meshes", resource_name.c_str());
+     return NULL;
+   }
+   EigenSTL::vector_Vector3d vertices;
+@@ -352,12 +352,12 @@ Mesh* createMeshFromAsset(const aiScene*
+   extractMeshData(scene, scene->mRootNode, aiMatrix4x4(), scale, vertices, triangles);
+   if (vertices.empty())
+   {
+-    logWarn("There are no vertices in the scene %s", resource_name.c_str());
++    CONSOLE_BRIDGE_logWarn("There are no vertices in the scene %s", resource_name.c_str());
+     return NULL;
+   }
+   if (triangles.empty())
+   {
+-    logWarn("There are no triangles in the scene %s", resource_name.c_str());
++    CONSOLE_BRIDGE_logWarn("There are no triangles in the scene %s", resource_name.c_str());
+     return NULL;
+   }
+ 
+@@ -378,7 +378,7 @@ Mesh* createMeshFromShape(const Shape *s
+         if (shape->type == shapes::CONE)
+           return shapes::createMeshFromShape(static_cast<const shapes::Cone&>(*shape));
+         else
+-          logError("Conversion of shape of type '%s' to a mesh is not known", shapeStringName(shape).c_str());
++          CONSOLE_BRIDGE_logError("Conversion of shape of type '%s' to a mesh is not known", shapeStringName(shape).c_str());
+   return NULL;
+ }
+ 
+Index: geometric_shapes-0.5.3/src/shape_operations.cpp
+===================================================================
+--- geometric_shapes-0.5.3.orig/src/shape_operations.cpp
++++ geometric_shapes-0.5.3/src/shape_operations.cpp
+@@ -62,7 +62,7 @@ Shape* constructShapeFromMsg(const shape
+ {
+   if (shape_msg.triangles.empty() || shape_msg.vertices.empty())
+   {
+-    logWarn("Mesh definition is empty");
++    CONSOLE_BRIDGE_logWarn("Mesh definition is empty");
+     return NULL;
+   }
+   else
+@@ -117,7 +117,7 @@ Shape* constructShapeFromMsg(const shape
+                              shape_msg.dimensions[shape_msgs::SolidPrimitive::CONE_HEIGHT]);
+         }
+   if (shape == NULL)
+-    logError("Unable to construct shape corresponding to shape_msg of type %d", (int)shape_msg.type);
++    CONSOLE_BRIDGE_logError("Unable to construct shape corresponding to shape_msg of type %d", (int)shape_msg.type);
+ 
+   return shape;
+ }
+@@ -202,7 +202,7 @@ bool constructMarkerFromShape(const Shap
+     }
+     catch (std::runtime_error &ex)
+     {
+-      logError("%s", ex.what());
++      CONSOLE_BRIDGE_logError("%s", ex.what());
+     }
+     if (ok)
+       return true;
+@@ -451,7 +451,7 @@ bool constructMsgFromShape(const Shape*
+             }
+             else
+             {
+-              logError("Unable to construct shape message for shape of type %d", (int)shape->type);
++              CONSOLE_BRIDGE_logError("Unable to construct shape message for shape of type %d", (int)shape->type);
+               return false;
+             }
+ 
+@@ -512,7 +512,7 @@ void saveAsText(const Shape *shape, std:
+             }
+             else
+             {
+-              logError("Unable to save shape of type %d", (int)shape->type);
++              CONSOLE_BRIDGE_logError("Unable to save shape of type %d", (int)shape->type);
+             }
+ }
+ 
+@@ -580,7 +580,7 @@ Shape* constructShapeFromText(std::istre
+                   m->computeVertexNormals();
+                 }
+                 else
+-                  logError("Unknown shape type: '%s'", type.c_str());
++                  CONSOLE_BRIDGE_logError("Unknown shape type: '%s'", type.c_str());
+     }
+   }
+   return result;
+Index: geometric_shapes-0.5.3/src/shapes.cpp
+===================================================================
+--- geometric_shapes-0.5.3.orig/src/shapes.cpp
++++ geometric_shapes-0.5.3/src/shapes.cpp
+@@ -224,12 +224,12 @@ shapes::Shape* shapes::OcTree::clone() c
+ 
+ void shapes::OcTree::scaleAndPadd(double scale, double padd)
+ {
+-  logWarn("OcTrees cannot be scaled or padded");
++  CONSOLE_BRIDGE_logWarn("OcTrees cannot be scaled or padded");
+ }
+ 
+ void shapes::Plane::scaleAndPadd(double scale, double padding)
+ {
+-  logWarn("Planes cannot be scaled or padded");
++  CONSOLE_BRIDGE_logWarn("Planes cannot be scaled or padded");
+ }
+ 
+ void shapes::Shape::scale(double scale)
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.5.1.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.5.1.ebuild
deleted file mode 100644
index 134174e65418..000000000000
--- a/dev-ros/geometric_shapes/geometric_shapes-0.5.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Generic definitions of geometric shapes and bodies"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	media-libs/qhull
-	media-libs/assimp
-	sci-libs/octomap
-	dev-ros/random_numbers
-	dev-ros/resource_retriever
-	dev-ros/eigen_stl_containers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rosunit )
-"
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.5.2.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.5.2.ebuild
deleted file mode 100644
index 134174e65418..000000000000
--- a/dev-ros/geometric_shapes/geometric_shapes-0.5.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-planning/geometric_shapes"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Generic definitions of geometric shapes and bodies"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-cpp/eigen:3
-	dev-libs/boost:=
-	media-libs/qhull
-	media-libs/assimp
-	sci-libs/octomap
-	dev-ros/random_numbers
-	dev-ros/resource_retriever
-	dev-ros/eigen_stl_containers
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest dev-ros/rosunit )
-"
diff --git a/dev-ros/geometric_shapes/geometric_shapes-0.5.3.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.5.3-r1.ebuild
index 67c38b9738bf..54b4e296f9f0 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-0.5.3.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-0.5.3-r1.ebuild
@@ -23,7 +23,9 @@ RDEPEND="
 	dev-ros/eigen_stl_containers
 	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest dev-ros/rosunit )
 "
+PATCHES=( "${FILESDIR}/logging.patch" )
diff --git a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild b/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
index 134174e65418..54b4e296f9f0 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -23,7 +23,9 @@ RDEPEND="
 	dev-ros/eigen_stl_containers
 	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/shape_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest dev-ros/rosunit )
 "
+PATCHES=( "${FILESDIR}/logging.patch" )