gentoo resync : 25.08.2020

8 files changed, 46 insertions, 210 deletions

diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest
index 269425a10d7e..e832b8198ce8 100644
--- a/dev-ros/rosgraph/Manifest
+++ b/dev-ros/rosgraph/Manifest
@@ -1,9 +1,4 @@
-AUX py3-2.patch 2357 BLAKE2B a3af95fdd93c1e5540626a529696583c366623a34a056122efde2eccf19219c70528cfcf227ffe96c2e5c90c5d26da5127f5ae3fdbd47a0da045dea4e9b34f08 SHA512 3437178097e04ac0b169a0612579a839f1d1d391859df9e215a3a016b301d1a22cd37a1c25684d55e7af0958a46af0e6d8ed759798a350dd7839a1b2b5bc7783
-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
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD rosgraph-1.15.8.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
+EBUILD rosgraph-9999.ebuild 710 BLAKE2B 950e34d102bc2aa25a4abf3edfe5cc45385467704018fd872354da1b44c1eff914701a0d7c2d3cf8190660fcf0bbff0901217f0009a48472865278defc3a33d0 SHA512 17f5432be62c756cea092e8bafbbcdd5df2d5cbc52b288216b77ec418afca3359812019e5b283edee5a997c4e60bf8413b2edc3f97d9c3841e42b4af4cfd9c92
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/rosgraph/files/py3-2.patch b/dev-ros/rosgraph/files/py3-2.patch
deleted file mode 100644
index b83b349576bd..000000000000
--- a/dev-ros/rosgraph/files/py3-2.patch
+++ /dev/null
@@ -1,52 +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/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
-index bbf1d9f49..51c39becd 100644
---- a/tools/rosgraph/src/rosgraph/roslogging.py
-+++ b/tools/rosgraph/src/rosgraph/roslogging.py
-@@ -49,7 +49,7 @@
- class LoggingException(Exception): pass
- 
- class RospyLogger(logging.getLoggerClass()):
--    def findCaller(self, dummy=False): # Dummy second arg to match Python3 function declaration
-+    def findCaller(self, stack_info=False):
-         """
-         Find the stack frame of the caller so that we can note the source
-         file name, line number, and function name with class name if possible.
-diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py
-index 4ac4f8291..1c3cb5df5 100644
---- a/tools/rosgraph/test/test_roslogging_user_logger.py
-+++ b/tools/rosgraph/test/test_roslogging_user_logger.py
-@@ -51,12 +51,16 @@
- 
- # set user defined custom logger
- class UserCustomLogger(logging.Logger):
--    def findCaller(self):
-+    def findCaller(self, stack_info=False):
-         """Returns static caller.
- 
-         This method is being overwritten in rosgraph.roslogging.
-         """
--        return '<filename>', '<lineno>', '<func_name>'
-+        if sys.version_info > (3, 2):
-+            # Dummy last argument to match Python3 return type
-+            return '<filename>', '<lineno>', '<func_name>', None
-+        else:
-+            return '<filename>', '<lineno>', '<func_name>'
- 
-     def _log(self, level, msg, args, exc_info=None, extra=None):
-         """Write log with ROS_IP.
diff --git a/dev-ros/rosgraph/files/py3.patch b/dev-ros/rosgraph/files/py3.patch
deleted file mode 100644
index 45798c1d618e..000000000000
--- a/dev-ros/rosgraph/files/py3.patch
+++ /dev/null
@@ -1,47 +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/rosgraph/test/test_roslogging.py b/tools/rosgraph/test/test_roslogging.py
-index f9e618f87..ca38c80e8 100644
---- a/tools/rosgraph/test/test_roslogging.py
-+++ b/tools/rosgraph/test/test_roslogging.py
-@@ -32,7 +32,10 @@
- 
- import logging
- import os
--from StringIO import StringIO
-+try:
-+    from cStringIO import StringIO
-+except ImportError:
-+    from io import StringIO
- import sys
- 
- import re
-diff --git a/tools/rosgraph/test/test_roslogging_user_logger.py b/tools/rosgraph/test/test_roslogging_user_logger.py
-index 62051638a..4ac4f8291 100644
---- a/tools/rosgraph/test/test_roslogging_user_logger.py
-+++ b/tools/rosgraph/test/test_roslogging_user_logger.py
-@@ -38,7 +38,10 @@
- 
- import logging
- import os
--from StringIO import StringIO
-+try:
-+    from cStringIO import StringIO
-+except ImportError:
-+    from io import StringIO
- import sys
- 
- from nose.tools import assert_regexp_matches
diff --git a/dev-ros/rosgraph/files/yaml.patch b/dev-ros/rosgraph/files/yaml.patch
deleted file mode 100644
index 32ea589c8e49..000000000000
--- a/dev-ros/rosgraph/files/yaml.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 29053c4832229efa7160fb944c05e3bc82e11540 Mon Sep 17 00:00:00 2001
-From: Martijn Buijs <Martijn.buijs@gmail.com>
-Date: Tue, 23 Apr 2019 18:20:12 +0200
-Subject: [PATCH] Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
- (#1688)
-
-* Switch to yaml.safe_load(_all) to prevent YAMLLoadWarning
-
-* Change all usages of yaml.load to yaml.safe_load
-
-* Extend PyYAML's SafeLoader and use it with `yaml.load`
-
-Also added convenience functions for using this loader for reuse in
-`roslaunch`
-
-* fix typo in rosparam.yaml_load_all
-
-* Modify Loader and SafeLoader in yaml module directly
-
-* Revert whitespace change
-
-* Revert unrelated change to import through global variable construction
----
- clients/rospy/src/rospy/client.py             |  2 +-
- .../test/test_roslib_message.py               |  2 +-
- .../client_verification/test_slave_api.py     |  2 +-
- test/test_rosparam/test/check_rosparam.py     |  8 ++---
- .../check_rosparam_command_line_online.py     |  2 +-
- .../check_rosservice_command_line_online.py   |  4 +--
- test/test_rostopic/test/test_rostopic_unit.py | 30 +++++++++----------
- tools/rosbag/src/rosbag/bag.py                |  2 +-
- tools/rosgraph/src/rosgraph/roslogging.py     |  2 +-
- tools/roslaunch/src/roslaunch/loader.py       |  4 +--
- .../test/unit/test_roslaunch_dump_params.py   |  4 +--
- tools/rosparam/src/rosparam/__init__.py       |  7 ++++-
- tools/rosservice/src/rosservice/__init__.py   |  4 +--
- tools/rostopic/src/rostopic/__init__.py       |  6 ++--
- tools/topic_tools/scripts/relay_field         |  2 +-
- 15 files changed, 43 insertions(+), 38 deletions(-)
-
-diff --git a/tools/rosgraph/src/rosgraph/roslogging.py b/tools/rosgraph/src/rosgraph/roslogging.py
-index ffe975dab..bbf1d9f49 100644
---- a/tools/rosgraph/src/rosgraph/roslogging.py
-+++ b/tools/rosgraph/src/rosgraph/roslogging.py
-@@ -178,7 +178,7 @@ def configure_logging(logname, level=logging.INFO, filename=None, env=None):
-     os.environ['ROS_LOG_FILENAME'] = log_filename
-     if config_file.endswith(('.yaml', '.yml')):
-         with open(config_file) as f:
--            dict_conf = yaml.load(f)
-+            dict_conf = yaml.safe_load(f)
-         dict_conf.setdefault('version', 1)
-         logging.config.dictConfig(dict_conf)
-     else:
diff --git a/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild b/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild
deleted file mode 100644
index a3f0ad00a7c1..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,23 +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"
-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}] )"
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/py3.patch" "${FILESDIR}/py3-2.patch" )
diff --git a/dev-ros/rosgraph/rosgraph-1.15.4.ebuild b/dev-ros/rosgraph/rosgraph-1.15.4.ebuild
deleted file mode 100644
index 49cca14bf4f3..000000000000
--- a/dev-ros/rosgraph/rosgraph-1.15.4.ebuild
+++ /dev/null
@@ -1,22 +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"
-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/rosgraph/rosgraph-1.15.8.ebuild b/dev-ros/rosgraph/rosgraph-1.15.8.ebuild
new file mode 100644
index 000000000000..171218629338
--- /dev/null
+++ b/dev-ros/rosgraph/rosgraph-1.15.8.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"
+ROS_SUBDIR=tools/${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Prints information about the ROS Computation Graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
diff --git a/dev-ros/rosgraph/rosgraph-9999.ebuild b/dev-ros/rosgraph/rosgraph-9999.ebuild
index 49cca14bf4f3..171218629338 100644
--- a/dev-ros/rosgraph/rosgraph-9999.ebuild
+++ b/dev-ros/rosgraph/rosgraph-9999.ebuild
@@ -1,11 +1,10 @@
 # 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"
-PYTHON_COMPAT=( python{2_7,3_6} pypy3 )
 ROS_SUBDIR=tools/${PN}
 
 inherit ros-catkin
@@ -16,7 +15,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/netifaces[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep "dev-python/netifaces[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+"
 DEPEND="${RDEPEND}
-	test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )"
+	test? (
+		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+	)"
+
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}