From d73c98ce773ef174a921aa749d6a0e0a30ee8a42 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 6 Dec 2024 23:28:58 +0100 Subject: [PATCH 1/5] frameworks.kde.org.eclass: Introduce KDE_CATV Holds main Frameworks release number (major.minor) for use on same-category dependencies. Signed-off-by: Andreas Sturmlechner --- eclass/frameworks.kde.org.eclass | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/eclass/frameworks.kde.org.eclass b/eclass/frameworks.kde.org.eclass index 395f6156198..9b778785bf9 100644 --- a/eclass/frameworks.kde.org.eclass +++ b/eclass/frameworks.kde.org.eclass @@ -25,6 +25,13 @@ esac if [[ -z ${_FRAMEWORKS_KDE_ORG_ECLASS} ]]; then _FRAMEWORKS_KDE_ORG_ECLASS=1 +# @ECLASS_VARIABLE: KDE_CATV +# @DESCRIPTION: +# Holds main Frameworks release number (major.minor) for use on same-category +# dependencies. +KDE_CATV=$(ver_cut 1-2) +readonly KDE_CATV + # @ECLASS_VARIABLE: KDE_PV_UNRELEASED # @INTERNAL # @DESCRIPTION: @@ -43,7 +50,7 @@ if [[ ${PN} == extra-cmake-modules ]]; then SLOT=0 else if [[ ${KDE_BUILD_TYPE} == release ]]; then - SLOT=${SLOT}/$(ver_cut 1-2) + SLOT=${SLOT}/${KDE_CATV} else SLOT=${SLOT}/9999 fi @@ -63,7 +70,7 @@ _KDE_SRC_URI="mirror://kde/" # TODO: Remove after last KF5 PortingAid treecleaned; bug 755956 if [[ ${KDE_BUILD_TYPE} != live && -z ${KDE_ORG_COMMIT} ]]; then - _KDE_SRC_URI+="stable/frameworks/$(ver_cut 1-2)/" + _KDE_SRC_URI+="stable/frameworks/${KDE_CATV}/" case ${KDE_ORG_NAME} in kdelibs4support | \ kdesignerplugin | \ From 42a0234582907c844098bc1da057c28e6a75189b Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 6 Dec 2024 23:34:26 +0100 Subject: [PATCH 2/5] kde-frameworks: Drop PVCUT and replace w/ eclass-provided KDE_CATV Signed-off-by: Andreas Sturmlechner --- kde-frameworks/baloo/baloo-6.9.0.ebuild | 19 ++++--- kde-frameworks/baloo/baloo-9999.ebuild | 19 ++++--- .../breeze-icons/breeze-icons-6.9.0.ebuild | 3 +- .../breeze-icons/breeze-icons-9999.ebuild | 3 +- .../frameworkintegration-6.9.0.ebuild | 17 +++---- .../frameworkintegration-9999.ebuild | 17 +++---- kde-frameworks/kauth/kauth-6.9.0.ebuild | 5 +- kde-frameworks/kauth/kauth-9999.ebuild | 5 +- .../kbookmarks/kbookmarks-6.9.0.ebuild | 9 ++-- .../kbookmarks/kbookmarks-9999.ebuild | 9 ++-- kde-frameworks/kcmutils/kcmutils-6.9.0.ebuild | 19 ++++--- kde-frameworks/kcmutils/kcmutils-9999.ebuild | 19 ++++--- .../kcolorscheme/kcolorscheme-6.9.0.ebuild | 7 ++- .../kcolorscheme/kcolorscheme-9999.ebuild | 7 ++- .../kcompletion/kcompletion-6.9.0.ebuild | 9 ++-- .../kcompletion/kcompletion-9999.ebuild | 9 ++-- .../kconfigwidgets-6.9.0.ebuild | 17 +++---- .../kconfigwidgets/kconfigwidgets-9999.ebuild | 17 +++---- .../kcontacts/kcontacts-6.9.0.ebuild | 9 ++-- .../kcontacts/kcontacts-9999.ebuild | 9 ++-- kde-frameworks/kcrash/kcrash-6.9.0.ebuild | 3 +- kde-frameworks/kcrash/kcrash-9999.ebuild | 3 +- kde-frameworks/kdav/kdav-6.9.0.ebuild | 7 ++- kde-frameworks/kdav/kdav-9999.ebuild | 7 ++- .../kdeclarative/kdeclarative-6.9.0.ebuild | 15 +++--- .../kdeclarative/kdeclarative-9999.ebuild | 15 +++--- kde-frameworks/kded/kded-6.9.0.ebuild | 13 +++-- kde-frameworks/kded/kded-9999.ebuild | 13 +++-- kde-frameworks/kdesu/kdesu-6.9.0.ebuild | 9 ++-- kde-frameworks/kdesu/kdesu-9999.ebuild | 9 ++-- .../kdoctools/kdoctools-6.9.0.ebuild | 5 +- .../kdoctools/kdoctools-9999.ebuild | 5 +- .../kfilemetadata/kfilemetadata-6.9.0.ebuild | 9 ++-- .../kfilemetadata/kfilemetadata-9999.ebuild | 9 ++-- .../kiconthemes/kiconthemes-6.9.0.ebuild | 13 +++-- .../kiconthemes/kiconthemes-9999.ebuild | 13 +++-- .../kimageformats/kimageformats-6.9.0.ebuild | 3 +- .../kimageformats/kimageformats-9999.ebuild | 3 +- kde-frameworks/kio/kio-6.9.0.ebuild | 51 +++++++++---------- kde-frameworks/kio/kio-9999.ebuild | 51 +++++++++---------- .../kjobwidgets/kjobwidgets-6.9.0.ebuild | 7 ++- .../kjobwidgets/kjobwidgets-9999.ebuild | 7 ++- .../knewstuff/knewstuff-6.9.0.ebuild | 21 ++++---- .../knewstuff/knewstuff-9999.ebuild | 21 ++++---- .../knotifications-6.9.0.ebuild | 3 +- .../knotifications/knotifications-9999.ebuild | 3 +- .../knotifyconfig/knotifyconfig-6.9.0.ebuild | 9 ++-- .../knotifyconfig/knotifyconfig-9999.ebuild | 9 ++-- kde-frameworks/kpackage/kpackage-6.9.0.ebuild | 9 ++-- kde-frameworks/kpackage/kpackage-9999.ebuild | 9 ++-- kde-frameworks/kparts/kparts-6.9.0.ebuild | 19 ++++--- kde-frameworks/kparts/kparts-9999.ebuild | 19 ++++--- kde-frameworks/kpeople/kpeople-6.9.0.ebuild | 13 +++-- kde-frameworks/kpeople/kpeople-9999.ebuild | 13 +++-- kde-frameworks/kpty/kpty-6.9.0.ebuild | 5 +- kde-frameworks/kpty/kpty-9999.ebuild | 5 +- .../kquickcharts/kquickcharts-6.9.0.ebuild | 5 +- .../kquickcharts/kquickcharts-9999.ebuild | 5 +- kde-frameworks/krunner/krunner-6.9.0.ebuild | 9 ++-- kde-frameworks/krunner/krunner-9999.ebuild | 9 ++-- kde-frameworks/kservice/kservice-6.9.0.ebuild | 11 ++-- kde-frameworks/kservice/kservice-9999.ebuild | 11 ++-- .../kstatusnotifieritem-6.9.0.ebuild | 3 +- .../kstatusnotifieritem-9999.ebuild | 3 +- kde-frameworks/ksvg/ksvg-6.9.0.ebuild | 13 +++-- kde-frameworks/ksvg/ksvg-9999.ebuild | 13 +++-- .../ktexteditor/ktexteditor-6.9.0.ebuild | 41 ++++++++------- .../ktexteditor/ktexteditor-9999.ebuild | 41 ++++++++------- .../ktexttemplate/ktexttemplate-6.9.0.ebuild | 1 - .../ktexttemplate/ktexttemplate-9999.ebuild | 1 - .../ktextwidgets/ktextwidgets-6.9.0.ebuild | 17 +++---- .../ktextwidgets/ktextwidgets-9999.ebuild | 17 +++---- .../kunitconversion-6.9.0.ebuild | 3 +- .../kunitconversion-9999.ebuild | 3 +- .../kuserfeedback/kuserfeedback-6.9.0.ebuild | 1 - .../kuserfeedback/kuserfeedback-9999.ebuild | 1 - kde-frameworks/kwallet/kwallet-6.9.0.ebuild | 23 ++++----- kde-frameworks/kwallet/kwallet-9999.ebuild | 23 ++++----- kde-frameworks/kxmlgui/kxmlgui-6.9.0.ebuild | 19 ++++--- kde-frameworks/kxmlgui/kxmlgui-9999.ebuild | 19 ++++--- .../modemmanager-qt-6.9.0.ebuild | 1 - .../modemmanager-qt-9999.ebuild | 1 - kde-frameworks/purpose/purpose-6.9.0.ebuild | 23 ++++----- kde-frameworks/purpose/purpose-9999.ebuild | 23 ++++----- .../qqc2-desktop-style-6.9.0.ebuild | 11 ++-- .../qqc2-desktop-style-9999.ebuild | 11 ++-- .../syndication/syndication-6.9.0.ebuild | 3 +- .../syndication/syndication-9999.ebuild | 3 +- 88 files changed, 468 insertions(+), 556 deletions(-) diff --git a/kde-frameworks/baloo/baloo-6.9.0.ebuild b/kde-frameworks/baloo/baloo-6.9.0.ebuild index 4d583610150..125ffefdb2a 100644 --- a/kde-frameworks/baloo/baloo-6.9.0.ebuild +++ b/kde-frameworks/baloo/baloo-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -20,15 +19,15 @@ DEPEND=" >=dev-db/lmdb-0.9.17 >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kcrash-${PVCUT}*:6 - =kde-frameworks/kdbusaddons-${PVCUT}*:6 - =kde-frameworks/kfilemetadata-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kidletime-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 - =kde-frameworks/solid-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kcrash-${KDE_CATV}*:6 + =kde-frameworks/kdbusaddons-${KDE_CATV}*:6 + =kde-frameworks/kfilemetadata-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kidletime-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 + =kde-frameworks/solid-${KDE_CATV}*:6 " RDEPEND="${DEPEND} !${CATEGORY}/${PN}:5[-kf6compat(-)] diff --git a/kde-frameworks/baloo/baloo-9999.ebuild b/kde-frameworks/baloo/baloo-9999.ebuild index 869004e0190..401da491e12 100644 --- a/kde-frameworks/baloo/baloo-9999.ebuild +++ b/kde-frameworks/baloo/baloo-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -20,15 +19,15 @@ DEPEND=" >=dev-db/lmdb-0.9.17 >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kcrash-${PVCUT}*:6 - =kde-frameworks/kdbusaddons-${PVCUT}*:6 - =kde-frameworks/kfilemetadata-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kidletime-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 - =kde-frameworks/solid-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kcrash-${KDE_CATV}*:6 + =kde-frameworks/kdbusaddons-${KDE_CATV}*:6 + =kde-frameworks/kfilemetadata-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kidletime-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 + =kde-frameworks/solid-${KDE_CATV}*:6 " RDEPEND="${DEPEND} !${CATEGORY}/${PN}:5[-kf6compat(-)] diff --git a/kde-frameworks/breeze-icons/breeze-icons-6.9.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-6.9.0.ebuild index 9c4e8773f0c..45f20fc5f0c 100644 --- a/kde-frameworks/breeze-icons/breeze-icons-6.9.0.ebuild +++ b/kde-frameworks/breeze-icons/breeze-icons-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) PYTHON_COMPAT=( python3_{10..13} ) inherit cmake frameworks.kde.org python-any-r1 xdg @@ -23,7 +22,7 @@ RDEPEND=" BDEPEND="${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') dev-qt/qtbase:6[gui] - >=kde-frameworks/extra-cmake-modules-${PVCUT}:* + >=kde-frameworks/extra-cmake-modules-${KDE_CATV}:* test? ( app-misc/fdupes ) " diff --git a/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild b/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild index 596563b4b4b..de309645983 100644 --- a/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild +++ b/kde-frameworks/breeze-icons/breeze-icons-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) PYTHON_COMPAT=( python3_{10..13} ) inherit cmake frameworks.kde.org python-any-r1 xdg @@ -23,7 +22,7 @@ RDEPEND=" BDEPEND="${PYTHON_DEPS} $(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]') dev-qt/qtbase:6[gui] - >=kde-frameworks/extra-cmake-modules-${PVCUT}:* + >=kde-frameworks/extra-cmake-modules-${KDE_CATV}:* test? ( app-misc/fdupes ) " diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-6.9.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-6.9.0.ebuild index 2972df88a25..709638c52ba 100644 --- a/kde-frameworks/frameworkintegration/frameworkintegration-6.9.0.ebuild +++ b/kde-frameworks/frameworkintegration/frameworkintegration-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -19,16 +18,16 @@ RESTRICT="test" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/knewstuff-${PVCUT}*:6 - =kde-frameworks/knotifications-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/knewstuff-${KDE_CATV}*:6 + =kde-frameworks/knotifications-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " DEPEND="${RDEPEND} - =kde-frameworks/kpackage-${PVCUT}*:6 + =kde-frameworks/kpackage-${KDE_CATV}*:6 " src_configure() { diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild index 31549b88f96..17c517a64e1 100644 --- a/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild +++ b/kde-frameworks/frameworkintegration/frameworkintegration-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -19,16 +18,16 @@ RESTRICT="test" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/knewstuff-${PVCUT}*:6 - =kde-frameworks/knotifications-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/knewstuff-${KDE_CATV}*:6 + =kde-frameworks/knotifications-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " DEPEND="${RDEPEND} - =kde-frameworks/kpackage-${PVCUT}*:6 + =kde-frameworks/kpackage-${KDE_CATV}*:6 " src_configure() { diff --git a/kde-frameworks/kauth/kauth-6.9.0.ebuild b/kde-frameworks/kauth/kauth-6.9.0.ebuild index 97c69b19cca..91c106b66be 100644 --- a/kde-frameworks/kauth/kauth-6.9.0.ebuild +++ b/kde-frameworks/kauth/kauth-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -15,10 +14,10 @@ IUSE="+policykit" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] - =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 policykit? ( >=dev-qt/qtbase-${QTMIN}:6[dbus] - =kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland] + =kde-frameworks/kwindowsystem-${KDE_CATV}*:6[wayland] >=sys-auth/polkit-qt-0.175.0[qt6(+)] ) " diff --git a/kde-frameworks/kauth/kauth-9999.ebuild b/kde-frameworks/kauth/kauth-9999.ebuild index 60e1fd29b7d..bf827210a2b 100644 --- a/kde-frameworks/kauth/kauth-9999.ebuild +++ b/kde-frameworks/kauth/kauth-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -15,10 +14,10 @@ IUSE="+policykit" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] - =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 policykit? ( >=dev-qt/qtbase-${QTMIN}:6[dbus] - =kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland] + =kde-frameworks/kwindowsystem-${KDE_CATV}*:6[wayland] >=sys-auth/polkit-qt-0.175.0[qt6(+)] ) " diff --git a/kde-frameworks/kbookmarks/kbookmarks-6.9.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-6.9.0.ebuild index d466dc6e539..3cecb9f9bd9 100644 --- a/kde-frameworks/kbookmarks/kbookmarks-6.9.0.ebuild +++ b/kde-frameworks/kbookmarks/kbookmarks-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -15,10 +14,10 @@ IUSE="" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " DEPEND="${RDEPEND}" BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild b/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild index 8e4b204965d..9d326e6df15 100644 --- a/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild +++ b/kde-frameworks/kbookmarks/kbookmarks-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -15,10 +14,10 @@ IUSE="" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " DEPEND="${RDEPEND}" BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/kcmutils/kcmutils-6.9.0.ebuild b/kde-frameworks/kcmutils/kcmutils-6.9.0.ebuild index 9e0d2ef92a0..302f96ab376 100644 --- a/kde-frameworks/kcmutils/kcmutils-6.9.0.ebuild +++ b/kde-frameworks/kcmutils/kcmutils-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,14 +16,14 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kconfigwidgets-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 - =kde-frameworks/kitemviews-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/kxmlgui-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kconfigwidgets-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 + =kde-frameworks/kitemviews-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/kxmlgui-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kcmutils/kcmutils-9999.ebuild b/kde-frameworks/kcmutils/kcmutils-9999.ebuild index ae5b0d6e34f..53d136aea0c 100644 --- a/kde-frameworks/kcmutils/kcmutils-9999.ebuild +++ b/kde-frameworks/kcmutils/kcmutils-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,14 +16,14 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kconfigwidgets-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 - =kde-frameworks/kitemviews-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/kxmlgui-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kconfigwidgets-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 + =kde-frameworks/kitemviews-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/kxmlgui-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kcolorscheme/kcolorscheme-6.9.0.ebuild b/kde-frameworks/kcolorscheme/kcolorscheme-6.9.0.ebuild index d69ad46ac78..b94ca355454 100644 --- a/kde-frameworks/kcolorscheme/kcolorscheme-6.9.0.ebuild +++ b/kde-frameworks/kcolorscheme/kcolorscheme-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,8 +16,8 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kcolorscheme/kcolorscheme-9999.ebuild b/kde-frameworks/kcolorscheme/kcolorscheme-9999.ebuild index 9b0e29e64c2..f5d569e7748 100644 --- a/kde-frameworks/kcolorscheme/kcolorscheme-9999.ebuild +++ b/kde-frameworks/kcolorscheme/kcolorscheme-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,8 +16,8 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kcompletion/kcompletion-6.9.0.ebuild b/kde-frameworks/kcompletion/kcompletion-6.9.0.ebuild index a805ed235dd..89ce6124405 100644 --- a/kde-frameworks/kcompletion/kcompletion-6.9.0.ebuild +++ b/kde-frameworks/kcompletion/kcompletion-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,10 +15,10 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/kcompletion/kcompletion-9999.ebuild b/kde-frameworks/kcompletion/kcompletion-9999.ebuild index 66bc3c8131c..510f3f9d012 100644 --- a/kde-frameworks/kcompletion/kcompletion-9999.ebuild +++ b/kde-frameworks/kcompletion/kcompletion-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,10 +15,10 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-6.9.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.9.0.ebuild index ce4929ebda8..9ccb14cb17a 100644 --- a/kde-frameworks/kconfigwidgets/kconfigwidgets-6.9.0.ebuild +++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -23,14 +22,14 @@ CMAKE_SKIP_TESTS=( RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " DEPEND="${RDEPEND} - test? ( =kde-frameworks/kconfig-${PVCUT}*:6[dbus] ) + test? ( =kde-frameworks/kconfig-${KDE_CATV}*:6[dbus] ) " diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild index 788fd4dd745..7ccb14542a3 100644 --- a/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild +++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -23,14 +22,14 @@ CMAKE_SKIP_TESTS=( RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " DEPEND="${RDEPEND} - test? ( =kde-frameworks/kconfig-${PVCUT}*:6[dbus] ) + test? ( =kde-frameworks/kconfig-${KDE_CATV}*:6[dbus] ) " diff --git a/kde-frameworks/kcontacts/kcontacts-6.9.0.ebuild b/kde-frameworks/kcontacts/kcontacts-6.9.0.ebuild index 1ea6fbb9ad6..1580b172098 100644 --- a/kde-frameworks/kcontacts/kcontacts-6.9.0.ebuild +++ b/kde-frameworks/kcontacts/kcontacts-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,10 +16,10 @@ IUSE="" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kcontacts/kcontacts-9999.ebuild b/kde-frameworks/kcontacts/kcontacts-9999.ebuild index 0c6a3d8150c..42fffc3e87e 100644 --- a/kde-frameworks/kcontacts/kcontacts-9999.ebuild +++ b/kde-frameworks/kcontacts/kcontacts-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,10 +16,10 @@ IUSE="" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kcrash/kcrash-6.9.0.ebuild b/kde-frameworks/kcrash/kcrash-6.9.0.ebuild index 7b1c11008db..2fc170033b1 100644 --- a/kde-frameworks/kcrash/kcrash-6.9.0.ebuild +++ b/kde-frameworks/kcrash/kcrash-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -19,7 +18,7 @@ RESTRICT="test" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,opengl] - =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 X? ( x11-libs/libX11 ) " DEPEND="${RDEPEND} diff --git a/kde-frameworks/kcrash/kcrash-9999.ebuild b/kde-frameworks/kcrash/kcrash-9999.ebuild index b744b7e874f..e03ce050a0f 100644 --- a/kde-frameworks/kcrash/kcrash-9999.ebuild +++ b/kde-frameworks/kcrash/kcrash-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -19,7 +18,7 @@ RESTRICT="test" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,opengl] - =kde-frameworks/kcoreaddons-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 X? ( x11-libs/libX11 ) " DEPEND="${RDEPEND} diff --git a/kde-frameworks/kdav/kdav-6.9.0.ebuild b/kde-frameworks/kdav/kdav-6.9.0.ebuild index 37f4a571720..92f56228f6c 100644 --- a/kde-frameworks/kdav/kdav-6.9.0.ebuild +++ b/kde-frameworks/kdav/kdav-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,9 +15,9 @@ IUSE="" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,xml] - >=kde-frameworks/kcoreaddons-${PVCUT}:6 - >=kde-frameworks/ki18n-${PVCUT}:6 - >=kde-frameworks/kio-${PVCUT}:6 + >=kde-frameworks/kcoreaddons-${KDE_CATV}:6 + >=kde-frameworks/ki18n-${KDE_CATV}:6 + >=kde-frameworks/kio-${KDE_CATV}:6 " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kdav/kdav-9999.ebuild b/kde-frameworks/kdav/kdav-9999.ebuild index 4ec7a7cd726..20ccdc9f0fe 100644 --- a/kde-frameworks/kdav/kdav-9999.ebuild +++ b/kde-frameworks/kdav/kdav-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,9 +15,9 @@ IUSE="" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,xml] - >=kde-frameworks/kcoreaddons-${PVCUT}:6 - >=kde-frameworks/ki18n-${PVCUT}:6 - >=kde-frameworks/kio-${PVCUT}:6 + >=kde-frameworks/kcoreaddons-${KDE_CATV}:6 + >=kde-frameworks/ki18n-${KDE_CATV}:6 + >=kde-frameworks/kio-${KDE_CATV}:6 " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kdeclarative/kdeclarative-6.9.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-6.9.0.ebuild index b0d5fc2990a..75ee3ba59e3 100644 --- a/kde-frameworks/kdeclarative/kdeclarative-6.9.0.ebuild +++ b/kde-frameworks/kdeclarative/kdeclarative-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,12 +16,12 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kglobalaccel-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kglobalaccel-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild index c9b260be335..b604ef3aed0 100644 --- a/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild +++ b/kde-frameworks/kdeclarative/kdeclarative-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,12 +16,12 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kglobalaccel-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kglobalaccel-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kded/kded-6.9.0.ebuild b/kde-frameworks/kded/kded-6.9.0.ebuild index 986961be156..62cbba2c266 100644 --- a/kde-frameworks/kded/kded-6.9.0.ebuild +++ b/kde-frameworks/kded/kded-6.9.0.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_QTHELP="false" ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,14 +16,14 @@ IUSE="+man" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - =kde-frameworks/kconfig-${PVCUT}*:6[dbus] - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kcrash-${PVCUT}*:6 - =kde-frameworks/kdbusaddons-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6[dbus] + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kcrash-${KDE_CATV}*:6 + =kde-frameworks/kdbusaddons-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kded/kded-9999.ebuild b/kde-frameworks/kded/kded-9999.ebuild index 50c8b09fabe..d43197b3c88 100644 --- a/kde-frameworks/kded/kded-9999.ebuild +++ b/kde-frameworks/kded/kded-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_QTHELP="false" ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,14 +16,14 @@ IUSE="+man" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - =kde-frameworks/kconfig-${PVCUT}*:6[dbus] - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kcrash-${PVCUT}*:6 - =kde-frameworks/kdbusaddons-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6[dbus] + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kcrash-${KDE_CATV}*:6 + =kde-frameworks/kdbusaddons-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kdesu/kdesu-6.9.0.ebuild b/kde-frameworks/kdesu/kdesu-6.9.0.ebuild index 69b3aef23ba..c0f0d49b8d5 100644 --- a/kde-frameworks/kdesu/kdesu-6.9.0.ebuild +++ b/kde-frameworks/kdesu/kdesu-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="true" -PVCUT=$(ver_cut 1-2) inherit ecm frameworks.kde.org DESCRIPTION="Framework to handle super user actions" @@ -14,10 +13,10 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="X" RDEPEND=" - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kpty-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kpty-${KDE_CATV}*:6 X? ( x11-libs/libX11 ) " DEPEND="${RDEPEND} diff --git a/kde-frameworks/kdesu/kdesu-9999.ebuild b/kde-frameworks/kdesu/kdesu-9999.ebuild index 0d87b2fb2e2..ea197880dcd 100644 --- a/kde-frameworks/kdesu/kdesu-9999.ebuild +++ b/kde-frameworks/kdesu/kdesu-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="true" -PVCUT=$(ver_cut 1-2) inherit ecm frameworks.kde.org DESCRIPTION="Framework to handle super user actions" @@ -14,10 +13,10 @@ KEYWORDS="" IUSE="X" RDEPEND=" - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kpty-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kpty-${KDE_CATV}*:6 X? ( x11-libs/libX11 ) " DEPEND="${RDEPEND} diff --git a/kde-frameworks/kdoctools/kdoctools-6.9.0.ebuild b/kde-frameworks/kdoctools/kdoctools-6.9.0.ebuild index 4b24d23198c..e0ea9f4b432 100644 --- a/kde-frameworks/kdoctools/kdoctools-6.9.0.ebuild +++ b/kde-frameworks/kdoctools/kdoctools-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) inherit ecm frameworks.kde.org DESCRIPTION="Tools to generate documentation in various formats from DocBook files" @@ -19,13 +18,13 @@ DEPEND=" app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt - =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" BDEPEND=" dev-lang/perl dev-perl/URI - nls? ( >=kde-frameworks/ki18n-${PVCUT}:6 ) + nls? ( >=kde-frameworks/ki18n-${KDE_CATV}:6 ) " CMAKE_SKIP_TESTS=( diff --git a/kde-frameworks/kdoctools/kdoctools-9999.ebuild b/kde-frameworks/kdoctools/kdoctools-9999.ebuild index 450c341ea6f..3b8e3e37bbe 100644 --- a/kde-frameworks/kdoctools/kdoctools-9999.ebuild +++ b/kde-frameworks/kdoctools/kdoctools-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) inherit ecm frameworks.kde.org DESCRIPTION="Tools to generate documentation in various formats from DocBook files" @@ -19,13 +18,13 @@ DEPEND=" app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt - =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" BDEPEND=" dev-lang/perl dev-perl/URI - nls? ( >=kde-frameworks/ki18n-${PVCUT}:6 ) + nls? ( >=kde-frameworks/ki18n-${KDE_CATV}:6 ) " CMAKE_SKIP_TESTS=( diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-6.9.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-6.9.0.ebuild index 002829c1e62..f6dfdb51daf 100644 --- a/kde-frameworks/kfilemetadata/kfilemetadata-6.9.0.ebuild +++ b/kde-frameworks/kfilemetadata/kfilemetadata-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org optfeature python-any-r1 @@ -18,10 +17,10 @@ RESTRICT="test" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,xml] - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild index 4ab55bd1e9f..149e4ffd812 100644 --- a/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild +++ b/kde-frameworks/kfilemetadata/kfilemetadata-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org optfeature python-any-r1 @@ -18,10 +17,10 @@ RESTRICT="test" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,xml] - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( media-video/ffmpeg:0= ) diff --git a/kde-frameworks/kiconthemes/kiconthemes-6.9.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-6.9.0.ebuild index 735ececcbc5..b0b1d1079eb 100644 --- a/kde-frameworks/kiconthemes/kiconthemes-6.9.0.ebuild +++ b/kde-frameworks/kiconthemes/kiconthemes-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -21,11 +20,11 @@ RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtsvg-${QTMIN}:6 - =kde-frameworks/breeze-icons-${PVCUT}*:6 - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/breeze-icons-${KDE_CATV}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild index a6778da7415..f37ce87d278 100644 --- a/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild +++ b/kde-frameworks/kiconthemes/kiconthemes-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -21,11 +20,11 @@ RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtsvg-${QTMIN}:6 - =kde-frameworks/breeze-icons-${PVCUT}*:6 - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/breeze-icons-${KDE_CATV}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kimageformats/kimageformats-6.9.0.ebuild b/kde-frameworks/kimageformats/kimageformats-6.9.0.ebuild index 253df12d5b7..03684028cf8 100644 --- a/kde-frameworks/kimageformats/kimageformats-6.9.0.ebuild +++ b/kde-frameworks/kimageformats/kimageformats-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,7 +15,7 @@ IUSE="avif eps heif jpegxl openexr raw" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] - =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 avif? ( >=media-libs/libavif-0.8.2:= ) eps? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) heif? ( >=media-libs/libheif-1.10.0:= ) diff --git a/kde-frameworks/kimageformats/kimageformats-9999.ebuild b/kde-frameworks/kimageformats/kimageformats-9999.ebuild index 3128807ea10..081758d18cb 100644 --- a/kde-frameworks/kimageformats/kimageformats-9999.ebuild +++ b/kde-frameworks/kimageformats/kimageformats-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,7 +15,7 @@ IUSE="avif eps heif jpegxl openexr raw" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] - =kde-frameworks/karchive-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 avif? ( >=media-libs/libavif-0.8.2:= ) eps? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] ) heif? ( >=media-libs/libheif-1.10.0:= ) diff --git a/kde-frameworks/kio/kio-6.9.0.ebuild b/kde-frameworks/kio/kio-6.9.0.ebuild index 9d429efc766..121545bac9e 100644 --- a/kde-frameworks/kio/kio-6.9.0.ebuild +++ b/kde-frameworks/kio/kio-6.9.0.ebuild @@ -7,7 +7,6 @@ ECM_DESIGNERPLUGIN="true" ECM_HANDBOOK="optional" ECM_HANDBOOK_DIR="docs" ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org xdg-utils @@ -24,27 +23,27 @@ RESTRICT="test" COMMON_DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets,X?] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kauth-${PVCUT}*:6 - =kde-frameworks/kbookmarks-${PVCUT}*:6 - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kcompletion-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kcrash-${PVCUT}*:6 - =kde-frameworks/kdbusaddons-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kitemviews-${PVCUT}*:6 - =kde-frameworks/kjobwidgets-${PVCUT}*:6 - =kde-frameworks/knotifications-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/ktextwidgets-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland?,X?] - =kde-frameworks/kxmlgui-${PVCUT}*:6 - =kde-frameworks/solid-${PVCUT}*:6 + =kde-frameworks/kauth-${KDE_CATV}*:6 + =kde-frameworks/kbookmarks-${KDE_CATV}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kcompletion-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kcrash-${KDE_CATV}*:6 + =kde-frameworks/kdbusaddons-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kitemviews-${KDE_CATV}*:6 + =kde-frameworks/kjobwidgets-${KDE_CATV}*:6 + =kde-frameworks/knotifications-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/ktextwidgets-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/kwindowsystem-${KDE_CATV}*:6[wayland?,X?] + =kde-frameworks/kxmlgui-${KDE_CATV}*:6 + =kde-frameworks/solid-${KDE_CATV}*:6 sys-power/switcheroo-control acl? ( sys-apps/attr @@ -53,10 +52,10 @@ COMMON_DEPEND=" handbook? ( dev-libs/libxml2 dev-libs/libxslt - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kdoctools-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kdoctools-${KDE_CATV}*:6 ) - kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:6 ) + kwallet? ( =kde-frameworks/kwallet-${KDE_CATV}*:6 ) X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] ) " DEPEND="${COMMON_DEPEND} @@ -70,7 +69,7 @@ RDEPEND="${COMMON_DEPEND} # provides access to keditfiletype binary via KWidgetsAddons (Tier1) # Typical KIO revdeps (dolphin, krusader et al.) can rely on this dep PDEPEND=" - >=kde-frameworks/kded-${PVCUT}:6 + >=kde-frameworks/kded-${KDE_CATV}:6 kde-plasma/keditfiletype " diff --git a/kde-frameworks/kio/kio-9999.ebuild b/kde-frameworks/kio/kio-9999.ebuild index 6bc28d99f0e..129ca7ea728 100644 --- a/kde-frameworks/kio/kio-9999.ebuild +++ b/kde-frameworks/kio/kio-9999.ebuild @@ -7,7 +7,6 @@ ECM_DESIGNERPLUGIN="true" ECM_HANDBOOK="optional" ECM_HANDBOOK_DIR="docs" ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org xdg-utils @@ -24,27 +23,27 @@ RESTRICT="test" COMMON_DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,ssl,widgets,X?] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kauth-${PVCUT}*:6 - =kde-frameworks/kbookmarks-${PVCUT}*:6 - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kcompletion-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kcrash-${PVCUT}*:6 - =kde-frameworks/kdbusaddons-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kitemviews-${PVCUT}*:6 - =kde-frameworks/kjobwidgets-${PVCUT}*:6 - =kde-frameworks/knotifications-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/ktextwidgets-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/kwindowsystem-${PVCUT}*:6[wayland?,X?] - =kde-frameworks/kxmlgui-${PVCUT}*:6 - =kde-frameworks/solid-${PVCUT}*:6 + =kde-frameworks/kauth-${KDE_CATV}*:6 + =kde-frameworks/kbookmarks-${KDE_CATV}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kcompletion-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kcrash-${KDE_CATV}*:6 + =kde-frameworks/kdbusaddons-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kitemviews-${KDE_CATV}*:6 + =kde-frameworks/kjobwidgets-${KDE_CATV}*:6 + =kde-frameworks/knotifications-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/ktextwidgets-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/kwindowsystem-${KDE_CATV}*:6[wayland?,X?] + =kde-frameworks/kxmlgui-${KDE_CATV}*:6 + =kde-frameworks/solid-${KDE_CATV}*:6 sys-power/switcheroo-control acl? ( sys-apps/attr @@ -53,10 +52,10 @@ COMMON_DEPEND=" handbook? ( dev-libs/libxml2 dev-libs/libxslt - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kdoctools-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kdoctools-${KDE_CATV}*:6 ) - kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:6 ) + kwallet? ( =kde-frameworks/kwallet-${KDE_CATV}*:6 ) X? ( >=dev-qt/qtbase-${QTMIN}:6=[gui] ) " DEPEND="${COMMON_DEPEND} @@ -70,7 +69,7 @@ RDEPEND="${COMMON_DEPEND} # provides access to keditfiletype binary via KWidgetsAddons (Tier1) # Typical KIO revdeps (dolphin, krusader et al.) can rely on this dep PDEPEND=" - >=kde-frameworks/kded-${PVCUT}:6 + >=kde-frameworks/kded-${KDE_CATV}:6 kde-plasma/keditfiletype " diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-6.9.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-6.9.0.ebuild index 757ab709b43..d1dec69e8bb 100644 --- a/kde-frameworks/kjobwidgets/kjobwidgets-6.9.0.ebuild +++ b/kde-frameworks/kjobwidgets/kjobwidgets-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,9 +15,9 @@ IUSE="X" # slot op: WITH_X11 uses Qt6::GuiPrivate for qtx11extras_p.h RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/knotifications-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/knotifications-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 X? ( >=dev-qt/qtbase-${QTMIN}:6=[X] ) " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild index 5dc1a664174..e4a8b2347fb 100644 --- a/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild +++ b/kde-frameworks/kjobwidgets/kjobwidgets-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,9 +15,9 @@ IUSE="X" # slot op: WITH_X11 uses Qt6::GuiPrivate for qtx11extras_p.h RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/knotifications-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/knotifications-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 X? ( >=dev-qt/qtbase-${QTMIN}:6=[X] ) " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/knewstuff/knewstuff-6.9.0.ebuild b/kde-frameworks/knewstuff/knewstuff-6.9.0.ebuild index c7c958fb66d..b81fc8626ec 100644 --- a/kde-frameworks/knewstuff/knewstuff-6.9.0.ebuild +++ b/kde-frameworks/knewstuff/knewstuff-6.9.0.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -18,18 +17,18 @@ IUSE="opds" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml] >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] - =kde-frameworks/attica-${PVCUT}*:6 - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kpackage-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - opds? ( =kde-frameworks/syndication-${PVCUT}*:6 ) + =kde-frameworks/attica-${KDE_CATV}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kpackage-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + opds? ( =kde-frameworks/syndication-${KDE_CATV}*:6 ) " RDEPEND="${DEPEND} - >=kde-frameworks/kcmutils-${PVCUT}:6 - >=kde-frameworks/kirigami-${PVCUT}:6 + >=kde-frameworks/kcmutils-${KDE_CATV}:6 + >=kde-frameworks/kirigami-${KDE_CATV}:6 " src_configure() { diff --git a/kde-frameworks/knewstuff/knewstuff-9999.ebuild b/kde-frameworks/knewstuff/knewstuff-9999.ebuild index 35affaedd69..79793523c81 100644 --- a/kde-frameworks/knewstuff/knewstuff-9999.ebuild +++ b/kde-frameworks/knewstuff/knewstuff-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -18,18 +17,18 @@ IUSE="opds" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,network,widgets,xml] >=dev-qt/qtdeclarative-${QTMIN}:6[widgets] - =kde-frameworks/attica-${PVCUT}*:6 - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kpackage-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - opds? ( =kde-frameworks/syndication-${PVCUT}*:6 ) + =kde-frameworks/attica-${KDE_CATV}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kpackage-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + opds? ( =kde-frameworks/syndication-${KDE_CATV}*:6 ) " RDEPEND="${DEPEND} - >=kde-frameworks/kcmutils-${PVCUT}:6 - >=kde-frameworks/kirigami-${PVCUT}:6 + >=kde-frameworks/kcmutils-${KDE_CATV}:6 + >=kde-frameworks/kirigami-${KDE_CATV}:6 " src_configure() { diff --git a/kde-frameworks/knotifications/knotifications-6.9.0.ebuild b/kde-frameworks/knotifications/knotifications-6.9.0.ebuild index 8d9c3ca7db8..43485bbbd64 100644 --- a/kde-frameworks/knotifications/knotifications-6.9.0.ebuild +++ b/kde-frameworks/knotifications/knotifications-6.9.0.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_PYTHON_BINDINGS="off" ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,7 +16,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 media-libs/libcanberra " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/knotifications/knotifications-9999.ebuild b/kde-frameworks/knotifications/knotifications-9999.ebuild index 371ecc333a9..ad35004b7bf 100644 --- a/kde-frameworks/knotifications/knotifications-9999.ebuild +++ b/kde-frameworks/knotifications/knotifications-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_PYTHON_BINDINGS="off" ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,7 +16,7 @@ KEYWORDS="" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 media-libs/libcanberra " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-6.9.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-6.9.0.ebuild index f0083b54a9e..4ed1f53261d 100644 --- a/kde-frameworks/knotifyconfig/knotifyconfig-6.9.0.ebuild +++ b/kde-frameworks/knotifyconfig/knotifyconfig-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,10 +16,10 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] >=dev-qt/qtmultimedia-${QTMIN}:6 - =kde-frameworks/kcompletion-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 + =kde-frameworks/kcompletion-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild index 169a8e715f1..169d21d8277 100644 --- a/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild +++ b/kde-frameworks/knotifyconfig/knotifyconfig-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,10 +16,10 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] >=dev-qt/qtmultimedia-${QTMIN}:6 - =kde-frameworks/kcompletion-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 + =kde-frameworks/kcompletion-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kpackage/kpackage-6.9.0.ebuild b/kde-frameworks/kpackage/kpackage-6.9.0.ebuild index 9fc27e4f123..f1f6d391713 100644 --- a/kde-frameworks/kpackage/kpackage-6.9.0.ebuild +++ b/kde-frameworks/kpackage/kpackage-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -15,12 +14,12 @@ IUSE="man" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus] - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )" CMAKE_SKIP_TESTS=( # bugs 650214, 939041 diff --git a/kde-frameworks/kpackage/kpackage-9999.ebuild b/kde-frameworks/kpackage/kpackage-9999.ebuild index 54985eee166..4e76337ed4c 100644 --- a/kde-frameworks/kpackage/kpackage-9999.ebuild +++ b/kde-frameworks/kpackage/kpackage-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -15,12 +14,12 @@ IUSE="man" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus] - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )" CMAKE_SKIP_TESTS=( # bugs 650214, 939041 diff --git a/kde-frameworks/kparts/kparts-6.9.0.ebuild b/kde-frameworks/kparts/kparts-6.9.0.ebuild index 461056af25a..cc8a3ff2106 100644 --- a/kde-frameworks/kparts/kparts-6.9.0.ebuild +++ b/kde-frameworks/kparts/kparts-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -15,14 +14,14 @@ IUSE="" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 - =kde-frameworks/kjobwidgets-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/kxmlgui-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 + =kde-frameworks/kjobwidgets-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/kxmlgui-${KDE_CATV}*:6 " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kparts/kparts-9999.ebuild b/kde-frameworks/kparts/kparts-9999.ebuild index eb5a95b6973..886b7bcc6bc 100644 --- a/kde-frameworks/kparts/kparts-9999.ebuild +++ b/kde-frameworks/kparts/kparts-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -15,14 +14,14 @@ IUSE="" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,widgets,xml] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 - =kde-frameworks/kjobwidgets-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/kxmlgui-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 + =kde-frameworks/kjobwidgets-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/kxmlgui-${KDE_CATV}*:6 " DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kpeople/kpeople-6.9.0.ebuild b/kde-frameworks/kpeople/kpeople-6.9.0.ebuild index a749077b314..c58ba5ded36 100644 --- a/kde-frameworks/kpeople/kpeople-6.9.0.ebuild +++ b/kde-frameworks/kpeople/kpeople-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 VIRTUALX_REQUIRED="test" # bug 816588 (test fails) inherit ecm frameworks.kde.org @@ -18,12 +17,12 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcontacts-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kitemviews-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcontacts-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kitemviews-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kpeople/kpeople-9999.ebuild b/kde-frameworks/kpeople/kpeople-9999.ebuild index 32ee7cdf10d..8986d592dc6 100644 --- a/kde-frameworks/kpeople/kpeople-9999.ebuild +++ b/kde-frameworks/kpeople/kpeople-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 VIRTUALX_REQUIRED="test" # bug 816588 (test fails) inherit ecm frameworks.kde.org @@ -18,12 +17,12 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,sql,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcontacts-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kitemviews-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcontacts-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kitemviews-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kpty/kpty-6.9.0.ebuild b/kde-frameworks/kpty/kpty-6.9.0.ebuild index 8d3ce0c0e68..e15cc70ae47 100644 --- a/kde-frameworks/kpty/kpty-6.9.0.ebuild +++ b/kde-frameworks/kpty/kpty-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) inherit ecm frameworks.kde.org DESCRIPTION="Framework for pseudo terminal devices and running child processes" @@ -13,8 +12,8 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="" DEPEND=" - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 sys-libs/libutempter " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kpty/kpty-9999.ebuild b/kde-frameworks/kpty/kpty-9999.ebuild index bc234085184..6914068d065 100644 --- a/kde-frameworks/kpty/kpty-9999.ebuild +++ b/kde-frameworks/kpty/kpty-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) inherit ecm frameworks.kde.org DESCRIPTION="Framework for pseudo terminal devices and running child processes" @@ -13,8 +12,8 @@ KEYWORDS="" IUSE="" DEPEND=" - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 sys-libs/libutempter " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kquickcharts/kquickcharts-6.9.0.ebuild b/kde-frameworks/kquickcharts/kquickcharts-6.9.0.ebuild index 6189c92822d..5c94df91884 100644 --- a/kde-frameworks/kquickcharts/kquickcharts-6.9.0.ebuild +++ b/kde-frameworks/kquickcharts/kquickcharts-6.9.0.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_EXAMPLES="true" ECM_QTHELP="false" ECM_TEST="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -23,8 +22,8 @@ DEPEND=" >=dev-qt/qtshadertools-${QTMIN}:6 examples? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] - =kde-frameworks/kdeclarative-${PVCUT}*:6 - =kde-frameworks/kirigami-${PVCUT}*:6 + =kde-frameworks/kdeclarative-${KDE_CATV}*:6 + =kde-frameworks/kirigami-${KDE_CATV}*:6 ) " RDEPEND="${DEPEND} diff --git a/kde-frameworks/kquickcharts/kquickcharts-9999.ebuild b/kde-frameworks/kquickcharts/kquickcharts-9999.ebuild index 4e64ea80006..c16d5e661cb 100644 --- a/kde-frameworks/kquickcharts/kquickcharts-9999.ebuild +++ b/kde-frameworks/kquickcharts/kquickcharts-9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_EXAMPLES="true" ECM_QTHELP="false" ECM_TEST="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -23,8 +22,8 @@ DEPEND=" >=dev-qt/qtshadertools-${QTMIN}:6 examples? ( >=dev-qt/qtbase-${QTMIN}:6[widgets] - =kde-frameworks/kdeclarative-${PVCUT}*:6 - =kde-frameworks/kirigami-${PVCUT}*:6 + =kde-frameworks/kdeclarative-${KDE_CATV}*:6 + =kde-frameworks/kirigami-${KDE_CATV}*:6 ) " RDEPEND="${DEPEND} diff --git a/kde-frameworks/krunner/krunner-6.9.0.ebuild b/kde-frameworks/krunner/krunner-6.9.0.ebuild index 80f8f35805a..afb36133550 100644 --- a/kde-frameworks/krunner/krunner-6.9.0.ebuild +++ b/kde-frameworks/krunner/krunner-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -15,10 +14,10 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kitemmodels-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kitemmodels-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/krunner/krunner-9999.ebuild b/kde-frameworks/krunner/krunner-9999.ebuild index e9f8ad68dea..fac491f83ed 100644 --- a/kde-frameworks/krunner/krunner-9999.ebuild +++ b/kde-frameworks/krunner/krunner-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -15,10 +14,10 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kitemmodels-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kitemmodels-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kservice/kservice-6.9.0.ebuild b/kde-frameworks/kservice/kservice-6.9.0.ebuild index 03b53b7861f..8850654ea70 100644 --- a/kde-frameworks/kservice/kservice-6.9.0.ebuild +++ b/kde-frameworks/kservice/kservice-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -18,15 +17,15 @@ RESTRICT="test" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,xml] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kdbusaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kdbusaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 " DEPEND="${RDEPEND} test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] ) " -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kservice/kservice-9999.ebuild b/kde-frameworks/kservice/kservice-9999.ebuild index ead76f99887..a1dd76ae569 100644 --- a/kde-frameworks/kservice/kservice-9999.ebuild +++ b/kde-frameworks/kservice/kservice-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -18,15 +17,15 @@ RESTRICT="test" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,xml] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kdbusaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kdbusaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 " DEPEND="${RDEPEND} test? ( >=dev-qt/qtbase-${QTMIN}:6[concurrent] ) " -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.9.0.ebuild b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.9.0.ebuild index 8526af1a178..8973dbe8d65 100644 --- a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.9.0.ebuild +++ b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,7 +15,7 @@ IUSE="X" # slot op: Qt6::WidgetsPrivate use RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] - =kde-frameworks/kwindowsystem-${PVCUT}*:6[X?] + =kde-frameworks/kwindowsystem-${KDE_CATV}*:6[X?] " DEPEND="${RDEPEND}" BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-9999.ebuild b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-9999.ebuild index bc0495d77db..513708a4830 100644 --- a/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-9999.ebuild +++ b/kde-frameworks/kstatusnotifieritem/kstatusnotifieritem-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,7 +15,7 @@ IUSE="X" # slot op: Qt6::WidgetsPrivate use RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,widgets] - =kde-frameworks/kwindowsystem-${PVCUT}*:6[X?] + =kde-frameworks/kwindowsystem-${KDE_CATV}*:6[X?] " DEPEND="${RDEPEND}" BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" diff --git a/kde-frameworks/ksvg/ksvg-6.9.0.ebuild b/kde-frameworks/ksvg/ksvg-6.9.0.ebuild index 11fb70ac5f6..31a25810143 100644 --- a/kde-frameworks/ksvg/ksvg-6.9.0.ebuild +++ b/kde-frameworks/ksvg/ksvg-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,11 +16,11 @@ DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtsvg-${QTMIN}:6 - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/kirigami-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/kirigami-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/ksvg/ksvg-9999.ebuild b/kde-frameworks/ksvg/ksvg-9999.ebuild index cd25cb200e5..224819cd482 100644 --- a/kde-frameworks/ksvg/ksvg-9999.ebuild +++ b/kde-frameworks/ksvg/ksvg-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -17,11 +16,11 @@ DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtsvg-${QTMIN}:6 - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/kirigami-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/kirigami-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/ktexteditor/ktexteditor-6.9.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-6.9.0.ebuild index 9f0cfc2da1f..25f1267ffee 100644 --- a/kde-frameworks/ktexteditor/ktexteditor-6.9.0.ebuild +++ b/kde-frameworks/ktexteditor/ktexteditor-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -19,29 +18,29 @@ DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtspeech-${QTMIN}:6 - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kauth-${PVCUT}*:6 - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kcompletion-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kconfigwidgets-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 - =kde-frameworks/kitemviews-${PVCUT}*:6 - =kde-frameworks/kjobwidgets-${PVCUT}*:6 - =kde-frameworks/kparts-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/kwindowsystem-${PVCUT}*:6 - =kde-frameworks/kxmlgui-${PVCUT}*:6 - =kde-frameworks/sonnet-${PVCUT}*:6 - =kde-frameworks/syntax-highlighting-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kauth-${KDE_CATV}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kcompletion-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kconfigwidgets-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 + =kde-frameworks/kitemviews-${KDE_CATV}*:6 + =kde-frameworks/kjobwidgets-${KDE_CATV}*:6 + =kde-frameworks/kparts-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/kwindowsystem-${KDE_CATV}*:6 + =kde-frameworks/kxmlgui-${KDE_CATV}*:6 + =kde-frameworks/sonnet-${KDE_CATV}*:6 + =kde-frameworks/syntax-highlighting-${KDE_CATV}*:6 editorconfig? ( app-text/editorconfig-core-c ) " RDEPEND="${DEPEND}" -BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:6 )" +BDEPEND="test? ( >=kde-frameworks/kservice-${KDE_CATV}:6 )" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild index 4312566d1d1..95f0b3996cd 100644 --- a/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild +++ b/kde-frameworks/ktexteditor/ktexteditor-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -19,29 +18,29 @@ DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtspeech-${QTMIN}:6 - =kde-frameworks/karchive-${PVCUT}*:6 - =kde-frameworks/kauth-${PVCUT}*:6 - =kde-frameworks/kcodecs-${PVCUT}*:6 - =kde-frameworks/kcompletion-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kconfigwidgets-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 - =kde-frameworks/kitemviews-${PVCUT}*:6 - =kde-frameworks/kjobwidgets-${PVCUT}*:6 - =kde-frameworks/kparts-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/kwindowsystem-${PVCUT}*:6 - =kde-frameworks/kxmlgui-${PVCUT}*:6 - =kde-frameworks/sonnet-${PVCUT}*:6 - =kde-frameworks/syntax-highlighting-${PVCUT}*:6 + =kde-frameworks/karchive-${KDE_CATV}*:6 + =kde-frameworks/kauth-${KDE_CATV}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 + =kde-frameworks/kcompletion-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kconfigwidgets-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 + =kde-frameworks/kitemviews-${KDE_CATV}*:6 + =kde-frameworks/kjobwidgets-${KDE_CATV}*:6 + =kde-frameworks/kparts-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/kwindowsystem-${KDE_CATV}*:6 + =kde-frameworks/kxmlgui-${KDE_CATV}*:6 + =kde-frameworks/sonnet-${KDE_CATV}*:6 + =kde-frameworks/syntax-highlighting-${KDE_CATV}*:6 editorconfig? ( app-text/editorconfig-core-c ) " RDEPEND="${DEPEND}" -BDEPEND="test? ( >=kde-frameworks/kservice-${PVCUT}:6 )" +BDEPEND="test? ( >=kde-frameworks/kservice-${KDE_CATV}:6 )" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/ktexttemplate/ktexttemplate-6.9.0.ebuild b/kde-frameworks/ktexttemplate/ktexttemplate-6.9.0.ebuild index 19d730c0b24..d018d4165cc 100644 --- a/kde-frameworks/ktexttemplate/ktexttemplate-6.9.0.ebuild +++ b/kde-frameworks/ktexttemplate/ktexttemplate-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm flag-o-matic frameworks.kde.org diff --git a/kde-frameworks/ktexttemplate/ktexttemplate-9999.ebuild b/kde-frameworks/ktexttemplate/ktexttemplate-9999.ebuild index 4f86d4c28a4..90c6fdffbbd 100644 --- a/kde-frameworks/ktexttemplate/ktexttemplate-9999.ebuild +++ b/kde-frameworks/ktexttemplate/ktexttemplate-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm flag-o-matic frameworks.kde.org diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-6.9.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-6.9.0.ebuild index 1a6d5834879..f23e2e313f8 100644 --- a/kde-frameworks/ktextwidgets/ktextwidgets-6.9.0.ebuild +++ b/kde-frameworks/ktextwidgets/ktextwidgets-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,14 +15,14 @@ IUSE="speech" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] - =kde-frameworks/kcompletion-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/sonnet-${PVCUT}*:6 + =kde-frameworks/kcompletion-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/sonnet-${KDE_CATV}*:6 speech? ( >=dev-qt/qtspeech-${QTMIN}:6 ) " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild index fc1cfdcc15b..7e2d0067e20 100644 --- a/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild +++ b/kde-frameworks/ktextwidgets/ktextwidgets-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,14 +15,14 @@ IUSE="speech" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] - =kde-frameworks/kcompletion-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/sonnet-${PVCUT}*:6 + =kde-frameworks/kcompletion-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/sonnet-${KDE_CATV}*:6 speech? ( >=dev-qt/qtspeech-${QTMIN}:6 ) " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kunitconversion/kunitconversion-6.9.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-6.9.0.ebuild index 2c91bc44cdb..e9ce1491684 100644 --- a/kde-frameworks/kunitconversion/kunitconversion-6.9.0.ebuild +++ b/kde-frameworks/kunitconversion/kunitconversion-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_PYTHON_BINDINGS="off" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,7 +15,7 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[network] - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild b/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild index 38845a4e6fb..55181b3d184 100644 --- a/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild +++ b/kde-frameworks/kunitconversion/kunitconversion-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_PYTHON_BINDINGS="off" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,7 +15,7 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[network] - =kde-frameworks/ki18n-${PVCUT}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-6.9.0.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-6.9.0.ebuild index fde2e3560b2..3819d639396 100644 --- a/kde-frameworks/kuserfeedback/kuserfeedback-6.9.0.ebuild +++ b/kde-frameworks/kuserfeedback/kuserfeedback-6.9.0.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_QTHELP="false" ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org diff --git a/kde-frameworks/kuserfeedback/kuserfeedback-9999.ebuild b/kde-frameworks/kuserfeedback/kuserfeedback-9999.ebuild index 9c462ebe19b..ac4f50b3382 100644 --- a/kde-frameworks/kuserfeedback/kuserfeedback-9999.ebuild +++ b/kde-frameworks/kuserfeedback/kuserfeedback-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_QTHELP="false" ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org diff --git a/kde-frameworks/kwallet/kwallet-6.9.0.ebuild b/kde-frameworks/kwallet/kwallet-6.9.0.ebuild index 916a2aa2f53..54a6467ab64 100644 --- a/kde-frameworks/kwallet/kwallet-6.9.0.ebuild +++ b/kde-frameworks/kwallet/kwallet-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org optfeature @@ -17,22 +16,22 @@ DEPEND=" >=app-crypt/qca-2.3.9:2[qt6(+)] dev-libs/libgcrypt:0= >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kcrash-${PVCUT}*:6 - =kde-frameworks/kdbusaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/knotifications-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/kwindowsystem-${PVCUT}*:6[X?] + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kcrash-${KDE_CATV}*:6 + =kde-frameworks/kdbusaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/knotifications-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/kwindowsystem-${KDE_CATV}*:6[X?] gpg? ( app-crypt/gpgme:=[qt6(-)] ) " RDEPEND="${DEPEND} !${CATEGORY}/${PN}:5[-kf6compat(-)] " -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kwallet/kwallet-9999.ebuild b/kde-frameworks/kwallet/kwallet-9999.ebuild index d20e2dcdaab..087022896b2 100644 --- a/kde-frameworks/kwallet/kwallet-9999.ebuild +++ b/kde-frameworks/kwallet/kwallet-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org optfeature @@ -17,22 +16,22 @@ DEPEND=" >=app-crypt/qca-2.3.9:2[qt6(+)] dev-libs/libgcrypt:0= >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kcrash-${PVCUT}*:6 - =kde-frameworks/kdbusaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/knotifications-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 - =kde-frameworks/kwindowsystem-${PVCUT}*:6[X?] + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kcrash-${KDE_CATV}*:6 + =kde-frameworks/kdbusaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/knotifications-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 + =kde-frameworks/kwindowsystem-${KDE_CATV}*:6[X?] gpg? ( app-crypt/gpgme:=[qt6(-)] ) " RDEPEND="${DEPEND} !${CATEGORY}/${PN}:5[-kf6compat(-)] " -BDEPEND="man? ( >=kde-frameworks/kdoctools-${PVCUT}:6 )" +BDEPEND="man? ( >=kde-frameworks/kdoctools-${KDE_CATV}:6 )" src_configure() { local mycmakeargs=( diff --git a/kde-frameworks/kxmlgui/kxmlgui-6.9.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-6.9.0.ebuild index 6483a88e94a..007180d6a16 100644 --- a/kde-frameworks/kxmlgui/kxmlgui-6.9.0.ebuild +++ b/kde-frameworks/kxmlgui/kxmlgui-6.9.0.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" ECM_PYTHON_BINDINGS="off" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -18,15 +17,15 @@ IUSE="" # slot op: includes QtCore/private/qlocale_p.h DEPEND=" >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,ssl,widgets,xml] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kconfigwidgets-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kglobalaccel-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kitemviews-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kconfigwidgets-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kglobalaccel-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kitemviews-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild b/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild index 818f6eb7a82..62d6a7c7ef3 100644 --- a/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild +++ b/kde-frameworks/kxmlgui/kxmlgui-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_DESIGNERPLUGIN="true" ECM_PYTHON_BINDINGS="off" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -18,15 +17,15 @@ IUSE="" # slot op: includes QtCore/private/qlocale_p.h DEPEND=" >=dev-qt/qtbase-${QTMIN}:6=[dbus,gui,network,ssl,widgets,xml] - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kconfigwidgets-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/kglobalaccel-${PVCUT}*:6 - =kde-frameworks/kguiaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kitemviews-${PVCUT}*:6 - =kde-frameworks/kwidgetsaddons-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kconfigwidgets-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/kglobalaccel-${KDE_CATV}*:6 + =kde-frameworks/kguiaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kitemviews-${KDE_CATV}*:6 + =kde-frameworks/kwidgetsaddons-${KDE_CATV}*:6 " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-6.9.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.9.0.ebuild index a9c866d2bff..438f3809dab 100644 --- a/kde-frameworks/modemmanager-qt/modemmanager-qt-6.9.0.ebuild +++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-6.9.0.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild index b0e64426163..1c517d9b512 100644 --- a/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild +++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org diff --git a/kde-frameworks/purpose/purpose-6.9.0.ebuild b/kde-frameworks/purpose/purpose-6.9.0.ebuild index 09ce2a6738d..2af145bafec 100644 --- a/kde-frameworks/purpose/purpose-6.9.0.ebuild +++ b/kde-frameworks/purpose/purpose-6.9.0.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_QTHELP="false" ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org optfeature xdg-utils @@ -21,24 +20,24 @@ RESTRICT="test" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 - =kde-frameworks/kirigami-${PVCUT}*:6 - =kde-frameworks/knotifications-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/prison-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 + =kde-frameworks/kirigami-${KDE_CATV}*:6 + =kde-frameworks/knotifications-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/prison-${KDE_CATV}*:6 webengine? ( kde-apps/kaccounts-integration:6 >=net-libs/accounts-qt-1.17[qt6(+)] ) " RDEPEND="${DEPEND} - >=kde-frameworks/kdeclarative-${PVCUT}:6 - bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:6 ) + >=kde-frameworks/kdeclarative-${KDE_CATV}:6 + bluetooth? ( =kde-frameworks/bluez-qt-${KDE_CATV}*:6 ) webengine? ( - >=kde-frameworks/purpose-kaccounts-services-${PVCUT} + >=kde-frameworks/purpose-kaccounts-services-${KDE_CATV} >=net-libs/accounts-qml-0.7_p20231028[qt6(+)] ) " diff --git a/kde-frameworks/purpose/purpose-9999.ebuild b/kde-frameworks/purpose/purpose-9999.ebuild index 693a265c5fe..abff88a4bdf 100644 --- a/kde-frameworks/purpose/purpose-9999.ebuild +++ b/kde-frameworks/purpose/purpose-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_QTHELP="false" ECM_TEST="forceoptional" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org optfeature xdg-utils @@ -21,24 +20,24 @@ RESTRICT="test" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kcoreaddons-${PVCUT}*:6 - =kde-frameworks/ki18n-${PVCUT}*:6 - =kde-frameworks/kio-${PVCUT}*:6 - =kde-frameworks/kirigami-${PVCUT}*:6 - =kde-frameworks/knotifications-${PVCUT}*:6 - =kde-frameworks/kservice-${PVCUT}*:6 - =kde-frameworks/prison-${PVCUT}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kcoreaddons-${KDE_CATV}*:6 + =kde-frameworks/ki18n-${KDE_CATV}*:6 + =kde-frameworks/kio-${KDE_CATV}*:6 + =kde-frameworks/kirigami-${KDE_CATV}*:6 + =kde-frameworks/knotifications-${KDE_CATV}*:6 + =kde-frameworks/kservice-${KDE_CATV}*:6 + =kde-frameworks/prison-${KDE_CATV}*:6 webengine? ( kde-apps/kaccounts-integration:6 >=net-libs/accounts-qt-1.17[qt6(+)] ) " RDEPEND="${DEPEND} - >=kde-frameworks/kdeclarative-${PVCUT}:6 - bluetooth? ( =kde-frameworks/bluez-qt-${PVCUT}*:6 ) + >=kde-frameworks/kdeclarative-${KDE_CATV}:6 + bluetooth? ( =kde-frameworks/bluez-qt-${KDE_CATV}*:6 ) webengine? ( - >=kde-frameworks/purpose-kaccounts-services-${PVCUT} + >=kde-frameworks/purpose-kaccounts-services-${KDE_CATV} >=net-libs/accounts-qml-0.7_p20231028[qt6(+)] ) " diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.9.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.9.0.ebuild index d69938e4187..0e47782468d 100644 --- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.9.0.ebuild +++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -19,11 +18,11 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6= - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kirigami-${PVCUT}*:6 - =kde-frameworks/sonnet-${PVCUT}*:6[qml] + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kirigami-${KDE_CATV}*:6 + =kde-frameworks/sonnet-${KDE_CATV}*:6[qml] " RDEPEND="${DEPEND} >=dev-qt/qt5compat-${QTMIN}:6 diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-9999.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-9999.ebuild index a38c7b2563a..d6f139098ae 100644 --- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-9999.ebuild +++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_QTHELP="false" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -19,11 +18,11 @@ IUSE="" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6= - =kde-frameworks/kcolorscheme-${PVCUT}*:6 - =kde-frameworks/kconfig-${PVCUT}*:6 - =kde-frameworks/kiconthemes-${PVCUT}*:6 - =kde-frameworks/kirigami-${PVCUT}*:6 - =kde-frameworks/sonnet-${PVCUT}*:6[qml] + =kde-frameworks/kcolorscheme-${KDE_CATV}*:6 + =kde-frameworks/kconfig-${KDE_CATV}*:6 + =kde-frameworks/kiconthemes-${KDE_CATV}*:6 + =kde-frameworks/kirigami-${KDE_CATV}*:6 + =kde-frameworks/sonnet-${KDE_CATV}*:6[qml] " RDEPEND="${DEPEND} >=dev-qt/qt5compat-${QTMIN}:6 diff --git a/kde-frameworks/syndication/syndication-6.9.0.ebuild b/kde-frameworks/syndication/syndication-6.9.0.ebuild index 65e954e68a6..4e2e795d797 100644 --- a/kde-frameworks/syndication/syndication-6.9.0.ebuild +++ b/kde-frameworks/syndication/syndication-6.9.0.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,7 +15,7 @@ IUSE="" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[xml] - =kde-frameworks/kcodecs-${PVCUT}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 " DEPEND="${RDEPEND} test? ( >=dev-qt/qtbase-${QTMIN}:6[network] ) diff --git a/kde-frameworks/syndication/syndication-9999.ebuild b/kde-frameworks/syndication/syndication-9999.ebuild index 75154b42bde..0cdce983874 100644 --- a/kde-frameworks/syndication/syndication-9999.ebuild +++ b/kde-frameworks/syndication/syndication-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="true" -PVCUT=$(ver_cut 1-2) QTMIN=6.7.2 inherit ecm frameworks.kde.org @@ -16,7 +15,7 @@ IUSE="" RDEPEND=" >=dev-qt/qtbase-${QTMIN}:6[xml] - =kde-frameworks/kcodecs-${PVCUT}*:6 + =kde-frameworks/kcodecs-${KDE_CATV}*:6 " DEPEND="${RDEPEND} test? ( >=dev-qt/qtbase-${QTMIN}:6[network] ) From e023b5c41e613f513ef8db389bf698274515c549 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 6 Dec 2024 23:41:45 +0100 Subject: [PATCH 3/5] plasma.kde.org.eclass: Introduce KDE_CATV Holds main Plasma release number (major.minor.micro) for use on same-category dependencies. Signed-off-by: Andreas Sturmlechner --- eclass/plasma.kde.org.eclass | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass index 1a626de37bf..6612028e298 100644 --- a/eclass/plasma.kde.org.eclass +++ b/eclass/plasma.kde.org.eclass @@ -25,6 +25,13 @@ esac if [[ -z ${_PLASMA_KDE_ORG_ECLASS} ]]; then _PLASMA_KDE_ORG_ECLASS=1 +# @ECLASS_VARIABLE: KDE_CATV +# @DESCRIPTION: +# Holds main Plasma release number (major.minor.micro) for use on same-category +# dependencies. +KDE_CATV=$(ver_cut 1-3) +readonly KDE_CATV + # @ECLASS_VARIABLE: KDE_PV_UNRELEASED # @INTERNAL # @DESCRIPTION: @@ -64,10 +71,10 @@ if [[ ${KDE_BUILD_TYPE} == live ]]; then elif [[ -z ${KDE_ORG_COMMIT} ]]; then case ${PV} in 5.??.[6-9][05]* | 6.?.[6-9][05]* ) - _KDE_SRC_URI+="unstable/plasma/$(ver_cut 1-3)/" + _KDE_SRC_URI+="unstable/plasma/${KDE_CATV}/" RESTRICT+=" mirror" ;; - *) _KDE_SRC_URI+="stable/plasma/$(ver_cut 1-3)/" ;; + *) _KDE_SRC_URI+="stable/plasma/${KDE_CATV}/" ;; esac SRC_URI="${_KDE_SRC_URI}${KDE_ORG_TAR_PN}-${PV}.tar.xz" From c629431d3bdd169395657e8e01e2aded304e3bb5 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Fri, 6 Dec 2024 23:43:45 +0100 Subject: [PATCH 4/5] kde-plasma: Drop PVCUT and replace w/ eclass-provided KDE_CATV Signed-off-by: Andreas Sturmlechner --- .../bluedevil/bluedevil-6.2.49.9999.ebuild | 3 +- kde-plasma/bluedevil/bluedevil-9999.ebuild | 3 +- .../breeze-grub-6.2.49.9999.ebuild | 1 - .../breeze-grub/breeze-grub-9999.ebuild | 1 - .../breeze-gtk/breeze-gtk-6.2.49.9999.ebuild | 3 +- kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild | 3 +- .../breeze-plymouth-6.2.49.9999.ebuild | 1 - .../breeze-plymouth-9999.ebuild | 1 - kde-plasma/breeze/breeze-6.2.49.9999.ebuild | 3 +- kde-plasma/breeze/breeze-9999.ebuild | 3 +- .../flatpak-kcm-6.2.49.9999.ebuild | 1 - .../flatpak-kcm/flatpak-kcm-9999.ebuild | 1 - .../kactivitymanagerd-6.2.49.9999.ebuild | 1 - .../kactivitymanagerd-9999.ebuild | 1 - .../kde-gtk-config-6.2.49.9999.ebuild | 3 +- .../kde-gtk-config/kde-gtk-config-9999.ebuild | 3 +- .../kdeplasma-addons-6.2.49.9999.ebuild | 5 ++- .../kdeplasma-addons-9999.ebuild | 5 ++- .../kinfocenter-6.2.49.9999.ebuild | 3 +- .../kinfocenter/kinfocenter-9999.ebuild | 3 +- .../kpipewire/kpipewire-6.2.49.9999.ebuild | 3 +- kde-plasma/kpipewire/kpipewire-9999.ebuild | 3 +- kde-plasma/krdp/krdp-6.2.49.9999.ebuild | 3 +- kde-plasma/krdp/krdp-9999.ebuild | 3 +- kde-plasma/kscreen/kscreen-6.2.49.9999.ebuild | 7 ++-- kde-plasma/kscreen/kscreen-9999.ebuild | 7 ++-- .../kscreenlocker-6.2.49.9999.ebuild | 9 +++-- .../kscreenlocker/kscreenlocker-9999.ebuild | 9 +++-- .../ksystemstats-6.2.49.9999.ebuild | 3 +- .../ksystemstats/ksystemstats-9999.ebuild | 3 +- kde-plasma/kwin/kwin-6.2.49.9999.ebuild | 17 +++++---- kde-plasma/kwin/kwin-9999.ebuild | 17 +++++---- .../libplasma/libplasma-6.2.49.9999.ebuild | 3 +- kde-plasma/libplasma/libplasma-9999.ebuild | 3 +- kde-plasma/milou/milou-6.2.49.9999.ebuild | 3 +- kde-plasma/milou/milou-9999.ebuild | 3 +- kde-plasma/oxygen/oxygen-6.2.49.9999.ebuild | 5 ++- kde-plasma/oxygen/oxygen-9999.ebuild | 5 ++- .../plasma-bigscreen-5.27.49.9999.ebuild | 11 +++--- ...sma-browser-integration-6.2.49.9999.ebuild | 5 ++- .../plasma-browser-integration-9999.ebuild | 5 ++- .../plasma-desktop-6.2.49.9999.ebuild | 21 ++++++----- .../plasma-desktop/plasma-desktop-9999.ebuild | 21 ++++++----- .../plasma-integration-6.2.49.9999.ebuild | 3 +- .../plasma-integration-9999.ebuild | 3 +- .../plasma-nm/plasma-nm-6.2.49.9999.ebuild | 3 +- kde-plasma/plasma-nm/plasma-nm-9999.ebuild | 3 +- .../plasma-pa/plasma-pa-6.2.49.9999.ebuild | 3 +- kde-plasma/plasma-pa/plasma-pa-9999.ebuild | 3 +- .../plasma-sdk/plasma-sdk-6.2.49.9999.ebuild | 5 ++- kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild | 5 ++- .../plasma-systemmonitor-6.2.49.9999.ebuild | 5 ++- .../plasma-systemmonitor-9999.ebuild | 5 ++- .../plasma-vault-6.2.49.9999.ebuild | 7 ++-- .../plasma-vault/plasma-vault-9999.ebuild | 7 ++-- .../plasma-welcome-6.2.49.9999.ebuild | 3 +- .../plasma-welcome/plasma-welcome-9999.ebuild | 3 +- ...ma-workspace-wallpapers-6.2.49.9999.ebuild | 1 - .../plasma-workspace-wallpapers-9999.ebuild | 1 - .../plasma-workspace-6.2.49.9999.ebuild | 35 +++++++++---------- .../plasma-workspace-9999.ebuild | 33 +++++++++-------- .../plasma5support-6.2.49.9999.ebuild | 3 +- .../plasma5support/plasma5support-9999.ebuild | 3 +- .../plymouth-kcm-6.2.49.9999.ebuild | 1 - .../plymouth-kcm/plymouth-kcm-9999.ebuild | 1 - .../polkit-kde-agent-6.2.49.9999.ebuild | 3 +- .../polkit-kde-agent-9999.ebuild | 3 +- .../powerdevil/powerdevil-6.2.49.9999.ebuild | 9 +++-- kde-plasma/powerdevil/powerdevil-9999.ebuild | 9 +++-- .../print-manager-6.2.49.9999.ebuild | 3 +- .../print-manager/print-manager-9999.ebuild | 3 +- .../sddm-kcm/sddm-kcm-6.2.49.9999.ebuild | 1 - kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild | 1 - .../systemsettings-6.2.49.9999.ebuild | 3 +- .../systemsettings/systemsettings-9999.ebuild | 3 +- .../wacomtablet-6.2.49.9999.ebuild | 5 ++- .../wacomtablet/wacomtablet-9999.ebuild | 5 ++- .../xdg-desktop-portal-kde-6.2.49.9999.ebuild | 5 ++- .../xdg-desktop-portal-kde-9999.ebuild | 5 ++- 79 files changed, 166 insertions(+), 245 deletions(-) diff --git a/kde-plasma/bluedevil/bluedevil-6.2.49.9999.ebuild b/kde-plasma/bluedevil/bluedevil-6.2.49.9999.ebuild index 5b25e0e94e1..b798dfc952e 100644 --- a/kde-plasma/bluedevil/bluedevil-6.2.49.9999.ebuild +++ b/kde-plasma/bluedevil/bluedevil-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -34,7 +33,7 @@ DEPEND=" >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 " RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:6 diff --git a/kde-plasma/bluedevil/bluedevil-9999.ebuild b/kde-plasma/bluedevil/bluedevil-9999.ebuild index b38b73e021f..32efabda0a7 100644 --- a/kde-plasma/bluedevil/bluedevil-9999.ebuild +++ b/kde-plasma/bluedevil/bluedevil-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_HANDBOOK="optional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -34,7 +33,7 @@ DEPEND=" >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 " RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:6 diff --git a/kde-plasma/breeze-grub/breeze-grub-6.2.49.9999.ebuild b/kde-plasma/breeze-grub/breeze-grub-6.2.49.9999.ebuild index 6755168f92c..6aced6fe901 100644 --- a/kde-plasma/breeze-grub/breeze-grub-6.2.49.9999.ebuild +++ b/kde-plasma/breeze-grub/breeze-grub-6.2.49.9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-3) inherit plasma.kde.org DESCRIPTION="Breeze theme for GRUB" diff --git a/kde-plasma/breeze-grub/breeze-grub-9999.ebuild b/kde-plasma/breeze-grub/breeze-grub-9999.ebuild index 6755168f92c..6aced6fe901 100644 --- a/kde-plasma/breeze-grub/breeze-grub-9999.ebuild +++ b/kde-plasma/breeze-grub/breeze-grub-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-3) inherit plasma.kde.org DESCRIPTION="Breeze theme for GRUB" diff --git a/kde-plasma/breeze-gtk/breeze-gtk-6.2.49.9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-6.2.49.9999.ebuild index 9470ddbdba6..c692163dddb 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-6.2.49.9999.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.5.0 -PVCUT=$(ver_cut 1-3) PYTHON_COMPAT=( python3_{10..13} ) inherit ecm plasma.kde.org python-any-r1 @@ -19,7 +18,7 @@ IUSE="" BDEPEND="${PYTHON_DEPS} dev-lang/sassc $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') - >=kde-plasma/breeze-${PVCUT}:6 + >=kde-plasma/breeze-${KDE_CATV}:6 " python_check_deps() { diff --git a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild index 9470ddbdba6..c692163dddb 100644 --- a/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild +++ b/kde-plasma/breeze-gtk/breeze-gtk-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.5.0 -PVCUT=$(ver_cut 1-3) PYTHON_COMPAT=( python3_{10..13} ) inherit ecm plasma.kde.org python-any-r1 @@ -19,7 +18,7 @@ IUSE="" BDEPEND="${PYTHON_DEPS} dev-lang/sassc $(python_gen_any_dep 'dev-python/pycairo[${PYTHON_USEDEP}]') - >=kde-plasma/breeze-${PVCUT}:6 + >=kde-plasma/breeze-${KDE_CATV}:6 " python_check_deps() { diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-6.2.49.9999.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-6.2.49.9999.ebuild index 959a70f3f63..47040a47a95 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-6.2.49.9999.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) inherit cmake plasma.kde.org DESCRIPTION="Breeze theme for Plymouth" diff --git a/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild b/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild index 83fddde6c0c..7c85d9d706b 100644 --- a/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild +++ b/kde-plasma/breeze-plymouth/breeze-plymouth-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=9999 -PVCUT=$(ver_cut 1-3) inherit cmake plasma.kde.org DESCRIPTION="Breeze theme for Plymouth" diff --git a/kde-plasma/breeze/breeze-6.2.49.9999.ebuild b/kde-plasma/breeze/breeze-6.2.49.9999.ebuild index 17f2c64c6d1..746e0a5cc2a 100644 --- a/kde-plasma/breeze/breeze-6.2.49.9999.ebuild +++ b/kde-plasma/breeze/breeze-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 KF5MIN=5.115.0 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QT5MIN=5.15.12 QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -33,7 +32,7 @@ RDEPEND=" >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] - >=kde-plasma/kdecoration-${PVCUT}:6 + >=kde-plasma/kdecoration-${KDE_CATV}:6 qt5? ( >=dev-qt/qtdbus-${QT5MIN}:5 >=dev-qt/qtdeclarative-${QT5MIN}:5 diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild index 8b8c94dd2e8..3b863fdede4 100644 --- a/kde-plasma/breeze/breeze-9999.ebuild +++ b/kde-plasma/breeze/breeze-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 KF5MIN=5.115.0 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QT5MIN=5.15.12 QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -33,7 +32,7 @@ RDEPEND=" >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] - >=kde-plasma/kdecoration-${PVCUT}:6 + >=kde-plasma/kdecoration-${KDE_CATV}:6 qt5? ( >=dev-qt/qtdbus-${QT5MIN}:5 >=dev-qt/qtdeclarative-${QT5MIN}:5 diff --git a/kde-plasma/flatpak-kcm/flatpak-kcm-6.2.49.9999.ebuild b/kde-plasma/flatpak-kcm/flatpak-kcm-6.2.49.9999.ebuild index 88e4303735f..3e3f2580f70 100644 --- a/kde-plasma/flatpak-kcm/flatpak-kcm-6.2.49.9999.ebuild +++ b/kde-plasma/flatpak-kcm/flatpak-kcm-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org diff --git a/kde-plasma/flatpak-kcm/flatpak-kcm-9999.ebuild b/kde-plasma/flatpak-kcm/flatpak-kcm-9999.ebuild index 53ae6ed5a80..d6f601798e6 100644 --- a/kde-plasma/flatpak-kcm/flatpak-kcm-9999.ebuild +++ b/kde-plasma/flatpak-kcm/flatpak-kcm-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.2.49.9999.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.2.49.9999.ebuild index b6964d355c3..84d566b6847 100644 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.2.49.9999.ebuild +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild index e477b7de598..c5c25dee05a 100644 --- a/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-6.2.49.9999.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-6.2.49.9999.ebuild index f90c03a8693..645b9a9b003 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-6.2.49.9999.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -27,7 +26,7 @@ DEPEND=" >=kde-frameworks/kdbusaddons-${KFMIN}:6 >=kde-frameworks/kguiaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/kdecoration-${PVCUT}:6 + >=kde-plasma/kdecoration-${KDE_CATV}:6 x11-libs/gtk+:3[X] " RDEPEND="${DEPEND} diff --git a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild index d2e25eb6abf..c7938b90b79 100644 --- a/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild +++ b/kde-plasma/kde-gtk-config/kde-gtk-config-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -27,7 +26,7 @@ DEPEND=" >=kde-frameworks/kdbusaddons-${KFMIN}:6 >=kde-frameworks/kguiaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/kdecoration-${PVCUT}:6 + >=kde-plasma/kdecoration-${KDE_CATV}:6 x11-libs/gtk+:3[X] " RDEPEND="${DEPEND} diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.2.49.9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.2.49.9999.ebuild index 3a6e0e2c25c..2d4038773dc 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.2.49.9999.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org optfeature @@ -42,8 +41,8 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kxmlgui-${KFMIN}:6 >=kde-frameworks/sonnet-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma5support-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma5support-${KDE_CATV}:6 alternate-calendar? ( dev-libs/icu:= ) share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 ) diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild index 1aa8adbfb6a..20547a06cf6 100644 --- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild +++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org optfeature @@ -42,8 +41,8 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kxmlgui-${KFMIN}:6 >=kde-frameworks/sonnet-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma5support-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma5support-${KDE_CATV}:6 alternate-calendar? ( dev-libs/icu:= ) share? ( >=kde-frameworks/purpose-${KFMIN}:6 ) webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 ) diff --git a/kde-plasma/kinfocenter/kinfocenter-6.2.49.9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-6.2.49.9999.ebuild index b0c5ee8d26d..60187641c04 100644 --- a/kde-plasma/kinfocenter/kinfocenter-6.2.49.9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org optfeature @@ -37,7 +36,7 @@ RDEPEND="${DEPEND} dev-qt/qdbus:* ) >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-plasma/systemsettings-${PVCUT}:6 + >=kde-plasma/systemsettings-${KDE_CATV}:6 " BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" diff --git a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild index 70ae239a2d0..877f039b26c 100644 --- a/kde-plasma/kinfocenter/kinfocenter-9999.ebuild +++ b/kde-plasma/kinfocenter/kinfocenter-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org optfeature @@ -37,7 +36,7 @@ RDEPEND="${DEPEND} dev-qt/qdbus:* ) >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-plasma/systemsettings-${PVCUT}:6 + >=kde-plasma/systemsettings-${KDE_CATV}:6 " BDEPEND=">=kde-frameworks/kcmutils-${KFMIN}:6" diff --git a/kde-plasma/kpipewire/kpipewire-6.2.49.9999.ebuild b/kde-plasma/kpipewire/kpipewire-6.2.49.9999.ebuild index f34bed80820..33ba199b279 100644 --- a/kde-plasma/kpipewire/kpipewire-6.2.49.9999.ebuild +++ b/kde-plasma/kpipewire/kpipewire-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="true" -PVCUT=$(ver_cut 1-3) KFMIN=6.6.0 QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -34,7 +33,7 @@ DEPEND="${COMMON_DEPEND} dev-libs/plasma-wayland-protocols dev-libs/wayland >=dev-qt/qtwayland-${QTMIN}:6 - >=kde-plasma/kwayland-${PVCUT}:6 + >=kde-plasma/kwayland-${KDE_CATV}:6 media-video/pipewire[extra] ) " diff --git a/kde-plasma/kpipewire/kpipewire-9999.ebuild b/kde-plasma/kpipewire/kpipewire-9999.ebuild index 2e66c1a1050..58ff58e5f8d 100644 --- a/kde-plasma/kpipewire/kpipewire-9999.ebuild +++ b/kde-plasma/kpipewire/kpipewire-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 ECM_TEST="true" -PVCUT=$(ver_cut 1-3) KFMIN=9999 QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -34,7 +33,7 @@ DEPEND="${COMMON_DEPEND} dev-libs/plasma-wayland-protocols dev-libs/wayland >=dev-qt/qtwayland-${QTMIN}:6 - >=kde-plasma/kwayland-${PVCUT}:6 + >=kde-plasma/kwayland-${KDE_CATV}:6 media-video/pipewire[extra] ) " diff --git a/kde-plasma/krdp/krdp-6.2.49.9999.ebuild b/kde-plasma/krdp/krdp-6.2.49.9999.ebuild index bc13f4b1c38..220e5ed9aa3 100644 --- a/kde-plasma/krdp/krdp-6.2.49.9999.ebuild +++ b/kde-plasma/krdp/krdp-6.2.49.9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_EXAMPLES="true" ECM_TEST="true" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm flag-o-matic plasma.kde.org toolchain-funcs @@ -30,7 +29,7 @@ COMMON_DEPEND=" >=kde-frameworks/kdbusaddons-${KFMIN}:6 >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 - >=kde-plasma/kpipewire-${PVCUT}:6 + >=kde-plasma/kpipewire-${KDE_CATV}:6 >=net-misc/freerdp-2.10:2[server] x11-libs/libxkbcommon " diff --git a/kde-plasma/krdp/krdp-9999.ebuild b/kde-plasma/krdp/krdp-9999.ebuild index 89a33a0151a..5b8a3898445 100644 --- a/kde-plasma/krdp/krdp-9999.ebuild +++ b/kde-plasma/krdp/krdp-9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_EXAMPLES="true" ECM_TEST="true" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm flag-o-matic plasma.kde.org toolchain-funcs @@ -30,7 +29,7 @@ COMMON_DEPEND=" >=kde-frameworks/kdbusaddons-${KFMIN}:6 >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 - >=kde-plasma/kpipewire-${PVCUT}:6 + >=kde-plasma/kpipewire-${KDE_CATV}:6 >=net-misc/freerdp-2.10:2[server] x11-libs/libxkbcommon " diff --git a/kde-plasma/kscreen/kscreen-6.2.49.9999.ebuild b/kde-plasma/kscreen/kscreen-6.2.49.9999.ebuild index 4421e084cc2..7ce37e3bdd0 100644 --- a/kde-plasma/kscreen/kscreen-6.2.49.9999.ebuild +++ b/kde-plasma/kscreen/kscreen-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_TEST="forceoptional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -34,9 +33,9 @@ DEPEND=" >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-plasma/layer-shell-qt-${PVCUT}:6 - >=kde-plasma/libkscreen-${PVCUT}:6= - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/layer-shell-qt-${KDE_CATV}:6 + >=kde-plasma/libkscreen-${KDE_CATV}:6= + >=kde-plasma/libplasma-${KDE_CATV}:6 X? ( >=dev-qt/qtbase-${QTMIN}:6=[X] x11-libs/libX11 diff --git a/kde-plasma/kscreen/kscreen-9999.ebuild b/kde-plasma/kscreen/kscreen-9999.ebuild index a288f8fc53a..17540cf376f 100644 --- a/kde-plasma/kscreen/kscreen-9999.ebuild +++ b/kde-plasma/kscreen/kscreen-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_TEST="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -34,9 +33,9 @@ DEPEND=" >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-plasma/layer-shell-qt-${PVCUT}:6 - >=kde-plasma/libkscreen-${PVCUT}:6= - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/layer-shell-qt-${KDE_CATV}:6 + >=kde-plasma/libkscreen-${KDE_CATV}:6= + >=kde-plasma/libplasma-${KDE_CATV}:6 X? ( >=dev-qt/qtbase-${QTMIN}:6=[X] x11-libs/libX11 diff --git a/kde-plasma/kscreenlocker/kscreenlocker-6.2.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-6.2.49.9999.ebuild index 2690ad7439d..9a0fdab00bc 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-6.2.49.9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_TEST="forceoptional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org pam @@ -36,9 +35,9 @@ COMMON_DEPEND=" >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/layer-shell-qt-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/libkscreen-${PVCUT}:6 + >=kde-plasma/layer-shell-qt-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/libkscreen-${KDE_CATV}:6 sys-libs/pam x11-libs/libX11 x11-libs/libXi @@ -50,7 +49,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 " BDEPEND=" dev-util/wayland-scanner diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild index 1d9f617f84b..09f8b81bcc8 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_TEST="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org pam @@ -36,9 +35,9 @@ COMMON_DEPEND=" >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/layer-shell-qt-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/libkscreen-${PVCUT}:6 + >=kde-plasma/layer-shell-qt-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/libkscreen-${KDE_CATV}:6 sys-libs/pam x11-libs/libX11 x11-libs/libXi @@ -50,7 +49,7 @@ DEPEND="${COMMON_DEPEND} " RDEPEND="${COMMON_DEPEND} >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 " BDEPEND=" dev-util/wayland-scanner diff --git a/kde-plasma/ksystemstats/ksystemstats-6.2.49.9999.ebuild b/kde-plasma/ksystemstats/ksystemstats-6.2.49.9999.ebuild index 950fe2653b4..e2c0fa9fd0a 100644 --- a/kde-plasma/ksystemstats/ksystemstats-6.2.49.9999.ebuild +++ b/kde-plasma/ksystemstats/ksystemstats-6.2.49.9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -26,7 +25,7 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kio-${KFMIN}:6 >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap diff --git a/kde-plasma/ksystemstats/ksystemstats-9999.ebuild b/kde-plasma/ksystemstats/ksystemstats-9999.ebuild index 23546a0f36b..5d317f68ecc 100644 --- a/kde-plasma/ksystemstats/ksystemstats-9999.ebuild +++ b/kde-plasma/ksystemstats/ksystemstats-9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -26,7 +25,7 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kio-${KFMIN}:6 >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 net-libs/libpcap sys-apps/lm-sensors:= sys-libs/libcap diff --git a/kde-plasma/kwin/kwin-6.2.49.9999.ebuild b/kde-plasma/kwin/kwin-6.2.49.9999.ebuild index cfc163ca177..9f5bae71ae7 100644 --- a/kde-plasma/kwin/kwin-6.2.49.9999.ebuild +++ b/kde-plasma/kwin/kwin-6.2.49.9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="true" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm fcaps plasma.kde.org @@ -51,10 +50,10 @@ COMMON_DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6=[wayland,X] >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-plasma/breeze-${PVCUT}:6 - >=kde-plasma/kdecoration-${PVCUT}:6 - >=kde-plasma/kwayland-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/breeze-${KDE_CATV}:6 + >=kde-plasma/kdecoration-${KDE_CATV}:6 + >=kde-plasma/kwayland-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 @@ -75,9 +74,9 @@ COMMON_DEPEND=" x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:6 ) gles2-only? ( >=media-libs/mesa-24.1.0_rc1[opengl] ) - lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 ) + lock? ( >=kde-plasma/kscreenlocker-${KDE_CATV}:6 ) screencast? ( >=media-video/pipewire-0.3.65:= ) - shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}:6 ) + shortcuts? ( >=kde-plasma/kglobalacceld-${KDE_CATV}:6 ) " RDEPEND="${COMMON_DEPEND} !kde-plasma/kdeplasma-addons:5 @@ -91,7 +90,7 @@ RDEPEND="${COMMON_DEPEND} ) >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/kitemmodels-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6[wayland(+)] + >=kde-plasma/libplasma-${KDE_CATV}:6[wayland(+)] sys-apps/hwdata x11-base/xwayland[libei] " @@ -103,7 +102,7 @@ DEPEND="${COMMON_DEPEND} >=dev-qt/qtwayland-${QTMIN}:6 x11-base/xorg-proto x11-libs/xcb-util-image - test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) ) + test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) ) " BDEPEND=" >=dev-qt/qtwayland-${QTMIN}:6 diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild index 1a36b95b123..616f1eda7a3 100644 --- a/kde-plasma/kwin/kwin-9999.ebuild +++ b/kde-plasma/kwin/kwin-9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="true" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm fcaps plasma.kde.org @@ -51,10 +50,10 @@ COMMON_DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6=[wayland,X] >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-plasma/breeze-${PVCUT}:6 - >=kde-plasma/kdecoration-${PVCUT}:6 - >=kde-plasma/kwayland-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/breeze-${KDE_CATV}:6 + >=kde-plasma/kdecoration-${KDE_CATV}:6 + >=kde-plasma/kwayland-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 media-libs/fontconfig media-libs/freetype media-libs/lcms:2 @@ -75,9 +74,9 @@ COMMON_DEPEND=" x11-libs/xcb-util-wm accessibility? ( media-libs/libqaccessibilityclient:6 ) gles2-only? ( >=media-libs/mesa-24.1.0_rc1[opengl] ) - lock? ( >=kde-plasma/kscreenlocker-${PVCUT}:6 ) + lock? ( >=kde-plasma/kscreenlocker-${KDE_CATV}:6 ) screencast? ( >=media-video/pipewire-1.2.0:= ) - shortcuts? ( >=kde-plasma/kglobalacceld-${PVCUT}:6 ) + shortcuts? ( >=kde-plasma/kglobalacceld-${KDE_CATV}:6 ) " RDEPEND="${COMMON_DEPEND} !kde-plasma/kdeplasma-addons:5 @@ -91,7 +90,7 @@ RDEPEND="${COMMON_DEPEND} ) >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/kitemmodels-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6[wayland(+)] + >=kde-plasma/libplasma-${KDE_CATV}:6[wayland(+)] sys-apps/hwdata >=x11-base/xwayland-23.1.0[libei] " @@ -103,7 +102,7 @@ DEPEND="${COMMON_DEPEND} >=dev-qt/qtwayland-${QTMIN}:6 x11-base/xorg-proto x11-libs/xcb-util-image - test? ( screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) ) + test? ( screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) ) " BDEPEND=" >=dev-qt/qtwayland-${QTMIN}:6 diff --git a/kde-plasma/libplasma/libplasma-6.2.49.9999.ebuild b/kde-plasma/libplasma/libplasma-6.2.49.9999.ebuild index 62c037c0071..a31e1b67281 100644 --- a/kde-plasma/libplasma/libplasma-6.2.49.9999.ebuild +++ b/kde-plasma/libplasma/libplasma-6.2.49.9999.ebuild @@ -7,7 +7,6 @@ ECM_NONGUI="true" ECM_QTHELP="true" ECM_TEST="true" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -42,7 +41,7 @@ COMMON_DEPEND=" >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] - =kde-plasma/plasma-activities-${PVCUT}*:6 + =kde-plasma/plasma-activities-${KDE_CATV}*:6 media-libs/libglvnd x11-libs/libX11 x11-libs/libxcb diff --git a/kde-plasma/libplasma/libplasma-9999.ebuild b/kde-plasma/libplasma/libplasma-9999.ebuild index 586c1597ae2..74e041f8c0b 100644 --- a/kde-plasma/libplasma/libplasma-9999.ebuild +++ b/kde-plasma/libplasma/libplasma-9999.ebuild @@ -7,7 +7,6 @@ ECM_NONGUI="true" ECM_QTHELP="true" ECM_TEST="true" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -42,7 +41,7 @@ COMMON_DEPEND=" >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] - =kde-plasma/plasma-activities-${PVCUT}*:6 + =kde-plasma/plasma-activities-${KDE_CATV}*:6 media-libs/libglvnd x11-libs/libX11 x11-libs/libxcb diff --git a/kde-plasma/milou/milou-6.2.49.9999.ebuild b/kde-plasma/milou/milou-6.2.49.9999.ebuild index 28c51b4c884..71c33be3345 100644 --- a/kde-plasma/milou/milou-6.2.49.9999.ebuild +++ b/kde-plasma/milou/milou-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_TEST="true" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -24,6 +23,6 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/krunner-${KFMIN}:6 >=kde-frameworks/ksvg-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 " RDEPEND="${DEPEND}" diff --git a/kde-plasma/milou/milou-9999.ebuild b/kde-plasma/milou/milou-9999.ebuild index 355f173c069..ae4be84e8fa 100644 --- a/kde-plasma/milou/milou-9999.ebuild +++ b/kde-plasma/milou/milou-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_TEST="true" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -24,6 +23,6 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/krunner-${KFMIN}:6 >=kde-frameworks/ksvg-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 " RDEPEND="${DEPEND}" diff --git a/kde-plasma/oxygen/oxygen-6.2.49.9999.ebuild b/kde-plasma/oxygen/oxygen-6.2.49.9999.ebuild index 0eaa15147ad..7ec36a4915f 100644 --- a/kde-plasma/oxygen/oxygen-6.2.49.9999.ebuild +++ b/kde-plasma/oxygen/oxygen-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 KF5MIN=5.115.0 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QT5MIN=5.15.12 QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -32,8 +31,8 @@ COMMON_DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/kdecoration-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/kdecoration-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 qt5? ( >=dev-qt/qtdbus-${QT5MIN}:5 >=dev-qt/qtdeclarative-${QT5MIN}:5 diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild index f036dae5b94..63c062ecef8 100644 --- a/kde-plasma/oxygen/oxygen-9999.ebuild +++ b/kde-plasma/oxygen/oxygen-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 KF5MIN=5.115.0 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QT5MIN=5.15.12 QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -32,8 +31,8 @@ COMMON_DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/kdecoration-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/kdecoration-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 qt5? ( >=dev-qt/qtdbus-${QT5MIN}:5 >=dev-qt/qtdeclarative-${QT5MIN}:5 diff --git a/kde-plasma/plasma-bigscreen/plasma-bigscreen-5.27.49.9999.ebuild b/kde-plasma/plasma-bigscreen/plasma-bigscreen-5.27.49.9999.ebuild index c744de62be6..417948c82c4 100644 --- a/kde-plasma/plasma-bigscreen/plasma-bigscreen-5.27.49.9999.ebuild +++ b/kde-plasma/plasma-bigscreen/plasma-bigscreen-5.27.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.5.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -30,11 +29,11 @@ DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:6 >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/kwayland-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-activities-stats-${PVCUT}:6 - >=kde-plasma/plasma-workspace-${PVCUT}:6 + >=kde-plasma/kwayland-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-stats-${KDE_CATV}:6 + >=kde-plasma/plasma-workspace-${KDE_CATV}:6 " RDEPEND="${DEPEND} >=dev-qt/qtsvg-${QTMIN}:6 diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.2.49.9999.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.2.49.9999.ebuild index f8778e162ac..9ef3013f316 100644 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.2.49.9999.ebuild +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -30,8 +29,8 @@ RDEPEND=" >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 >=kde-frameworks/purpose-${KFMIN}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-workspace-${PVCUT}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 + >=kde-plasma/plasma-workspace-${KDE_CATV}:6 " DEPEND="${RDEPEND} >=kde-frameworks/krunner-${KFMIN}:6 diff --git a/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild b/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild index 329d515d577..08bacb991b4 100644 --- a/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild +++ b/kde-plasma/plasma-browser-integration/plasma-browser-integration-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -30,8 +29,8 @@ RDEPEND=" >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 >=kde-frameworks/purpose-${KFMIN}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-workspace-${PVCUT}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 + >=kde-plasma/plasma-workspace-${KDE_CATV}:6 " DEPEND="${RDEPEND} >=kde-frameworks/krunner-${KFMIN}:6 diff --git a/kde-plasma/plasma-desktop/plasma-desktop-6.2.49.9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-6.2.49.9999.ebuild index 57f1f715d55..36c61b60171 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-6.2.49.9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-6.2.49.9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org optfeature @@ -63,13 +62,13 @@ COMMON_DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:6 >=kde-frameworks/solid-${KFMIN}:6 >=kde-frameworks/sonnet-${KFMIN}:6 - >=kde-plasma/kwin-${PVCUT}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-activities-stats-${PVCUT}:6 - >=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?] - >=kde-plasma/plasma5support-${PVCUT}:6 + >=kde-plasma/kwin-${KDE_CATV}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-stats-${KDE_CATV}:6 + >=kde-plasma/plasma-workspace-${KDE_CATV}:6[screencast?] + >=kde-plasma/plasma5support-${KDE_CATV}:6 media-libs/libcanberra x11-libs/libX11 x11-libs/libxcb @@ -100,7 +99,7 @@ DEPEND="${COMMON_DEPEND} input_devices_wacom? ( >=dev-libs/wayland-protocols-1.25 ) test? ( >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - >=kde-plasma/kactivitymanagerd-${PVCUT}:6 + >=kde-plasma/kactivitymanagerd-${KDE_CATV}:6 ) " RDEPEND="${COMMON_DEPEND} @@ -110,13 +109,13 @@ RDEPEND="${COMMON_DEPEND} >=dev-qt/qtwayland-${QTMIN}:6 >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - >=kde-plasma/oxygen-${PVCUT}:6 + >=kde-plasma/oxygen-${KDE_CATV}:6 kde-plasma/plasma-mimeapps-list media-fonts/noto-emoji sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs - screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) + screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) webengine? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6(+)] ) " BDEPEND=" diff --git a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild index de72a06e68d..f1631cb173a 100644 --- a/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild +++ b/kde-plasma/plasma-desktop/plasma-desktop-9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org optfeature @@ -63,13 +62,13 @@ COMMON_DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:6 >=kde-frameworks/solid-${KFMIN}:6 >=kde-frameworks/sonnet-${KFMIN}:6 - >=kde-plasma/kwin-${PVCUT}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-activities-stats-${PVCUT}:6 - >=kde-plasma/plasma-workspace-${PVCUT}:6[screencast?] - >=kde-plasma/plasma5support-${PVCUT}:6 + >=kde-plasma/kwin-${KDE_CATV}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-stats-${KDE_CATV}:6 + >=kde-plasma/plasma-workspace-${KDE_CATV}:6[screencast?] + >=kde-plasma/plasma5support-${KDE_CATV}:6 media-libs/libcanberra x11-libs/libX11 x11-libs/libxcb @@ -101,7 +100,7 @@ DEPEND="${COMMON_DEPEND} input_devices_wacom? ( >=dev-libs/wayland-protocols-1.25 ) test? ( >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - >=kde-plasma/kactivitymanagerd-${PVCUT}:6 + >=kde-plasma/kactivitymanagerd-${KDE_CATV}:6 ) " RDEPEND="${COMMON_DEPEND} @@ -111,13 +110,13 @@ RDEPEND="${COMMON_DEPEND} >=dev-qt/qtwayland-${QTMIN}:6 >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6 - >=kde-plasma/oxygen-${PVCUT}:6 + >=kde-plasma/oxygen-${KDE_CATV}:6 kde-plasma/plasma-mimeapps-list media-fonts/noto-emoji sys-apps/util-linux x11-apps/setxkbmap x11-misc/xdg-user-dirs - screencast? ( >=kde-plasma/kpipewire-${PVCUT}:6 ) + screencast? ( >=kde-plasma/kpipewire-${KDE_CATV}:6 ) webengine? ( >=net-libs/signon-oauth2-0.25_p20210102[qt6(+)] ) " BDEPEND=" diff --git a/kde-plasma/plasma-integration/plasma-integration-6.2.49.9999.ebuild b/kde-plasma/plasma-integration/plasma-integration-6.2.49.9999.ebuild index 04ef869a47d..27dc0b8a090 100644 --- a/kde-plasma/plasma-integration/plasma-integration-6.2.49.9999.ebuild +++ b/kde-plasma/plasma-integration/plasma-integration-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 KF5MIN=5.115.0 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QT5MIN=5.15.12 QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -72,7 +71,7 @@ RDEPEND="${COMMON_DEPEND} media-fonts/noto-emoji " PDEPEND=" - >=kde-plasma/xdg-desktop-portal-kde-${PVCUT}:6 + >=kde-plasma/xdg-desktop-portal-kde-${KDE_CATV}:6 " BDEPEND=" >=dev-qt/qtwayland-${QTMIN}:6 diff --git a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild index 883496b0aaf..3f312f9da0e 100644 --- a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild +++ b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 KF5MIN=5.115.0 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QT5MIN=5.15.12 QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -72,7 +71,7 @@ RDEPEND="${COMMON_DEPEND} media-fonts/noto-emoji " PDEPEND=" - >=kde-plasma/xdg-desktop-portal-kde-${PVCUT}:6 + >=kde-plasma/xdg-desktop-portal-kde-${KDE_CATV}:6 " BDEPEND=" >=dev-qt/qtwayland-${QTMIN}:6 diff --git a/kde-plasma/plasma-nm/plasma-nm-6.2.49.9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-6.2.49.9999.ebuild index 94ea592efd2..938c3f59e64 100644 --- a/kde-plasma/plasma-nm/plasma-nm-6.2.49.9999.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_TEST="true" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -39,7 +38,7 @@ DEPEND=" >=kde-frameworks/modemmanager-qt-${KFMIN}:6 >=kde-frameworks/networkmanager-qt-${KFMIN}:6[teamd=] >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 net-misc/mobile-broadband-provider-info net-misc/networkmanager[teamd=] openconnect? ( diff --git a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild index 08af5fdc778..cafda8b7516 100644 --- a/kde-plasma/plasma-nm/plasma-nm-9999.ebuild +++ b/kde-plasma/plasma-nm/plasma-nm-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_TEST="true" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -39,7 +38,7 @@ DEPEND=" >=kde-frameworks/modemmanager-qt-${KFMIN}:6 >=kde-frameworks/networkmanager-qt-${KFMIN}:6[teamd=] >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 net-misc/mobile-broadband-provider-info net-misc/networkmanager[teamd=] openconnect? ( diff --git a/kde-plasma/plasma-pa/plasma-pa-6.2.49.9999.ebuild b/kde-plasma/plasma-pa/plasma-pa-6.2.49.9999.ebuild index 80ef338d99e..115eff9e199 100644 --- a/kde-plasma/plasma-pa/plasma-pa-6.2.49.9999.ebuild +++ b/kde-plasma/plasma-pa/plasma-pa-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -30,7 +29,7 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 >=kde-frameworks/ksvg-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 media-libs/libcanberra media-libs/libpulse >=media-libs/pulseaudio-qt-1.6.0:= diff --git a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild index 035686b0e45..79d5634d284 100644 --- a/kde-plasma/plasma-pa/plasma-pa-9999.ebuild +++ b/kde-plasma/plasma-pa/plasma-pa-9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -31,7 +30,7 @@ DEPEND=" >=kde-frameworks/ki18n-${KFMIN}:6 >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 >=kde-frameworks/ksvg-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 media-libs/libcanberra media-libs/libpulse >=media-libs/pulseaudio-qt-1.6.0:= diff --git a/kde-plasma/plasma-sdk/plasma-sdk-6.2.49.9999.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-6.2.49.9999.ebuild index 97f2637748b..8a695803333 100644 --- a/kde-plasma/plasma-sdk/plasma-sdk-6.2.49.9999.ebuild +++ b/kde-plasma/plasma-sdk/plasma-sdk-6.2.49.9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -34,8 +33,8 @@ DEPEND=" >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/ktexteditor-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma5support-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma5support-${KDE_CATV}:6 " RDEPEND="${DEPEND} >=dev-qt/qt5compat-${QTMIN}:6[qml] diff --git a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild index 4815650a068..825b231bbe8 100644 --- a/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild +++ b/kde-plasma/plasma-sdk/plasma-sdk-9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -34,8 +33,8 @@ DEPEND=" >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/ktexteditor-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma5support-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma5support-${KDE_CATV}:6 " RDEPEND="${DEPEND} >=dev-qt/qt5compat-${QTMIN}:6[qml] diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.2.49.9999.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.2.49.9999.ebuild index 33c297488af..47d84291805 100644 --- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.2.49.9999.ebuild +++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-6.2.49.9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-3) KFMIN=6.6.0 QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -33,11 +32,11 @@ DEPEND=" >=kde-frameworks/kpackage-${KFMIN}:6 >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 " RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/kitemmodels-${KFMIN}:6 >=kde-frameworks/kquickcharts-${KFMIN}:6 - >=kde-plasma/ksystemstats-${PVCUT}:6 + >=kde-plasma/ksystemstats-${KDE_CATV}:6 " diff --git a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-9999.ebuild b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-9999.ebuild index cb260f72685..eb00709c5e5 100644 --- a/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-9999.ebuild +++ b/kde-plasma/plasma-systemmonitor/plasma-systemmonitor-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-3) KFMIN=9999 QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -33,11 +32,11 @@ DEPEND=" >=kde-frameworks/kpackage-${KFMIN}:6 >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 " RDEPEND="${DEPEND} >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/kitemmodels-${KFMIN}:6 >=kde-frameworks/kquickcharts-${KFMIN}:6 - >=kde-plasma/ksystemstats-${PVCUT}:6 + >=kde-plasma/ksystemstats-${KDE_CATV}:6 " diff --git a/kde-plasma/plasma-vault/plasma-vault-6.2.49.9999.ebuild b/kde-plasma/plasma-vault/plasma-vault-6.2.49.9999.ebuild index 244bdd51e63..b418a8cc328 100644 --- a/kde-plasma/plasma-vault/plasma-vault-6.2.49.9999.ebuild +++ b/kde-plasma/plasma-vault/plasma-vault-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm flag-o-matic plasma.kde.org @@ -29,9 +28,9 @@ DEPEND=" >=kde-frameworks/kitemmodels-${KFMIN}:6 >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) " RDEPEND="${DEPEND} diff --git a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild index 4236725bbf6..92bfc574628 100644 --- a/kde-plasma/plasma-vault/plasma-vault-9999.ebuild +++ b/kde-plasma/plasma-vault/plasma-vault-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm flag-o-matic plasma.kde.org @@ -29,9 +28,9 @@ DEPEND=" >=kde-frameworks/kitemmodels-${KFMIN}:6 >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 networkmanager? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) " RDEPEND="${DEPEND} diff --git a/kde-plasma/plasma-welcome/plasma-welcome-6.2.49.9999.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-6.2.49.9999.ebuild index fabe1cf75db..5eb6674a321 100644 --- a/kde-plasma/plasma-welcome/plasma-welcome-6.2.49.9999.ebuild +++ b/kde-plasma/plasma-welcome/plasma-welcome-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -32,6 +31,6 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 " RDEPEND="${DEPEND}" diff --git a/kde-plasma/plasma-welcome/plasma-welcome-9999.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-9999.ebuild index 0fcd8a2c135..07253efa602 100644 --- a/kde-plasma/plasma-welcome/plasma-welcome-9999.ebuild +++ b/kde-plasma/plasma-welcome/plasma-welcome-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -32,6 +31,6 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/ksvg-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 " RDEPEND="${DEPEND}" diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.2.49.9999.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.2.49.9999.ebuild index 9afd8580d87..f957b1266d2 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.2.49.9999.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-6.2.49.9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit cmake plasma.kde.org diff --git a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild index 9afd8580d87..f957b1266d2 100644 --- a/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild +++ b/kde-plasma/plasma-workspace-wallpapers/plasma-workspace-wallpapers-9999.ebuild @@ -3,7 +3,6 @@ EAPI=8 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit cmake plasma.kde.org diff --git a/kde-plasma/plasma-workspace/plasma-workspace-6.2.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-6.2.49.9999.ebuild index e4e2f9c8f06..ff03edca08a 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-6.2.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-6.2.49.9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="forceoptional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -73,17 +72,17 @@ COMMON_DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:6 >=kde-frameworks/prison-${KFMIN}:6[qml] >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/breeze-${PVCUT}:6 - >=kde-plasma/kscreenlocker-${PVCUT}:6 - >=kde-plasma/kwayland-${PVCUT}:6 - >=kde-plasma/kwin-${PVCUT}:6 - >=kde-plasma/layer-shell-qt-${PVCUT}:6 - >=kde-plasma/libkscreen-${PVCUT}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-activities-stats-${PVCUT}:6 - >=kde-plasma/plasma5support-${PVCUT}:6 + >=kde-plasma/breeze-${KDE_CATV}:6 + >=kde-plasma/kscreenlocker-${KDE_CATV}:6 + >=kde-plasma/kwayland-${KDE_CATV}:6 + >=kde-plasma/kwin-${KDE_CATV}:6 + >=kde-plasma/layer-shell-qt-${KDE_CATV}:6 + >=kde-plasma/libkscreen-${KDE_CATV}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-stats-${KDE_CATV}:6 + >=kde-plasma/plasma5support-${KDE_CATV}:6 media-libs/libcanberra >=media-libs/phonon-4.12.0[qt6(+)] sci-libs/libqalculate:= @@ -115,7 +114,7 @@ COMMON_DEPEND=" ) screencast? ( >=dev-qt/qtbase-${QTMIN}:6=[opengl] - >=kde-plasma/kpipewire-${PVCUT}:6 + >=kde-plasma/kpipewire-${KDE_CATV}:6 media-libs/libglvnd >=media-video/pipewire-0.3:= x11-libs/libdrm @@ -143,11 +142,11 @@ RDEPEND="${COMMON_DEPEND} kde-apps/kio-extras:6 >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/kquickcharts-${KFMIN}:6 - >=kde-plasma/kactivitymanagerd-${PVCUT}:6 - >=kde-plasma/kdesu-gui-${PVCUT}:* - >=kde-plasma/milou-${PVCUT}:6 - >=kde-plasma/plasma-integration-${PVCUT}:6 - >=kde-plasma/plasma-login-sessions-${PVCUT}:6 + >=kde-plasma/kactivitymanagerd-${KDE_CATV}:6 + >=kde-plasma/kdesu-gui-${KDE_CATV}:* + >=kde-plasma/milou-${KDE_CATV}:6 + >=kde-plasma/plasma-integration-${KDE_CATV}:6 + >=kde-plasma/plasma-login-sessions-${KDE_CATV}:6 sys-apps/dbus x11-apps/xmessage x11-apps/xprop diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 6ec83cfb9e2..59e3bb584da 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="optional" ECM_TEST="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -73,17 +72,17 @@ COMMON_DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:6 >=kde-frameworks/prison-${KFMIN}:6[qml] >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/breeze-${PVCUT}:6 - >=kde-plasma/kscreenlocker-${PVCUT}:6 - >=kde-plasma/kwayland-${PVCUT}:6 - >=kde-plasma/kwin-${PVCUT}:6 - >=kde-plasma/layer-shell-qt-${PVCUT}:6 - >=kde-plasma/libkscreen-${PVCUT}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-activities-stats-${PVCUT}:6 - >=kde-plasma/plasma5support-${PVCUT}:6 + >=kde-plasma/breeze-${KDE_CATV}:6 + >=kde-plasma/kscreenlocker-${KDE_CATV}:6 + >=kde-plasma/kwayland-${KDE_CATV}:6 + >=kde-plasma/kwin-${KDE_CATV}:6 + >=kde-plasma/layer-shell-qt-${KDE_CATV}:6 + >=kde-plasma/libkscreen-${KDE_CATV}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-stats-${KDE_CATV}:6 + >=kde-plasma/plasma5support-${KDE_CATV}:6 media-libs/libcanberra >=media-libs/phonon-4.12.0[qt6(+)] sci-libs/libqalculate:= @@ -141,11 +140,11 @@ RDEPEND="${COMMON_DEPEND} kde-apps/kio-extras:6 >=kde-frameworks/kirigami-${KFMIN}:6 >=kde-frameworks/kquickcharts-${KFMIN}:6 - >=kde-plasma/kactivitymanagerd-${PVCUT}:6 - >=kde-plasma/kdesu-gui-${PVCUT}:* - >=kde-plasma/milou-${PVCUT}:6 - >=kde-plasma/plasma-integration-${PVCUT}:6 - >=kde-plasma/plasma-login-sessions-${PVCUT}:6 + >=kde-plasma/kactivitymanagerd-${KDE_CATV}:6 + >=kde-plasma/kdesu-gui-${KDE_CATV}:* + >=kde-plasma/milou-${KDE_CATV}:6 + >=kde-plasma/plasma-integration-${KDE_CATV}:6 + >=kde-plasma/plasma-login-sessions-${KDE_CATV}:6 sys-apps/dbus x11-apps/xmessage x11-apps/xprop diff --git a/kde-plasma/plasma5support/plasma5support-6.2.49.9999.ebuild b/kde-plasma/plasma5support/plasma5support-6.2.49.9999.ebuild index 5db165684be..8010fb33904 100644 --- a/kde-plasma/plasma5support/plasma5support-6.2.49.9999.ebuild +++ b/kde-plasma/plasma5support/plasma5support-6.2.49.9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_QTHELP="true" ECM_TEST="true" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -30,7 +29,7 @@ DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:6 >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 " RDEPEND="${DEPEND} !kde-plasma/plasma-workspace:5 diff --git a/kde-plasma/plasma5support/plasma5support-9999.ebuild b/kde-plasma/plasma5support/plasma5support-9999.ebuild index 74083f707dd..966041de507 100644 --- a/kde-plasma/plasma5support/plasma5support-9999.ebuild +++ b/kde-plasma/plasma5support/plasma5support-9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_QTHELP="true" ECM_TEST="true" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -31,7 +30,7 @@ DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:6 >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/libksysguard-${PVCUT}:6 + >=kde-plasma/libksysguard-${KDE_CATV}:6 geolocation? ( >=kde-frameworks/networkmanager-qt-${KFMIN}:6 ) X? ( x11-libs/libX11 ) " diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-6.2.49.9999.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-6.2.49.9999.ebuild index 552ee14a0e5..bb6da19f7dc 100644 --- a/kde-plasma/plymouth-kcm/plymouth-kcm-6.2.49.9999.ebuild +++ b/kde-plasma/plymouth-kcm/plymouth-kcm-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org diff --git a/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild b/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild index cd50eb7ad8c..46086ffa887 100644 --- a/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild +++ b/kde-plasma/plymouth-kcm/plymouth-kcm-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.2.49.9999.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.2.49.9999.ebuild index c99163b6830..078cb5c4a83 100644 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.2.49.9999.ebuild +++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 KDE_ORG_NAME="${PN}-1" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -30,5 +29,5 @@ DEPEND=" RDEPEND="${DEPEND} >=dev-qt/qt5compat-${QTMIN}:6[qml] >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 " diff --git a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild index 04f9de6b660..13b902ef7d4 100644 --- a/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild +++ b/kde-plasma/polkit-kde-agent/polkit-kde-agent-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 KDE_ORG_NAME="${PN}-1" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -30,5 +29,5 @@ DEPEND=" RDEPEND="${DEPEND} >=dev-qt/qt5compat-${QTMIN}:6[qml] >=kde-frameworks/kirigami-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 " diff --git a/kde-plasma/powerdevil/powerdevil-6.2.49.9999.ebuild b/kde-plasma/powerdevil/powerdevil-6.2.49.9999.ebuild index 635572f81d5..0319d640e11 100644 --- a/kde-plasma/powerdevil/powerdevil-6.2.49.9999.ebuild +++ b/kde-plasma/powerdevil/powerdevil-6.2.49.9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm fcaps plasma.kde.org @@ -44,10 +43,10 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] >=kde-frameworks/kxmlgui-${KFMIN}:6 >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/libkscreen-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-workspace-${PVCUT}:6 + >=kde-plasma/libkscreen-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 + >=kde-plasma/plasma-workspace-${KDE_CATV}:6 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) diff --git a/kde-plasma/powerdevil/powerdevil-9999.ebuild b/kde-plasma/powerdevil/powerdevil-9999.ebuild index 44db8b6d878..d2fccec6872 100644 --- a/kde-plasma/powerdevil/powerdevil-9999.ebuild +++ b/kde-plasma/powerdevil/powerdevil-9999.ebuild @@ -6,7 +6,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm fcaps plasma.kde.org @@ -44,10 +43,10 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] >=kde-frameworks/kxmlgui-${KFMIN}:6 >=kde-frameworks/solid-${KFMIN}:6 - >=kde-plasma/libkscreen-${PVCUT}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 - >=kde-plasma/plasma-workspace-${PVCUT}:6 + >=kde-plasma/libkscreen-${KDE_CATV}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 + >=kde-plasma/plasma-workspace-${KDE_CATV}:6 virtual/libudev:= x11-libs/libxcb brightness-control? ( app-misc/ddcutil:= ) diff --git a/kde-plasma/print-manager/print-manager-6.2.49.9999.ebuild b/kde-plasma/print-manager/print-manager-6.2.49.9999.ebuild index 03ad738c880..f49c569018e 100644 --- a/kde-plasma/print-manager/print-manager-6.2.49.9999.ebuild +++ b/kde-plasma/print-manager/print-manager-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -32,7 +31,7 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 >=net-print/cups-2.4 " RDEPEND="${DEPEND} diff --git a/kde-plasma/print-manager/print-manager-9999.ebuild b/kde-plasma/print-manager/print-manager-9999.ebuild index b5502ea4544..eb7de1f7b8e 100644 --- a/kde-plasma/print-manager/print-manager-9999.ebuild +++ b/kde-plasma/print-manager/print-manager-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -32,7 +31,7 @@ DEPEND=" >=kde-frameworks/kservice-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 >=net-print/cups-2.4 " RDEPEND="${DEPEND} diff --git a/kde-plasma/sddm-kcm/sddm-kcm-6.2.49.9999.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-6.2.49.9999.ebuild index ec887bea270..0443a1a8caf 100644 --- a/kde-plasma/sddm-kcm/sddm-kcm-6.2.49.9999.ebuild +++ b/kde-plasma/sddm-kcm/sddm-kcm-6.2.49.9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org diff --git a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild index 8f98a06b28f..28eaa9613d2 100644 --- a/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild +++ b/kde-plasma/sddm-kcm/sddm-kcm-9999.ebuild @@ -4,7 +4,6 @@ EAPI=8 KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org diff --git a/kde-plasma/systemsettings/systemsettings-6.2.49.9999.ebuild b/kde-plasma/systemsettings/systemsettings-6.2.49.9999.ebuild index 69aa1b26263..b785d1d9f72 100644 --- a/kde-plasma/systemsettings/systemsettings-6.2.49.9999.ebuild +++ b/kde-plasma/systemsettings/systemsettings-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_HANDBOOK="optional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org optfeature @@ -40,7 +39,7 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 " RDEPEND="${DEPEND}" diff --git a/kde-plasma/systemsettings/systemsettings-9999.ebuild b/kde-plasma/systemsettings/systemsettings-9999.ebuild index 8c3682c6449..ab222596b0d 100644 --- a/kde-plasma/systemsettings/systemsettings-9999.ebuild +++ b/kde-plasma/systemsettings/systemsettings-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_HANDBOOK="optional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org optfeature @@ -40,7 +39,7 @@ DEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-plasma/plasma-activities-${PVCUT}:6 + >=kde-plasma/plasma-activities-${KDE_CATV}:6 " RDEPEND="${DEPEND}" diff --git a/kde-plasma/wacomtablet/wacomtablet-6.2.49.9999.ebuild b/kde-plasma/wacomtablet/wacomtablet-6.2.49.9999.ebuild index 716fee764cd..c4ac3ca602c 100644 --- a/kde-plasma/wacomtablet/wacomtablet-6.2.49.9999.ebuild +++ b/kde-plasma/wacomtablet/wacomtablet-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -34,8 +33,8 @@ RDEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma5support-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma5support-${KDE_CATV}:6 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb diff --git a/kde-plasma/wacomtablet/wacomtablet-9999.ebuild b/kde-plasma/wacomtablet/wacomtablet-9999.ebuild index 40303be09cd..e1a5d7b4cf0 100644 --- a/kde-plasma/wacomtablet/wacomtablet-9999.ebuild +++ b/kde-plasma/wacomtablet/wacomtablet-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_HANDBOOK="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -34,8 +33,8 @@ RDEPEND=" >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 >=kde-frameworks/kxmlgui-${KFMIN}:6 - >=kde-plasma/libplasma-${PVCUT}:6 - >=kde-plasma/plasma5support-${PVCUT}:6 + >=kde-plasma/libplasma-${KDE_CATV}:6 + >=kde-plasma/plasma5support-${KDE_CATV}:6 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libXi x11-libs/libxcb diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.2.49.9999.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.2.49.9999.ebuild index 1c5176ec64d..c725aa1a0cb 100644 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.2.49.9999.ebuild +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-6.2.49.9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_TEST="forceoptional" KFMIN=6.6.0 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -42,8 +41,8 @@ COMMON_DEPEND=" >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/kwayland-${PVCUT}:6 - >=kde-plasma/plasma-workspace-${PVCUT}:6 + >=kde-plasma/kwayland-${KDE_CATV}:6 + >=kde-plasma/plasma-workspace-${KDE_CATV}:6 x11-libs/libxkbcommon " DEPEND="${COMMON_DEPEND} diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild index c10d0ad162b..83f648ed34e 100644 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-9999.ebuild @@ -5,7 +5,6 @@ EAPI=8 ECM_TEST="forceoptional" KFMIN=9999 -PVCUT=$(ver_cut 1-3) QTMIN=6.7.2 inherit ecm plasma.kde.org @@ -42,8 +41,8 @@ COMMON_DEPEND=" >=kde-frameworks/kstatusnotifieritem-${KFMIN}:6 >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-plasma/kwayland-${PVCUT}:6 - >=kde-plasma/plasma-workspace-${PVCUT}:6 + >=kde-plasma/kwayland-${KDE_CATV}:6 + >=kde-plasma/plasma-workspace-${KDE_CATV}:6 x11-libs/libxkbcommon " DEPEND="${COMMON_DEPEND} From c991c3306f2dd1ddc5134368b24e5cd7d318b6e3 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Thu, 12 Dec 2024 01:36:05 +0100 Subject: [PATCH 5/5] kde-misc/kdiff3: Update dependencies Upstream commits: 342924de5000a2821736f2c4cd58f92c6ad9c159 5d1a1befaaed30396b36bdd77ffc40917a58ca67 c478d24b47bacc71914e4e91a5facddb37801c8d Signed-off-by: Andreas Sturmlechner --- kde-misc/kdiff3/kdiff3-9999.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-misc/kdiff3/kdiff3-9999.ebuild b/kde-misc/kdiff3/kdiff3-9999.ebuild index 3d0f86dc0ee..7c57fe8e301 100644 --- a/kde-misc/kdiff3/kdiff3-9999.ebuild +++ b/kde-misc/kdiff3/kdiff3-9999.ebuild @@ -4,8 +4,8 @@ EAPI=8 ECM_HANDBOOK="optional" -KFMIN=6.3.0 -QTMIN=6.6.2 +KFMIN=6.6.0 +QTMIN=6.7.2 inherit ecm kde.org DESCRIPTION="Frontend to diff3 based on KDE Frameworks" @@ -17,7 +17,7 @@ KEYWORDS="" IUSE="" COMMON_DEPEND=" - >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-libs/icu-70.0:= >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] >=kde-frameworks/kconfig-${KFMIN}:6 >=kde-frameworks/kconfigwidgets-${KFMIN}:6