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 4BDC6158015 for ; Sat, 16 Dec 2023 13:32:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 706682BC018; Sat, 16 Dec 2023 13:32:23 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 549E02BC019 for ; Sat, 16 Dec 2023 13:32:23 +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 873F933BE12 for ; Sat, 16 Dec 2023 13:32:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E29BD1450 for ; Sat, 16 Dec 2023 13:32:20 +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: <1702733223.92b1152408d6d0b522b5bd52e66a2e6b9c17e433.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/gear.kde.org.eclass X-VCS-Directories: eclass/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 92b1152408d6d0b522b5bd52e66a2e6b9c17e433 X-VCS-Branch: master Date: Sat, 16 Dec 2023 13:32:20 +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: 8019885b-44c9-4413-a58a-57fbc8e2aed7 X-Archives-Hash: 928993a07d7c4747896b782ebfbfadeb commit: 92b1152408d6d0b522b5bd52e66a2e6b9c17e433 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 16 13:27:03 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 16 13:27:03 2023 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=92b11524 gear.kde.org.eclass: Replace ill-fated dynamic SLOT blocking w/ static We don't know a package's SLOT at this point in the eclass because it is set within Gear ebuilds. - Drop KDE_BLOCK_SLOT5 - Add static list of PN requiring blocking against ${CATEGORY}/${PN} Signed-off-by: Andreas Sturmlechner gentoo.org> eclass/gear.kde.org.eclass | 135 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 113 insertions(+), 22 deletions(-) diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass index 226db68a87..4d799ec672 100644 --- a/eclass/gear.kde.org.eclass +++ b/eclass/gear.kde.org.eclass @@ -25,18 +25,6 @@ esac if [[ -z ${_GEAR_KDE_ORG_ECLASS} ]]; then _GEAR_KDE_ORG_ECLASS=1 -# @ECLASS-VARIABLE: KDE_BLOCK_SLOT5 -# @PRE_INHERIT -# @DESCRIPTION: -# By default set to "true", which means for packages in SLOT 6, add RDEPEND -# block against ${CATEGORY}/${PN}:5. -# Set to "false" in order to enable side-by-side installability. -if [[ ${SLOT} == 6 ]]; then -: ${KDE_BLOCK_SLOT5:=true} -else -: ${KDE_BLOCK_SLOT5:=false} -fi - # @ECLASS_VARIABLE: KDE_PV_UNRELEASED # @INTERNAL # @DESCRIPTION: @@ -75,15 +63,118 @@ elif [[ -z ${KDE_ORG_COMMIT} ]]; then SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz" fi -case ${KDE_BLOCK_SLOT5} in - true) - RDEPEND+=" !${CATEGORY}/${PN}:5" - ;; - false) ;; - *) - eerror "Unknown value for \${KDE_BLOCK_SLOT5}" - die "Value ${KDE_BLOCK_SLOT5} is not supported" - ;; -esac +# list of applications ported to KF6 in SLOT=6 having to block SLOT=5 +if $(ver_test -gt 24.01.75); then + case ${PN} in + analitza | \ + ark | \ + baloo-widgets | \ + blinken | \ + bomber | \ + bovo | \ + dolphin | \ + dolphin-plugins-dropbox | \ + dolphin-plugins-git | \ + dolphin-plugins-mercurial | \ + dolphin-plugins-mountiso | \ + dolphin-plugins-subversion | \ + dragon | \ + elisa | \ + filelight | \ + granatier | \ + kajongg | \ + kalgebra | \ + kamera | \ + kapman | \ + kapptemplate | \ + kate | \ + kate-addons | \ + kate-lib | \ + katomic | \ + kbackup | \ + kblackbox | \ + kblocks | \ + kbounce | \ + kbreakout | \ + kbruch | \ + kcachegrind | \ + kcalc | \ + kcharselect | \ + kcolorchooser | \ + kcron | \ + kdebugsettings | \ + kdegraphics-mobipocket | \ + kdenetwork-filesharing | \ + kdevelop | \ + kdf | \ + kdialog | \ + kdiamond | \ + keditbookmarks | \ + kfind | \ + kfourinline | \ + kgeography | \ + kget | \ + kgoldrunner | \ + khelpcenter | \ + kigo | \ + killbots | \ + kio-extras | \ + kiriki | \ + kiten | \ + kjumpingcube | \ + klettres | \ + klickety | \ + klines | \ + kmag | \ + kmahjongg | \ + kmines | \ + kmousetool | \ + kmouth | \ + knavalbattle | \ + knetwalk | \ + knights | \ + kolf | \ + kollision | \ + konqueror | \ + konquest | \ + konsole | \ + kontrast | \ + kpat | \ + kpmcore | \ + kreversi | \ + kruler | \ + kshisen | \ + ksirk | \ + ksnakeduel | \ + kspaceduel | \ + ksquares | \ + ksudoku | \ + ksystemlog | \ + kteatime | \ + ktimer | \ + ktorrent | \ + ktuberling | \ + kturtle | \ + kubrick | \ + kwalletmanager | \ + kweather | \ + kwrite | \ + libkdegames | \ + libkmahjongg | \ + libktorrent | \ + lskat | \ + markdownpart | \ + palapeli | \ + partitionmanager | \ + picmi | \ + spectacle | \ + svgpart | \ + sweeper | \ + thumbnailers | \ + yakuake) + RDEPEND+=" !${CATEGORY}/${PN}:5" ;; + *) ;; + esac +fi fi