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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 39EA3158099 for ; Wed, 29 Nov 2023 20:27:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 53D392BC014; Wed, 29 Nov 2023 20:27:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 34D392BC014 for ; Wed, 29 Nov 2023 20:27:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 325AA335C7E for ; Wed, 29 Nov 2023 20:27:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF9C2C38 for ; Wed, 29 Nov 2023 20:27:41 +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: <1701289640.4933c28677189614a6025a68939207ad78b5e014.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/plasma.kde.org.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 4933c28677189614a6025a68939207ad78b5e014 X-VCS-Branch: master Date: Wed, 29 Nov 2023 20:27:41 +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: e0a3cb98-9208-4d8b-9be6-29e85122bb74 X-Archives-Hash: 5c0c484df34c765f673d5cf88751a367 commit: 4933c28677189614a6025a68939207ad78b5e014 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Nov 29 20:23:17 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Nov 29 20:27:20 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=4933c286 plasma.kde.org.eclass: Add _PSLOT major version mapping, SLOT 5 blocker Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/plasma.kde.org.eclass | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass index 367ad94a61..8326a7b5ed 100644 --- a/eclass/plasma.kde.org.eclass +++ b/eclass/plasma.kde.org.eclass @@ -31,6 +31,16 @@ _PLASMA_KDE_ORG_ECLASS=1 # For proper description see kde.org.eclass manpage. KDE_PV_UNRELEASED=( ) +# @ECLASS_VARIABLE: _PSLOT +# @INTERNAL +# @DESCRIPTION: +# KDE Plasma major version mapping, implied by package version. This is being +# used throughout the eclass as a switch between Plasma 5 and 6 packages. +_PSLOT=6 +if $(ver_test -lt 5.27.50); then + _PSLOT=5 +fi + inherit kde.org HOMEPAGE="https://kde.org/plasma-desktop" @@ -39,7 +49,7 @@ HOMEPAGE="https://kde.org/plasma-desktop" # @INTERNAL # @DESCRIPTION: # For proper description see kde.org.eclass manpage. -KDE_ORG_SCHEDULE_URI+="/Plasma_5" +KDE_ORG_SCHEDULE_URI+="/Plasma_${_PSLOT}" # @ECLASS_VARIABLE: _KDE_SRC_URI # @INTERNAL @@ -63,4 +73,17 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then SRC_URI="${_KDE_SRC_URI}${KDE_ORG_NAME}-${PV}.tar.xz" fi +if [[ ${_PSLOT} == 6 ]]; then + case ${PN} in + kglobalacceld | \ + kwayland | \ + libplasma | \ + ocean-sound-theme | \ + plasma-activities | \ + plasma-activities-stats | \ + plasma5support) ;; + *) RDEPEND+=" !kde-plasma/${PN}:5" ;; + esac +fi + fi