From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-914375-garchives=archives.gentoo.org@lists.gentoo.org>
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 8FA271395E2
	for <garchives@archives.gentoo.org>; Wed, 30 Nov 2016 17:23:08 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 46A10E0C01;
	Wed, 30 Nov 2016 17:23:05 +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 2FCBDE0C01
	for <gentoo-commits@lists.gentoo.org>; Wed, 30 Nov 2016 17:23:05 +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 2937F3411D7
	for <gentoo-commits@lists.gentoo.org>; Wed, 30 Nov 2016 17:23:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 893D84A9
	for <gentoo-commits@lists.gentoo.org>; Wed, 30 Nov 2016 17:23:02 +0000 (UTC)
From: "Michael Palimaka" <kensington@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" <kensington@gentoo.org>
Message-ID: <1480526570.ff79c14ece9b5fbd2e13a897e67d37ab241a3b68.kensington@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: kensington
X-VCS-Committer-Name: Michael Palimaka
X-VCS-Revision: ff79c14ece9b5fbd2e13a897e67d37ab241a3b68
X-VCS-Branch: master
Date: Wed, 30 Nov 2016 17:23:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: be58649d-db91-4445-a7aa-79b8746b4d09
X-Archives-Hash: 0f6af1f289600b3b7cc426997115962b

commit:     ff79c14ece9b5fbd2e13a897e67d37ab241a3b68
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Thu Oct  6 18:00:42 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 17:22:50 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=ff79c14e

qt5-build.eclass: Disable 'global_docs'

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 | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index f66fde0..9727ce7 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -283,9 +283,18 @@ qt5-build_src_install() {
 			qmake_install_target=sub-qmake-qmake-aux-pro-install_subtargets
 		fi
 
-		set -- emake INSTALL_ROOT="${D}" \
-			${qmake_install_target} \
-			install_{syncqt,mkspecs,global_docs}
+		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}
+		fi
+
 		einfo "Running $*"
 		"$@"