qt5-build.eclass: Relocate QT5_DOCDIR to /usr/share/qt5-doc
authorAndreas Sturmlechner <asturm@gentoo.org>
Thu, 31 Jan 2019 19:47:20 +0000 (20:47 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Fri, 1 Mar 2019 09:24:37 +0000 (10:24 +0100)
Acked-by: Michael Palimaka <kensington@gentoo.org>
Bug: https://bugs.gentoo.org/667280
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
eclass/qt5-build.eclass

index 2f1e6e684ecf40f5a774f2a178f1547728055e9f..613af912b93a87f24b8301a2901caa8dca188496 100644 (file)
@@ -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