gentoo resync : 25.08.2020

5 files changed, 35 insertions, 65 deletions

diff --git a/dev-ros/rqt_logger_level/Manifest b/dev-ros/rqt_logger_level/Manifest
index 5afadca739e7..617e3b46629c 100644
--- a/dev-ros/rqt_logger_level/Manifest
+++ b/dev-ros/rqt_logger_level/Manifest
@@ -1,6 +1,4 @@
-DIST rqt_common_plugins-0.4.7.tar.gz 246977 BLAKE2B 5efebfa64dcc587822e558b5527a2ef2e33adc8adcb45800876e278be5ccdacbaef93b0f9dfbb7b98972fd5cffb4fcddee80e9522a4135a736d744765c2490ed SHA512 eb10a7c03bb079d939a9705a08e9194c83e020235a13ed2d4ff8e9c3c73e5abbd0a9bd7c00587135767497b155bb9516d7b4c2240fbe2118d7b0668d6ee32ab7
-DIST rqt_logger_level-0.4.8.tar.gz 5963 BLAKE2B e3c419ce761c6bd841005e728c7866275f9a3e3212d809bc50484902ad0dbcaa79f165a2afe01546d6ecd25110068be90d3a0f2325eb56ef847ea2163a9dbae4 SHA512 e07f1a46ac29697be0b6f6e94c0948670d3c20190be8abd5ea17b9f6bc09ba06c03ef1b12adfeb2e3de6dc55dccc988c8fab48efda390b7194568f374d7353d1
-EBUILD rqt_logger_level-0.4.7.ebuild 622 BLAKE2B e39325eb733c8fc94517ece320d0051eb0f0a888ba4d1d7a589d089f1e5d4ddd3f1c81095cb335cee770142252b42138db97764dd023e1c4f5cd0ad19f5b6b9f SHA512 48c344b0e8e594ba0a8c6d9d3b4e0359c0fe7b8c6c25591cfa9120889c9bb9bbce499496073fdd75611a2e17e89a1be1674e2ff0b21348f969bbbb8b6b3558ad
-EBUILD rqt_logger_level-0.4.8.ebuild 603 BLAKE2B 003f557c615c37227a45c0f8e7c7d5aca5aa42c60637768ce31da54e32638c6f4b7efef5f531ac03aa527ab0d0538f711079406be1461a854123021c79996650 SHA512 b04902489ac8e0c1be8de63468e58472825fadd0830c8d713cebef1280aa911b77802f4dde13ad189f6b7ce08be7e6c957e90cf8b1db48c11eebcf6be065a660
-EBUILD rqt_logger_level-9999.ebuild 603 BLAKE2B 003f557c615c37227a45c0f8e7c7d5aca5aa42c60637768ce31da54e32638c6f4b7efef5f531ac03aa527ab0d0538f711079406be1461a854123021c79996650 SHA512 b04902489ac8e0c1be8de63468e58472825fadd0830c8d713cebef1280aa911b77802f4dde13ad189f6b7ce08be7e6c957e90cf8b1db48c11eebcf6be065a660
+DIST rqt_logger_level-0.4.11.tar.gz 6193 BLAKE2B f3970477b4b3a91c5bc8c5682e5d915ce74f2c9bd64ff5c79bd52f4d97db6e5d1638b197197ed8a43a0aca9cc65fe7d68eae549d399087683b8b9d3e465c34d4 SHA512 94ddae15665e4a0ec11aeb5996509b58d8d9d4cfd7111b53a7e0eae6a812fd914fde4dc31a5dd3906ffc3d96ad9b2e9adfe0296a3d84173914864b6da041ca17
+EBUILD rqt_logger_level-0.4.11.ebuild 633 BLAKE2B 98fa361f03b90d4365bec1c1d1ee7a929cdb165533852cb2c8af06e79a497ee613e5aa0be4a909fe1bc6a66f444550362bf35a08de6e5bff0c887687683e29d2 SHA512 d914f9c4ccedc1b3be6f936fe001cab1ee207cc40dab762aacb920fb3b4de880029efd5ad1177a391d918d2fa19fe43ed77bf08893dfe50dc47ea24bdfb0eb1c
+EBUILD rqt_logger_level-9999.ebuild 633 BLAKE2B 98fa361f03b90d4365bec1c1d1ee7a929cdb165533852cb2c8af06e79a497ee613e5aa0be4a909fe1bc6a66f444550362bf35a08de6e5bff0c887687683e29d2 SHA512 d914f9c4ccedc1b3be6f936fe001cab1ee207cc40dab762aacb920fb3b4de880029efd5ad1177a391d918d2fa19fe43ed77bf08893dfe50dc47ea24bdfb0eb1c
 MISC metadata.xml 348 BLAKE2B 7562bc3abe6bb44c051f96d7847e834adaff167706771457a08c1ff289a7d76cbd538aa2ed08c53cb9c5cfdd167f1950c9830c2021b8c120830dbd97bdac89aa SHA512 edd740d0ff161f4c8a7fe3e2f0da50fd57e083a2a14a6bba13cbf6ee9c6e7280b00045ec70dda10ed136e587c3338912eb802eb5692fdb07d849656fd96c9fe6
diff --git a/dev-ros/rqt_logger_level/rqt_logger_level-0.4.11.ebuild b/dev-ros/rqt_logger_level/rqt_logger_level-0.4.11.ebuild
new file mode 100644
index 000000000000..6c0c5dcb45ec
--- /dev/null
+++ b/dev-ros/rqt_logger_level/rqt_logger_level-0.4.11.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_logger_level"
+
+inherit ros-catkin
+
+DESCRIPTION="GUI plugin for configuring the logger level of ROS nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${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_logger_level/rqt_logger_level-0.4.7.ebuild b/dev-ros/rqt_logger_level/rqt_logger_level-0.4.7.ebuild
deleted file mode 100644
index c918c3dde571..000000000000
--- a/dev-ros/rqt_logger_level/rqt_logger_level-0.4.7.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_common_plugins"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for configuring the logger level of ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_logger_level/rqt_logger_level-0.4.8.ebuild b/dev-ros/rqt_logger_level/rqt_logger_level-0.4.8.ebuild
deleted file mode 100644
index d22dedfc81a7..000000000000
--- a/dev-ros/rqt_logger_level/rqt_logger_level-0.4.8.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_logger_level"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="GUI plugin for configuring the logger level of ROS nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/rqt_logger_level/rqt_logger_level-9999.ebuild b/dev-ros/rqt_logger_level/rqt_logger_level-9999.ebuild
index d22dedfc81a7..6c0c5dcb45ec 100644
--- a/dev-ros/rqt_logger_level/rqt_logger_level-9999.ebuild
+++ b/dev-ros/rqt_logger_level/rqt_logger_level-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_logger_level"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,11 +14,11 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/rosnode[${PYTHON_USEDEP}]
-	dev-ros/rosservice[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui[${PYTHON_USEDEP}]
-	dev-ros/rqt_gui_py[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	dev-ros/rosnode[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rosservice[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rospy[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui[${PYTHON_SINGLE_USEDEP}]
+	dev-ros/rqt_gui_py[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"