commit: 94160dfc90d6bc716483575d6f07b00963121a53
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 5 22:58:18 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 18 19:49:20 2025 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=94160dfc
kde-plasma/plasma-integration: IUSE qt5 got split off into SLOT:5
No IUSE mask makes handling the final cleanup of KF5/Qt5 a bit nicer.
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/plasma.kde.org.eclass | 1 +
.../plasma-integration-6.5.49.9999.ebuild | 33 +++-------------------
.../plasma-integration-9999.ebuild | 33 +++-------------------
3 files changed, 9 insertions(+), 58 deletions(-)
diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass
index 22fe8e1d90..4b21d4f60b 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -91,6 +91,7 @@ if [[ ${_PSLOT} == 6 ]]; then
oxygen | \
plasma-activities | \
plasma-activities-stats | \
+ plasma-integration | \
plasma5support | \
print-manager) ;;
*) RDEPEND+=" !kde-plasma/${PN}:5" ;;
diff --git
a/kde-plasma/plasma-integration/plasma-integration-6.5.49.9999.ebuild
b/kde-plasma/plasma-integration/plasma-integration-6.5.49.9999.ebuild
index d436522d7c..61ded45e89 100644
--- a/kde-plasma/plasma-integration/plasma-integration-6.5.49.9999.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-6.5.49.9999.ebuild
@@ -3,9 +3,7 @@
EAPI=8
-KF5MIN=5.116.0
KFMIN=6.18.0
-QT5MIN=5.15.17
QTMIN=6.9.1
inherit ecm plasma.kde.org xdg
@@ -14,7 +12,7 @@ DESCRIPTION="Qt Platform Theme integration plugins for the
Plasma workspaces"
LICENSE="LGPL-2+"
SLOT="6"
KEYWORDS=""
-IUSE="qt5"
+IUSE=""
# requires running kde environment
RESTRICT="test"
@@ -39,48 +37,25 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
x11-libs/libXcursor
x11-libs/libxcb
- qt5? (
- >=dev-qt/qtdbus-${QT5MIN}:5
- >=dev-qt/qtgui-${QT5MIN}:5=[dbus]
- >=dev-qt/qtquickcontrols2-${QT5MIN}:5
- >=dev-qt/qtwayland-${QT5MIN}:5
- >=dev-qt/qtwidgets-${QT5MIN}:5
- >=dev-qt/qtx11extras-${QT5MIN}:5
- >=kde-frameworks/kcompletion-${KF5MIN}:5
- >=kde-frameworks/kconfig-${KF5MIN}:5
- >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
- >=kde-frameworks/kcoreaddons-${KF5MIN}:5
- >=kde-frameworks/kguiaddons-${KF5MIN}:5
- >=kde-frameworks/ki18n-${KF5MIN}:5
- >=kde-frameworks/kiconthemes-${KF5MIN}:5
- >=kde-frameworks/kio-${KF5MIN}:5
- >=kde-frameworks/kjobwidgets-${KF5MIN}:5
- >=kde-frameworks/knotifications-${KF5MIN}:5
- >=kde-frameworks/kwindowsystem-${KF5MIN}:5
- >=kde-frameworks/kxmlgui-${KF5MIN}:5
- >=kde-plasma/kwayland-${KF5MIN}:5
- )
"
DEPEND="${COMMON_DEPEND}
>=dev-libs/plasma-wayland-protocols-1.19.0
"
RDEPEND="${COMMON_DEPEND}
+ !<${CATEGORY}/${PN}-6.5.0:5
media-fonts/hack
media-fonts/noto
media-fonts/noto-emoji
"
RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
PDEPEND=">=kde-plasma/xdg-desktop-portal-kde-${KDE_CATV}:6"
-BDEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[wayland]
- qt5? ( >=dev-qt/qtwaylandscanner-${QT5MIN}:5 )
-"
+BDEPEND=">=dev-qt/qtbase-${QTMIN}:6[wayland]"
BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
src_configure() {
local mycmakeargs=(
-DBUILD_QT6=ON
- -DBUILD_QT5=$(usex qt5)
+ -DBUILD_QT5=OFF
)
ecm_src_configure
}
diff --git a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
index f0975cff2c..e5f5361e48 100644
--- a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
+++ b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild
@@ -3,9 +3,7 @@
EAPI=8
-KF5MIN=5.116.0
KFMIN=9999
-QT5MIN=5.15.17
QTMIN=6.9.1
inherit ecm plasma.kde.org xdg
@@ -14,7 +12,7 @@ DESCRIPTION="Qt Platform Theme integration plugins for the
Plasma workspaces"
LICENSE="LGPL-2+"
SLOT="6"
KEYWORDS=""
-IUSE="qt5"
+IUSE=""
# requires running kde environment
RESTRICT="test"
@@ -39,48 +37,25 @@ COMMON_DEPEND="
>=kde-frameworks/kxmlgui-${KFMIN}:6
x11-libs/libXcursor
x11-libs/libxcb
- qt5? (
- >=dev-qt/qtdbus-${QT5MIN}:5
- >=dev-qt/qtgui-${QT5MIN}:5=[dbus]
- >=dev-qt/qtquickcontrols2-${QT5MIN}:5
- >=dev-qt/qtwayland-${QT5MIN}:5
- >=dev-qt/qtwidgets-${QT5MIN}:5
- >=dev-qt/qtx11extras-${QT5MIN}:5
- >=kde-frameworks/kcompletion-${KF5MIN}:5
- >=kde-frameworks/kconfig-${KF5MIN}:5
- >=kde-frameworks/kconfigwidgets-${KF5MIN}:5
- >=kde-frameworks/kcoreaddons-${KF5MIN}:5
- >=kde-frameworks/kguiaddons-${KF5MIN}:5
- >=kde-frameworks/ki18n-${KF5MIN}:5
- >=kde-frameworks/kiconthemes-${KF5MIN}:5
- >=kde-frameworks/kio-${KF5MIN}:5
- >=kde-frameworks/kjobwidgets-${KF5MIN}:5
- >=kde-frameworks/knotifications-${KF5MIN}:5
- >=kde-frameworks/kwindowsystem-${KF5MIN}:5
- >=kde-frameworks/kxmlgui-${KF5MIN}:5
- >=kde-plasma/kwayland-${KF5MIN}:5
- )
"
DEPEND="${COMMON_DEPEND}
>=dev-libs/plasma-wayland-protocols-1.19.0
"
RDEPEND="${COMMON_DEPEND}
+ !<${CATEGORY}/${PN}-6.5.0:5
media-fonts/hack
media-fonts/noto
media-fonts/noto-emoji
"
RDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
PDEPEND=">=kde-plasma/xdg-desktop-portal-kde-${KDE_CATV}:6"
-BDEPEND="
- >=dev-qt/qtbase-${QTMIN}:6[wayland]
- qt5? ( >=dev-qt/qtwaylandscanner-${QT5MIN}:5 )
-"
+BDEPEND=">=dev-qt/qtbase-${QTMIN}:6[wayland]"
BDEPEND+=" || ( >=dev-qt/qtbase-6.10:6[wayland] <dev-qt/qtwayland-6.10:6 )"
src_configure() {
local mycmakeargs=(
-DBUILD_QT6=ON
- -DBUILD_QT5=$(usex qt5)
+ -DBUILD_QT5=OFF
)
ecm_src_configure
}
