gentoo resync : 25.08.2020

7 files changed, 23 insertions, 288 deletions

diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest
index 95e19290070d..f86d36d5d6a9 100644
--- a/dev-ros/rosmsg/Manifest
+++ b/dev-ros/rosmsg/Manifest
@@ -1,9 +1,6 @@
-AUX norm.patch 1260 BLAKE2B 09c790fa6d31a76d07a44622c514391a30c855c167aa3598f300754ba24249023efef644c397203e66d25c467b6043a6a6f02d9d19d9a23d1b920619d04e7b9e SHA512 3fe87e224a10bd5b3eaafbb370031ee0ca30f3a968742df78fc6319875f1ae374e06d58dd2d47a499065dba2030914ad5b4221b856b18d340f7119b6435b19cb
-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
+DIST ros_comm-1.15.7.tar.gz 1080092 BLAKE2B d5c0dd1f54eac7aa11be21bbc680f85f988cc9328382c0c675b7d5986e888be603ed82affa5f51a270974d07044debe3ecf86f5647fd59cb29e8e791a227feb9 SHA512 67dc100e8ed03a25ea228cc7d456ec2203324098f9e11c9a249299df73bfc34efc75b1221c0fb6fceb38fece627f1dc5f2c23be93c9a1c85b1075784a45ff20e
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD rosmsg-1.15.7.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394
+EBUILD rosmsg-1.15.8.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394
+EBUILD rosmsg-9999.ebuild 624 BLAKE2B 44c0cc3aef9ef0727ab783de6e4cb92457775ed5fb93f9a22bf395ee48dd0fbdaeac2a2db2c7c62717bdac30c255ca4ba9b45da419671e9fa898726260fbb072 SHA512 0e64f192a34a18baa5d4d9a0e3d1172657d6c2c9bca04238cfaabfbff3344733c2e044796aaf2bb39a25504d1fba2c85b33c414656f27b1cfb6e8668eac80394
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosmsg/files/norm.patch b/dev-ros/rosmsg/files/norm.patch
deleted file mode 100644
index 530da65fcd24..000000000000
--- a/dev-ros/rosmsg/files/norm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 0648d3019dc2395f61a8a7a3d1bbf790eca98739 Mon Sep 17 00:00:00 2001
-From: James Xu <kejia.xu@microsoft.com>
-Date: Wed, 6 Feb 2019 09:47:54 -0800
-Subject: [PATCH] normalize paths before comparison in rosmsg (#1586)
-
-* normalize paths before comparison in rosmsg
-
-* remove use of normcase and remove path_in_workspaces temp variable
-
-* remove duplicated control
-
-* revert unrelated whitespace changes
-
-* keep order of operands
----
- tools/rosmsg/src/rosmsg/__init__.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/rosmsg/src/rosmsg/__init__.py b/tools/rosmsg/src/rosmsg/__init__.py
-index 83b629e7e..4ed7aa542 100644
---- a/tools/rosmsg/src/rosmsg/__init__.py
-+++ b/tools/rosmsg/src/rosmsg/__init__.py
-@@ -551,7 +551,7 @@ def _get_package_paths(pkgname, rospack):
-     path = rospack.get_path(pkgname)
-     paths.append(path)
-     results = find_in_workspaces(search_dirs=['share'], project=pkgname, first_match_only=True, workspace_to_source_spaces=_catkin_workspace_to_source_spaces, source_path_to_packages=_catkin_source_path_to_packages)
--    if results and results[0] != path:
-+    if results and results[0].replace(os.path.sep, '/') != path.replace(os.path.sep, '/'):
-         paths.append(results[0])
-     return paths
-     
diff --git a/dev-ros/rosmsg/files/py3.patch b/dev-ros/rosmsg/files/py3.patch
deleted file mode 100644
index 4cfcb77d2a26..000000000000
--- a/dev-ros/rosmsg/files/py3.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From 1933acfa8107a164ec825d3223d14589fefd1b5b Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
-Date: Tue, 6 Aug 2019 16:06:51 -0700
-Subject: [PATCH] more Python 3 compatibility (#1783)
-
----
- test/test_rospy/test/unit/test_genmsg_py.py   |  6 +--
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- .../test/test_roslogging_user_logger.py       |  8 +++-
- tools/roslaunch/test/unit/test_xmlloader.py   |  2 +-
- tools/rosmsg/src/rosmsg/__init__.py           |  2 +-
- tools/rosmsg/test/test_rosmsg_command_line.py | 46 +++++++++----------
- .../test/test_rosmsgproto_command_line.py     | 20 ++++----
- .../test_rostopic_command_line_offline.py     | 44 +++++++++---------
- 8 files changed, 67 insertions(+), 63 deletions(-)
-
-diff --git a/tools/rosmsg/src/rosmsg/__init__.py b/tools/rosmsg/src/rosmsg/__init__.py
-index 4ed7aa542..75f5afcbd 100644
---- a/tools/rosmsg/src/rosmsg/__init__.py
-+++ b/tools/rosmsg/src/rosmsg/__init__.py
-@@ -240,7 +240,7 @@ def create_names_filter(names):
-     """
-     returns a function to use as filter that returns all objects slots except those with names in list.
-     """
--    return lambda obj : filter(lambda slotname : not slotname in names, obj.__slots__)
-+    return lambda obj : list(filter(lambda slotname : not slotname in names, obj.__slots__))
- 
- 
- def init_rosmsg_proto():
-diff --git a/tools/rosmsg/test/test_rosmsg_command_line.py b/tools/rosmsg/test/test_rosmsg_command_line.py
-index 02e31022e..d5515a3ac 100644
---- a/tools/rosmsg/test/test_rosmsg_command_line.py
-+++ b/tools/rosmsg/test/test_rosmsg_command_line.py
-@@ -54,24 +54,24 @@ def test_cmd_help(self):
-         
-         for cmd in ['rosmsg', 'rossrv']:
-             glob_cmd=[os.path.join(_SCRIPT_FOLDER, cmd)]
--            output = Popen(glob_cmd, stdout=PIPE, env=self.new_environ).communicate()[0]
-+            output = Popen(glob_cmd, stdout=PIPE, env=self.new_environ).communicate()[0].decode()
-             self.assert_('Commands' in output)
--            output = Popen(glob_cmd+['-h'], stdout=PIPE, env=self.new_environ).communicate()[0]
-+            output = Popen(glob_cmd+['-h'], stdout=PIPE, env=self.new_environ).communicate()[0].decode()
-             self.assert_('Commands' in output)
-             self.assert_('Traceback' not in output)
-             for c in sub:
-                 self.assert_("%s %s"%(cmd, c) in output, "%s %s"%(cmd, c) + " not in "+ output + " of " + str(glob_cmd))
-                 
-             for c in sub:
--                output = Popen(glob_cmd + [c, '-h'], stdout=PIPE, env=self.new_environ).communicate()[0]
-+                output = Popen(glob_cmd + [c, '-h'], stdout=PIPE, env=self.new_environ).communicate()[0].decode()
-                 self.assert_('Usage' in output)
-                 self.assert_("%s %s"%(cmd, c) in output, output)
-             
-     def test_cmd_packages(self):
-         # - single line
--        output1 = Popen(['rosmsg', 'packages', '-s'], stdout=PIPE).communicate()[0]
-+        output1 = Popen(['rosmsg', 'packages', '-s'], stdout=PIPE).communicate()[0].decode()
-         # - multi-line
--        output2 = Popen(['rosmsg', 'packages'], stdout=PIPE).communicate()[0]
-+        output2 = Popen(['rosmsg', 'packages'], stdout=PIPE).communicate()[0].decode()
-         l1 = [x for x in output1.split() if x]
-         l2 = [x.strip() for x in output2.split('\n') if x.strip()]
-         self.assertEquals(l1, l2)
-@@ -80,8 +80,8 @@ def test_cmd_packages(self):
-         for p in ['std_srvs', 'rosmsg']:
-             self.assert_(p not in l1)
- 
--        output1 = Popen(['rossrv', 'packages', '-s'], stdout=PIPE).communicate()[0]
--        output2 = Popen(['rossrv', 'packages'], stdout=PIPE).communicate()[0]
-+        output1 = Popen(['rossrv', 'packages', '-s'], stdout=PIPE).communicate()[0].decode()
-+        output2 = Popen(['rossrv', 'packages'], stdout=PIPE).communicate()[0].decode()
-         l1 = [x for x in output1.split() if x]
-         l2 = [x.strip() for x in output2.split('\n') if x.strip()]
-         self.assertEquals(l1, l2)
-@@ -92,14 +92,14 @@ def test_cmd_packages(self):
- 
-     def test_cmd_list(self):
-         # - multi-line
--        output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rosmsg'), 'list'], stdout=PIPE).communicate()[0]
-+        output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rosmsg'), 'list'], stdout=PIPE).communicate()[0].decode()
-         l1 = [x.strip() for x in output1.split('\n') if x.strip()]
-         for p in ['std_msgs/String', 'test_rosmaster/Floats']:
-             self.assert_(p in l1)
-         for p in ['std_srvs/Empty', 'roscpp/Empty']:
-             self.assert_(p not in l1)
- 
--        output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rossrv'), 'list'], stdout=PIPE).communicate()[0]
-+        output1 = Popen([os.path.join(_SCRIPT_FOLDER,'rossrv'), 'list'], stdout=PIPE).communicate()[0].decode()
-         l1 = [x.strip() for x in output1.split('\n') if x.strip()]
-         for p in ['std_srvs/Empty', 'roscpp/Empty']:
-             self.assert_(p in l1)
-@@ -109,9 +109,9 @@ def test_cmd_list(self):
-     def test_cmd_package(self):
-         # this test is obviously very brittle, but should stabilize as the tests stabilize
-         # - single line output
--        output1 = Popen(['rosmsg', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0]
-+        output1 = Popen(['rosmsg', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
-         # - multi-line output
--        output2 = Popen(['rosmsg', 'package', 'test_rosmaster'], stdout=PIPE).communicate()[0]
-+        output2 = Popen(['rosmsg', 'package', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
-         l = set([x for x in output1.split() if x])        
-         l2 = set([x.strip() for x in output2.split('\n') if x.strip()])
-         self.assertEquals(l, l2)
-@@ -121,8 +121,8 @@ def test_cmd_package(self):
-                   'test_rosmaster/RosmsgC']:
-             self.assertTrue(m in l, l)
-         
--        output = Popen(['rossrv', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0]
--        output2 = Popen(['rossrv', 'package','test_rosmaster'], stdout=PIPE).communicate()[0]        
-+        output = Popen(['rossrv', 'package', '-s', 'test_rosmaster'], stdout=PIPE).communicate()[0].decode()
-+        output2 = Popen(['rossrv', 'package','test_rosmaster'], stdout=PIPE).communicate()[0].decode()
-         l = set([x for x in output.split() if x])
-         l2 = set([x.strip() for x in output2.split('\n') if x.strip()])
-         self.assertEquals(l, l2)
-@@ -132,14 +132,14 @@ def test_cmd_package(self):
-         
-     ## test that the rosmsg/rossrv show command works
-     def test_cmd_show(self):
--        output = Popen(['rosmsg', 'show', 'std_msgs/String'], stdout=PIPE).communicate()[0]
-+        output = Popen(['rosmsg', 'show', 'std_msgs/String'], stdout=PIPE).communicate()[0].decode()
-         self.assertEquals('string data', output.strip())
- 
--        output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0]
-+        output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0].decode()
-         self.assertEquals('---', output.strip())
--        output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0]
-+        output = Popen(['rossrv', 'show', 'std_srvs/Empty'], stdout=PIPE).communicate()[0].decode()
-         self.assertEquals('---', output.strip())
--        output = Popen(['rossrv', 'show', 'test_rosmaster/AddTwoInts'], stdout=PIPE).communicate()[0]
-+        output = Popen(['rossrv', 'show', 'test_rosmaster/AddTwoInts'], stdout=PIPE).communicate()[0].decode()
-         self.assertEquals('int64 a\nint64 b\n---\nint64 sum', output.strip())
- 
-         # test against test_rosmsg package
-@@ -159,20 +159,20 @@ def test_cmd_show(self):
-             text = text+'\n' # running command adds one new line
-             text_raw = text_raw+'\n'
-             type_ =test_message_package+'/'+t
--            output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0]
-+            output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text, output)
--            output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE).communicate()[0]
-+            output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text_raw, output)
--            output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0]
-+            output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text_raw, output)
- 
-             # test as search
-             type_ = t
-             text = "[test_rosmaster/%s]:\n%s"%(t, text)
-             text_raw = "[test_rosmaster/%s]:\n%s"%(t, text_raw)
--            output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0]
-+            output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text, output)
-             output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE, stderr=PIPE).communicate()
--            self.assertEquals(text_raw, output[0], "Failed: %s"%(str(output)))
--            output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0]
-+            self.assertEquals(text_raw, output[0].decode(), "Failed: %s"%(str(output)))
-+            output = Popen(['rosmsg', 'show', '--raw', type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text_raw, output)
-diff --git a/tools/rosmsg/test/test_rosmsgproto_command_line.py b/tools/rosmsg/test/test_rosmsgproto_command_line.py
-index b5b555e78..b4aa0c5b3 100644
---- a/tools/rosmsg/test/test_rosmsgproto_command_line.py
-+++ b/tools/rosmsg/test/test_rosmsgproto_command_line.py
-@@ -67,37 +67,37 @@ def testFail(self):
-         cmd.extend(["msg", "foo123barxyz"])
-         call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
-         (output, erroutput) = call.communicate()
--        self.assertEqual('', output)
--        self.assertTrue('Unknown message name foo123barxyz' in erroutput)
-+        self.assertEqual(b'', output)
-+        self.assertTrue('Unknown message name foo123barxyz' in erroutput.decode())
- 
-     def testSilentFail(self):
-         cmd = copy.copy(ROSMSGPROTO_FN)
-         cmd.extend(["msg", "-s", "foo123barxyz"])
-         call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
-         (output, erroutput) = call.communicate()
--        self.assertEqual('', output)
--        self.assertEqual('', erroutput)
-+        self.assertEqual(b'', output)
-+        self.assertEqual(b'', erroutput)
- 
-     def testSilentFailCpp(self):
-         cmd = copy.copy(ROSMSGPROTO_FN)
-         cmd.extend(["msg", "-s", "foo123barxyz::bar"])
-         call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
-         (output, erroutput) = call.communicate()
--        self.assertEqual('', output)
--        self.assertEqual('', erroutput)
-+        self.assertEqual(b'', output)
-+        self.assertEqual(b'', erroutput)
- 
-     def testSilentFailDot(self):
-         cmd = copy.copy(ROSMSGPROTO_FN)
-         cmd.extend(["msg", "-s", "foo123barxyz.bar"])
-         call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
-         (output, erroutput) = call.communicate()
--        self.assertEqual('', output)
--        self.assertEqual('', erroutput)
-+        self.assertEqual(b'', output)
-+        self.assertEqual(b'', erroutput)
- 
-     def testSilentFailMode(self):
-         cmd = copy.copy(ROSMSGPROTO_FN)
-         cmd.extend(["msgfoobar", "-s", "foo123barxyz.bar"])
-         call = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.PIPE, env = self.new_environ)
-         (output, erroutput) = call.communicate()
--        self.assertEqual('', output)
--        self.assertEqual('', erroutput)
-+        self.assertEqual(b'', output)
-+        self.assertEqual(b'', erroutput)
diff --git a/dev-ros/rosmsg/files/tests.patch b/dev-ros/rosmsg/files/tests.patch
deleted file mode 100644
index f8b514b4e127..000000000000
--- a/dev-ros/rosmsg/files/tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: rosmsg/test/test_rosmsg_command_line.py
-===================================================================
---- rosmsg.orig/test/test_rosmsg_command_line.py
-+++ rosmsg/test/test_rosmsg_command_line.py
-@@ -168,8 +168,8 @@ class TestRosmsg(unittest.TestCase):
- 
-             # test as search
-             type_ = t
--            text = "[test_rosmaster/%s]:\n%s"%(t, text)
--            text_raw = "[test_rosmaster/%s]:\n%s"%(t, text_raw)
-+            text = ("[test_rosmaster/%s]:\n%s"%(t, text))*2
-+            text_raw = ("[test_rosmaster/%s]:\n%s"%(t, text_raw))*2
-             output = Popen(['rosmsg', 'show', type_], stdout=PIPE).communicate()[0].decode()
-             self.assertEquals(text, output)
-             output = Popen(['rosmsg', 'show', '-r',type_], stdout=PIPE, stderr=PIPE).communicate()
diff --git a/dev-ros/rosmsg/rosmsg-1.15.4.ebuild b/dev-ros/rosmsg/rosmsg-1.15.7.ebuild
index 941834eadacc..ba0d62bb080b 100644
--- a/dev-ros/rosmsg/rosmsg-1.15.4.ebuild
+++ b/dev-ros/rosmsg/rosmsg-1.15.7.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"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,11 +15,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] )
+	test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
 "
diff --git a/dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild b/dev-ros/rosmsg/rosmsg-1.15.8.ebuild
index a76abe4007fc..ba0d62bb080b 100644
--- a/dev-ros/rosmsg/rosmsg-1.14.3-r1.ebuild
+++ b/dev-ros/rosmsg/rosmsg-1.15.8.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"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,12 +15,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] )
+	test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
 "
-PATCHES=( "${FILESDIR}/py3.patch" "${FILESDIR}/norm.patch" "${FILESDIR}/tests.patch" )
diff --git a/dev-ros/rosmsg/rosmsg-9999.ebuild b/dev-ros/rosmsg/rosmsg-9999.ebuild
index 941834eadacc..ba0d62bb080b 100644
--- a/dev-ros/rosmsg/rosmsg-9999.ebuild
+++ b/dev-ros/rosmsg/rosmsg-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"
 ROS_SUBDIR=tools/${PN}
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -16,11 +15,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/genmsg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosbag[${PYTHON_USEDEP}]
+	dev-ros/genmsg[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosbag[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-ros/test_rosmaster[${PYTHON_USEDEP}] )
+	test? ( dev-ros/test_rosmaster[${PYTHON_SINGLE_USEDEP}] )
 "