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 647EB139085 for ; Fri, 6 Jan 2017 15:46:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AD08E0CE2; Fri, 6 Jan 2017 15:46:16 +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 736D2E0CE2 for ; Fri, 6 Jan 2017 15:46:16 +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 8551C341616 for ; Fri, 6 Jan 2017 15:46:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BABFA261F for ; Fri, 6 Jan 2017 15:46:13 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1483717512.5f80efa768f765f0f31f3956545c13fa7573284d.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5-functions.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 5f80efa768f765f0f31f3956545c13fa7573284d X-VCS-Branch: master Date: Fri, 6 Jan 2017 15:46:13 +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: 86982ac3-1f0d-4f2b-aa37-5694cbeab8b2 X-Archives-Hash: 95f7c14993e077c822a41860a3cfb171 commit: 5f80efa768f765f0f31f3956545c13fa7573284d Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Jan 6 14:40:57 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Jan 6 15:45:12 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=5f80efa7 kde5-functions.eclass: Assume slot 5 for add_qt_dep unless defined So far we relied on ${SLOT} (4|5) to depend on the correct Qt slot, but this is not always the case. If an ebuild inherits kde5-functions and uses add_qt_dep then it is safe to assume it will depend on Qt5. eclass/kde5-functions.eclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index ad576c6..26e9811 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -280,14 +280,19 @@ add_qt_dep() { fi local version + local slot=${4} if [[ -n ${3} ]]; then version=${3} - elif [[ -z "${version}" ]] ; then + elif [[ -z "${version}" ]]; then version=${QT_MINIMAL} fi - _add_category_dep dev-qt "${1}" "${2}" "${version}" "${4}" + if [[ -z ${slot} ]]; then + slot="5" + fi + + _add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}" } # @FUNCTION: get_kde_version