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 4BB0713838B for ; Tue, 14 Oct 2014 12:42:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2B52FE084B; Tue, 14 Oct 2014 12:42:38 +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 C3E1DE084B for ; Tue, 14 Oct 2014 12:42:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8BCA34038A for ; Tue, 14 Oct 2014 12:42:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 494E07D10 for ; Tue, 14 Oct 2014 12:42:35 +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: <1413290546.43df7b2587c54afbfd07b5990fcc4f05e80bc1ee.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: 43df7b2587c54afbfd07b5990fcc4f05e80bc1ee X-VCS-Branch: master Date: Tue, 14 Oct 2014 12:42: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: fbcb59a8-beab-4f88-87a7-376bfc766d52 X-Archives-Hash: d88839b3eed8bffea85acd1774e59ee3 commit: 43df7b2587c54afbfd07b5990fcc4f05e80bc1ee Author: Michael Palimaka gentoo org> AuthorDate: Tue Oct 14 12:12:17 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Tue Oct 14 12:42:26 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=43df7b25 [eclass] Make dependency version handling more case specific. There's no need to have generic guessing logic when we have specific logic for each case. --- eclass/kde5-functions.eclass | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index e52e9ea..564dce8 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -86,24 +86,18 @@ _add_kdecategory_dep() { local category=${1} local package=${2} local use=${3} - local minversion=${4} - local version + local version=${4} - if [[ -n ${minversion} ]]; then - version=${minversion} - # if building stable-live version depend just on the raw KDE version - # to allow merging packages against more stable basic stuff - elif [[ ${PV} == *.9999 ]]; then - version=$(get_kde_version) - else - version=${PV} + if [[ -n ${use} ]] ; then + local use="[${use}]" fi - if [[ -n ${use} ]] ; then - usedep="[${use}]" + if [[ -n ${version} ]] ; then + local operator=">=" + local version="-${version}" fi - echo " >=${category}/${package}-${version}:5${usedep}" + echo " ${operator}${category}/${package}${version}:5${use}" } # @FUNCTION: add_frameworks_dep @@ -150,7 +144,15 @@ add_frameworks_dep() { add_kdebase_dep() { debug-print-function ${FUNCNAME} "$@" - _add_kdecategory_dep kde-base "${1}" "${2}" "${3}" + local version + + if [[ -n ${3} ]]; then + version=${3} + elif [[ ${CATEGORY} = kde-base ]]; then + version=${PV} + fi + + _add_kdecategory_dep kde-base "${1}" "${2}" "${version}" } # @FUNCTION: get_kde_version