[gentoo-commits] proj/qt:master commit in: eclass/

[Davide Pesavento]

commit:     4b7ca223526e696b47ba90d3dd5fbcee2c6185f0
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sun Dec  4 02:47:32 2016 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
CommitDate: Sun Dec  4 02:47:32 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=4b7ca223

qt5-build.eclass: fix version check for install_global_docs

This restores global docs installation in 5.6.1 and 5.6.2, which
do not contain the mentioned upstream commit.

Amends ff79c14ece9b5fbd2e13a897e67d37ab241a3b68

 eclass/qt5-build.eclass | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index d496ba0..f6a62cc 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -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"
@@ -283,18 +284,16 @@ qt5-build_src_install() {
 			qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets
 		fi
 
-		if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then
-
-			set -- emake INSTALL_ROOT="${D}" \
-				${qmake_install_target} \
-				install_{syncqt,mkspecs}
-		else
-
-			set -- emake INSTALL_ROOT="${D}" \
-				${qmake_install_target} \
-				install_{syncqt,mkspecs,global_docs}
+		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_target}
+
 		einfo "Running $*"
 		"$@"