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 F25FB138330 for ; Thu, 31 May 2018 18:30:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2EA6E0883; Thu, 31 May 2018 18:30:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 70A96E0883 for ; Thu, 31 May 2018 18:30:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 237FB335C76 for ; Thu, 31 May 2018 18:30:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29AAD2BE for ; Thu, 31 May 2018 18:30:25 +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: <1527791394.22c71e550e6e12a20663047f8a80ac3bdf7ef3d5.asturm@gentoo> Subject: [gentoo-commits] proj/kde-sunset:master commit in: eclass/ X-VCS-Repository: proj/kde-sunset X-VCS-Files: eclass/kde4-functions-extra.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 22c71e550e6e12a20663047f8a80ac3bdf7ef3d5 X-VCS-Branch: master Date: Thu, 31 May 2018 18:30:25 +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: ef9c8bcc-2577-4b8b-893c-abea166f2bc0 X-Archives-Hash: f76ab53016eefb9c29ef6d60b8c2fe4e commit: 22c71e550e6e12a20663047f8a80ac3bdf7ef3d5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 31 17:57:09 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 31 18:29:54 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde-sunset.git/commit/?id=22c71e55 kde4-functions-extra.eclass: Drop invalid aqua conditional eclass/kde4-functions-extra.eclass | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/eclass/kde4-functions-extra.eclass b/eclass/kde4-functions-extra.eclass index 168bf43..a6ad847 100644 --- a/eclass/kde4-functions-extra.eclass +++ b/eclass/kde4-functions-extra.eclass @@ -31,7 +31,11 @@ add_kdeplasma_dep() { debug-print-function ${FUNCNAME} "$@" local ver + local use=${2} + if [[ -n ${use} ]] ; then + use="[${use}]" + fi if [[ -n ${3} ]]; then ver=${3} elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then @@ -49,9 +53,7 @@ add_kdeplasma_dep() { [[ -z ${1} ]] && die "Missing parameter" - #FIXME - # Drop aqua= from kf5 packages - echo " >=kde-plasma/${1}-${ver}:4[aqua=${2:+,${2}}]" + echo " >=kde-plasma/${1}-${ver}:4${use}" } # @FUNCTION: add_kdeframeworks_dep @@ -67,7 +69,11 @@ add_kdeframeworks_dep() { debug-print-function ${FUNCNAME} "$@" local ver + local use=${2} + if [[ -n ${use} ]] ; then + use="[${use}]" + fi if [[ -n ${3} ]]; then ver=${3} elif [[ -n ${KDE_OVERRIDE_MINIMAL} ]]; then @@ -85,9 +91,7 @@ add_kdeframeworks_dep() { [[ -z ${1} ]] && die "Missing parameter" - #FIXME - # Drop aqua= from kf5 packages - echo " >=kde-frameworks/${1}-${ver}:4[aqua=${2:+,${2}}]" + echo " >=kde-frameworks/${1}-${ver}:4${use}" } fi