gentoo resync : 25.08.2020

6 files changed, 43 insertions, 96 deletions

diff --git a/dev-ros/rqt_dep/Manifest b/dev-ros/rqt_dep/Manifest
index 2e6e81b37465..93b1e208ffef 100644
--- a/dev-ros/rqt_dep/Manifest
+++ b/dev-ros/rqt_dep/Manifest
@@ -1,8 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_dep-0.4.8.tar.gz 12398 BLAKE2B c44a245163e198d60ce030425861a7088432ba4fd5dabb697c0f3644a233bb5b48e6be6f759de4f2f62ca4cb87a99d01eea50446afb9c71cded78e15c5aa45d8 SHA512 b56f1b78ab80feeef3965586d5b67d5342113e9ec2ccc2964c255bcf06b311b112346d2fe48f4cf5c92c97c396917d915999c36b46279be98e3be30b0a4212dd
-DIST rqt_dep-0.4.9.tar.gz 12506 BLAKE2B aa5e70cbb2341410a549441ecf7d7b1b06cc8263112523c32433ad1a86e3f5db963f0215c2f7ea241f0466a463551c717400093e010cab6831968967b2df429c SHA512 4f23f9414bd461ca3086a1e81318ba7282ebe29b3edf019413bbb12ded6f2812254931a0a39cb1632f62bf1655b1af621042232615e2dacacb5eee7dd2b7edf0
-EBUILD rqt_dep-0.4.7.ebuild 675 BLAKE2B 1d6ed10eba23376a4b445fafd54863705e4c0d4a2841af9aa071836cde7afb91550f35a4e84728765fac1858fcd12cd7c54d3a9a36c4b5436cad3eecdd31d360 SHA512 b7f2703bc313d166b39f30ad736df4690b045a3467c573be0d9fce7eaf5817b0360f2bb8bfa0317873cf9376a8fc8a0e46e50b91e8b0fd5cd70b8de5d4648095
-EBUILD rqt_dep-0.4.8.ebuild 647 BLAKE2B 689f77b5fccdab4dd642c44c0228f06f073e3de946a51ee0444885c37e58c581f3deba50ba7aa27ea0faa9edc3e59859637ba15a57e1a89f8cffcfb696c7a0a6 SHA512 2e46cf58f4bc4dca6df3d945e40e43ebc7e667fd8f1a4e086fbd1284310dc120bb60bcbb7aef9963ee451184391f8d35dd5a0920dd91a81716557a618ddfb795
-EBUILD rqt_dep-0.4.9.ebuild 647 BLAKE2B 5008fe10f5ca15da17bdb887f12b8e56b67f8ff87bf8fb67ecc3b48c31457253f38c72784fe3764bfa8f0c08c98128a11f38ed006deafd23c6bcfe9e37642d7f SHA512 59c67c079dffd1269111eb93e3e8d2eeb877ea379fbe57dd5e4266a53b6d74356b133c009c5ac2df00bfe50ab756bc70e958317ab34273f5de7f47ad61366629
-EBUILD rqt_dep-9999.ebuild 647 BLAKE2B 689f77b5fccdab4dd642c44c0228f06f073e3de946a51ee0444885c37e58c581f3deba50ba7aa27ea0faa9edc3e59859637ba15a57e1a89f8cffcfb696c7a0a6 SHA512 2e46cf58f4bc4dca6df3d945e40e43ebc7e667fd8f1a4e086fbd1284310dc120bb60bcbb7aef9963ee451184391f8d35dd5a0920dd91a81716557a618ddfb795
+DIST rqt_dep-0.4.10.tar.gz 12730 BLAKE2B dfb0624433086a005f3a0c85dc9e5ff92e018a47d541a039a29f9b39bcf1bd99a99ef1abac847b73b643ad043f8732ecb2f34c8adbb128e95339d1625a8527ba SHA512 6cd590e991a786f3017956a25fc8a977ab581ee931710637a9b4e4cff5f2f863e67c1923dbaf66ad203ae12e484a124d822ccbdc7dde57856e4011e6cc722221
+EBUILD rqt_dep-0.4.10.ebuild 768 BLAKE2B d37dc8a7bfc7fc8dbb13fdad59418f9d5181b1447e9f60199a20b8f950627f63a7f9e8cc5643f9a429b18e36efe77ff7efb73224e8d3e960590748c974cac72c SHA512 0304c38f7007bc09267939a72b8f1eadd9ac4ac32a152c8ccd72f3e23b2ca2245011a74d4e90172af4781297b48d43955ebe09c45461aacfb4e92995371be5f3
+EBUILD rqt_dep-9999.ebuild 768 BLAKE2B d37dc8a7bfc7fc8dbb13fdad59418f9d5181b1447e9f60199a20b8f950627f63a7f9e8cc5643f9a429b18e36efe77ff7efb73224e8d3e960590748c974cac72c SHA512 0304c38f7007bc09267939a72b8f1eadd9ac4ac32a152c8ccd72f3e23b2ca2245011a74d4e90172af4781297b48d43955ebe09c45461aacfb4e92995371be5f3
 MISC metadata.xml 339 BLAKE2B 88e2a45dbf383c5addb2bc4ad4d83ec4b75ce5eaa525f40422964e12df5a35b402cc5b36d3a579ae37608c3d9ee17bcdda88e605cce24b85edaa103c47da0245 SHA512 9634570bb6226eea78ab642d0645516e9c523e4669fbd42b1a375f3f56e37ce9a87dff464fcc0c956c21606066bd71378ab4dc11a7590282ac8b011223d1ec96
diff --git a/dev-ros/rqt_dep/rqt_dep-0.4.10.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.10.ebuild
new file mode 100644
index 000000000000..0f0d8315777a
--- /dev/null
+++ b/dev-ros/rqt_dep/rqt_dep-0.4.10.ebuild
@@ -0,0 +1,28 @@
+# 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_dep"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for visualizing the ROS dependency graph"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/qt_dotgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_graph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
+	)"
diff --git a/dev-ros/rqt_dep/rqt_dep-0.4.7.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.7.ebuild
deleted file mode 100644
index c6feb5ba6f29..000000000000
--- a/dev-ros/rqt_dep/rqt_dep-0.4.7.ebuild
+++ /dev/null
@@ -1,27 +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="GUI plugin for visualizing the ROS dependency graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rqt_dep/rqt_dep-0.4.8.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.8.ebuild
deleted file mode 100644
index da5568842166..000000000000
--- a/dev-ros/rqt_dep/rqt_dep-0.4.8.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_dep"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS dependency graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rqt_dep/rqt_dep-0.4.9.ebuild b/dev-ros/rqt_dep/rqt_dep-0.4.9.ebuild
deleted file mode 100644
index 35bba3cb5001..000000000000
--- a/dev-ros/rqt_dep/rqt_dep-0.4.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 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_dep"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS dependency graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/rqt_dep/rqt_dep-9999.ebuild b/dev-ros/rqt_dep/rqt_dep-9999.ebuild
index da5568842166..0f0d8315777a 100644
--- a/dev-ros/rqt_dep/rqt_dep-9999.ebuild
+++ b/dev-ros/rqt_dep/rqt_dep-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_dep"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,12 +14,15 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/qt_gui[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rqt_graph[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/qt_dotgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/qt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_graph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+	test? (
+		$(python_gen_cond_dep "dev-python/nose[\${PYTHON_USEDEP}]")
+		$(python_gen_cond_dep "dev-python/mock[\${PYTHON_USEDEP}]")
+	)"