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 34F07139694 for ; Thu, 15 Jun 2017 08:11:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6A93CE0DC2; Thu, 15 Jun 2017 08:11:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 4AA52E0DC2 for ; Thu, 15 Jun 2017 08:11:57 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 65C30341761 for ; Thu, 15 Jun 2017 08:11:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CCE554EBE for ; Thu, 15 Jun 2017 08:11:54 +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: <1497514297.8ae7620c5051cbf2b98facbfd4e4d0196c2c1fe6.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: 8ae7620c5051cbf2b98facbfd4e4d0196c2c1fe6 X-VCS-Branch: master Date: Thu, 15 Jun 2017 08:11:54 +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: 4def2b89-d521-4891-a47f-371c021f9e48 X-Archives-Hash: c0e0fe05ea79e07e3ad65d2b28bdc738 commit: 8ae7620c5051cbf2b98facbfd4e4d0196c2c1fe6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jun 15 08:09:11 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 15 08:11:37 2017 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8ae7620c kde5-functions.eclass: Drop KDE Plasma 5.8 LTS quirks We won't need this. eclass/kde5-functions.eclass | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index b5f639eaf7..942c0251d5 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -136,22 +136,16 @@ _add_category_dep() { local category=${1} local package=${2} local use=${3} - local operator=${4} - local version=${5} - local slot=${6} + local version=${4} + local slot=${5} if [[ -n ${use} ]] ; then local use="[${use}]" fi if [[ -n ${version} ]] ; then - if [[ -z ${operator} ]] ; then - operator=">=" - fi - version="-$(get_version_component_range 1-3 ${version})" - if [[ ${operator} = "=" ]] ; then - version="${version}*" - fi + local operator=">=" + local version="-$(get_version_component_range 1-3 ${version})" fi if [[ -n ${slot} ]] ; then @@ -192,7 +186,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,21 +208,17 @@ 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}" "${operator}" "${version}" "${4}" + _add_category_dep kde-plasma "${1}" "${2}" "${version}" "${4}" } # @FUNCTION: add_kdeapps_dep @@ -265,7 +255,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 @@ -300,7 +290,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