kde-plasma: Drop PVCUT and replace w/ eclass-provided KDE_CATV

Signed-off-by: Andreas Sturmlechner <[email protected]>
a17r · Dec 12, 2024 · c629431 · c629431
1 parent e023b5c
commit c629431
Show file tree

Hide file tree

Showing 79 changed files with 166 additions and 245 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
     EAPI=8
-    PVCUT=$(ver_cut 1-3)
     inherit plasma.kde.org
     DESCRIPTION="Breeze theme for GRUB"
@@ Expand Down @@