From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 finch.gentoo.org (Postfix) with ESMTPS id CB96B15808A for ; Sun, 18 May 2025 23:08:49 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B5ECC343282 for ; Sun, 18 May 2025 23:08:49 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id B00971103DD; Sun, 18 May 2025 23:08:48 +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 bobolink.gentoo.org (Postfix) with ESMTPS id A06111103DD for ; Sun, 18 May 2025 23:08:48 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A43E343282 for ; Sun, 18 May 2025 23:08:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 269B313A6 for ; Sun, 18 May 2025 23:08:45 +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: <1747603012.9df3277eab8872be400ecb91b291895e9cf07d8c.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-meta/ X-VCS-Repository: proj/kde X-VCS-Files: kde-plasma/plasma-meta/plasma-meta-6.3.49.9999.ebuild kde-plasma/plasma-meta/plasma-meta-6.3.90.ebuild kde-plasma/plasma-meta/plasma-meta-6.4.49.9999.ebuild kde-plasma/plasma-meta/plasma-meta-9999.ebuild X-VCS-Directories: kde-plasma/plasma-meta/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9df3277eab8872be400ecb91b291895e9cf07d8c X-VCS-Branch: master Date: Sun, 18 May 2025 23:08:45 +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: e3fbe2e2-7d80-4342-afc7-48a65b324425 X-Archives-Hash: 6e3db7788640a8b9c483cdd161d697af commit: 9df3277eab8872be400ecb91b291895e9cf07d8c Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 18 21:14:28 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 18 21:16:52 2025 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=9df3277e kde-plasma/plasma-meta: Better deal with kde-plasma/spectacle version Signed-off-by: Andreas Sturmlechner gentoo.org> .../plasma-meta/plasma-meta-6.3.49.9999.ebuild | 20 ++++++++++---------- kde-plasma/plasma-meta/plasma-meta-6.3.90.ebuild | 20 ++++++++++---------- .../plasma-meta/plasma-meta-6.4.49.9999.ebuild | 20 ++++++++++---------- kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 21 +++++++++++---------- 4 files changed, 41 insertions(+), 40 deletions(-) diff --git a/kde-plasma/plasma-meta/plasma-meta-6.3.49.9999.ebuild b/kde-plasma/plasma-meta/plasma-meta-6.3.49.9999.ebuild index 3ac4cc247c..c1b0522015 100644 --- a/kde-plasma/plasma-meta/plasma-meta-6.3.49.9999.ebuild +++ b/kde-plasma/plasma-meta/plasma-meta-6.3.49.9999.ebuild @@ -18,15 +18,6 @@ thunderbolt unsupported wacom +wallpapers webengine" REQUIRED_USE="^^ ( elogind systemd ) firewall? ( systemd )" -# The =kde-apps/spectacle-6.3* pin is needed because Spectacle moved from -# KDE Gear => KDE Plasma, but KDE Gear's version scheme is higher than -# KDE Plasma's, so without such a pin, there's nothing that will cause -# the in-reality newer (but wrt PV, older) Spectacle to be pulled in for users. -# -# It can be changed to =kde-apps/spectacle-6* in due course once newer -# KDE Plasma and KDE Gear are stabled and old is cleaned up. Changing it -# to >=kde-plasma/spectacle-${PV}:${SLOT} however can't be done for quite -# some time. RDEPEND=" !${CATEGORY}/${PN}:5 !kde-plasma/khotkeys:5 @@ -69,7 +60,6 @@ RDEPEND=" >=kde-plasma/polkit-kde-agent-${PV}:* >=kde-plasma/powerdevil-${PV}:${SLOT} >=kde-plasma/qqc2-breeze-style-${PV}:${SLOT} - =kde-plasma/spectacle-6.3*:${SLOT} >=kde-plasma/systemsettings-${PV}:${SLOT} >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} sys-apps/dbus[elogind?,systemd?] @@ -135,6 +125,16 @@ RDEPEND=" wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-${PV}:${SLOT} ) webengine? ( kde-apps/khelpcenter:6 ) " +# NOTE spectacle moved from KDE Gear (yy.mm) to KDE Plasma version scheme +case ${PV} in + *9999) RDEPEND+=" ~kde-plasma/spectacle-${PV}:${SLOT}" ;; + *) + RDEPEND+=" + >=kde-plasma/spectacle-$(ver_cut 1-3):${SLOT} + KDE Plasma, but KDE Gear's version scheme is higher than -# KDE Plasma's, so without such a pin, there's nothing that will cause -# the in-reality newer (but wrt PV, older) Spectacle to be pulled in for users. -# -# It can be changed to =kde-apps/spectacle-6* in due course once newer -# KDE Plasma and KDE Gear are stabled and old is cleaned up. Changing it -# to >=kde-plasma/spectacle-${PV}:${SLOT} however can't be done for quite -# some time. RDEPEND=" !${CATEGORY}/${PN}:5 !kde-plasma/khotkeys:5 @@ -69,7 +60,6 @@ RDEPEND=" >=kde-plasma/polkit-kde-agent-${PV}:* >=kde-plasma/powerdevil-${PV}:${SLOT} >=kde-plasma/qqc2-breeze-style-${PV}:${SLOT} - =kde-plasma/spectacle-6*:${SLOT} >=kde-plasma/systemsettings-${PV}:${SLOT} >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} sys-apps/dbus[elogind?,systemd?] @@ -137,6 +127,16 @@ RDEPEND=" webengine? ( kde-apps/khelpcenter:6 ) X? ( >=kde-plasma/kwin-x11-${PV}:${SLOT}[lock] ) " +# NOTE spectacle moved from KDE Gear (yy.mm) to KDE Plasma version scheme +case ${PV} in + *9999) RDEPEND+=" ~kde-plasma/spectacle-${PV}:${SLOT}" ;; + *) + RDEPEND+=" + >=kde-plasma/spectacle-$(ver_cut 1-3):${SLOT} + KDE Plasma, but KDE Gear's version scheme is higher than -# KDE Plasma's, so without such a pin, there's nothing that will cause -# the in-reality newer (but wrt PV, older) Spectacle to be pulled in for users. -# -# It can be changed to =kde-apps/spectacle-6* in due course once newer -# KDE Plasma and KDE Gear are stabled and old is cleaned up. Changing it -# to >=kde-plasma/spectacle-${PV}:${SLOT} however can't be done for quite -# some time. RDEPEND=" !${CATEGORY}/${PN}:5 !kde-plasma/khotkeys:5 @@ -69,7 +60,6 @@ RDEPEND=" >=kde-plasma/polkit-kde-agent-${PV}:* >=kde-plasma/powerdevil-${PV}:${SLOT} >=kde-plasma/qqc2-breeze-style-${PV}:${SLOT} - =kde-plasma/spectacle-6*:${SLOT} >=kde-plasma/systemsettings-${PV}:${SLOT} >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} sys-apps/dbus[elogind?,systemd?] @@ -137,6 +127,16 @@ RDEPEND=" webengine? ( kde-apps/khelpcenter:6 ) X? ( >=kde-plasma/kwin-x11-${PV}:${SLOT}[lock] ) " +# NOTE spectacle moved from KDE Gear (yy.mm) to KDE Plasma version scheme +case ${PV} in + *9999) RDEPEND+=" ~kde-plasma/spectacle-${PV}:${SLOT}" ;; + *) + RDEPEND+=" + >=kde-plasma/spectacle-$(ver_cut 1-3):${SLOT} + KDE Plasma, but KDE Gear's version scheme is higher than -# KDE Plasma's, so without such a pin, there's nothing that will cause -# the in-reality newer (but wrt PV, older) Spectacle to be pulled in for users. -# -# It can be changed to =kde-apps/spectacle-6* in due course once newer -# KDE Plasma and KDE Gear are stabled and old is cleaned up. Changing it -# to >=kde-plasma/spectacle-${PV}:${SLOT} however can't be done for quite -# some time. RDEPEND=" !${CATEGORY}/${PN}:5 !kde-plasma/khotkeys:5 @@ -69,7 +60,6 @@ RDEPEND=" >=kde-plasma/polkit-kde-agent-${PV}:* >=kde-plasma/powerdevil-${PV}:${SLOT} >=kde-plasma/qqc2-breeze-style-${PV}:${SLOT} - =kde-plasma/spectacle-6*:${SLOT} >=kde-plasma/systemsettings-${PV}:${SLOT} >=kde-plasma/xdg-desktop-portal-kde-${PV}:${SLOT} sys-apps/dbus[elogind?,systemd?] @@ -137,6 +127,17 @@ RDEPEND=" webengine? ( kde-apps/khelpcenter:6 ) X? ( >=kde-plasma/kwin-x11-${PV}:${SLOT}[lock] ) " +# NOTE spectacle moved from KDE Gear (yy.mm) to KDE Plasma version scheme +# TODO drop after 2027-04-26 +case ${PV} in + *9999) RDEPEND+=" ~kde-plasma/spectacle-${PV}:${SLOT}" ;; + *) + RDEPEND+=" + >=kde-plasma/spectacle-$(ver_cut 1-3):${SLOT} +