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 951DC138331 for ; Sat, 12 May 2018 14:02:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1086E0ADA; Sat, 12 May 2018 14:02:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7D6F2E0ADA for ; Sat, 12 May 2018 14:02:16 +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 546C9335C96 for ; Sat, 12 May 2018 14:02:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D2F328D for ; Sat, 12 May 2018 14:02:14 +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: <1526133677.ebabacb20f7f8909ab2f895b593714baf04df93d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/kde5-functions.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: ebabacb20f7f8909ab2f895b593714baf04df93d X-VCS-Branch: master Date: Sat, 12 May 2018 14:02:14 +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: bf8d1645-09e4-4f68-9baa-86ea50f2b4cb X-Archives-Hash: c3e6764d783b1c4e64256e338e4fc4de commit: ebabacb20f7f8909ab2f895b593714baf04df93d Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 6 21:28:50 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat May 12 14:01:17 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebabacb2 kde5-functions.eclass: versionator -> eapi7-ver eclass/kde5-functions.eclass | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass index 4435b09f69d..0fbff9846a6 100644 --- a/eclass/kde5-functions.eclass +++ b/eclass/kde5-functions.eclass @@ -15,10 +15,10 @@ if [[ -z ${_KDE5_FUNCTIONS_ECLASS} ]]; then _KDE5_FUNCTIONS_ECLASS=1 -inherit toolchain-funcs versionator +inherit toolchain-funcs case ${EAPI} in - 6) ;; + 6) inherit eapi7-ver ;; *) die "EAPI=${EAPI:-0} is not supported" ;; esac @@ -185,7 +185,7 @@ add_frameworks_dep() { if [[ -n ${3} ]]; then version=${3} elif [[ ${CATEGORY} = kde-frameworks ]]; then - version=$(get_version_component_range 1-2) + version=$(ver_cut 1-2) elif [[ -z ${3} ]] ; then version=${FRAMEWORKS_MINIMAL} fi @@ -217,7 +217,7 @@ add_plasma_dep() { if [[ -n ${3} ]]; then version=${3} elif [[ ${CATEGORY} = kde-plasma ]]; then - version=$(get_version_component_range 1-3) + version=$(ver_cut 1-3) elif [[ -z ${3} ]] ; then version=${PLASMA_MINIMAL} fi @@ -249,7 +249,7 @@ add_kdeapps_dep() { if [[ -n ${3} ]]; then version=${3} elif [[ ${CATEGORY} = kde-apps ]]; then - version=$(get_version_component_range 1-3) + version=$(ver_cut 1-3) elif [[ -z ${3} ]] ; then version=${KDE_APPS_MINIMAL} fi @@ -302,9 +302,9 @@ add_qt_dep() { # If no version is specified, ${PV} is used. get_kde_version() { local ver=${1:-${PV}} - local major=$(get_major_version ${ver}) - local minor=$(get_version_component_range 2 ${ver}) - local micro=$(get_version_component_range 3 ${ver}) + local major=$(ver_cut 1 ${ver}) + local minor=$(ver_cut 2 ${ver}) + local micro=$(ver_cut 3 ${ver}) if [[ ${ver} == 9999 ]]; then echo live else