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 BA7151382C5 for ; Sun, 11 Apr 2021 20:03:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6D4EE083D; Sun, 11 Apr 2021 20:03:24 +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 C2242E083D for ; Sun, 11 Apr 2021 20:03:24 +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 92545340C69 for ; Sun, 11 Apr 2021 20:03:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9B9A47 for ; Sun, 11 Apr 2021 20:03:21 +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: <1618139931.d59a0593cd7a521f3d635aca601ef65599359e59.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde.org.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: d59a0593cd7a521f3d635aca601ef65599359e59 X-VCS-Branch: master Date: Sun, 11 Apr 2021 20:03:21 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5f6baacb-a115-4306-86a8-4eaac316f5ec X-Archives-Hash: fb5b12df2a758c7ff40ed2ce82591fef commit: d59a0593cd7a521f3d635aca601ef65599359e59 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 11 08:54:45 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 11 11:18:51 2021 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d59a0593 kde.org.eclass: KDE_RELEASE_SERVICE -> KDE_GEAR The unbranded KDE Release Schedule formerly known as KDE Applications is now known as KDE Gear. Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/kde.org.eclass | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eclass/kde.org.eclass b/eclass/kde.org.eclass index 7d46b8e324..3f9850a067 100644 --- a/eclass/kde.org.eclass +++ b/eclass/kde.org.eclass @@ -7,8 +7,8 @@ # @SUPPORTED_EAPIS: 7 # @BLURB: Support eclass for packages that are hosted on kde.org infrastructure. # @DESCRIPTION: -# This eclass is mainly providing facilities for the upstream release groups -# Frameworks, Plasma, Release Service to assemble default SRC_URI for tarballs, +# This eclass is mainly providing facilities for the three upstream release +# groups (Frameworks, Plasma, Gear) to assemble default SRC_URI for tarballs, # set up git-r3.eclass for stable/master branch versions or restrict access to # unreleased (packager access only) tarballs in Gentoo KDE overlay, but it may # be also used by any other package hosted on kde.org. @@ -87,11 +87,11 @@ readonly KDE_ORG_CATEGORIES # Name of the package as hosted on kde.org mirrors. : ${KDE_ORG_NAME:=$PN} -# @ECLASS-VARIABLE: KDE_RELEASE_SERVICE +# @ECLASS-VARIABLE: KDE_GEAR # @DESCRIPTION: # If set to "false", do nothing. # If set to "true", set SRC_URI accordingly and apply KDE_UNRELEASED. -: ${KDE_RELEASE_SERVICE:=false} +: ${KDE_GEAR:=false} # @ECLASS-VARIABLE: KDE_SELINUX_MODULE # @DESCRIPTION: @@ -120,7 +120,7 @@ HOMEPAGE="https://kde.org/" case ${CATEGORY} in kde-apps) - KDE_RELEASE_SERVICE=true + KDE_GEAR=true ;; kde-plasma) HOMEPAGE="https://kde.org/plasma-desktop" @@ -142,7 +142,7 @@ _kde.org_is_unreleased() { for pair in "${KDE_UNRELEASED[@]}" ; do if [[ "${pair}" = "${CATEGORY}-${PV}" ]]; then return 0 - elif [[ ${KDE_RELEASE_SERVICE} = true ]]; then + elif [[ ${KDE_GEAR} = true ]]; then if [[ "${pair/kde-apps/${CATEGORY}}" = "${CATEGORY}-${PV}" ]]; then return 0 fi @@ -161,7 +161,7 @@ _kde.org_calculate_src_uri() { local _src_uri="mirror://kde/" - if [[ ${KDE_RELEASE_SERVICE} = true ]]; then + if [[ ${KDE_GEAR} = true ]]; then case ${PV} in ??.??.[6-9]? ) _src_uri+="unstable/release-service/${PV}/src/" @@ -231,7 +231,7 @@ _kde.org_calculate_live_repo() { # (anongit) with anything else you might want to use. EGIT_MIRROR=${EGIT_MIRROR:=https://invent.kde.org/${KDE_ORG_CATEGORY}} - if [[ ${PV} == ??.??.49.9999 && ${KDE_RELEASE_SERVICE} = true ]]; then + if [[ ${PV} == ??.??.49.9999 && ${KDE_GEAR} = true ]]; then EGIT_BRANCH="release/$(ver_cut 1-2)" fi @@ -278,8 +278,8 @@ kde.org_pkg_nofetch() { kde-frameworks) sched_uri+="/Frameworks" ;; kde-plasma) sched_uri+="/Plasma_5" ;; *) - [[ ${KDE_RELEASE_SERVICE} = true ]] && - sched_uri+="/release_service/$(ver_cut 1-2)_Release_Schedule" + [[ ${KDE_GEAR} = true ]] && + sched_uri+="/KDE_Gear_$(ver_cut 1-2)_Schedule" ;; esac