1 |
commit: 6e8df96298480523c6f0e37a20d843ef5fd263ed |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 31 19:47:20 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 1 09:24:37 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8df962 |
7 |
|
8 |
qt5-build.eclass: Relocate QT5_DOCDIR to /usr/share/qt5-doc |
9 |
|
10 |
Acked-by: Michael Palimaka <kensington <AT> gentoo.org> |
11 |
Bug: https://bugs.gentoo.org/667280 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
eclass/qt5-build.eclass | 10 ++++++++-- |
15 |
1 file changed, 8 insertions(+), 2 deletions(-) |
16 |
|
17 |
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass |
18 |
index 2f1e6e684ec..613af912b93 100644 |
19 |
--- a/eclass/qt5-build.eclass |
20 |
+++ b/eclass/qt5-build.eclass |
21 |
@@ -256,7 +256,9 @@ qt5-build_src_install() { |
22 |
|
23 |
popd >/dev/null || die |
24 |
|
25 |
- docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global |
26 |
+ if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then |
27 |
+ docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global |
28 |
+ fi |
29 |
|
30 |
# install an empty Gentoo/gentoo-qconfig.h in ${D} |
31 |
# so that it's placed under package manager control |
32 |
@@ -414,7 +416,11 @@ qt5_prepare_env() { |
33 |
QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports |
34 |
QT5_QMLDIR=${QT5_ARCHDATADIR}/qml |
35 |
QT5_DATADIR=${QT5_PREFIX}/share/qt5 |
36 |
- QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} |
37 |
+ if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then |
38 |
+ QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} |
39 |
+ else |
40 |
+ QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc |
41 |
+ fi |
42 |
QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations |
43 |
QT5_EXAMPLESDIR=${QT5_DATADIR}/examples |
44 |
QT5_TESTSDIR=${QT5_DATADIR}/tests |