commit: e276e9e2928031386ec683d3e699bb6fd0a9418b Author: Johannes Huber <johu <AT> gmx <DOT> de> AuthorDate: Sat May 17 13:42:23 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat May 17 14:17:08 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e276e9e2
gui-wm/hyprland: use subslot on gui-libs/aquamarine Signed-off-by: Johannes Huber <johu <AT> gmx.de> Part-of: https://github.com/gentoo/gentoo/pull/42132 Signed-off-by: Sam James <sam <AT> gentoo.org> ...{hyprland-0.48.1.ebuild => hyprland-0.48.1-r1.ebuild} | 2 +- gui-wm/hyprland/hyprland-9999.ebuild | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gui-wm/hyprland/hyprland-0.48.1.ebuild b/gui-wm/hyprland/hyprland-0.48.1-r1.ebuild similarity index 98% rename from gui-wm/hyprland/hyprland-0.48.1.ebuild rename to gui-wm/hyprland/hyprland-0.48.1-r1.ebuild index 6a20f03c6f67..ad20c81124a4 100644 --- a/gui-wm/hyprland/hyprland-0.48.1.ebuild +++ b/gui-wm/hyprland/hyprland-0.48.1-r1.ebuild @@ -41,7 +41,7 @@ RDEPEND=" dev-libs/re2:= >=dev-libs/udis86-1.7.2 >=dev-libs/wayland-1.22.90 - >=gui-libs/aquamarine-0.8.0 + >=gui-libs/aquamarine-0.8.0:= >=gui-libs/hyprcursor-0.1.9 >=gui-libs/hyprutils-0.5.2:= media-libs/libglvnd diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild index b57460937487..4ae8a5cb9327 100644 --- a/gui-wm/hyprland/hyprland-9999.ebuild +++ b/gui-wm/hyprland/hyprland-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -41,9 +41,9 @@ RDEPEND=" dev-libs/re2:= >=dev-libs/udis86-1.7.2 >=dev-libs/wayland-1.22.90 - >=gui-libs/aquamarine-0.4.2 + >=gui-libs/aquamarine-0.8.0:= >=gui-libs/hyprcursor-0.1.9 - gui-libs/hyprutils:= + >=gui-libs/hyprutils-0.5.2:= media-libs/libglvnd media-libs/mesa sys-apps/util-linux @@ -63,8 +63,9 @@ RDEPEND=" " DEPEND=" ${RDEPEND} - >=dev-libs/hyprland-protocols-0.4 - >=dev-libs/wayland-protocols-1.36 + dev-cpp/glaze + >=dev-libs/hyprland-protocols-0.6.0 + >=dev-libs/wayland-protocols-1.41 " BDEPEND=" || ( >=sys-devel/gcc-14:* >=llvm-core/clang-18:* ) @@ -77,11 +78,11 @@ BDEPEND=" pkg_setup() { [[ ${MERGE_TYPE} == binary ]] && return - if tc-is-gcc && ver_test $(gcc-version) -lt 14 ; then + if tc-is-gcc && ver_test $(gcc-version) -lt 14; then eerror "Hyprland requires >=sys-devel/gcc-14 to build" eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc" die "GCC version is too old to compile Hyprland!" - elif tc-is-clang && ver_test $(clang-version) -lt 18 ; then + elif tc-is-clang && ver_test $(clang-version) -lt 18; then eerror "Hyprland requires >=llvm-core/clang-18 to build" eerror "Please upgrade Clang: emerge -v1 llvm-core/clang" die "Clang version is too old to compile Hyprland!" @@ -94,6 +95,5 @@ src_configure() { $(meson_feature systemd) $(meson_feature X xwayland) ) - meson_src_configure }
