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 DEED4139694 for ; Sun, 28 May 2017 11:50:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05E23E0C56; Sun, 28 May 2017 11:50:10 +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 D9306E0C56 for ; Sun, 28 May 2017 11:50:09 +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 A1A3734164B for ; Sun, 28 May 2017 11:50:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6354F7449 for ; Sun, 28 May 2017 11:50:01 +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: <1495972119.c5764a1a9654b008329dbf4355b5ef2482c8bc63.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: c5764a1a9654b008329dbf4355b5ef2482c8bc63 X-VCS-Branch: master Date: Sun, 28 May 2017 11:50:01 +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: 84850cea-aa9f-4b9d-9b83-f7c7cf59d9ef X-Archives-Hash: e52753becaaad6650caeadc78e5d64e9 commit: c5764a1a9654b008329dbf4355b5ef2482c8bc63 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 28 11:48:39 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 28 11:48:39 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=c5764a1a kde5-functions.eclass: Pin down Plasma 5.8 LTS deps to LTS versions eclass/kde5-functions.eclass | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index d187f54283..b255cc88e6 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -142,16 +142,23 @@ _add_category_dep() { local category=${1} local package=${2} local use=${3} - local version=${4} - local slot=${5} + local operator=${4} + local version=${5} + local slot=${6} if [[ -n ${use} ]] ; then local use="[${use}]" fi if [[ -n ${version} ]] ; then - local operator=">=" - local version="-$(get_version_component_range 1-3 ${version})" + if [[ -z ${operator} ]] ; then + operator=">=" + fi + if [[ ${operator} = ">=" ]] ; then + version="-$(get_version_component_range 1-3 ${version})" + else + version="-${version}" + fi fi if [[ -n ${slot} ]] ; then @@ -192,7 +199,7 @@ add_frameworks_dep() { version=${FRAMEWORKS_MINIMAL} fi - _add_category_dep kde-frameworks "${1}" "${2}" "${version}" "${4}" + _add_category_dep kde-frameworks "${1}" "${2}" "" "${version}" "${4}" } # @FUNCTION: add_plasma_dep @@ -214,17 +221,21 @@ add_plasma_dep() { die "${FUNCNAME} was called with too many arguments" fi + local operator local version if [[ -n ${3} ]]; then version=${3} elif [[ ${CATEGORY} = kde-plasma ]]; then version=${PV} + if [[ ${PV} = 5.8* ]] ; then + operator="~" + fi elif [[ -z "${version}" ]] ; then version=${PLASMA_MINIMAL} fi - _add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}" + _add_category_dep kde-plasma "${1}" "${2}" "${operator}" "${version}" "${4}" } # @FUNCTION: add_kdeapps_dep @@ -261,7 +272,7 @@ add_kdeapps_dep() { fi fi - _add_category_dep kde-apps "${1}" "${2}" "${version}" "${4}" + _add_category_dep kde-apps "${1}" "${2}" "" "${version}" "${4}" } # @FUNCTION: add_qt_dep @@ -296,7 +307,7 @@ add_qt_dep() { slot="5" fi - _add_category_dep dev-qt "${1}" "${2}" "${version}" "${slot}" + _add_category_dep dev-qt "${1}" "${2}" "" "${version}" "${slot}" } # @FUNCTION: get_kde_version