gentoo resync : 25.08.2020

5 files changed, 49 insertions, 67 deletions

diff --git a/dev-ros/rqt_py_common/Manifest b/dev-ros/rqt_py_common/Manifest
index 9cc565a49dca..11da6ca7664e 100644
--- a/dev-ros/rqt_py_common/Manifest
+++ b/dev-ros/rqt_py_common/Manifest
@@ -1,6 +1,4 @@
-DIST rqt-0.5.0.tar.gz 120992 BLAKE2B 645d53ec7070fc5a40760bedc556328e26a16dea7b2990ad0512bc372cb346d545dbea42689b4c39039f17abc4920d5059e5b9a25ac7b77f8b5e5cc02100c5ac SHA512 5c91fe9bce5a7cb0cdc54b42667488d30c33bd57afd30cc8f2047b91b7aa7b8afd936090bfc76be5dbc8c6497623c1be4340e061503f5a65bc94faaad810597e
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-EBUILD rqt_py_common-0.4.7.ebuild 628 BLAKE2B 62a01fbe0f63a31efc91153b13ec583a518b10e4cfd8d94c25d4d75606e0736947c705255978b27274b4cab0fc581e3f6efd482618843cea2fc329aece671ac5 SHA512 dca103c5244abd9bb1cbeb79acccd4d5a65dcc1469f2c98724b52b2857f08dc44420c591c3b6d8fcec2ddbd06f289159760b7da89b3e70f073a31fadf79ab8b4
-EBUILD rqt_py_common-0.5.0.ebuild 613 BLAKE2B d2b87a923203a15f78aaeedcac770b298da4fdb6e2ef0e29c929f909ef5b540b7384b778cded7bdb08475f59b13db42163967272952b36b840998a204a50248a SHA512 ff8f377586d9cf7a14bd0a3224479c37713c303f0487de830822bba29c6b74763e685c4dd1390a6d6105c3f78a7174b889522d6b629a890130e18f347a360299
-EBUILD rqt_py_common-9999.ebuild 613 BLAKE2B d2b87a923203a15f78aaeedcac770b298da4fdb6e2ef0e29c929f909ef5b540b7384b778cded7bdb08475f59b13db42163967272952b36b840998a204a50248a SHA512 ff8f377586d9cf7a14bd0a3224479c37713c303f0487de830822bba29c6b74763e685c4dd1390a6d6105c3f78a7174b889522d6b629a890130e18f347a360299
+DIST rqt-0.5.2.tar.gz 121619 BLAKE2B a065501ee6f78b3e2867aa9a6fc416b70472a3dcd3bf447ab7c07941284add7fdaffafa4bc370ce73b777b9616544a6650bb94c30fb61bed8ce6381a2d88b5cd SHA512 09093e80daefd530b36c1ef90a350c0c5fa7ba4211b779da38c230df445170e766a737cfadec29997f81968c454daec2ffc2b6cf236e41daa21d9536f498fc17
+EBUILD rqt_py_common-0.5.2.ebuild 736 BLAKE2B 5033f9fc2bc57dd9f9c33cf9ce54c7be3b4b75de5e5d53cf1ad615f9bd8bf56470b99a44e5df1f29dfe9e1007e9bf343b9e176c957f823dec88699373071094a SHA512 4231a76d261b436f86cfbb12d6b71d01dc0efd1ac2f3c4b64c55ead921454175ca09bb50347e2c7420b0157c48202918a23574f8eae33d926567e303ee15f6a3
+EBUILD rqt_py_common-9999.ebuild 736 BLAKE2B 5033f9fc2bc57dd9f9c33cf9ce54c7be3b4b75de5e5d53cf1ad615f9bd8bf56470b99a44e5df1f29dfe9e1007e9bf343b9e176c957f823dec88699373071094a SHA512 4231a76d261b436f86cfbb12d6b71d01dc0efd1ac2f3c4b64c55ead921454175ca09bb50347e2c7420b0157c48202918a23574f8eae33d926567e303ee15f6a3
 MISC metadata.xml 335 BLAKE2B 132c01d79a583ad6be876acab7644c890ccd31d44ee3ec46644eb005b56042ba1e687239dead37b4e592536493e82a74bfd22a99661a3945dfdf79448e9ca450 SHA512 d861666a6188e5bce041f76eedc1c3c18c8f1a185b5481e16f57481d7836f4fd71e9fb04b6f0c58c0cf4f5f77595e7675e2761699efdb2f697ec76cd6d0941f4
diff --git a/dev-ros/rqt_py_common/rqt_py_common-0.4.7.ebuild b/dev-ros/rqt_py_common/rqt_py_common-0.4.7.ebuild
deleted file mode 100644
index e027b886f6d8..000000000000
--- a/dev-ros/rqt_py_common/rqt_py_common-0.4.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for rqt plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_py_common/rqt_py_common-0.5.0.ebuild b/dev-ros/rqt_py_common/rqt_py_common-0.5.0.ebuild
deleted file mode 100644
index bb0ac4b8ba23..000000000000
--- a/dev-ros/rqt_py_common/rqt_py_common-0.5.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KEYWORDS="~amd64"
-ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for rqt plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_py_common/rqt_py_common-0.5.2.ebuild b/dev-ros/rqt_py_common/rqt_py_common-0.5.2.ebuild
new file mode 100644
index 000000000000..7f032e6025de
--- /dev/null
+++ b/dev-ros/rqt_py_common/rqt_py_common-0.5.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KEYWORDS="~amd64"
+ROS_REPO_URI="https://github.com/ros-visualization/rqt"
+ROS_SUBDIR=${PN}
+# Tests have messages
+CATKIN_HAS_MESSAGES=yes
+
+inherit ros-catkin
+
+DESCRIPTION="Common functionality for rqt plugins written in Python"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
+"
diff --git a/dev-ros/rqt_py_common/rqt_py_common-9999.ebuild b/dev-ros/rqt_py_common/rqt_py_common-9999.ebuild
index bb0ac4b8ba23..7f032e6025de 100644
--- a/dev-ros/rqt_py_common/rqt_py_common-9999.ebuild
+++ b/dev-ros/rqt_py_common/rqt_py_common-9999.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 KEYWORDS="~amd64"
 ROS_REPO_URI="https://github.com/ros-visualization/rqt"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
+# Tests have messages
+CATKIN_HAS_MESSAGES=yes
 
 inherit ros-catkin
 
@@ -16,11 +17,15 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	)
 "
-DEPEND="${RDEPEND}"