From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0936C1384B4 for ; Sun, 20 Dec 2015 02:05:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DCA521C003; Sun, 20 Dec 2015 02:05:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2E14121C003 for ; Sun, 20 Dec 2015 02:05:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4147534016B for ; Sun, 20 Dec 2015 02:05:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 18382CAF for ; Sun, 20 Dec 2015 02:05:35 +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: <1450577099.f9919f0af99e9ececcea0e95391eb90cc36adb68.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: f9919f0af99e9ececcea0e95391eb90cc36adb68 X-VCS-Branch: master Date: Sun, 20 Dec 2015 02:05:35 +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: 84012705-2ccc-429a-8b72-73f60e6497f7 X-Archives-Hash: 213f6fd870d2f944dc068b83fb38094d commit: f9919f0af99e9ececcea0e95391eb90cc36adb68 Author: Davide Pesavento gentoo org> AuthorDate: Sun Dec 20 02:04:59 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sun Dec 20 02:04:59 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f9919f0a qt5-build.eclass: drop subslot from 5.5.x eclass/qt5-build.eclass | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 63c6617..0778918 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -23,12 +23,16 @@ inherit eutils flag-o-matic toolchain-funcs versionator virtualx HOMEPAGE="https://www.qt.io/" LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" -# IMPORTANT: add a subslot dependency to your package only if you are sure -# that it uses some private Qt APIs (most likely it does not) -SLOT=5/$(get_version_component_range 1-2) - QT5_MINOR_VERSION=$(get_version_component_range 2) +if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then + # IMPORTANT: add a subslot dependency to your package only if you are sure + # that it uses some private Qt APIs (most likely it does not) + SLOT=5/$(get_version_component_range 1-2) +else + SLOT=5 +fi + # @ECLASS-VARIABLE: QT5_MODULE # @DESCRIPTION: # The upstream name of the module this package belongs to. Used for