gentoo resync : 25.08.2020

7 files changed, 24 insertions, 176 deletions

diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest
index 884fb3c15fb7..2417c1bb3d6f 100644
--- a/dev-ros/test_rosmaster/Manifest
+++ b/dev-ros/test_rosmaster/Manifest
@@ -1,9 +1,4 @@
-AUX empty.patch 389 BLAKE2B 7ff08d2bd3cc7c14a4e93cc2ff4a89029f8e922f545c707d14b604a207170a1bbe8f0321c64882d6cc0f614670a8fe6f173e787c7b672a60afb1f8a3a289fe11 SHA512 c6ae83e53ec66fe390647e04c0ddf4ab8a7fcd20dfc6ab4c26012011f8033d3f5120f05eb7f6a71da361592058bcea521ca7839f3158c2fb63b68961c01ef9e6
-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
+DIST ros_comm-1.15.8.tar.gz 1080826 BLAKE2B c1a1e085225a96cf0b50309cb78e1ccdabefce1f23ee669393b7fc747537c7e39bfb6ad382b0d24e3b5507b1d0f3eaf2051a1bee90507b0e724e06a83df301a2 SHA512 b1c34ab6548400fc014eda496e5d1e1c7d134b9062a031386ac4eac3245ca83b034f74f0a189ccf9ec6933c18d6df0ae1a93d05f1526d09debf70c25aa25b6b9
+EBUILD test_rosmaster-1.15.8.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
+EBUILD test_rosmaster-9999.ebuild 783 BLAKE2B 13c70c437a3f2d082ce7f8fde7476b2e02f53d42c2733f2334cc6f9e7d1e08ea07359792992ec772c007bacc9750dbd3de7521480270d3764d3d267e2b550a39 SHA512 8945deb795c584b316d0a9f612f472a5ab60e546293e4c4f633e77a05b4159c145b23f88f488fcb5a19dd9a749bea7cac7fe3a3240a5172320c5b7147c51ea2e
 MISC metadata.xml 326 BLAKE2B c8975866f4616482c71ac67084df89cea2643cc8233957c86450f7dba2ce320448e4e95fd1495c81717559d3fc5384dcc19f2182d3a348e4dcf2ea4d248e702e SHA512 6f647154c02825982d150588332801ad4c10c75cc5997b7825c0dd0381f48f6a3d09bf88346bc3e075891e77ca43a0a4c9f9c65962fd791085385c4229a1eb45
diff --git a/dev-ros/test_rosmaster/files/empty.patch b/dev-ros/test_rosmaster/files/empty.patch
deleted file mode 100644
index 8ec371c917c0..000000000000
--- a/dev-ros/test_rosmaster/files/empty.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: test_rosmaster/CMakeLists.txt
-===================================================================
---- test_rosmaster.orig/CMakeLists.txt
-+++ test_rosmaster/CMakeLists.txt
-@@ -10,6 +10,7 @@ if(CATKIN_ENABLE_TESTING)
-     String.msg
-     Arrays.msg
-     CompositeA.msg CompositeB.msg Composite.msg
-+    Empty.msg
-     Embed.msg Floats.msg Simple.msg
-     RosmsgA.msg
-     RosmsgB.msg
diff --git a/dev-ros/test_rosmaster/files/py3.patch b/dev-ros/test_rosmaster/files/py3.patch
deleted file mode 100644
index 579d24f9f0b5..000000000000
--- a/dev-ros/test_rosmaster/files/py3.patch
+++ /dev/null
@@ -1,54 +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/test/test_rosmaster/test/nodes/testAllCommonFlows b/test/test_rosmaster/test/nodes/testAllCommonFlows
-index 4d3e053f8..a22ffb8d8 100755
---- a/test/test_rosmaster/test/nodes/testAllCommonFlows
-+++ b/test/test_rosmaster/test/nodes/testAllCommonFlows
-@@ -12,7 +12,7 @@ import sys, os
- BOOTSTRAP_VERSION = "0.1"
- 
- # Read in ROS_ROOT
--if not os.environ.has_key('ROS_ROOT'):
-+if 'ROS_ROOT' not in os.environ:
-   print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the 
- location of your ROS install.\n"""
-   sys.exit(-1)
-diff --git a/test/test_rosmaster/test/nodes/testMaster b/test/test_rosmaster/test/nodes/testMaster
-index f3ec36be4..4dca1cb4a 100755
---- a/test/test_rosmaster/test/nodes/testMaster
-+++ b/test/test_rosmaster/test/nodes/testMaster
-@@ -12,7 +12,7 @@ import sys, os
- BOOTSTRAP_VERSION = "0.1"
- 
- # Read in ROS_ROOT
--if not os.environ.has_key('ROS_ROOT'):
-+if 'ROS_ROOT' not in os.environ:
-   print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the 
- location of your ROS install.\n"""
-   sys.exit(-1)
-diff --git a/test/test_rosmaster/test/nodes/testSlave b/test/test_rosmaster/test/nodes/testSlave
-index cf70af08b..f8ea7cb47 100755
---- a/test/test_rosmaster/test/nodes/testSlave
-+++ b/test/test_rosmaster/test/nodes/testSlave
-@@ -12,7 +12,7 @@ import sys, os
- BOOTSTRAP_VERSION = "0.1"
- 
- # Read in ROS_ROOT
--if not os.environ.has_key('ROS_ROOT'):
-+if 'ROS_ROOT' not in os.environ:
-   print """\nCannot run ROS: ROS_ROOT is not set.\nPlease set the ROS_ROOT environment variable to the 
- location of your ROS install.\n"""
-   sys.exit(-1)
diff --git a/dev-ros/test_rosmaster/files/yaml.patch b/dev-ros/test_rosmaster/files/yaml.patch
deleted file mode 100644
index 2eb9c086b7e4..000000000000
--- a/dev-ros/test_rosmaster/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/test/test_rosmaster/test/client_verification/test_slave_api.py b/test/test_rosmaster/test/client_verification/test_slave_api.py
-index 63d919c72..8614c045d 100755
---- a/test/test_rosmaster/test/client_verification/test_slave_api.py
-+++ b/test/test_rosmaster/test/client_verification/test_slave_api.py
-@@ -106,7 +106,7 @@ def __init__(self, *args, **kwds):
-     def load_profile(self, filename):
-         import yaml
-         with open(filename) as f:
--            d = yaml.load(f)
-+            d = yaml.safe_load(f)
-         self.required_pubs = d.get('pubs', {})
-         self.required_subs = d.get('subs', {})
-         
diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild
deleted file mode 100644
index d09c050ee2a7..000000000000
--- a/dev-ros/test_rosmaster/test_rosmaster-1.14.3-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2019 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}] )
-"
-PATCHES=( "${FILESDIR}/yaml.patch" "${FILESDIR}/empty.patch" "${FILESDIR}/py3.patch" )
-
-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_rosmaster/test_rosmaster-1.15.4.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.15.8.ebuild
index ea88573de821..6a163fb0f0ad 100644
--- a/dev-ros/test_rosmaster/test_rosmaster-1.15.4.ebuild
+++ b/dev-ros/test_rosmaster/test_rosmaster-1.15.8.ebuild
@@ -1,15 +1,13 @@
 # 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=test/${PN}
 CATKIN_HAS_MESSAGES=yes
 
-PYTHON_COMPAT=( python2_7 )
-
 inherit ros-catkin
 
 DESCRIPTION="Unit tests for rosmaster"
@@ -17,15 +15,20 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
+	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
 "
 
 mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
 
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
+
 src_install() {
 	ros-catkin_src_install
 	dodir /usr/share/${PN}
diff --git a/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild b/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
index aec1968cf2c2..6a163fb0f0ad 100644
--- a/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
+++ b/dev-ros/test_rosmaster/test_rosmaster-9999.ebuild
@@ -1,15 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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=test/${PN}
 CATKIN_HAS_MESSAGES=yes
 
-PYTHON_COMPAT=( python2_7 )
-
 inherit ros-catkin
 
 DESCRIPTION="Unit tests for rosmaster"
@@ -17,15 +15,20 @@ LICENSE="BSD"
 SLOT="0"
 IUSE=""
 
-RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostest[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]"
+RDEPEND="dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostest[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]"
 DEPEND="${RDEPEND}
-	test? (	dev-ros/roslib[${PYTHON_USEDEP}] )
+	test? (	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}] )
 "
 
 mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" )
 
+src_test() {
+	export ROS_PACKAGE_PATH="${S}:${ROS_PACKAGE_PATH}"
+	ros-catkin_src_test
+}
+
 src_install() {
 	ros-catkin_src_install
 	dodir /usr/share/${PN}