gentoo resync : 25.08.2020

5 files changed, 44 insertions, 78 deletions

diff --git a/dev-ros/rqt_graph/Manifest b/dev-ros/rqt_graph/Manifest
index e5e86487e4e1..50c6bdccbeab 100644
--- a/dev-ros/rqt_graph/Manifest
+++ b/dev-ros/rqt_graph/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_graph-0.4.10.tar.gz 18455 BLAKE2B 930f2c7bc5d1797eae06e9d37e9f1268a503ddda3bf28adda47779b5879d578353e77e773e7c4417e670870effa6c6a39b5844f19bb101ba6f3733604514e704 SHA512 a37483ed15dc1f1d1492e53d26252a3db6771a1ecf47469a33314c9d17aef88d2e68a5acdca24e412e1d2409c31311ea2f2983aa54b6a5e3b5de5c11b6ab1191
-DIST rqt_graph-0.4.9.tar.gz 15857 BLAKE2B 52201faed0ec636dc15a7a7067d19d29f72dca4e98412614a24d6e5f38d916f6cf194fa2b11f84ed0d9476a53f0ad3fdcff807b851286f192c5ee1332033d997 SHA512 21d1395f272f38bb27f7549c865a9e2b4ac5d9267c50dbbaf02016b509b6fab08526c35a87f500788bad094e605d89f925baf939742e78f37d615fedcb04776e
-EBUILD rqt_graph-0.4.10.ebuild 794 BLAKE2B 0005e27a142b3b692f7dba6a012aaaa7c97dd2954ab1df244dce00ba2467e23ec5f1c57a0d4caedb8f72757a04dfae97e26749be4b4336f8e63cd90ea0789015 SHA512 ade1ebf56d89d3f7965c6b428dfc58ea0cef86232cc77c505eb6b7d530ee404562b2ff5696d835b8f762896a1d781038512be1db612ab45cd32d1bb5cd31850f
-EBUILD rqt_graph-0.4.9.ebuild 794 BLAKE2B cba021c39b36a41bca6f0f9f2d269a7407c5186b90ceb3a58d8cf49d864a46e269cefdfa79a6bf8b0b84f8cb08f08f28e3bb8cf90f549260e24023e5b9a299ae SHA512 d55d44962d6efaff6e67e752a866ef3ad49ead7ea55ee4ad62945e0242ba6264082a78b587b5ef89ce1f85fa5096849c0693c5e42d5f2f08ab098d157325048e
-EBUILD rqt_graph-9999.ebuild 794 BLAKE2B cba021c39b36a41bca6f0f9f2d269a7407c5186b90ceb3a58d8cf49d864a46e269cefdfa79a6bf8b0b84f8cb08f08f28e3bb8cf90f549260e24023e5b9a299ae SHA512 d55d44962d6efaff6e67e752a866ef3ad49ead7ea55ee4ad62945e0242ba6264082a78b587b5ef89ce1f85fa5096849c0693c5e42d5f2f08ab098d157325048e
+DIST rqt_graph-0.4.14.tar.gz 19068 BLAKE2B c03431d4b72b31a913ea427e6988e0de60ac41384ea0ccdc20d07232230db441398ee93f00017dffa70dc7413e847a9f128a2514d7af9a20e3b79d6b73b89231 SHA512 15871a7b48f4e121d5ed3445bbeb2f051218455c08180aeff24a756e6ee8ede795627a60152472fccbea08bd75adfc78f014c16dc9f108db1c3e0824dc630003
+EBUILD rqt_graph-0.4.14.ebuild 852 BLAKE2B 834744280752f39b5ff0f7cc294c33c1b29f520eb8bb2b1442830738f831a56e293e117b23ea629497bacb07e13677c50261fda72be99faacb23f51a41df865a SHA512 14c6937fbc9c754ad3f0127569ed29b7c7f5224b1248359c573f2799dbedadbdf5660cd5970dade4dc210c113c190c9638d434ac647c39141255683eba708b92
+EBUILD rqt_graph-9999.ebuild 852 BLAKE2B 834744280752f39b5ff0f7cc294c33c1b29f520eb8bb2b1442830738f831a56e293e117b23ea629497bacb07e13677c50261fda72be99faacb23f51a41df865a SHA512 14c6937fbc9c754ad3f0127569ed29b7c7f5224b1248359c573f2799dbedadbdf5660cd5970dade4dc210c113c190c9638d434ac647c39141255683eba708b92
 MISC metadata.xml 341 BLAKE2B 060e33c2b6381ab2f650e89494f89c30ce46628290ecf2894ef4173844e43c7f7d909e144af779af247abfa3324affaf160bb25bc70f92a7261db202552d9759 SHA512 94542a537503e17832e10f98462d73a3a0c0cf0fc0d7083198b5509cf44a2743c243b79ff23b4067b6db2593d9bd1b69d406bb23ddec41dc681ffd39c25c8593
diff --git a/dev-ros/rqt_graph/rqt_graph-0.4.10.ebuild b/dev-ros/rqt_graph/rqt_graph-0.4.10.ebuild
deleted file mode 100644
index a40a5c1b0a81..000000000000
--- a/dev-ros/rqt_graph/rqt_graph-0.4.10.ebuild
+++ /dev/null
@@ -1,30 +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_graph"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS computation graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_graph/rqt_graph-0.4.14.ebuild b/dev-ros/rqt_graph/rqt_graph-0.4.14.ebuild
new file mode 100644
index 000000000000..74ebe47da37f
--- /dev/null
+++ b/dev-ros/rqt_graph/rqt_graph-0.4.14.ebuild
@@ -0,0 +1,29 @@
+# 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_graph"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for visualizing the ROS computation 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/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_graph/rqt_graph-0.4.9.ebuild b/dev-ros/rqt_graph/rqt_graph-0.4.9.ebuild
deleted file mode 100644
index 1f2bff4c39fc..000000000000
--- a/dev-ros/rqt_graph/rqt_graph-0.4.9.ebuild
+++ /dev/null
@@ -1,30 +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_graph"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for visualizing the ROS computation graph"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_graph/rqt_graph-9999.ebuild b/dev-ros/rqt_graph/rqt_graph-9999.ebuild
index 1f2bff4c39fc..74ebe47da37f 100644
--- a/dev-ros/rqt_graph/rqt_graph-9999.ebuild
+++ b/dev-ros/rqt_graph/rqt_graph-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_graph"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,16 +14,16 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/qt_dotgraph[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/qt_dotgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"