diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass index dfbaea88b096..4b21d4f60bd5 100644 --- a/eclass/plasma.kde.org.eclass +++ b/eclass/plasma.kde.org.eclass @@ -82,13 +82,16 @@ fi if [[ ${_PSLOT} == 6 ]]; then case ${PN} in + breeze | \ kglobalacceld | \ kwayland | \ kwayland-integration | \ libplasma | \ ocean-sound-theme | \ + oxygen | \ plasma-activities | \ plasma-activities-stats | \ + plasma-integration | \ plasma5support | \ print-manager) ;; *) RDEPEND+=" !kde-plasma/${PN}:5" ;; diff --git a/kde-plasma/breeze/breeze-6.4.5.ebuild b/kde-plasma/breeze/breeze-6.4.5.ebuild index bcfc78e3f8d3..398346bc8b9f 100644 --- a/kde-plasma/breeze/breeze-6.4.5.ebuild +++ b/kde-plasma/breeze/breeze-6.4.5.ebuild @@ -18,7 +18,7 @@ KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv ~x86" IUSE="qt5" # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras -RDEPEND=" +DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtsvg-${QTMIN}:6 @@ -54,7 +54,9 @@ RDEPEND=" >=kde-frameworks/kwindowsystem-${KF5MIN}:5 ) " -DEPEND="${RDEPEND}" +RDEPEND="${DEPEND} + !kde-plasma/${PN}:5 +" BDEPEND=" >=kde-frameworks/kcmutils-${KFMIN}:6 qt5? ( >=kde-frameworks/kcmutils-${KF5MIN}:5 ) diff --git a/kde-plasma/breeze/breeze-6.5.2.ebuild b/kde-plasma/breeze/breeze-6.5.2.ebuild index 4dcde75ca41d..4c72f48a3b6a 100644 --- a/kde-plasma/breeze/breeze-6.5.2.ebuild +++ b/kde-plasma/breeze/breeze-6.5.2.ebuild @@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" IUSE="qt5" # kde-frameworks/kwindowsystem[X]: Unconditional use of KX11Extras -RDEPEND=" +DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] >=dev-qt/qtdeclarative-${QTMIN}:6 >=dev-qt/qtsvg-${QTMIN}:6 @@ -54,7 +54,9 @@ RDEPEND=" >=kde-frameworks/kwindowsystem-${KF5MIN}:5 ) " -DEPEND="${RDEPEND}" +RDEPEND="${DEPEND} + !kde-plasma/${PN}:5 +" BDEPEND=" >=kde-frameworks/kcmutils-${KFMIN}:6 qt5? ( >=kde-frameworks/kcmutils-${KF5MIN}:5 ) diff --git a/kde-plasma/oxygen/oxygen-6.4.5.ebuild b/kde-plasma/oxygen/oxygen-6.4.5.ebuild index 1f78dbd43058..ea9f17217bf9 100644 --- a/kde-plasma/oxygen/oxygen-6.4.5.ebuild +++ b/kde-plasma/oxygen/oxygen-6.4.5.ebuild @@ -58,6 +58,7 @@ DEPEND="${COMMON_DEPEND} >=kde-frameworks/kservice-${KFMIN}:6 " RDEPEND="${COMMON_DEPEND} + !kde-plasma/${PN}:5 !=dev-qt/qtsvg-${QTMIN}:6 " diff --git a/kde-plasma/oxygen/oxygen-6.5.2.ebuild b/kde-plasma/oxygen/oxygen-6.5.2.ebuild index a8e25dbf8d09..1d881162903c 100644 --- a/kde-plasma/oxygen/oxygen-6.5.2.ebuild +++ b/kde-plasma/oxygen/oxygen-6.5.2.ebuild @@ -58,6 +58,7 @@ DEPEND="${COMMON_DEPEND} >=kde-frameworks/kservice-${KFMIN}:6 " RDEPEND="${COMMON_DEPEND} + !kde-plasma/${PN}:5 !=dev-qt/qtsvg-${QTMIN}:6 " diff --git a/kde-plasma/plasma-integration/plasma-integration-6.4.5.ebuild b/kde-plasma/plasma-integration/plasma-integration-6.4.5.ebuild index e8bb3890b0e8..de74fcfa81ff 100644 --- a/kde-plasma/plasma-integration/plasma-integration-6.4.5.ebuild +++ b/kde-plasma/plasma-integration/plasma-integration-6.4.5.ebuild @@ -65,6 +65,7 @@ DEPEND="${COMMON_DEPEND} >=dev-libs/plasma-wayland-protocols-1.18.0 " RDEPEND="${COMMON_DEPEND} + !kde-plasma/${PN}:5 media-fonts/hack media-fonts/noto media-fonts/noto-emoji diff --git a/kde-plasma/plasma-integration/plasma-integration-6.5.2.ebuild b/kde-plasma/plasma-integration/plasma-integration-6.5.2.ebuild index ec56888005fe..13e3d5eecdd0 100644 --- a/kde-plasma/plasma-integration/plasma-integration-6.5.2.ebuild +++ b/kde-plasma/plasma-integration/plasma-integration-6.5.2.ebuild @@ -65,6 +65,7 @@ DEPEND="${COMMON_DEPEND} >=dev-libs/plasma-wayland-protocols-1.19.0 " RDEPEND="${COMMON_DEPEND} + !kde-plasma/${PN}:5 media-fonts/hack media-fonts/noto media-fonts/noto-emoji