gentoo resync : 25.08.2020

5 files changed, 37 insertions, 68 deletions

diff --git a/dev-ros/rqt_console/Manifest b/dev-ros/rqt_console/Manifest
index 06c2b0bad7d3..bda297a829df 100644
--- a/dev-ros/rqt_console/Manifest
+++ b/dev-ros/rqt_console/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_console-0.4.8.tar.gz 26946 BLAKE2B fcfb17681d26611e782e87173d93d4644ca96fd4fb765e547252d12f3ffb7bf25df8cde2b19acbb2e240d4c1bc305a2a371682e1e81df35a006da2540c15c8e4 SHA512 9674898ef33397d59554b20980c45ae4cc04be019a2f039eedd401ccd6f774e9f6e4130c1aad9bb953d39f47a971fe0514853d2be8be05cc53d6d8c203054813
-EBUILD rqt_console-0.4.7.ebuild 677 BLAKE2B 48c8362bcd8af7cb7d79bd087811eb67ff00014825a7ce79d42b0ab04416aa98b92b321391d423ae2c83b933d8d5da07201a1f7066c4cc1dffecdc2145a87969 SHA512 bada5fc2ff098ef6f45f22698b2a9fb773667891587eafa80f4a840296f43621f27e684f48721fc612437369c0ea51278222be4b47edf25ea09d36d00be9256c
-EBUILD rqt_console-0.4.8.ebuild 653 BLAKE2B d168e80df9acac734e0eb045533c69d35a9001509e7826722bdc39495ffcfb5f7c781ee1a3a17a4d6ccb225ea2f51c672807a95a2eeaae8ba0fef4ee6e264262 SHA512 c2f8b211f2240cc14d57502f64fee34346092a3d17c2554a7863fa28e3aaf1d4cf6574c73653208e7aa259b3f6f48fb945affdf2dd099bc0b187820012c01bae
-EBUILD rqt_console-9999.ebuild 653 BLAKE2B d168e80df9acac734e0eb045533c69d35a9001509e7826722bdc39495ffcfb5f7c781ee1a3a17a4d6ccb225ea2f51c672807a95a2eeaae8ba0fef4ee6e264262 SHA512 c2f8b211f2240cc14d57502f64fee34346092a3d17c2554a7863fa28e3aaf1d4cf6574c73653208e7aa259b3f6f48fb945affdf2dd099bc0b187820012c01bae
+DIST rqt_console-0.4.11.tar.gz 27734 BLAKE2B ea8f71871bb4bc5f529c0502b0c02590c937340f9c15d4db09fbf90c47fda2731b978e88292452f217cd0c301e5f40ccaff96ca0f58bb6b3aa580f48cd41540b SHA512 c9ba7bf85c19e8fa7df7786c8d575b7a2658d4567b6b7bf67d949d844ad3b1f1892d844df6fb592d90ff01f64ad16f6b0602a8c64cf44ac09e24bc08c262b827
+EBUILD rqt_console-0.4.11.ebuild 690 BLAKE2B dc3daf73fd8eb07322ed0534ec4f97eda4b9a7acdf317afa08fb57ffa373c10f0079b4b1268d590c0e4ca235c79f78fa44cb1f5fbf9b6ad38fbf8ecd117072b1 SHA512 487f095961ae5cea2ac8a8985ac30a26b97968cc8e4dc2089c96e82a1051cfd82f8c87fbeb5885672c4c6d42d7f5529e8c0143d2808f3eea50f45b54475324d4
+EBUILD rqt_console-9999.ebuild 690 BLAKE2B dc3daf73fd8eb07322ed0534ec4f97eda4b9a7acdf317afa08fb57ffa373c10f0079b4b1268d590c0e4ca235c79f78fa44cb1f5fbf9b6ad38fbf8ecd117072b1 SHA512 487f095961ae5cea2ac8a8985ac30a26b97968cc8e4dc2089c96e82a1051cfd82f8c87fbeb5885672c4c6d42d7f5529e8c0143d2808f3eea50f45b54475324d4
 MISC metadata.xml 343 BLAKE2B be092a072e973109779ffe75bb1b4561b1cc1ca19fdc7509a27b75f467dfa008c0f3b8e970f9483b76ffe34d3c1a99aecf3de76903e6ea679f3958e15e902db9 SHA512 7146d73d4cb17aebb82ec521988681dfee861a36c66fefd21c47f30f1ffda11670f6c802fd4f433101eb5f498000f47f648c3b13cde71916b9115a50b6814bf3
diff --git a/dev-ros/rqt_console/rqt_console-0.4.11.ebuild b/dev-ros/rqt_console/rqt_console-0.4.11.ebuild
new file mode 100644
index 000000000000..2f17c1d3201b
--- /dev/null
+++ b/dev-ros/rqt_console/rqt_console-0.4.11.ebuild
@@ -0,0 +1,25 @@
+# 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_console"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for displaying and filtering ROS messages"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/roslib[${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_logger_level[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_console/rqt_console-0.4.7.ebuild b/dev-ros/rqt_console/rqt_console-0.4.7.ebuild
deleted file mode 100644
index 8a81c3235c5b..000000000000
--- a/dev-ros/rqt_console/rqt_console-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 displaying and filtering ROS messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_logger_level[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_console/rqt_console-0.4.8.ebuild b/dev-ros/rqt_console/rqt_console-0.4.8.ebuild
deleted file mode 100644
index eefcdaa3e26c..000000000000
--- a/dev-ros/rqt_console/rqt_console-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_console"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for displaying and filtering ROS messages"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_logger_level[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_console/rqt_console-9999.ebuild b/dev-ros/rqt_console/rqt_console-9999.ebuild
index eefcdaa3e26c..2f17c1d3201b 100644
--- a/dev-ros/rqt_console/rqt_console-9999.ebuild
+++ b/dev-ros/rqt_console/rqt_console-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_console"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,12 +14,12 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/roslib[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-	dev-ros/rqt_logger_level[${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/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_logger_level[${PYTHON_SINGLE_USEDEP}]
+	>=dev-ros/python_qt_binding-0.2.19[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"