From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 27E06138334 for ; Thu, 28 Feb 2019 15:41:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 14D85E081A; Thu, 28 Feb 2019 15:41:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DFB5EE081A for ; Thu, 28 Feb 2019 15:41:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 678E0335CCB for ; Thu, 28 Feb 2019 15:41:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D33BD452 for ; Thu, 28 Feb 2019 15:41:05 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1551368429.14708bf89e530a1755a84c351963fbeba73fe760.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 14708bf89e530a1755a84c351963fbeba73fe760 X-VCS-Branch: master Date: Thu, 28 Feb 2019 15:41:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 376daa9a-af5a-4c5b-ac44-fada1e01037b X-Archives-Hash: 26d9120ff76a3c0656c2a2c99990070d commit: 14708bf89e530a1755a84c351963fbeba73fe760 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 31 22:34:49 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 28 15:40:29 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=14708bf8 kde5.eclass: Qt 5.12.1 is changing qch doc location Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde5.eclass | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 1167e2c532..ca96a6f7dc 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -702,9 +702,12 @@ kde5_src_install() { # cmake can't find the tags and qthelp viewers can't find the docs local p=$(best_version dev-qt/qtcore:5) local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev) - #todo: clean up trailing slash check when EAPI <7 is removed - if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then - docompress -x /usr/share/doc/qt-${pv} + einfo "muha $pv" + if [[ ${pv} = 5.11* ]]; then + #todo: clean up trailing slash check when EAPI <7 is removed + if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then + docompress -x /usr/share/doc/qt-${pv} + fi fi if [[ ${EAPI} = 6 ]]; then