gentoo resync : 14.05.2020

66 files changed, 979 insertions, 11 deletions

diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index 1590f0be9d81..8fbf51cb3ffa 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest
index a9b5c590b900..91ac651af1dd 100644
--- a/dev-ros/message_filters/Manifest
+++ b/dev-ros/message_filters/Manifest
@@ -1,6 +1,8 @@
 AUX boost.patch 1066 BLAKE2B 955d62df23d3165df5cf2645967755bf8dbd993779ddba0c6db4cbd77c6456d536421d428475ef521f3b961e4e9dd9f93a78066f10ed961fddb6a8528ea29648 SHA512 a78c61c54c7389647fa7001ce0d453b0d2b74324877da1275edc487c18cd6208a640678575887f84bcab0a742618efe69bd209855a4f57f58ede98f0a3cd7600
 AUX tests.patch 4837 BLAKE2B 2793652865f2d1f8ce1499b37922e480d40ca3931f098156a6cf541ad48985a3bee29364bb09e37c4f15424765dd057875f26dd5290f5747718538bcbeb3aead SHA512 2c778a7e4c7fc6d89ef162fd42d6f1dbd487d885c7ee04f6a8243142aaf949b02bfcd0c08cc8799f7a1ee95d13c8d21aef340abc4a3e6ca3c0f2231118985796
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD message_filters-1.14.3-r1.ebuild 795 BLAKE2B 294a8f9f9f3d3b47a8a692c86b88badd8370ef38f680e6fb2ed1fbfb027ffe8e20cfdfea63564478488e2b583d5588478330535c458ce7b45383d2e979e3d5cf SHA512 e159086871167df2de97ad0912162f4ac2c94a4e43796d41f8b4a338d1cc8783a094de87497c719d9608d62a2cfa1f31f17fa946a96cb1b01203a8ed47039055
+EBUILD message_filters-1.15.4.ebuild 769 BLAKE2B 1d022886a2dc5110f40e8eec6458687855690d2c5f073a96e936c16172bd20c656d127bf2a76d636dffda664a4431ac943dc4f97a52b9aed0544ff267a721bc5 SHA512 9d9f9dfcc87fa07dd7473710a059d88267ebf55ba84b00d709b0aec7959049a3f0de7cf490fa46d19c330403a168e1114cd99e2a2425bea406228878d1d41cf0
 EBUILD message_filters-9999.ebuild 769 BLAKE2B 1d022886a2dc5110f40e8eec6458687855690d2c5f073a96e936c16172bd20c656d127bf2a76d636dffda664a4431ac943dc4f97a52b9aed0544ff267a721bc5 SHA512 9d9f9dfcc87fa07dd7473710a059d88267ebf55ba84b00d709b0aec7959049a3f0de7cf490fa46d19c330403a168e1114cd99e2a2425bea406228878d1d41cf0
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/message_filters/message_filters-1.15.4.ebuild b/dev-ros/message_filters/message_filters-1.15.4.ebuild
new file mode 100644
index 000000000000..ec6cbf8434ad
--- /dev/null
+++ b/dev-ros/message_filters/message_filters-1.15.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-libs/boost:=[threads]
+	dev-ros/genpy[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+PATCHES=( "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest
index ffcc849abf22..9bb649c36b40 100644
--- a/dev-ros/rosbag/Manifest
+++ b/dev-ros/rosbag/Manifest
@@ -1,5 +1,8 @@
+AUX pycrypto.patch 402 BLAKE2B 2f784f93115b205285bb9eb9c910185f84871da7ecc5865304d220df7e1e9bea3799743a1f7a2a274423ec3fa4e367773814bd5fbb5cb074acb7252845ba6e94 SHA512 2343aca88929010f76389f31187b913f92f8d510a18a0d81b20c2c9accc2da68d15fd959404f11d363bdbe98f644ff2e76a70fdca4a718b490fa7f812a1b417e
 AUX yaml.patch 2142 BLAKE2B 3b42703dc19179852e53bb98e6b450014bfa21d3f253e912ff6ce970b0904ae700b724e761821fa9b5a880789de8c80a2820e9a64bb2e56fb1783b034f4291ad SHA512 a5c41b8b374b33c577375495e6599daa50685664794ffc0c9dd83118b4ea8d74c68e3831ea426a1a3bce585e35f9039a86fab4266840b4eb3302bb4454ac889a
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD rosbag-1.14.3-r3.ebuild 905 BLAKE2B 3b3f98ddac35f795a8d195c41883466b774c37e79028d3086ab7bbbbd0b405c194b4850590db6f954ad2ab7fa363f671ee8a018540c0e6108a05a7ac82293da6 SHA512 8528cfd738b64324316a057a16bc7155a330f2aa150f4dd7bdd241250ac509ce7f460564b0fc3a1eb1b6daa8e28f3eb7adc14b547f0e2545884567d0e68167ee
-EBUILD rosbag-9999.ebuild 868 BLAKE2B f9fc2095f638b533577dbf66da4ae52639727ea94e53ca333e3c1ed8d4c2feda124f102b504cab0980c34fcfe596c8d8d2d2c3f7f4813ca538962c99b30dae31 SHA512 b92e4042ed87e820530119ce22f6a8697fda8dfb8ace05904cfbba9b44e0cf6884bf158cd6c9b8d8f74a26f79847b57ba92b7e2f0c12187a2403272c39c2cf9a
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
+EBUILD rosbag-1.14.3-r3.ebuild 877 BLAKE2B 3b9c2e9d89270a5011c8480b791a72ae50b10292766c9eb5a8826e16ebbea61869a72a7b17709bdb1b2c7f422d9e02afee032df3f21b2921630fdb455acd3552 SHA512 09029c964574932beb792fc5008334e4f31e7428c9a098c87484c59fe7995b85d57febea5e3d76c8129ef011764543945b60d31ee358788e6b5ce540ccbc6830
+EBUILD rosbag-1.15.4.ebuild 881 BLAKE2B 2f6251489319075dac9ab839ca967cc88ab2f698c951e4381531c297cd01edf17570a2a70145f3d55b821bcef992d90c1dc1a6c11457ff2cb15ca946e6d144a6 SHA512 3c3cfe681870436df68d6c20b320ede685766c232c9545eb1319d0abde83ad7090ef61df84ad8a228203be83e750569afe44edf7e3142978377b224c83588622
+EBUILD rosbag-9999.ebuild 881 BLAKE2B 2f6251489319075dac9ab839ca967cc88ab2f698c951e4381531c297cd01edf17570a2a70145f3d55b821bcef992d90c1dc1a6c11457ff2cb15ca946e6d144a6 SHA512 3c3cfe681870436df68d6c20b320ede685766c232c9545eb1319d0abde83ad7090ef61df84ad8a228203be83e750569afe44edf7e3142978377b224c83588622
 MISC metadata.xml 418 BLAKE2B 2d84b96bfb428654a9b926100a8bd083afb2addc6db8b2e6fb003fab4bb8c1615df40ee13c863a3ddfe98a1a1f9b72af8310a80a9f610a01fe14366afde2e38d SHA512 d7579d9a25bf9f83513e3d8058ec845ee9b59e5d999128532b63d992cee8ef94922aee88140f044829442077c6f9ae80d6b0b0f554cf677690fdc88a17c9f260
diff --git a/dev-ros/rosbag/files/pycrypto.patch b/dev-ros/rosbag/files/pycrypto.patch
new file mode 100644
index 000000000000..c221d1bc086b
--- /dev/null
+++ b/dev-ros/rosbag/files/pycrypto.patch
@@ -0,0 +1,15 @@
+Index: rosbag/src/rosbag/bag.py
+===================================================================
+--- rosbag.orig/src/rosbag/bag.py
++++ rosbag/src/rosbag/bag.py
+@@ -50,8 +50,8 @@ import threading
+ import time
+ import yaml
+ 
+-from Cryptodome.Cipher import AES
+-from Cryptodome.Random import get_random_bytes
++from Crypto.Cipher import AES
++from Crypto.Random import get_random_bytes
+ 
+ import gnupg
+ 
diff --git a/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
index 7e936c76873d..7249f56e314a 100644
--- a/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
+++ b/dev-ros/rosbag/rosbag-1.14.3-r3.ebuild
@@ -6,7 +6,6 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
diff --git a/dev-ros/rosbag/rosbag-1.15.4.ebuild b/dev-ros/rosbag/rosbag-1.15.4.ebuild
new file mode 100644
index 000000000000..572a7bcad9d9
--- /dev/null
+++ b/dev-ros/rosbag/rosbag-1.15.4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back to ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE="lz4"
+
+RDEPEND="
+	>=dev-ros/rosbag_storage-1.14
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/topic_tools
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-ros/std_srvs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/genpy[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-libs/console_bridge:=
+	dev-python/pycryptodome[${PYTHON_USEDEP}]
+	dev-python/python-gnupg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag/rosbag-9999.ebuild b/dev-ros/rosbag/rosbag-9999.ebuild
index 7d776ac0c2aa..572a7bcad9d9 100644
--- a/dev-ros/rosbag/rosbag-9999.ebuild
+++ b/dev-ros/rosbag/rosbag-9999.ebuild
@@ -6,7 +6,6 @@ EAPI=7
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -34,3 +33,4 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 RDEPEND="${RDEPEND}
 	lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )"
+PATCHES=( "${FILESDIR}/pycrypto.patch" )
diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest
index 7de5c949560f..ebb6c245341e 100644
--- a/dev-ros/rosbag_storage/Manifest
+++ b/dev-ros/rosbag_storage/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD rosbag_storage-1.14.2-r1.ebuild 597 BLAKE2B 396fa1a667259dc91de933d9537bf54db019b2e06c64ab5f4dfe5cc550813ccf5a629dec9ff53d3f409ce602d4b6ce2c7201f505eddc74aa5b9b1d40561f70c1 SHA512 35b01188976c4273bcd62675d4d88cd27947e57e53e0de036084a577c564ffb477bbc46f5966b9abcf7464c8a36bb86c4a91cc89cdb334a1e6abb777caf314f4
 EBUILD rosbag_storage-1.14.3-r2.ebuild 654 BLAKE2B e89f69d4007184e383b514b9dd3a9eae2d45d7f856cfe26db32f3e262c34d7bce64eb62cb35c90930e4408191930ce8c1587f91fdaea2fbb50d11aec270fc941 SHA512 3a9c4f1e3e134d1c7ed44fb998d5b1cbd7cc6e2953a4e5eef3de4daab9b32a75a4693e149d9f104792d3727bd7228a5dee0012c123cc428737658221cde8f6fb
+EBUILD rosbag_storage-1.15.4.ebuild 654 BLAKE2B 1be6603ceba6193bbeaa2276ec10ab58a85016b7c3b32194b7bd1081d9a85d210532138175fdda886b562de6ea1d54f6e323d9d829f3e8dda3022e669cd788af SHA512 22235a935488e0c824bfd3874d8a154cdc3ae62f0e21e883968e540697e58ff9535139de69c343d7a622447f174883e606288c9c90672e6c082c698fb22549d7
 EBUILD rosbag_storage-9999.ebuild 654 BLAKE2B e89f69d4007184e383b514b9dd3a9eae2d45d7f856cfe26db32f3e262c34d7bce64eb62cb35c90930e4408191930ce8c1587f91fdaea2fbb50d11aec270fc941 SHA512 3a9c4f1e3e134d1c7ed44fb998d5b1cbd7cc6e2953a4e5eef3de4daab9b32a75a4693e149d9f104792d3727bd7228a5dee0012c123cc428737658221cde8f6fb
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.15.4.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.15.4.ebuild
new file mode 100644
index 000000000000..4095940515c2
--- /dev/null
+++ b/dev-ros/rosbag_storage/rosbag_storage-1.15.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Set of tools for recording from and playing back ROS message"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/console_bridge
+	app-crypt/gpgme
+	dev-ros/pluginlib
+	dev-ros/cpp_common
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/roslz4
+	dev-libs/boost:=
+	app-arch/bzip2
+	dev-libs/console_bridge:=
+	dev-libs/tinyxml2:=
+
+	dev-libs/openssl:0=
+	app-crypt/gpgme
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest
index ce7766047557..0da9943f990d 100644
--- a/dev-ros/roscpp/Manifest
+++ b/dev-ros/roscpp/Manifest
@@ -1,5 +1,8 @@
 AUX boost.patch 1237 BLAKE2B bdea2bd55d1df3db2bdf3df15fd648bd488403068fc4667a2f1217cedaa066d5bb24cde84f1b9bc2ae43c33baec0dd601e0de1c036d0a522d9bf215f00cdf8eb SHA512 383a3c7ec2f4d92f578a18f530e2cf856c269bf761adb4c2a015fdffa5ee8adfbb2d62086c0c2a126653ea63a97763a8631eb93a82d1e9da5898c54f7187eadd
+AUX boost173.patch 3035 BLAKE2B 3ce759d081ebaaab9e10b838515ffe41d3e5c3925e995379fe768030e1a308f3531aea70c97aa0b761fd9531ec18fb054a7b1f4ff0ad3f522a4e28a7165f7571 SHA512 6b263429c7172189e4d341a1e0471d70de419d3c694bcd09549d057fd8568facd30b46a2adbb66f0cb5216333225ed5db5752be4ebc17980e2080312031c7409
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
-EBUILD roscpp-1.14.3-r1.ebuild 684 BLAKE2B 9d220932e732d452671cafffd410ce08b5159b7a900ee5c542092633997e8d0d00a5a4e7cac4cc4ff6c6113219c407287a8e45a56098869654cd1de4f52870e9 SHA512 77198473590e30ea071fa0a26d794a2f4f349519d5c94f528ca815675d1c5133297cd25c1aa1e9a3680673ef1c1e05d13ff924ff1432cdbfdf07d43051401bbc
-EBUILD roscpp-9999.ebuild 646 BLAKE2B bcec73ae5a6dca33a30b58e80937f138f09f8db8033f9e18c25bb1dd6ab58a3072b85a615ad81e6f4df3ff59a0ebf8a1e46008673103571825c7865986a82e50 SHA512 789b0028a1bf51a9f166d87522d755dda8a1eb8bf336bc38cf5a4b2eaea760e6032f461b7059136f50f99c6181e814baec356c29a2947247e76d9e987a49a0fe
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
+EBUILD roscpp-1.14.3-r1.ebuild 644 BLAKE2B ccb0c12829043287d21b36636ec34b2aecd9f4b3aaf6f66619bd76fd7886b2aa789bd47eabe348c4b8c374cefd07370485816e6160ce7740b1ad22dfcdf23905 SHA512 a10ac9244f4b769ec523147a325088294340787ac09a56f32826796b9df9d83b3bdc98101a422794494d5fcaedeef9c1b7bc35ad593acc8a086e7b8e22a07dd7
+EBUILD roscpp-1.15.4.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
+EBUILD roscpp-9999.ebuild 647 BLAKE2B 10abcfc901b53a6de6abce9a5ae0e8ac5f17939ace4126c13a2ecd326854c635174f1b68740ed5f177600309ee63aefac3bb7e4c338fd5c7d50699d2cd4fc9a8 SHA512 f098ea166d39d993387205ee1c7d51bfac64bf536f2399ca2cbae70dc992428bd858c2d864b20531f2c956cb3cc26cf991def027bf1ef1145993f8db1888e9f3
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roscpp/files/boost173.patch b/dev-ros/roscpp/files/boost173.patch
new file mode 100644
index 000000000000..d31f8c8ff246
--- /dev/null
+++ b/dev-ros/roscpp/files/boost173.patch
@@ -0,0 +1,62 @@
+Index: roscpp/include/ros/timer_manager.h
+===================================================================
+--- roscpp.orig/include/ros/timer_manager.h
++++ roscpp/include/ros/timer_manager.h
+@@ -349,7 +349,7 @@ int32_t TimerManager<T, D, E>::add(const
+     {
+       boost::mutex::scoped_lock lock(waiting_mutex_);
+       waiting_.push_back(info->handle);
+-      waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
++      waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
+     }
+ 
+     new_timer_ = true;
+@@ -416,7 +416,7 @@ void TimerManager<T, D, E>::schedule(con
+ 
+     waiting_.push_back(info->handle);
+     // waitingCompare requires a lock on the timers_mutex_
+-    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
++    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
+   }
+ 
+   new_timer_ = true;
+@@ -490,7 +490,7 @@ void TimerManager<T, D, E>::setPeriod(in
+     // In this case, let next_expected be updated only in updateNext
+     
+     info->period = period;
+-    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, _1, _2));
++    waiting_.sort(boost::bind(&TimerManager::waitingCompare, this, boost::placeholders::_1, boost::placeholders::_2));
+   }
+ 
+   new_timer_ = true;
+Index: roscpp/src/libros/connection_manager.cpp
+===================================================================
+--- roscpp.orig/src/libros/connection_manager.cpp
++++ roscpp/src/libros/connection_manager.cpp
+@@ -66,7 +66,7 @@ void ConnectionManager::start()
+   tcpserver_transport_ = boost::make_shared<TransportTCP>(&poll_manager_->getPollSet());
+   if (!tcpserver_transport_->listen(network::getTCPROSPort(), 
+ 				    MAX_TCPROS_CONN_QUEUE, 
+-				    boost::bind(&ConnectionManager::tcprosAcceptConnection, this, _1)))
++				    boost::bind(&ConnectionManager::tcprosAcceptConnection, this, boost::placeholders::_1)))
+   {
+     ROS_FATAL("Listen on port [%d] failed", network::getTCPROSPort());
+     ROS_BREAK();
+@@ -142,7 +142,7 @@ void ConnectionManager::addConnection(co
+   boost::mutex::scoped_lock lock(connections_mutex_);
+ 
+   connections_.insert(conn);
+-  conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, _1));
++  conn->addDropListener(boost::bind(&ConnectionManager::onConnectionDropped, this, boost::placeholders::_1));
+ }
+ 
+ void ConnectionManager::onConnectionDropped(const ConnectionPtr& conn)
+@@ -190,7 +190,7 @@ void ConnectionManager::tcprosAcceptConn
+   ConnectionPtr conn(boost::make_shared<Connection>());
+   addConnection(conn);
+ 
+-  conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, _1, _2));
++  conn->initialize(transport, true, boost::bind(&ConnectionManager::onConnectionHeaderReceived, this, boost::placeholders::_1, boost::placeholders::_2));
+ }
+ 
+ bool ConnectionManager::onConnectionHeaderReceived(const ConnectionPtr& conn, const Header& header)
diff --git a/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild b/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
index d60a12ad74df..9f927d9f390b 100644
--- a/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
+++ b/dev-ros/roscpp/roscpp-1.14.3-r1.ebuild
@@ -6,7 +6,6 @@ EAPI=5
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=clients/${PN}
 
 inherit ros-catkin
diff --git a/dev-ros/roscpp/roscpp-1.15.4.ebuild b/dev-ros/roscpp/roscpp-1.15.4.ebuild
new file mode 100644
index 000000000000..8863bf3d38b4
--- /dev/null
+++ b/dev-ros/roscpp/roscpp-1.15.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp_serialization
+	dev-ros/roscpp_traits
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost173.patch" )
diff --git a/dev-ros/roscpp/roscpp-9999.ebuild b/dev-ros/roscpp/roscpp-9999.ebuild
index 3c3355ec363b..8863bf3d38b4 100644
--- a/dev-ros/roscpp/roscpp-9999.ebuild
+++ b/dev-ros/roscpp/roscpp-9999.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros/ros_comm"
 KEYWORDS="~amd64 ~arm"
 CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=clients/${PN}
 
 inherit ros-catkin
@@ -28,3 +27,4 @@ RDEPEND="
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/boost173.patch" )
diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 608e9d37a298..269425a10d7e 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -2,6 +2,8 @@ AUX py3-2.patch 2357 BLAKE2B a3af95fdd93c1e5540626a529696583c366623a34a056122efd
 AUX py3.patch 1616 BLAKE2B 56b70362a387ca67c97041456f185f4fb10959d32c7a54d825c8ee2a2dc71cc6bef3f2b9883083596f28bd26442d1b6d9bf92e563a5d3a8872a608a676949aa4 SHA512 e12466e7f86252516a7a094fdb6b0bbfeef784cae3a6638683b84aa5ee94c6848ecb1a22121719339f65fecdaa0d25a26c27d986c771ad2a82dc42975dad6118
 AUX yaml.patch 2245 BLAKE2B 2048938c0532efee2bca2cd7bdc5f544670245cd3b647613e8ec1a80588fad33287931ead00fc63c27e03e825bfb5c2b8db5bae75446184f85fc0c09abb26f3d SHA512 6346eb9231152dd91627b67f99f1268fc158136092d62e86fa01c7adb831a31e36844c12dbb3c52f190fbd6b4dbd77b026fe5190496d88ba4326abf55f7339ac
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD rosgraph-1.14.3-r1.ebuild 638 BLAKE2B 466cd36f189b553c024553471e9bc912cb1c7c56c5e99d85c3783e8806b047c5dde65a2212e8e75008e6baa571d974ccc88fee8484fb585f4ffd440f1cfc8554 SHA512 241bcf3ac7f4a244bb186a23d2b66bcdbd0101234acbeb64acef219c81220789f080610e6aeec0767f76f74814f3d640f48daae630e1221c88ab74c725f7470a
+EBUILD rosgraph-1.15.4.ebuild 551 BLAKE2B 16d5178f64797054ee4de083110175ddffa6b0edd714c64fbd149cf8493f97ff8839f4fa83d7724689aad6a4cb6d38238ed07461b07addd286afbe2725502324 SHA512 39901b1d4e9df5316c0a170a928cd4e09bad87a564be69897b9f594c4008ce96a67459d989cd419fc370f0b1b8a1cc890f97e690b46a99da0056e7be3d0454c9
 EBUILD rosgraph-9999.ebuild 551 BLAKE2B 16d5178f64797054ee4de083110175ddffa6b0edd714c64fbd149cf8493f97ff8839f4fa83d7724689aad6a4cb6d38238ed07461b07addd286afbe2725502324 SHA512 39901b1d4e9df5316c0a170a928cd4e09bad87a564be69897b9f594c4008ce96a67459d989cd419fc370f0b1b8a1cc890f97e690b46a99da0056e7be3d0454c9
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosgraph/rosgraph-1.15.4.ebuild b/dev-ros/rosgraph/rosgraph-1.15.4.ebuild
new file mode 100644
index 000000000000..49cca14bf4f3
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.15.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Prints information about the ROS Computation Graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/netifaces[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index db4837a9e346..c44735ec8b20 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -9,6 +9,8 @@ AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6c
 AUX timeout.patch 623 BLAKE2B 0889396c4a38d3f62fd928dcd2f8d982a7fb070da0912d16f68ff61bf15c0d10f7b4f8dc70f8df9d946608c6755dbcfeb770d9cbc6e5acc9dfd0e3d509177258 SHA512 56ded8178faab6d74245479afe013fbffc984037263cae502ec411ce5e681efa6a8d11fc3b2083673df3e69a011db0c2e0992c5900fa5409338f7be84b0ea843
 AUX yaml.patch 1951 BLAKE2B cb6a66bb788221cd666d199d28a9844e10e61955e254bbd73e93e4595a1b6f3f9bbd292bf2781c46b5f3a0e4d052b79691a896a4fb922ab7db10918d61c86519 SHA512 964212c13d5cdef7fa0b19a947d1740b0782eac35e62e9bac41bc5e4fa33ebb3e15ca7ba6007ec97df2903237c250cdbc87d438804bdf5648ecec55f24ccd21d
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD roslaunch-1.14.3-r2.ebuild 1500 BLAKE2B 829c844a6f728b8dac5f494ba96c82bd9eadb500430e6f0bf7f393c57e50d23b5858da818b628d756949849580f5e66fffb94684b30dd5bb4b1f20c2250c65a6 SHA512 bb54582f417f932e4dac68d7214acd7c0343ad4681cb54b8167417b52af02f0adb1160c0013a0dcd96856052349032b148bf01cdeb4c26cfafa88154ab828a3a
-EBUILD roslaunch-9999.ebuild 1450 BLAKE2B 52460a5324e6497a74e9204067cf77bf1ae815c6dc319639a72ad03e6dd05ecc45fa92673b803d03e9605f38be2f092d64c3350a7a914340b6f40668aef449e2 SHA512 4a7056edefe8b110345abb026aadbd73cdfdef76f0be020dd527312ef5439b81e2d70f72fdff92683d1ec2ec5a041b78973a5469e666555d971f6ec9bf12630e
+EBUILD roslaunch-1.15.4.ebuild 1425 BLAKE2B 94a0208aa65bfa08d0c7a51d84bed57f7b51ee767ec1181a5016299ac57867c3ba8b3f75d4ef82b665d89043365b0b409171d937816b093002b8cda0ab6358d7 SHA512 5e9e26393d979cf1ff0b5167b9ed2cf7b9e561d1cde8a744cb77cb9872c8beac5f58fbbc08a646cd65a91d7365139f4e51819a3120ff2f4db350407c0b58382c
+EBUILD roslaunch-9999.ebuild 1425 BLAKE2B 94a0208aa65bfa08d0c7a51d84bed57f7b51ee767ec1181a5016299ac57867c3ba8b3f75d4ef82b665d89043365b0b409171d937816b093002b8cda0ab6358d7 SHA512 5e9e26393d979cf1ff0b5167b9ed2cf7b9e561d1cde8a744cb77cb9872c8beac5f58fbbc08a646cd65a91d7365139f4e51819a3120ff2f4db350407c0b58382c
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild b/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
new file mode 100644
index 000000000000..4538fcdb1d63
--- /dev/null
+++ b/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+
+inherit ros-catkin user
+
+DESCRIPTION="Tool for easily launching multiple ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/rosclean[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosparam[${PYTHON_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_USEDEP}]
+	dev-ros/rosout
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-util/rosdep[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/test_rosmaster
+	)"
+PATCHES=( "${FILESDIR}/timeout.patch" )
+
+src_test() {
+	rosdep update
+	ros-catkin_src_test
+}
+
+src_install() {
+	ros-catkin_src_install
+
+	dodir /etc/ros
+	sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die
+
+	newinitd "${FILESDIR}/roscore.initd" roscore
+	newconfd "${FILESDIR}/roscore.confd" roscore
+
+	newinitd "${FILESDIR}/roslaunch.initd" roslaunch
+	newconfd "${FILESDIR}/roslaunch.confd" roslaunch
+
+	doenvd "${FILESDIR}/40roslaunch"
+
+	# Needed by test_roslaunch
+	insinto /usr/share/${PN}
+	doins test/xml/noop.launch
+}
+
+pkg_preinst() {
+	enewgroup ros
+	enewuser ros -1 -1 /home/ros ros
+}
diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
index 7263b4b91248..4538fcdb1d63 100644
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild
+++ b/dev-ros/roslaunch/roslaunch-9999.ebuild
@@ -31,7 +31,7 @@ DEPEND="${RDEPEND}
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-ros/test_rosmaster
 	)"
-PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" )
+PATCHES=( "${FILESDIR}/timeout.patch" )
 
 src_test() {
 	rosdep update
diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest
index 9d4ccbb46c0d..b7aed5db2bbd 100644
--- a/dev-ros/roslz4/Manifest
+++ b/dev-ros/roslz4/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD roslz4-1.13.0.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
 EBUILD roslz4-1.13.1.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
 EBUILD roslz4-1.13.2.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
@@ -14,5 +15,6 @@ EBUILD roslz4-1.13.5.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976
 EBUILD roslz4-1.13.6.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
 EBUILD roslz4-1.14.2.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
 EBUILD roslz4-1.14.3.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
+EBUILD roslz4-1.15.4.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
 EBUILD roslz4-9999.ebuild 431 BLAKE2B d97a54e8cf621bc7e5e986571584bc74f133b976e55dd73c054a8c610843a88a2f9204c37ffab07937ddea47cfabeea20aebfd50c49f8155967a80132a2b0648 SHA512 27a4500c3094957be9462af86e2eb7da63da1b8ece273681f4229e4de44ad89f2c18487508208081387f95746eb0f8849f509d2c0eeb7c69ba652095c86867a5
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslz4/roslz4-1.15.4.ebuild b/dev-ros/roslz4/roslz4-1.15.4.ebuild
new file mode 100644
index 000000000000..acf0fcec87e0
--- /dev/null
+++ b/dev-ros/roslz4/roslz4-1.15.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python2_7 )
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python and C++ implementation of the LZ4 streaming format"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/lz4"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest
index d800abf3e349..413b419d58c9 100644
--- a/dev-ros/rosmaster/Manifest
+++ b/dev-ros/rosmaster/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD rosmaster-1.13.0.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
 EBUILD rosmaster-1.13.1.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
 EBUILD rosmaster-1.13.2.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
@@ -14,5 +15,6 @@ EBUILD rosmaster-1.13.5.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc
 EBUILD rosmaster-1.13.6.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
 EBUILD rosmaster-1.14.2.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
 EBUILD rosmaster-1.14.3.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
+EBUILD rosmaster-1.15.4.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
 EBUILD rosmaster-9999.ebuild 493 BLAKE2B 95327558e06ac24f48a5c3cd4ecff72ef62bc3e6256663bbe9a1904640b97d59e146e2bd722d975ce3ca63365da94ed3112798203cf7e24efcd1a9b7d2437fc4 SHA512 2e79eb53ba5c15138d1302fc4940e703fc35c0d5f4949ed570b5bfa6aac0ad947505f526ab75641d558d8be91c4baf0c698d40e64429811006465ca4d7d7dfc4
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmaster/rosmaster-1.15.4.ebuild b/dev-ros/rosmaster/rosmaster-1.15.4.ebuild
new file mode 100644
index 000000000000..a339d31c4b73
--- /dev/null
+++ b/dev-ros/rosmaster/rosmaster-1.15.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS Master implementation"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index 1c3881cd2acd..95e19290070d 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -2,6 +2,8 @@ AUX norm.patch 1260 BLAKE2B 09c790fa6d31a76d07a44622c514391a30c855c167aa3598f300
 AUX py3.patch 12157 BLAKE2B 13c70122c5b790e9d3f54ed9709d01ec4fbb98ba9b0f912d61d016afe265d81abe19e3e8a1b308536019fb995277e0931a0d1238dd1af128059462d7439a132c SHA512 756d32eef5be6e40564654f0bd8eb66295e02af91e3a6f56b995a593a5687fd5e324a5963e68a44a7f19f7fe98eca5717b272533add90710bea46d05912a1066
 AUX tests.patch 811 BLAKE2B 66d61f39aaa4138f1e4ef60c24724216a698d4c355b6830802a176c74cccddd742849377abdd4773c241cf3096d0023fa6ea98aa0a975376fa02d2ba6ea0510e SHA512 3fca6df07aacb5a8230c5990ded10f18127cd92947b3d263042fe49938a224bce0874bc5bc5924a258b116f88f3176c8aedc0ebc92492329c84320d1e2eb20d4
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD rosmsg-1.14.3-r1.ebuild 685 BLAKE2B 4bba0c3d568621b570992e8c4943e6a3248740f9dbef4658d0b519ff84f8456cf200a5e4a26d78328583f9a113a141e3a3e922b80a77351d86fc18f289751d0b SHA512 a2d87e5b732375bc69f1b74e8b1e2afb2b5234fd5e34cb127e738762605f8fcd72d92624fae274fb67681bd86321dbb96b4c0b2a3ec8f3be3e26dbb6c5a978dd
+EBUILD rosmsg-1.15.4.ebuild 598 BLAKE2B 8618b8067bcb689d8b6fb14cbc7c5a427c1b3d9f9f2eb8bec937d49ee08728e1e3b068340422079f697a809651cc0cc52f40a97333b4912863ac1d94e3cf8df6 SHA512 bf2879ef4ca972720b05abb1a3b14abe49b377b4a4ca8af65b810b411b04febfb974208b1106c39bbeeb60832bd4352610df73b3ee9c68904217018c9403e2fd
 EBUILD rosmsg-9999.ebuild 598 BLAKE2B 8618b8067bcb689d8b6fb14cbc7c5a427c1b3d9f9f2eb8bec937d49ee08728e1e3b068340422079f697a809651cc0cc52f40a97333b4912863ac1d94e3cf8df6 SHA512 bf2879ef4ca972720b05abb1a3b14abe49b377b4a4ca8af65b810b411b04febfb974208b1106c39bbeeb60832bd4352610df73b3ee9c68904217018c9403e2fd
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/rosmsg-1.15.4.ebuild b/dev-ros/rosmsg/rosmsg-1.15.4.ebuild
new file mode 100644
index 000000000000..941834eadacc
--- /dev/null
+++ b/dev-ros/rosmsg/rosmsg-1.15.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tools for displaying information about message and services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest
index 2b8c20ae7a8f..5e061965ca39 100644
--- a/dev-ros/rosnode/Manifest
+++ b/dev-ros/rosnode/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD rosnode-1.13.0.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
 EBUILD rosnode-1.13.1.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
 EBUILD rosnode-1.13.2.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
@@ -14,5 +15,6 @@ EBUILD rosnode-1.13.5.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097
 EBUILD rosnode-1.13.6.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
 EBUILD rosnode-1.14.2.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
 EBUILD rosnode-1.14.3.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
+EBUILD rosnode-1.15.4.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
 EBUILD rosnode-9999.ebuild 550 BLAKE2B cd51751dfde3afa2ccab4f9b9ee9a172f376097d137e627a70f1a3ef3f548eef9164bf9e6c86a954fb7e02254d8765105223fbaf32e2ac27daa544d55f490e24 SHA512 9d1b8bb261699011692e9d13fe50e640c105328d196763462314293d32d905aa3a5238897358a269d427bcfbffc25d1e9ad23fffa9a28f6d0d8d27a9d75ce0fa
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosnode/rosnode-1.15.4.ebuild b/dev-ros/rosnode/rosnode-1.15.4.ebuild
new file mode 100644
index 000000000000..032e59ae3c1e
--- /dev/null
+++ b/dev-ros/rosnode/rosnode-1.15.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/genmsg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rosout/Manifest b/dev-ros/rosout/Manifest
index de1359dbbf81..720f18934063 100644
--- a/dev-ros/rosout/Manifest
+++ b/dev-ros/rosout/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD rosout-1.13.0.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
 EBUILD rosout-1.13.1.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
 EBUILD rosout-1.13.2.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04ab746cb4a9ff6c3d39d92d75671d45738425a60b6f873a4ad6226e77da9826390656ef269a555bc75c94ccc80 SHA512 dc7d5b16332cabd9491c611e323b61a1fab16b320983f5b9e8aec1deee4bdd2ad3dc16738872b3ab5b04ea531ef003575a2a70dda461a23ea684598d9aba7ae0
@@ -14,5 +15,6 @@ EBUILD rosout-1.13.5.ebuild 447 BLAKE2B 74efd1ae4b9f5fc20763837c563bd52318c1c04a
 EBUILD rosout-1.13.6.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
 EBUILD rosout-1.14.2.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
 EBUILD rosout-1.14.3.ebuild 447 BLAKE2B 81c9dd524245527cee90454c213d934a2a45b9da4ad4f99951b2ffa1e378ba29c1fd95cabb9e1b6ee06fe40bc92cc6a9b80b29a657364c6ad46ceb00d69b8117 SHA512 93c1d6a9774efc847bd8263218db6e932b9afcfb0f34f5836cb54fb0374777606917462fa198ba025a47268238ed95408a4e08233b602d3f21d4169b7a7cd56f
+EBUILD rosout-1.15.4.ebuild 444 BLAKE2B eef3bc8ba0a343f04a15b9c406cf75e49da247ffa471e43e84ebc82735039f6c8e9f37154c024c637d14404cabcbaf0bfb00e02384c92141da9ce83794917526 SHA512 d70e2077c1f64dc89dd751fc7c5c23d04069b77d06a91a64812afd8a0c7be5fb901d075fbb109246ad92a28de0492ddec054259b2a8fb10777ad5b6f3271cfa6
 EBUILD rosout-9999.ebuild 447 BLAKE2B adabe1d2c1ee22ac5c5a0a779b6aaf8727ef695af867b2c8b0c91d9d68f4fcefe12641d6952981925090335b78df5c35fc8f91d022e6e6abaaacea5539a59f6a SHA512 803a69ff8f9f0ee9dfd2c1d071307f185fead002952113c31c216583f3d77688bf86205e76d79326c72d2472e533d685304247178debda9607fa2d3547433a6b
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosout/rosout-1.15.4.ebuild b/dev-ros/rosout/rosout-1.15.4.ebuild
new file mode 100644
index 000000000000..0315427da820
--- /dev/null
+++ b/dev-ros/rosout/rosout-1.15.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest
index 37f4282da94d..a2105d3d7329 100644
--- a/dev-ros/rosparam/Manifest
+++ b/dev-ros/rosparam/Manifest
@@ -1,6 +1,8 @@
 AUX yaml.patch 895 BLAKE2B 983493cadf83e5eee7646769ddc8560bbcff3756ebdb77f4365e0a3e10d97b104c4a6ec3ceb0d7e3504502c250cc21ee07b3f5582e3521a5eafe7f5925c622a1 SHA512 92a6ba5660b2cc0a490477d4e4fd39ebbd95912804d5c32c76eec5dc4fc5a67e043dc9cce2ee13d44c623b7a7b710d045fabd68ff3968d2e5ea555d97eb219f2
 AUX yaml2.patch 3279 BLAKE2B 8ca2d9dcd99eeefe7ca2c5039a894bfcda02586995a2982c8f6ea6ac61c19c16325e53bd0733b1c3272160f3dd572ed8aa5c754ad7d182adfc8e85f7b39e0c99 SHA512 23856b931f203fc3c0adfddbcc3c94ea1b827eb2a1f8550d130ac25abdb09a2167da5f4ae9aaf9d869326a80f1964e0f5a00e68895133fb101e4accdf6f5a4c4
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD rosparam-1.14.3-r1.ebuild 562 BLAKE2B 77a1ff5ef7d1035009421bd5582e5bea52ea11e5fdbb45349ef37a4c46449aac66333e16b89158e367ee2e379cd94c3a8dd11f23339a498c2d10ec8cd3b6cebf SHA512 d3056a70cbf9903d22f9d5d76b243d6f98aa50563a9be7248972dbd1cbca4570e922a304af8555be8c47254732f2a2aa7973c5fffa27b5a5a4118fddb721325a
+EBUILD rosparam-1.15.4.ebuild 499 BLAKE2B 44b8e57ab8d44f3f014c3a04520698fd27495d948c7423720a9d3b4f92f227bc782319d90f20a87b3389381127f6f405630c6138e62e5c0e8745ce3e9072ebaf SHA512 902d85db77f75bc112fb01ff608994c4c98fbd6b862a0f195a88956a0319752cacbf0ec314a41af8f2f5e9ec9b2da842a674154db60012c624d8dc91b3428546
 EBUILD rosparam-9999.ebuild 499 BLAKE2B 44b8e57ab8d44f3f014c3a04520698fd27495d948c7423720a9d3b4f92f227bc782319d90f20a87b3389381127f6f405630c6138e62e5c0e8745ce3e9072ebaf SHA512 902d85db77f75bc112fb01ff608994c4c98fbd6b862a0f195a88956a0319752cacbf0ec314a41af8f2f5e9ec9b2da842a674154db60012c624d8dc91b3428546
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosparam/rosparam-1.15.4.ebuild b/dev-ros/rosparam/rosparam-1.15.4.ebuild
new file mode 100644
index 000000000000..07a0e27680c2
--- /dev/null
+++ b/dev-ros/rosparam/rosparam-1.15.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest
index 2089ad51a282..f2523aa6960e 100644
--- a/dev-ros/rospy/Manifest
+++ b/dev-ros/rospy/Manifest
@@ -1,5 +1,7 @@
 AUX yaml.patch 2320 BLAKE2B 2b59ccbd08c333df5b6ec603136ac94202da82eec17f13b4b84c1df66636d2fadf22eaacb5d24e7d00543358eb1f539ffa7c09498ed0afeda5ae5e382b17660f SHA512 de3f2c418f5d84f99af771634cca03e5982ca0a828f404fdfe62de2e8fac9cf4dcaf681e1892f37908568fd5b70f527c0f4f860e201ba330dda65b1e7098de30
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD rospy-1.14.3-r1.ebuild 757 BLAKE2B e6a4dddf0d7316388b6c5de241c94be85680c212508f0301b13d140e51c007ace25e94f429d7c037e836f6da98986386b1b945c663ba18cda1cb4bd9e1bccea6 SHA512 00efa18957a3fb4f556c41a998e060888e1d5cb299e3a197c6a2a669c4996892e18ab9c92a4b93623d0b30ab8525108c1b8855b56bc797bba5e00f5f45d2e1a3
+EBUILD rospy-1.15.4.ebuild 720 BLAKE2B 718df093cd4d0c42aff4a245a6cc6f070aba7100e45f978fd3257b711b81e857547ee05665c48f7c9f36a813c6eb12fa26d594a9776ed3ddbdd7cfc7bfd3b342 SHA512 83e83ccd7a5a61df417dbc81f0a8691fc5265f76cb301329cad5d4fd35bc428cf7500479934081d69fed3e285ff28945c5f69943c2e7585e0d3ec343d58b9a42
 EBUILD rospy-9999.ebuild 720 BLAKE2B 718df093cd4d0c42aff4a245a6cc6f070aba7100e45f978fd3257b711b81e857547ee05665c48f7c9f36a813c6eb12fa26d594a9776ed3ddbdd7cfc7bfd3b342 SHA512 83e83ccd7a5a61df417dbc81f0a8691fc5265f76cb301329cad5d4fd35bc428cf7500479934081d69fed3e285ff28945c5f69943c2e7585e0d3ec343d58b9a42
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rospy/rospy-1.15.4.ebuild b/dev-ros/rospy/rospy-1.15.4.ebuild
new file mode 100644
index 000000000000..ed13430b1e69
--- /dev/null
+++ b/dev-ros/rospy/rospy-1.15.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+ROS_SUBDIR=clients/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Python client library for ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-ros/roscpp[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	ros-catkin_src_install
+	# Other tests need these nodes
+	exeinto /usr/share/${PN}
+	doexe test_nodes/*
+}
diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest
index 954828f9c99c..b130b6f43f44 100644
--- a/dev-ros/rosservice/Manifest
+++ b/dev-ros/rosservice/Manifest
@@ -1,5 +1,7 @@
 AUX yaml.patch 2657 BLAKE2B 16f9cc5cafd8306d06f64370bf334f68038e3b2e7feb6d48110cdddb12e00fb27b8f36492bd6ddca8eb0902da727d371266b3cd65440c82c3b9785c9823e1ad3 SHA512 3b71ccb1b3579bb16c86a0dbbc0708e7417461a91b31d1ab166ed38a3e75f117df355d91d9c1644d9c5da19c29b61ea208e6eed31ae6dfdd74bc6f057b0c1908
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD rosservice-1.14.3-r1.ebuild 563 BLAKE2B c8aeda6239e07fa3b92638fe357f7d743b3cd68215ad21296077d904e88dec993059379c69afe878c3a7e3dd9e19729ff577fe93d0117388d1ebc6c0667d5b12 SHA512 873d3e1062c0d25a6931a090ad87f3c64882666b296a39e6700973d558e7949bf4199e35b75df7909f86ebc1bb38cd147bcd211c748e3ace4caad7e13c10a4e6
+EBUILD rosservice-1.15.4.ebuild 526 BLAKE2B 65c0eee5316816509b9d0b5819d52264d8c3242d133b58b4bdd9ccd33b44e2578105e011346398d21673012b1aff05f19ca0f3108f76aa482eed50971d5c5c05 SHA512 d2ec7a759dbeda80e1fe3abae6c8f17cfb7f9f86c63540d449678264d12c30edfb367faf35ff3b2ad5e444c4bff074855f3501e1da7961e077f133b138e3afde
 EBUILD rosservice-9999.ebuild 526 BLAKE2B 65c0eee5316816509b9d0b5819d52264d8c3242d133b58b4bdd9ccd33b44e2578105e011346398d21673012b1aff05f19ca0f3108f76aa482eed50971d5c5c05 SHA512 d2ec7a759dbeda80e1fe3abae6c8f17cfb7f9f86c63540d449678264d12c30edfb367faf35ff3b2ad5e444c4bff074855f3501e1da7961e077f133b138e3afde
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosservice/rosservice-1.15.4.ebuild b/dev-ros/rosservice/rosservice-1.15.4.ebuild
new file mode 100644
index 000000000000..dec58f5c3cba
--- /dev/null
+++ b/dev-ros/rosservice/rosservice-1.15.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for listing and querying ROS Services"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rostest/Manifest b/dev-ros/rostest/Manifest
index afac06ad9a1b..d16d3b165781 100644
--- a/dev-ros/rostest/Manifest
+++ b/dev-ros/rostest/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD rostest-1.13.0.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
 EBUILD rostest-1.13.1.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
 EBUILD rostest-1.13.2.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
@@ -14,5 +15,6 @@ EBUILD rostest-1.13.5.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1
 EBUILD rostest-1.13.6.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
 EBUILD rostest-1.14.2.ebuild 712 BLAKE2B 87048c689e9b02ac29ebfaacb9cddc69e5902e1d2ca6835d30a4627fe1b7e03e854b50fd4412069cb5a19cfcc81dbf2714f31b6cd031553b0cb58d46d884c5c8 SHA512 f0bace9f30241d61cafcdca135bbd9cdebbd77af303dcf0483300ece4fff137a4282fab202917a81aeba74a15eee33240ae7acc7d7cfc50881dda8b84cd6d859
 EBUILD rostest-1.14.3.ebuild 731 BLAKE2B c4be2ea8b698906763e8a70df769b1f62b6ee019dd145e152bdcd9af8b519a0294db9763250367c7cd13409dd8181722e3088646445968cd8815df30e6cffc3d SHA512 cfffbdb069d719009e5204c74bb37b34a0c4f3d774d6671252951044128c3d8969ab6034cdd528784c6c5b6a6580cb1c7b4d6f5bc2ff977203f7f34827cc98ef
+EBUILD rostest-1.15.4.ebuild 731 BLAKE2B c4be2ea8b698906763e8a70df769b1f62b6ee019dd145e152bdcd9af8b519a0294db9763250367c7cd13409dd8181722e3088646445968cd8815df30e6cffc3d SHA512 cfffbdb069d719009e5204c74bb37b34a0c4f3d774d6671252951044128c3d8969ab6034cdd528784c6c5b6a6580cb1c7b4d6f5bc2ff977203f7f34827cc98ef
 EBUILD rostest-9999.ebuild 731 BLAKE2B c4be2ea8b698906763e8a70df769b1f62b6ee019dd145e152bdcd9af8b519a0294db9763250367c7cd13409dd8181722e3088646445968cd8815df30e6cffc3d SHA512 cfffbdb069d719009e5204c74bb37b34a0c4f3d774d6671252951044128c3d8969ab6034cdd528784c6c5b6a6580cb1c7b4d6f5bc2ff977203f7f34827cc98ef
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostest/rostest-1.15.4.ebuild b/dev-ros/rostest/rostest-1.15.4.ebuild
new file mode 100644
index 000000000000..c8b1067e86a3
--- /dev/null
+++ b/dev-ros/rostest/rostest-1.15.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
+
+inherit ros-catkin
+
+DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
+"
+DEPEND="${RDEPEND}"
+RDEPEND="${RDEPEND}
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-ros/roslaunch[${PYTHON_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_USEDEP}]"
+DEPEND="${DEPEND}
+	test? (
+		${RDEPEND}
+		dev-cpp/gtest
+		dev-ros/rostopic
+	)"
diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest
index 07e079636c39..b344d8045857 100644
--- a/dev-ros/rostopic/Manifest
+++ b/dev-ros/rostopic/Manifest
@@ -1,6 +1,8 @@
 AUX py3.patch 4958 BLAKE2B c441bee4b3ae1095b32aecb9618120d41d2cda53062ba4ce7c85f539840be27ed035a4f3da87f643217a650c1766b6b9c94f48d44116a753ddc6ab44a5a0fd43 SHA512 b576a41c69680df1a388b30b3588ef0a94609b6338820a08deaa2ed3f29b05816bbb68db256cb843ae394f12723674a485e1b933caa2a19729a3c610de5c8345
 AUX yaml.patch 2816 BLAKE2B ecd4c4047f009dcc9c2417efa8a2233220dc002ede217beee75f88af111b1bab26423aba8796027f60e73887c0926e5099fa9db114b8a7f5144e25a5acf04789 SHA512 f3d197fec12c9df46eb488398c3149c36f0b7581a2a2c7ae7052bc0c37ed27302405b1aba81a140463ffe52fd8a9f65789371bbb697e0d09867b0ca02ce35340
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD rostopic-1.14.3-r1.ebuild 614 BLAKE2B 53a0cbbe88bf306c7c348c50a16d61c612002c33174c9c1f84fb1d8b066d9bff950a7813d22c8b4cf5261d4dbedce2e60aec443798fccf9755173c9a61b1acc7 SHA512 7367cd95c60c2c8a6c0a97a0c4b31bf1acc357e0036f7a63cb714d8dd6e15140fd89a7ad777cb7aa2e5c93ab03854b2eabd4ff4ecae16708dc0db182f034e1d6
+EBUILD rostopic-1.15.4.ebuild 553 BLAKE2B 0b9508bdf9327727eba2d3e44eb3b14d06d610d915f2199c524cb1e7b40497e0844ce8bfad318bb9052f46c19662dd8db8d67739450a49ce3b5ffac5bb6e4208 SHA512 793194ac2652d09b512cd95cbc2a4531418b11f1d9b119b8bf164af27b90db18938b8cc64a41944afe39fc115baf85c2fb161e60e458605498d0c23ca15c62b3
 EBUILD rostopic-9999.ebuild 553 BLAKE2B 0b9508bdf9327727eba2d3e44eb3b14d06d610d915f2199c524cb1e7b40497e0844ce8bfad318bb9052f46c19662dd8db8d67739450a49ce3b5ffac5bb6e4208 SHA512 793194ac2652d09b512cd95cbc2a4531418b11f1d9b119b8bf164af27b90db18938b8cc64a41944afe39fc115baf85c2fb161e60e458605498d0c23ca15c62b3
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rostopic/rostopic-1.15.4.ebuild b/dev-ros/rostopic/rostopic-1.15.4.ebuild
new file mode 100644
index 000000000000..647d292a6d3f
--- /dev/null
+++ b/dev-ros/rostopic/rostopic-1.15.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Command-line tool for displaying debug information about ROS Topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest
index 9f94cb8b5ed5..c77003c89686 100644
--- a/dev-ros/roswtf/Manifest
+++ b/dev-ros/roswtf/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD roswtf-1.13.0.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
 EBUILD roswtf-1.13.1.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
 EBUILD roswtf-1.13.2.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5a808fb6a9163974ea450ce5e997a47f93bd50ad3b7826455dc54e921e496ba81b1a0ace27fbfb6a019fa4275 SHA512 ab22eb56031f29beecb6bf1218c37e384323126dfbfc644c5b3c979b1ec653c123c675d24ed76c4e8410e1f34dcfb1f04983b2af066f31cca947884dcadf92a4
@@ -14,5 +15,6 @@ EBUILD roswtf-1.13.5.ebuild 662 BLAKE2B c35b427e2c6eb87c404438dac97748ede0880fb5
 EBUILD roswtf-1.13.6.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
 EBUILD roswtf-1.14.2.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
 EBUILD roswtf-1.14.3.ebuild 662 BLAKE2B 7ca8fccb945abfa0b4c4c2048e1582063be1dd67276224522a9e568bb3947903a190a75b6f09306f1c273af70cec7a1d4b7979663244f746a14191d644034ae5 SHA512 086d738888864950509088d82d2d669397805523501addd75fb067220ee2b6cab9e515e469159fe5e0ed8a479780d6737c954d90d218401aacebbff868c8d43a
+EBUILD roswtf-1.15.4.ebuild 659 BLAKE2B b1818147b4f5824cbc501af4fa3ef2f6a5ac631bad99074ac3181b448c028319136cba5a9a45fc191aedeae600cbbcc7fd42408cd4168081602177d018e6cfa8 SHA512 123f30422b3413eceb996f6ee2ba4ceb6803752212cc0119b921b31751a31741da11c634e3cdcd29179f8ec88639942988aec9c2c28f8ad87f9b1469636e8691
 EBUILD roswtf-9999.ebuild 662 BLAKE2B f6ccaffa46e840f520e1bd63befdbab04d52c240055e63e28be2793904cff438ad64082558ca361855afcd5b2ecca94a4ef610a2406bb8ba42b5c8ddfdc72f09 SHA512 b3afa27d6bc9e241f10f67a9ae876123db28a5960a4d069b95f790901565285814b16604c98777339ec805d1f7f0fdde98eabf47f394aabad3a6d69eaacd29b5
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roswtf/roswtf-1.15.4.ebuild b/dev-ros/roswtf/roswtf-1.15.4.ebuild
new file mode 100644
index 000000000000..ceae0cb87c1d
--- /dev/null
+++ b/dev-ros/roswtf/roswtf-1.15.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Tool for diagnosing issues with a running ROS system"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-util/rosdep[${PYTHON_USEDEP}]
+		dev-util/rosinstall[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest
index 20d14f515573..64167379a716 100644
--- a/dev-ros/test_rosbag/Manifest
+++ b/dev-ros/test_rosbag/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD test_rosbag-1.13.0.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
 EBUILD test_rosbag-1.13.1.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
 EBUILD test_rosbag-1.13.2.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c6161f0e730c427ace53db21c29c76d0a74617fbd7c6d697af4ebbd368892ad9139a01a8214454f6f53b90ded1d133 SHA512 82494e901cd62dd39c4d6a7c03af9cc7b1cb9644c57ddc140c5766ebf6c5587e9520e005c2af5c833c0b4a06d0a170ede29c1aa10d7e49070a91572ef5aeded0
@@ -14,5 +15,6 @@ EBUILD test_rosbag-1.13.5.ebuild 840 BLAKE2B 2b43d4f56719919d0635b570fe6386d280c
 EBUILD test_rosbag-1.13.6.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
 EBUILD test_rosbag-1.14.2.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
 EBUILD test_rosbag-1.14.3.ebuild 840 BLAKE2B 9f1886a266e904b42f948de75eb4befb12b589248050ae75bcda3ff682d8248ded8e601e6113af84f30e42ab5b024b1a90b96af0f18d46f4dcf822a03561766c SHA512 c3a56c11dc788d45ed76b1e151312c3db2832c391581a18a6ed7e67a72702fdb8454255b7c4be2c85a0a67bb8ad37fd0155ffcec56d61e746b5347e7f05e809f
+EBUILD test_rosbag-1.15.4.ebuild 837 BLAKE2B b90afd9f723ff6e4d1be048aac2cdedb5cb32d24b060d29085dea31dda9b0d892d7a5b009fac78f56a89b5c426716fe890158841f549cbef1de85380583b7208 SHA512 8d006d83727ffc89945962a2b1e549028417a3caa20ab47b6e530d3b9adb188c3814986fd72b333d20fc0ee819b7e0e91f69e71a814f6f1c24315eae5a7bb101
 EBUILD test_rosbag-9999.ebuild 840 BLAKE2B 4ea77fe53b2287de2f68558340968b0833871953aea2008574e1f85395ce8c35d7169c612fff9f66579119aa1f80f42d5a10806b3321fd0edd9fff7795b4f5f8 SHA512 f094d1f6268deb2b18ca04e0d1098eccb889e9e40337f947392a36c603b2ffd111cb0968187e2ceb8aa77f7dec772c00f0d5d1660ff3e1b85476c5939a33e6ba
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag/test_rosbag-1.15.4.ebuild b/dev-ros/test_rosbag/test_rosbag-1.15.4.ebuild
new file mode 100644
index 000000000000..9d9775c4523e
--- /dev/null
+++ b/dev-ros/test_rosbag/test_rosbag-1.15.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/message_generation
+	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/topic_tools[${PYTHON_USEDEP}]
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/boost[threads]
+		app-arch/bzip2
+		dev-ros/rosout
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+	)
+"
diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest
index a4a005b6cf58..2969f93bc036 100644
--- a/dev-ros/test_rosbag_storage/Manifest
+++ b/dev-ros/test_rosbag_storage/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD test_rosbag_storage-1.13.0.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
 EBUILD test_rosbag_storage-1.13.1.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
 EBUILD test_rosbag_storage-1.13.2.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04fb461694b4702dea92ba7d89a90d5fdb5949b1f856d07a38497278e4b67c8a01e0669bed1c484a0874fcd87f277ba10171742c SHA512 ec8c967d0e3161807a9795ab7102f8134ebbae5527ac6ca63d52fd135512efd7623a3fad334addbeb06163e0fecdd57102b7f68bc3254535bbfc1db2d193f93c
@@ -14,5 +15,6 @@ EBUILD test_rosbag_storage-1.13.5.ebuild 452 BLAKE2B e8ee58dbe79847949aa2970e04f
 EBUILD test_rosbag_storage-1.13.6.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
 EBUILD test_rosbag_storage-1.14.2.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
 EBUILD test_rosbag_storage-1.14.3.ebuild 452 BLAKE2B 2769e5d28c34b7102298c3d0f98d660baa870c59a7299be038029e6ce3636489b3d02a16d954dd9779fb635917ad134408ef5205cc62c8ea6dd43b9e98f408a3 SHA512 deff131d08cdead605916e1af61fd5aabdbe2f70479075272a9ec78202686638377d72c27fbbe2561d18452b950682ae7a2e0042bb4d6766c58715ce047e9830
+EBUILD test_rosbag_storage-1.15.4.ebuild 449 BLAKE2B 4b94b391be588c89ac4f24e0939631d7ccad33effd2d60db1718731c6fe6f21c66b0437092700fd8db0a3a64c8c810c81e03e23579894530e5d66af65e0256b4 SHA512 e0a5f4d95e37c39889d853d663304c579f2f57503a6ff18dc1d2fce483b14246af3938b2fae68ebcd73260f0c62ac0444fb5a6a32c1bb0f358abfbb169a2f88e
 EBUILD test_rosbag_storage-9999.ebuild 452 BLAKE2B 77d6739d14ac2a65205f3fb708f2876a5ac77cb1d5dd398d77418ad90295a431c0184711d6bba55780c8249690fd870170b2bf492134c88879ab8b71ce6ef643 SHA512 5da1d0e29a39475966df57aa6f820e053b3cd4873d9ce88803956c52fd3a3a14773b618c57a5621831cc5b505380658c4881a23fe16a656f0f3ba1215b9a07e8
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.4.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.4.ebuild
new file mode 100644
index 000000000000..8f9c485914bb
--- /dev/null
+++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.15.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosbag_storage"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rosbag_storage
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=
+	test? ( dev-cpp/gtest )"
diff --git a/dev-ros/test_roscpp/Manifest b/dev-ros/test_roscpp/Manifest
index 4ed5d0988cd2..8610b8f14a07 100644
--- a/dev-ros/test_roscpp/Manifest
+++ b/dev-ros/test_roscpp/Manifest
@@ -1,5 +1,7 @@
 AUX boost.patch 1046 BLAKE2B f74c7018f277fa2cb525f68602599127eba9fa43cd29b706960de70c3757f9e4e22a3491f3f2d549a0c20abcdf70051449765bc0bad24bfb018a96b5f30022be SHA512 9391547e16815bd065bb467f13468c020006aaac0e49b6b86505ea3aefc110a2a342b47cf3c235fd5522d9881a8c9c85e142c15f00e4b1a627c6be9516738d37
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD test_roscpp-1.14.3-r1.ebuild 721 BLAKE2B 2cfdd691aedc99cda218504cacc6eeffcc96c75eed937fca3d5c2c04235363cc7a876ac87f6af5f1c318616aecb6c4838ea9d970bb2ce5991eb488175cd334bc SHA512 cf2c48391e89b87a39e3d368907a711a7ed7b470ce6ddcb676bd83dfe21df9c66d060c238307b333a38f3221ddc1a1e0d0cbb3614f7609120a60b4b0e8706622
+EBUILD test_roscpp-1.15.4.ebuild 683 BLAKE2B 1b890234f56dcc228bb2d1846de3c9a52bd4083634fafbf433daabcef6a388c5a6f59df7a9c820b4edf8d79f900b3f51b06514315cb9e62c0e271cf68e66a32b SHA512 c0dd1645817bfadae0ba1865cc219802378fbaaf0782d03784f3d14857ebade42c2380578bba87814e31b38ea0c10706e35d7712b399c2b0515eb5a150328b5b
 EBUILD test_roscpp-9999.ebuild 686 BLAKE2B 913ebd162894a4839ac240006a07f9007384d8066f71fcbef889b020b1283e5d528edc297e9f81497a984e152b6d0f1d91149bbaf0cdb437b2a6074ea51b9326 SHA512 88523b4bd636f6c066a7132bb0509c92cdfbfdbf24db72adef2c4461358c31c40f5c4f7db655aecbc41766429b50f73f1c7e247b7a956fefe2184e9079cd8df8
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild b/dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild
new file mode 100644
index 000000000000..e1720ee72889
--- /dev/null
+++ b/dev-ros/test_roscpp/test_roscpp-1.15.4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roscpp"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/roscpp
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/boost:=[threads]
+	test? (
+		dev-cpp/gtest
+	)
+"
+REQUIRED_USE="test? ( ros_messages_cxx )"
diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest
index e708469342f2..9e448054f960 100644
--- a/dev-ros/test_rosgraph/Manifest
+++ b/dev-ros/test_rosgraph/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD test_rosgraph-1.13.0.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
 EBUILD test_rosgraph-1.13.1.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
 EBUILD test_rosgraph-1.13.2.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99d2b64418b1f18f6e207530d54dc2dff6427696a433b4d7c05dab3cce3fd548ad0b5b42dd8177a918061fa23588005a8 SHA512 dd84d83f96cac17908c6394aba5c0bdd6a00342ed0698ef0fd3015cd588af8c413eee3a54bbf6d185731c9b4b1067f8e044e03b5122b37842845f6b42ec09ac2
@@ -14,5 +15,6 @@ EBUILD test_rosgraph-1.13.5.ebuild 438 BLAKE2B 285149df50559eb5a46946bb972d8df99
 EBUILD test_rosgraph-1.13.6.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
 EBUILD test_rosgraph-1.14.2.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
 EBUILD test_rosgraph-1.14.3.ebuild 438 BLAKE2B f404da5764238b04f9eb7f055bc3726924311a8f7f77482e8c2ca65f6dab05d669f7abed15204263bc044e7841d6adbff29e5854d23d4ffab1102fac32a39788 SHA512 b4183c921be3b4856544b67a535721c0badd209b8e7c3f570ac5fb4684e1dcfd5dcfaa4ea08ab23b13b64a86d17fd01bf8e45b1e866d16fc5dd71109e723d274
+EBUILD test_rosgraph-1.15.4.ebuild 435 BLAKE2B a4e168d4de8994d37ce04b1835d22097a9d734aaff1ca12f9763eb62fe337ecf676b350ea5ccc4a388bcb59c40b04be37758cf7407648549887d0a79d708a48a SHA512 4a8b4124d0bf813e4ff89083806efab24654bee7a69ce7cbac71eba94ac2c1b07dbfb6f48a4526d8b665f8d7af660cb43d7c230e9ea353d1c974e911b8158806
 EBUILD test_rosgraph-9999.ebuild 438 BLAKE2B 7f9b25d24b5cab1d71ca26dc80adc38743677d4794e97dc06d8f9c8f40e0cbe42824928f279078bd7c8ea0fac89d17a331f22ced085397a58232be41de424422 SHA512 6a7779f57141d8c72a97e36d73411f5241b3839ff8d1a3d102314fee9192ff6ff637ae86918723a4fa1b8e5dc2523c6a8907ec655f3ec6f5e3abb25533f3a780
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.15.4.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.15.4.ebuild
new file mode 100644
index 000000000000..065166144a2e
--- /dev/null
+++ b/dev-ros/test_rosgraph/test_rosgraph-1.15.4.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosgraph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] )
+"
diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest
index 33946be60e2b..1382823011e9 100644
--- a/dev-ros/test_roslaunch/Manifest
+++ b/dev-ros/test_roslaunch/Manifest
@@ -6,6 +6,7 @@ DIST ros_comm-1.13.5.tar.gz 1027857 BLAKE2B ed2611179bc7f84bf0b9cde1336474a3bc4c
 DIST ros_comm-1.13.6.tar.gz 1047870 BLAKE2B 874e31faa1a6a77292dab4b7fa64ed13a1f1f63f76512ea351e53bd14ce87662cea5c648e48c3c16668104129cc5eb172bc8f381516bdba676c7212f1acbaaf9 SHA512 382e81847141ab95462fc84a8215b945af995d29f9c0d507665e22faaf79aee9789950546ca7737bd40059f3ed1ecd284ff11bd3e6f1732f3c47a433c5d25155
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD test_roslaunch-1.13.0.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
 EBUILD test_roslaunch-1.13.1.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
 EBUILD test_roslaunch-1.13.2.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96f3dffd862f5b639368246d50d305197e94920b54ce5ab47594afd17b888eee289bfd9413604c35514e1888236be6b252 SHA512 dd7d1fc59699d0c338a59a382ae3c73d749fd04512c514373ec6284a73b59a14ce899c70d93a6595d1a154a20c2d711fc66ea2baae790a533983c10d35e0f703
@@ -14,5 +15,6 @@ EBUILD test_roslaunch-1.13.5.ebuild 483 BLAKE2B cc095f04bcea45e33b5fd6a439d25d96
 EBUILD test_roslaunch-1.13.6.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
 EBUILD test_roslaunch-1.14.2.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
 EBUILD test_roslaunch-1.14.3.ebuild 483 BLAKE2B 5823a43960ad28a1efb407a8e13bc4482329d2f9d893d2110a286d0dbfa76ea9c42ee3aa483780c2c586df817b19c8b08084ff603384e52d542c6a9d3f409117 SHA512 ff69459d80e8cebe100b59e89c29e09242762d67c3cfe5c115bb0a764f1a65f7c7a2cef29c5d0e7fedf0157b89a40e6173955878f1d2e2cd2bdd3bd97dfbf1ba
+EBUILD test_roslaunch-1.15.4.ebuild 480 BLAKE2B 07c6a5c1689ac56bb03e2326db4191cc308a632564bc0692cc3f5f8ac2ccff1f82aa5a2751a2a46d0f621af683eff60bf15f02cb08817cc0fdf532c459b7bee0 SHA512 a42224296a3a238a47be9a58184d80be676f80f35c2548952a696f107dd9de4154158318ded251cbc32f1de794869dca110cfbc0b33780f347df7120d0e69ae3
 EBUILD test_roslaunch-9999.ebuild 483 BLAKE2B 30e75a9862ea977d4aaf8f4429e35ec20ecc5999219c3d783b27f96de7ccaa18af6bbcf664611eda1b56933e3247b0e37dff999bb8532d8cc4f9586ba60afb72 SHA512 4d6f106652d163dcade1a720e50fe7ef7d3f219f9196128fc044b19fc98c8a4d183c5933d9aa8a152959f331f0b17fd1f8ff67c34f8c875b532d25af5a39e180
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.15.4.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.15.4.ebuild
new file mode 100644
index 000000000000..719c7c480b7b
--- /dev/null
+++ b/dev-ros/test_roslaunch/test_roslaunch-1.15.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslaunch"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	test? (
+		dev-ros/roslaunch[${PYTHON_USEDEP}]
+		dev-python/rospkg[${PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest
index 0a968be1ad60..66666f8e948f 100644
--- a/dev-ros/test_roslib_comm/Manifest
+++ b/dev-ros/test_roslib_comm/Manifest
@@ -1,5 +1,7 @@
 AUX yaml.patch 2213 BLAKE2B 28dc462a0861c30a9916dd3a42a44a78b411fdb81f2ae8e646f0fb6fe8f1653e5ffcb8a23d6e96bebcebb9073413496338d18cdfd94a25fe54564702e0f86687 SHA512 0cc5bc3627d012b82b5a07a1c24bc997c7c9a9a388cec32732e6b33f2d4e619eeb2f9c404f050ff129592235a73ffe27c2b63b1985108150a2033d504d37b246
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD test_roslib_comm-1.14.3-r1.ebuild 590 BLAKE2B b7451505b22995f0bc79b667e066fadf17ce14e1abac26bf65f72f5cf0af30726a4090f2417ea1f9fb1c48114b6c916333bdbbc688b4949c4ff77dea17e3d305 SHA512 56b579a588a93dcd88cbad7235a281c98219a291bf8b0de1313a97a2ae82342328ba186a12475f48cccfde8232191bd2efb7dc1433b71cc3c9ca428edf89694a
+EBUILD test_roslib_comm-1.15.4.ebuild 553 BLAKE2B c7c70b96915ca3aa2ee80b41dc992c7a099da29dbc8989511c99f7e1ea9f68d9c3505f5de8d1a3041a6d880025a5ebd425dd8370dc2ff8accfb979183ab029ef SHA512 edd4175c5b2594ec0da4fc551e4a86a946b07a668554d35c77a2a205c679729cd3ffac92a1a61d819112bc56a86b4a20e59b73b12a30bfb8342dae42ebfe4361
 EBUILD test_roslib_comm-9999.ebuild 556 BLAKE2B 500e11a34be014312a1e6432df777843bafb425e09d976cf3c7e4aa86eb8a8c1f085f76d48841aad243b97f1fdf87b79fbdd84b2294089bb6520701923c92939 SHA512 34db49c0d2de9f563da46e1ec3b87a0b4adfe9b99e6b6bbfce2b2b176320ce6f27d9f05c8c47346d07088b23d9f7771a56b7f346bbefc340c8ff5d116523def8
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.15.4.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.4.ebuild
new file mode 100644
index 000000000000..ae126d32d92f
--- /dev/null
+++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.15.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for roslib"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster )
+"
diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
index 279a76bddead..884fb3c15fb7 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -2,6 +2,8 @@ AUX empty.patch 389 BLAKE2B 7ff08d2bd3cc7c14a4e93cc2ff4a89029f8e922f545c707d14b6
 AUX py3.patch 2361 BLAKE2B 778987cf4fa20faf2bc883f6715f6c05a0631037bcab799e73e842c18ca1aa2cdbe1ac483d1e160a41eb24c6cac17ae9aff7c14ab86813d348281191948445b2 SHA512 f4f53a5caed1a11c1d0619d2f9a883fc30c35f4f431461074a4e1c79b478be41de7702299fa10ab0c187662aaa1531f184a3748a6944c9eb44130899b0222d6c
 AUX yaml.patch 2233 BLAKE2B 174e7417282c07960ddb76381f79d4cae9ccfd3c9c99add5f0e5dfa610b84fb437b8d6410937bfe048640e082fba23c0544df1dbfd5422b74d9500b5f21468e2 SHA512 ef38c5408dc694bef305746f31b6e0a2b5711968dd5f54a290d5d7eec4c09631fd5773a22443d7c02bc0ef5e275986c7b3755d9acbfa971085e2b67e37f53103
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD test_rosmaster-1.14.3-r2.ebuild 782 BLAKE2B 55c8a2d6a8323107a49e6877989a037a57e9e7807816fdef4d57c0a458909df2fee6d689d27d5fe8ed8142bd4fe4b3732f4019ecc90dfc24950d175d12733649 SHA512 6c280c81ac9c8fe6d362fc34ad9c119adef908be96dbffa0f8fe272f7b344b1aef573a698238b1f3cae01390d98830ed54d44ac1768b8c12f6ce2b213dc2a402
+EBUILD test_rosmaster-1.15.4.ebuild 695 BLAKE2B 0b710c893ec0d6a12650e6f35e53589b855c12bd736c3fc84dc054bce00079baf84b28fc34b823d67b6f59bec368bececf4743dc31cc91d0c3ab249f431a5adb SHA512 3cf4cf844c95f5e275da51f0650763b0cdd2d4c8dcf9e1485a5cf6fb4854703b1a220d2c900f97ae1c5e7068562eca67e6f3f325bb855e632c68be5d664932e8
 EBUILD test_rosmaster-9999.ebuild 698 BLAKE2B d5b4d4a9029b5fb5d967a146d22f056f48bab5c55d71db031322feadd8dbd11cccd46dfb8bba77bf70328e24b329e3bdb7df824c9706f30c5dd7e40f1d5c9eb0 SHA512 99dc926c24a752cedb957d9322d1f9a76ca3eb1855ef485ba81fe12fcca2641ecebc960279dbc04739a14cdb77e807cc012233419d6d7c7466b4778c2f5d9498
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild
new file mode 100644
index 000000000000..ea88573de821
--- /dev/null
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosmaster"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
+"
+
+mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
+
+src_install() {
+	ros-catkin_src_install
+	dodir /usr/share/${PN}
+	cp -a test "${ED}//usr/share/${PN}/" || die
+}
diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest
index c160f3ae5207..80a4a8a83e80 100644
--- a/dev-ros/test_rosparam/Manifest
+++ b/dev-ros/test_rosparam/Manifest
@@ -1,5 +1,7 @@
 AUX yaml.patch 3286 BLAKE2B ff83da906b271b957a63e89b26b7ab8b30abf8464635ac773a23d86a82d304ad09fcb9f78eba4f599655231ba59bb509fa89f146529f927742480eb4b777ca37 SHA512 85c1674cc7de77b08e8f632df97e772a325b5595086153690a289f8c2f33e9392ade4a17ab198969baf21f17f2e0414df4aefc2eb758866fa0da2ffe069f5ed0
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD test_rosparam-1.14.3.ebuild 537 BLAKE2B ee1b480b906b2606b85c128dfe22e364187bb6866606623bb524e82d2be666bb59d5da501493dfe7fd0933a1c2037cc406802bd9fd2d020b2edce336b5a0dcb4 SHA512 7f6700c3584b8500757db238544252360b1426b7a1b863b15f33fde7a50f87e52f3915181df6db8ea80d7e8a353b1003bc0ca29c0689bfdf83ee2460349eb85e
+EBUILD test_rosparam-1.15.4.ebuild 500 BLAKE2B c4e62babd10d7dda9da6769b5094c763759ff9afa3d05b5fc54b26c17bb19feca8d202de279541a38aa7625acff8815c95670ff2912b08f1094d764c6de1a282 SHA512 d5ae65e1cf92443d496a116e2829a4d5fbccc36980c47fad6c6879995714c772567b88f49b5c5a49e778ae3379d06f747621558eae6503ae87232713e5cb0148
 EBUILD test_rosparam-9999.ebuild 503 BLAKE2B e065bfcfa421c3de64ad8840a544eb4f427c3b2753b38b64960b51e4a9f432d7d3a6e8f2f4ef5303e47c0005e533deea5f34cd63369febb1f05ea3ac0bfb460f SHA512 a36d13dae004b782d566d5c7edf5ebe551c6e6a4d5213904824b1ccacfb61b24c437d01765fe96d584ffcc497fee7a3a630c3bbd45d0849fd0b460289ba8a654
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild b/dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild
new file mode 100644
index 000000000000..5193bcbb1300
--- /dev/null
+++ b/dev-ros/test_rosparam/test_rosparam-1.15.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rosparam"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-ros/rosparam[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest
index e2f5304a2be0..bef3d7bf4c91 100644
--- a/dev-ros/test_rospy/Manifest
+++ b/dev-ros/test_rospy/Manifest
@@ -1,6 +1,8 @@
 AUX py3-2.patch 2077 BLAKE2B 76b3289eb5a54e085d8ed2b687b70f53c047625a9b4216f4972f62702604192996b89d0469a5d927515c510f00a032919b40b9cd76db8e9e011c61fc37c50e28 SHA512 8b554bbc2a38e3d64a88e05921a8e0ed8271126e86f85f04bf0903224304a25df07530614435247a861b193c0a02a2fd0280488696f9196e6f3bf88b8e89da9e
 AUX py3.patch 1169 BLAKE2B e73fa2afdde33f8fc921118b4bc1189b5f976a2dcc56f498890e1925c698b975c38dec6c6be24f7269e0dce83d2630eaba89b9aa925c249037720d15928d7a9d SHA512 8b5475d81200b724701e3f7312646105295f99d084e324f8990cc494609166d77b834309e19f36452133379682f33174d923d8fbb05f95a75306147c3bac154d
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD test_rospy-1.14.3-r1.ebuild 902 BLAKE2B cc2d72203d6026d6c2fc9694bbbfe92f8af379ec3e0284b67684d30e432757834869710db15e0f546a8c817ccdd6f1cf6e145e68a4a2700ad694c6ca2a6d53bd SHA512 38ecb314607a3db7c111a889f885238a383208f89a8ee952356f44ece4669540f353e81be2d3c45fb3e5aef0c5b3a20c62f9c2db4316e91352caf601560998cb
+EBUILD test_rospy-1.15.4.ebuild 840 BLAKE2B a2b7bd4ee2342d2c780d470d94291bd7557e5ed974d869cffd65c0b06c3bf8be0dbf0621c5866972893c987acaf8e57da71ec05c7a5cc51e8cec9267a82626f6 SHA512 807a14b5886ae3b3e1e1bb230e47db02f9023ccb4c0f47cc4685a39d8e21576dbc1870fa441a33fbf5f84b82aaa4b77833f3eb1c6f488061dad8915d68b6b36c
 EBUILD test_rospy-9999.ebuild 843 BLAKE2B 95bee07029a08cc289842cab2529c1854f1af6ea706853c51725ae88e6e50cad233090f48dfb4c203747a3e4d1fb7849caaf7daa3865730bc6bcb02e295cb77f SHA512 0351a18324e0c5c13cb36af850383a9c904ac8d5bd8f005dfafa6fa1e84a7a9377aaa8fd760036cc7057ee2d4f210f924fed6e65147da9a6c7676f31c75d54a0
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rospy/test_rospy-1.15.4.ebuild b/dev-ros/test_rospy/test_rospy-1.15.4.ebuild
new file mode 100644
index 000000000000..a60ab86abc52
--- /dev/null
+++ b/dev-ros/test_rospy/test_rospy-1.15.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosunit[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-ros/rosbuild
+		dev-ros/rosgraph[${PYTHON_USEDEP}]
+		dev-ros/rospy[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest
index 0b574b9acc4e..6c1171139730 100644
--- a/dev-ros/test_rosservice/Manifest
+++ b/dev-ros/test_rosservice/Manifest
@@ -1,5 +1,7 @@
 AUX yaml.patch 2877 BLAKE2B af708d68c805323af1e337789798c0318f49e7805cc3b6a52a895edff40fcb71a48c467c2e009c04f19e5ad75231f07e60d94cbfe2baa7a47a5d3d4cd78bd379 SHA512 cd3099ed89f475603151e290dbdddcc170bad5a01002ce51e5a44ceed0ab864480e8daf1eaaf3ab5fbf4fec550f6a0e91ec7dc6400b2fb227abc2bdadc3d64b2
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD test_rosservice-1.14.3-r1.ebuild 713 BLAKE2B faacb0d4583af8cde634e608012ed3d1d89a0cd912a54f3c8931a109d3e2ab06965c85c123e7bd92cc83a1a86bc222e5f6648e079dc9e2644ae19268bf96d2b5 SHA512 8604ba792e6a01dc7f085061889d278d48474da3ad21a2580f560ba771dafb3041afd2fe9a797c886bc01af8f04c7f4108f0c8387c25501d5ef3d1667813373a
+EBUILD test_rosservice-1.15.4.ebuild 676 BLAKE2B ecff62b277ac96c0c94754d50a0b1640eebba549a86661f69aebf693ec39d5f66114a7f366ce1adeced5523aa3ffcb7b5d2a4d60fc7e6232f5b8dffa69680e73 SHA512 71453f94f88b1055698f09b4688ad25b5b61246eac009b7a7abed9f13ded12ab158029b16ec76e1900dd2dd8591744db95bdb40d54a20296a01cd04cf0b38f3a
 EBUILD test_rosservice-9999.ebuild 679 BLAKE2B d8c7decce6abc14a7e9c0d9b36a40a001c282333d0e50e8caf7c8598b646adb458bce1aadd01a2a97639dac10d2ec7a232f8145c6fb6a904eb83311bbb47afae SHA512 36c5673453deb431ee1e5816af18510e7bfd9d324089e6bf05af963ef4d769ddc2d8d1d04796f849b75a8d0aeb0dc9663fa9747c07ad20c68934e258e0d273cc
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild b/dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild
new file mode 100644
index 000000000000..507361ef503e
--- /dev/null
+++ b/dev-ros/test_rosservice/test_rosservice-1.15.4.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=test/${PN}
+CATKIN_HAS_MESSAGES=yes
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit ros-catkin
+
+DESCRIPTION="Unit tests for rospy"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-ros/rostest[${PYTHON_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	test? (
+		dev-ros/test_rosmaster[${PYTHON_USEDEP}]
+		dev-ros/rospy[${PYTHON_USEDEP}]
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest
index 994ab40dbb58..857fbbf35b91 100644
--- a/dev-ros/topic_tools/Manifest
+++ b/dev-ros/topic_tools/Manifest
@@ -1,5 +1,7 @@
 AUX yaml.patch 2150 BLAKE2B 5620056ff8c1da96f7f5e42bf4fccff73763211051d7c39c35c3dd6181aba3059dcbe9e32b5b6edb6ba4f074601dee7937e6093c321e3b236a7de2bcd7f9252d SHA512 4b9b884c1b29987bff911a945daec6841fb19b5fa34d0b6ffd81c3c338412c3faf5787240c39e7ff5a952841131aeb3f2994161eddc5c3a9b4173c099660e9bd
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD topic_tools-1.14.3-r1.ebuild 729 BLAKE2B ccc071e3a6170f559e3e9dce6886621f4c7c1c72b11ce1f66e83cd04092cd6cc999e7e0526baf9c8a6336c976f27ebcf213d01186aae486cfcdb80a4eeef58dd SHA512 5181892055fbb64cba30d9467d30639c3f23435b805be1c9ea32fd8f19aeafa0a3b152a0106398e69b45134f5f317a3ca2b96f1e2e04e164bee52fa2dc619a40
+EBUILD topic_tools-1.15.4.ebuild 692 BLAKE2B 18d9cb31888309b6e5cbec2c1c30567f0d68bb763081c2a51ae1a3839f768d49e8f7b4de73553d4263ebf44ce4dad81044fc7cc0298f3e18b93eef151037df26 SHA512 3a2c93aa9a49182054372a4115d3cb8f5cfa8b8aed0fb0509b76260492afa218e0c4867d365f04c76a0f1133947f43d7ea75c590c038245d6a6ecd41a29af4fb
 EBUILD topic_tools-9999.ebuild 695 BLAKE2B 63c6c776011923217856c1392fb0d292d0bb44bebd000c7fa6530371a237aefda1a18c07bd78d9352d0f4dc7608a1c9dd335710cc6860485678dd2da4fa621df SHA512 918f548657eeab6f571e371dde921b0cdc374890b3f4a80b9eb51ece52e3404ce750a9447d1139e15a60409054f8f3e6d829f75ad538e6c80ffa8617eaca646a
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/topic_tools/topic_tools-1.15.4.ebuild b/dev-ros/topic_tools/topic_tools-1.15.4.ebuild
new file mode 100644
index 000000000000..49f8f6d9bbb1
--- /dev/null
+++ b/dev-ros/topic_tools/topic_tools-1.15.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=tools/${PN}
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Tools for directing, throttling and selecting ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/cpp_common
+	dev-ros/rosconsole
+	dev-ros/roscpp
+	dev-ros/rostime
+	dev-ros/xmlrpcpp
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/rostest[${PYTHON_USEDEP}]
+		dev-ros/rosunit[${PYTHON_USEDEP}]
+		dev-cpp/gtest
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest
index e4b6527db86d..b1ce66bb68d5 100644
--- a/dev-ros/xmlrpcpp/Manifest
+++ b/dev-ros/xmlrpcpp/Manifest
@@ -1,6 +1,8 @@
 DIST ros_comm-1.14.2.tar.gz 1044745 BLAKE2B 1a5d47a4c6682c7a629d9d84be121a5eafcfc16621dec9a9ab9b57c2c7f9070f0007e15492ee44d86e1879351fae20bb9a759093424dd22ae7d44ae0f28e00e1 SHA512 8cece09572dc6b94a42eb49537cbcddbb954f70df01dc7ac9bd8aba17f53207b86afd8ccff81d929eca33bb9642ad7c530835d3f43471de497611940edae4777
 DIST ros_comm-1.14.3.tar.gz 1045287 BLAKE2B c079983aa730e70028d1bf2c365d01d99ce09ced0c0f6443b18f9d0fb83715f6af4b313d6db4eb99dcc10052c81fa3e6560e7b3591b2fbe14b9ec20fac24babe SHA512 52df24f10f476697ee6fa340da354b45431f35018a25e2674dc9306f175929a4b0368753503ea143f87aeb4945a2e67c37f83d833f54b53f9a76a81022c280a3
+DIST ros_comm-1.15.4.tar.gz 1071246 BLAKE2B 57867c192bfd48f3a0534762808c668031081a6155510879e68f9618226b9c5eff0d5fc9ec0e7ec8d0cc1f0d74794a4e55151036275ae6fc5bb613cc42137ddc SHA512 f92233cbf5ee97832023545730d3e756dfa08507072c074ac3e0763db1c2c2ab9fcbb0c90995a0c5d43f0ddc2ee528c185173a664b19abe4f8159aa3f3cb20dc
 EBUILD xmlrpcpp-1.14.2.ebuild 372 BLAKE2B 8caf0ab6a8639e6dacde87df3fd5e236e43c27d0f419775f6689613d772b08d1019e23b62dd6580a09d22097c418b359462a507684163b7878b2e4d058c417ef SHA512 6509ebcf6deee98bbdaf1b82a95a137801c8dffe9e8fffed70533b78ee19941544432d770089130707747d93fd955fb035440354bf30938081afe9a97c53002c
 EBUILD xmlrpcpp-1.14.3.ebuild 372 BLAKE2B 8caf0ab6a8639e6dacde87df3fd5e236e43c27d0f419775f6689613d772b08d1019e23b62dd6580a09d22097c418b359462a507684163b7878b2e4d058c417ef SHA512 6509ebcf6deee98bbdaf1b82a95a137801c8dffe9e8fffed70533b78ee19941544432d770089130707747d93fd955fb035440354bf30938081afe9a97c53002c
+EBUILD xmlrpcpp-1.15.4.ebuild 369 BLAKE2B f409c970fe8f94a204e8e112584bd8757a0518a3cc263c1d0894c161514ee825d6fba27460ac4cc5b60482cb8300dd9cb7f9ca1e2388aa839373ae5309fa7671 SHA512 20e8450e09b1662c7bbf3180f00940e2db4881f984abe996bec80b9bf80f4957e33a56009a50b33134d3fe08e63dcad2c833abf48e09bf250b5e7e83ed63094e
 EBUILD xmlrpcpp-9999.ebuild 372 BLAKE2B a665b463f43367c765319e4a86d0027fabecb2ec7672f3fce55a3b593f875171eeef769bfbc70d3cfb701c035895ee1819b2b922b2e29c083085e43e491b2d2c SHA512 cd4b48ddd4741f7112ecc47ee4e6907ce1d7e67ab4d580b876f95229b325ce2fbbb466d764155cda81d99c9f22f05f2d0524a5ccf7c930a5cb57f0e8bf0b0791
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.15.4.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.4.ebuild
new file mode 100644
index 000000000000..0e4f1eeed2e5
--- /dev/null
+++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.15.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+ROS_REPO_URI="https://github.com/ros/ros_comm"
+KEYWORDS="~amd64 ~arm"
+ROS_SUBDIR=utilities/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="C++ implementation of the XML-RPC protocol"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-ros/cpp_common"
+DEPEND="${RDEPEND}"