gentoo resync : 25.08.2020

5 files changed, 7 insertions, 64 deletions

diff --git a/dev-ros/python_qt_binding/Manifest b/dev-ros/python_qt_binding/Manifest
index fb568ce93ff9..de1c096f7b48 100644
--- a/dev-ros/python_qt_binding/Manifest
+++ b/dev-ros/python_qt_binding/Manifest
@@ -1,7 +1,4 @@
-AUX var.patch 961 BLAKE2B 5bbf8db95f689cc7d2c0358d0dcccc8856a4318137eeda2f56458d145654bc20b6ed3a6d6df40d89f4f2a654762415776aa0bf8410dafddce5606e3d515e554f SHA512 4b774ae419f56094bb0d059fca1944043c9d8b176195dd6df970407ba7e4e71239fd2ad155c4cfaeb50bad585fea175f08ad7d6911cace5a8a21b0a03c483f52
-DIST python_qt_binding-0.3.4.tar.gz 12255 BLAKE2B bc72aa806098d460e5b884bde7664f295399555d96e10b66791e59a26d1e61dd22aabecf9b40b5d14f61c2c906c18ff3fe2cd03de6108d7d9c2c649d553ab09d SHA512 df5fc2c6a744e66d0c03089e15ce4cfb3890d8fd67d826a3832d22cf99de235e18720c59f737c3ddacefb02dac5571d64042dd862c10ea4c44835063037eb533
-DIST python_qt_binding-0.3.5.tar.gz 12412 BLAKE2B ee2f2537bb1ddceb5cce0ca1963e042d10e5d011cffac25caba1a714c992d975413b7e1c4a23d5472567d4e214f482414dcfc56d499fcbcb0bd5559d7670b484 SHA512 a54ce90008d0893f236533cdda7d3520db264ba3e66b6edf18bac0d6e97975823e3900d1f265a7459813c823c9fc0bce7bb12570de1f8101b588954adeb073b4
-EBUILD python_qt_binding-0.3.4.ebuild 451 BLAKE2B 6b5d59a029849455e72d8e9c684f08ac8eb22eb14f9e391ed61a5e51804890c094aeb454d7dbe1743ddb99bd601f80b9e1a5b8034b183c9a9e81c3a93bf91d44 SHA512 c31c9520e1f7cfb8432be6adeba7694449f7974517d331237ea3c4e48b813895c8a8c2b24440c723fe5d9863385ce69868e16b052c01cbb5e7dc993cead37ab1
-EBUILD python_qt_binding-0.3.5-r1.ebuild 487 BLAKE2B d45bf248919d443956a3bf24e8bfaf7caa60c22d4c492e362b8520384c4c918ec6aa9522d3d071e1ff78c93fae48cdaf9db61cc1ec36479bd3a45566e4380e26 SHA512 3a54046c4fa155820ebc9253f0a708cf2c9b827f033f115a8dbfe96762ae7cbd60fa781d5f3d41c40a58c4009c7eb5f2c401e03880f57ff411c3af5239c6cfc4
-EBUILD python_qt_binding-9999.ebuild 451 BLAKE2B 6b5d59a029849455e72d8e9c684f08ac8eb22eb14f9e391ed61a5e51804890c094aeb454d7dbe1743ddb99bd601f80b9e1a5b8034b183c9a9e81c3a93bf91d44 SHA512 c31c9520e1f7cfb8432be6adeba7694449f7974517d331237ea3c4e48b813895c8a8c2b24440c723fe5d9863385ce69868e16b052c01cbb5e7dc993cead37ab1
+DIST python_qt_binding-0.4.3.tar.gz 12632 BLAKE2B 1403602262a18ce359d153234bb01ff3a6a90e91f9f4a84ddcd0551723c04c493526f51b81f750c90f78005d2c5b78cf77396ecd3132f1c505038bad8639b63d SHA512 103f791a27f8e8dad668a63c0bfc96facd93cbb043541bd036355d62c787759724fe0d66788c587c3cb68486e6d2732039d7c27f567ed48f2ecf21ce98d275af
+EBUILD python_qt_binding-0.4.3.ebuild 449 BLAKE2B f800f81ae45225fa9cb5232862b57d133541e3876296f8f9c089248ec9402279c57d8d45ad9d76052de15888e0bab60839e9ec40a64b3073384535550a6a0579 SHA512 759e21d2aa3400608590ac9f6de37d6c70a545ba122ecd3de5e195e73d402487de1368503d33b56906b028164df38ee4bab4745471386d0f4321e9e1e695e417
+EBUILD python_qt_binding-9999.ebuild 449 BLAKE2B f800f81ae45225fa9cb5232862b57d133541e3876296f8f9c089248ec9402279c57d8d45ad9d76052de15888e0bab60839e9ec40a64b3073384535550a6a0579 SHA512 759e21d2aa3400608590ac9f6de37d6c70a545ba122ecd3de5e195e73d402487de1368503d33b56906b028164df38ee4bab4745471386d0f4321e9e1e695e417
 MISC metadata.xml 349 BLAKE2B bc205c9c90eab1ea292d3e90f9f4a1d769c5202af60c57371152eaf80a50bdf6257cb2bb0ad6070a8443f0d19cc64e8493d5ec43e2701085f96c90ec6187a705 SHA512 f388f612a53c2de0a6cdece5a03d08e583f848592da6763b7995ff80e60756caca49da4318ded57ba09141facf717442141066142ed0691172f4e6b98a5ee266
diff --git a/dev-ros/python_qt_binding/files/var.patch b/dev-ros/python_qt_binding/files/var.patch
deleted file mode 100644
index f0cd56d10a7e..000000000000
--- a/dev-ros/python_qt_binding/files/var.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1b3000d2eccfad651b427de20028a4ca552e9ea7 Mon Sep 17 00:00:00 2001
-From: Hans Gaiser <h.gaiser@fizyr.com>
-Date: Mon, 29 Jul 2019 15:17:39 -0700
-Subject: [PATCH] Replace Qt variable in generated Makefile. (#64)
-
-* Replace Qt variable in generated Makefile.
-
-* use single quotes
----
- cmake/sip_configure.py | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/cmake/sip_configure.py b/cmake/sip_configure.py
-index 49eb866..ce084dd 100644
---- a/cmake/sip_configure.py
-+++ b/cmake/sip_configure.py
-@@ -145,5 +145,14 @@ def split_paths(paths):
- else:
-     makefile.extra_cxxflags.append('-std=c++14')
- 
-+# Finalise the Makefile, preparing it to be saved to disk
-+makefile.finalise()
-+
-+# Replace Qt variables from libraries
-+libs = makefile.LIBS.as_list()
-+for i in range(len(libs)):
-+    libs[i] = libs[i].replace('$$[QT_INSTALL_LIBS]', config.build_macros()['LIBDIR_QT'])
-+makefile.LIBS.set(libs)
-+
- # Generate the Makefile itself
- makefile.generate()
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
deleted file mode 100644
index c4bda1c59580..000000000000
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/var.patch" )
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.4.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.4.3.ebuild
index 6aed5cfe415e..1c72ba45c00c 100644
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.4.ebuild
+++ b/dev-ros/python_qt_binding/python_qt_binding-0.4.3.ebuild
@@ -1,11 +1,10 @@
 # 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/python_qt_binding"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,6 +14,6 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/PyQt5[gui,widgets,\${PYTHON_USEDEP}]")
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild b/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
index 6aed5cfe415e..1c72ba45c00c 100644
--- a/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
+++ b/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild
@@ -1,11 +1,10 @@
 # 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/python_qt_binding"
 KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
 
 inherit ros-catkin
 
@@ -15,6 +14,6 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
-	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "dev-python/PyQt5[gui,widgets,\${PYTHON_USEDEP}]")
 "
 DEPEND="${RDEPEND}"