qt5-build.eclass: fix doc handling in Qt 5.6.2 and later
authorJimi Huotari <chiitoo@gentoo.org>
Thu, 6 Oct 2016 18:00:42 +0000 (21:00 +0300)
committerMichael Palimaka <kensington@gentoo.org>
Wed, 14 Dec 2016 16:20:42 +0000 (03:20 +1100)
The global_docs target is not needed any longer due to the following
upstream change:

http://code.qt.io/cgit/qt/qtbase.git/commit/?id=a7ddef139415f74f9ba8dc84a2f15105149ca5e8

Gentoo-Bug: https://bugs.gentoo.org/596054

eclass/qt5-build.eclass

index 7e9bf41ad75ab6cadf4e50c3dc75add6a6ddb30b..f22934418b8639c2144013dfc9fc5726a483bfba 100644 (file)
@@ -54,7 +54,8 @@ inherit eutils flag-o-matic toolchain-funcs versionator virtualx
 HOMEPAGE="https://www.qt.io/"
 
 QT5_MINOR_VERSION=$(get_version_component_range 2)
-readonly QT5_MINOR_VERSION
+QT5_PATCH_VERSION=$(get_version_component_range 3)
+readonly QT5_MINOR_VERSION QT5_PATCH_VERSION
 
 if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then
        LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3"
@@ -278,9 +279,16 @@ qt5-build_src_install() {
                        qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets
                fi
 
+               local global_docs_install_target=
+               if [[ ${QT5_MINOR_VERSION} -le 6 && ${QT5_PATCH_VERSION} -le 2 ]]; then
+                       global_docs_install_target=install_global_docs
+               fi
+
                set -- emake INSTALL_ROOT="${D}" \
                        ${qmake_install_target} \
-                       install_{syncqt,mkspecs,global_docs}
+                       install_{syncqt,mkspecs} \
+                       ${global_docs_install_target}
+
                einfo "Running $*"
                "$@"