gentoo resync : 06.08.2019

4 files changed, 35 insertions, 24 deletions

diff --git a/dev-ros/python_qt_binding/Manifest b/dev-ros/python_qt_binding/Manifest
index a96986339a35..fd7f65e06416 100644
--- a/dev-ros/python_qt_binding/Manifest
+++ b/dev-ros/python_qt_binding/Manifest
@@ -1,8 +1,7 @@
-DIST python_qt_binding-0.3.2.tar.gz 12047 BLAKE2B 330ab27cface576d37cfca709a9758b6499a181b8e2734c04ef0f55b84a3d45a4ae821fbf572337e71115b4db57839f900e406b9ce8b3cfc71daa2d4ff4b143c SHA512 777d7ba00652d34994648615125f6c426170a1723570de35b9e5a060d0f077b563a57c9b0cbe7bd85a7ed2f5f011797e9102918a27df4f0096831cce0bb80304
-DIST python_qt_binding-0.3.3.tar.gz 12114 BLAKE2B 12a2e785746ec3d9fe7b387a9e727bfacb5e37da90702c728c8e874c52cd3e4cfc000936d8f17cefbeeb98673de8c21f066eded743df3b5325b88e785f3dc100 SHA512 0dfd698b390a87e0619e93a291656c329ff37713411c5a805e720aeedf9fefd43fc780bbdba351cd1a73e30d67ce8e93a98b5ba6b5584a807d829611ac232263
+AUX var.patch 961 BLAKE2B 5bbf8db95f689cc7d2c0358d0dcccc8856a4318137eeda2f56458d145654bc20b6ed3a6d6df40d89f4f2a654762415776aa0bf8410dafddce5606e3d515e554f SHA512 4b774ae419f56094bb0d059fca1944043c9d8b176195dd6df970407ba7e4e71239fd2ad155c4cfaeb50bad585fea175f08ad7d6911cace5a8a21b0a03c483f52
 DIST python_qt_binding-0.3.4.tar.gz 12255 BLAKE2B bc72aa806098d460e5b884bde7664f295399555d96e10b66791e59a26d1e61dd22aabecf9b40b5d14f61c2c906c18ff3fe2cd03de6108d7d9c2c649d553ab09d SHA512 df5fc2c6a744e66d0c03089e15ce4cfb3890d8fd67d826a3832d22cf99de235e18720c59f737c3ddacefb02dac5571d64042dd862c10ea4c44835063037eb533
-EBUILD python_qt_binding-0.3.2.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
-EBUILD python_qt_binding-0.3.3.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
+DIST python_qt_binding-0.3.5.tar.gz 12412 BLAKE2B ee2f2537bb1ddceb5cce0ca1963e042d10e5d011cffac25caba1a714c992d975413b7e1c4a23d5472567d4e214f482414dcfc56d499fcbcb0bd5559d7670b484 SHA512 a54ce90008d0893f236533cdda7d3520db264ba3e66b6edf18bac0d6e97975823e3900d1f265a7459813c823c9fc0bce7bb12570de1f8101b588954adeb073b4
 EBUILD python_qt_binding-0.3.4.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
+EBUILD python_qt_binding-0.3.5-r1.ebuild 493 BLAKE2B 50e17b641cec09703e2a2cc8cdde1fca6adb281403ff834ad0ff6b9e2518f70af7b283bceca8d744e887179ef4fff7c019d35ad77e2424691b1a2b63b76f43e0 SHA512 429199c878e3a355db508187e8aa745866f7114e52d9f3426d23a1dca03310beaa7a74f19422a21565bbdf46bf03271e19a1dc498e2a0a25437ba9a862cf4c64
 EBUILD python_qt_binding-9999.ebuild 457 BLAKE2B de30c507e7415187bddfc691f988e8e79e7a4f0671ad817493ba42a8aa837449946db9be13829592abfd5504718f0b08e5b67f6abbfc7a65576cec4485721530 SHA512 1da86df5a851ea02b666825ab445a1015b07d4cec74791b9eb7620e63947bdd7b52be3146312b6dc2d5bb9e6faed454efa4622a8b1928eb35bdd71107f01d2e9
 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
new file mode 100644
index 000000000000..f0cd56d10a7e
--- /dev/null
+++ b/dev-ros/python_qt_binding/files/var.patch
@@ -0,0 +1,31 @@
+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.3.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.3.ebuild
deleted file mode 100644
index 5309c2893fbe..000000000000
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.3.ebuild
+++ /dev/null
@@ -1,20 +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/python_qt_binding"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python{2_7,3_5} )
-
-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}"
diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.3.2.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
index 5309c2893fbe..f74ff22c2b2e 100644
--- a/dev-ros/python_qt_binding/python_qt_binding-0.3.2.ebuild
+++ b/dev-ros/python_qt_binding/python_qt_binding-0.3.5-r1.ebuild
@@ -18,3 +18,4 @@ RDEPEND="
 	dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}/var.patch" )