gentoo auto-resync : 23:02:2024 - 05:40:46

5 files changed, 4 insertions, 137 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index e3bd73e693ac..ffd34a850077 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 70b97ac085a9..aac957a604d5 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,9 +1,7 @@
 AUX gcc14.patch 1300 BLAKE2B c737318ca98ca4a3782353c74656b4f13abd675fcd61c4ccd8b80f72161b11b601f4fc07774c6c174ee141e215f99d8949cf2eb4f617a445f4502f890767c7ac SHA512 aa7e4bfadf12c8bf6e26b4e0751d7906a8fcf9171587d4f5561e2af22ee28b62100bc9e7759b760a92414d6004fecdda00fe2d140264738d0cb1eec86ff00172
-DIST hyprland-0.32.3.gh.tar.gz 14119304 BLAKE2B 304878a3bb167da9ceae8afbde21bf2c64b81ffd61c13ccfd772f240d234bb9cbd448f7ae2d0fcc6d8e7c7e29e1eca66ad68d98cfef9b22caccae9ee9f3ae39d SHA512 521cfa6b3621142cb4cc1e6c11978e49f28b29836a1a8e00cc2c697f44dcf620da63e9d39deeabb41130a56c65464b6117416c8a3c1bd690bb056955b7ccea40
 DIST hyprland-0.34.0.gh.tar.gz 14128415 BLAKE2B 059fc8b849daeb71b08d7114fd8aea1264c0e9967f471df66b27aca46b95fd499d2929730ba66981bb7d6c423479533b280839db7839ca1df007825f72fb9bf8 SHA512 35cce0668a13d7e7fd220d62efd965a069ff0213996bfa47ca0852c6258881bc070020d4831364b325b71d8ce7373d1793a89006a4341088dcbaf01914920f1a
 DIST hyprland-0.35.0.gh.tar.gz 54200453 BLAKE2B f5a8a5ed5f5ca28e5fc5a329d5191abce458b9bf0b99bee970aaa4be40671bfe945dabe2b3ff34ca753beeb35ec7fe016e6a54669dbe1ee4f25e2c128c3e390d SHA512 5afe7c340b994f2542982d8c8fa837b2a43ef9e487810fec0b33e4a5cc9188b71e41a0be22839191cf15e9c1fdfd964d0751def51f93db438e4a45649077c8a7
-EBUILD hyprland-0.32.3.ebuild 3480 BLAKE2B 69da0a3898215a523eea91e9570e7664faa872d353643be2b56255fd6c583a6ecc84458e4ed0569c6dd75ba755cde57edbf06811372a8de11bf4a466932a6870 SHA512 ace99762fbbaff0070c600b0143149804dac32f0a32740b54b34269974bdb11fefe2a7b3ee2a6c6a0316fa17b7e41d1a1019f1de66d64153989d67d285baf843
 EBUILD hyprland-0.34.0.ebuild 3732 BLAKE2B 931c743c8bf05fe46179ec7fd4968439899b1dcd6e9afc23b01ab86372a666342b9fe7b27b49dca10d08e1c6eb667dae823e0acdfccdbdb05ceed7856a80a8e0 SHA512 dada8e515fb9eaae7bca023b5e5442f78c19ff9483a0a7f30b148fad7fc1cf6222d739bf35ad41a494f10dba59faa0f0c416c06064b139b166b9ff8a6e1c2533
-EBUILD hyprland-0.35.0.ebuild 3686 BLAKE2B 16fe562acdacb24653ee65ef5be9362da91c56189ebd6db2a66f744b0f230071abbf2a37687bf6073f716c9d18eafc1cdddaccb087cabc7b18fc7bde43796037 SHA512 651908a5d41dfe8ad6686b3a9188a570b1151adaf656dd424bcd17c06fd1a3642699d79969ebcb1111e3e97606a12fa7147c8bc0e147170ddbf882eadbcc1672
-EBUILD hyprland-9999.ebuild 3686 BLAKE2B 175835f9077b019bcac005e5659e95c745e9e6c7eb61a88bf2e175af0c5aaf87dfb5cbad7b4e4f3ba0c708c1af2e548ec2bade747952e8530289ebb013e1ac19 SHA512 6a6bf543420e207b0d92ba57c7a9485a23387a8b23cd8515dea42ba108ef4e0bd653973692260c5cfe3939c08e2c5e649813f2a07a5ab5ff729095c73a1940d3
+EBUILD hyprland-0.35.0-r1.ebuild 3669 BLAKE2B 8d9558c003d134a30e0dddcbab4656adef342446542931b245ba11396836d7bd021b0aa6df21d78a518978ce19693a1b85809014e6a2d68600a3f856c25c0697 SHA512 48cd123d85feaa75447f3284343ad92276d90307e4ffa87cea2be66e171c77b3e2fa65fa3819503b9e14c26a321fa932be7dc2bf79d04844f2b5c68d532605e0
+EBUILD hyprland-9999.ebuild 3705 BLAKE2B 98516477a8009ec7255faf6c161c98eca3ca29254a03bb4ee1921080a27cc9e4b349acedcbb8908ca2c81ae7aa5c3c28da19a99cbdbe32dd225653f560613833 SHA512 8fb16cb84085cc760b9e82ae9329ada018e1fb77aba55af98c10a7b23d5c404fb9a3a7179ae0fcc528bd5f51915d7d66bf62d8750a1557b96ee8f53e9acf3945
 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98
diff --git a/gui-wm/hyprland/hyprland-0.32.3.ebuild b/gui-wm/hyprland/hyprland-0.32.3.ebuild
deleted file mode 100644
index 5341f4ae2f59..000000000000
--- a/gui-wm/hyprland/hyprland-0.32.3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson toolchain-funcs
-
-DESCRIPTION="A dynamic tiling Wayland compositor that doesn't sacrifice on its looks"
-HOMEPAGE="https://github.com/hyprwm/Hyprland"
-
-SRC_URI="https://github.com/hyprwm/${PN^}/releases/download/v${PV}/source-v${PV}.tar.gz -> ${P}.gh.tar.gz"
-S="${WORKDIR}/${PN}-source"
-
-KEYWORDS="amd64 ~riscv"
-LICENSE="BSD"
-SLOT="0"
-IUSE="X legacy-renderer systemd video_cards_nvidia"
-
-# 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_RDEPEND="
-	>=dev-libs/libinput-1.14.0:=
-	dev-libs/libliftoff
-	>=dev-libs/wayland-1.22
-	media-libs/libdisplay-info
-	media-libs/libglvnd
-	media-libs/mesa[egl(+),gles2]
-	sys-apps/hwdata:=
-	sys-auth/seatd:=
-	>=x11-libs/libdrm-2.4.114
-	x11-libs/libxkbcommon
-	>=x11-libs/pixman-0.42.0
-	virtual/libudev:=
-	X? (
-		x11-base/xwayland
-		x11-libs/libxcb:0=
-		x11-libs/xcb-util-renderutil
-		x11-libs/xcb-util-wm
-	)
-"
-WLROOTS_DEPEND="
-	>=dev-libs/wayland-protocols-1.32
-"
-WLROOTS_BDEPEND="
-	dev-util/glslang
-	dev-util/wayland-scanner
-"
-
-RDEPEND="
-	${WLROOTS_RDEPEND}
-	dev-libs/glib:2
-	dev-libs/libinput
-	dev-libs/wayland
-	media-libs/libglvnd
-	x11-libs/cairo
-	x11-libs/libdrm
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	X? (
-		x11-libs/libxcb:0=
-	)
-"
-DEPEND="
-	${RDEPEND}
-	${WLROOTS_DEPEND}
-	dev-libs/hyprland-protocols
-	>=dev-libs/wayland-protocols-1.25
-"
-BDEPEND="
-	${WLROOTS_BDEPEND}
-	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
-	app-misc/jq
-	dev-build/cmake
-	dev-util/wayland-scanner
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	if tc-is-gcc && ver_test $(gcc-version) -lt 13 ; then
-		eerror "Hyprland requires >=sys-devel/gcc-13 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 16 ; then
-		eerror "Hyprland requires >=sys-devel/clang-16 to build"
-		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
-		die "Clang version is too old to compile Hyprland!"
-	fi
-}
-
-src_prepare() {
-	if use video_cards_nvidia; then
-		cd "${S}/subprojects/wlroots" || die
-		eapply "${S}/nix/patches/wlroots-nvidia.patch"
-		cd "${S}" || die
-	fi
-
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		$(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
-
-	# Wlroots headers are required by hyprland-plugins and the pkgconfig file expects
-	# them to be in /usr/include/hyprland/wlroots, despite this they aren't installed there.
-	# Ideally you could override includedir per subproject and the install tags would
-	# be granular enough to only install headers. But its not requiring this.
-	mkdir "${ED}"/usr/include/hyprland/wlroots || die
-	mv "${ED}"/usr/include/wlr "${ED}"/usr/include/hyprland/wlroots || die
-	# devel tag includes wlroots .pc and .a files still
-	rm -rf "${ED}"/usr/$(get_libdir)/ || die
-}
diff --git a/gui-wm/hyprland/hyprland-0.35.0.ebuild b/gui-wm/hyprland/hyprland-0.35.0-r1.ebuild
index 640be8a77ac9..bd70e22a7247 100644
--- a/gui-wm/hyprland/hyprland-0.35.0.ebuild
+++ b/gui-wm/hyprland/hyprland-0.35.0-r1.ebuild
@@ -29,7 +29,6 @@ HYPRPM_RDEPEND="
 	dev-build/cmake
 	dev-build/meson
 	dev-vcs/git
-	sys-auth/polkit
 	virtual/pkgconfig
 "
 # bundled wlroots has the following dependency string according to included headers.
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index 14c7837e3e21..0af159a801c3 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -56,7 +56,7 @@ WLROOTS_RDEPEND="
 	)
 "
 WLROOTS_DEPEND="
-	>=dev-libs/wayland-protocols-1.32
+	>=dev-libs/wayland-protocols-1.33
 "
 WLROOTS_BDEPEND="
 	dev-util/glslang
@@ -83,6 +83,7 @@ DEPEND="
 	${RDEPEND}
 	${WLROOTS_DEPEND}
 	dev-libs/hyprland-protocols
+	dev-libs/hyprlang
 	>=dev-libs/wayland-protocols-1.25
 "
 BDEPEND="