From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AE2591395E2 for ; Sun, 4 Dec 2016 02:55:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C831A21C084; Sun, 4 Dec 2016 02:55:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4D8A21C084 for ; Sun, 4 Dec 2016 02:55:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 912E3341063 for ; Sun, 4 Dec 2016 02:55:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 19AE4498 for ; Sun, 4 Dec 2016 02:55:03 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1480819652.4b7ca223526e696b47ba90d3dd5fbcee2c6185f0.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 4b7ca223526e696b47ba90d3dd5fbcee2c6185f0 X-VCS-Branch: master Date: Sun, 4 Dec 2016 02:55:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d87afcbf-95a1-44fb-8e32-5a62060b7628 X-Archives-Hash: b1a528702b31b6022b81b67f3e46ff47 commit: 4b7ca223526e696b47ba90d3dd5fbcee2c6185f0 Author: Davide Pesavento gentoo org> AuthorDate: Sun Dec 4 02:47:32 2016 +0000 Commit: Davide Pesavento gentoo 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 $*" "$@"