commit: f4614e567024e4179e1a16c879653d2e22c5d836 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Jan 31 19:47:20 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Feb 28 14:16:33 2019 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f4614e56
qt5-build.eclass: Relocate QT5_DOCDIR to /usr/share/qt5-doc Acked-by: Michael Palimaka <kensington <AT> gentoo.org> Bug: https://bugs.gentoo.org/667280 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> eclass/qt5-build.eclass | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 2f1e6e68..613af912 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -256,7 +256,9 @@ qt5-build_src_install() { popd >/dev/null || die - docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global + if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then + docompress -x "${QT5_DOCDIR#${EPREFIX}}"/global + fi # install an empty Gentoo/gentoo-qconfig.h in ${D} # so that it's placed under package manager control @@ -414,7 +416,11 @@ qt5_prepare_env() { QT5_IMPORTDIR=${QT5_ARCHDATADIR}/imports QT5_QMLDIR=${QT5_ARCHDATADIR}/qml QT5_DATADIR=${QT5_PREFIX}/share/qt5 - QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} + if [[ ${QT5_MINOR_VERSION} -lt 12 ]]; then + QT5_DOCDIR=${QT5_PREFIX}/share/doc/qt-${PV} + else + QT5_DOCDIR=${QT5_PREFIX}/share/qt5-doc + fi QT5_TRANSLATIONDIR=${QT5_DATADIR}/translations QT5_EXAMPLESDIR=${QT5_DATADIR}/examples QT5_TESTSDIR=${QT5_DATADIR}/tests
