diff --git a/gui-apps/noctalia-qs/metadata.xml b/gui-apps/noctalia-qs/metadata.xml
index 946cd9d2bc..a61d820e65 100644
--- a/gui-apps/noctalia-qs/metadata.xml
+++ b/gui-apps/noctalia-qs/metadata.xml
@@ -11,26 +11,20 @@
It serves as the shell framework powering Noctalia Shell.
noctalia-dev/noctalia-qs
diff --git a/gui-apps/noctalia-qs/noctalia-qs-0.0.10.ebuild b/gui-apps/noctalia-qs/noctalia-qs-0.0.10.ebuild
index 43d265549c..cd9825fec5 100644
--- a/gui-apps/noctalia-qs/noctalia-qs-0.0.10.ebuild
+++ b/gui-apps/noctalia-qs/noctalia-qs-0.0.10.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
# Upstream recommends leaving all build options enabled by default
IUSE="
+bluetooth +dwl +greetd +hyprland +i3 +jemalloc +layer-shell
- +mpris +network +niri +notifications +pam +pipewire +polkit
+ +mpris +networkmanager +niri +notifications +pam +pipewire +policykit
+screencopy +session-lock +sockets +tray +toplevel-management
+upower +wayland +X
"
@@ -44,10 +44,10 @@ RDEPEND="
dev-qt/qtsvg:6=
bluetooth? ( net-wireless/bluez )
jemalloc? ( dev-libs/jemalloc )
- network? ( net-misc/networkmanager )
+ networkmanager? ( net-misc/networkmanager )
pam? ( sys-libs/pam )
pipewire? ( media-video/pipewire )
- polkit? (
+ policykit? (
dev-libs/glib
sys-auth/polkit
)
@@ -100,7 +100,7 @@ src_configure() {
-DHYPRLAND_SURFACE_EXTENSIONS=${_hyprland}
-DI3=${_i3}
-DI3_IPC=${_i3}
- -DNETWORK=$(usex network)
+ -DNETWORK=$(usex networkmanager)
-DNIRI=${_niri}
-DNIRI_IPC=${_niri}
-DSCREENCOPY=${_screencopy}
@@ -112,7 +112,7 @@ src_configure() {
-DSERVICE_NOTIFICATIONS=$(usex notifications)
-DSERVICE_PAM=$(usex pam)
-DSERVICE_PIPEWIRE=$(usex pipewire)
- -DSERVICE_POLKIT=$(usex polkit)
+ -DSERVICE_POLKIT=$(usex policykit)
-DSERVICE_STATUS_NOTIFIER=$(usex tray)
-DSERVICE_UPOWER=$(usex upower)
-DSOCKETS=$(usex sockets)
diff --git a/gui-apps/noctalia-qs/noctalia-qs-0.0.11.ebuild b/gui-apps/noctalia-qs/noctalia-qs-0.0.11.ebuild
index 43d265549c..cd9825fec5 100644
--- a/gui-apps/noctalia-qs/noctalia-qs-0.0.11.ebuild
+++ b/gui-apps/noctalia-qs/noctalia-qs-0.0.11.ebuild
@@ -24,7 +24,7 @@ SLOT="0"
# Upstream recommends leaving all build options enabled by default
IUSE="
+bluetooth +dwl +greetd +hyprland +i3 +jemalloc +layer-shell
- +mpris +network +niri +notifications +pam +pipewire +polkit
+ +mpris +networkmanager +niri +notifications +pam +pipewire +policykit
+screencopy +session-lock +sockets +tray +toplevel-management
+upower +wayland +X
"
@@ -44,10 +44,10 @@ RDEPEND="
dev-qt/qtsvg:6=
bluetooth? ( net-wireless/bluez )
jemalloc? ( dev-libs/jemalloc )
- network? ( net-misc/networkmanager )
+ networkmanager? ( net-misc/networkmanager )
pam? ( sys-libs/pam )
pipewire? ( media-video/pipewire )
- polkit? (
+ policykit? (
dev-libs/glib
sys-auth/polkit
)
@@ -100,7 +100,7 @@ src_configure() {
-DHYPRLAND_SURFACE_EXTENSIONS=${_hyprland}
-DI3=${_i3}
-DI3_IPC=${_i3}
- -DNETWORK=$(usex network)
+ -DNETWORK=$(usex networkmanager)
-DNIRI=${_niri}
-DNIRI_IPC=${_niri}
-DSCREENCOPY=${_screencopy}
@@ -112,7 +112,7 @@ src_configure() {
-DSERVICE_NOTIFICATIONS=$(usex notifications)
-DSERVICE_PAM=$(usex pam)
-DSERVICE_PIPEWIRE=$(usex pipewire)
- -DSERVICE_POLKIT=$(usex polkit)
+ -DSERVICE_POLKIT=$(usex policykit)
-DSERVICE_STATUS_NOTIFIER=$(usex tray)
-DSERVICE_UPOWER=$(usex upower)
-DSOCKETS=$(usex sockets)
diff --git a/gui-apps/noctalia-qs/noctalia-qs-0.0.9.ebuild b/gui-apps/noctalia-qs/noctalia-qs-0.0.9.ebuild
index 2b1337582f..348ad7b9fb 100644
--- a/gui-apps/noctalia-qs/noctalia-qs-0.0.9.ebuild
+++ b/gui-apps/noctalia-qs/noctalia-qs-0.0.9.ebuild
@@ -27,8 +27,8 @@ IUSE="
+wayland +layer-shell +session-lock +toplevel-management
+hyprland +screencopy
+X +i3
- +tray +pipewire +mpris +pam +polkit +greetd +upower +notifications
- +bluetooth +network
+ +tray +pipewire +mpris +pam +policykit +greetd +upower +notifications
+ +bluetooth +networkmanager
lto
"
REQUIRED_USE="
@@ -56,12 +56,12 @@ RDEPEND="
X? ( x11-libs/libxcb )
pipewire? ( media-video/pipewire )
pam? ( sys-libs/pam )
- polkit? (
+ policykit? (
sys-auth/polkit
dev-libs/glib
)
bluetooth? ( net-wireless/bluez )
- network? ( net-misc/networkmanager )
+ networkmanager? ( net-misc/networkmanager )
"
DEPEND="${RDEPEND}"
BDEPEND="
@@ -113,12 +113,12 @@ src_configure() {
-DSERVICE_PIPEWIRE=$(usex pipewire)
-DSERVICE_MPRIS=$(usex mpris)
-DSERVICE_PAM=$(usex pam)
- -DSERVICE_POLKIT=$(usex polkit)
+ -DSERVICE_POLKIT=$(usex policykit)
-DSERVICE_GREETD=$(usex greetd)
-DSERVICE_UPOWER=$(usex upower)
-DSERVICE_NOTIFICATIONS=$(usex notifications)
-DBLUETOOTH=$(usex bluetooth)
- -DNETWORK=$(usex network)
+ -DNETWORK=$(usex networkmanager)
-DLTO=$(usex lto)
)
cmake_src_configure
diff --git a/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild b/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild
index 4d3c637f6f..7f058116cd 100644
--- a/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild
+++ b/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
# Upstream recommends leaving all build options enabled by default
IUSE="
+bluetooth +dwl +greetd +hyprland +i3 +jemalloc +layer-shell
- +mpris +network +niri +notifications +pam +pipewire +polkit
+ +mpris +networkmanager +niri +notifications +pam +pipewire +policykit
+screencopy +session-lock +sockets +tray +toplevel-management
+upower +wayland +X
"
@@ -42,10 +42,10 @@ RDEPEND="
dev-qt/qtsvg:6=
bluetooth? ( net-wireless/bluez )
jemalloc? ( dev-libs/jemalloc )
- network? ( net-misc/networkmanager )
+ networkmanager? ( net-misc/networkmanager )
pam? ( sys-libs/pam )
pipewire? ( media-video/pipewire )
- polkit? (
+ policykit? (
dev-libs/glib
sys-auth/polkit
)
@@ -98,7 +98,7 @@ src_configure() {
-DHYPRLAND_SURFACE_EXTENSIONS=${_hyprland}
-DI3=${_i3}
-DI3_IPC=${_i3}
- -DNETWORK=$(usex network)
+ -DNETWORK=$(usex networkmanager)
-DNIRI=${_niri}
-DNIRI_IPC=${_niri}
-DSCREENCOPY=${_screencopy}
@@ -110,7 +110,7 @@ src_configure() {
-DSERVICE_NOTIFICATIONS=$(usex notifications)
-DSERVICE_PAM=$(usex pam)
-DSERVICE_PIPEWIRE=$(usex pipewire)
- -DSERVICE_POLKIT=$(usex polkit)
+ -DSERVICE_POLKIT=$(usex policykit)
-DSERVICE_STATUS_NOTIFIER=$(usex tray)
-DSERVICE_UPOWER=$(usex upower)
-DSOCKETS=$(usex sockets)