gentoo resync : 13.05.2018

82 files changed, 860 insertions, 89 deletions

diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 11f0329195c9..49fbe2b62c34 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/actionlib_msgs/Manifest b/dev-ros/actionlib_msgs/Manifest
index faa4ba4a3d41..3a374e5e8cc1 100644
--- a/dev-ros/actionlib_msgs/Manifest
+++ b/dev-ros/actionlib_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
+DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
 EBUILD actionlib_msgs-1.12.5.ebuild 500 BLAKE2B 42e26bedd7d2083a91bf75bdc25eba6f69f3a7f19966a5c533ce7368c85130c115dde9f7e93d476dc2d706add703733117a509f50f90ee373603e2d3a3aaadb8 SHA512 4ac1e59c1bf4d170773a315fe0a52eb73e1b855ebf0ee8bbfdd9a6b0c417bd3ecc82c3485b18a878beebfbc92976e2c32a312c1989c98065be5ad8185e281ef0
+EBUILD actionlib_msgs-1.12.6.ebuild 500 BLAKE2B 8ce5fbe6bf83e12d57aef73833d26f99677990de810892c9ce4ff84f9783dd6d3e76b3b5456ffb75b4bef6059a0cedd5c978eb53cf7ecfb4ea3f95f92a24278d SHA512 2c52c810d38e64d211516d46980a74243ec4506850756c0d9590d461127fa174923bd31e029ece203ebd2c9d2ece4f918ac4f47a1fe84cf1185fc62c42bf72d3
 EBUILD actionlib_msgs-9999.ebuild 500 BLAKE2B 42e26bedd7d2083a91bf75bdc25eba6f69f3a7f19966a5c533ce7368c85130c115dde9f7e93d476dc2d706add703733117a509f50f90ee373603e2d3a3aaadb8 SHA512 4ac1e59c1bf4d170773a315fe0a52eb73e1b855ebf0ee8bbfdd9a6b0c417bd3ecc82c3485b18a878beebfbc92976e2c32a312c1989c98065be5ad8185e281ef0
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/actionlib_msgs/actionlib_msgs-1.12.6.ebuild b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.6.ebuild
new file mode 100644
index 000000000000..6fd08afffc6e
--- /dev/null
+++ b/dev-ros/actionlib_msgs/actionlib_msgs-1.12.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Common messages to interact with an action server and an action client"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/diagnostic_msgs/Manifest b/dev-ros/diagnostic_msgs/Manifest
index 90a11d309493..0b67a0fd493a 100644
--- a/dev-ros/diagnostic_msgs/Manifest
+++ b/dev-ros/diagnostic_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
+DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
 EBUILD diagnostic_msgs-1.12.5.ebuild 509 BLAKE2B 152c3107b52077b6217b912e0bce0c2a84f040173376c4429e8408c209e44c8e6d993acef72896e10b78666a3719b307f10e309e76b174fcf330802a885c5c20 SHA512 76dcfcdbbb83606453539a78636463a1dcbe05e906b32e6ab0029e9c4741334c5490a714077f86ad46a8f8f74b0093bad2f9dbb9a8700b41208d3fdef72be91b
+EBUILD diagnostic_msgs-1.12.6.ebuild 509 BLAKE2B 92d04cd0b69b7b38e117435948411682281cd379e7fefaddb5ceb5aca5ecb663bb57b2a8c25b6a455ae17d25d377d5d291853d6408d99fa0d293ff1f8f674c8d SHA512 a6ddde7fbb4bf631e3cf9169b1a164324bc466508c77299cbc6dc9b988838b9b0b77fcbcd14553666167d56bc933a8c628ea92bfda8912631a674b48a9384808
 EBUILD diagnostic_msgs-9999.ebuild 509 BLAKE2B 152c3107b52077b6217b912e0bce0c2a84f040173376c4429e8408c209e44c8e6d993acef72896e10b78666a3719b307f10e309e76b174fcf330802a885c5c20 SHA512 76dcfcdbbb83606453539a78636463a1dcbe05e906b32e6ab0029e9c4741334c5490a714077f86ad46a8f8f74b0093bad2f9dbb9a8700b41208d3fdef72be91b
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.6.ebuild b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.6.ebuild
new file mode 100644
index 000000000000..4136d8c611dd
--- /dev/null
+++ b/dev-ros/diagnostic_msgs/diagnostic_msgs-1.12.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Standardized interface for the diagnostic and runtime monitoring systems in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/eigen_conversions/Manifest b/dev-ros/eigen_conversions/Manifest
index e9ca9626dccd..a1d41140e706 100644
--- a/dev-ros/eigen_conversions/Manifest
+++ b/dev-ros/eigen_conversions/Manifest
@@ -1,4 +1,6 @@
 DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
+DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
 EBUILD eigen_conversions-1.11.9-r1.ebuild 562 BLAKE2B bae7a80955e2140b3e6845e1be8203cd24690c81ff157095847952e9d3ddd88888ddd540d0e2ec26af3e9c4f57f90c37df00b706a625237c604dbf59430b3307 SHA512 8c19ba235c637de3f3a835143b7920370052e78d763151d1d572aaa85a78c512e82b0a54dd059ba6bfa2e7ca04496c7b5e2fb602b85335e0169b473c3f0db3c1
+EBUILD eigen_conversions-1.12.0.ebuild 562 BLAKE2B bae7a80955e2140b3e6845e1be8203cd24690c81ff157095847952e9d3ddd88888ddd540d0e2ec26af3e9c4f57f90c37df00b706a625237c604dbf59430b3307 SHA512 8c19ba235c637de3f3a835143b7920370052e78d763151d1d572aaa85a78c512e82b0a54dd059ba6bfa2e7ca04496c7b5e2fb602b85335e0169b473c3f0db3c1
 EBUILD eigen_conversions-9999.ebuild 562 BLAKE2B bae7a80955e2140b3e6845e1be8203cd24690c81ff157095847952e9d3ddd88888ddd540d0e2ec26af3e9c4f57f90c37df00b706a625237c604dbf59430b3307 SHA512 8c19ba235c637de3f3a835143b7920370052e78d763151d1d572aaa85a78c512e82b0a54dd059ba6bfa2e7ca04496c7b5e2fb602b85335e0169b473c3f0db3c1
 MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/eigen_conversions/eigen_conversions-1.12.0.ebuild b/dev-ros/eigen_conversions/eigen_conversions-1.12.0.ebuild
new file mode 100644
index 000000000000..4065fd42f096
--- /dev/null
+++ b/dev-ros/eigen_conversions/eigen_conversions-1.12.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between Eigen and KDL and Eigen and geometry_msgs"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-libs/orocos_kdl:=
+	dev-cpp/eigen:3
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/cmake_modules
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/geometry_msgs/Manifest b/dev-ros/geometry_msgs/Manifest
index 46b1b3d13666..43e44dd96697 100644
--- a/dev-ros/geometry_msgs/Manifest
+++ b/dev-ros/geometry_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
+DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
 EBUILD geometry_msgs-1.12.5.ebuild 505 BLAKE2B 51a4ed63bd40f6bdd4490f3751ec21f2c828d713bd5aaa06e833160904bb50e9da580a789984f9f56870a4776bc455092b38f05e110f64547c384abff0cb5463 SHA512 21eae8f33a873278f4e636c1d08899996d201843ebbb3cc254872b38c0e16cbea88eda9ad4b54223f3a54092787e9d4e13f5fbf8d467fb75fc60d49a5b7d6e00
+EBUILD geometry_msgs-1.12.6.ebuild 505 BLAKE2B e7679fd7ca916ac53aac4dab328a265484cfb3a40f0b9cc6329fdf2782f8592d83e397c300da599084df1b6c306ebda61cfa38a2349ec90126b84c0b8f9e304b SHA512 245b160d7e785f3c1e20712a513502bd776d3ea6bd54b03ce00226b120ad42de5053693ede7d89c227e35a8ed3fee6b968915ddcb96e3aae513a5a744ed9cf1c
 EBUILD geometry_msgs-9999.ebuild 505 BLAKE2B 51a4ed63bd40f6bdd4490f3751ec21f2c828d713bd5aaa06e833160904bb50e9da580a789984f9f56870a4776bc455092b38f05e110f64547c384abff0cb5463 SHA512 21eae8f33a873278f4e636c1d08899996d201843ebbb3cc254872b38c0e16cbea88eda9ad4b54223f3a54092787e9d4e13f5fbf8d467fb75fc60d49a5b7d6e00
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/geometry_msgs/geometry_msgs-1.12.6.ebuild b/dev-ros/geometry_msgs/geometry_msgs-1.12.6.ebuild
new file mode 100644
index 000000000000..ec05a78b8a0c
--- /dev/null
+++ b/dev-ros/geometry_msgs/geometry_msgs-1.12.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for common geometric primitives such as points, vectors, and poses"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/interactive_marker_tutorials/Manifest b/dev-ros/interactive_marker_tutorials/Manifest
index e1c77b00a0fd..63978c407293 100644
--- a/dev-ros/interactive_marker_tutorials/Manifest
+++ b/dev-ros/interactive_marker_tutorials/Manifest
@@ -1,6 +1,8 @@
 DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
 DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
+DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
 EBUILD interactive_marker_tutorials-0.10.1.ebuild 616 BLAKE2B 72b4d727495dbe33c5fb596eee49474e4eac54f8d4c400a704a58efe364e4634203d102510ab77f2c9716a9f7c28f79127c2399ba05095cacbe9f612eb86dcab SHA512 23efafcbdb9297b028329a3486533e10ed560e5dcc053f397ceac1f16e2052702498346dad522191167bcb26a4141b71922dd5a3d4ce7f4e6a7d11747299dd10
 EBUILD interactive_marker_tutorials-0.10.2.ebuild 616 BLAKE2B 1a0233430e646cee91bd197ba068742de0a91ac963e060d23587e45b4b9e7aab5829bcc36a666367bf1cb50d36159a68d83c35e72499b5affce16c7bd45835d3 SHA512 d4c1167db05ac08c3f44a7fa8c1ecd5df277b045dc5a173a0bd61d6713cda6f5f3f23e7e81d42b537ca8b1acea0e66370f704bcaa5283d508918dec63aa6d7e6
+EBUILD interactive_marker_tutorials-0.10.3.ebuild 616 BLAKE2B 1a0233430e646cee91bd197ba068742de0a91ac963e060d23587e45b4b9e7aab5829bcc36a666367bf1cb50d36159a68d83c35e72499b5affce16c7bd45835d3 SHA512 d4c1167db05ac08c3f44a7fa8c1ecd5df277b045dc5a173a0bd61d6713cda6f5f3f23e7e81d42b537ca8b1acea0e66370f704bcaa5283d508918dec63aa6d7e6
 EBUILD interactive_marker_tutorials-9999.ebuild 616 BLAKE2B 72b4d727495dbe33c5fb596eee49474e4eac54f8d4c400a704a58efe364e4634203d102510ab77f2c9716a9f7c28f79127c2399ba05095cacbe9f612eb86dcab SHA512 23efafcbdb9297b028329a3486533e10ed560e5dcc053f397ceac1f16e2052702498346dad522191167bcb26a4141b71922dd5a3d4ce7f4e6a7d11747299dd10
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3.ebuild b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3.ebuild
new file mode 100644
index 000000000000..834526809e25
--- /dev/null
+++ b/dev-ros/interactive_marker_tutorials/interactive_marker_tutorials-0.10.3.ebuild
@@ -0,0 +1,25 @@
+# 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/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Interactive marker tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/interactive_markers
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/kdl_conversions/Manifest b/dev-ros/kdl_conversions/Manifest
index ded7661198d9..bcac5e098854 100644
--- a/dev-ros/kdl_conversions/Manifest
+++ b/dev-ros/kdl_conversions/Manifest
@@ -1,4 +1,6 @@
 DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
+DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
 EBUILD kdl_conversions-1.11.9-r1.ebuild 459 BLAKE2B b4ed7de2be0f7478e1b563a1be7ec605dbaf5c9dd597380b90986edbe80fb064d167b15366134a6be0492d3403249d66923156c2244837ff179165333b794992 SHA512 e28526275022de0f203d20d745b713ea880859f5066b6f719c589009a15ab0a8550ba562c59384636b383a3bd8149015e6f452259c1c1849b483ef86065eae24
+EBUILD kdl_conversions-1.12.0.ebuild 459 BLAKE2B b4ed7de2be0f7478e1b563a1be7ec605dbaf5c9dd597380b90986edbe80fb064d167b15366134a6be0492d3403249d66923156c2244837ff179165333b794992 SHA512 e28526275022de0f203d20d745b713ea880859f5066b6f719c589009a15ab0a8550ba562c59384636b383a3bd8149015e6f452259c1c1849b483ef86065eae24
 EBUILD kdl_conversions-9999.ebuild 459 BLAKE2B b4ed7de2be0f7478e1b563a1be7ec605dbaf5c9dd597380b90986edbe80fb064d167b15366134a6be0492d3403249d66923156c2244837ff179165333b794992 SHA512 e28526275022de0f203d20d745b713ea880859f5066b6f719c589009a15ab0a8550ba562c59384636b383a3bd8149015e6f452259c1c1849b483ef86065eae24
 MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/kdl_conversions/kdl_conversions-1.12.0.ebuild b/dev-ros/kdl_conversions/kdl_conversions-1.12.0.ebuild
new file mode 100644
index 000000000000..0f4679e87a71
--- /dev/null
+++ b/dev-ros/kdl_conversions/kdl_conversions-1.12.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions between KDL and geometry_msgs types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	sci-libs/orocos_kdl:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/librviz_tutorial/Manifest b/dev-ros/librviz_tutorial/Manifest
index 3624ee306d68..24d6e4c0a322 100644
--- a/dev-ros/librviz_tutorial/Manifest
+++ b/dev-ros/librviz_tutorial/Manifest
@@ -1,6 +1,8 @@
 DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
 DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
+DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
 EBUILD librviz_tutorial-0.10.1.ebuild 458 BLAKE2B 1e6cba7a4fece4d4c82e809a51b93ad1f10aa073d006c1f7df851d2d1343d9b47de412d96f18b65ef25cfaca5985fa50c5f12d21dc253d74e0625cc8b8a7c420 SHA512 c93eedc30fade27d4d85dda547b49566227517b729ede7503b5334b549ba549cccfc700249cd2da6636ad1413765a5a491f0348e39c5649985e152162adc48a8
 EBUILD librviz_tutorial-0.10.2.ebuild 458 BLAKE2B 3ee42f59d025c0fb9a8adaf3b1355f78aa8c7ba82f5f779691a4c15f2362791e15d88f3271d902bad059eb3ee59619e496a1f7dc12745cf1f3926840f33436a1 SHA512 b86dbc8b4d38f91faad5771afd1f769af6123e83258c56a5c6502f1a6259194ad9c3c61d219499fa4df4ac79c61fddd5d4155a4ce941d0548b86e15f075168c8
+EBUILD librviz_tutorial-0.10.3.ebuild 458 BLAKE2B 3ee42f59d025c0fb9a8adaf3b1355f78aa8c7ba82f5f779691a4c15f2362791e15d88f3271d902bad059eb3ee59619e496a1f7dc12745cf1f3926840f33436a1 SHA512 b86dbc8b4d38f91faad5771afd1f769af6123e83258c56a5c6502f1a6259194ad9c3c61d219499fa4df4ac79c61fddd5d4155a4ce941d0548b86e15f075168c8
 EBUILD librviz_tutorial-9999.ebuild 458 BLAKE2B 1e6cba7a4fece4d4c82e809a51b93ad1f10aa073d006c1f7df851d2d1343d9b47de412d96f18b65ef25cfaca5985fa50c5f12d21dc253d74e0625cc8b8a7c420 SHA512 c93eedc30fade27d4d85dda547b49566227517b729ede7503b5334b549ba549cccfc700249cd2da6636ad1413765a5a491f0348e39c5649985e152162adc48a8
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/librviz_tutorial/librviz_tutorial-0.10.3.ebuild b/dev-ros/librviz_tutorial/librviz_tutorial-0.10.3.ebuild
new file mode 100644
index 000000000000..dbb62ffac134
--- /dev/null
+++ b/dev-ros/librviz_tutorial/librviz_tutorial-0.10.3.ebuild
@@ -0,0 +1,21 @@
+# 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/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tutorial showing how to compile your own C++ program with RViz displays and features"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rviz
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/moveit_msgs/Manifest b/dev-ros/moveit_msgs/Manifest
index b87551e1349d..efd4c13823c4 100644
--- a/dev-ros/moveit_msgs/Manifest
+++ b/dev-ros/moveit_msgs/Manifest
@@ -1,4 +1,6 @@
+DIST moveit_msgs-0.10.0.tar.gz 17847 BLAKE2B f80d7c267aab47b38e426b88e7a1e5487c738a8aeda143eee3d4c83a5929b66380aff939536d8f587b7acacbe239bfb2d5a8489fa3100a1f9f15cbe0cff310db SHA512 80a7dca2e9bda4bcf191691671ba179a42fb031b9ba2ac64c8e73854a94dc15ffaaedb1dce06da42d994c9c8b3161e6d55a8ef7a9c3c5a1f3629779eac5c1dba
 DIST moveit_msgs-0.9.1.tar.gz 17760 BLAKE2B 1ac7c9c30e5873ecf51db435c66553d3ded4104cfca6a5daaa3396d96380eb41580b3c494b94c002b2829f01c001f947f126935c5dd9f239362da08bc8567ff2 SHA512 af998019a5c1c82a2026c6d2071feb7494616b6eef942450dbb81178f0c393c173ca8b8c17018f6da15b5b0ac438515a762914122ad315572cc5ef25567be758
+EBUILD moveit_msgs-0.10.0.ebuild 639 BLAKE2B 095d99c8ec2ac718c4b94f3be620a7ea047b414aa0c28ed7bae5248f83b22b6df288318323091da920dd885239a695a133869013411b5a4c81eb3034f6b50fea SHA512 5662965b3588f96dc1c9cc215e40148045e9860f8e67f1b7d037a1e418278dfca6bea4e1b30901b89d2154b9bcd6533c7233371b3b9126b325ebc461e3cee0a1
 EBUILD moveit_msgs-0.9.1.ebuild 639 BLAKE2B 61ba46c72a6ac57fbf08ee26a7a0373e2e0a7d147ac853250ab5c29fddc8d4de6ad977a1c471f0c66ea578c266515fa9926cede7aa74ea73af255b1cb99db5e8 SHA512 cae0a3459b75d74882704d61051e2f6694a5d831d4f3a9c17a3e838d21cd3353e0e4e3786c52a139ef9ce68d0331b5db699707e1ed9e56c064924ebf58d1131c
 EBUILD moveit_msgs-9999.ebuild 639 BLAKE2B 61ba46c72a6ac57fbf08ee26a7a0373e2e0a7d147ac853250ab5c29fddc8d4de6ad977a1c471f0c66ea578c266515fa9926cede7aa74ea73af255b1cb99db5e8 SHA512 cae0a3459b75d74882704d61051e2f6694a5d831d4f3a9c17a3e838d21cd3353e0e4e3786c52a139ef9ce68d0331b5db699707e1ed9e56c064924ebf58d1131c
 MISC metadata.xml 338 BLAKE2B f91c4144e8f04fe987c5db67b6ebf539420aa3c07bd50c58394bd489a5d6b41f6122a645dd2c182dc6c14d4755d97b89fe444e2a1b48a6b048a6726c36bd31e9 SHA512 232c4c964a3798a5b5aa26692e74b2f71e1a6f4bf89e618c86824d0a6fd97b4064b68ecb380dc505c4cf492fd45671e89bb419d96377e5fced8a665b864fb1a1
diff --git a/dev-ros/moveit_msgs/moveit_msgs-0.10.0.ebuild b/dev-ros/moveit_msgs/moveit_msgs-0.10.0.ebuild
new file mode 100644
index 000000000000..762265817bc2
--- /dev/null
+++ b/dev-ros/moveit_msgs/moveit_msgs-0.10.0.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-planning/moveit_msgs"
+CATKIN_HAS_MESSAGES=yes
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="
+	dev-ros/actionlib_msgs
+	dev-ros/sensor_msgs
+	dev-ros/geometry_msgs
+	dev-ros/trajectory_msgs
+	dev-ros/shape_msgs
+	dev-ros/std_msgs
+	dev-ros/octomap_msgs
+	dev-ros/object_recognition_msgs
+"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages, services and actions used by MoveIt"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/nav_msgs/Manifest b/dev-ros/nav_msgs/Manifest
index 7e448587d1b1..8873d4aef5be 100644
--- a/dev-ros/nav_msgs/Manifest
+++ b/dev-ros/nav_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
+DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
 EBUILD nav_msgs-1.12.5.ebuild 533 BLAKE2B 0a84f7543b83355b49cdf8e35caf9245310f25053f4fe7f99792fb838bc6125225b81d96806e27df6de8d5a285261d43fb6e61bbab79ba1da9a8c3df2342a4fa SHA512 fad0ea2c0f6357b097ef88118129fcf1b39a34efd8a7f1bbaecda08976c0d4bfd8ff030bc9714b362931b5106f371fd1f26f9423a79c25090b2100c41f8da4f3
+EBUILD nav_msgs-1.12.6.ebuild 533 BLAKE2B 4776eb0d08edfe14e4f9e66d02a7455a02107afc0fe49f6caa62ac5cbe0b48f0aa73bfa9415893ae66eea9364814f90afa91460dd900bc1d3134950a5c172f7d SHA512 71a81844a797ef8f856eb7f52a578fc06377f7d5c511e0a8318ed293b243d37dd8adfbb029b2532dfc65923cca756b89ca26c740c564c25d500ef19c06bbd4ca
 EBUILD nav_msgs-9999.ebuild 533 BLAKE2B 0a84f7543b83355b49cdf8e35caf9245310f25053f4fe7f99792fb838bc6125225b81d96806e27df6de8d5a285261d43fb6e61bbab79ba1da9a8c3df2342a4fa SHA512 fad0ea2c0f6357b097ef88118129fcf1b39a34efd8a7f1bbaecda08976c0d4bfd8ff030bc9714b362931b5106f371fd1f26f9423a79c25090b2100c41f8da4f3
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/nav_msgs/nav_msgs-1.12.6.ebuild b/dev-ros/nav_msgs/nav_msgs-1.12.6.ebuild
new file mode 100644
index 000000000000..0be06a797589
--- /dev/null
+++ b/dev-ros/nav_msgs/nav_msgs-1.12.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/actionlib_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Common messages used to interact with the navigation stack"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/pluginlib/Manifest b/dev-ros/pluginlib/Manifest
index 0f377c6fcbc9..4be11cb2c0a1 100644
--- a/dev-ros/pluginlib/Manifest
+++ b/dev-ros/pluginlib/Manifest
@@ -1,9 +1,7 @@
 AUX catkin_prefix_path2.patch 678 BLAKE2B c494700f8d2cfce884b65ef87963cbf414dc4af1a9c9390978e7f458ad7f93b28c54bcd9831ff3edf4d6a421c4ec9ad1859bafff5f8ed209662ea1d14a70c299 SHA512 3b91fac26a2e48087fc70a773f5416e6cc3f7758adcddea6d50ba97a2d1ff8ae2f14fd5b74ba043a5546a8809def8b2154c70a97b10c451ba3773a82eda67100
-DIST pluginlib-1.11.2.tar.gz 22844 BLAKE2B 3f3090b2b41754c0989cbc2c0f31333cf404aca00c481c3062955b01274b1cddb76eef41a0bce9a01058b461a293d42beae7c9337e8780d1e9503968196f0a98 SHA512 579aeb2ae82d6607c62007a5be6ccc402856c135e69a500d530ce5569c4f77526a63fee8b948db997db2face37bdac929b58911b5245c6ad641d19af055e46c0
-DIST pluginlib-1.11.3.tar.gz 23465 BLAKE2B 64725b7bd3896362168db324dbbdc9a0de24d6c79b77d3b21e6d6a95091bfe7bca35fe93617200ed993a20aa8ce5604b90eadf546ca0d3ab5cca79dd47e182a0 SHA512 5d0acadf69362137041b6f08724ef0c0b0209ca901d1d082df38224e08ad990e43133979e9462128f0b9fb313ad4c9398bf5c075e5669a1cd3cd8dd715e9355b
 DIST pluginlib-1.12.0.tar.gz 20298 BLAKE2B 9d6e5adb6bd64f02d237fa1992402cb016266071c0fa0447709880f90550f36f9e280163a3e054594235d0102f7fb22f4b98a56216b0db9ebaa200b99d018570 SHA512 fcd51908c6c7223bbe50eb43733ba6d00e11419b26d2b9a05aaaf6498020fcd44bacc19313c3a4dd7524bf69d4f54aec27e05b1f88ee578191484c53c1e3f767
-EBUILD pluginlib-1.11.2.ebuild 641 BLAKE2B 2c4329a647af34803aa7397cbe4a4a15bef5e4bcc986791136a18df732729e6b75e1a3e4612d8a17a8f738a17e247e133e2d69cb4af934bca2fac4ec9654fa88 SHA512 cd565b244ea1b067e1a01c8011cc132f579f7a11d642bb9c7309899e014a0cf5d61518d84d74d66bfe48686e979237babfea8efc9085b8f842ccd52137b22da4
-EBUILD pluginlib-1.11.3.ebuild 641 BLAKE2B e2c20cda0913569bb214bee0b9f3f9e1d97dafcfb9d11b71855c424914a7f2849e872bbc12e6c5ebb293e4167e1799ae1956e60d9f4230af89e9789c4bd4a9cc SHA512 614abf141b20bb02351988fc06b48a97a2f37ef514a340e1d81fcb78c6e89d3b811c08dff2432dd9d2b4b0e3acb790f010a30d84d98661b5bd8628bb082b0fa0
+DIST pluginlib-1.12.1.tar.gz 19619 BLAKE2B e91fb15b4857fae10012a71df606f5040d5a62bdee596695c873808790eea02cd380eedda6c438388264003d7ac930ebc2c649a421411580dd095365c93d3c8e SHA512 1a15cd934c4f93fecf32d7d3cab1ee6caae61d59aa65d1f796ab2ba63d5204a6fe28744c28eac80d304bd802b184afe79ead621b3c370c6d3526a944c144d724
 EBUILD pluginlib-1.12.0-r1.ebuild 639 BLAKE2B 15f141f8d152ee3eb19190a25de826335497cf5f6a9d4916a1c3c8c36eabc0435634ec1bed7f2a94787d8a58199eb42c1470a8783d9e4142ca6c6afab350c75c SHA512 032ed001238c0999a3bcd9eaf541328978af79af2ff5b95ac146b81c57c4c0948a20dc8aa07ff102754447940f2fad02612258432c4b51dfea2dab6e8f54d29d
+EBUILD pluginlib-1.12.1.ebuild 639 BLAKE2B 15f141f8d152ee3eb19190a25de826335497cf5f6a9d4916a1c3c8c36eabc0435634ec1bed7f2a94787d8a58199eb42c1470a8783d9e4142ca6c6afab350c75c SHA512 032ed001238c0999a3bcd9eaf541328978af79af2ff5b95ac146b81c57c4c0948a20dc8aa07ff102754447940f2fad02612258432c4b51dfea2dab6e8f54d29d
 EBUILD pluginlib-9999.ebuild 639 BLAKE2B 15f141f8d152ee3eb19190a25de826335497cf5f6a9d4916a1c3c8c36eabc0435634ec1bed7f2a94787d8a58199eb42c1470a8783d9e4142ca6c6afab350c75c SHA512 032ed001238c0999a3bcd9eaf541328978af79af2ff5b95ac146b81c57c4c0948a20dc8aa07ff102754447940f2fad02612258432c4b51dfea2dab6e8f54d29d
 MISC metadata.xml 327 BLAKE2B f94cb82ca7e89f9c45d423a4b56a573d7d220a5bf218838163659dc027554338b845539ae4090df944e0053ce3e0264c0323a442732619147116a583926fc405 SHA512 cf53258133948a2b0d201af3f0d439f5dcfc9c43691ae4d2b175a70258dd26ffd0fd99511aa02df57cfafb8fc4a1a8185759de0b23f7a1496a227f706900b7a2
diff --git a/dev-ros/pluginlib/pluginlib-1.11.2.ebuild b/dev-ros/pluginlib/pluginlib-1.11.2.ebuild
deleted file mode 100644
index d72ce338bb94..000000000000
--- a/dev-ros/pluginlib/pluginlib-1.11.2.ebuild
+++ /dev/null
@@ -1,27 +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/pluginlib"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit ros-catkin
-
-DESCRIPTION="Provides tools for writing and dynamically loading plugins using the ROS build infrastructure"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/class_loader-0.3.5
-	dev-ros/rosconsole
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-libs/boost:=
-	dev-libs/tinyxml2:=
-	dev-ros/cmake_modules
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )"
-PATCHES=( "${FILESDIR}/catkin_prefix_path2.patch" )
diff --git a/dev-ros/pluginlib/pluginlib-1.11.3.ebuild b/dev-ros/pluginlib/pluginlib-1.12.1.ebuild
index 01682d753b10..5346810670b3 100644
--- a/dev-ros/pluginlib/pluginlib-1.11.3.ebuild
+++ b/dev-ros/pluginlib/pluginlib-1.12.1.ebuild
@@ -6,6 +6,7 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/pluginlib"
 KEYWORDS="~amd64 ~arm"
 PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR="${PN}"
 
 inherit ros-catkin
 
@@ -15,12 +16,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	>=dev-ros/class_loader-0.3.5
+	>=dev-ros/class_loader-0.3.5:=
 	dev-ros/rosconsole
 	dev-ros/roslib[${PYTHON_USEDEP}]
 	dev-libs/boost:=
 	dev-libs/tinyxml2:=
-	dev-ros/cmake_modules
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/rviz/Manifest b/dev-ros/rviz/Manifest
index 5d1cfc12c3f4..d807748b03c2 100644
--- a/dev-ros/rviz/Manifest
+++ b/dev-ros/rviz/Manifest
@@ -1,6 +1,8 @@
 DIST rviz-1.12.15.tar.gz 5088184 BLAKE2B 9096cd707ff265847fdb0ddc71b31ec50dcfb9af0cb658ccbe8530d75cf82abcfa7d5a76f220e1bf2393e28807b44fec3d8690463f19dfb6482bc7b51a07f2c2 SHA512 d12ca4b56a7a2a19f37ca69a4efc0f474ff1409cdd9e1f1d357d6c2b6033a21183e469c712b5583ddc41f579f697d55145516c79797e846d3345019e57615ad6
 DIST rviz-1.13.0.tar.gz 5090158 BLAKE2B 40f5135a0518be5c97b713e43d29bd16f115d3759d16a82853e85aa8a4f918e4c11d2e78781d8c2d0ee8337d3d60865e3e76434b6a7fdc4c96ebc39288290809 SHA512 5ab9d24ffeeb41db4c12ead22a38b5815c5660c884c23bf20769a59f18603938c4c804fc9de506f9d5137e438f7241d06f0968ab80be70b7e9e281f9693e1ad8
+DIST rviz-1.13.1.tar.gz 5094089 BLAKE2B 7f4c106bf51b2465177107f5eb19602323045423b3ee5149f70b177170af9eea1cea0d4069f859c3c9bf3a2bdbe7feb91b802c758a66f6b990bd890b124d2a52 SHA512 cace4d41341647a8e4d5ab3be64ca71a4b41134a15a4df8556f35824c550c5fb7024f7338d0ffac1ea9c7f574c10757b773a8df37625d6e616eafdcd7f0aab09
 EBUILD rviz-1.12.15-r1.ebuild 1694 BLAKE2B 80e391c4dd623f9ba988a00b90146c20f2b4fb363b29efa712d1a2e382f647765849a5eef73e74831d61202a27e4e20a316f3d640205c149dfb938ac044ddca1 SHA512 8113c7539a6a2674d99ef82b181e8907a449023d983a8d007a42dc81785007a5e9a4fb2d6e08f4c9ead16fc306327a4a06f9f995ba1a71608804995073f766c2
 EBUILD rviz-1.13.0.ebuild 1694 BLAKE2B 80e391c4dd623f9ba988a00b90146c20f2b4fb363b29efa712d1a2e382f647765849a5eef73e74831d61202a27e4e20a316f3d640205c149dfb938ac044ddca1 SHA512 8113c7539a6a2674d99ef82b181e8907a449023d983a8d007a42dc81785007a5e9a4fb2d6e08f4c9ead16fc306327a4a06f9f995ba1a71608804995073f766c2
-EBUILD rviz-9999.ebuild 1694 BLAKE2B 80e391c4dd623f9ba988a00b90146c20f2b4fb363b29efa712d1a2e382f647765849a5eef73e74831d61202a27e4e20a316f3d640205c149dfb938ac044ddca1 SHA512 8113c7539a6a2674d99ef82b181e8907a449023d983a8d007a42dc81785007a5e9a4fb2d6e08f4c9ead16fc306327a4a06f9f995ba1a71608804995073f766c2
+EBUILD rviz-1.13.1.ebuild 1694 BLAKE2B 80e391c4dd623f9ba988a00b90146c20f2b4fb363b29efa712d1a2e382f647765849a5eef73e74831d61202a27e4e20a316f3d640205c149dfb938ac044ddca1 SHA512 8113c7539a6a2674d99ef82b181e8907a449023d983a8d007a42dc81785007a5e9a4fb2d6e08f4c9ead16fc306327a4a06f9f995ba1a71608804995073f766c2
+EBUILD rviz-9999.ebuild 1673 BLAKE2B d1a261869bfc377df3f3a81a8fa5883cc2fdccfb9e1a25c2fde1241dc87bd0bbca1f865ff336acffe03c04abf31b55cebe44b502ec9f40b9526af4ecb553ae1f SHA512 a66f24ff2386853906a87a71895edf27d401c24251b3cf1b09146d4db8016102e3214591d8346d1c7a2be985a6e717e786003dae5c9c45d650aaa97e3df31aa9
 MISC metadata.xml 336 BLAKE2B 8cba61f66f05c578aa056805cff5c5f9b79f4cc9a36001a5c332b048958039e049e8003b4c6a6cbe44a10973b5094daf880f25f9a124a2967069687762a492d0 SHA512 5621623b90d64245ec73b1ff7cace103dd809ac9da8b4614cd8b5931854ed159e8b5de867f1a6e83949376b99e41c181def0569f90f128c4c85e97cd42659120
diff --git a/dev-ros/rviz/rviz-1.13.1.ebuild b/dev-ros/rviz/rviz-1.13.1.ebuild
new file mode 100644
index 000000000000..e91a1a39c000
--- /dev/null
+++ b/dev-ros/rviz/rviz-1.13.1.ebuild
@@ -0,0 +1,69 @@
+# 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/rviz"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="3D visualization tool for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	media-libs/assimp
+	dev-games/ogre
+	virtual/opengl
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-cpp/eigen:3
+	dev-cpp/yaml-cpp:=
+	dev-libs/urdfdom:=
+	dev-libs/tinyxml:=
+
+	dev-ros/angles
+	dev-ros/image_geometry
+	dev-ros/image_transport
+	dev-ros/interactive_markers
+	dev-ros/laser_geometry
+	dev-ros/message_filters
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	dev-ros/resource_retriever
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-libs/console_bridge:=
+	dev-ros/roscpp
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/urdf
+	dev-ros/media_export
+
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/map_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-ros/cmake_modules
+	virtual/pkgconfig
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)"
+
+src_configure() {
+	local mycatkincmakeargs=( "-DUseQt5=ON" )
+	ros-catkin_src_configure
+}
diff --git a/dev-ros/rviz/rviz-9999.ebuild b/dev-ros/rviz/rviz-9999.ebuild
index e91a1a39c000..ffbd4e5c47bd 100644
--- a/dev-ros/rviz/rviz-9999.ebuild
+++ b/dev-ros/rviz/rviz-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	dev-cpp/eigen:3
 	dev-cpp/yaml-cpp:=
 	dev-libs/urdfdom:=
-	dev-libs/tinyxml:=
+	dev-libs/tinyxml2:=
 
 	dev-ros/angles
 	dev-ros/image_geometry
@@ -34,7 +34,6 @@ RDEPEND="
 	dev-ros/laser_geometry
 	dev-ros/message_filters
 	dev-ros/pluginlib
-		dev-libs/tinyxml2:=
 	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
 	dev-ros/resource_retriever
 	dev-ros/rosbag[${PYTHON_USEDEP}]
diff --git a/dev-ros/rviz_plugin_tutorials/Manifest b/dev-ros/rviz_plugin_tutorials/Manifest
index 3991d270e116..e8f9097f19e0 100644
--- a/dev-ros/rviz_plugin_tutorials/Manifest
+++ b/dev-ros/rviz_plugin_tutorials/Manifest
@@ -1,6 +1,8 @@
 DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
 DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
+DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
 EBUILD rviz_plugin_tutorials-0.10.1-r4.ebuild 485 BLAKE2B 66b0981eaa7c9c6c68080f2d95ab1716177cdef66cca4707136cbbb615dd5d182df90141af46ae600f85cbe2cde6ca4f111d230bc5918391043e449f564b2b13 SHA512 d31845c711675a6b21145b40abe1265f4e0993304baf68811ca60997d1764bc7cb0686893c79bfdc82170d93a15f0732cc624dd14208bdb0d02aaf0b784a4b90
 EBUILD rviz_plugin_tutorials-0.10.2.ebuild 485 BLAKE2B 006d43fcd28dcea0c19489210fa8f59b7636d17c331302f4071194bed98fcf3c3c38afba36d4c5547ac7ef0cf24e6983d1eb0092fb1f60166446ba1b4ac22c46 SHA512 733dd923bf39dd41c91f9a27c5d6c362362cefd631007c55fc09865c3a1ed70a3d48707e0394dbc84c39a45dc0e0e7f90e49e280caae67abec0a6128f7037dcb
+EBUILD rviz_plugin_tutorials-0.10.3.ebuild 485 BLAKE2B 006d43fcd28dcea0c19489210fa8f59b7636d17c331302f4071194bed98fcf3c3c38afba36d4c5547ac7ef0cf24e6983d1eb0092fb1f60166446ba1b4ac22c46 SHA512 733dd923bf39dd41c91f9a27c5d6c362362cefd631007c55fc09865c3a1ed70a3d48707e0394dbc84c39a45dc0e0e7f90e49e280caae67abec0a6128f7037dcb
 EBUILD rviz_plugin_tutorials-9999.ebuild 485 BLAKE2B 66b0981eaa7c9c6c68080f2d95ab1716177cdef66cca4707136cbbb615dd5d182df90141af46ae600f85cbe2cde6ca4f111d230bc5918391043e449f564b2b13 SHA512 d31845c711675a6b21145b40abe1265f4e0993304baf68811ca60997d1764bc7cb0686893c79bfdc82170d93a15f0732cc624dd14208bdb0d02aaf0b784a4b90
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.3.ebuild b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.3.ebuild
new file mode 100644
index 000000000000..1e7aa88d9e30
--- /dev/null
+++ b/dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.10.3.ebuild
@@ -0,0 +1,24 @@
+# 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/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Tutorials showing how to write plugins for RViz"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rviz
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-libs/boost:=
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rviz_python_tutorial/Manifest b/dev-ros/rviz_python_tutorial/Manifest
index 0a392f8e3168..5cf10750a407 100644
--- a/dev-ros/rviz_python_tutorial/Manifest
+++ b/dev-ros/rviz_python_tutorial/Manifest
@@ -1,8 +1,10 @@
 DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
 DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
+DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
 DIST visualization_tutorials-0.9.2.tar.gz 428117 BLAKE2B f25320fa80b12a8a5499d505af369c33362e7f085de3846478b6376fc49e4e2502f07ded6c9e1025224d7b2418d78c87933b2d93b66ad2865eb45581384df24f SHA512 4a2b323e74725dbb77fbba6405d39246a89b170c66dec78288c4461d70c419efc3197eed5867f68305e490552d0480525153f98a64a3025efddc367db824ca53
 EBUILD rviz_python_tutorial-0.10.1.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
 EBUILD rviz_python_tutorial-0.10.2.ebuild 452 BLAKE2B 7cb142425b38933b78c712a3de1f919647f00a7074cf234bb321c929cca089c7b35d10fbc5c85e88d6685a0bf562fec48c859fa4d1e40d61783a553b8b1803f2 SHA512 d0d18eb2f5b0602c9653261de0a2c3e1dc6014e29245b7a50f0518d444e711becf17af97029fdfcfa695760f9a735264b9a0d89eff1a17189aeac0bf2297b9c5
+EBUILD rviz_python_tutorial-0.10.3.ebuild 452 BLAKE2B 7cb142425b38933b78c712a3de1f919647f00a7074cf234bb321c929cca089c7b35d10fbc5c85e88d6685a0bf562fec48c859fa4d1e40d61783a553b8b1803f2 SHA512 d0d18eb2f5b0602c9653261de0a2c3e1dc6014e29245b7a50f0518d444e711becf17af97029fdfcfa695760f9a735264b9a0d89eff1a17189aeac0bf2297b9c5
 EBUILD rviz_python_tutorial-0.9.2.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
 EBUILD rviz_python_tutorial-9999.ebuild 452 BLAKE2B 1af501744428e5693ba71a326092d6d17ee9f8be078eabee5febc2a91b1ead2c6c491a2e1d4dcc66e17dd976bff21a878304c25ee35bcfc8c361e0b86bec4c2f SHA512 45d3339c26b33bb6af6d4fb859e670f1cb68e74fb8247da1106337aadce43b565320a053512d9f8ae1081aae9e840011e8050726f33659d3ef7c9386ceffcc95
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.3.ebuild b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.3.ebuild
new file mode 100644
index 000000000000..0f3ef919f175
--- /dev/null
+++ b/dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.3.ebuild
@@ -0,0 +1,18 @@
+# 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/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tutorials showing how to call into rviz internals from python scripts"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rviz[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/Manifest b/dev-ros/sensor_msgs/Manifest
index 65395fd43909..9dd85496efc2 100644
--- a/dev-ros/sensor_msgs/Manifest
+++ b/dev-ros/sensor_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
-EBUILD sensor_msgs-1.12.5.ebuild 584 BLAKE2B 57caeeeb8086233cb2e324cb857566ca5848bc07addae085be194c903f56884ea124c8fce8c363cb4eea7ee9b38acde5602cbec66e4e92a3ed994d7d056649e1 SHA512 5f27b731c58d63bd52e86a94f2ba9362a497b02b0b1c36ae6d2a8a353b8ae6b0149afdb57376c9db53de884c9da147dd932ff4f0d049062dbad25e41a49369b5
-EBUILD sensor_msgs-9999.ebuild 584 BLAKE2B 57caeeeb8086233cb2e324cb857566ca5848bc07addae085be194c903f56884ea124c8fce8c363cb4eea7ee9b38acde5602cbec66e4e92a3ed994d7d056649e1 SHA512 5f27b731c58d63bd52e86a94f2ba9362a497b02b0b1c36ae6d2a8a353b8ae6b0149afdb57376c9db53de884c9da147dd932ff4f0d049062dbad25e41a49369b5
+DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
+EBUILD sensor_msgs-1.12.5.ebuild 618 BLAKE2B 70ae8c95c32d2955db6fa6cf65c01bd7bb72f66f3a5d99cfe8d1a7ae797f1f4fa4f7b41726165cfe276d432212e6c76e35f41f43003cb451743af832727bddd4 SHA512 eeeef26f236d0550943ab08457b81908ed20ef737672b34c00b0e23e26a19264db9c8a722c46c11bc2c0d6761491f38fc572226485c5dfb6a28f91f8baefd3cb
+EBUILD sensor_msgs-1.12.6.ebuild 618 BLAKE2B 70ae8c95c32d2955db6fa6cf65c01bd7bb72f66f3a5d99cfe8d1a7ae797f1f4fa4f7b41726165cfe276d432212e6c76e35f41f43003cb451743af832727bddd4 SHA512 eeeef26f236d0550943ab08457b81908ed20ef737672b34c00b0e23e26a19264db9c8a722c46c11bc2c0d6761491f38fc572226485c5dfb6a28f91f8baefd3cb
+EBUILD sensor_msgs-9999.ebuild 618 BLAKE2B 70ae8c95c32d2955db6fa6cf65c01bd7bb72f66f3a5d99cfe8d1a7ae797f1f4fa4f7b41726165cfe276d432212e6c76e35f41f43003cb451743af832727bddd4 SHA512 eeeef26f236d0550943ab08457b81908ed20ef737672b34c00b0e23e26a19264db9c8a722c46c11bc2c0d6761491f38fc572226485c5dfb6a28f91f8baefd3cb
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.12.5.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.12.5.ebuild
index 9598d97fddaf..16d26c17f586 100644
--- a/dev-ros/sensor_msgs/sensor_msgs-1.12.5.ebuild
+++ b/dev-ros/sensor_msgs/sensor_msgs-1.12.5.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
@@ -18,6 +18,6 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
+	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
 "
 RDEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/sensor_msgs-1.12.6.ebuild b/dev-ros/sensor_msgs/sensor_msgs-1.12.6.ebuild
new file mode 100644
index 000000000000..16d26c17f586
--- /dev/null
+++ b/dev-ros/sensor_msgs/sensor_msgs-1.12.6.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for commonly used sensors, including cameras and scanning laser rangefinders"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
+"
+RDEPEND="${RDEPEND}"
diff --git a/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild b/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild
index 9598d97fddaf..16d26c17f586 100644
--- a/dev-ros/sensor_msgs/sensor_msgs-9999.ebuild
+++ b/dev-ros/sensor_msgs/sensor_msgs-9999.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
@@ -18,6 +18,6 @@ IUSE=""
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
+	test? ( dev-cpp/gtest dev-ros/rosunit[${PYTHON_USEDEP}] )
 "
 RDEPEND="${RDEPEND}"
diff --git a/dev-ros/shape_msgs/Manifest b/dev-ros/shape_msgs/Manifest
index 3ec2db6da4c0..6332f467cd0a 100644
--- a/dev-ros/shape_msgs/Manifest
+++ b/dev-ros/shape_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
+DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
 EBUILD shape_msgs-1.12.5.ebuild 540 BLAKE2B 38b4a730c23d683c6c42f9f9edccb4c55caabb5f4c69cc6c96ae68f2ada02261a8828887cfe203e1748912a723cb07d9645b12bf9a31f3ace08f7c9807070313 SHA512 6ab42cf0245fd64189263ccbc729a44afd7e28183f045c22fb9e20f0a3470a618dfc720dd7dc21e3f86175197a6f5884a3bc213deb2e03070663ef15c1c89a65
+EBUILD shape_msgs-1.12.6.ebuild 540 BLAKE2B b42b00e4244b04f7a390552c557f76554e98d389b7b06d2d3e0ef7e0e04738fa826717fe143c24079c5849d1ee76bc44ac795bbcf4ed2b549e0b31017fb0a234 SHA512 b5435fc459120fd0c25ce80c649dcf9362226a0b0eb4380e67004e7c36160bc3bebe814c3c96448bf22d04327f9decf8bd73458178410027a71cfe28ddcb14e4
 EBUILD shape_msgs-9999.ebuild 540 BLAKE2B 38b4a730c23d683c6c42f9f9edccb4c55caabb5f4c69cc6c96ae68f2ada02261a8828887cfe203e1748912a723cb07d9645b12bf9a31f3ace08f7c9807070313 SHA512 6ab42cf0245fd64189263ccbc729a44afd7e28183f045c22fb9e20f0a3470a618dfc720dd7dc21e3f86175197a6f5884a3bc213deb2e03070663ef15c1c89a65
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/shape_msgs/shape_msgs-1.12.6.ebuild b/dev-ros/shape_msgs/shape_msgs-1.12.6.ebuild
new file mode 100644
index 000000000000..b3071a70b84d
--- /dev/null
+++ b/dev-ros/shape_msgs/shape_msgs-1.12.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for defining shapes, such as simple solid object primitives, planes, and meshes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_msgs/Manifest b/dev-ros/stereo_msgs/Manifest
index 1f2c82bbb927..f20811c61057 100644
--- a/dev-ros/stereo_msgs/Manifest
+++ b/dev-ros/stereo_msgs/Manifest
@@ -1,8 +1,10 @@
 DIST common_msgs-1.12.3.tar.gz 55960 BLAKE2B 448892dae7b2a399d0ba9964830875dc18af19920b4f346b4dd22176e023f895a105cc63f72a6440d9743743b5e082a96e88a077f3bfdb947e130468a8de0a15 SHA512 5c7a7362bb1024409c6da3e228e86d701a8df111481ddb831967b6eb447a32da5108ba7421509896628055ddeb2045441ec625178119aebf53a95cd933939cb7
 DIST common_msgs-1.12.4.tar.gz 58764 BLAKE2B 0cc1bdcf59882b3ba54683f1254aa7dd0d3bb61aa7cc1e1a27295fc31281badcda14c2ffb1231e2a6ffcdd43d3c386255b0ddebf1534711e7ccad475d98c4e06 SHA512 4605264f44dcaf6d970be9278de7433fa933d96eb9e4e6355b417c8f4a378eec03106414f3d9ca22cd7960435b2da714c76d40dfc8073dd887038cbecda7bf28
 DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
+DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
 EBUILD stereo_msgs-1.12.3.ebuild 501 BLAKE2B a7d08d32f919ffe2b518607532e0ce43f248cc597600cf8821a86c57a1617698fd2e4dca16b7d8a58760aa3bc02dac8aab9d587721461387210411b7a21f3833 SHA512 dfb56a1e6ed148062390026184ccad0ba59ec6399621ac390761aaace9e87516568a74cab3f13b98bccaf5ebe7f48248025e704c126040ffffb110c79bdd111f
 EBUILD stereo_msgs-1.12.4.ebuild 501 BLAKE2B a7d08d32f919ffe2b518607532e0ce43f248cc597600cf8821a86c57a1617698fd2e4dca16b7d8a58760aa3bc02dac8aab9d587721461387210411b7a21f3833 SHA512 dfb56a1e6ed148062390026184ccad0ba59ec6399621ac390761aaace9e87516568a74cab3f13b98bccaf5ebe7f48248025e704c126040ffffb110c79bdd111f
 EBUILD stereo_msgs-1.12.5.ebuild 501 BLAKE2B baf75b073ac9aacec5d7debc9a931ff213e29d03b9d4ee598595bd95bc116a9f1062d264b59bcc3e108abda616eda87a77d736d95d2cdb44281064c7de93e4a1 SHA512 2a2c2efa412466b09b16f7e5d045f40b040ec081748bd2956653a8eaa4175c478f24bd3e6c460e0c82ffd08e3bde409e840c9d492cc7c619cffcfeb06476fbfb
+EBUILD stereo_msgs-1.12.6.ebuild 501 BLAKE2B bbc7dbfff693b16587af5d2b1920d53e90a87da9cd7c1f6d28ddd0c6624c8e21b1b171ad36ba2fbc72e2d20ecc208cbd085f60e64851d61d7885687671353a19 SHA512 aedd5974cf6bab6cf9ed77fbeb05efd6f0b0584697b7166912d765672384cb84395f0b51e36f6491044b99124c902eb208cc4a8cb4dcaecceba5557cdf7249f9
 EBUILD stereo_msgs-9999.ebuild 501 BLAKE2B a7d08d32f919ffe2b518607532e0ce43f248cc597600cf8821a86c57a1617698fd2e4dca16b7d8a58760aa3bc02dac8aab9d587721461387210411b7a21f3833 SHA512 dfb56a1e6ed148062390026184ccad0ba59ec6399621ac390761aaace9e87516568a74cab3f13b98bccaf5ebe7f48248025e704c126040ffffb110c79bdd111f
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/stereo_msgs/stereo_msgs-1.12.6.ebuild b/dev-ros/stereo_msgs/stereo_msgs-1.12.6.ebuild
new file mode 100644
index 000000000000..25d39053631f
--- /dev/null
+++ b/dev-ros/stereo_msgs/stereo_msgs-1.12.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/sensor_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages specific to stereo processing, such as disparity images"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/test_tf2/Manifest b/dev-ros/test_tf2/Manifest
index 7842adc24375..8f289e236eb3 100644
--- a/dev-ros/test_tf2/Manifest
+++ b/dev-ros/test_tf2/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
 EBUILD test_tf2-0.6.1.ebuild 741 BLAKE2B b7ef0a75c8c15478dff57e2129bba8134152c7c2cb3662f37ffe33d80457f18a66a270bbb72c9b6626085331d196ff59536511432dc2235ec829a62481711d24 SHA512 da448edd248d912e18e51e431510252ffc87f766341cef516fb332ce8dc63ecdac1d3943799c31123c1362045bed1ba108ca5d0489c7a54c677b5d033b9979ea
+EBUILD test_tf2-0.6.2.ebuild 741 BLAKE2B b7ef0a75c8c15478dff57e2129bba8134152c7c2cb3662f37ffe33d80457f18a66a270bbb72c9b6626085331d196ff59536511432dc2235ec829a62481711d24 SHA512 da448edd248d912e18e51e431510252ffc87f766341cef516fb332ce8dc63ecdac1d3943799c31123c1362045bed1ba108ca5d0489c7a54c677b5d033b9979ea
 EBUILD test_tf2-9999.ebuild 741 BLAKE2B 2913249074a919534e3d42b22cccb6feafae0280339295a6a283cc0992de58225002ac74b26650126f3e203ff74fa8cdacb17b78dbc7bf4ce136d32a414afe43 SHA512 20ba3059bafc461a232c8c94e62e85ca9e38553f9e58a5154e9ce0b7089d5e2a5d1022972289c2de7b4ced6741a95dbff33d076551bd4b0771e60e45f0eebcfd
-MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
+MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/test_tf2/metadata.xml b/dev-ros/test_tf2/metadata.xml
index 00d4b2a1a83d..03f74b7656e7 100644
--- a/dev-ros/test_tf2/metadata.xml
+++ b/dev-ros/test_tf2/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/test_tf2/test_tf2-0.6.2.ebuild b/dev-ros/test_tf2/test_tf2-0.6.2.ebuild
new file mode 100644
index 000000000000..9bfecde03150
--- /dev/null
+++ b/dev-ros/test_tf2/test_tf2-0.6.2.ebuild
@@ -0,0 +1,34 @@
+# 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/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 unit tests"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/tf
+	dev-ros/tf2
+	dev-ros/tf2_bullet
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/tf2_geometry_msgs[${PYTHON_USEDEP}]
+	dev-ros/tf2_kdl[${PYTHON_USEDEP}]
+	dev-ros/tf2_msgs
+	sci-libs/orocos_kdl
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
+	dev-cpp/gtest"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
diff --git a/dev-ros/tf/Manifest b/dev-ros/tf/Manifest
index a5e91b2dee19..1fa20c1a9724 100644
--- a/dev-ros/tf/Manifest
+++ b/dev-ros/tf/Manifest
@@ -1,7 +1,6 @@
-AUX gcc6.patch 748 BLAKE2B 57e16e85342b4de4427a8a5234ccfd5ae0ac08e3cd64c05b41b762d49b9971b85d1e3592abd38273e95fee5959608edfa4990d874f85bcf1ce9af5dcf73cb72c SHA512 fa8a856349f05c9b440e32f2530234149e2eb27492b416d6fbb47d9f78d2d61c8225b10fdaea8dd3f68dc754d9b7cc3520f7f8582dad7319c81bc722a56529c0
-DIST geometry-1.11.8.tar.gz 186749 BLAKE2B f4d2579586221014ae50a649aa8cc19fdf975184091e9f50912494f3f3d4a2963160c63bbf9ee9466ae3f26aed533b5fba35c20663681009a69b71dbb595f879 SHA512 a7d1383635d96b8a95486cbb9d1fdfc762846cb6ecc41c0deef76cea4d9f9cde99c4b079527a25bc5ac559d4987fe7a4c3159e2435942bb3d4fb992da68e0e04
 DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
-EBUILD tf-1.11.8.ebuild 1043 BLAKE2B 7ae236b057b2775eb8b252b9d6e6e54af84f10157fdbb71e524886c13e5d5fea785cb66db763a8559184a823f8da60190b6a132451cc014d3b9832570a6483a8 SHA512 fe598d080fd07473db0c71e4981022bb28330462e96af5f1ddfe627a77003759136d0b613f99776baf043df325f2767c316acf9ab8468271c00f2b67dd315651
+DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
 EBUILD tf-1.11.9.ebuild 1006 BLAKE2B 71c1becd35ac2ececd5b14d98a0ebc183be878d4c7765b16e9d5f5d0541b54162b1b175efd3548a6bae4b7325d3989af65a5dbe066a602c54002d69d2d326a32 SHA512 936b4e9db468d68476d5aa58b76721168aab9d597589b335cbd662370ad34a1b02b3044e954374f8f6b66e2cfe472c9f689c94917da9395970c25d6f0e307e24
+EBUILD tf-1.12.0.ebuild 1006 BLAKE2B adf845f181fb20a7acd81d38786687aadfd3ed5b147bf2afa4d8a1dd32e87e746eb06859c2d5ac14b82cae587385ca8e80af95e683fcfb80bc6682a52ac69c1c SHA512 4cd0691a6b2fe1582d7c7aee0bd83e2be2db926193b58b9be050f88cd13c80e5f177e3d9e2d6c15883c3049adb8b3d48c7b40d3343e5ecbcb7a8ffae0719e165
 EBUILD tf-9999.ebuild 1006 BLAKE2B 67006c1c0fc77a0449be9d829464d1efad49aa0e503d96df900e3c288350dd1d140fd2b22bdd76eaa6e3973ef83642251c2ef3218f02492e6d637e903992983e SHA512 980971c39495ef9679810efa1cce7ac029ea92b2fe09031a8dd52d346c37770caf5717641d548b200b42dbce2b4c21dd64d3363794e3fd904c441753fcbd65ac
 MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf/files/gcc6.patch b/dev-ros/tf/files/gcc6.patch
deleted file mode 100644
index 72b32bd1172e..000000000000
--- a/dev-ros/tf/files/gcc6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit b0d31cc1e9a43b45d216ee7f804e901a5c0f8936
-Author: Hodorgasm <nsane457@gmail.com>
-Date:   Mon Sep 19 17:58:22 2016 -0400
-
-    Fix "stdlib.h: No such file or directory" errors in GCC-6
-    
-    Including '-isystem /usr/include' breaks building with GCC-6.
-    See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70129
-
-diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt
-index 8077561..cf72127 100644
---- a/tf/CMakeLists.txt
-+++ b/tf/CMakeLists.txt
-@@ -8,7 +8,7 @@ find_package(catkin COMPONENTS angles geometry_msgs message_filters message_gene
- 
- catkin_python_setup()
- 
--include_directories(SYSTEM ${Boost_INCLUDE_DIR}
-+include_directories(${Boost_INCLUDE_DIR}
-                            ${catkin_INCLUDE_DIRS}
- )
- include_directories(include)
diff --git a/dev-ros/tf/tf-1.11.8.ebuild b/dev-ros/tf/tf-1.12.0.ebuild
index d6b24fbcd9fd..d129d24ee28a 100644
--- a/dev-ros/tf/tf-1.11.8.ebuild
+++ b/dev-ros/tf/tf-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -36,4 +36,3 @@ DEPEND="${RDEPEND}
 		dev-cpp/gtest
 		dev-python/nose[${PYTHON_USEDEP}]
 	)"
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/tf2/Manifest b/dev-ros/tf2/Manifest
index 492b39c6fa76..807f9e957b3e 100644
--- a/dev-ros/tf2/Manifest
+++ b/dev-ros/tf2/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
 EBUILD tf2-0.6.1.ebuild 550 BLAKE2B a1824ba987c5aa4c6492ab7b03e8705bf2c89d47f1528f7656322d684ca7d3620691699882ecfe1b35925f912c68c84d30981fd673c51785fff291f5a5665a13 SHA512 c2246380dba8b2dc1066b364b31390092192526bf8ce2b2161789192428b38087773cd54965138871bf42aa9daa1e63426eecd75a9548a675c5feea6c6e4ab1b
+EBUILD tf2-0.6.2.ebuild 550 BLAKE2B a1824ba987c5aa4c6492ab7b03e8705bf2c89d47f1528f7656322d684ca7d3620691699882ecfe1b35925f912c68c84d30981fd673c51785fff291f5a5665a13 SHA512 c2246380dba8b2dc1066b364b31390092192526bf8ce2b2161789192428b38087773cd54965138871bf42aa9daa1e63426eecd75a9548a675c5feea6c6e4ab1b
 EBUILD tf2-9999.ebuild 550 BLAKE2B 10c50cfb412755a1c9ca026c2343da67ebdd73a2d9b9eb3697d7d87ca3a167e7f02008cd1f55c6cea8129b162d32c0277ddadfe07dc814a8359e0366f4013121 SHA512 f90dce47cd2d78d2de07c1bfc8da8e17865fe4c3e76313efc8751be397e2892a4df61a10de60eb875309ae9db9c20cd6700a72540cbeb49e303a297d830281b4
-MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
+MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2/metadata.xml b/dev-ros/tf2/metadata.xml
index 00d4b2a1a83d..03f74b7656e7 100644
--- a/dev-ros/tf2/metadata.xml
+++ b/dev-ros/tf2/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2/tf2-0.6.2.ebuild b/dev-ros/tf2/tf2-0.6.2.ebuild
new file mode 100644
index 000000000000..5751b898da20
--- /dev/null
+++ b/dev-ros/tf2/tf2-0.6.2.ebuild
@@ -0,0 +1,25 @@
+# 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/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/console_bridge:=
+	dev-ros/rostime
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/roscpp )
+"
diff --git a/dev-ros/tf2_bullet/Manifest b/dev-ros/tf2_bullet/Manifest
index d347d874bf43..93083af5984b 100644
--- a/dev-ros/tf2_bullet/Manifest
+++ b/dev-ros/tf2_bullet/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
 EBUILD tf2_bullet-0.6.1.ebuild 403 BLAKE2B 82c635f27e043327f7d158193ac5f8c438c676fe9cd30c956542454ca394061ab9c843ac019bab431c1cac7aa24f2e5a6fe1ab069707b0eeb13aed93c3a3e111 SHA512 7f566040c785caef269f23555d183c4c7a3dae5bcff0cf0d9cc4d6a4d18c782fbe68d7134b0b81d7c132129f67ad64800c90ef3dbc67b5263c54bdb3372ab82f
+EBUILD tf2_bullet-0.6.2.ebuild 403 BLAKE2B 82c635f27e043327f7d158193ac5f8c438c676fe9cd30c956542454ca394061ab9c843ac019bab431c1cac7aa24f2e5a6fe1ab069707b0eeb13aed93c3a3e111 SHA512 7f566040c785caef269f23555d183c4c7a3dae5bcff0cf0d9cc4d6a4d18c782fbe68d7134b0b81d7c132129f67ad64800c90ef3dbc67b5263c54bdb3372ab82f
 EBUILD tf2_bullet-9999.ebuild 403 BLAKE2B 5cd722d732fcbda57a1712a1154c25c7ca071a7f9f98bad333f88ba9bbce875f96c06c6d5174e2da844aefd5592b2010dbbedd501599afd10c8639e4c0726249 SHA512 cb8dc5dde03d9a367af2b78fe5e9a06477703a019b0f3229faac68df0ba1b11313af9d0fce4751202a5302c25373405c616b5a67a0625bb105638f2a038c1a96
-MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
+MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_bullet/metadata.xml b/dev-ros/tf2_bullet/metadata.xml
index 00d4b2a1a83d..03f74b7656e7 100644
--- a/dev-ros/tf2_bullet/metadata.xml
+++ b/dev-ros/tf2_bullet/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_bullet/tf2_bullet-0.6.2.ebuild b/dev-ros/tf2_bullet/tf2_bullet-0.6.2.ebuild
new file mode 100644
index 000000000000..cff2733f7c12
--- /dev/null
+++ b/dev-ros/tf2_bullet/tf2_bullet-0.6.2.ebuild
@@ -0,0 +1,21 @@
+# 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/geometry2"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 bullet support"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	sci-physics/bullet
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_eigen/Manifest b/dev-ros/tf2_eigen/Manifest
index 2778eacb6d8e..b4e38fa32e65 100644
--- a/dev-ros/tf2_eigen/Manifest
+++ b/dev-ros/tf2_eigen/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
 EBUILD tf2_eigen-0.6.1.ebuild 426 BLAKE2B 396fa885cab72c2e60ef49db22e97cabf953a0178955c1e12e88362589d5201a9e77401af867a19946cd6287795812cc5d9d78f21781cb22979c3676c446fcfe SHA512 4c19f01cae4b2c61db270a34a5ee284fbc838e86451b9a66c7da93d9eba1fd605ff862960556d02f707cc9f1a0ce568c7e4965bd7dc9ed4f20783962f869be7f
+EBUILD tf2_eigen-0.6.2.ebuild 426 BLAKE2B 396fa885cab72c2e60ef49db22e97cabf953a0178955c1e12e88362589d5201a9e77401af867a19946cd6287795812cc5d9d78f21781cb22979c3676c446fcfe SHA512 4c19f01cae4b2c61db270a34a5ee284fbc838e86451b9a66c7da93d9eba1fd605ff862960556d02f707cc9f1a0ce568c7e4965bd7dc9ed4f20783962f869be7f
 EBUILD tf2_eigen-9999.ebuild 426 BLAKE2B ad08ef9dcc12fbc23f846f04e65cd59d2826b99441a05f55ea4cce8c8686956ef3ebd15dfdbd7999de9a89c4c34bdb9476119869dc0213194366735fee2c4828 SHA512 59af992a1e2c160faa74d9f9c7ad06cc95ef4726062726044865da407147e92e0fca5eb32a4b5261d35fbe61288de6d78f1813ebf124a6a2a741cd6219e36774
 MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_eigen/tf2_eigen-0.6.2.ebuild b/dev-ros/tf2_eigen/tf2_eigen-0.6.2.ebuild
new file mode 100644
index 000000000000..b3071940cfb2
--- /dev/null
+++ b/dev-ros/tf2_eigen/tf2_eigen-0.6.2.ebuild
@@ -0,0 +1,21 @@
+# 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/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 eigen support"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-ros/tf2
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND} dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_geometry_msgs/Manifest b/dev-ros/tf2_geometry_msgs/Manifest
index aa6873c84e33..e113c51ce061 100644
--- a/dev-ros/tf2_geometry_msgs/Manifest
+++ b/dev-ros/tf2_geometry_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
 EBUILD tf2_geometry_msgs-0.6.1.ebuild 614 BLAKE2B 0e8c3201cf166c33334d1cbdf97f60472b074a391bf5d2231319a7067bc4bd5dfbed5d42ef7491e2e3e33a5eb33f7483c184affb592a2634dbe5fca0bd358596 SHA512 af0cc5f55216553c84a8b856fde88af85ee0cb745e4339f2d256c55001b46beb81d4c810bcfdc43f2721c8e29d6ea2ecbccc5a53779573f6635005f91fe7c407
+EBUILD tf2_geometry_msgs-0.6.2.ebuild 614 BLAKE2B 0e8c3201cf166c33334d1cbdf97f60472b074a391bf5d2231319a7067bc4bd5dfbed5d42ef7491e2e3e33a5eb33f7483c184affb592a2634dbe5fca0bd358596 SHA512 af0cc5f55216553c84a8b856fde88af85ee0cb745e4339f2d256c55001b46beb81d4c810bcfdc43f2721c8e29d6ea2ecbccc5a53779573f6635005f91fe7c407
 EBUILD tf2_geometry_msgs-9999.ebuild 614 BLAKE2B 7053d0094ef827c41d26d6e75fecc146e6ae8ed1048bd3af63b26fc20a9e1eb2572e8002962e53f8b470a4150260b58a6554ce64edba2fc2afd9a8d305c4a5b9 SHA512 a38c116f128ff62c7662345a2e41793171e4e9e73f53568aac97e570b073e0f170f57b254d326e0e89c2f6ab74364a9d71fbe9fbb4a0fba093fcbf804064b9f1
-MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
+MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_geometry_msgs/metadata.xml b/dev-ros/tf2_geometry_msgs/metadata.xml
index 00d4b2a1a83d..03f74b7656e7 100644
--- a/dev-ros/tf2_geometry_msgs/metadata.xml
+++ b/dev-ros/tf2_geometry_msgs/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.2.ebuild b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.2.ebuild
new file mode 100644
index 000000000000..6e110987c542
--- /dev/null
+++ b/dev-ros/tf2_geometry_msgs/tf2_geometry_msgs-0.6.2.ebuild
@@ -0,0 +1,25 @@
+# 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/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="The second generation Transform Library in ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	dev-ros/tf2
+	sci-libs/orocos_kdl
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_kdl/Manifest b/dev-ros/tf2_kdl/Manifest
index b05baf238059..a8dad31835bb 100644
--- a/dev-ros/tf2_kdl/Manifest
+++ b/dev-ros/tf2_kdl/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
 EBUILD tf2_kdl-0.6.1-r1.ebuild 591 BLAKE2B 9ce143f43d01ff78ca37af92c50a5387a4cab0a83804813f28a6c6516283ee92585eb0ed4b3877c2065741d11db5203f2d9cdca55cbfac015dd8e2b69d584469 SHA512 33682a91446fde1fcada6ecf7b5d0ee3f140b1a32b91c004c126bf50c6696479d185d85cb5e3a7577d70563b5b700fabc56639b7df3e06aded57978f6113a4ee
+EBUILD tf2_kdl-0.6.2.ebuild 591 BLAKE2B 9ce143f43d01ff78ca37af92c50a5387a4cab0a83804813f28a6c6516283ee92585eb0ed4b3877c2065741d11db5203f2d9cdca55cbfac015dd8e2b69d584469 SHA512 33682a91446fde1fcada6ecf7b5d0ee3f140b1a32b91c004c126bf50c6696479d185d85cb5e3a7577d70563b5b700fabc56639b7df3e06aded57978f6113a4ee
 EBUILD tf2_kdl-9999.ebuild 591 BLAKE2B 9ce143f43d01ff78ca37af92c50a5387a4cab0a83804813f28a6c6516283ee92585eb0ed4b3877c2065741d11db5203f2d9cdca55cbfac015dd8e2b69d584469 SHA512 33682a91446fde1fcada6ecf7b5d0ee3f140b1a32b91c004c126bf50c6696479d185d85cb5e3a7577d70563b5b700fabc56639b7df3e06aded57978f6113a4ee
-MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
+MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_kdl/metadata.xml b/dev-ros/tf2_kdl/metadata.xml
index 00d4b2a1a83d..03f74b7656e7 100644
--- a/dev-ros/tf2_kdl/metadata.xml
+++ b/dev-ros/tf2_kdl/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_kdl/tf2_kdl-0.6.2.ebuild b/dev-ros/tf2_kdl/tf2_kdl-0.6.2.ebuild
new file mode 100644
index 000000000000..e5c441b6527d
--- /dev/null
+++ b/dev-ros/tf2_kdl/tf2_kdl-0.6.2.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/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="KDL binding for tf2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-ros/tf2
+	dev-ros/tf2_ros
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	sci-libs/orocos_kdl:=
+	dev-ros/tf2_msgs[${PYTHON_USEDEP}]
+	dev-ros/cmake_modules
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)"
diff --git a/dev-ros/tf2_msgs/Manifest b/dev-ros/tf2_msgs/Manifest
index 3e5506b9dd78..989e3ca53a96 100644
--- a/dev-ros/tf2_msgs/Manifest
+++ b/dev-ros/tf2_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
 EBUILD tf2_msgs-0.6.1.ebuild 455 BLAKE2B c35564ed41515f54b0b1647dd940bd8a8db6214a16f254b5dc80b0b9fe69f59f3c729b462126be1a88e4128ec9b96945c0012ac32d6a5d02c42e4b12cc6a1b91 SHA512 871ba088204e4cf4010302f205a54a21ff4d0c6695b1508f691f1e7aa7dff9072c2322c2b9a923a1cbacd53aaa61cf8538816fd4b111e574249170eafdfe5a5e
+EBUILD tf2_msgs-0.6.2.ebuild 455 BLAKE2B c35564ed41515f54b0b1647dd940bd8a8db6214a16f254b5dc80b0b9fe69f59f3c729b462126be1a88e4128ec9b96945c0012ac32d6a5d02c42e4b12cc6a1b91 SHA512 871ba088204e4cf4010302f205a54a21ff4d0c6695b1508f691f1e7aa7dff9072c2322c2b9a923a1cbacd53aaa61cf8538816fd4b111e574249170eafdfe5a5e
 EBUILD tf2_msgs-9999.ebuild 455 BLAKE2B 9a3af9fa5a8e52b29323685b113e0e4c91645488116e588fce6eb5abc8b9175461fd900ee9e45a43fbdced7890a644d6ac6566374f4b8df7fc1f4c85bb4128e7 SHA512 6574bbb6547e5c5537e2543d3f882d6d1b16d700834b628675fdb182d3f5227a100de0ca4b70e096d1223a8cb63f014e5334cb65a7883795407dec34863cda6b
-MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
+MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_msgs/metadata.xml b/dev-ros/tf2_msgs/metadata.xml
index 00d4b2a1a83d..03f74b7656e7 100644
--- a/dev-ros/tf2_msgs/metadata.xml
+++ b/dev-ros/tf2_msgs/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_msgs/tf2_msgs-0.6.2.ebuild b/dev-ros/tf2_msgs/tf2_msgs-0.6.2.ebuild
new file mode 100644
index 000000000000..ab26fd503c34
--- /dev/null
+++ b/dev-ros/tf2_msgs/tf2_msgs-0.6.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry2"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_py/Manifest b/dev-ros/tf2_py/Manifest
index 098cb896f506..4bf300477052 100644
--- a/dev-ros/tf2_py/Manifest
+++ b/dev-ros/tf2_py/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
 EBUILD tf2_py-0.6.1.ebuild 414 BLAKE2B 93348fc5981f8d1947882242610ec34835c9fbc57e63db147d63e627311dd2a59463ad86734eb59d63ca568dcd0e47914a4b6628becf8fe03781e2bca28a6a05 SHA512 2d5d8540591e564816d98296a01eac4708e1ac3c1d5da370ca70b1f752304ed71019a3fba704db3729e8628d710b76d558f1b345f2bfd718f722def2b94a5036
+EBUILD tf2_py-0.6.2.ebuild 414 BLAKE2B 93348fc5981f8d1947882242610ec34835c9fbc57e63db147d63e627311dd2a59463ad86734eb59d63ca568dcd0e47914a4b6628becf8fe03781e2bca28a6a05 SHA512 2d5d8540591e564816d98296a01eac4708e1ac3c1d5da370ca70b1f752304ed71019a3fba704db3729e8628d710b76d558f1b345f2bfd718f722def2b94a5036
 EBUILD tf2_py-9999.ebuild 414 BLAKE2B ddfb7630d561add62cb401b565df834d0d9d824f64dc099aa4963aa92381c332b05f2766b8546d7f649175bcd3ae63ef40e4754b10493055cd722dc7cb97e678 SHA512 3ee385b68f0a48c25e018f179447ea8b8c747c7e6a144280d2ed373f542754325c3ae8de791df6c91cf9e2a1ace19a5a74397fe2fb65d1bb67b3ae00f6c97c5c
-MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
+MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_py/metadata.xml b/dev-ros/tf2_py/metadata.xml
index 00d4b2a1a83d..03f74b7656e7 100644
--- a/dev-ros/tf2_py/metadata.xml
+++ b/dev-ros/tf2_py/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_py/tf2_py-0.6.2.ebuild b/dev-ros/tf2_py/tf2_py-0.6.2.ebuild
new file mode 100644
index 000000000000..97b18592a9a3
--- /dev/null
+++ b/dev-ros/tf2_py/tf2_py-0.6.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/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 python bindings"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-libs/boost:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_ros/Manifest b/dev-ros/tf2_ros/Manifest
index 656a3f7872c4..e38a70699f51 100644
--- a/dev-ros/tf2_ros/Manifest
+++ b/dev-ros/tf2_ros/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
 EBUILD tf2_ros-0.6.1.ebuild 863 BLAKE2B de1be6947d42661a1e4826884c1c4f9ebddbe0c506fc91e1cb40c2ff05d3c4a19265b6af56dc95258404cf3ad5a25607eaa5fe2515836870dc85bed771735986 SHA512 1f01d037cc92884ed61b4b15a9911e2d9a68152267612ebf7fc3785b89d2e6b738fa7f439c40bc59a071d859b638ed7e7e5b1e8e22b47d804fcbe1b7c76cc3bf
+EBUILD tf2_ros-0.6.2.ebuild 863 BLAKE2B de1be6947d42661a1e4826884c1c4f9ebddbe0c506fc91e1cb40c2ff05d3c4a19265b6af56dc95258404cf3ad5a25607eaa5fe2515836870dc85bed771735986 SHA512 1f01d037cc92884ed61b4b15a9911e2d9a68152267612ebf7fc3785b89d2e6b738fa7f439c40bc59a071d859b638ed7e7e5b1e8e22b47d804fcbe1b7c76cc3bf
 EBUILD tf2_ros-9999.ebuild 863 BLAKE2B f456a8e3f159c2271d35970cc06c08880fc45d321b4bd35a1926102d008af02762fc1024ab0aa453150975634ea74d3bca4714ffdf5f09c2663be11ea6b0ddd2 SHA512 900d622cad352217d1a3211ed32a2002db47c032dfa8552a2c524e06de9c31ae8bd59c899285ad4e18ef656bb6afee11c1f583006a5ffa220f1657d3905906a4
-MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
+MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_ros/metadata.xml b/dev-ros/tf2_ros/metadata.xml
index 00d4b2a1a83d..03f74b7656e7 100644
--- a/dev-ros/tf2_ros/metadata.xml
+++ b/dev-ros/tf2_ros/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_ros/tf2_ros-0.6.2.ebuild b/dev-ros/tf2_ros/tf2_ros-0.6.2.ebuild
new file mode 100644
index 000000000000..0e85b91f5107
--- /dev/null
+++ b/dev-ros/tf2_ros/tf2_ros-0.6.2.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/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/actionlib[${PYTHON_USEDEP}]
+	dev-ros/message_filters
+	dev-ros/roscpp
+	dev-ros/rosgraph
+	dev-libs/boost:=[threads]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_py[${PYTHON_USEDEP}]
+	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_sensor_msgs/Manifest b/dev-ros/tf2_sensor_msgs/Manifest
index 6e2c47adf128..d602345cbf11 100644
--- a/dev-ros/tf2_sensor_msgs/Manifest
+++ b/dev-ros/tf2_sensor_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
 EBUILD tf2_sensor_msgs-0.6.1.ebuild 669 BLAKE2B dcbbfed6d01622cb9180e5710c873c91b3c89f98b687ef997d6bde5b7a674d5ff28167690e058fb811f4c14abe98f0dae052e333bef7ad512f26da08b060f518 SHA512 5fd908cf73de8cac73082449f277cc8855eef78b3592ffd4f3ac103f2f441a71d4e625239781de015e7318ae44d9b47c4a72d28e2e70e21f18cec3ec17a31382
+EBUILD tf2_sensor_msgs-0.6.2.ebuild 669 BLAKE2B dcbbfed6d01622cb9180e5710c873c91b3c89f98b687ef997d6bde5b7a674d5ff28167690e058fb811f4c14abe98f0dae052e333bef7ad512f26da08b060f518 SHA512 5fd908cf73de8cac73082449f277cc8855eef78b3592ffd4f3ac103f2f441a71d4e625239781de015e7318ae44d9b47c4a72d28e2e70e21f18cec3ec17a31382
 EBUILD tf2_sensor_msgs-9999.ebuild 669 BLAKE2B 421e0a9477b65e934283192c07b6e8f61fffceb9b563c6fb3da5b4206c1f9c5fbe3d48c277acf604166d014d212b1f3e04c721c692a2723d2112438c1278f325 SHA512 457c001966d6e995f0773f3c6faa15dce13f82f60de4adb4814c1cd624fb60e76cb0cd2c8fbde72dca2ae26fe6250c7c913cd9c26fd2c724df09589929de1db1
-MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
+MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_sensor_msgs/metadata.xml b/dev-ros/tf2_sensor_msgs/metadata.xml
index 00d4b2a1a83d..03f74b7656e7 100644
--- a/dev-ros/tf2_sensor_msgs/metadata.xml
+++ b/dev-ros/tf2_sensor_msgs/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.2.ebuild b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.2.ebuild
new file mode 100644
index 000000000000..b4c841429ce6
--- /dev/null
+++ b/dev-ros/tf2_sensor_msgs/tf2_sensor_msgs-0.6.2.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/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Transform sensor_msgs with tf. Most notably, PointCloud2"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/tf2
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-python/python_orocos_kdl[${PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
+	dev-ros/cmake_modules"
diff --git a/dev-ros/tf2_tools/Manifest b/dev-ros/tf2_tools/Manifest
index b86af96d97b7..6b390b14978d 100644
--- a/dev-ros/tf2_tools/Manifest
+++ b/dev-ros/tf2_tools/Manifest
@@ -1,4 +1,6 @@
 DIST geometry2-0.6.1.tar.gz 162912 BLAKE2B 103937894921111da2058f61b555cb9498ea053e8c8dac357383fc326e214bf88e74a65c97021cf7dd0ecb2b5a38606c3ad3660e365af145349c764660c56726 SHA512 392719295eedf4a5f580390f076a14f9909f49681223d8c50ccb88d57b784c1e50383d28ff10bddc21424662f261504c29525c24965a51462d6e9e62d702d6ef
+DIST geometry2-0.6.2.tar.gz 166807 BLAKE2B 821ad4bc68ff2703df53d3d85505cd892f0399abe99b7fbff13852bda0895e8b28bc4e6aaff0590d4bc7124d36c396e7c477be0a9d56c532fe491099ccb3990d SHA512 fddf5e114600a2814bfecc71c52ddc820fa113fbd07584cd43d4b8a5eb395e9d9b1f78e28c193866920690edb8a5b220bfed949a6e6741926dcea1fc654edadf
 EBUILD tf2_tools-0.6.1.ebuild 565 BLAKE2B 5a1b0e497f9e03eaf244710b9bb787579127f42a47432d31ff59ba0cb27553337424cb951d5231a70fc45b5a9a65866fb9ebbfc8d67acfb0b6915fed84bc71fd SHA512 9c05a0524162a3090376ea122bd96b48cd6e24bc747b4b30472943b25f8f2aa235b75504097b47584f8c1a0615a2fdbe193dda8071c35d1f54d4fd2d48866abb
+EBUILD tf2_tools-0.6.2.ebuild 565 BLAKE2B 5a1b0e497f9e03eaf244710b9bb787579127f42a47432d31ff59ba0cb27553337424cb951d5231a70fc45b5a9a65866fb9ebbfc8d67acfb0b6915fed84bc71fd SHA512 9c05a0524162a3090376ea122bd96b48cd6e24bc747b4b30472943b25f8f2aa235b75504097b47584f8c1a0615a2fdbe193dda8071c35d1f54d4fd2d48866abb
 EBUILD tf2_tools-9999.ebuild 565 BLAKE2B 482efd293cd0f0015eb101c805a46cda6a3287da182559908830884c0c662131e476a29998fcc293d20fcd98941d00bf2df0e6a1739adc9d0e32dd33438e5a0a SHA512 cd24e0ae858a0776c151232ced119477e3aff6b83a56793ff8a325f62fe5d71a3dc513ec5604886fb01ec6d2c2618302b48cedf3e40d5d946f5e7124659a6293
-MISC metadata.xml 339 BLAKE2B bf7648aaefd8e1834d8d0faf1307566a068bffc3873942b6c799124486a369df38f2defae61afb67c51ed4750b77ee68ab163d1510b6ea0dedb3867bfa9a29e2 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51
+MISC metadata.xml 327 BLAKE2B ee9a902001f4ab56d6bdca309315ae772642fcd9c231dbbbad1ee532424d3e4dfd8140be540816f24ae5cecb06746d8258259d5e22d4cb70d7dbc6b803c8f97a SHA512 12555186ce2fbe547f8e8fc19483accf1fb7821bc1c4f1bdf3fb16855a801ed07849d5d86cf07aba1f6d4238121591355a27a50bde0e27efd04ef589c62176da
diff --git a/dev-ros/tf2_tools/metadata.xml b/dev-ros/tf2_tools/metadata.xml
index 00d4b2a1a83d..03f74b7656e7 100644
--- a/dev-ros/tf2_tools/metadata.xml
+++ b/dev-ros/tf2_tools/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo ROS Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">ros/geometry_experimental</remote-id>
+		<remote-id type="github">ros/geometry2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-ros/tf2_tools/tf2_tools-0.6.2.ebuild b/dev-ros/tf2_tools/tf2_tools-0.6.2.ebuild
new file mode 100644
index 000000000000..007bd064fc2d
--- /dev/null
+++ b/dev-ros/tf2_tools/tf2_tools-0.6.2.ebuild
@@ -0,0 +1,25 @@
+# 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/geometry2"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="TF2 tools"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/tf2_py[${PYTHON_USEDEP}]
+	dev-ros/tf2_ros[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf_conversions/Manifest b/dev-ros/tf_conversions/Manifest
index e73c3a7fe29e..0b1d079c7b70 100644
--- a/dev-ros/tf_conversions/Manifest
+++ b/dev-ros/tf_conversions/Manifest
@@ -1,4 +1,6 @@
 DIST geometry-1.11.9.tar.gz 185525 BLAKE2B ba807c12d4389983d95a37707344f439cd256c5200bcc639b103862d6b3c4670db62a048feddac2ddeabe8374ccfebc0cef7bf6e14b672b1610194c40c9d6022 SHA512 de775da483d1bcca05bcc0f05dc358e1e11e4ba9845f446f5810ca2e835e75ed7202ff7c43a0d7433f9db4298930af32715f2ab2689e0f22c9d8ac10a73cc97c
+DIST geometry-1.12.0.tar.gz 186357 BLAKE2B 6bf8c93b5707403655253a30b8994bb62b8b44077805bf43b266b781e5c8edb65c402d00fb76d9e87bd111211b932f10487f769ac4d04322255b57f44680adca SHA512 5cef17a76dfd5b9c2f118519bf3a74a1213d3036c8de19de453e8419d12d744a6a4ae4fd4a76b34c455b548a9857cd5bfa181698d903356737e1555d619a0627
 EBUILD tf_conversions-1.11.9-r1.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
+EBUILD tf_conversions-1.12.0.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
 EBUILD tf_conversions-9999.ebuild 728 BLAKE2B 9380598c515d30683ef9a1904897f701b9e6729322e4a3ac06cbcebcfec6676d0f49cb0f25264c1f27c805b460781b14f5061fee7148f1704b331e6752ffe097 SHA512 14983a751eaf870844fba7f2fdaec1df22a6f5bf6ac28ea700a146df5ec3524efcb3274bc0398ad3b5b24d862dc0788a1c0a5da7ec1c8139db0e6ec1134dd5db
 MISC metadata.xml 326 BLAKE2B 5dc7af91da7fdb7ea5fc3057f3d536db449ab74936a1d7d5fc8db12e7ee77f575df3607e4cb4be025a297c16ff2396fe7b8ee18d3024278059c3a9acf59485ba SHA512 2a6fb539ad45610d9ece5d96d9dfdcc90a0e11723e2a2747dd49a4b15fedda8afc369e5d9a1a4337f9216a983a4d8f3c9fe6b1054c8dafedd83ced92fd8381ae
diff --git a/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild b/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild
new file mode 100644
index 000000000000..9e9aa0f339c9
--- /dev/null
+++ b/dev-ros/tf_conversions/tf_conversions-1.12.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/geometry"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Conversion functions to convert common tf datatypes into identical datatypes used by other libraries"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/kdl_conversions
+	dev-ros/tf[${PYTHON_USEDEP}]
+	sci-libs/orocos_kdl:=
+	dev-cpp/eigen:3
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/trajectory_msgs/Manifest b/dev-ros/trajectory_msgs/Manifest
index 4a06a385eb48..994cf42d7a5e 100644
--- a/dev-ros/trajectory_msgs/Manifest
+++ b/dev-ros/trajectory_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
+DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
 EBUILD trajectory_msgs-1.12.5.ebuild 492 BLAKE2B 9d708829c9ac72d72759fc9533ad7882c3c4a49d052399cf30727cf76d8e7230f206066832c993e92784524543ae9f9924f4554cf1975e9ccad1f40e8c7a8ec5 SHA512 cbfe17a29a6733f149c26cc4130d971f619c93eb0af5e3f20d0fcdb13fb6524b4b8d214f6f3d9c7b689b02c025d42ab9e300532e7f357d115712c8da659d6526
+EBUILD trajectory_msgs-1.12.6.ebuild 492 BLAKE2B 16c9a65ddf8a31c45047e00c11650e5b1b54264032daa93573f6f85c48ffbd776c37f4f883b49abae459fbf63c048abc3bd080e28095b956f9f2b7bd5d44281e SHA512 3c38eb24047460d0474baba0605d6f647d12aa263a23bf7d55280de0207cd0b9153384fea65ab7393dd5803cdbc10696e48a7c8a3d91ba34d8e97059c62bfcc3
 EBUILD trajectory_msgs-9999.ebuild 492 BLAKE2B 9d708829c9ac72d72759fc9533ad7882c3c4a49d052399cf30727cf76d8e7230f206066832c993e92784524543ae9f9924f4554cf1975e9ccad1f40e8c7a8ec5 SHA512 cbfe17a29a6733f149c26cc4130d971f619c93eb0af5e3f20d0fcdb13fb6524b4b8d214f6f3d9c7b689b02c025d42ab9e300532e7f357d115712c8da659d6526
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/trajectory_msgs/trajectory_msgs-1.12.6.ebuild b/dev-ros/trajectory_msgs/trajectory_msgs-1.12.6.ebuild
new file mode 100644
index 000000000000..45db762ccfe1
--- /dev/null
+++ b/dev-ros/trajectory_msgs/trajectory_msgs-1.12.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages for defining robot trajectories"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/visualization_marker_tutorials/Manifest b/dev-ros/visualization_marker_tutorials/Manifest
index 13eddc8c6edf..e7e2cbdf6847 100644
--- a/dev-ros/visualization_marker_tutorials/Manifest
+++ b/dev-ros/visualization_marker_tutorials/Manifest
@@ -1,8 +1,10 @@
 DIST visualization_tutorials-0.10.1.tar.gz 428608 BLAKE2B abee44fa91388e792a5e2ccadf07a32236f7575f5a0e0121ddfdc0135bf63b12c8d603d4bee3ef463f0c64debf9e9c6f8c7c89c2e8dce8375d3264039b6378b0 SHA512 38ad2c29456ff994914b1ca3b2ab6d90b0c9224481d360fd7f88b38c0e9615d35eb94b90abb699738b5f4fac091489bdf2373168bc3a0acc0e6ba3a61b646bbf
 DIST visualization_tutorials-0.10.2.tar.gz 428684 BLAKE2B 751d18089c69cdb8cd0cfac97235d213cce9d098264dc49fcaf7d7a949216b8fd40041c23be5d16be1537298b876dc1854a8b7dc1214ba7aeb74b18716892636 SHA512 40d8621fd05e81dc23adbf7fd0a69209d796ade3ad291aa350030872a3bbffad2ec9ac0d31734ccf73f8215f7dd52834a35baaa3fe198a3fc4c5bda71a760b05
+DIST visualization_tutorials-0.10.3.tar.gz 428877 BLAKE2B 4bcd482ae61f29908ca23dda653d1c6d0e6a0a9df56df8343d1dfb5124f8d60c9a12ef8b1565c4655617dcd62d80a2aa51f2fd9b2c5329e33c3cc22e3e63c22d SHA512 2e484791851291d2316c7a20e92d988d71b6c41c98bad98c78bed465069dcfe5fc1ddd5c15c6981e951db2c114e965747c07e27f4851c2705af3dd036b992781
 DIST visualization_tutorials-0.9.2.tar.gz 428117 BLAKE2B f25320fa80b12a8a5499d505af369c33362e7f085de3846478b6376fc49e4e2502f07ded6c9e1025224d7b2418d78c87933b2d93b66ad2865eb45581384df24f SHA512 4a2b323e74725dbb77fbba6405d39246a89b170c66dec78288c4461d70c419efc3197eed5867f68305e490552d0480525153f98a64a3025efddc367db824ca53
 EBUILD visualization_marker_tutorials-0.10.1.ebuild 431 BLAKE2B 611791dde1d1bd5646770eb26f6e52ff904e6823ba9e26d49bff4cc154176faec86ab66bdfea219deda61e08ac56c28d67bc5fb602d101c2cffc4e5d340fdb94 SHA512 b4b03e71016ab6dc058dd36410c9865e53aacf0d45d128a97ae66a249d76958c541167c1fcb94ce56c0dc7ae912024433866a81e62b3aeb5cc7e25f545616573
 EBUILD visualization_marker_tutorials-0.10.2.ebuild 431 BLAKE2B c17e489055aeb591796d7bf9aa76cb55a1577729506cfcfa477edc60a796ef941befadea473c1c29561b8a781b5f8512d4ed78b02fc8efbcce896263de6748e5 SHA512 bdc3f9c5f14fc1d7656b530fd7c7c4c90aa7e4e0bc920cfaec28cb15829430337c8a0f27c683fbe05c4676f2981abe222b0abdd0a980059ca01ea3713f35ab0c
+EBUILD visualization_marker_tutorials-0.10.3.ebuild 431 BLAKE2B c17e489055aeb591796d7bf9aa76cb55a1577729506cfcfa477edc60a796ef941befadea473c1c29561b8a781b5f8512d4ed78b02fc8efbcce896263de6748e5 SHA512 bdc3f9c5f14fc1d7656b530fd7c7c4c90aa7e4e0bc920cfaec28cb15829430337c8a0f27c683fbe05c4676f2981abe222b0abdd0a980059ca01ea3713f35ab0c
 EBUILD visualization_marker_tutorials-0.9.2.ebuild 431 BLAKE2B 611791dde1d1bd5646770eb26f6e52ff904e6823ba9e26d49bff4cc154176faec86ab66bdfea219deda61e08ac56c28d67bc5fb602d101c2cffc4e5d340fdb94 SHA512 b4b03e71016ab6dc058dd36410c9865e53aacf0d45d128a97ae66a249d76958c541167c1fcb94ce56c0dc7ae912024433866a81e62b3aeb5cc7e25f545616573
 EBUILD visualization_marker_tutorials-9999.ebuild 431 BLAKE2B 611791dde1d1bd5646770eb26f6e52ff904e6823ba9e26d49bff4cc154176faec86ab66bdfea219deda61e08ac56c28d67bc5fb602d101c2cffc4e5d340fdb94 SHA512 b4b03e71016ab6dc058dd36410c9865e53aacf0d45d128a97ae66a249d76958c541167c1fcb94ce56c0dc7ae912024433866a81e62b3aeb5cc7e25f545616573
 MISC metadata.xml 355 BLAKE2B fb6b9ee20af31ea0d99819722e6df9dc086b3b4de71d9a3aba80bee73490a62738ce308e9b1e77ee22c079e21ff7623b13fd7d46fd8d670232ea45a3cffd47ae SHA512 5e233967a9e4b9c0f790ddfa82d4c2febbb2948b3ed3abe4ec91d1ec0e80202738daed074eb911a63ccd6209837f5e52ab985ff4e792f3e90a38120963e8db34
diff --git a/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-0.10.3.ebuild b/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-0.10.3.ebuild
new file mode 100644
index 000000000000..264e1b66adae
--- /dev/null
+++ b/dev-ros/visualization_marker_tutorials/visualization_marker_tutorials-0.10.3.ebuild
@@ -0,0 +1,20 @@
+# 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/visualization_tutorials"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Visualization marker tutorials"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/visualization_msgs/Manifest b/dev-ros/visualization_msgs/Manifest
index c59464978001..aa70ecb275dc 100644
--- a/dev-ros/visualization_msgs/Manifest
+++ b/dev-ros/visualization_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST common_msgs-1.12.5.tar.gz 59525 BLAKE2B ac6a8f71df81aa520ec5cef00a5b20d098344356fa93141a5cce07eb185032d69593fa2d8c11edc39572826a69cc69e2c94cacf83802993e47180fadcaaa23ac SHA512 99efda88b630c0ebadc576501e9d84f3811fb012084125569d54da0b75656751f8f782d101fa0cf62d7b1ac4419902f17d1dc78efee7188ff67f59bf00a743ee
+DIST common_msgs-1.12.6.tar.gz 66588 BLAKE2B 56c8be3857f5285ebd2f25710f7f8e23f3e316aabfc30c981ba8b0c24b40e3d527fef307d503484506a66391398a8f9196ca57088ddda7f951506edd8e7dd538 SHA512 cc783e5e2c10862418459dc6085dae09948004f7a9d4f718d1a9bfaa117ddbe41e04482d28a8a02cf045dd859ddff6c927074ac6cec0916c8b0aa46526c0eb4b
 EBUILD visualization_msgs-1.12.5.ebuild 532 BLAKE2B 8dbc068cf47db1c795237b9043366a1d34cebcad5135b7150e90b9d1bab9f54747770d60dd961e548c82176081938e188c9b7f7dfecd807573fc849692238090 SHA512 e64d6a73c0a3ae7f075b55ff3e847e9b16a0747676dfdc3b474627a30f68e5d1fb36c3d36dc2b77a2e8bdb7ebb9616d8863b289d1324aa0a784c3477b384e076
+EBUILD visualization_msgs-1.12.6.ebuild 532 BLAKE2B 6361df40782bf8960d474a8dbafe162fc800c7a74999d2c29bbbe0e59fe9749b2811db4152dfde67a10aa7795fc37c6f349292100ce5705b058c1912fb76d210 SHA512 0e955ec56b7cad47aeffb3caaee42da19d580a8bfaced3290ad04984f1967224ffdb0f6447f45a56a4e11072ce4c7a34c8bb2d71e7955d02b6ea0e96d42fbba9
 EBUILD visualization_msgs-9999.ebuild 532 BLAKE2B 8dbc068cf47db1c795237b9043366a1d34cebcad5135b7150e90b9d1bab9f54747770d60dd961e548c82176081938e188c9b7f7dfecd807573fc849692238090 SHA512 e64d6a73c0a3ae7f075b55ff3e847e9b16a0747676dfdc3b474627a30f68e5d1fb36c3d36dc2b77a2e8bdb7ebb9616d8863b289d1324aa0a784c3477b384e076
 MISC metadata.xml 329 BLAKE2B 31f4f89a8981373ec2da20b753091270b0c6bfefd3ce02dfc5164f1394826dd59a8afce540c0c7ff34d43ec36f86fe71f8321b9a47099dde21f0eca068956f9f SHA512 0c4983993d1eec1067981913453de5b83fc2474c0af890dd388911039080a84c80881b3bc683aa01ceff35f511d2365292f15fb22f8ba10b188cace918dd1022
diff --git a/dev-ros/visualization_msgs/visualization_msgs-1.12.6.ebuild b/dev-ros/visualization_msgs/visualization_msgs-1.12.6.ebuild
new file mode 100644
index 000000000000..bfb9a27d1fa9
--- /dev/null
+++ b/dev-ros/visualization_msgs/visualization_msgs-1.12.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+CATKIN_HAS_MESSAGES=yes
+ROS_REPO_URI="https://github.com/ros/common_msgs"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Messages used by higher level packages that deal in visualization-specific data."
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/xacro/Manifest b/dev-ros/xacro/Manifest
index 6c22751e66a1..55f609ea7d62 100644
--- a/dev-ros/xacro/Manifest
+++ b/dev-ros/xacro/Manifest
@@ -1,4 +1,6 @@
 DIST xacro-1.13.0.tar.gz 80831 BLAKE2B e7d522879998c0d98bd6a45c409949b93392fa6cc2593c9796d68ed51aef37f82a3b15346c3a15e72c7724564b722f3a5b944f7ded62e720b6ab8c54dc74721b SHA512 f2eaa6f6eb7249ce1da84660d9f10ff83002c69e3d8ead5c4bfcad194052e6a059fa6dfcc261e199bfcb686a9801e810db4923b137530ad7df9572faad34a9aa
+DIST xacro-1.13.1.tar.gz 81091 BLAKE2B 40c48e63f288285a786fc3d6f3624940d25ec1bf78d92c05a6a40efa0db1ee0b3b63533f912459dbb59540ed8c1d266ae07a4df6e837a04232de6fa83b5bc10b SHA512 04732f1e77bf37268fc3e43ea6f888d17dcadab5f1869525f9f2237e893bc2eb7004ab730892ed6fa98d81706ff32e240b0bae0445791f6c1f1f8098effb4f95
 EBUILD xacro-1.13.0.ebuild 494 BLAKE2B 7a6b16056e1fde6ecc980f7aa4319c0e1fc604e786a12d7700ca4fd239772bb7bc9b4255d57e5f6107ef41eb64d8c6cb9b2ca5da0c08e86a63f3fd72edc748aa SHA512 0dbe3e599a3a84b3fa810fdecbc63be4ac547a74dd74b19225c90513f6145c4f765b5474156d5402731773fc0d2984b1e8d0a7a7c3048eb976eb569d791f94b0
+EBUILD xacro-1.13.1.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.1.ebuild b/dev-ros/xacro/xacro-1.13.1.ebuild
new file mode 100644
index 000000000000..a7b93c3df7f6
--- /dev/null
+++ b/dev-ros/xacro/xacro-1.13.1.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}]"