gentoo resync : 25.08.2020

4 files changed, 48 insertions, 50 deletions

diff --git a/dev-ros/rqt_plot/Manifest b/dev-ros/rqt_plot/Manifest
index 2b911db7dc31..94445d999e42 100644
--- a/dev-ros/rqt_plot/Manifest
+++ b/dev-ros/rqt_plot/Manifest
@@ -1,4 +1,4 @@
-DIST rqt_plot-0.4.8.tar.gz 19153 BLAKE2B 300ab2d7b27dddcad1403bd10aae46406b95aa00f80ac55bd479241deeef746720db5f03dc62957500774ddaa97379902441363c8e590d34c032a25f8d6ebbf9 SHA512 c06a5c0990ee071c20f278c44456404b9f9b7e211b16aa5d670ccffcbf6cd69f24d2c30e930c99c97b4288b996138a73243f877656dcfcf960c4684df3deaf5d
-EBUILD rqt_plot-0.4.8.ebuild 897 BLAKE2B 5e65e7f437cb9e918469d723cc4ac270cacb88c487ca85890d31848043f81ec2650e48d9540af6d93416eb6acd6b5f67d2b2fa251b192b2ef22c6692c5f8d507 SHA512 32ab396cd10f1ff962967e04f3d78de91c8cc335bf2b53fccc8459cc3bb47da24e91e9ec168de2a35c74c778f80f024627bd70d61265f07082f22b81bcd7ec4e
-EBUILD rqt_plot-9999.ebuild 897 BLAKE2B 5e65e7f437cb9e918469d723cc4ac270cacb88c487ca85890d31848043f81ec2650e48d9540af6d93416eb6acd6b5f67d2b2fa251b192b2ef22c6692c5f8d507 SHA512 32ab396cd10f1ff962967e04f3d78de91c8cc335bf2b53fccc8459cc3bb47da24e91e9ec168de2a35c74c778f80f024627bd70d61265f07082f22b81bcd7ec4e
+DIST rqt_plot-0.4.12.tar.gz 19862 BLAKE2B b98e9d3c5862674997e6e6792332beae945a798eadb8ca0fd5b9d105fa04e6fe9a36033d48535d1918b5f3ab6d40cc5c3e0babae7e55079f013f4acd998dbdbc SHA512 adb20495b1c7402fda5685afe300d25ea7117fbe540025588c0fc30bf5791f408286a8ba9101dafd97d88a11e5561cd0f1b8c35e868bf979b6c5833b3c9f85e6
+EBUILD rqt_plot-0.4.12.ebuild 1026 BLAKE2B 147f73f1513eb2b0fb0277838264cae156c1f50e13ec4576632b8096bd30f1a4c6f366cb125cba80e91615077b2ca405a17438e6af931dfeef933d32a458dc5b SHA512 471f7cd60e7af6a9c2b6eff17c59ddb88ad99aabff2fcba46a8c567f2aadfe91e480467168248dda80688f2a366e0eec14f945b140d8be1b179de664c2cfb357
+EBUILD rqt_plot-9999.ebuild 1026 BLAKE2B 147f73f1513eb2b0fb0277838264cae156c1f50e13ec4576632b8096bd30f1a4c6f366cb125cba80e91615077b2ca405a17438e6af931dfeef933d32a458dc5b SHA512 471f7cd60e7af6a9c2b6eff17c59ddb88ad99aabff2fcba46a8c567f2aadfe91e480467168248dda80688f2a366e0eec14f945b140d8be1b179de664c2cfb357
 MISC metadata.xml 340 BLAKE2B ee1e844a5600f4b8d81b5fcba490547da1428d73df295887987360255cce0c90530dd36f6d6cc3b49c7348e1c8f59196c8d812f18b211aa0ae1afc6437058c99 SHA512 50ba9ca4bdbaea86622fdf825491641172ee07f413fed602f8aad0f5f8e3b0dcfdbb88100863a53b9d550dd9d3b038462873b06b8a3012280a57ffe3b35e3421
diff --git a/dev-ros/rqt_plot/rqt_plot-0.4.12.ebuild b/dev-ros/rqt_plot/rqt_plot-0.4.12.ebuild
new file mode 100644
index 000000000000..84ec25dcda92
--- /dev/null
+++ b/dev-ros/rqt_plot/rqt_plot-0.4.12.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_plot"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin visualizing numeric values in a 2D plot"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/pyqtgraph[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${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/roslib[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_plot/rqt_plot-0.4.8.ebuild b/dev-ros/rqt_plot/rqt_plot-0.4.8.ebuild
deleted file mode 100644
index 845689ab2731..000000000000
--- a/dev-ros/rqt_plot/rqt_plot-0.4.8.ebuild
+++ /dev/null
@@ -1,32 +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_plot"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin visualizing numeric values in a 2D plot"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pyqtgraph[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_plot/rqt_plot-9999.ebuild b/dev-ros/rqt_plot/rqt_plot-9999.ebuild
index 845689ab2731..84ec25dcda92 100644
--- a/dev-ros/rqt_plot/rqt_plot-9999.ebuild
+++ b/dev-ros/rqt_plot/rqt_plot-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2018 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_plot"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,18 +14,18 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/pyqtgraph[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-ros/qt_gui_py_common[${PYTHON_USEDEP}]
-	dev-ros/rosgraph[${PYTHON_USEDEP}]
-	dev-ros/rostopic[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_py_common[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/matplotlib[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/pyqtgraph[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	$(python_gen_cond_dep "dev-python/numpy[\${PYTHON_USEDEP}]")
+	dev-ros/qt_gui_py_common[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosgraph[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rostopic[${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/roslib[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"