10 files changed, 86 insertions, 218 deletions
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 303ffd0eddf1..b31ef77f4a84 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
index afebf864e3df..bb2d0891d149 100644
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@@ -1,8 +1,10 @@
 DIST vision_opencv-1.12.5.tar.gz 81739 BLAKE2B 5c135009f4e766b34c217b6de1dba836bf225b4cc7aca53b34c297f0c0986a79c3c629990464599da98fa32424a87467037caf3b51f3f6dcab2add615d613c08 SHA512 df3ad951262a692124eead5751f64c04fbf831486db8c000e23e2f0b10f645d830c38cf2d99d23b696b96cd0388c4d732ddda4e5d8e8b7cb88a3fd5909c62c71
 DIST vision_opencv-1.12.7.tar.gz 81877 BLAKE2B 216a82ec377e0bc3d85866da3ed3b9e8e90f7615bfbf0e3cacc30cd2bc2aeeb3f822d8daa1f0be42dab45dbdfc69c043a3a4c29b8357561356a2f874b3f61552 SHA512 e02f9450183e8e927d947d2382859ed01aaa5dc7a8f299e5a39815c53ee726b96781e961b1cf0f5cc3ac16699d162d4ed80678de4b6517e5139a5a8bd592e39c
 DIST vision_opencv-1.12.8.tar.gz 82043 BLAKE2B 9eb18ea9a4d3ddf6d2103ab3a2e53557349880ea665f8089d64319e8c99fb4ea922e8de1ab04fb749bed5c2503041d27d8e9b773d6142a5b5366aae937ca2514 SHA512 fadd84bb5e9586a5b04833100d9e1267ce8d153ca95a3257e1c3e6fe825dae524e25b2cc7deebb48d326cce8ef04523c5803eeecd88362cf6ff0384c52557608
+DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
 EBUILD cv_bridge-1.12.5.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
 EBUILD cv_bridge-1.12.7.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
 EBUILD cv_bridge-1.12.8.ebuild 592 BLAKE2B 31b4abecd775ec2383eae038f2a27780a9b5dd1628f15223deb347426ec132ecc19b12077f44c782e7f93bd16977613bab442595c9cc7c6b3006120c863e0ffb SHA512 fcfa0f414ff530e0f0981a538b64e5a8a403aec5962f7b7d5127ff0e6aed93324e612650b46fb6632aaa9a59ce42641085221f04b5153c6a06b754310ec2618e
+EBUILD cv_bridge-1.13.0.ebuild 592 BLAKE2B 31b4abecd775ec2383eae038f2a27780a9b5dd1628f15223deb347426ec132ecc19b12077f44c782e7f93bd16977613bab442595c9cc7c6b3006120c863e0ffb SHA512 fcfa0f414ff530e0f0981a538b64e5a8a403aec5962f7b7d5127ff0e6aed93324e612650b46fb6632aaa9a59ce42641085221f04b5153c6a06b754310ec2618e
 EBUILD cv_bridge-9999.ebuild 592 BLAKE2B e83e4897190d99593d5921ba55ba342511f8e5d3b7b4173892b3b763b01f6a68d4421d39c928519505982a6df17185973ec91685e3421a0f67ee8099b8c95999 SHA512 ae4b1d791d4ace3b583124c14a5499e0e0f45ad834e694c9c06f259ce28a4af95c43f567bd440139f043be7d80f9bcb4d19caaf56794228ec1e6e49b0b8cff62
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
new file mode 100644
index 000000000000..781df6ff0219
--- /dev/null
+++ b/dev-ros/cv_bridge/cv_bridge-1.13.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Converts between ROS Image messages and OpenCV images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	>=media-libs/opencv-3:=[contrib(+)]
+	dev-libs/boost:=[threads,python,${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometric_shapes/Manifest b/dev-ros/geometric_shapes/Manifest
index edd90106b06f..971ea8532a2d 100644
--- a/dev-ros/geometric_shapes/Manifest
+++ b/dev-ros/geometric_shapes/Manifest
@@ -1,7 +1,6 @@
-AUX logging.patch 8504 BLAKE2B 5d1efc6613a64084c3d927b7e9e026e063de21b3e211c7f12fa26f6bc882390de47bfe7a4491f6096dd73ed73c84c2e1d4f08da9b9083351c45d910b709f02e2 SHA512 747925609a4e029344c1ba0e50fb50caf637720824aa0d086d853f9c0f5ab2ca03c98d9f1b9d79240d5b3536637ac8d604607d63613c028d1e91df6247796b4e
-DIST geometric_shapes-0.5.3.tar.gz 60799 BLAKE2B 77bfde8f7b1f3e11bd4bb12c82374e34ca0efc0f75125a1c5a58d4ce797feb70b70803526f4b8cbdf651d762082a4bbcb03df5e6ace2bdc69ed84be20a963731 SHA512 13c1b85cab4d0d5d35bd010927a5fd789312b4c11667ee73295722067968504054a8f24628db2f78782078ff3cbcd6878bd403979c29526b2183c3ae2414b2b1
 DIST geometric_shapes-0.5.4.tar.gz 62028 BLAKE2B 6873019c54872077ec88ad6107bdf1a69092d73bd1f73b38dbbdcd88a3e5da9cfffd0782ec2e01f87fd90082ed856e3a2f5161dec606ba08c0510752a813359c SHA512 bd0909fb0feeddebf65793aa77a6803217e39e782767cd2d58b26266ff79018ebb352c77385e20043a069caaa7e00ba63366a703d52605562e8535f1d3af2dac
-EBUILD geometric_shapes-0.5.3-r1.ebuild 743 BLAKE2B c1309d2ab2ae4dad4902ccfba8ed097c644918f5be10cd45a4ab1f5a218a73790ff6688176798f447a284a218120b4368fa1228f36f0d54872a8df921a9d2f81 SHA512 4bb3d115087ec084608da1a5c00e4023e9c91058d547406ed04b5c5a232cb52ef803edf73b07687209e033589a25bd37e0bc9193753064fcea36d0d44a0d5571
+DIST geometric_shapes-0.6.0.tar.gz 62152 BLAKE2B ebd2b6260a212e1ba3513d064d69af91fe2141e2ee696b6781829c83a5df44c9de9a9ee68c0c9354adbfc954350cde6c339529955c506e3e2c45e7eaa2a54d52 SHA512 b580f2e2acf864d3d03dd67d088d5c0d04cf8f28c1db8ebb3f4155ff9cf77af92cc268aecc41ad3d983d9e021044404af03309fb94d99162ea84d2d16681b562
 EBUILD geometric_shapes-0.5.4.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a
+EBUILD geometric_shapes-0.6.0.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a
 EBUILD geometric_shapes-9999.ebuild 703 BLAKE2B 773af22ffa1bfe37adcb79a490281fe481f4eb172233f9c4c2fef4ae99774c0c378fe52bfcb3b35dfe6bb2806924aa04982fe0eefbfcc475186c7fab15ada91d SHA512 ebe158b437daa4a89ae21d663c6052d561cf76c04b4fc20a342a6a0ffdcbcab861781edd358dcfa98a0a4e0aa5d47dd9bebdbd45234f056bd939503ac730f77a
 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
deleted file mode 100644
index 06036ad5dcee..000000000000
--- a/dev-ros/geometric_shapes/files/logging.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-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.3-r1.ebuild b/dev-ros/geometric_shapes/geometric_shapes-0.6.0.ebuild
index 54b4e296f9f0..80708cfa63ea 100644
--- a/dev-ros/geometric_shapes/geometric_shapes-0.5.3-r1.ebuild
+++ b/dev-ros/geometric_shapes/geometric_shapes-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,4 +28,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest dev-ros/rosunit )
 "
-PATCHES=( "${FILESDIR}/logging.patch" )
diff --git a/dev-ros/image_geometry/Manifest b/dev-ros/image_geometry/Manifest
index 041a6c0ff2d9..51023c19185e 100644
--- a/dev-ros/image_geometry/Manifest
+++ b/dev-ros/image_geometry/Manifest
@@ -3,10 +3,12 @@ DIST vision_opencv-1.12.4.tar.gz 80675 BLAKE2B e07f89942f471e25ec76ae43b07dee79e
 DIST vision_opencv-1.12.5.tar.gz 81739 BLAKE2B 5c135009f4e766b34c217b6de1dba836bf225b4cc7aca53b34c297f0c0986a79c3c629990464599da98fa32424a87467037caf3b51f3f6dcab2add615d613c08 SHA512 df3ad951262a692124eead5751f64c04fbf831486db8c000e23e2f0b10f645d830c38cf2d99d23b696b96cd0388c4d732ddda4e5d8e8b7cb88a3fd5909c62c71
 DIST vision_opencv-1.12.7.tar.gz 81877 BLAKE2B 216a82ec377e0bc3d85866da3ed3b9e8e90f7615bfbf0e3cacc30cd2bc2aeeb3f822d8daa1f0be42dab45dbdfc69c043a3a4c29b8357561356a2f874b3f61552 SHA512 e02f9450183e8e927d947d2382859ed01aaa5dc7a8f299e5a39815c53ee726b96781e961b1cf0f5cc3ac16699d162d4ed80678de4b6517e5139a5a8bd592e39c
 DIST vision_opencv-1.12.8.tar.gz 82043 BLAKE2B 9eb18ea9a4d3ddf6d2103ab3a2e53557349880ea665f8089d64319e8c99fb4ea922e8de1ab04fb749bed5c2503041d27d8e9b773d6142a5b5366aae937ca2514 SHA512 fadd84bb5e9586a5b04833100d9e1267ce8d153ca95a3257e1c3e6fe825dae524e25b2cc7deebb48d326cce8ef04523c5803eeecd88362cf6ff0384c52557608
+DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
 EBUILD image_geometry-1.12.3.ebuild 573 BLAKE2B 57d843b24727e237d1a934271762c2ffce2b90f0de3564d6098ae3ed91225b279ecb114ba7eae2ca5cb25e34d23eac07dbfae565e36ec8d1a17027b665210dae SHA512 b5032a90e9d488251c830082437aafb9cf4d751fdd1c15d7d245ba26d6d282622b30bde351ae8427841646dc7ce30ab303881b6e8a3ff117b0117c36a2650973
 EBUILD image_geometry-1.12.4.ebuild 573 BLAKE2B 68440489a3d62b55fade107e7673442a78fae0c03deffbb6f3c0a5b5dbcc99c4ff829aff002a906c4def274cb8e79a3993a0ed924401cd137ce8f0647fa56f93 SHA512 426c8579a9b2b005749d68e1d383d3435138410c4be7906805e770bfa328b8c776dca4f8cde40d9a02acff8b065e0e561c5fe245547cb9e9413b3801d92e00c5
 EBUILD image_geometry-1.12.5.ebuild 573 BLAKE2B 68440489a3d62b55fade107e7673442a78fae0c03deffbb6f3c0a5b5dbcc99c4ff829aff002a906c4def274cb8e79a3993a0ed924401cd137ce8f0647fa56f93 SHA512 426c8579a9b2b005749d68e1d383d3435138410c4be7906805e770bfa328b8c776dca4f8cde40d9a02acff8b065e0e561c5fe245547cb9e9413b3801d92e00c5
 EBUILD image_geometry-1.12.7.ebuild 573 BLAKE2B 68440489a3d62b55fade107e7673442a78fae0c03deffbb6f3c0a5b5dbcc99c4ff829aff002a906c4def274cb8e79a3993a0ed924401cd137ce8f0647fa56f93 SHA512 426c8579a9b2b005749d68e1d383d3435138410c4be7906805e770bfa328b8c776dca4f8cde40d9a02acff8b065e0e561c5fe245547cb9e9413b3801d92e00c5
 EBUILD image_geometry-1.12.8.ebuild 573 BLAKE2B b5475075d7374dc72731c9420a6c60f4ae6407f09644a7bc781c56554af3ee4db3a7f82a6a97ed130cf2286c924101c7698705153601ec5bd7eeb3bc8ef2c7f6 SHA512 d50375d31c899e44567a7167a3229aacaef924f5bc2b3903d16a168aee3aa3fba43d6f19e727efacfc43a97c072be214c6de047f22af20d2ff16fb1823ffee63
+EBUILD image_geometry-1.13.0.ebuild 573 BLAKE2B b5475075d7374dc72731c9420a6c60f4ae6407f09644a7bc781c56554af3ee4db3a7f82a6a97ed130cf2286c924101c7698705153601ec5bd7eeb3bc8ef2c7f6 SHA512 d50375d31c899e44567a7167a3229aacaef924f5bc2b3903d16a168aee3aa3fba43d6f19e727efacfc43a97c072be214c6de047f22af20d2ff16fb1823ffee63
 EBUILD image_geometry-9999.ebuild 573 BLAKE2B 5d941d4bdac14a1792893e7de1e8fe5ba96114c454e54675577cd64966c89105b0501f7d7fdd5e63905d3e6642be8537d4523859ee65bef3051a15a5e3a16bf5 SHA512 62ff031953231cc9d983aae2e77c01f0b8a15f0d80b95ee6289994e76a02f8ca38b224ed2ab6700ed82531a84f8058121d11bac28d424f49282c60bc25ee3ada
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/image_geometry/image_geometry-1.13.0.ebuild b/dev-ros/image_geometry/image_geometry-1.13.0.ebuild
new file mode 100644
index 000000000000..25d882f4b84d
--- /dev/null
+++ b/dev-ros/image_geometry/image_geometry-1.13.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ and Python libraries for interpreting images geometrically"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	media-libs/opencv:=
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )"
diff --git a/dev-ros/opencv_tests/Manifest b/dev-ros/opencv_tests/Manifest
index af5d7bb83c83..de909d7af7cc 100644
--- a/dev-ros/opencv_tests/Manifest
+++ b/dev-ros/opencv_tests/Manifest
@@ -5,6 +5,7 @@ DIST vision_opencv-1.12.4.tar.gz 80675 BLAKE2B e07f89942f471e25ec76ae43b07dee79e
 DIST vision_opencv-1.12.5.tar.gz 81739 BLAKE2B 5c135009f4e766b34c217b6de1dba836bf225b4cc7aca53b34c297f0c0986a79c3c629990464599da98fa32424a87467037caf3b51f3f6dcab2add615d613c08 SHA512 df3ad951262a692124eead5751f64c04fbf831486db8c000e23e2f0b10f645d830c38cf2d99d23b696b96cd0388c4d732ddda4e5d8e8b7cb88a3fd5909c62c71
 DIST vision_opencv-1.12.7.tar.gz 81877 BLAKE2B 216a82ec377e0bc3d85866da3ed3b9e8e90f7615bfbf0e3cacc30cd2bc2aeeb3f822d8daa1f0be42dab45dbdfc69c043a3a4c29b8357561356a2f874b3f61552 SHA512 e02f9450183e8e927d947d2382859ed01aaa5dc7a8f299e5a39815c53ee726b96781e961b1cf0f5cc3ac16699d162d4ed80678de4b6517e5139a5a8bd592e39c
 DIST vision_opencv-1.12.8.tar.gz 82043 BLAKE2B 9eb18ea9a4d3ddf6d2103ab3a2e53557349880ea665f8089d64319e8c99fb4ea922e8de1ab04fb749bed5c2503041d27d8e9b773d6142a5b5366aae937ca2514 SHA512 fadd84bb5e9586a5b04833100d9e1267ce8d153ca95a3257e1c3e6fe825dae524e25b2cc7deebb48d326cce8ef04523c5803eeecd88362cf6ff0384c52557608
+DIST vision_opencv-1.13.0.tar.gz 82177 BLAKE2B 1c863f3c9e6b856d61a0e879f958f0f1fd184f088e208023a504cf5bb982c5496b71e1f2b4761e4456ca76348e51bc2bc760b2c43e1a35b02fa5c23c8e444502 SHA512 a20ec2f41a0c94dde51b19f902ae078cbf5449a2aadbeacbc49bbfc2ab52c39878e63448a3137591f7e1b2f6025baef616579463cf32274e7838157137d214bc
 EBUILD opencv_tests-1.12.1-r1.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
 EBUILD opencv_tests-1.12.2.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
 EBUILD opencv_tests-1.12.3.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
@@ -12,5 +13,6 @@ EBUILD opencv_tests-1.12.4.ebuild 751 BLAKE2B 41933ebb87ba8a0007d989b14ccff54452
 EBUILD opencv_tests-1.12.5.ebuild 751 BLAKE2B 41933ebb87ba8a0007d989b14ccff544522b040b1cadb5e96e04b52c7ce27e3b0b3bc2a1660dfd9d719bd9c819da649e2fc551f9527a9c9f93bf173d0a157f6a SHA512 e633cdca4016a98505c24cb1e2d5f865235e009c2300f1778205b7ce2a01229e038a76e9099c1f1655b5a053c0be54a3177259e64932bee4ce75551e82c6c2db
 EBUILD opencv_tests-1.12.7.ebuild 751 BLAKE2B 41933ebb87ba8a0007d989b14ccff544522b040b1cadb5e96e04b52c7ce27e3b0b3bc2a1660dfd9d719bd9c819da649e2fc551f9527a9c9f93bf173d0a157f6a SHA512 e633cdca4016a98505c24cb1e2d5f865235e009c2300f1778205b7ce2a01229e038a76e9099c1f1655b5a053c0be54a3177259e64932bee4ce75551e82c6c2db
 EBUILD opencv_tests-1.12.8.ebuild 751 BLAKE2B c63cc3f23dc5546cd60ccf055a67cb8203e2963f05c8b4b51b122dd99755ee30d8c477bf1c8fa049e802b8e0df3424afbe340193f171f3cd3a316d424cfffc4b SHA512 ab5a16d3034f13aaf7b8dbb15eee3f686cde42b69617e8ee852fd1cfd1f401a96754ce794b6354b6fe273f1311da20a84d5e00d44b299b377b459dc19e1263c2
+EBUILD opencv_tests-1.13.0.ebuild 751 BLAKE2B c63cc3f23dc5546cd60ccf055a67cb8203e2963f05c8b4b51b122dd99755ee30d8c477bf1c8fa049e802b8e0df3424afbe340193f171f3cd3a316d424cfffc4b SHA512 ab5a16d3034f13aaf7b8dbb15eee3f686cde42b69617e8ee852fd1cfd1f401a96754ce794b6354b6fe273f1311da20a84d5e00d44b299b377b459dc19e1263c2
 EBUILD opencv_tests-9999.ebuild 751 BLAKE2B 13caeb590567722c981b7841381b3d4e81afa0df10b389c948ee4bc09d6449f50a61c7855d81e3abed2d2b94a597602f41ff6312457b474fabadbf8884bbe9d3 SHA512 922567415134388b204babc07f86c96c52b7ccb020dadc0061140c7463394aae9a281db6e7b269d32bc8074823b549f96de8a9993c09ee5e2e03725df756a307
 MISC metadata.xml 342 BLAKE2B 41ebd1d903bb2c2be8df58a29062ae314becf1e29b309369eb8295f49760e35800d2164de2d9088b90716432d04b5290123f1a1110175250348301e12afe3f26 SHA512 ebd8a1fd0c584bd4dbbcbdd6e396c288a50d68916d357f030dfaf13ec8204c0bf8a4c98f740952400e43ce5d6f112a0865086484de1a8abdd088d39e79f74693
diff --git a/dev-ros/opencv_tests/opencv_tests-1.13.0.ebuild b/dev-ros/opencv_tests/opencv_tests-1.13.0.ebuild
new file mode 100644
index 000000000000..83b23217853e
--- /dev/null
+++ b/dev-ros/opencv_tests/opencv_tests-1.13.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-perception/vision_opencv"
+KEYWORDS="~amd64 ~arm"
+# Be careful: It needs opencv with python support but opencv is python-single-r1
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tests for ROS OpenCV integration"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	media-libs/opencv[python,${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	insinto /usr/share/${PN}/launch
+	doins launch/*.launch
+	exeinto /usr/libexec/${PN}
+	doexe nodes/*
+}