[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

[Andreas Sturmlechner]

commit:     782f2fad3e4d17b00e76a6412a73f304b709c227
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 22:20:29 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 22:42:07 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782f2fad

app-office/libreoffice: 6.4.7.2: Fix Qt5 moc path detect, drop QT_SELECT

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/libreoffice/libreoffice-6.4.7.2.ebuild | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild 
b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
index e632c848c58..15b973e2b41 100644
--- a/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
+++ b/app-office/libreoffice/libreoffice-6.4.7.2.ebuild
@@ -267,6 +267,7 @@ PATCHES=(
        # not upstreamable stuff
        "${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
        "${FILESDIR}/${PN}-6.1-nomancompress.patch"
+       "${FILESDIR}/${PN}-7.0.3.1-qt5detect.patch"
 
        # 6.4 branch (fixed in 6.4.8)
        "${FILESDIR}/${P}-fix-wrong-setting-for-doc-properties.patch"
@@ -377,11 +378,7 @@ src_configure() {
        export PYTHON_CFLAGS=$(python_get_CFLAGS)
        export PYTHON_LIBS=$(python_get_LIBS)
 
-       if use kde; then
-               export QT_SELECT=5 # bug 639620 needs proper fix though
-               export QT5DIR="$(qt5_get_bindir)/../"
-               export MOC5="$(qt5_get_bindir)/moc"
-       fi
+       use kde && export QT5DIR="$(qt5_get_bindir)/.."
 
        local gentoo_buildid="Gentoo official package"
        if [[ -n ${LOCOREGIT_VERSION} ]]; then