Merge branch 'end-4:main' into parallax

sdata/dist-arch/illogical-impulse-fonts-themes/PKGBUILD

@@ -1,6 +1,6 @@
 pkgname=illogical-impulse-fonts-themes
 pkgver=1.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Illogical Impulse Fonts and Theming Dependencies'
 arch=(any)
 license=(None)

sdata/dist-arch/install-deps.sh

@@ -18,6 +18,7 @@ remove_deprecated_dependencies(){
   list+=(illogical-impulse-{microtex,pymyc-aur})
   list+=(hyprland-qtutils)
   list+=({quickshell,hyprutils,hyprpicker,hyprlang,hypridle,hyprland-qt-support,hyprland-qtutils,hyprlock,xdg-desktop-portal-hyprland,hyprcursor,hyprwayland-scanner,hyprland}-git)
+  list+=(matugen-bin)
   for i in ${list[@]};do try sudo pacman --noconfirm -Rdd $i;done
 }
 # NOTE: `implicitize_old_dependencies()` was for the old days when we just switch from dependencies.conf to local PKGBUILDs.

sdata/dist-fedora/README.md

@@ -24,3 +24,4 @@ Note:
 +    "bluetooth": "kcmshell6 kcm_bluetooth",
 +    "network": "plasmawindowed org.kde.plasma.networkmanagement",
 ```
+

sdata/dist-gentoo/illogical-impulse-hyprland/illogical-impulse-hyprland-1.0-r3.ebuild

@@ -14,6 +14,6 @@ RESTRICT="strip"
 DEPEND=""
 RDEPEND="
 	gui-apps/hyprsunset
-	gui-wm/hyprland
+	>=gui-wm/hyprland-0.53.3:=
 	gui-apps/wl-clipboard
 "

sdata/dist-gentoo/install-deps.sh

@@ -26,6 +26,10 @@ if [[ -z $(eselect repository list | grep -E ".*guru \*.*") ]]; then
         v sudo eselect repository enable guru
 fi
 
+if [[ -z $(eselect repository list | grep -E ".*hyproverlay \*.*") ]]; then
+	v sudo eselect repository enable hyproverlay
+fi
+
 arch=$(portageq envvar ACCEPT_KEYWORDS)
 
 # Exclude hyprland, will deal with that separately
@@ -40,15 +44,6 @@ x sudo cp ./sdata/dist-gentoo/keywords ./sdata/dist-gentoo/keywords-user
 x sed -i "s/$/ ~${arch}/" ./sdata/dist-gentoo/keywords-user
 v sudo cp ./sdata/dist-gentoo/keywords-user /etc/portage/package.accept_keywords/illogical-impulse
 
-# QT
-x sudo cp ./sdata/dist-gentoo/qt-keywords ./sdata/dist-gentoo/qt-keywords-user
-x sed -i "s/$/ ~${arch}/" ./sdata/dist-gentoo/qt-keywords-user
-v sudo cp ./sdata/dist-gentoo/qt-keywords-user /etc/portage/package.accept_keywords/qt
-
-########## IMPORT UNMASKS
-sudo mkdir -p /etc/portage/package.unmask/
-v sudo cp ./sdata/dist-gentoo/qt-unmasks /etc/portage/package.unmask/qt
-
 ########## IMPORT USEFLAGS
 v sudo cp ./sdata/dist-gentoo/useflags /etc/portage/package.use/illogical-impulse
 v sudo sh -c 'cat ./sdata/dist-gentoo/additional-useflags >> /etc/portage/package.use/illogical-impulse'
@@ -59,6 +54,10 @@ v sudo emerge --quiet --newuse --update --deep @world
 v sudo emerge --quiet @smart-live-rebuild
 v sudo emerge --depclean
 
+# Hard coded for now
+v sudo emerge --update --quiet '>=dev-cpp/glaze-6.1.0'
+v sudo emerge --update --quiet dev-libs/pugixml
+
 # Remove old ebuilds (if this isn't done the wildcard will fuck upon a version change)
 x sudo rm -fr ${ebuild_dir}/app-misc/illogical-impulse-*
 

sdata/dist-gentoo/keywords

@@ -30,15 +30,15 @@ gui-apps/quickshell **
 gui-apps/wlogout
 dev-cpp/sdbus-c++
 dev-libs/hyprland-protocols
-gui-libs/aquamarine
+gui-libs/hyprutils::hyproverlay
-gui-libs/hyprutils
+gui-libs/hyprwire::hyproverlay
 dev-util/hyprwayland-scanner
-dev-libs/hyprlang
-dev-libs/hyprgraphics
-gui-libs/hyprcursor
 gui-libs/hyprland-qt-support
-gui-libs/hyprland-qtutils
+gui-libs/hyprland-guiutils::hyproverlay
-gui-wm/hyprland
+gui-libs/hyprtoolkit::hyproverlay
+gui-wm/hyprland::hyproverlay
+dev-libs/hyprgraphics::hyproverlay
+gui-libs/aquamarine::hyproverlay 
 x11-libs/libxkbcommon
 dev-util/breakpad
 dev-libs/linux-syscall-support
@@ -51,3 +51,4 @@ media-fonts/material-symbols-variable **
 media-fonts/readex-pro
 media-fonts/rubik-vf
 app-misc/songrec
+dev-cpp/glaze::hyproverlay

sdata/dist-gentoo/qt-keywords

@@ -1,27 +0,0 @@
-dev-qt/qtbase
-dev-qt/qtdeclarative
-dev-qt/qtlanguageserver
-dev-qt/qtsvg
-dev-qt/qtshadertools
-dev-qt/qttranslations
-dev-qt/qttools
-dev-qt/qt5compat
-dev-qt/qtcore
-dev-qt/qtdbus
-dev-qt/qtgraphicaleffects
-dev-qt/qtgui
-dev-qt/qtimageformats
-dev-qt/qtlocation
-dev-qt/qtmultimedia
-dev-qt/qtnetwork
-dev-qt/qtpositioning
-dev-qt/qtquick3d
-dev-qt/qtquickcontrols2
-dev-qt/qtquicktimeline
-dev-qt/qtsensors
-dev-qt/qtspeech
-dev-qt/qttest
-dev-qt/qtvirtualkeyboard
-dev-qt/qtwayland
-dev-qt/qtwayland
-dev-qt/qtwidgets

sdata/dist-gentoo/qt-unmasks

@@ -1,27 +0,0 @@
-dev-qt/qtbase
-dev-qt/qtdeclarative
-dev-qt/qtlanguageserver
-dev-qt/qtsvg
-dev-qt/qtshadertools
-dev-qt/qttranslations
-dev-qt/qttools
-dev-qt/qt5compat
-dev-qt/qtcore
-dev-qt/qtdbus
-dev-qt/qtgraphicaleffects
-dev-qt/qtgui
-dev-qt/qtimageformats
-dev-qt/qtlocation
-dev-qt/qtmultimedia
-dev-qt/qtnetwork
-dev-qt/qtpositioning
-dev-qt/qtquick3d
-dev-qt/qtquickcontrols2
-dev-qt/qtquicktimeline
-dev-qt/qtsensors
-dev-qt/qtspeech
-dev-qt/qttest
-dev-qt/qtvirtualkeyboard
-dev-qt/qtwayland
-dev-qt/qtwayland
-dev-qt/qtwidgets

sdata/dist-gentoo/useflags

@@ -39,7 +39,7 @@ media-fonts/twemoji X
 ################### HYPRLAND ################### 
 #gui-apps/hypridle (no use flags)
 #gui-libs/hyprcursor (no use flags)
-gui-wm/hyprland X qtutils
+gui-wm/hyprland::hyproverlay X guiutils
 #gui-libs/hyprland-qtutils (no use flags)
 #gui-libs/hyprland-qt-support (no use flags)
 #dev-libs/hyprlang (no use flags)