diff options
38 files changed, 40 insertions, 37 deletions
diff --git a/Documentation/package.accept_keywords/.kde-frameworks-5-live/kde-frameworks-5-tier1-live b/Documentation/package.accept_keywords/.kde-frameworks-5-live/kde-frameworks-5-tier1-live index b577b249212..040d9a624d3 100644 --- a/Documentation/package.accept_keywords/.kde-frameworks-5-live/kde-frameworks-5-tier1-live +++ b/Documentation/package.accept_keywords/.kde-frameworks-5-live/kde-frameworks-5-tier1-live @@ -21,7 +21,6 @@ ~kde-frameworks/kitemviews-5.9999 ** ~kde-frameworks/kplotting-5.9999 ** ~kde-frameworks/kquickcharts-5.9999 ** -~kde-frameworks/kwayland-5.9999 ** ~kde-frameworks/kwidgetsaddons-5.9999 ** ~kde-frameworks/kwindowsystem-5.9999 ** ~kde-frameworks/modemmanager-qt-5.9999 ** @@ -32,3 +31,4 @@ ~kde-frameworks/sonnet-5.9999 ** ~kde-frameworks/syntax-highlighting-5.9999 ** ~kde-frameworks/threadweaver-5.9999 ** +~kde-plasma/kwayland-5.9999 ** diff --git a/Documentation/package.accept_keywords/kde-frameworks-5-live.keywords b/Documentation/package.accept_keywords/kde-frameworks-5-live.keywords index 85a08eff13e..147b1243a95 100644 --- a/Documentation/package.accept_keywords/kde-frameworks-5-live.keywords +++ b/Documentation/package.accept_keywords/kde-frameworks-5-live.keywords @@ -32,7 +32,6 @@ ~kde-frameworks/kitemviews-5.9999 ** ~kde-frameworks/kplotting-5.9999 ** ~kde-frameworks/kquickcharts-5.9999 ** -~kde-frameworks/kwayland-5.9999 ** ~kde-frameworks/kwidgetsaddons-5.9999 ** ~kde-frameworks/kwindowsystem-5.9999 ** ~kde-frameworks/modemmanager-qt-5.9999 ** @@ -43,6 +42,7 @@ ~kde-frameworks/sonnet-5.9999 ** ~kde-frameworks/syntax-highlighting-5.9999 ** ~kde-frameworks/threadweaver-5.9999 ** +~kde-plasma/kwayland-5.9999 ** # Tier 2: Additionally depend on tier 1 frameworks. ~kde-frameworks/kauth-5.9999 ** ~kde-frameworks/kcompletion-5.9999 ** diff --git a/Documentation/package.accept_keywords/kde-frameworks-5.110.keywords b/Documentation/package.accept_keywords/kde-frameworks-5.110.keywords index 5af09988799..727a3487d0f 100644 --- a/Documentation/package.accept_keywords/kde-frameworks-5.110.keywords +++ b/Documentation/package.accept_keywords/kde-frameworks-5.110.keywords @@ -32,7 +32,6 @@ <kde-frameworks/kitemviews-5.110.50 <kde-frameworks/kplotting-5.110.50 <kde-frameworks/kquickcharts-5.110.50 -<kde-frameworks/kwayland-5.110.50 <kde-frameworks/kwidgetsaddons-5.110.50 <kde-frameworks/kwindowsystem-5.110.50 <kde-frameworks/modemmanager-qt-5.110.50 @@ -43,6 +42,7 @@ <kde-frameworks/sonnet-5.110.50 <kde-frameworks/syntax-highlighting-5.110.50 <kde-frameworks/threadweaver-5.110.50 +<kde-plasma/kwayland-5.110.50 # Tier 2: Additionally depend on tier 1 frameworks. <kde-frameworks/kauth-5.110.50 <kde-frameworks/kcompletion-5.110.50 diff --git a/Documentation/package.accept_keywords/kde-frameworks-5.112.keywords b/Documentation/package.accept_keywords/kde-frameworks-5.112.keywords index c18d3d90dab..c96d08af299 100644 --- a/Documentation/package.accept_keywords/kde-frameworks-5.112.keywords +++ b/Documentation/package.accept_keywords/kde-frameworks-5.112.keywords @@ -32,7 +32,6 @@ <kde-frameworks/kitemviews-5.112.50 <kde-frameworks/kplotting-5.112.50 <kde-frameworks/kquickcharts-5.112.50 -<kde-frameworks/kwayland-5.112.50 <kde-frameworks/kwidgetsaddons-5.112.50 <kde-frameworks/kwindowsystem-5.112.50 <kde-frameworks/modemmanager-qt-5.112.50 @@ -43,6 +42,7 @@ <kde-frameworks/sonnet-5.112.50 <kde-frameworks/syntax-highlighting-5.112.50 <kde-frameworks/threadweaver-5.112.50 +<kde-plasma/kwayland-5.112.50 # Tier 2: Additionally depend on tier 1 frameworks. <kde-frameworks/kauth-5.112.50 <kde-frameworks/kcompletion-5.112.50 diff --git a/Documentation/package.mask/kde-frameworks-5.110 b/Documentation/package.mask/kde-frameworks-5.110 index 1a04b6e58a6..96ab53ba664 100644 --- a/Documentation/package.mask/kde-frameworks-5.110 +++ b/Documentation/package.mask/kde-frameworks-5.110 @@ -32,7 +32,6 @@ <kde-frameworks/kitemviews-5.110.50 <kde-frameworks/kplotting-5.110.50 <kde-frameworks/kquickcharts-5.110.50 -<kde-frameworks/kwayland-5.110.50 <kde-frameworks/kwidgetsaddons-5.110.50 <kde-frameworks/kwindowsystem-5.110.50 <kde-frameworks/modemmanager-qt-5.110.50 @@ -43,6 +42,7 @@ <kde-frameworks/sonnet-5.110.50 <kde-frameworks/syntax-highlighting-5.110.50 <kde-frameworks/threadweaver-5.110.50 +<kde-plasma/kwayland-5.110.50 # Tier 2: Additionally depend on tier 1 frameworks. <kde-frameworks/kauth-5.110.50 <kde-frameworks/kcompletion-5.110.50 diff --git a/Documentation/package.mask/kde-frameworks-5.112 b/Documentation/package.mask/kde-frameworks-5.112 index 01860424f6a..c119ff5bade 100644 --- a/Documentation/package.mask/kde-frameworks-5.112 +++ b/Documentation/package.mask/kde-frameworks-5.112 @@ -32,7 +32,6 @@ <kde-frameworks/kitemviews-5.112.50 <kde-frameworks/kplotting-5.112.50 <kde-frameworks/kquickcharts-5.112.50 -<kde-frameworks/kwayland-5.112.50 <kde-frameworks/kwidgetsaddons-5.112.50 <kde-frameworks/kwindowsystem-5.112.50 <kde-frameworks/modemmanager-qt-5.112.50 @@ -43,6 +42,7 @@ <kde-frameworks/sonnet-5.112.50 <kde-frameworks/syntax-highlighting-5.112.50 <kde-frameworks/threadweaver-5.112.50 +<kde-plasma/kwayland-5.112.50 # Tier 2: Additionally depend on tier 1 frameworks. <kde-frameworks/kauth-5.112.50 <kde-frameworks/kcompletion-5.112.50 diff --git a/Documentation/package.unmask/kde-frameworks-5.110 b/Documentation/package.unmask/kde-frameworks-5.110 index 1a04b6e58a6..96ab53ba664 100644 --- a/Documentation/package.unmask/kde-frameworks-5.110 +++ b/Documentation/package.unmask/kde-frameworks-5.110 @@ -32,7 +32,6 @@ <kde-frameworks/kitemviews-5.110.50 <kde-frameworks/kplotting-5.110.50 <kde-frameworks/kquickcharts-5.110.50 -<kde-frameworks/kwayland-5.110.50 <kde-frameworks/kwidgetsaddons-5.110.50 <kde-frameworks/kwindowsystem-5.110.50 <kde-frameworks/modemmanager-qt-5.110.50 @@ -43,6 +42,7 @@ <kde-frameworks/sonnet-5.110.50 <kde-frameworks/syntax-highlighting-5.110.50 <kde-frameworks/threadweaver-5.110.50 +<kde-plasma/kwayland-5.110.50 # Tier 2: Additionally depend on tier 1 frameworks. <kde-frameworks/kauth-5.110.50 <kde-frameworks/kcompletion-5.110.50 diff --git a/Documentation/package.unmask/kde-frameworks-5.112 b/Documentation/package.unmask/kde-frameworks-5.112 index 01860424f6a..c119ff5bade 100644 --- a/Documentation/package.unmask/kde-frameworks-5.112 +++ b/Documentation/package.unmask/kde-frameworks-5.112 @@ -32,7 +32,6 @@ <kde-frameworks/kitemviews-5.112.50 <kde-frameworks/kplotting-5.112.50 <kde-frameworks/kquickcharts-5.112.50 -<kde-frameworks/kwayland-5.112.50 <kde-frameworks/kwidgetsaddons-5.112.50 <kde-frameworks/kwindowsystem-5.112.50 <kde-frameworks/modemmanager-qt-5.112.50 @@ -43,6 +42,7 @@ <kde-frameworks/sonnet-5.112.50 <kde-frameworks/syntax-highlighting-5.112.50 <kde-frameworks/threadweaver-5.112.50 +<kde-plasma/kwayland-5.112.50 # Tier 2: Additionally depend on tier 1 frameworks. <kde-frameworks/kauth-5.112.50 <kde-frameworks/kcompletion-5.112.50 diff --git a/kde-apps/krfb/krfb-23.08.49.9999.ebuild b/kde-apps/krfb/krfb-23.08.49.9999.ebuild index bff69f21465..fa460cc940e 100644 --- a/kde-apps/krfb/krfb-23.08.49.9999.ebuild +++ b/kde-apps/krfb/krfb-23.08.49.9999.ebuild @@ -46,8 +46,8 @@ COMMON_DEPEND=" >=dev-qt/qtgui-${QTMIN}:5[X] ) >=dev-qt/qtwayland-${QTMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 kde-plasma/kpipewire:5 + >=kde-plasma/kwayland-${KFMIN}:5 ) " DEPEND="${COMMON_DEPEND} diff --git a/kde-apps/krfb/krfb-9999.ebuild b/kde-apps/krfb/krfb-9999.ebuild index bff69f21465..fa460cc940e 100644 --- a/kde-apps/krfb/krfb-9999.ebuild +++ b/kde-apps/krfb/krfb-9999.ebuild @@ -46,8 +46,8 @@ COMMON_DEPEND=" >=dev-qt/qtgui-${QTMIN}:5[X] ) >=dev-qt/qtwayland-${QTMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 kde-plasma/kpipewire:5 + >=kde-plasma/kwayland-${KFMIN}:5 ) " DEPEND="${COMMON_DEPEND} diff --git a/kde-apps/yakuake/metadata.xml b/kde-apps/yakuake/metadata.xml index 36816f0e194..1d0ca273fd8 100644 --- a/kde-apps/yakuake/metadata.xml +++ b/kde-apps/yakuake/metadata.xml @@ -9,6 +9,6 @@ <bugs-to>https://bugs.kde.org/</bugs-to> </upstream> <use> - <flag name="absolute-position">Use <pkg>kde-frameworks/kwayland</pkg> for absolute window positioning in KWin</flag> + <flag name="absolute-position">Use <pkg>kde-plasma/kwayland</pkg> for absolute window positioning in KWin</flag> </use> </pkgmetadata> diff --git a/kde-apps/yakuake/yakuake-23.08.49.9999.ebuild b/kde-apps/yakuake/yakuake-23.08.49.9999.ebuild index 06cd87d832c..0c0c41a83a3 100644 --- a/kde-apps/yakuake/yakuake-23.08.49.9999.ebuild +++ b/kde-apps/yakuake/yakuake-23.08.49.9999.ebuild @@ -43,7 +43,7 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 x11-libs/libX11 - absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) + absolute-position? ( >=kde-plasma/kwayland-${KFMIN}:5 ) " RDEPEND="${DEPEND}" diff --git a/kde-apps/yakuake/yakuake-9999.ebuild b/kde-apps/yakuake/yakuake-9999.ebuild index 06cd87d832c..0c0c41a83a3 100644 --- a/kde-apps/yakuake/yakuake-9999.ebuild +++ b/kde-apps/yakuake/yakuake-9999.ebuild @@ -43,7 +43,7 @@ DEPEND=" >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 x11-libs/libX11 - absolute-position? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) + absolute-position? ( >=kde-plasma/kwayland-${KFMIN}:5 ) " RDEPEND="${DEPEND}" diff --git a/kde-misc/latte-dock/latte-dock-9999.ebuild b/kde-misc/latte-dock/latte-dock-9999.ebuild index bd905eff81f..5d96ff20e94 100644 --- a/kde-misc/latte-dock/latte-dock-9999.ebuild +++ b/kde-misc/latte-dock/latte-dock-9999.ebuild @@ -44,9 +44,9 @@ COMMON_DEPEND=" >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 >=kde-plasma/libplasma-${KFMIN}:5[X(+)] x11-libs/libSM x11-libs/libX11 diff --git a/kde-plasma/kpipewire/kpipewire-5.27.49.9999.ebuild b/kde-plasma/kpipewire/kpipewire-5.27.49.9999.ebuild index 57a6ad2f3c8..b1df91e8ad7 100644 --- a/kde-plasma/kpipewire/kpipewire-5.27.49.9999.ebuild +++ b/kde-plasma/kpipewire/kpipewire-5.27.49.9999.ebuild @@ -23,7 +23,7 @@ COMMON_DEPEND=" >=dev-qt/qtwayland-${QTMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 media-libs/libepoxy media-libs/libglvnd media-video/ffmpeg:= diff --git a/kde-plasma/kpipewire/kpipewire-9999.ebuild b/kde-plasma/kpipewire/kpipewire-9999.ebuild index 57a6ad2f3c8..b1df91e8ad7 100644 --- a/kde-plasma/kpipewire/kpipewire-9999.ebuild +++ b/kde-plasma/kpipewire/kpipewire-9999.ebuild @@ -23,7 +23,7 @@ COMMON_DEPEND=" >=dev-qt/qtwayland-${QTMIN}:5 >=kde-frameworks/kcoreaddons-${KFMIN}:5 >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 media-libs/libepoxy media-libs/libglvnd media-video/ffmpeg:= diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.27.49.9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.27.49.9999.ebuild index 81528d3e6c5..aaa818aee16 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-5.27.49.9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-5.27.49.9999.ebuild @@ -38,10 +38,10 @@ COMMON_DEPEND=" >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 >=kde-plasma/layer-shell-qt-${PVCUT}:5 >=kde-plasma/libkscreen-${PVCUT}:5 sys-libs/pam diff --git a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild index e17df834ee9..f3e5c2d394f 100644 --- a/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild +++ b/kde-plasma/kscreenlocker/kscreenlocker-9999.ebuild @@ -38,10 +38,10 @@ COMMON_DEPEND=" >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5 + >=kde-plasma/kwayland-${PVCUT}:5 >=kde-plasma/layer-shell-qt-${PVCUT}:5 >=kde-plasma/libkscreen-${PVCUT}:5 sys-libs/pam diff --git a/kde-plasma/kwayland-integration/kwayland-integration-5.27.49.9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-5.27.49.9999.ebuild index c442bcf971c..16dfb0e2810 100644 --- a/kde-plasma/kwayland-integration/kwayland-integration-5.27.49.9999.ebuild +++ b/kde-plasma/kwayland-integration/kwayland-integration-5.27.49.9999.ebuild @@ -29,8 +29,8 @@ DEPEND=" ) >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtwayland-${QTMIN}:5= - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5= + >=kde-plasma/kwayland-${KFMIN}:5 x11-libs/libxkbcommon " RDEPEND="${DEPEND}" diff --git a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild index c442bcf971c..5b321867b30 100644 --- a/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild +++ b/kde-plasma/kwayland-integration/kwayland-integration-9999.ebuild @@ -29,8 +29,8 @@ DEPEND=" ) >=dev-qt/qtwidgets-${QTMIN}:5 >=dev-qt/qtwayland-${QTMIN}:5= - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5= + >=kde-plasma/kwayland-${PVCUT}:5 x11-libs/libxkbcommon " RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kwayland/kwayland-5.9999.ebuild b/kde-plasma/kwayland/kwayland-5.9999.ebuild index e7ee588778a..5ce2ed6538e 100644 --- a/kde-frameworks/kwayland/kwayland-5.9999.ebuild +++ b/kde-plasma/kwayland/kwayland-5.9999.ebuild @@ -3,8 +3,10 @@ EAPI=8 +ECM_NONGUI="true" +ECM_QTHELP="true" ECM_TEST="true" -PVCUT=$(ver_cut 1-2) +KFMIN=$(ver_cut 1-2) QTMIN=5.15.9 inherit ecm frameworks.kde.org diff --git a/kde-frameworks/kwayland/metadata.xml b/kde-plasma/kwayland/metadata.xml index aeee38454dd..f337bba66b2 100644 --- a/kde-frameworks/kwayland/metadata.xml +++ b/kde-plasma/kwayland/metadata.xml @@ -7,7 +7,7 @@ </maintainer> <upstream> <bugs-to>https://bugs.kde.org/</bugs-to> - <remote-id type="kde-invent">frameworks/kwayland</remote-id> + <remote-id type="kde-invent">plasma/kwayland</remote-id> </upstream> <slots> <subslots> diff --git a/kde-plasma/kwin/kwin-5.27.49.9999.ebuild b/kde-plasma/kwin/kwin-5.27.49.9999.ebuild index 22d8a5aacec..2a97169f2fc 100644 --- a/kde-plasma/kwin/kwin-5.27.49.9999.ebuild +++ b/kde-plasma/kwin/kwin-5.27.49.9999.ebuild @@ -43,12 +43,12 @@ COMMON_DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-plasma/breeze-${PVCUT}:5 >=kde-plasma/kdecoration-${PVCUT}:5 + >=kde-plasma/kwayland-${KFMIN}:5 >=kde-plasma/libplasma-${KFMIN}:5 >=kde-plasma/plasma-activities-${KFMIN}:5 media-libs/fontconfig diff --git a/kde-plasma/kwin/kwin-9999.ebuild b/kde-plasma/kwin/kwin-9999.ebuild index 1d7fa4b8cc3..26d4b8e6dc2 100644 --- a/kde-plasma/kwin/kwin-9999.ebuild +++ b/kde-plasma/kwin/kwin-9999.ebuild @@ -42,12 +42,12 @@ COMMON_DEPEND=" >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kpackage-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5=[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-plasma/breeze-${PVCUT}:5 >=kde-plasma/kdecoration-${PVCUT}:5 + >=kde-plasma/kwayland-${PVCUT}:5 >=kde-plasma/libplasma-${PVCUT}:5 >=kde-plasma/plasma-activities-${PVCUT}:5 media-libs/fontconfig diff --git a/kde-plasma/libkscreen/libkscreen-5.27.49.9999.ebuild b/kde-plasma/libkscreen/libkscreen-5.27.49.9999.ebuild index 55ec50e2a10..f4f1e4836dc 100644 --- a/kde-plasma/libkscreen/libkscreen-5.27.49.9999.ebuild +++ b/kde-plasma/libkscreen/libkscreen-5.27.49.9999.ebuild @@ -27,7 +27,7 @@ RDEPEND=" >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 x11-libs/libxcb:= " DEPEND="${RDEPEND} diff --git a/kde-plasma/libkscreen/libkscreen-9999.ebuild b/kde-plasma/libkscreen/libkscreen-9999.ebuild index 55ec50e2a10..f4f1e4836dc 100644 --- a/kde-plasma/libkscreen/libkscreen-9999.ebuild +++ b/kde-plasma/libkscreen/libkscreen-9999.ebuild @@ -27,7 +27,7 @@ RDEPEND=" >=dev-qt/qtwayland-${QTMIN}:5 >=dev-qt/qtx11extras-${QTMIN}:5 >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 x11-libs/libxcb:= " DEPEND="${RDEPEND} diff --git a/kde-plasma/libplasma/libplasma-5.9999.ebuild b/kde-plasma/libplasma/libplasma-5.9999.ebuild index 7b423c04255..c80f10dcc81 100644 --- a/kde-plasma/libplasma/libplasma-5.9999.ebuild +++ b/kde-plasma/libplasma/libplasma-5.9999.ebuild @@ -50,7 +50,7 @@ RDEPEND=" x11-libs/libxcb !gles2-only? ( media-libs/libglvnd[X] ) wayland? ( - =kde-frameworks/kwayland-${KFMIN}*:5 + =kde-plasma/kwayland-${KFMIN}*:5 media-libs/libglvnd ) " diff --git a/kde-plasma/plasma-bigscreen/plasma-bigscreen-9999.ebuild b/kde-plasma/plasma-bigscreen/plasma-bigscreen-9999.ebuild index 3117db1b6ce..0fbeda0eba3 100644 --- a/kde-plasma/plasma-bigscreen/plasma-bigscreen-9999.ebuild +++ b/kde-plasma/plasma-bigscreen/plasma-bigscreen-9999.ebuild @@ -31,8 +31,8 @@ DEPEND=" >=kde-frameworks/kirigami-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-plasma/kwayland-${PVCUT}:5 >=kde-plasma/libkworkspace-5.19.0:5 >=kde-plasma/libplasma-${PVCUT}:5 >=kde-plasma/plasma-activities-${PVCUT}:5 diff --git a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild index 7912f6d34e2..91b02084334 100644 --- a/kde-plasma/plasma-integration/plasma-integration-9999.ebuild +++ b/kde-plasma/plasma-integration/plasma-integration-9999.ebuild @@ -35,11 +35,11 @@ COMMON_DEPEND=" >=kde-frameworks/kio-${KFMIN}:5 >=kde-frameworks/kjobwidgets-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-plasma/breeze-${PVCUT}:5 + >=kde-plasma/kwayland-${PVCUT}:5 x11-libs/libXcursor x11-libs/libxcb " diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.27.49.9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.27.49.9999.ebuild index bdb6bcf4038..3bf9b3bc107 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.27.49.9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.27.49.9999.ebuild @@ -69,7 +69,6 @@ COMMON_DEPEND=" >=kde-frameworks/ktextwidgets-${KFMIN}:5 >=kde-frameworks/kunitconversion-${KFMIN}:5 >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 @@ -77,6 +76,7 @@ COMMON_DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 >=kde-plasma/breeze-${PVCUT}:5 >=kde-plasma/kscreenlocker-${PVCUT}:5 + >=kde-plasma/kwayland-${KFMIN}:5 >=kde-plasma/kwin-${PVCUT}:5 >=kde-plasma/layer-shell-qt-${PVCUT}:5 >=kde-plasma/libkscreen-${PVCUT}:5 diff --git a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild index 69e11b79e5f..020910c9e85 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-9999.ebuild @@ -69,7 +69,6 @@ COMMON_DEPEND=" >=kde-frameworks/ktextwidgets-${KFMIN}:5 >=kde-frameworks/kunitconversion-${KFMIN}:5 >=kde-frameworks/kwallet-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5[X] >=kde-frameworks/kxmlgui-${KFMIN}:5 @@ -77,6 +76,7 @@ COMMON_DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 >=kde-plasma/breeze-${PVCUT}:5 >=kde-plasma/kscreenlocker-${PVCUT}:5 + >=kde-plasma/kwayland-${PVCUT}:5 >=kde-plasma/kwin-${PVCUT}:5 >=kde-plasma/layer-shell-qt-${PVCUT}:5 >=kde-plasma/libkscreen-${PVCUT}:5 diff --git a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.49.9999.ebuild b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.49.9999.ebuild index 58ac87ebd5f..4b54da4a5d8 100644 --- a/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.49.9999.ebuild +++ b/kde-plasma/xdg-desktop-portal-kde/xdg-desktop-portal-kde-5.27.49.9999.ebuild @@ -41,7 +41,7 @@ COMMON_DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-plasma/kwayland-${KFMIN}:5 >=kde-plasma/libplasma-${KFMIN}:5 x11-libs/libxkbcommon " 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 fdc82929705..d591e3e04d2 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 @@ -41,7 +41,7 @@ COMMON_DEPEND=" >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kwindowsystem-${KFMIN}:5 - >=kde-frameworks/kwayland-${KFMIN}:5 + >=kde-plasma/kwayland-${PVCUT}:5 >=kde-plasma/libplasma-${PVCUT}:5 x11-libs/libxkbcommon " diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023 index b0181720da9..5d13421c3e6 100644 --- a/profiles/updates/4Q-2023 +++ b/profiles/updates/4Q-2023 @@ -6,3 +6,4 @@ move kde-frameworks/plasma kde-plasma/libplasma move kde-frameworks/kactivities-stats kde-plasma/plasma-activities-stats move kde-frameworks/kactivities kde-plasma/plasma-activities slotmove kde-frameworks/extra-cmake-modules 5 0 +move kde-frameworks/kwayland kde-plasma/kwayland diff --git a/sets/kde-frameworks-5-tier1 b/sets/kde-frameworks-5-tier1 index c9426a40784..1aa6ab3d9fc 100644 --- a/sets/kde-frameworks-5-tier1 +++ b/sets/kde-frameworks-5-tier1 @@ -24,7 +24,6 @@ kde-frameworks/kitemviews:5 kde-frameworks/kplotting:5 kde-frameworks/kquickcharts:5 # FIXME: uncomment: kde-frameworks/kuserfeedback:6 -kde-frameworks/kwayland:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kwindowsystem:5 kde-frameworks/modemmanager-qt:5 @@ -35,3 +34,4 @@ kde-frameworks/solid:5 kde-frameworks/sonnet:5 kde-frameworks/syntax-highlighting:5 kde-frameworks/threadweaver:5 +kde-plasma/kwayland:5 diff --git a/sets/kde- |