gentoo resync : 25.08.2020

5 files changed, 35 insertions, 64 deletions

diff --git a/dev-ros/rqt_topic/Manifest b/dev-ros/rqt_topic/Manifest
index 4656e774419f..af13e2ca6402 100644
--- a/dev-ros/rqt_topic/Manifest
+++ b/dev-ros/rqt_topic/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_topic-0.4.10.tar.gz 8907 BLAKE2B 92343432ddf3b2bd9dff600f088935ca6bceac0239f2818b9a5601a2702bac52c13526571c0be454c41dfe14f2d6baab48e6f95f004c233f474d5fc6ac943423 SHA512 d16c882091d7d2f5701a399faca4dfd5331bbf66b84222cfafcdfc8b362ccff667b9d13bfc2143d41b5d2261b98dde4e0e967c7123ec06b390c80b846a4beae0
-DIST rqt_topic-0.4.9.tar.gz 8794 BLAKE2B c239e6a54bdcbe4bc2c55bd08a74d523399478ba19b2502f9f75038e2fa7ff949f3e0fd76ec25a3443a037f975eb04625fe37e7fa51240022cac28d979337ebb SHA512 ca7b9a9459406dbafcf58b23fe6695b7f5627326cf0c5f2b5d5bb61475c34200181d4702270a6bad59e23ea0706463e15839624d128f063db167cc5fb60182b9
-EBUILD rqt_topic-0.4.10.ebuild 620 BLAKE2B caad682985e0f871f8317cd2026a774d24b6ac11380bd39ac246de2f37450a2b573e92ac146948927d271aa8a2cbc2951b5ab47d9f82e990bbbff9b053435625 SHA512 bd69c03e965bd8ea1cf591be49f826b7fda0b8d5c1d7f5b8ca0566eec1754457db271f2778ed4e1ee1ac834a02e13e2984c839cc2edde5b5d1610c33c40a930a
-EBUILD rqt_topic-0.4.9.ebuild 620 BLAKE2B caad682985e0f871f8317cd2026a774d24b6ac11380bd39ac246de2f37450a2b573e92ac146948927d271aa8a2cbc2951b5ab47d9f82e990bbbff9b053435625 SHA512 bd69c03e965bd8ea1cf591be49f826b7fda0b8d5c1d7f5b8ca0566eec1754457db271f2778ed4e1ee1ac834a02e13e2984c839cc2edde5b5d1610c33c40a930a
-EBUILD rqt_topic-9999.ebuild 620 BLAKE2B caad682985e0f871f8317cd2026a774d24b6ac11380bd39ac246de2f37450a2b573e92ac146948927d271aa8a2cbc2951b5ab47d9f82e990bbbff9b053435625 SHA512 bd69c03e965bd8ea1cf591be49f826b7fda0b8d5c1d7f5b8ca0566eec1754457db271f2778ed4e1ee1ac834a02e13e2984c839cc2edde5b5d1610c33c40a930a
+DIST rqt_topic-0.4.12.tar.gz 9104 BLAKE2B e40341efb53c25cadbf4143f73f8c36ffb5635212f1f4f26f937d4bbfb7ca9b70a596dab98ad1a941ae72e26e86741893a52ca22b0353e36bfbe5a016c675836 SHA512 1e124e10aade7150c4f0599ec0aba04a0bee25253318a4cc99d03164575ba79d4a8cbef170b527c5209989c480d9ce6d00c4267d96976500fcc9f9ba6fb11ba7
+EBUILD rqt_topic-0.4.12.ebuild 650 BLAKE2B d6207d32f0492ae233d1c3c833a5405190e8972c021be95cf5bfff722055a482598d712bb3022850a8008a4f3e3d706ad65a3c112a92d1c2d4814125f3f14578 SHA512 77012707abfce9e77446721d9b745034af05deb784e3be4ed358abcb0885dc054e0069ee1f1720f00f54f9d22b0f4e80b8bd8d0a4940bba13a7df98832eb4042
+EBUILD rqt_topic-9999.ebuild 650 BLAKE2B d6207d32f0492ae233d1c3c833a5405190e8972c021be95cf5bfff722055a482598d712bb3022850a8008a4f3e3d706ad65a3c112a92d1c2d4814125f3f14578 SHA512 77012707abfce9e77446721d9b745034af05deb784e3be4ed358abcb0885dc054e0069ee1f1720f00f54f9d22b0f4e80b8bd8d0a4940bba13a7df98832eb4042
 MISC metadata.xml 341 BLAKE2B 712951d9154df7294a560ebaebf9a2b5dffb344496533d99fc33559103e09e1f362ec4038adbbedc8022999f10037a302c740c8723d1431e8045dbe143e58b2b SHA512 ce655ab4c0bb16df2aa621fecc2007c580b556a95b9a40e28d8b74f76bd4605e0c731d7c4424573af5262f1094a0175b8e7ce61b0487679e2ce067e483327130
diff --git a/dev-ros/rqt_topic/rqt_topic-0.4.10.ebuild b/dev-ros/rqt_topic/rqt_topic-0.4.10.ebuild
deleted file mode 100644
index bf621ebec809..000000000000
--- a/dev-ros/rqt_topic/rqt_topic-0.4.10.ebuild
+++ /dev/null
@@ -1,25 +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_topic"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying debug information about ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_topic/rqt_topic-0.4.12.ebuild b/dev-ros/rqt_topic/rqt_topic-0.4.12.ebuild
new file mode 100644
index 000000000000..e99b6145b05f
--- /dev/null
+++ b/dev-ros/rqt_topic/rqt_topic-0.4.12.ebuild
@@ -0,0 +1,24 @@
+# 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_topic"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for displaying debug information about ROS topics"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_topic/rqt_topic-0.4.9.ebuild b/dev-ros/rqt_topic/rqt_topic-0.4.9.ebuild
deleted file mode 100644
index bf621ebec809..000000000000
--- a/dev-ros/rqt_topic/rqt_topic-0.4.9.ebuild
+++ /dev/null
@@ -1,25 +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_topic"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying debug information about ROS topics"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_topic/rqt_topic-9999.ebuild b/dev-ros/rqt_topic/rqt_topic-9999.ebuild
index bf621ebec809..e99b6145b05f 100644
--- a/dev-ros/rqt_topic/rqt_topic-9999.ebuild
+++ b/dev-ros/rqt_topic/rqt_topic-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_topic"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,11 +14,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"