gentoo resync : 25.08.2020

5 files changed, 41 insertions, 74 deletions

diff --git a/dev-ros/rqt_msg/Manifest b/dev-ros/rqt_msg/Manifest
index 984c4cd7fedb..3823279a5e79 100644
--- a/dev-ros/rqt_msg/Manifest
+++ b/dev-ros/rqt_msg/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_msg-0.4.8.tar.gz 6806 BLAKE2B de53b4025006ce38324f00afa80c4b437a80f0313b0814e60c8b2edee9695461cc33675e6a8c9aa52cda44eb79f2f7486eb90fe28727113eaf03b0cd3d905063 SHA512 d1598315f8cccdc83059046d0bbbd5fe970e4a2981f08cc9e3841fae12b85ca3f907a1509b024809ebf3834f8a2e40b7ed26ce39b2e1638d120ea5a749dd715e
-EBUILD rqt_msg-0.4.7.ebuild 758 BLAKE2B 2fa5abebc3f358922ba428df28f84b4fefda004ef09dc7d27249a6a2652db6cfbb5497f03a900a79cdd8148ca4a09cd03c18368f817f6282ca3464494213c454 SHA512 571ec91bf002ecbac397ed4e74adf88bd39bc5b90748acd8e841f8a765fcb12f8f95542dc37f66a5b8dad0ca4f419e62aa9f64d870fd9a638e2dbdc2382709ef
-EBUILD rqt_msg-0.4.8.ebuild 730 BLAKE2B 2b5e67a176ebd1b58a8448ae4d526b7113fdd5070808f5018b680dfba8ec935b5ee804f50b2e9b0cf309a3194be4664e7b91841ef4563ac7d95826f72956ff32 SHA512 140dd1afae8e2c6bb831401f89c9dea7bd498fb5fc95594b9f722565ab1af279947a09de685f34e54fc51c02f1e74760eef97c1f20d236fecb1ce9b4ec211bb0
-EBUILD rqt_msg-9999.ebuild 730 BLAKE2B 2b5e67a176ebd1b58a8448ae4d526b7113fdd5070808f5018b680dfba8ec935b5ee804f50b2e9b0cf309a3194be4664e7b91841ef4563ac7d95826f72956ff32 SHA512 140dd1afae8e2c6bb831401f89c9dea7bd498fb5fc95594b9f722565ab1af279947a09de685f34e54fc51c02f1e74760eef97c1f20d236fecb1ce9b4ec211bb0
+DIST rqt_msg-0.4.9.tar.gz 6920 BLAKE2B 5187c050972045401f76546f3e5abc9cfd9fd58d2a42cc0ae317e0f689ca7c3b73ae6f160777510a522670cd03d2553e195157ea51af81c73334c99f705c619c SHA512 a0d36bf30dbd3582d93c3d89d495b4b5aa25d76895b61eed70cc8878ced43e407a72d593e8b38194522d56cbfc2a5622c30179116dcd86de4d3e7b49dc24a9ff
+EBUILD rqt_msg-0.4.9.ebuild 781 BLAKE2B d1af9204bc0c781008668acd5dd22e3596305966c479488c7846d06d4ceeb4cd5e7c465c0bd7490c409003ba4877db495aabedec59ca4286bbef50ba0736e070 SHA512 42a0b1bc7b8ee75d9d958ac3fc5b8c43684068fb189c225e6aea003d5954268d144e2d24644cd007ad4c15b29d4d8e629ec77bfeb3a3dad8e440a915d9ead06a
+EBUILD rqt_msg-9999.ebuild 781 BLAKE2B d1af9204bc0c781008668acd5dd22e3596305966c479488c7846d06d4ceeb4cd5e7c465c0bd7490c409003ba4877db495aabedec59ca4286bbef50ba0736e070 SHA512 42a0b1bc7b8ee75d9d958ac3fc5b8c43684068fb189c225e6aea003d5954268d144e2d24644cd007ad4c15b29d4d8e629ec77bfeb3a3dad8e440a915d9ead06a
 MISC metadata.xml 339 BLAKE2B acb4a2863a4c506310686a1977f1637d738296860abaa3c3b3be8978e292ed4308fc2b6ced16161320f705b1d38558182861fcd273c8d43ed8472ea58856bf71 SHA512 0b20862cd86ae1fa79707986d39c0f33008fd7848fe9dafb0323dea6ebfa75634fd05befe068b72927d7188448ea2f3471cc0b78fad36a87b895b2b59d5ed726
diff --git a/dev-ros/rqt_msg/rqt_msg-0.4.7.ebuild b/dev-ros/rqt_msg/rqt_msg-0.4.7.ebuild
deleted file mode 100644
index 4f958e5b9a99..000000000000
--- a/dev-ros/rqt_msg/rqt_msg-0.4.7.ebuild
+++ /dev/null
@@ -1,29 +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="Python GUI plugin for introspecting available ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_msg/rqt_msg-0.4.8.ebuild b/dev-ros/rqt_msg/rqt_msg-0.4.8.ebuild
deleted file mode 100644
index 01361aa919a8..000000000000
--- a/dev-ros/rqt_msg/rqt_msg-0.4.8.ebuild
+++ /dev/null
@@ -1,28 +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_msg"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Python GUI plugin for introspecting available ROS message types"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_msg/rqt_msg-0.4.9.ebuild b/dev-ros/rqt_msg/rqt_msg-0.4.9.ebuild
new file mode 100644
index 000000000000..d88c80ad96cd
--- /dev/null
+++ b/dev-ros/rqt_msg/rqt_msg-0.4.9.ebuild
@@ -0,0 +1,27 @@
+# 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_msg"
+
+inherit ros-catkin
+
+DESCRIPTION="Python GUI plugin for introspecting available ROS message types"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_msg/rqt_msg-9999.ebuild b/dev-ros/rqt_msg/rqt_msg-9999.ebuild
index 01361aa919a8..d88c80ad96cd 100644
--- a/dev-ros/rqt_msg/rqt_msg-9999.ebuild
+++ b/dev-ros/rqt_msg/rqt_msg-9999.ebuild
@@ -1,11 +1,10 @@
-# 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_msg"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,14 +14,14 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosmsg[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_console[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosmsg[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_py_common[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_console[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"