[gentoo-commits] repo/user/johnmh:master commit in: gui-wm/hyprland/

[John M. Harris, Jr.]

commit:     112313ee06dd1a292744440cdc9413206a1bff09
Author:     John M. Harris Jr. <johnmh <AT> johnmh <DOT> me>
AuthorDate: Mon Jul 22 19:05:09 2024 +0000
Commit:     John M. Harris, Jr. <johnmh <AT> johnmh <DOT> me>
CommitDate: Fri Jul 26 20:36:03 2024 +0000
URL:        https://gitweb.gentoo.org/repo/user/johnmh.git/commit/?id=112313ee

gui-wm/hyprland: Update dependencies

Signed-off-by: John M. Harris Jr. <johnmh <AT> johnmh.me>

 gui-wm/hyprland/hyprland-9999.ebuild | 56 ++++--------------------------------
 1 file changed, 6 insertions(+), 50 deletions(-)

diff --git a/gui-wm/hyprland/hyprland-9999.ebuild 
b/gui-wm/hyprland/hyprland-9999.ebuild
index c513e77..8202372 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -32,48 +32,14 @@ HYPRPM_RDEPEND="
        dev-vcs/git
        virtual/pkgconfig
 "
-# bundled wlroots has the following dependency string according to included 
headers.
-# wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
-# enable x11-backend with X and vice versa
-WLROOTS_DEPEND="
-       >=dev-libs/wayland-1.22
-       media-libs/libglvnd
-       || (
-               >=media-libs/mesa-24.1.0_rc1[opengl]
-               <media-libs/mesa-24.1.0_rc1[egl(+),gles2]
-       )
-       >=x11-libs/libdrm-2.4.114
-       x11-libs/libxkbcommon
-       >=x11-libs/pixman-0.42.0
-       media-libs/libdisplay-info:=
-       sys-apps/hwdata
-       >=dev-libs/libinput-1.14.0:=
-       sys-auth/seatd:=
-       virtual/libudev:=
-       X? (
-               x11-libs/libxcb:=
-               x11-libs/xcb-util-errors
-               x11-libs/xcb-util-renderutil
-               x11-libs/xcb-util-wm
-               x11-base/xwayland
-       )
-"
-WLROOTS_RDEPEND="
-       ${WLROOTS_DEPEND}
-"
-WLROOTS_BDEPEND="
-       >=dev-libs/wayland-protocols-1.32
-       dev-util/hyprwayland-scanner
-       virtual/pkgconfig
-"
 RDEPEND="
        ${HYPRPM_RDEPEND}
-       ${WLROOTS_RDEPEND}
        dev-cpp/tomlplusplus
        dev-libs/glib:2
        dev-libs/libinput
        >=dev-libs/wayland-1.20.0
-       >=gui-libs/hyprcursor-0.1.7
+       gui-libs/aquamarine
+       >=gui-libs/hyprcursor-0.1.9
        media-libs/libglvnd
        x11-libs/cairo
        x11-libs/libdrm
@@ -87,16 +53,17 @@ RDEPEND="
 DEPEND="
        ${RDEPEND}
        ${WLROOTS_DEPEND}
-       >=dev-libs/hyprland-protocols-0.2
+       >=dev-libs/hyprland-protocols-0.3
        >=dev-libs/hyprlang-0.3.2
-       >=dev-libs/wayland-protocols-1.34
+       >=dev-libs/wayland-protocols-1.36
+       >=gui-libs/hyprutils-0.2.0
 "
 BDEPEND="
        ${WLROOTS_BDEPEND}
        || ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
        app-misc/jq
        dev-build/cmake
-       dev-util/hyprwayland-scanner
+       >=dev-util/hyprwayland-scanner-0.3.8
        virtual/pkgconfig
 "
 
@@ -119,20 +86,9 @@ src_configure() {
                $(meson_feature legacy-renderer legacy_renderer)
                $(meson_feature systemd)
                $(meson_feature X xwayland)
-               $(meson_feature X wlroots:xwayland)
                -Dwlroots:backends=drm,libinput$(usev X ',x11')
                -Dwlroots:xcb-errors=disabled
        )
 
        meson_src_configure
 }
-
-src_install() {
-       # First install everything except wlroots to avoid conflicts.
-       meson_src_install --skip-subprojects wlroots
-       # Then install development files (mainly wlroots) for bug #916760.
-       meson_src_install --tags devel
-
-       # devel tag includes wlroots .pc and .a files still
-       rm -rf "${ED}"/usr/$(get_libdir)/ || die
-}