commit: 3dd33e94c04fdac142d0e2c2b15c93a552ceeaba
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 5 22:42:57 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Nov 18 19:48:26 2025 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=3dd33e94
kde-plasma/oxygen: 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 +
kde-plasma/oxygen/oxygen-6.5.49.9999.ebuild | 23 +++--------------------
kde-plasma/oxygen/oxygen-9999.ebuild | 23 +++--------------------
3 files changed, 7 insertions(+), 40 deletions(-)
diff --git a/eclass/plasma.kde.org.eclass b/eclass/plasma.kde.org.eclass
index 9f16c6520b..22fe8e1d90 100644
--- a/eclass/plasma.kde.org.eclass
+++ b/eclass/plasma.kde.org.eclass
@@ -88,6 +88,7 @@ if [[ ${_PSLOT} == 6 ]]; then
kwayland-integration | \
libplasma | \
ocean-sound-theme | \
+ oxygen | \
plasma-activities | \
plasma-activities-stats | \
plasma5support | \
diff --git a/kde-plasma/oxygen/oxygen-6.5.49.9999.ebuild
b/kde-plasma/oxygen/oxygen-6.5.49.9999.ebuild
index eca2ffc7da..1bce14415e 100644
--- a/kde-plasma/oxygen/oxygen-6.5.49.9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-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
@@ -15,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen";
LICENSE="GPL-2" # TODO: CHECK
SLOT="6"
KEYWORDS=""
-IUSE="qt5 X"
+IUSE="X"
# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
COMMON_DEPEND="
@@ -33,22 +31,6 @@ COMMON_DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:6
>=kde-plasma/kdecoration-${KDE_CATV}:6
>=kde-plasma/libplasma-${KDE_CATV}:6
- qt5? (
- >=dev-qt/qtdbus-${QT5MIN}:5
- >=dev-qt/qtdeclarative-${QT5MIN}:5
- >=dev-qt/qtgui-${QT5MIN}:5
- >=dev-qt/qtwidgets-${QT5MIN}:5
- >=kde-frameworks/frameworkintegration-${KF5MIN}: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/kwidgetsaddons-${KF5MIN}:5
- >=kde-frameworks/kwindowsystem-${KF5MIN}:5
- X? ( >=dev-qt/qtx11extras-${QT5MIN}:5 )
- )
X? (
>=dev-qt/qtbase-${QTMIN}:6=[gui]
x11-libs/libxcb
@@ -59,13 +41,14 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!<kde-plasma/libplasma-6.1.90:*[-kf6compat(-)]
+ !<${CATEGORY}/${PN}-6.5.0:5
>=dev-qt/qtsvg-${QTMIN}:6
"
src_configure() {
local mycmakeargs=(
-DBUILD_QT6=ON
- -DBUILD_QT5=$(usex qt5)
+ -DBUILD_QT5=OFF
$(cmake_use_find_package X XCB)
)
ecm_src_configure
diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild
b/kde-plasma/oxygen/oxygen-9999.ebuild
index f5127c0009..88455c1bd0 100644
--- a/kde-plasma/oxygen/oxygen-9999.ebuild
+++ b/kde-plasma/oxygen/oxygen-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
@@ -15,7 +13,7 @@ HOMEPAGE="https://invent.kde.org/plasma/oxygen";
LICENSE="GPL-2" # TODO: CHECK
SLOT="6"
KEYWORDS=""
-IUSE="qt5 X"
+IUSE="X"
# slot op: Uses Qt6::GuiPrivate for qtx11extras_p.h
COMMON_DEPEND="
@@ -33,22 +31,6 @@ COMMON_DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:6
>=kde-plasma/kdecoration-${KDE_CATV}:6
>=kde-plasma/libplasma-${KDE_CATV}:6
- qt5? (
- >=dev-qt/qtdbus-${QT5MIN}:5
- >=dev-qt/qtdeclarative-${QT5MIN}:5
- >=dev-qt/qtgui-${QT5MIN}:5
- >=dev-qt/qtwidgets-${QT5MIN}:5
- >=kde-frameworks/frameworkintegration-${KF5MIN}: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/kwidgetsaddons-${KF5MIN}:5
- >=kde-frameworks/kwindowsystem-${KF5MIN}:5
- X? ( >=dev-qt/qtx11extras-${QT5MIN}:5 )
- )
X? (
>=dev-qt/qtbase-${QTMIN}:6=[gui]
x11-libs/libxcb
@@ -59,13 +41,14 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!<kde-plasma/libplasma-6.1.90:*[-kf6compat(-)]
+ !<${CATEGORY}/${PN}-6.5.0:5
>=dev-qt/qtsvg-${QTMIN}:6
"
src_configure() {
local mycmakeargs=(
-DBUILD_QT6=ON
- -DBUILD_QT5=$(usex qt5)
+ -DBUILD_QT5=OFF
$(cmake_use_find_package X XCB)
)
ecm_src_configure
