commit:     158f665fb4960bdb47fee1be6fa3032e52ae47d8
Author:     dsaf <ghostyn678+git <AT> gmail <DOT> com>
AuthorDate: Mon Mar  9 23:33:27 2026 +0000
Commit:     dsaf <ghostyn678+git <AT> gmail <DOT> com>
CommitDate: Mon Mar  9 23:33:27 2026 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=158f665f

gui-apps/noctalia-qs: remake use flags, add 0.0.6-r1, drop 0.0.6

* Missing USE flags were added and others merged (i.e. Hyprland)

Signed-off-by: dsaf <ghostyn678+git <AT> gmail.com>

 gui-apps/noctalia-qs/metadata.xml                  |  6 +--
 ...qs-0.0.6.ebuild => noctalia-qs-0.0.6-r1.ebuild} | 54 ++++++++++++++++------
 gui-apps/noctalia-qs/noctalia-qs-9999.ebuild       | 54 ++++++++++++++++------
 3 files changed, 83 insertions(+), 31 deletions(-)

diff --git a/gui-apps/noctalia-qs/metadata.xml 
b/gui-apps/noctalia-qs/metadata.xml
index a74cffbfd2..a1b3d2984f 100644
--- a/gui-apps/noctalia-qs/metadata.xml
+++ b/gui-apps/noctalia-qs/metadata.xml
@@ -22,11 +22,11 @@
                <flag name="pam">Enable <pkg>sys-libs/pam</pkg> integration for 
user authentication</flag>
                <flag name="polkit">Enable creating <pkg>sys-auth/polkit</pkg> 
agents that can prompt user for authentication</flag>
                <flag name="hyprland">Enable <pkg>gui-wm/hyprland</pkg> 
specific integrations</flag>
-               <flag name="hyprland-global-shortcuts">Enable creation of 
global shortcuts under <pkg>gui-wm/hyprland</pkg> through the 
hyprland-global-shortcuts-v1 protocol</flag>
-               <flag name="hyprland-focus-grab">Enables windows to grab focus 
on <pkg>gui-wm/hyprland</pkg> through the hyprland-focus-grab-v1 protocol</flag>
                <flag name="i3">Enable <pkg>x11-wm/i3</pkg> and 
<pkg>gui-wm/sway</pkg> specific features</flag>
-               <flag name="i3-ipc">Enable interfacing with 
<pkg>x11-wm/i3</pkg> and <pkg>gui-wm/sway</pkg>'s IPC</flag>
                <flag name="bluetooth">Enable Bluetooth integration using 
<pkg>net-wireless/bluez</pkg></flag>
+               <flag name="greetd">Enable <pkg>gui-libs/greetd</pkg> 
integration</flag>
+               <flag name="network">Enable Network integration using 
<pkg>net-misc/networkmanager</pkg></flag>
+               <flag name="notifications">Enable notifications service 
integration</flag>
        </use>
        <upstream>
                <remote-id type="github">noctalia-dev/noctalia-qs</remote-id>

diff --git a/gui-apps/noctalia-qs/noctalia-qs-0.0.6.ebuild 
b/gui-apps/noctalia-qs/noctalia-qs-0.0.6-r1.ebuild
similarity index 59%
rename from gui-apps/noctalia-qs/noctalia-qs-0.0.6.ebuild
rename to gui-apps/noctalia-qs/noctalia-qs-0.0.6-r1.ebuild
index 1395334459..6d6d7c4a4f 100644
--- a/gui-apps/noctalia-qs/noctalia-qs-0.0.6.ebuild
+++ b/gui-apps/noctalia-qs/noctalia-qs-0.0.6-r1.ebuild
@@ -23,17 +23,24 @@ SLOT="0"
 
 # Upstream recommends leaving all build options enabled by default
 IUSE="
-       +jemalloc +sockets +wayland +layer-shell
-       +session-lock +toplevel-management +screencopy +X
-       +pipewire +tray +mpris +pam +polkit +hyprland
-       +hyprland-global-shortcuts +hyprland-focus-grab
-       +i3 +i3-ipc +bluetooth
+       +jemalloc +sockets
+       +wayland +layer-shell +session-lock +toplevel-management
+       +hyprland +screencopy
+       +X +i3
+       +tray +pipewire +mpris +pam +polkit +greetd +upower +notifications
+       +bluetooth +network
+"
+REQUIRED_USE="
+       layer-shell?         ( wayland )
+       session-lock?        ( wayland )
+       toplevel-management? ( wayland )
+       hyprland?            ( wayland )
+       screencopy?          ( wayland )
 "
-REQUIRED_USE="screencopy? ( toplevel-management )"
 
 RDEPEND="
        !gui-apps/quickshell
-       dev-qt/qtbase:6=[dbus]
+       dev-qt/qtbase:6=[dbus,vulkan]
        dev-qt/qtsvg:6=
        dev-qt/qtdeclarative:6=
        jemalloc? ( dev-libs/jemalloc )
@@ -53,12 +60,15 @@ RDEPEND="
                dev-libs/glib
        )
        bluetooth? ( net-wireless/bluez )
+       network? ( net-misc/networkmanager )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
        virtual/pkgconfig
        dev-cpp/cli11
+       dev-util/spirv-tools
        dev-qt/qtshadertools:6
+       screencopy? ( dev-util/vulkan-headers )
        wayland? (
                dev-util/wayland-scanner
                dev-libs/wayland-protocols
@@ -66,6 +76,13 @@ BDEPEND="
 "
 
 src_configure() {
+       # hyprland controls all Hyprland sub-features as a group.
+       # i3 controls I3/Sway IPC.
+       # screencopy controls all screencopy backends (icc, wlr, 
hyprland-toplevel).
+       local _hyprland=$(usex hyprland ON OFF)
+       local _screencopy=$(usex screencopy ON OFF)
+       local _i3=$(usex i3 ON OFF)
+
        local mycmakeargs=(
                -DCMAKE_BUILD_TYPE=Release
                -DDISTRIBUTOR="${BRANDING_OS_NAME} GURU"
@@ -77,19 +94,28 @@ src_configure() {
                -DWAYLAND_WLR_LAYERSHELL=$(usex layer-shell ON OFF)
                -DWAYLAND_SESSION_LOCK=$(usex session-lock ON OFF)
                -DWAYLAND_TOPLEVEL_MANAGEMENT=$(usex toplevel-management ON OFF)
-               -DSCREENCOPY=$(usex screencopy ON OFF)
+               -DHYPRLAND=${_hyprland}
+               -DHYPRLAND_IPC=${_hyprland}
+               -DHYPRLAND_GLOBAL_SHORTCUTS=${_hyprland}
+               -DHYPRLAND_FOCUS_GRAB=${_hyprland}
+               -DHYPRLAND_SURFACE_EXTENSIONS=${_hyprland}
+               -DSCREENCOPY=${_screencopy}
+               -DSCREENCOPY_ICC=${_screencopy}
+               -DSCREENCOPY_WLR=${_screencopy}
+               -DSCREENCOPY_HYPRLAND_TOPLEVEL=${_screencopy}
                -DX11=$(usex X ON OFF)
-               -DSERVICE_PIPEWIRE=$(usex pipewire ON OFF)
+               -DI3=${_i3}
+               -DI3_IPC=${_i3}
                -DSERVICE_STATUS_NOTIFIER=$(usex tray ON OFF)
+               -DSERVICE_PIPEWIRE=$(usex pipewire ON OFF)
                -DSERVICE_MPRIS=$(usex mpris ON OFF)
                -DSERVICE_PAM=$(usex pam ON OFF)
                -DSERVICE_POLKIT=$(usex polkit ON OFF)
-               -DHYPRLAND=$(usex hyprland ON OFF)
-               -DHYPRLAND_GLOBAL_SHORTCUTS=$(usex hyprland-global-shortcuts)
-               -DHYPRLAND_FOCUS_GRAB=$(usex hyprland-focus-grab)
-               -DI3=$(usex i3 ON OFF)
-               -DI3_IPC=$(usex i3-ipc ON OFF)
+               -DSERVICE_GREETD=$(usex greetd ON OFF)
+               -DSERVICE_UPOWER=$(usex upower ON OFF)
+               -DSERVICE_NOTIFICATIONS=$(usex notifications ON OFF)
                -DBLUETOOTH=$(usex bluetooth ON OFF)
+               -DNETWORK=$(usex network ON OFF)
        )
        cmake_src_configure
 }

diff --git a/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild 
b/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild
index ae39158b86..0864083020 100644
--- a/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild
+++ b/gui-apps/noctalia-qs/noctalia-qs-9999.ebuild
@@ -21,17 +21,24 @@ SLOT="0"
 
 # Upstream recommends leaving all build options enabled by default
 IUSE="
-       +jemalloc +sockets +wayland +layer-shell
-       +session-lock +toplevel-management +screencopy +X
-       +pipewire +tray +mpris +pam +polkit +hyprland
-       +hyprland-global-shortcuts +hyprland-focus-grab
-       +i3 +i3-ipc +bluetooth
+       +jemalloc +sockets
+       +wayland +layer-shell +session-lock +toplevel-management
+       +hyprland +screencopy
+       +X +i3
+       +tray +pipewire +mpris +pam +polkit +greetd +upower +notifications
+       +bluetooth +network
+"
+REQUIRED_USE="
+       layer-shell?         ( wayland )
+       session-lock?        ( wayland )
+       toplevel-management? ( wayland )
+       hyprland?            ( wayland )
+       screencopy?          ( wayland )
 "
-REQUIRED_USE="screencopy? ( toplevel-management )"
 
 RDEPEND="
        !gui-apps/quickshell
-       dev-qt/qtbase:6=[dbus]
+       dev-qt/qtbase:6=[dbus,vulkan]
        dev-qt/qtsvg:6=
        dev-qt/qtdeclarative:6=
        jemalloc? ( dev-libs/jemalloc )
@@ -51,12 +58,15 @@ RDEPEND="
                dev-libs/glib
        )
        bluetooth? ( net-wireless/bluez )
+       network? ( net-misc/networkmanager )
 "
 DEPEND="${RDEPEND}"
 BDEPEND="
        virtual/pkgconfig
        dev-cpp/cli11
+       dev-util/spirv-tools
        dev-qt/qtshadertools:6
+       screencopy? ( dev-util/vulkan-headers )
        wayland? (
                dev-util/wayland-scanner
                dev-libs/wayland-protocols
@@ -64,6 +74,13 @@ BDEPEND="
 "
 
 src_configure() {
+       # hyprland controls all Hyprland sub-features as a group.
+       # i3 controls I3/Sway IPC.
+       # screencopy controls all screencopy backends (icc, wlr, 
hyprland-toplevel).
+       local _hyprland=$(usex hyprland ON OFF)
+       local _screencopy=$(usex screencopy ON OFF)
+       local _i3=$(usex i3 ON OFF)
+
        local mycmakeargs=(
                -DCMAKE_BUILD_TYPE=Release
                -DDISTRIBUTOR="${BRANDING_OS_NAME} GURU"
@@ -75,19 +92,28 @@ src_configure() {
                -DWAYLAND_WLR_LAYERSHELL=$(usex layer-shell ON OFF)
                -DWAYLAND_SESSION_LOCK=$(usex session-lock ON OFF)
                -DWAYLAND_TOPLEVEL_MANAGEMENT=$(usex toplevel-management ON OFF)
-               -DSCREENCOPY=$(usex screencopy ON OFF)
+               -DHYPRLAND=${_hyprland}
+               -DHYPRLAND_IPC=${_hyprland}
+               -DHYPRLAND_GLOBAL_SHORTCUTS=${_hyprland}
+               -DHYPRLAND_FOCUS_GRAB=${_hyprland}
+               -DHYPRLAND_SURFACE_EXTENSIONS=${_hyprland}
+               -DSCREENCOPY=${_screencopy}
+               -DSCREENCOPY_ICC=${_screencopy}
+               -DSCREENCOPY_WLR=${_screencopy}
+               -DSCREENCOPY_HYPRLAND_TOPLEVEL=${_screencopy}
                -DX11=$(usex X ON OFF)
-               -DSERVICE_PIPEWIRE=$(usex pipewire ON OFF)
+               -DI3=${_i3}
+               -DI3_IPC=${_i3}
                -DSERVICE_STATUS_NOTIFIER=$(usex tray ON OFF)
+               -DSERVICE_PIPEWIRE=$(usex pipewire ON OFF)
                -DSERVICE_MPRIS=$(usex mpris ON OFF)
                -DSERVICE_PAM=$(usex pam ON OFF)
                -DSERVICE_POLKIT=$(usex polkit ON OFF)
-               -DHYPRLAND=$(usex hyprland ON OFF)
-               -DHYPRLAND_GLOBAL_SHORTCUTS=$(usex hyprland-global-shortcuts)
-               -DHYPRLAND_FOCUS_GRAB=$(usex hyprland-focus-grab)
-               -DI3=$(usex i3 ON OFF)
-               -DI3_IPC=$(usex i3-ipc ON OFF)
+               -DSERVICE_GREETD=$(usex greetd ON OFF)
+               -DSERVICE_UPOWER=$(usex upower ON OFF)
+               -DSERVICE_NOTIFICATIONS=$(usex notifications ON OFF)
                -DBLUETOOTH=$(usex bluetooth ON OFF)
+               -DNETWORK=$(usex network ON OFF)
        )
        cmake_src_configure
 }

Reply via email to