Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: eclass/
Date: Thu, 28 Feb 2019 15:41:10
Message-Id: 1551368429.14708bf89e530a1755a84c351963fbeba73fe760.asturm@gentoo
1 commit: 14708bf89e530a1755a84c351963fbeba73fe760
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 31 22:34:49 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 28 15:40:29 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=14708bf8
7
8 kde5.eclass: Qt 5.12.1 is changing qch doc location
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 eclass/kde5.eclass | 9 ++++++---
13 1 file changed, 6 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
16 index 1167e2c532..ca96a6f7dc 100644
17 --- a/eclass/kde5.eclass
18 +++ b/eclass/kde5.eclass
19 @@ -702,9 +702,12 @@ kde5_src_install() {
20 # cmake can't find the tags and qthelp viewers can't find the docs
21 local p=$(best_version dev-qt/qtcore:5)
22 local pv=$(echo ${p/%-r[0-9]*/} | rev | cut -d - -f 1 | rev)
23 - #todo: clean up trailing slash check when EAPI <7 is removed
24 - if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
25 - docompress -x /usr/share/doc/qt-${pv}
26 + einfo "muha $pv"
27 + if [[ ${pv} = 5.11* ]]; then
28 + #todo: clean up trailing slash check when EAPI <7 is removed
29 + if [[ -d ${ED%/}/usr/share/doc/qt-${pv} ]]; then
30 + docompress -x /usr/share/doc/qt-${pv}
31 + fi
32 fi
33
34 if [[ ${EAPI} = 6 ]]; then