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 3150958973 for ; Sun, 31 Jan 2016 16:22:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7547721C13A; Sun, 31 Jan 2016 16:22:07 +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 57B9721C137 for ; Sun, 31 Jan 2016 16:22:06 +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 89765340BDA for ; Sun, 31 Jan 2016 16:22:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88C3B8F7 for ; Sun, 31 Jan 2016 16:22:02 +0000 (UTC) From: "Michael Palimaka" 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" Message-ID: <1454257307.b99f8c46537a20bd6ad08b56007a193fb2e5627e.kensington@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: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: b99f8c46537a20bd6ad08b56007a193fb2e5627e X-VCS-Branch: master Date: Sun, 31 Jan 2016 16:22:02 +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: c29fc840-57f9-472e-984d-bfdf878cf43a X-Archives-Hash: 57c4b2cc33d3bb528e869cda623834e8 commit: b99f8c46537a20bd6ad08b56007a193fb2e5627e Author: Andreas Sturmlechner gmail com> AuthorDate: Mon Jan 25 22:50:20 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Jan 31 16:21:47 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b99f8c46 kde5-functions.eclass: add_category_dep: Implement slot/op override Also fixes subslot awareness. eclass/kde5-functions.eclass | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index f8b3b30..932c2b8 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -105,7 +105,7 @@ _add_category_dep() { local package=${2} local use=${3} local version=${4} - local slot= + local slot=${5} if [[ -n ${use} ]] ; then local use="[${use}]" @@ -116,8 +116,10 @@ _add_category_dep() { local version="-$(get_version_component_range 1-3 ${version})" fi - if [[ ${SLOT} = 4 || ${SLOT} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then - slot=":${SLOT}" + if [[ -n ${slot} ]] ; then + slot=":${slot}" + elif [[ ${SLOT%\/*} = 4 || ${SLOT%\/*} = 5 ]] && ! has kde5-meta-pkg ${INHERITED} ; then + slot=":${SLOT%\/*}" fi echo " ${operator}${category}/${package}${version}${slot}${use}" @@ -210,9 +212,11 @@ add_kdeapps_dep() { # @USAGE: [USE flags] [minimum version] # @DESCRIPTION: # Create proper dependency for dev-qt/ dependencies. -# This takes 1 to 3 arguments. The first being the package name, the optional +# This takes 1 to 4 arguments. The first being the package name, the optional # second is additional USE flags to append, and the optional third is the -# version to use instead of the automatic version (use sparingly). +# version to use instead of the automatic version (use sparingly). In addition, +# the optional fourth argument defines slot+operator instead of automatic slot +# (use even more sparingly). # The output of this should be added directly to DEPEND/RDEPEND, and may be # wrapped in a USE conditional (but not an || conditional without an extra set # of parentheses). @@ -227,7 +231,7 @@ add_qt_dep() { version=${QT_MINIMAL} fi - _add_category_dep dev-qt "${1}" "${2}" "${version}" + _add_category_dep dev-qt "${1}" "${2}" "${version}" "${4}" } # @FUNCTION: get_kde_version