gentoo resync : 15.05.2018

43 files changed, 500 insertions, 79 deletions

diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 49fbe2b62c34..303ffd0eddf1 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/camera_calibration/Manifest b/dev-ros/camera_calibration/Manifest
index 58aa7d00e1d1..934d83ceedd5 100644
--- a/dev-ros/camera_calibration/Manifest
+++ b/dev-ros/camera_calibration/Manifest
@@ -6,6 +6,7 @@ DIST image_pipeline-1.12.19.tar.gz 130635 BLAKE2B 23709220248c86900c092a94a688cb
 DIST image_pipeline-1.12.20.tar.gz 137888 BLAKE2B 2fa362acf59e545c794136262bab98bd5bf5c9025306df5b3f46fd4f498a13c99ef902653f8725564e02f6d1178ba7b77f973d248e4229c80251ad8f5747fb56 SHA512 37a45cfcc8bdb8b40477860e29f72671d423d4531156f5901128c32a6c41d27f235cdac216502d614ab7ddab5e66c2f343baaa0fd22cf83cb38e667fbbc111c5
 DIST image_pipeline-1.12.21.tar.gz 139264 BLAKE2B 0b60057d35a250b0f4938ad79d893b922501d9416a6a7122c49023f632affd06c1c82bfddff0f10bbebe683d8dd50eb4d947d5086a8bb6935da98f8a2d146eed SHA512 76f06e7a1effb3098454496e01a8c14b34a37a3ea96ac51a0deb860b6891b37d354dcf7d9c06389476decaa90c3097c4495e34d04f70ad6a571fc5469eda2f6c
 DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
+DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
 EBUILD camera_calibration-1.12.14.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
 EBUILD camera_calibration-1.12.15.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
 EBUILD camera_calibration-1.12.16.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
@@ -14,5 +15,6 @@ EBUILD camera_calibration-1.12.19.ebuild 828 BLAKE2B a6833c11c8dc7e6f45dae25ee28
 EBUILD camera_calibration-1.12.20.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a4748171dec9bb6d8cc67d39d5aa59f153673a7659e071fcb2f34b8663ff90d0bed4c037dfc291953f8d9b39cebdd91d1e4ac0938d97 SHA512 3d225fc8d2e0541d0779203bc17d91700a5d2f385f3fcd7cff4444e14a3a7895a892b17ba5cd77c4e6a59bed34419da68a87b193dc536eb0154fedc5c066c843
 EBUILD camera_calibration-1.12.21.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a4748171dec9bb6d8cc67d39d5aa59f153673a7659e071fcb2f34b8663ff90d0bed4c037dfc291953f8d9b39cebdd91d1e4ac0938d97 SHA512 3d225fc8d2e0541d0779203bc17d91700a5d2f385f3fcd7cff4444e14a3a7895a892b17ba5cd77c4e6a59bed34419da68a87b193dc536eb0154fedc5c066c843
 EBUILD camera_calibration-1.12.22.ebuild 828 BLAKE2B 9d5455d906f5caaf6cf1a4748171dec9bb6d8cc67d39d5aa59f153673a7659e071fcb2f34b8663ff90d0bed4c037dfc291953f8d9b39cebdd91d1e4ac0938d97 SHA512 3d225fc8d2e0541d0779203bc17d91700a5d2f385f3fcd7cff4444e14a3a7895a892b17ba5cd77c4e6a59bed34419da68a87b193dc536eb0154fedc5c066c843
+EBUILD camera_calibration-1.12.23.ebuild 828 BLAKE2B 7584bc3eb7533127f2475f6a42ccde314f51cb64fcf14ca3e2e1e7ef3f8a3e83c606ce8cc00d0e329f359b46b4d5477d2e68f7a43c9b1b9dd61bbe6d3a8c32a7 SHA512 4fac89c8b30f0be4898a996cf1f2bc0af1643e2e2b0a9b3bfb72ddd50e9e235e623f5600a90f321030f75e1707e3fa200899e6e7e50ba5b81f736735f5227e53
 EBUILD camera_calibration-9999.ebuild 828 BLAKE2B da8e389262e1fcca3a2e796f1009282669fe779c358bfbbfbffbc737a9e302f7d94f17490ef0c03c3b646e77cc6be2c79d5456728f02002a7a1d370f72b6a37c SHA512 9843de38821e963ed06637472329e1933b8b788e3ba1745507ebe9f51199640e5b0a31806eb0b23ed5da60215f499a0094c2726cd7faf2504fdbc71a31eafab1
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/camera_calibration/camera_calibration-1.12.23.ebuild b/dev-ros/camera_calibration/camera_calibration-1.12.23.ebuild
new file mode 100644
index 000000000000..c1bc117b7d18
--- /dev/null
+++ b/dev-ros/camera_calibration/camera_calibration-1.12.23.ebuild
@@ -0,0 +1,27 @@
+# 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/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Calibration of monocular or stereo cameras using a checkerboard calibration target"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge[${PYTHON_USEDEP}]
+	dev-ros/image_geometry[${PYTHON_USEDEP}]
+	|| ( media-libs/opencv[python,${PYTHON_USEDEP}] media-libs/opencv[python,python_single_target_python2_7] )
+	dev-ros/message_filters[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/std_srvs[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/class_loader/Manifest b/dev-ros/class_loader/Manifest
index b825d49c986e..3a42e0e095d2 100644
--- a/dev-ros/class_loader/Manifest
+++ b/dev-ros/class_loader/Manifest
@@ -1,8 +1,6 @@
-DIST class_loader-0.3.8.tar.gz 30726 BLAKE2B 0f2b8eef574b5a5f8010a00562a9879e892f30b37a3ca776e1067500f6a304ae453fc8f84c1b25d895a3eddcb65be334d5101ad8cb3671c3abd21581e707a55d SHA512 d2e7ebad6057cca135a95ba0382adc1b91e987bc2a8eefe16011e4fdbab41e77489724f4dcfcae4fbb15034ec7601af91aba9e179085d5a9027246ffc3b1f499
-DIST class_loader-0.3.9.tar.gz 32311 BLAKE2B 7398825fe0ff4f113c6f48711d600dcf342ed7b77804e6778beae0b519a2154275a7e7cedd39c14fb7414be400311a6883a72cde8ebc8c06902bc7e3f5386bba SHA512 3434a63fc7e89d18724f5bf6c2b27251f07bde83d62e3496644772f73f96675489d994150686315876a9666aa4acc1c12bbde2b66d4348d05bbf3a7ad482d4ee
 DIST class_loader-0.4.0.tar.gz 32163 BLAKE2B f86e3903628cc797e935bb83b49d3f3baf1330bf6431402e7c4c38be802596a6e26767ea7089fa3f1a833f3e22b49f8a72b24675c2502810efb2a6d9104cb611 SHA512 3d07ba3a85b0c2b2153776ca55fe6b83a14c39fe7f62e4d7e6b66e1000fb0365f967e0a04c0c918ee99d730ea0b4fff6bec63ac00ad04d8c1574008297390346
-EBUILD class_loader-0.3.8-r1.ebuild 422 BLAKE2B 45b410f051e5071702a5dd5e3e9a0be91937d18b8897a276d11a7714f92b952c9300ca22dc47bf078f48f19080c52e29d3b1adc7e3cc92179d2d5b2a4d513b1c SHA512 386bf34231ce4c9b4e72705d8a36b24c434eedeae483ae584e3887b46f867cde4710379be67036a079e7ca27925d463f2fe36fe430097e157d2cece74f087e2f
-EBUILD class_loader-0.3.9.ebuild 422 BLAKE2B e10d35ba8891e7fb79e3bf3c1aff9b4165927e8b10c437f7382e6f95842f9bcd32280164746982615950ff70b18a9b8f6806580e2d0242cd08ee2f510dd032da SHA512 d1de64d2433111e3fc2cd373d8e0d7156ebaab8daa0b9bf581e26749725db41732b094cf528578ea30ef3cf8952fccc387831b1ebb76ee8bd84b6101106c6337
+DIST class_loader-0.4.1.tar.gz 33110 BLAKE2B 61a93af542124799ddc7341bdd330ca8cd13046fc6a0ce765818bfce09def49b93c351180278c80c32e9449ce46b520ab91153bb4d9630e809623106efdc1f76 SHA512 954ad1e76a8b2b679d4cdd46e4c29471dbdaae18be580bd5babe576c89265c473fb218253338667d51f68bf26780a48d934e476a30983cb986bec4ffadec28d1
 EBUILD class_loader-0.4.0.ebuild 430 BLAKE2B c54cbf4efae2dce392cc0b0eec1fb8390d41596ff3c2d1c2916e273455b34cdf89d410e744059b067bc8a49f26825c160d78b485628278f97d14cf18c7e845d2 SHA512 e94175e8be29a2aacef774762399e24344425d8fb23117f8ce1cf7f26d0601cc9267073ebfdc8217bca857309e5309f6691d62c0d52e67f62f83d0a1e15cd5b6
+EBUILD class_loader-0.4.1.ebuild 430 BLAKE2B c54cbf4efae2dce392cc0b0eec1fb8390d41596ff3c2d1c2916e273455b34cdf89d410e744059b067bc8a49f26825c160d78b485628278f97d14cf18c7e845d2 SHA512 e94175e8be29a2aacef774762399e24344425d8fb23117f8ce1cf7f26d0601cc9267073ebfdc8217bca857309e5309f6691d62c0d52e67f62f83d0a1e15cd5b6
 EBUILD class_loader-9999.ebuild 430 BLAKE2B c54cbf4efae2dce392cc0b0eec1fb8390d41596ff3c2d1c2916e273455b34cdf89d410e744059b067bc8a49f26825c160d78b485628278f97d14cf18c7e845d2 SHA512 e94175e8be29a2aacef774762399e24344425d8fb23117f8ce1cf7f26d0601cc9267073ebfdc8217bca857309e5309f6691d62c0d52e67f62f83d0a1e15cd5b6
 MISC metadata.xml 330 BLAKE2B ee09655fb1ba4eb6310f6ada92765e7a7aeab4cf9c9c3acfc29c54e6248543270aff3f089b13df31bb0b9f4e17c28f9dc82d469a481769989aa410fd392619e1 SHA512 9577bebad3f9dc042eb4d055bda37a837948682da8a73dee93d847b9224227edbb51ca6cdd4002ff0c076387d8aee43428e6c16cfb13fce6a0ee8502b3eab406
diff --git a/dev-ros/class_loader/class_loader-0.3.8-r1.ebuild b/dev-ros/class_loader/class_loader-0.3.8-r1.ebuild
deleted file mode 100644
index 1b4cdea4967a..000000000000
--- a/dev-ros/class_loader/class_loader-0.3.8-r1.ebuild
+++ /dev/null
@@ -1,20 +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/class_loader"
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="ROS-independent package for loading plugins"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="dev-libs/poco
-	dev-libs/boost:=[threads]
-	dev-ros/cmake_modules
-	dev-libs/console_bridge:="
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/class_loader/class_loader-0.3.9.ebuild b/dev-ros/class_loader/class_loader-0.4.1.ebuild
index 9b136133707b..bd6d17ac0ef4 100644
--- a/dev-ros/class_loader/class_loader-0.3.9.ebuild
+++ b/dev-ros/class_loader/class_loader-0.4.1.ebuild
@@ -10,7 +10,7 @@ inherit ros-catkin
 
 DESCRIPTION="ROS-independent package for loading plugins"
 LICENSE="BSD"
-SLOT="0"
+SLOT="0/melodic"
 IUSE=""
 
 RDEPEND="dev-libs/poco
diff --git a/dev-ros/collada_parser/Manifest b/dev-ros/collada_parser/Manifest
index f3d6fb1f1143..a11a867361b7 100644
--- a/dev-ros/collada_parser/Manifest
+++ b/dev-ros/collada_parser/Manifest
@@ -1,4 +1,6 @@
 DIST collada_urdf-1.12.10.tar.gz 73182 BLAKE2B 69f245e7962ad542a133ee71a7e9cbf7314ca7e754d95521dc802ef4296e957321897170444616bc2789626f19e7c368749f5644482dae04f28b864d08970de9 SHA512 78387ba78175099be0c48f966a185630598504f27d5baa76e9a9c088132b1368c698784c5367b376ac126e7c5a97a2117864561a073e6f9370a47fb86ad62ca4
+DIST collada_urdf-1.12.12.tar.gz 73361 BLAKE2B 7c23510d18080614e4f5666fa79d66b8378b6e524ac54249b8df03cefb3edfbcb7977690ca30917f8eab5ca56e689015f236cabff2aed402bd3a6b8d50f72cc6 SHA512 e0628daf905053bb6193cb3919b17b78f0697b1a530d589165f91343ac82a9fd08d86b9b24264e7f7750bef74d3a3b0db28bae63a31e8a484d8784db0a0ef6e5
 EBUILD collada_parser-1.12.10-r3.ebuild 552 BLAKE2B a56ae971ca688d0774f59b54004df43871e6a92ac8b55a1a2b48ba35c53fcaa35938bf968659943429ac7b62cccc95d5a182dd305428a0ddf48f672461134334 SHA512 8f462d2b74002b11b8fe7002d01767c1ad65650b395c142a69f901464e0a2f1566a2b068135c698134517b8927bf0bb199b84b8840920bafb7b97c2cc600bc95
-EBUILD collada_parser-9999.ebuild 552 BLAKE2B a56ae971ca688d0774f59b54004df43871e6a92ac8b55a1a2b48ba35c53fcaa35938bf968659943429ac7b62cccc95d5a182dd305428a0ddf48f672461134334 SHA512 8f462d2b74002b11b8fe7002d01767c1ad65650b395c142a69f901464e0a2f1566a2b068135c698134517b8927bf0bb199b84b8840920bafb7b97c2cc600bc95
+EBUILD collada_parser-1.12.12.ebuild 556 BLAKE2B b5131c89be3981d39d8d0bc0310a92007b9f2b0377b0096595230ce8b884e54a030bb5356531ab90f738e2d0820188651c935588e27b36fe7887763ee5fe2c7f SHA512 0dc225504afb546744f8fbfe7d5bf99a9f887f9e2cb27ca46784daac45d968c580af672f5c7bace1d5eb3bd9d2cb52b3ab95f486cb947517ce1dece4b4631b49
+EBUILD collada_parser-9999.ebuild 556 BLAKE2B b5131c89be3981d39d8d0bc0310a92007b9f2b0377b0096595230ce8b884e54a030bb5356531ab90f738e2d0820188651c935588e27b36fe7887763ee5fe2c7f SHA512 0dc225504afb546744f8fbfe7d5bf99a9f887f9e2cb27ca46784daac45d968c580af672f5c7bace1d5eb3bd9d2cb52b3ab95f486cb947517ce1dece4b4631b49
 MISC metadata.xml 330 BLAKE2B c2da1c8743674b266a5f2f5fcc19b62552a16668ddc3770bbb693942a52e2b089e80646cbfd971cc9d8a196d62cf5fa08fc9612c2b9f8e0fe4127af47de683ff SHA512 ee9d0c6d572e3e0027eac2efd899d9008549a7f45a7ca92356bc62c7f3f10fc6aa3a9bb5e4b926ee44bf106350769c9ddf7d351761457707fba21f6e1c9eb3bf
diff --git a/dev-ros/collada_parser/collada_parser-1.12.12.ebuild b/dev-ros/collada_parser/collada_parser-1.12.12.ebuild
new file mode 100644
index 000000000000..6358999ff08c
--- /dev/null
+++ b/dev-ros/collada_parser/collada_parser-1.12.12.ebuild
@@ -0,0 +1,26 @@
+# 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/collada_urdf"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ parser for the Collada robot description format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	>=dev-ros/urdf_parser_plugin-1.12.6
+	dev-ros/class_loader:=
+	dev-libs/urdfdom_headers
+	dev-libs/collada-dom:=
+	>=dev-ros/urdf-1.12.6
+	dev-ros/rosconsole
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_parser/collada_parser-9999.ebuild b/dev-ros/collada_parser/collada_parser-9999.ebuild
index cd21973f675f..6358999ff08c 100644
--- a/dev-ros/collada_parser/collada_parser-9999.ebuild
+++ b/dev-ros/collada_parser/collada_parser-9999.ebuild
@@ -16,11 +16,11 @@ IUSE=""
 RDEPEND="
 	dev-libs/boost:=
 	>=dev-ros/urdf_parser_plugin-1.12.6
-	dev-ros/roscpp
 	dev-ros/class_loader:=
 	dev-libs/urdfdom_headers
 	dev-libs/collada-dom:=
 	>=dev-ros/urdf-1.12.6
+	dev-ros/rosconsole
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/collada_urdf/Manifest b/dev-ros/collada_urdf/Manifest
index b599ae05ea33..f1a804639d5a 100644
--- a/dev-ros/collada_urdf/Manifest
+++ b/dev-ros/collada_urdf/Manifest
@@ -1,4 +1,6 @@
 DIST collada_urdf-1.12.10.tar.gz 73182 BLAKE2B 69f245e7962ad542a133ee71a7e9cbf7314ca7e754d95521dc802ef4296e957321897170444616bc2789626f19e7c368749f5644482dae04f28b864d08970de9 SHA512 78387ba78175099be0c48f966a185630598504f27d5baa76e9a9c088132b1368c698784c5367b376ac126e7c5a97a2117864561a073e6f9370a47fb86ad62ca4
+DIST collada_urdf-1.12.12.tar.gz 73361 BLAKE2B 7c23510d18080614e4f5666fa79d66b8378b6e524ac54249b8df03cefb3edfbcb7977690ca30917f8eab5ca56e689015f236cabff2aed402bd3a6b8d50f72cc6 SHA512 e0628daf905053bb6193cb3919b17b78f0697b1a530d589165f91343ac82a9fd08d86b9b24264e7f7750bef74d3a3b0db28bae63a31e8a484d8784db0a0ef6e5
 EBUILD collada_urdf-1.12.10-r1.ebuild 585 BLAKE2B 4ac88d382e17505599c338392d20bc7fe770728b06587e248a1c77a7550e2f1cf4775bad0713891eb25b969aecedc3b25e090f87430c19cfea6cdae357225f6b SHA512 72c1728b7ea621ee064611082ebc3b8fd2f7330891e79c34ac023def00a535fd749dc1a27ffb84beee12c715967b2f12aff66c0480226fe26fe582d835806475
-EBUILD collada_urdf-9999.ebuild 585 BLAKE2B 4ac88d382e17505599c338392d20bc7fe770728b06587e248a1c77a7550e2f1cf4775bad0713891eb25b969aecedc3b25e090f87430c19cfea6cdae357225f6b SHA512 72c1728b7ea621ee064611082ebc3b8fd2f7330891e79c34ac023def00a535fd749dc1a27ffb84beee12c715967b2f12aff66c0480226fe26fe582d835806475
+EBUILD collada_urdf-1.12.12.ebuild 616 BLAKE2B ad46888b5009f1e42e0c08a21e49c93b085be6c13842fbc42d4e20afe61dcffebb7e1fd9b6ae50f8660981ce4f37eff6e3cdf156cb94da29e360a16a1f55d7b2 SHA512 3256d6bcbc557b70a6e6db147859fa7906baab1f21d1a18702dd46c12d3e505e0dbf0462476ea425e427877ecf1b8d30fc62f8ccf4aa0241301734e7a111bb16
+EBUILD collada_urdf-9999.ebuild 616 BLAKE2B ad46888b5009f1e42e0c08a21e49c93b085be6c13842fbc42d4e20afe61dcffebb7e1fd9b6ae50f8660981ce4f37eff6e3cdf156cb94da29e360a16a1f55d7b2 SHA512 3256d6bcbc557b70a6e6db147859fa7906baab1f21d1a18702dd46c12d3e505e0dbf0462476ea425e427877ecf1b8d30fc62f8ccf4aa0241301734e7a111bb16
 MISC metadata.xml 330 BLAKE2B c2da1c8743674b266a5f2f5fcc19b62552a16668ddc3770bbb693942a52e2b089e80646cbfd971cc9d8a196d62cf5fa08fc9612c2b9f8e0fe4127af47de683ff SHA512 ee9d0c6d572e3e0027eac2efd899d9008549a7f45a7ca92356bc62c7f3f10fc6aa3a9bb5e4b926ee44bf106350769c9ddf7d351761457707fba21f6e1c9eb3bf
diff --git a/dev-ros/collada_urdf/collada_urdf-1.12.12.ebuild b/dev-ros/collada_urdf/collada_urdf-1.12.12.ebuild
new file mode 100644
index 000000000000..4d2d43f8f971
--- /dev/null
+++ b/dev-ros/collada_urdf/collada_urdf-1.12.12.ebuild
@@ -0,0 +1,30 @@
+# 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/collada_urdf"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Convert Unified Robot Description Format (URDF) documents into COLLADA documents"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/angles
+	dev-ros/collada_parser
+	dev-ros/resource_retriever
+	dev-ros/rosconsole
+	dev-ros/urdf
+	dev-ros/geometric_shapes
+	media-libs/assimp
+	dev-libs/collada-dom:=
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+"
diff --git a/dev-ros/collada_urdf/collada_urdf-9999.ebuild b/dev-ros/collada_urdf/collada_urdf-9999.ebuild
index 1a3e4542f459..4d2d43f8f971 100644
--- a/dev-ros/collada_urdf/collada_urdf-9999.ebuild
+++ b/dev-ros/collada_urdf/collada_urdf-9999.ebuild
@@ -18,11 +18,13 @@ RDEPEND="
 	dev-ros/angles
 	dev-ros/collada_parser
 	dev-ros/resource_retriever
+	dev-ros/rosconsole
 	dev-ros/urdf
 	dev-ros/geometric_shapes
-	dev-ros/tf
 	media-libs/assimp
-	dev-libs/tinyxml
 	dev-libs/collada-dom:=
+	dev-cpp/eigen:3
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
 "
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest
index 2ecedbd8bca0..afebf864e3df 100644
--- a/dev-ros/cv_bridge/Manifest
+++ b/dev-ros/cv_bridge/Manifest
@@ -1,6 +1,8 @@
 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
 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-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.12.8.ebuild b/dev-ros/cv_bridge/cv_bridge-1.12.8.ebuild
new file mode 100644
index 000000000000..781df6ff0219
--- /dev/null
+++ b/dev-ros/cv_bridge/cv_bridge-1.12.8.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/depth_image_proc/Manifest b/dev-ros/depth_image_proc/Manifest
index 9ce7111647e3..e9521d0a8560 100644
--- a/dev-ros/depth_image_proc/Manifest
+++ b/dev-ros/depth_image_proc/Manifest
@@ -1,4 +1,6 @@
 DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
+DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
 EBUILD depth_image_proc-1.12.22-r1.ebuild 732 BLAKE2B 16cf7f434921ef6754dee1ef95da566b2a13267c9b51f6d8da7515e36e8696da505e1a43650c0536595e0ab12912b7176ad4f0aecaaaf6bd77c9fd957c28f28c SHA512 c81f37aacce8a8ea5a41d735e6411d8a03b8ae834ee76ffc54dffc46296c7afae845cbfadae49bc189d9438e81569bab82eb2e4d0e193bc836e8b47e079e1681
+EBUILD depth_image_proc-1.12.23.ebuild 732 BLAKE2B a5ab72714539b5c587ede8dd2a791e45f8016fe934765bb0132555b78ece1174351ef31b1bfed432eda62d5c85e1094bba244a8e3622dcd5487a2956e08fc58c SHA512 87982442ec87ce04625e18f3df7256aceb7fc85130319aebd490e920a144e53370e1dee481d4233d4cbace5477de29dfd12456df7bd33ca18c312abf387a06ea
 EBUILD depth_image_proc-9999.ebuild 732 BLAKE2B 16cf7f434921ef6754dee1ef95da566b2a13267c9b51f6d8da7515e36e8696da505e1a43650c0536595e0ab12912b7176ad4f0aecaaaf6bd77c9fd957c28f28c SHA512 c81f37aacce8a8ea5a41d735e6411d8a03b8ae834ee76ffc54dffc46296c7afae845cbfadae49bc189d9438e81569bab82eb2e4d0e193bc836e8b47e079e1681
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/depth_image_proc/depth_image_proc-1.12.23.ebuild b/dev-ros/depth_image_proc/depth_image_proc-1.12.23.ebuild
new file mode 100644
index 000000000000..85a496111029
--- /dev/null
+++ b/dev-ros/depth_image_proc/depth_image_proc-1.12.23.ebuild
@@ -0,0 +1,31 @@
+# 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/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Nodelets for processing depth images such as those produced by OpenNI camera"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/eigen_conversions
+	dev-ros/image_geometry
+	dev-ros/image_transport
+	dev-ros/message_filters
+	dev-ros/nodelet
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_geometry/Manifest b/dev-ros/image_geometry/Manifest
index 6d0e1fdeb6b4..041a6c0ff2d9 100644
--- a/dev-ros/image_geometry/Manifest
+++ b/dev-ros/image_geometry/Manifest
@@ -2,9 +2,11 @@ DIST vision_opencv-1.12.3.tar.gz 80497 BLAKE2B 97e9c6d623108307216ae88dd5a4c6231
 DIST vision_opencv-1.12.4.tar.gz 80675 BLAKE2B e07f89942f471e25ec76ae43b07dee79eaf4637e5f5775151e066cc92a92f8993a6bc047ddc35adbb77745e6070797111d78add690ee7bb54cc8179cf2f7cfa5 SHA512 9ed426ddae7af343eed01d6ebf2769d654476bb28b095d67394e75feeec8440859aca34f62c9faff81018cf98fe58b731b96f3f7ffeaa459d14e6a3c59ad02e5
 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
 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-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.12.8.ebuild b/dev-ros/image_geometry/image_geometry-1.12.8.ebuild
new file mode 100644
index 000000000000..25d882f4b84d
--- /dev/null
+++ b/dev-ros/image_geometry/image_geometry-1.12.8.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/image_proc/Manifest b/dev-ros/image_proc/Manifest
index 6203b22cf5a7..97cc3c4bc8ba 100644
--- a/dev-ros/image_proc/Manifest
+++ b/dev-ros/image_proc/Manifest
@@ -1,4 +1,6 @@
 DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
+DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
 EBUILD image_proc-1.12.22-r1.ebuild 651 BLAKE2B 1da86d1caf1f9f81d704e80324f997bfff5cfbe8d4cc73d7689e171eba51d475742c3098827bbdeada5399e02808410975fb5a22a44aa5c31d8bb823f932fcd2 SHA512 7dfe7d9ea0706efaef13299b1f4a6e41676c593e5c23baa2b5cb118a7d1288325d2dfae29f273e130f08ab1fbdd8c2ccb5b5238ddec30379ce63c4fce620fc35
+EBUILD image_proc-1.12.23.ebuild 651 BLAKE2B d01b42e8fb22054539ad4eb4f55993ddf8887fe1c950eaa8ef6b9264348d73d82d32904984fe65500c2af4c0342e3f70023b8808d8d5a9a09dbafdd11963ffb4 SHA512 4db3b8b9a3ac3dc3e98c9896dceaa8652868bc8818072cb5144749491344dfb8662beb275c4462b5890400217b63c156ebdba9960cbdac0e18000a2a565497bc
 EBUILD image_proc-9999.ebuild 651 BLAKE2B 1da86d1caf1f9f81d704e80324f997bfff5cfbe8d4cc73d7689e171eba51d475742c3098827bbdeada5399e02808410975fb5a22a44aa5c31d8bb823f932fcd2 SHA512 7dfe7d9ea0706efaef13299b1f4a6e41676c593e5c23baa2b5cb118a7d1288325d2dfae29f273e130f08ab1fbdd8c2ccb5b5238ddec30379ce63c4fce620fc35
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_proc/image_proc-1.12.23.ebuild b/dev-ros/image_proc/image_proc-1.12.23.ebuild
new file mode 100644
index 000000000000..5f6d762c33e0
--- /dev/null
+++ b/dev-ros/image_proc/image_proc-1.12.23.ebuild
@@ -0,0 +1,29 @@
+# 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/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Single image rectification and color processing"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/dynamic_reconfigure
+	dev-ros/image_geometry
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	media-libs/opencv:=
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_publisher/Manifest b/dev-ros/image_publisher/Manifest
index 6fca12af965f..d396e8cc8c29 100644
--- a/dev-ros/image_publisher/Manifest
+++ b/dev-ros/image_publisher/Manifest
@@ -1,4 +1,6 @@
 DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
+DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
 EBUILD image_publisher-1.12.22-r1.ebuild 659 BLAKE2B 315872591ff8deecf72a17396468817f79cfced2e9464985b89928c930ccd0d00687ed39793c8578b333cc4a945c647485a9bfba133659d2f6d647f9d22f381d SHA512 76b8ec87fcbdee7eb69923308d18e304ae6286c4de807568859b94e9d7e5ab9e4f6c5ab6634fe02f4d8ed082a53a2ed23469b21af820a110d801d8b700c5352c
+EBUILD image_publisher-1.12.23.ebuild 659 BLAKE2B e0fefc67d3680c3bd1e2cf54d32eedd4d1e997de6707f4b77604d776a5b63ef67a423ed0618b3566f2272f94a2500507c5ad0de1d44858de9d0a81fec9f96e1b SHA512 ffd763e3b47a77022e3ee17b180e629e3297fce8f85d34e40997019e3ee4f0a0cb01fe898b1a16b665d91c3d1a60c9312d97cbe6fdb1391796c4e087726f2155
 EBUILD image_publisher-9999.ebuild 659 BLAKE2B 315872591ff8deecf72a17396468817f79cfced2e9464985b89928c930ccd0d00687ed39793c8578b333cc4a945c647485a9bfba133659d2f6d647f9d22f381d SHA512 76b8ec87fcbdee7eb69923308d18e304ae6286c4de807568859b94e9d7e5ab9e4f6c5ab6634fe02f4d8ed082a53a2ed23469b21af820a110d801d8b700c5352c
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_publisher/image_publisher-1.12.23.ebuild b/dev-ros/image_publisher/image_publisher-1.12.23.ebuild
new file mode 100644
index 000000000000..44b01c18391f
--- /dev/null
+++ b/dev-ros/image_publisher/image_publisher-1.12.23.ebuild
@@ -0,0 +1,29 @@
+# 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/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Publish an image stream from single image file or avi file."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/dynamic_reconfigure
+	dev-ros/camera_info_manager
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_rotate/Manifest b/dev-ros/image_rotate/Manifest
index 8c4eaf765c4e..bc1e6ac9c574 100644
--- a/dev-ros/image_rotate/Manifest
+++ b/dev-ros/image_rotate/Manifest
@@ -1,4 +1,6 @@
 DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
+DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
 EBUILD image_rotate-1.12.22-r1.ebuild 679 BLAKE2B e69271b3169a0e6ee0734c9c00c465df97b9af950a102024546aa52778293e6aa0edf3b33697ffff4a33b439af4957934e1f6fdfb4bade19b798adff2a48d6b4 SHA512 2760cfc1c6408482a26057a7135f5859d4950c166992b8c4505b91018cb0fad4c9d53771542539d91c57386dc9e43a97fcdb7ed98403bdb4bf71fb429a0ae96e
+EBUILD image_rotate-1.12.23.ebuild 679 BLAKE2B aef3ad1496da9a3d3a536c4c06d3dfb57608d6684f9b741451fe98edc910ce7bb18b36e647604b280db642ee0d564151b8bd8c36def042d2f0a8730c96dc46ea SHA512 a3663e2ec6ce2dbd65547963c62996c55424cae45f94aaa3adc481f59fc11cb70196df22f9ea7c0ac63f226fb6a0a424d7b27915db58796d48f6f16c67b72cbc
 EBUILD image_rotate-9999.ebuild 679 BLAKE2B e69271b3169a0e6ee0734c9c00c465df97b9af950a102024546aa52778293e6aa0edf3b33697ffff4a33b439af4957934e1f6fdfb4bade19b798adff2a48d6b4 SHA512 2760cfc1c6408482a26057a7135f5859d4950c166992b8c4505b91018cb0fad4c9d53771542539d91c57386dc9e43a97fcdb7ed98403bdb4bf71fb429a0ae96e
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_rotate/image_rotate-1.12.23.ebuild b/dev-ros/image_rotate/image_rotate-1.12.23.ebuild
new file mode 100644
index 000000000000..c501661beb9e
--- /dev/null
+++ b/dev-ros/image_rotate/image_rotate-1.12.23.ebuild
@@ -0,0 +1,30 @@
+# 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/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Rotates an image stream minimizing the angle between an arbitrary vector and the camera frame"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/dynamic_reconfigure
+	dev-ros/eigen_conversions
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_view/Manifest b/dev-ros/image_view/Manifest
index aea86b4e0266..50378f002836 100644
--- a/dev-ros/image_view/Manifest
+++ b/dev-ros/image_view/Manifest
@@ -1,4 +1,6 @@
 DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
+DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
 EBUILD image_view-1.12.22-r1.ebuild 794 BLAKE2B 90e70f23cb4ad8c7430293bb2499acdcc35a64f5a9b605e1d96cd4e754a3d16741a190a7b1c989d8e1fc8d12507308227887eacb5e0e9663ad3e58c82ec8bfe4 SHA512 bdd6d9362267653cbd80ea6c8dd6a98b8c7eeb3b4908e270af5109d7c36ffb8a6eed7012314f52b05cafbc0c1fcb27d4f9ff3a3742faf7d408f0ce3a6c04b19f
+EBUILD image_view-1.12.23.ebuild 794 BLAKE2B b110f344132d47cdf515fadfdabb4d194c621ebe5b5aa6af9bd618e77a5b8ed57e9d3c616d4379c62a6bd21300b241e9305ba3b8e67ce20b2b2c22d5a52f7643 SHA512 9c8802246ef3e980f7111f16214ef251e62fc2b093c4e2ca8397c3fbb23ed360ff8b463fbf19947c445e0b039e2e3f91ae5c8350aa9fd0e2e190b568e5e3b7ea
 EBUILD image_view-9999.ebuild 794 BLAKE2B 90e70f23cb4ad8c7430293bb2499acdcc35a64f5a9b605e1d96cd4e754a3d16741a190a7b1c989d8e1fc8d12507308227887eacb5e0e9663ad3e58c82ec8bfe4 SHA512 bdd6d9362267653cbd80ea6c8dd6a98b8c7eeb3b4908e270af5109d7c36ffb8a6eed7012314f52b05cafbc0c1fcb27d4f9ff3a3742faf7d408f0ce3a6c04b19f
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/image_view/image_view-1.12.23.ebuild b/dev-ros/image_view/image_view-1.12.23.ebuild
new file mode 100644
index 000000000000..6835689f080e
--- /dev/null
+++ b/dev-ros/image_view/image_view-1.12.23.ebuild
@@ -0,0 +1,33 @@
+# 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/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Simple viewer for ROS image topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	media-libs/opencv:=
+	x11-libs/gtk+:2
+	dev-ros/camera_calibration_parsers
+	>=dev-ros/cv_bridge-1.11.10
+	dev-ros/image_transport
+	dev-ros/message_filters
+	dev-ros/nodelet
+	dev-ros/rosconsole
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_markers/Manifest b/dev-ros/interactive_markers/Manifest
index 5f709204a222..8648acd0904b 100644
--- a/dev-ros/interactive_markers/Manifest
+++ b/dev-ros/interactive_markers/Manifest
@@ -1,4 +1,6 @@
 DIST interactive_markers-1.11.3.tar.gz 30201 BLAKE2B 5f0ce32737bf6f61fe26ebbbaddf0222123fee26106eb0726817e6d2112bfa4861b0a2571beb2a94ed8d3fdeab6e8e4e0cf9820721349fddb82a68fe9e4adb5f SHA512 9d4c44b67474aefae33498e03f7dfaafd2b28bef42a780900f3c9b3c7b119e0f899bc9220d449e44f071257dff093f7af745f97cb2e75fc949ed54f53c60d46c
+DIST interactive_markers-1.11.4.tar.gz 29971 BLAKE2B cd260fe0f03fb10322f8c717f3532657123a8298f140db33ae927f054fa373b219fdcba1c4423bb38ed9b3cd5c5f10b4459e3b18e711b6acab5393b3019e4795 SHA512 e78d0ecd8c702aebcdbb28f4f227f1d0baeb71d4af952a2a2d385e2ced0bf5e6afd8e810ef99015bdf3c2284b583b0eb7776705caf30ba5ff3b4a77d16e12e94
 EBUILD interactive_markers-1.11.3.ebuild 737 BLAKE2B 3041406b61442fc95dde102c9c1a1bec3dcacb3705d1a236d9fbf357d92f4cd43f4ef1a2d5e56152aa7bde0bdd65fbc553d11f7cbf8e26d23276e6c639e0c113 SHA512 ff4e4f412fec60cd5a5ab4cf472101218ad230a337fc9bbe53b93473527c91b93ef0c59616e7a7df8e9020f9359e6aafc387058fa8e8644a6a952a254651cac9
+EBUILD interactive_markers-1.11.4.ebuild 737 BLAKE2B 93d435caa72c476bf26f9ca60dc34026ac66aa72de997125220a83d85724025017b1a41193fe9c8adf143e0216f9fa53b4db78c21f8965e42c6a660a9bf04a6a SHA512 1278189984374a320e82effca2039c96876a547afd8c8c52ecbafc3a4f47956a328de34bd53d738c6825f09d1520853dd31c5ddd236bef2caa21c17af83b6551
 EBUILD interactive_markers-9999.ebuild 737 BLAKE2B 3041406b61442fc95dde102c9c1a1bec3dcacb3705d1a236d9fbf357d92f4cd43f4ef1a2d5e56152aa7bde0bdd65fbc553d11f7cbf8e26d23276e6c639e0c113 SHA512 ff4e4f412fec60cd5a5ab4cf472101218ad230a337fc9bbe53b93473527c91b93ef0c59616e7a7df8e9020f9359e6aafc387058fa8e8644a6a952a254651cac9
 MISC metadata.xml 351 BLAKE2B b177ef1311b10a0939dc8778be7461072e9919a6318acca86e32a36d102698a50e6a77ec30ef99976d5d2b8660be7e658667f7f63ee80c30c8b8319fd618c655 SHA512 901123473444518fc3f02d2496a045d6154e35bce54f9e76d927cfa4cf268556f8479ec2a1f4f60655d7efaef3ee51b175301811012b171244c7667d6b8ecc49
diff --git a/dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild b/dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild
new file mode 100644
index 000000000000..c9e821947cd1
--- /dev/null
+++ b/dev-ros/interactive_markers/interactive_markers-1.11.4.ebuild
@@ -0,0 +1,28 @@
+# 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-visualization/interactive_markers"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="3D interactive marker communication library for RViz and similar tools"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/rosconsole
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/opencv_tests/Manifest b/dev-ros/opencv_tests/Manifest
index f4606b894b6b..af5d7bb83c83 100644
--- a/dev-ros/opencv_tests/Manifest
+++ b/dev-ros/opencv_tests/Manifest
@@ -4,11 +4,13 @@ DIST vision_opencv-1.12.3.tar.gz 80497 BLAKE2B 97e9c6d623108307216ae88dd5a4c6231
 DIST vision_opencv-1.12.4.tar.gz 80675 BLAKE2B e07f89942f471e25ec76ae43b07dee79eaf4637e5f5775151e066cc92a92f8993a6bc047ddc35adbb77745e6070797111d78add690ee7bb54cc8179cf2f7cfa5 SHA512 9ed426ddae7af343eed01d6ebf2769d654476bb28b095d67394e75feeec8440859aca34f62c9faff81018cf98fe58b731b96f3f7ffeaa459d14e6a3c59ad02e5
 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
 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
 EBUILD opencv_tests-1.12.4.ebuild 751 BLAKE2B 41933ebb87ba8a0007d989b14ccff544522b040b1cadb5e96e04b52c7ce27e3b0b3bc2a1660dfd9d719bd9c819da649e2fc551f9527a9c9f93bf173d0a157f6a SHA512 e633cdca4016a98505c24cb1e2d5f865235e009c2300f1778205b7ce2a01229e038a76e9099c1f1655b5a053c0be54a3177259e64932bee4ce75551e82c6c2db
 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-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.12.8.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.8.ebuild
new file mode 100644
index 000000000000..83b23217853e
--- /dev/null
+++ b/dev-ros/opencv_tests/opencv_tests-1.12.8.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/*
+}
diff --git a/dev-ros/rqt_image_view/Manifest b/dev-ros/rqt_image_view/Manifest
index e1a0f70ff070..13c2c9fbfb3b 100644
--- a/dev-ros/rqt_image_view/Manifest
+++ b/dev-ros/rqt_image_view/Manifest
@@ -1,4 +1,6 @@
 DIST rqt_image_view-0.4.11.tar.gz 12610 BLAKE2B 5501c54339cf94d709eb25b943dee3e4bb80e5462ee40b185196d7e18dd01a74829c57d505a7cf905caf117e4db547b6d1bbfa0bda02466b6f77c7c4a00eaaae SHA512 5f6bf27e277d2c3486a9cae5a007cb71d57e846d958a27cc0bf447728e6c72ca368ab56b5d4b092f1c48d0017bb74e54cf64468b8f7c4fbaebc05c642afaad21
+DIST rqt_image_view-0.4.13.tar.gz 13428 BLAKE2B 5a26e8361f7483bef0104dc704623a5a992234b5d939137815cf9bd48d6167b650cee44ab42648a5c672d7f4f85231948b06d711a05ca80806f110f3aa8d70de SHA512 fc9006059dd1f8829074244ea0b8b47b596ddc449a9445593cd96d56d5e9429b5f144cee2b52a4422eff183aa0577395eab647530742d87b14068bc401b9d8c8
 EBUILD rqt_image_view-0.4.11-r1.ebuild 648 BLAKE2B 2d1b82bb033cfef1c02bf53541cdf25a37b94eb8491ee55ffbba4a0216d8076b267c72f3a6114b16b7de50d4b6f3e26a6c9639c7da60bb34cdb2d131d8c33b2d SHA512 a624c8dacf682c4a41e43a9b2ade2adec5454253d8a2f67a05551fded10202e0a77566aaca7be5bd3cd2f3636f8b5c3aa6945a9ba98b5349b533571b89604d92
+EBUILD rqt_image_view-0.4.13.ebuild 648 BLAKE2B 0d48cac2741e59849dbf3328bb286ee0bc5428cb2c73b91dbf12af5a202e2919ac3ce1dfaaf5609e1823db4b730314f0fbbbac7fad102d506e4bbd7eed71d9f3 SHA512 abc9d7a1b0b7a6d5298524f9c9890e4d1101b07ed3941761ccded52c5a8f27b1f214eb4b00439e1a62fbbeb3bf58b888bcb1c23ed64972f9c3b164304d975649
 EBUILD rqt_image_view-9999.ebuild 648 BLAKE2B 2d1b82bb033cfef1c02bf53541cdf25a37b94eb8491ee55ffbba4a0216d8076b267c72f3a6114b16b7de50d4b6f3e26a6c9639c7da60bb34cdb2d131d8c33b2d SHA512 a624c8dacf682c4a41e43a9b2ade2adec5454253d8a2f67a05551fded10202e0a77566aaca7be5bd3cd2f3636f8b5c3aa6945a9ba98b5349b533571b89604d92
 MISC metadata.xml 346 BLAKE2B a79e94b137d03773101db1b1312e511a6b3d489b49cbf26b3b5e890dc3970ea8425985cb04ad705ed7e0f9bc8c18bf07f5f5aa328b359d37c4ceac3e36516f3a SHA512 dd45aa50e58a93d0f1fb637248f842b21d39547ac94d4e183ad110515fc2f9ac6f325d8f894c6103a5366d791cd8765291f2b9c6ac74761fdc5f83220297013e
diff --git a/dev-ros/rqt_image_view/rqt_image_view-0.4.13.ebuild b/dev-ros/rqt_image_view/rqt_image_view-0.4.13.ebuild
new file mode 100644
index 000000000000..28e2c16cb324
--- /dev/null
+++ b/dev-ros/rqt_image_view/rqt_image_view-0.4.13.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_image_view"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for displaying images using image_transport"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge[${PYTHON_USEDEP}]
+	media-libs/opencv:=
+	dev-ros/image_transport
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	>=dev-ros/rqt_gui_cpp-0.3
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-qt/qtwidgets:5
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_rviz/Manifest b/dev-ros/rqt_rviz/Manifest
index 7ef6b711f76e..b09915a23d92 100644
--- a/dev-ros/rqt_rviz/Manifest
+++ b/dev-ros/rqt_rviz/Manifest
@@ -1,4 +1,6 @@
 DIST rqt_rviz-0.5.8.tar.gz 5633 BLAKE2B c7d3c9888186911f39afe9ec23f7deb8c3da9590a7ee74e8b168ff4deae44d9021d152e41c013d0bc43a43795e70325a63b731887b59e83d585b2cd6176f1476 SHA512 ea2d06cf5da74de6ed8cd59bea586e0c963f1ce077fcb05638d53b0fd28e7ffde7bd265976efd0743ecdb86451fdba610f0b305170630ac910ecc9ab8590499c
+DIST rqt_rviz-0.5.9.tar.gz 5650 BLAKE2B 53d54266bd0dcade1d834e41918fc628f59cff4acf5e25852527f421bd4d887c7beceeade060670963cb3c6dd6fdd1882727e6b659704360e35205683b1209c8 SHA512 911d25d13f90c4b54f0ff0d51fb59d560faf2aea07e88396587e3e32c175a33ebddb4264d9a60d74281ba77401fe39d6486567c37ef5f3e0637350183e1aadd1
 EBUILD rqt_rviz-0.5.8-r1.ebuild 546 BLAKE2B e521b130df811341f8e0588194d24f05173c40fd05d88609cfdcaae34d83bbfdbf441a6191581708814a5e94bb31ad0cef1bba29d7458ef19d7ad19a78840e55 SHA512 51a67f41bded7b15c115d50b26f0660b6a4ee31a63f5543996350a363f999196ebee56389e5cc9ba0f92ccc8e1cee50a014e6f794f0f31ec181567aab638790d
+EBUILD rqt_rviz-0.5.9.ebuild 546 BLAKE2B 8d3c6a3ce4c83c63ff11583cfd8f4ddfdec7fc8d8ef8f167c63695bc6127b67675060b4bc1eb7e82542519e36910c427dc68f286fd71ffe92f279686e8c70dfc SHA512 6cc7f0bf9a6487018a32ca721b4134047c1b782ee87177a709db48a06de11b50208a3c92c2c0260a417d351980adcb8ddc4a065f3c6076b9c11c4f79d09d7017
 EBUILD rqt_rviz-9999.ebuild 546 BLAKE2B e521b130df811341f8e0588194d24f05173c40fd05d88609cfdcaae34d83bbfdbf441a6191581708814a5e94bb31ad0cef1bba29d7458ef19d7ad19a78840e55 SHA512 51a67f41bded7b15c115d50b26f0660b6a4ee31a63f5543996350a363f999196ebee56389e5cc9ba0f92ccc8e1cee50a014e6f794f0f31ec181567aab638790d
 MISC metadata.xml 340 BLAKE2B 4172ee0043191333587f0531f753f03f9aceed8cf29a81ac12b6833adb1be0a1583a542ad97775b0bc19e2ea4ba87edda2654eef085c49285b5ce2176daa2303 SHA512 81d265770fdf37279c8d815459f7b365d1bff1e8d18758565adecba21599878edfa3be3a0bcfed0afe1157fb373edc4e0f3087aadffd1736569be937538115da
diff --git a/dev-ros/rqt_rviz/rqt_rviz-0.5.9.ebuild b/dev-ros/rqt_rviz/rqt_rviz-0.5.9.ebuild
new file mode 100644
index 000000000000..53f536b4de7c
--- /dev/null
+++ b/dev-ros/rqt_rviz/rqt_rviz-0.5.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt_rviz"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin embedding RViz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=
+	dev-ros/pluginlib[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_USEDEP}]
+	dev-ros/rqt_gui_cpp
+	>=dev-ros/qt_gui_cpp-0.3
+	dev-qt/qtwidgets:5
+	dev-ros/rviz
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/Manifest b/dev-ros/stereo_image_proc/Manifest
index aacb41593950..891ef1518fca 100644
--- a/dev-ros/stereo_image_proc/Manifest
+++ b/dev-ros/stereo_image_proc/Manifest
@@ -1,4 +1,6 @@
 DIST image_pipeline-1.12.22.tar.gz 139237 BLAKE2B 9c4ad324494f7e9db935cceed562840bb7ed7af730655398c9ac410722faf7d6747010ef0bbee55f14b555b6b2a6756de3edde31d84c3ae3fad123cea4a85bfe SHA512 34c17bd13625dc0a3c94639ce5ea17cc7674b0035b425c10020178d08037fb4fd081a84d7e83c75822f58c0ba2faead351702dbbc75c821d2f8c17bda351c560
+DIST image_pipeline-1.12.23.tar.gz 139986 BLAKE2B 22349762d6119a2246cb812cce310ebe98b046881ea1192425c4a0ebd7717b8e2768cd4f357ebf905f81e2be9816b7b864ee1040e570d156f9377f51386274a1 SHA512 cb9df1845ae3e7a08788e8f401b8e1b5354cc06f9a4b1aa62d2729c5d84033adbc0049a837236644a0b89951a172b230d4c074bc403bb265ba6cf0ad8016dbdd
 EBUILD stereo_image_proc-1.12.22-r1.ebuild 747 BLAKE2B c261006449b87dafd168ab81b5cd5391beffa44bd3a276ae50fbf2554865fa28d1abe945b3ba6a206ac46653d2371d0e9be37a864c705becabdde5a0fe8f8760 SHA512 d566dfb75d9bddff8a6b3cf18a79cb067469720bdc0206495e5b14e0ff2ec9460e973970d08a97c14915760eac924cc1ceddc0ca089b391812b7176453bae3a6
+EBUILD stereo_image_proc-1.12.23.ebuild 747 BLAKE2B e1b45ffc21bfdc2a06f87bfdd71de506b8379b6b17b6ee4b3d0fcb7b89e31346e955174698ba037f8de2adfee5f1df0db8221b408954be1a2b9106f1f8dcaba4 SHA512 1e0e9a8373864a500588ec2e78e76400fc8b39b8af80644e4392f75a6c05c56a12d3ccd2c6aef96c6679d2e0873a45ac13f4c92d0e269312a714eae245c05088
 EBUILD stereo_image_proc-9999.ebuild 747 BLAKE2B c261006449b87dafd168ab81b5cd5391beffa44bd3a276ae50fbf2554865fa28d1abe945b3ba6a206ac46653d2371d0e9be37a864c705becabdde5a0fe8f8760 SHA512 d566dfb75d9bddff8a6b3cf18a79cb067469720bdc0206495e5b14e0ff2ec9460e973970d08a97c14915760eac924cc1ceddc0ca089b391812b7176453bae3a6
 MISC metadata.xml 343 BLAKE2B 338674597d8027dfe18c53c2322f9f1ad7cb177c988a820dfbacbb45cf25ed32fbb65fc0fe08de174b20933d2cbfb7118e1d01b5e9d852f226cbd581da046bb4 SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.23.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.23.ebuild
new file mode 100644
index 000000000000..feab50d5cf8f
--- /dev/null
+++ b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.23.ebuild
@@ -0,0 +1,31 @@
+# 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/image_pipeline"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Stereo and single image rectification and disparity processing"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cv_bridge
+	dev-ros/dynamic_reconfigure
+	dev-ros/image_geometry
+	dev-ros/image_proc
+	dev-ros/image_transport
+	dev-ros/message_filters
+	dev-ros/nodelet
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	media-libs/opencv:=
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/urdf_tutorial/Manifest b/dev-ros/urdf_tutorial/Manifest
index 893907cad5b8..599326830b3f 100644
--- a/dev-ros/urdf_tutorial/Manifest
+++ b/dev-ros/urdf_tutorial/Manifest
@@ -1,10 +1,7 @@
-AUX notest.patch 474 BLAKE2B 169a8e930884fecbaca6376adfec8a7b02ce7fa82b81de9a32e93e6558bef58748bd36e77dbba6312ecc42e6d85fb387734a9354c3a247134384832d42ef4b2f SHA512 84ee122a63ea4035f3e51d07f4f9b621a564310140cfc2898ffb3db9009b55ea1385fd4d488c9ac488c498cbfbfafa95fc4a317ae6589750f4c61cb242f3bffc
 AUX tests.patch 593 BLAKE2B c7597300a131235a1f60407d2123cdcdebb4e95328ba413b7243934a4401e084b814682c23ec58950db24f738b2a8e7064f62ab5784764461288de7b352cdcb3 SHA512 0ef25218dad5f9f4798557131cd10043b5ac3314723b2f6d2d2a5de961153748c8df955e14359338c289e1b3f20301beef173f5aa5d98524a612d9977d621406
-DIST urdf_tutorial-0.2.4.tar.gz 580617 BLAKE2B f8a52aec05c36d3b28f74d07945af369271d47707434d04e51a57de8e3346047f31164576a05c38b936ac68b137097e6eb542ec08fc483571ec83c264e53d65a SHA512 be1909b6b2f4efd5e0b846ab465d9b5b4096f729ffda7568194e4d3208604be83f7007160a767cc8f6df71edca9822e7e49e8f069e88e7b27d11690f7a17bf35
-DIST urdf_tutorial-0.2.5.tar.gz 866990 BLAKE2B 34d63b5ae2170684175db28db326d2b3c968161013208528551485729fc15b22d6e5e08e7deeb89920c0446b6ddbfe48f96eb2b0199bbffed5f305f0c053333a SHA512 5de1af9cf93063996ccd3a33a88fda022ab3182c9f5cd47c0217c63ca8501bac4bcb58f358870461ffdf1b110c47dc30734886359d5d3c30afb41412155fec04
 DIST urdf_tutorial-0.3.0.tar.gz 871048 BLAKE2B 2bca4409696011c75e7b6c1ae811fe4caec3fe34b28ea80c9774b6068c64509a97452173c1e43ba92f77081419b58bf5f6987e1e9941eca8ce077c534636bad9 SHA512 1518cd2aa783e92dd7a996b9cff9df37f21f7585d59b6001bd9a42782b2a5d81e96e8d2502955283f29390c7fc4944250ff1d954ab6e511e0886f243c4aabbde
-EBUILD urdf_tutorial-0.2.4.ebuild 429 BLAKE2B cff4e1254f56b444368d66ad4cf4ad036db1e384238d3f0a34ed63e473214001e0f362b732b98dca63e8768f7485252d98da927f9b840ac109c4911703b6e0d5 SHA512 c346c13db8df1e9c8ce8f0f3216a07ce0d196b2b025ac50923c0cbec35002c411570062135fb831053191f8565e33e3b6e0d4f56ded8b93352b611357b99c0e0
-EBUILD urdf_tutorial-0.2.5.ebuild 443 BLAKE2B 0f2c3b1f8c7adb8f51af559b302c7ce6b00cc43d6d103c000f029c09bdc23b9314fed5bd6fa1f81b20102327737ff6babcc63b46872c57b5fbd56910e0768715 SHA512 036427ddeaec6995e851736d55af950a489b5e881e2020ffe774401a05253ffd980f2f1a313de1443820123fe542583d48878e97cf13e9d0b2fd66924163c5ba
+DIST urdf_tutorial-0.4.0.tar.gz 865626 BLAKE2B 42a8c3274e00393f846d4e2e9641740dad214bbcdc4f65095f96f2faac1f3709170d5719085d5927ca0c322f9b8cc57b2f8494353bec629978874870a8d37206 SHA512 256859d83fb5860df27cf8922043fb61158134c1ea06f3943fed3b8183c7384819a761d83bcb03a924a813185be07e89ca510076bfa1dfe4c2e52f561503fa88
 EBUILD urdf_tutorial-0.3.0.ebuild 538 BLAKE2B bb697e25127e767527bfec3300afa588fd4b0dff34a2a9e5145723e96465922f790d02a571dc302094f85dd9e43a84aa41b81636aeab91d0519d49ede897fe09 SHA512 214b1c36eb845b4a8606753163fb781cc3a0a0f2d4283d34c0f5499e6b478a8255d338a4c7b754c73a1a813a28168ca857ed7d22295745996b45a33e7fabd1e9
-EBUILD urdf_tutorial-9999.ebuild 499 BLAKE2B 9557b01cf7717d55045b3b6f4772b9f1deb3192fdce09773e2874916633e5fd11c5f4da4df7ecc839849c7f60fb10b947d9b5a9564e7d1953180abbdfb2a47a6 SHA512 e9aed6394f4eeaae7f943ad3720ef1f08b91db1350bd466862314378218668ded2bb8a113c4208850a194d45484903ee166ea1b293dfa6eee6c989a38d9651f9
+EBUILD urdf_tutorial-0.4.0.ebuild 480 BLAKE2B 6a0825689ee5abba1ca565a4bac64b2671a991fedded31709728aff30a362b9588e74f39bec47001e739052ee7ace8cf89cb0c1df38e36988a5e13703c841db1 SHA512 5a01272a6a13efd6f309c3010b66d1f5cc70b8156d63a03c98dfaf22c1c3a6612ff0c65f47c4189717bf69cadbf00d86f4649fb23cfdaa49b19c9c15857efde7
+EBUILD urdf_tutorial-9999.ebuild 480 BLAKE2B 6a0825689ee5abba1ca565a4bac64b2671a991fedded31709728aff30a362b9588e74f39bec47001e739052ee7ace8cf89cb0c1df38e36988a5e13703c841db1 SHA512 5a01272a6a13efd6f309c3010b66d1f5cc70b8156d63a03c98dfaf22c1c3a6612ff0c65f47c4189717bf69cadbf00d86f4649fb23cfdaa49b19c9c15857efde7
 MISC metadata.xml 331 BLAKE2B ef4364f8ec21105621d1d902a42bcd3c84797d9d72781e5fc1d5f80fc81cf5920aef1b68edd558a84510a3bfd8b1266f826c64d2e842c42b7006f980de8f1626 SHA512 b1e2cc797f0ddcd22bbc3c0c36c2339a95e66b05c1ac2042e7261fce8c9b55586aae1ee0633b98ead7eff51788f3debb5568c06567746af116665375f32b918f
diff --git a/dev-ros/urdf_tutorial/files/notest.patch b/dev-ros/urdf_tutorial/files/notest.patch
deleted file mode 100644
index 63e25b65dbed..000000000000
--- a/dev-ros/urdf_tutorial/files/notest.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: urdf_tutorial-0.2.5/CMakeLists.txt
-===================================================================
---- urdf_tutorial-0.2.5.orig/CMakeLists.txt
-+++ urdf_tutorial-0.2.5/CMakeLists.txt
-@@ -4,7 +4,9 @@ project(urdf_tutorial)
- find_package(catkin REQUIRED roslaunch)
- catkin_package()
- 
-+if(CATKIN_ENABLE_TESTING)
- roslaunch_add_file_check(launch)
-+endif()
- 
- install(DIRECTORY config images meshes launch rviz urdf
-   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-0.2.4.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-0.2.4.ebuild
deleted file mode 100644
index 68caace85fb0..000000000000
--- a/dev-ros/urdf_tutorial/urdf_tutorial-0.2.4.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros/urdf_tutorial"
-KEYWORDS="~amd64"
-
-inherit ros-catkin
-
-DESCRIPTION="URDF tutorials"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/urdf
-	dev-ros/joint_state_publisher
-	dev-ros/pr2_description
-	dev-ros/robot_state_publisher
-	dev-ros/rviz
-	dev-ros/xacro
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-0.2.5.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-0.4.0.ebuild
index 845c092ca24d..305da65fc713 100644
--- a/dev-ros/urdf_tutorial/urdf_tutorial-0.2.5.ebuild
+++ b/dev-ros/urdf_tutorial/urdf_tutorial-0.4.0.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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/urdf_tutorial"
 KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -19,5 +20,6 @@ RDEPEND="
 	dev-ros/rviz
 	dev-ros/xacro
 "
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/notest.patch" )
+DEPEND="${RDEPEND}
+	test? ( dev-ros/roslaunch[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild b/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
index 5e71d2766709..305da65fc713 100644
--- a/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
+++ b/dev-ros/urdf_tutorial/urdf_tutorial-9999.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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/urdf_tutorial"
 KEYWORDS="~amd64"
-ROS_SUBDIR="${PN}"
 PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest
index 55f609ea7d62..b93dd6531478 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1,6 +1,8 @@
 DIST xacro-1.13.0.tar.gz 80831 BLAKE2B e7d522879998c0d98bd6a45c409949b93392fa6cc2593c9796d68ed51aef37f82a3b15346c3a15e72c7724564b722f3a5b944f7ded62e720b6ab8c54dc74721b SHA512 f2eaa6f6eb7249ce1da84660d9f10ff83002c69e3d8ead5c4bfcad194052e6a059fa6dfcc261e199bfcb686a9801e810db4923b137530ad7df9572faad34a9aa
 DIST xacro-1.13.1.tar.gz 81091 BLAKE2B 40c48e63f288285a786fc3d6f3624940d25ec1bf78d92c05a6a40efa0db1ee0b3b63533f912459dbb59540ed8c1d266ae07a4df6e837a04232de6fa83b5bc10b SHA512 04732f1e77bf37268fc3e43ea6f888d17dcadab5f1869525f9f2237e893bc2eb7004ab730892ed6fa98d81706ff32e240b0bae0445791f6c1f1f8098effb4f95
+DIST xacro-1.13.2.tar.gz 81163 BLAKE2B 3c4319ee0b0ad14f6310d8ce9ead7cf18c71285b5c601282b9951173eb2d7bbf0e9752d813b478bd340de29bacfd25e57166c018d7dd703377198773c3326203 SHA512 10a8498c48aa52b4b4930e2b59a3ad8be32b1b974ca5cb1c56f06ce5cb7866473a7f3d29cf37ffc0681c54f4377edcab327a302225429d32eb3cd26bdd322198
 EBUILD xacro-1.13.0.ebuild 494 BLAKE2B 7a6b16056e1fde6ecc980f7aa4319c0e1fc604e786a12d7700ca4fd239772bb7bc9b4255d57e5f6107ef41eb64d8c6cb9b2ca5da0c08e86a63f3fd72edc748aa SHA512 0dbe3e599a3a84b3fa810fdecbc63be4ac547a74dd74b19225c90513f6145c4f765b5474156d5402731773fc0d2984b1e8d0a7a7c3048eb976eb569d791f94b0
 EBUILD xacro-1.13.1.ebuild 494 BLAKE2B 7a6b16056e1fde6ecc980f7aa4319c0e1fc604e786a12d7700ca4fd239772bb7bc9b4255d57e5f6107ef41eb64d8c6cb9b2ca5da0c08e86a63f3fd72edc748aa SHA512 0dbe3e599a3a84b3fa810fdecbc63be4ac547a74dd74b19225c90513f6145c4f765b5474156d5402731773fc0d2984b1e8d0a7a7c3048eb976eb569d791f94b0
+EBUILD xacro-1.13.2.ebuild 494 BLAKE2B 7a6b16056e1fde6ecc980f7aa4319c0e1fc604e786a12d7700ca4fd239772bb7bc9b4255d57e5f6107ef41eb64d8c6cb9b2ca5da0c08e86a63f3fd72edc748aa SHA512 0dbe3e599a3a84b3fa810fdecbc63be4ac547a74dd74b19225c90513f6145c4f765b5474156d5402731773fc0d2984b1e8d0a7a7c3048eb976eb569d791f94b0
 EBUILD xacro-9999.ebuild 494 BLAKE2B 6d35cfe8f1b31cd28a38bc06c462267cdadc569afab8fea4234e79aa3aa273b3508058b159276ac44cebbe5fb55de4fbd9749f25aeee4c4705f05938f7118229 SHA512 8d869a3a6a2b070affb22353d619d4ca8fb00ad7a7c1ecee3c908d82580a9bc71fb9066171cf88a4098d17a0296c304d925919aa7af2618c7ab762ae90eb49a1
 MISC metadata.xml 323 BLAKE2B d43754a1147a95e3536569c858b3dafecbc9dd4ec06ef00d23d7948de3aaf40d15aabf502f6c1b5579c03139c06579517c86fddc6eaa61f970baf101d9fef68e SHA512 9c6fccac3f7ab699969eb90199aa9690d064f1d66cc003c157bf85bc3147ae42f1433ac1589f57ce5b05ebd78a44c7f1a92f99e3af29bdee58727c1a676afd37
diff --git a/dev-ros/xacro/xacro-1.13.2.ebuild b/dev-ros/xacro/xacro-1.13.2.ebuild
new file mode 100644
index 000000000000..a7b93c3df7f6
--- /dev/null
+++ b/dev-ros/xacro/xacro-1.13.2.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/xacro"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="XML macro language"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/roslint[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )
+"
+RDEPEND="${RDEPEND}
+	dev-ros/roslaunch[${PYTHON_USEDEP}]"