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 EA728138331 for ; Tue, 6 Mar 2018 22:46:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CCE57E09F6; Tue, 6 Mar 2018 22:46:40 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 ADB6EE09F6 for ; Tue, 6 Mar 2018 22:46:40 +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 69EBD335C34 for ; Tue, 6 Mar 2018 22:46:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C7F0238 for ; Tue, 6 Mar 2018 22:46:37 +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: <1520374238.9aba5b04a031ec120d8e42c2accfa4f69a9c36a0.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9aba5b04a031ec120d8e42c2accfa4f69a9c36a0 X-VCS-Branch: master Date: Tue, 6 Mar 2018 22:46:37 +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: 23eac78b-aef7-42c1-8750-0882fea9ae60 X-Archives-Hash: 679db95ff75a3bd669ce400f5d2f0589 commit: 9aba5b04a031ec120d8e42c2accfa4f69a9c36a0 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Mar 6 21:35:19 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Mar 6 22:10:38 2018 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9aba5b04 kde5.eclass: versionator -> eapi7-ver eclass/kde5.eclass | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass index 51fe304f2b..434ee7ec0a 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -31,7 +31,11 @@ _KDE5_ECLASS=1 # for tests you should proceed with setting VIRTUALX_REQUIRED=test. : ${VIRTUALX_REQUIRED:=manual} -inherit cmake-utils flag-o-matic gnome2-utils kde5-functions versionator virtualx xdg +inherit cmake-utils flag-o-matic gnome2-utils kde5-functions virtualx xdg + +case ${EAPI} in + 6) inherit eapi7-ver ;; +esac if [[ ${KDE_BUILD_TYPE} = live ]]; then case ${KDE_SCM} in @@ -180,7 +184,7 @@ case ${KDE_SUBSLOT} in kde-frameworks | \ kde-plasma | \ kde-apps) - SLOT+="/$(get_version_component_range 1-2)" + SLOT+="/$(ver_cut 1-2)" ;; *) SLOT+="/${PV}" @@ -341,7 +345,7 @@ _calculate_src_uri() { kde-frameworks) SRC_URI="mirror://kde/stable/frameworks/${PV%.*}/${_kmname}-${PV}.tar.xz" ;; kde-plasma) - local plasmapv=$(get_version_component_range 1-3) + local plasmapv=$(ver_cut 1-3) case ${PV} in 5.?.[6-9]? | 5.??.[6-9]? ) @@ -410,11 +414,11 @@ _calculate_live_repo() { fi if [[ ${PV} == ??.??.49.9999 && ${CATEGORY} = kde-apps ]]; then - EGIT_BRANCH="Applications/$(get_version_component_range 1-2)" + EGIT_BRANCH="Applications/$(ver_cut 1-2)" fi if [[ ${PV} != 9999 && ${CATEGORY} = kde-plasma ]]; then - EGIT_BRANCH="Plasma/$(get_version_component_range 1-2)" + EGIT_BRANCH="Plasma/$(ver_cut 1-2)" fi EGIT_REPO_URI="${EGIT_MIRROR}/${_kmname}"