gentoo resync : 25.08.2020

9 files changed, 25 insertions, 233 deletions

diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest
index c44735ec8b20..b841b0ea100c 100644
--- a/dev-ros/roslaunch/Manifest
+++ b/dev-ros/roslaunch/Manifest
@@ -1,16 +1,10 @@
-AUX 40roslaunch 41 BLAKE2B a07c8484065add0cec5d9cf2e586a7a1fff3b7df575a904f224eeb20fbf88c707212458e53f45799822703fad633efd944f8c0cab35fb1e22c701d40c17d8efa SHA512 1b32e0967267e2d6f40583f3463e989f52ff2aeb243fd3b96647e946c95bab553a0b969407579ea3b700234fd554ff23a4208562ffb741c0a5a47a42da28525a
-AUX py3-2.patch 1430 BLAKE2B bbb55f75603556a96e4a573039c20aa41caea7c3758a2a994e80d8dd4175c97467c740cc1319d61812301fe74956a63e5385eb2220573e36a6f557e9ba1b97ed SHA512 57c8853bf8130c2c5050d1191e197f37e38937ad524e01de551d0f1d018b507af3bb6de463381f743740ca8c52cdd1ed2ed85a9fa6830960a3c3b6661686c3ad
-AUX py3.patch 1989 BLAKE2B 635135fc80d5f28c7953fd28105793b74ef51384bdc269a3b45c85e5519a700014ff02a2eedc38aa8dc5642ca269421d5521197957f5ccbae8fe42d88bde18a1 SHA512 5ebf4e0bf6d5f814dd9ee4fee868127dd7fb13b78f488bed7875d1a0102ba7ff63b848d843d9a94eeee13aa79694b0f6d8a2a2bbc74294861a27dc3b8255248a
+AUX 40roslaunch 59 BLAKE2B 2dc6a88ae1902f2c42b026f8afbda9b1f5289eee8981969c0e86247e1cfae7bb45a8365b4edc43b8d1716ea3da34e7928cfbc7cf81232d3ce529ff9b8ccb32dd SHA512 baeb824bcaeb6023d2138335c002df67387b82e369d53be50f694a6122823dbd6bb114e1244721a623b3cd5ee87af696143345af000f73a256b1316d016d51b4
 AUX roscore.confd 9 BLAKE2B 89bba6f2d5d004cd5d0e3bb931d039e54e5389f21538c4210924c2e52d9287b2191e1ae5f94641658fb95fef10bf55e261e2d20e702974cc823988609e27781a SHA512 91af98d3c1f567572e0d995b68f268cefe8abaff46b58499fdd11845809947e858c8d133c6b4428115f0a62db6eb847495bf462619a7fa7c233bf3a97dc9f0bc
 AUX roscore.initd 533 BLAKE2B 2ff10e03a6b75128fd72a98022a040b93c32ddba6782912133e4164e50427a37f77c5911cd1a50082ba33f90cc7cc6983d2d4eff4ca1ef86c07d3e2ebabfbce6 SHA512 8a43dd2ec83c24db1c00f4e849fa3e6193d348c6c3e4cae0317717d1d08cd1da6cbc37dbfdd338b9d2d77d2bf852d93736214c7d3c31e6dba3b46627e3d0b410
 AUX roscore.xml.in 347 BLAKE2B 05c90bd6a2cffeaab16d1fb576e2cbe5768a848c5b6231af930e3e01a32dc3228dfc60aeb4c1d6efe05f8245a948edd2314dcb550f9e80d1acd36461c347ce38 SHA512 fff18b8f4ffdf3f3e6cdc3b33cdb386dabaab769f3bac995cb3c29243c8380b13898cd5892026e9dee459f88f4f05886c052696b2f081fbbb393ade148fda0f6
 AUX roslaunch.confd 46 BLAKE2B 24fcab885cf07185c751da12863e3af0ac8f1097a636c3641be1b6357e26b5178d13ee42d04bbacea27763df075f5436813afc2025dd9013461059b0c5feacd9 SHA512 0a86b0beb7b4bad2c01f3814070d27a3c85a99629ab26fa3aa6cce19d178d500c912665b152403cf7301f210e3cf9e6bd03103c3654b1ef61dae165ba5ac704d
 AUX roslaunch.initd 915 BLAKE2B 11f2c6f2db2ad1084332a1b704a90ed3a3fc9fe671f96f6ca74bbabdab3b7f22bed96c077dd994e3c3fc54eb299e93001167fe16e688eb062033f3da86ac168d SHA512 4f8bb2dfe085d09245ec2343e423e1dacbd02108868c5d9523d63929c939b753f45ce963d5d44b5ad0f547f7d85b82ea6d3a80f8984dfe72ade7f8a5372c850c
-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-1.15.4.ebuild 1425 BLAKE2B 94a0208aa65bfa08d0c7a51d84bed57f7b51ee767ec1181a5016299ac57867c3ba8b3f75d4ef82b665d89043365b0b409171d937816b093002b8cda0ab6358d7 SHA512 5e9e26393d979cf1ff0b5167b9ed2cf7b9e561d1cde8a744cb77cb9872c8beac5f58fbbc08a646cd65a91d7365139f4e51819a3120ff2f4db350407c0b58382c
-EBUILD roslaunch-9999.ebuild 1425 BLAKE2B 94a0208aa65bfa08d0c7a51d84bed57f7b51ee767ec1181a5016299ac57867c3ba8b3f75d4ef82b665d89043365b0b409171d937816b093002b8cda0ab6358d7 SHA512 5e9e26393d979cf1ff0b5167b9ed2cf7b9e561d1cde8a744cb77cb9872c8beac5f58fbbc08a646cd65a91d7365139f4e51819a3120ff2f4db350407c0b58382c
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD roslaunch-1.15.8-r1.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
+EBUILD roslaunch-9999.ebuild 1638 BLAKE2B 3b0bbdda497ad507283016a803a75d67ffaa47c766295f887fcae53ac0cf03622c4497263888b42dc1f705e5699ef443692b1fcad48e950352e2998bea287141 SHA512 2929c876f90e4feb4411f39dc3dabf24bb30858411ca9d5f39f4b956ccbcbaba5cb278d593f9db0b10e69314fdca43c952f4d9b1840d946f6bb01088093f3a8e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/roslaunch/files/40roslaunch b/dev-ros/roslaunch/files/40roslaunch
index 1e8f4dadcf29..e9dac18dd65f 100644
--- a/dev-ros/roslaunch/files/40roslaunch
+++ b/dev-ros/roslaunch/files/40roslaunch
@@ -1 +1,2 @@
 ROS_MASTER_URI="http://localhost:11311/"
+ROS_DISTRO=Gentoo
diff --git a/dev-ros/roslaunch/files/py3-2.patch b/dev-ros/roslaunch/files/py3-2.patch
deleted file mode 100644
index d3ae600e4d7e..000000000000
--- a/dev-ros/roslaunch/files/py3-2.patch
+++ /dev/null
@@ -1,29 +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/roslaunch/test/unit/test_xmlloader.py b/tools/roslaunch/test/unit/test_xmlloader.py
-index ac30189d0..f582ec230 100644
---- a/tools/roslaunch/test/unit/test_xmlloader.py
-+++ b/tools/roslaunch/test/unit/test_xmlloader.py
-@@ -218,7 +218,7 @@ def test_params(self):
-         p = [p for p in mock.params if p.key == '/configfile'][0]
-         self.assertEquals(contents, p.value, 1)
-         p = [p for p in mock.params if p.key == '/binaryfile'][0]
--        self.assertEquals(Binary(contents), p.value, 1)
-+        self.assertEquals(Binary(contents.encode()), p.value, 1)
- 
-         f = open(os.path.join(get_example_path(), 'example.launch'))
-         try:
diff --git a/dev-ros/roslaunch/files/py3.patch b/dev-ros/roslaunch/files/py3.patch
deleted file mode 100644
index 8fa2c6e2fab2..000000000000
--- a/dev-ros/roslaunch/files/py3.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8f22c20e418abe4abe23e789eef517a16a50604d Mon Sep 17 00:00:00 2001
-From: Dirk Thomas <dirk-thomas@users.noreply.github.com>
-Date: Tue, 6 Aug 2019 12:50:24 -0700
-Subject: [PATCH] more Python 3 compatibility (#1782)
-
----
- test/test_rosmaster/test/nodes/testAllCommonFlows  | 2 +-
- test/test_rosmaster/test/nodes/testMaster          | 2 +-
- test/test_rosmaster/test/nodes/testSlave           | 2 +-
- test/test_rospy/test/unit/test_genmsg_py.py        | 8 +++++++-
- tools/rosgraph/test/test_roslogging.py             | 5 ++++-
- tools/rosgraph/test/test_roslogging_user_logger.py | 5 ++++-
- tools/roslaunch/src/roslaunch/depends.py           | 8 ++++----
- 7 files changed, 22 insertions(+), 10 deletions(-)
-
-diff --git a/tools/roslaunch/src/roslaunch/depends.py b/tools/roslaunch/src/roslaunch/depends.py
-index a3fbf7a41..91ae26998 100644
---- a/tools/roslaunch/src/roslaunch/depends.py
-+++ b/tools/roslaunch/src/roslaunch/depends.py
-@@ -86,21 +86,21 @@ def __str__(self):
- 
- def _get_arg_value(tag, context):
-     name = tag.attributes['name'].value
--    if tag.attributes.has_key('value'):
-+    if 'value' in tag.attributes.keys():
-         return resolve_args(tag.attributes['value'].value, context)
-     elif name in context['arg']:
-         return context['arg'][name]
--    elif tag.attributes.has_key('default'):
-+    elif 'default' in tag.attributes.keys():
-         return resolve_args(tag.attributes['default'].value, context)
-     else:
-         raise RoslaunchDepsException("No value for arg [%s]"%(name))
- 
- def _check_ifunless(tag, context):
--    if tag.attributes.has_key('if'):
-+    if 'if' in tag.attributes.keys():
-         val = resolve_args(tag.attributes['if'].value, context)
-         if not convert_value(val, 'bool'):
-             return False
--    elif tag.attributes.has_key('unless'):
-+    elif 'unless' in tag.attributes.keys():
-         val = resolve_args(tag.attributes['unless'].value, context)
-         if convert_value(val, 'bool'):
-             return False
diff --git a/dev-ros/roslaunch/files/timeout.patch b/dev-ros/roslaunch/files/timeout.patch
deleted file mode 100644
index 169b12813c70..000000000000
--- a/dev-ros/roslaunch/files/timeout.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Slow HW like the raspberry pi easily hit this timeout over NFS.
-Increase it to 1 min.
-
-diff --git a/tools/roslaunch/src/roslaunch/launch.py b/tools/roslaunch/src/roslaunch/launch.py
-index 9a3b931..8e33c0c 100644
---- a/tools/roslaunch/src/roslaunch/launch.py
-+++ b/tools/roslaunch/src/roslaunch/launch.py
-@@ -57,8 +57,8 @@ from roslaunch.pmon import start_process_monitor, ProcessListener
- 
- from roslaunch.rlutil import update_terminal_name
- 
--_TIMEOUT_MASTER_START = 10.0 #seconds
--_TIMEOUT_MASTER_STOP  = 10.0 #seconds
-+_TIMEOUT_MASTER_START = 60.0 #seconds
-+_TIMEOUT_MASTER_STOP  = 60.0 #seconds
- 
- _ID = '/roslaunch'
- 
diff --git a/dev-ros/roslaunch/files/yaml.patch b/dev-ros/roslaunch/files/yaml.patch
deleted file mode 100644
index 135e9927c408..000000000000
--- a/dev-ros/roslaunch/files/yaml.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: roslaunch/src/roslaunch/loader.py
-===================================================================
---- roslaunch.orig/src/roslaunch/loader.py
-+++ roslaunch/src/roslaunch/loader.py
-@@ -98,7 +98,7 @@ def convert_value(value, type_):
-         raise ValueError("%s is not a '%s' type"%(value, type_))
-     elif type_ == 'yaml':
-         try:
--            return yaml.load(value)
-+            return yaml.safe_load(value)
-         except yaml.parser.ParserError as e:
-             raise ValueError(e)
-     else:
-@@ -409,7 +409,7 @@ class Loader(object):
-             if rosparam is None:
-                 import rosparam
-             try:
--                data = yaml.load(text)
-+                data = yaml.safe_load(text)
-                 # #3162: if there is no YAML, load() will return an
-                 # empty string.  We want an empty dictionary instead
-                 # for our representation of empty.
-Index: roslaunch/test/unit/test_roslaunch_dump_params.py
-===================================================================
---- roslaunch.orig/test/unit/test_roslaunch_dump_params.py
-+++ roslaunch/test/unit/test_roslaunch_dump_params.py
-@@ -53,7 +53,7 @@ class TestDumpParams(unittest.TestCase):
-         o, e = p.communicate()
-         self.assert_(p.returncode == 0, "Return code nonzero for param dump! Code: %d" % (p.returncode))
- 
--        self.assertEquals({'/noop': 'noop'}, yaml.load(o))
-+        self.assertEquals({'/noop': 'noop'}, yaml.safe_load(o))
- 
-         p = Popen([cmd, '--dump-params', 'roslaunch', 'test-dump-rosparam.launch'], stdout = PIPE)
-         o, e = p.communicate()
-@@ -95,7 +95,7 @@ class TestDumpParams(unittest.TestCase):
-             '/noparam1': 'value1',
-             '/noparam2': 'value2',
-             }
--        output_val = yaml.load(o)
-+        output_val = yaml.safe_load(o)
-         if not val == output_val:
-             for k, v in val.items():
-                 if k not in output_val:
diff --git a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild b/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
deleted file mode 100644
index 4538fcdb1d63..000000000000
--- a/dev-ros/roslaunch/roslaunch-1.15.4.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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-1.14.3-r2.ebuild b/dev-ros/roslaunch/roslaunch-1.15.8-r1.ebuild
index 61eb48c58d38..b0c3d9412aae 100644
--- a/dev-ros/roslaunch/roslaunch-1.14.3-r2.ebuild
+++ b/dev-ros/roslaunch/roslaunch-1.15.8-r1.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=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin user
 
@@ -16,25 +15,24 @@ 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/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "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/rosparam[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosout
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 		dev-ros/test_rosmaster
 	)"
-PATCHES=( "${FILESDIR}/timeout.patch" "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
 
 src_test() {
-	rosdep update
+	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
 	ros-catkin_src_test
 }
 
diff --git a/dev-ros/roslaunch/roslaunch-9999.ebuild b/dev-ros/roslaunch/roslaunch-9999.ebuild
index 4538fcdb1d63..b0c3d9412aae 100644
--- a/dev-ros/roslaunch/roslaunch-9999.ebuild
+++ b/dev-ros/roslaunch/roslaunch-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=( python{2_7,3_6} pypy3 )
 
 inherit ros-catkin user
 
@@ -16,25 +15,24 @@ 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/roslib[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosclean[${PYTHON_SINGLE_USEDEP}]
+	$(python_gen_cond_dep "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/rosparam[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmaster[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosout
 "
 DEPEND="${RDEPEND}
 	test? (
-		dev-util/rosdep[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep "dev-util/rosdep[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
 		dev-ros/test_rosmaster
 	)"
-PATCHES=( "${FILESDIR}/timeout.patch" )
 
 src_test() {
-	rosdep update
+	export ROS_PACKAGE_PATH="${S}:${S}/../rosmaster/:${EPREFIX}/usr/share/ros_packages/rosparam:${EPREFIX}/usr/share/ros_packages/roslib:${EPREFIX}/usr/share/ros_packages/rosout"
 	ros-catkin_src_test
 }