gentoo resync : 25.08.2020

16 files changed, 17 insertions, 308 deletions

diff --git a/dev-ros/qt_gui_py_common/Manifest b/dev-ros/qt_gui_py_common/Manifest
index fefdbacf0e6e..81bb6146ecff 100644
--- a/dev-ros/qt_gui_py_common/Manifest
+++ b/dev-ros/qt_gui_py_common/Manifest
@@ -1,30 +1,6 @@
-DIST qt_gui_core-0.2.29.tar.gz 85881 BLAKE2B f88853320237b410fa9231c85ad44f930d0e457f738214132a964f1c925048d3c31d73cf0a12573a9cafc3ea9304e1efe25144d168b88a120b64b3ccecbb57ed SHA512 958526a3bd76070e121d75a82c589894aef980870091cb853802fcb60328b54cbc95ee0c9eececa18e24608808cca2c722c5699b662c2a578f150995171d71db
-DIST qt_gui_core-0.2.30.tar.gz 86567 BLAKE2B a40e15ba1925db8afee2daffed2f2fbb3c242ecf84bc01d561b582ec561960e74e362d1ff0337e3100c3e050d63d3b9e5437ad0579f5580329f9af5e42cfd13d SHA512 4a9671c8814f16a371e77840d6df268e763ce5932d6e85842af34ee5322701ffa19d97d4d75b4fb6d4d272497281462296dc9cfc25d4efd96246a88a8ee08978
-DIST qt_gui_core-0.3.0.tar.gz 86904 BLAKE2B e136f6837c3e7cd55f51c49d7055243f4da5600adafef2d5ac59963222f0cfeda6bcc2aaaf18dcfc75fd6ed03771203503b1c44817c83f32c5cbb8d5a06d51e4 SHA512 6b14dafdc087f3fccfeacf2aedd438b069cd3592d6f834ba0d277107da936bbf0d3a40d0cd18468615fd9c508fb1fc5109ef83c4970031a7dca923b85270b385
-DIST qt_gui_core-0.3.1.tar.gz 87236 BLAKE2B ae7a8e094c8fc77a52c85511970a1c6782affdd833793a2c64eb35da33366e358cbdfab70fd2d599e20a3307b4d42389e95e88b07540e4a9d812b4109000bdcd SHA512 f209c257fe3f8bf10e285109e6d6a88e2c8f2d6bfdae82bf3177b94f0b0a74ac26585a1b688d37d6db828847f82b9a5d3c362847bedf41db8aa86a2bc9738c3c
-DIST qt_gui_core-0.3.10.tar.gz 91569 BLAKE2B 04c764e49c5dc1126d0f87e1c53109748dc11b38e94f242d44fca56e8334eaae3469f2299f9c2c4eef536264d1fd5c3ba5d8dbff0fc809afdb36d0b2a35ea669 SHA512 76c418315453d975ae2901e1d33205f3471ff540fac3be9834a567d4763400688aaedf3d172d45cc2f39652055446085a3ea65c7acca679e271333d8ca6ed3fa
-DIST qt_gui_core-0.3.11.tar.gz 91640 BLAKE2B 49615e039ea7a2586679c6d6ffd9a583a16c2087b1c1090885ca83894aa98d44efc10c7bb622068ac49eb8c70eac98a5f495e3b417b3750171c31b433c53bfad SHA512 f83abd1d75ea6794fc25da79912a629bd13167bbe2815c9616a0e1a8993a4730053fc737cb864ba01ac869d9aec85269d2e1a19d963a50b8469e6d073e55db9a
-DIST qt_gui_core-0.3.16.tar.gz 94321 BLAKE2B 87d38cfaa1ed46cdc6a08aaacef71844aec48226b6242b153d37d804e24a67300a84d7730d02f9cfcff42ab520b023b928bee6db354deec70744deb8c3136170 SHA512 44aaf7d07bc4223b1185fdfcd10f01f0eab0b2a3511dcb9cd055c98696becd07d46ceb1e15c6c78994e1069211b8c475d3b0a95523151a27e54c3f91ecc203dc
-DIST qt_gui_core-0.3.2.tar.gz 87326 BLAKE2B f5d22f4d48ccb06f27c6ef8d388cf7360e8207d23120af1213c29bdebf56654174aa92e3b38b78cbf42a6c037ff50008a1ba60a26fb63c0144b34a8568b3285c SHA512 9a3e5c395a49efc0cbd747b35898e5931155b9e22f4789cc111cfb28866db4589b3b7fbd8b32cb8d64ade568dd5a9eb4ee4b24f7b7f60dcf5aabc4a380b5c180
-DIST qt_gui_core-0.3.3.tar.gz 87422 BLAKE2B a3477f68b9e8b019b58882e4e063443b4cee8adf210ca3bebf43fc3a34888e167ae10e862423ee7d0da6afc9d7d22cec677400d92586e6dc8a4932112d6528be SHA512 5f2906e412b35b6edc9ba8792272b3d733574deda955279327e392ee3b0f55bb01a08607a25632fda43112842743fdd1432874fbf090f6b1404604c329b7dc3a
-DIST qt_gui_core-0.3.4.tar.gz 87974 BLAKE2B 7550100c865167a5e617db6ddbf2c2fcdb9f59ca3d9a20da2ed0305783885ae8f652f10d4b2739e5527ef7a9b60b1c3e080e682fa74034eca1fed0dd813658bc SHA512 794b0ea8b92cdbb748282ef48dcb41f24f3b83dd8ad92e8dc895d45ed085b9838b2ca4a5dc43284971d33b7ac40c86ca578fe042d71e0c9d1903cdfb561507af
-DIST qt_gui_core-0.3.5.tar.gz 90480 BLAKE2B cdbe0a8b8ddeb430658138fbe5dceae2ed233dd906d4b8eadedf5a1640d9ec8bd50adcf396c84199796798d41c3bf7247c8e11ac7675e0aa283ba33ad68dbfba SHA512 1c307e220d8484013e83cf2e3e4b6d674db3d6273f08ffc1ab928f92c1a4009d3b3d8d011f88b40e73ad371be34c7d4a790a78a47361ddb1c44b1a44970bf955
-DIST qt_gui_core-0.3.6.tar.gz 90705 BLAKE2B 7002d22b8deb2d8cd95ddfffcfd60e8cf092a1ada86a5fb6c666b41689d235f000a9375bf2389a082e187b4aa69accf8da1b7ce1b29c980d736fb9860e10a5d5 SHA512 bdd824010552af098f2b9294aef18c73413a1f76fe1cf61daccf9d9f17d7d16f6a9a1ec11c157460c1b89d6c44f21fccbdcab813ca42c052a6bc46de52f86ab0
-DIST qt_gui_core-0.3.8.tar.gz 91248 BLAKE2B 9ed159b8d065e7b2a44dcf9ac496a699675e5ec41d5ed222413894f098e122b092c976c934dc37a99846e0fe80858fb377bf937b3eabc3f0c6df126de7944e88 SHA512 aec926adffc9f1ab84d7d5cccb207d87254496b37e9e2e4c430de191917823424751206647d61821a65dec0aad3241dab22c85f21980fbe1a4bf114bb2c29d70
-DIST qt_gui_core-0.3.9.tar.gz 91495 BLAKE2B c0f2f2b9231a42da68c0032bfb192a47060f4b0915952b77750985be00023f22678480605990a79016b8ed906cacbdb9cd7eafabbb917b06f891f6b7817a999c SHA512 3e7e45001f1749e3ca75c6b33e3e7a131a314a5ec66925b86f2617f6f749f4c2093d33420bbe0f148faa44fb1fb3071241e47180d3c56ed9d1f7a2befb006a95
-EBUILD qt_gui_py_common-0.2.29.ebuild 487 BLAKE2B dd04f9e94dd975d7d0a7f8b91d26bc321504690ac81abf43f03dc82c994d8299243eb0a7f81121c2857af6152eed84f95d119a8dcedb80bffe0c2f84b9fc4ac0 SHA512 869826c0dddce1a231bf9ce36379ac578eb4f957b5ed5e769e81ddc88e45819b2be08e660c1ccf369131c672c1b2bea2ce9332a5abbf6a58a855d2657bf6a2a6
-EBUILD qt_gui_py_common-0.2.30.ebuild 487 BLAKE2B dd04f9e94dd975d7d0a7f8b91d26bc321504690ac81abf43f03dc82c994d8299243eb0a7f81121c2857af6152eed84f95d119a8dcedb80bffe0c2f84b9fc4ac0 SHA512 869826c0dddce1a231bf9ce36379ac578eb4f957b5ed5e769e81ddc88e45819b2be08e660c1ccf369131c672c1b2bea2ce9332a5abbf6a58a855d2657bf6a2a6
-EBUILD qt_gui_py_common-0.3.0.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
-EBUILD qt_gui_py_common-0.3.1.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
-EBUILD qt_gui_py_common-0.3.10.ebuild 495 BLAKE2B 6ff9af78697819a00ac135b63ce5659ae3c81d20ddc32e1e7de262c5e96502218c206549af5ac0d801f6438c16455a6bf831709ff3aa8e05a79e338175b38bfe SHA512 2a8c22e203afa1cdbfdfe587c089d52a32257d1ef2b8d2bc4dc90fa5f1d5222cb817cdaf573daa1afd3cc5ac81c46afa12ae50551cf4cbe74e87bbed6f0cd5eb
-EBUILD qt_gui_py_common-0.3.11.ebuild 495 BLAKE2B 6ff9af78697819a00ac135b63ce5659ae3c81d20ddc32e1e7de262c5e96502218c206549af5ac0d801f6438c16455a6bf831709ff3aa8e05a79e338175b38bfe SHA512 2a8c22e203afa1cdbfdfe587c089d52a32257d1ef2b8d2bc4dc90fa5f1d5222cb817cdaf573daa1afd3cc5ac81c46afa12ae50551cf4cbe74e87bbed6f0cd5eb
-EBUILD qt_gui_py_common-0.3.16.ebuild 492 BLAKE2B c3f64ebe4c95427f8143091675d9cc2387d07261ccf657ff16960ba150d0c4b307766ff82b510162c66143288fdf089c83701f5b74b3d8114fa7ff7f667fc323 SHA512 4b57439a27235c4bfaffc8507eaee9b3fc337045c4c030868c26a93b32957591960512c67df8c266df0f247b733b0c14b4b1145932c6c3a1fcac2378fe27d603
-EBUILD qt_gui_py_common-0.3.2.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
-EBUILD qt_gui_py_common-0.3.3.ebuild 495 BLAKE2B c73ccdb054e9a6e657eefe7471a983f8c7b6907b90c61ccab41a07e04647b57b1c8724e974de394caa76460953023783fa68382a683472fad1c986d18880fe4b SHA512 8413e1bf77163b55a3caa9dcf760576db4de7953a2b44aeb20c0940b6ffff103da58fd6fa5f0c57383c566d419ce26076864095507ca4568ebbfe16ac0d942fe
-EBUILD qt_gui_py_common-0.3.4.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
-EBUILD qt_gui_py_common-0.3.5.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
-EBUILD qt_gui_py_common-0.3.6.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
-EBUILD qt_gui_py_common-0.3.8.ebuild 495 BLAKE2B fd6ee071255e4d0140dff2f4fb76996173cec0166e37ba0c2491ed1b2713b34e1b59844c6b78ad1a103512a4c164acad81504484341a0a767eebd4dff47825a3 SHA512 37c8d203ca8f7752983531a72bc8ce00711e8e907324e8fe1c239595de0094e865f979a1f6a9f65b19975dfa813665da27ce1c457af6819f8a9f91268ebcd022
-EBUILD qt_gui_py_common-0.3.9.ebuild 495 BLAKE2B 6ff9af78697819a00ac135b63ce5659ae3c81d20ddc32e1e7de262c5e96502218c206549af5ac0d801f6438c16455a6bf831709ff3aa8e05a79e338175b38bfe SHA512 2a8c22e203afa1cdbfdfe587c089d52a32257d1ef2b8d2bc4dc90fa5f1d5222cb817cdaf573daa1afd3cc5ac81c46afa12ae50551cf4cbe74e87bbed6f0cd5eb
-EBUILD qt_gui_py_common-9999.ebuild 495 BLAKE2B 0cae86616656725aeb1e599966a939d49ce21104b7d74f982d9d76c9f2cc1a1e01b46d119bae419e09edc8c6611b26797630d628cab5b848c878cc6a66e47a70 SHA512 25d41945066aeb36416eca403a173ff9cbf551d971a6f73d1c2ff90f1083ed1a7eb760f8d753278b0a6f64b3c9243209fdfbc137d950272fce6432e69f5d438e
+DIST qt_gui_core-0.4.1.tar.gz 96850 BLAKE2B a8a4325d5462a0788a69661adb20b3bf1bc9e391344ced31468bf9ddbe7114a13a2ecd3dda580986bd0af98c837641bda3e3d6cd3c5d9fa3352c37817ace2ed4 SHA512 0c46f86f88a818107049d08db6682a320f47b1b4983c586e4c944a387c070c7e017fca2f4be9d251f8a907f15be439998b2d559bea51ffc724fa4afc5e75f67c
+DIST qt_gui_core-0.4.2.tar.gz 97267 BLAKE2B 631996dd5b2a4e0aa557eb14a9dcb967377fce4923ada280d5894a733827f6f7d1aa240cc28261ee95a39171b03cba4f27f794ca3f9eb488d8b1953d237a9223 SHA512 a8b684d52eb1d4bfcdb6b63a989598d2098462d6fd93f26dd5a7eb0c0c9be9c324cb5d77b5e12c583253da4ce5edc544535bb9dd5a2f7966bf1642a7bd0ca421
+EBUILD qt_gui_py_common-0.4.1.ebuild 497 BLAKE2B 621f198cac706bfd019e38cb6a7117c53fd90f29c348ac0fcea5bf3a647fa0ea7689dc69f9bcc2fdfe14af8eabfc819e0f64a51be7d35927a2e9fc23e4c46048 SHA512 69c6555f302c7deb3deefc67bbeb1dae71a0dc1e9c3ae504db74cf3c52f7c3677966a068b2e38109a9281ec124e7e02f677bcfbaa72b533fd8ed2e62ba48ed86
+EBUILD qt_gui_py_common-0.4.2.ebuild 497 BLAKE2B 621f198cac706bfd019e38cb6a7117c53fd90f29c348ac0fcea5bf3a647fa0ea7689dc69f9bcc2fdfe14af8eabfc819e0f64a51be7d35927a2e9fc23e4c46048 SHA512 69c6555f302c7deb3deefc67bbeb1dae71a0dc1e9c3ae504db74cf3c52f7c3677966a068b2e38109a9281ec124e7e02f677bcfbaa72b533fd8ed2e62ba48ed86
+EBUILD qt_gui_py_common-9999.ebuild 497 BLAKE2B 621f198cac706bfd019e38cb6a7117c53fd90f29c348ac0fcea5bf3a647fa0ea7689dc69f9bcc2fdfe14af8eabfc819e0f64a51be7d35927a2e9fc23e4c46048 SHA512 69c6555f302c7deb3deefc67bbeb1dae71a0dc1e9c3ae504db74cf3c52f7c3677966a068b2e38109a9281ec124e7e02f677bcfbaa72b533fd8ed2e62ba48ed86
 MISC metadata.xml 343 BLAKE2B 518da938afd557552bcb4eec225723207d73325a348640eb5280137715941f95190d8be30f52d1773e97cb80c9ed25b34d60ed7cfdbb5425e6b6d30bb1a2050b SHA512 88a9c15a6f681122449cff3b89c4805a0a9ee5d579e1eb98f4814e6e57d3adafb0e370986a6e68c555880b80fb900d74ffd4cb19a670c15e3d0f5fa383e39810
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.0.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.0.ebuild
deleted file mode 100644
index 9af608795a0d..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.1.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.1.ebuild
deleted file mode 100644
index 9af608795a0d..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.10.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.10.ebuild
deleted file mode 100644
index 249bfcd6004e..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.10.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.11.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.11.ebuild
deleted file mode 100644
index 249bfcd6004e..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.11.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.16.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.16.ebuild
deleted file mode 100644
index 7933e8e1843c..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.16.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.2.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.2.ebuild
deleted file mode 100644
index 9af608795a0d..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.2.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.3.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.3.ebuild
deleted file mode 100644
index 81b2407af430..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.4.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.4.ebuild
deleted file mode 100644
index 87a1c621b8d2..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.5.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.5.ebuild
deleted file mode 100644
index 87a1c621b8d2..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.5.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.6.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.6.ebuild
deleted file mode 100644
index 87a1c621b8d2..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.6.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.8.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.8.ebuild
deleted file mode 100644
index 87a1c621b8d2..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.9.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.9.ebuild
deleted file mode 100644
index 249bfcd6004e..000000000000
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.3.9.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
-KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Common functionality for ROS RQT GUI plugins written in Python"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.2.29.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.1.ebuild
index 5f2edfe5895d..a642b1ac2af7 100644
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.2.29.ebuild
+++ b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.1.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.2.30.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.2.ebuild
index 5f2edfe5895d..a642b1ac2af7 100644
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-0.2.30.ebuild
+++ b/dev-ros/qt_gui_py_common/qt_gui_py_common-0.4.2.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-ros/python_qt_binding[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/qt_gui_py_common/qt_gui_py_common-9999.ebuild b/dev-ros/qt_gui_py_common/qt_gui_py_common-9999.ebuild
index 9af608795a0d..a642b1ac2af7 100644
--- a/dev-ros/qt_gui_py_common/qt_gui_py_common-9999.ebuild
+++ b/dev-ros/qt_gui_py_common/qt_gui_py_common-9999.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 ROS_REPO_URI="https://github.com/ros-visualization/qt_gui_core"
 KEYWORDS="~amd64"
-PYTHON_COMPAT=( python2_7 )
 ROS_SUBDIR=${PN}
 
 inherit ros-catkin
@@ -16,7 +15,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/rospkg[\${PYTHON_USEDEP}]")
+	>=dev-ros/python_qt_binding-0.3.0[${PYTHON_SINGLE_USEDEP}]
 "
 DEPEND="${RDEPEND}"