gentoo auto-resync : 11:08:2024 - 11:06:01

5 files changed, 21 insertions, 62 deletions

diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index a082d8c6e7f1..24cf0b8a5b9d 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,10 +1,8 @@
-AUX bash-completion-fix-0.39.1.patch 1428 BLAKE2B 5fac61964fc255357e73f7d3cc7120818336849a049b83a7b728b5775995ce4b90b3496620962a596ca74f45a7933950568300e193e2e8d13f130bbdf06c756d SHA512 4101bb40509eec8a1649315d8fdb54d683347a576564f80b5a9e2d958fe75cc7e5ff3b669ed24cf8d897929e1eba4ab3c92b7287cc6ac9a90f2b7c01c93ab1f6
-AUX wlroots-hyprland-apply-0.40.0.patch 669 BLAKE2B be2bd47edc1eb640dd8a8e0be24cb9f9dea5c9a722dffde5d0fb6a11b2deb6a52f14b964a2043b9cbd08e32b769fee8597e9965ca76095c4c5453d356bdea673 SHA512 ba34e30f2f88afbb2758eee9479a523bcfa70596663faa825116a95a6b646bdb6333fa1a400d60b93ac65499c19809e8b181983b8dce3bcaa3b1aab00274c11e
 DIST hyprland-0.41.1.gh.tar.gz 54813832 BLAKE2B 1dd17e7e1f885da91fca596bf8ce9efc76b3110640a9bc11538fabf975eb55d76180c202527e0b0eac300f027adfed815d2a9a5396a48429097ef2a5ffcc4d9e SHA512 fa63e7c429e33535fa30ca70133f6ac8617f2386bdca1e8063628a2895677c9b80965548ee21f897aea2fe6bdcc10d74d8c46989a7563b36504f4a4f43c3eaad
 DIST hyprland-0.41.2.gh.tar.gz 54821598 BLAKE2B 026559e9319690e6b48863ffdc2e059c969ab45e7bfe75578b7e41f1d10b36e720ae0655f7003107a4ff4e94c1e95aba3e8a1af8ed01bae369c571e24d966aec SHA512 5a138d9ad6de2d45d8d0a5cde8c39ba3cd4c6bac61caf5b9f8520d0adcafe6ac1dfec4c529b8a6608133ffe9409935c1414a86d98d743be6766bdbc72641179d
 DIST hyprland-0.42.0.gh.tar.gz 54225438 BLAKE2B a947289c5568408d71383034a290f114b974f442ed1f56ac3ec30e49519ee886ac83e1f2611577a7240a555480a59bc01defb79b2aca2122ef0d81ea007f5486 SHA512 839916957abc867ad9a3a32b6f74830055060b99c4c1de314f71a85f8d55ef051c5adb7c79dd7a7e10f81d1130aa032458bb65ce2454198a79faa719021f66af
 EBUILD hyprland-0.41.1.ebuild 3450 BLAKE2B 9f7660c38c7a8440d311e9586592fbd83558ae295f6391c17b9c1793c8a2ecfd54fd4d54095a493b7d525317dc967064eb10fac2f1f5e80f01695c22a1b1ab66 SHA512 5ffd43609f6b752925dc636d2e675d732307160ca703c130edc7f5a4e79eb93c18dec170c0097a45907e7fb7767d5c354b908758542f8f4b48dfc884312eaccb
 EBUILD hyprland-0.41.2.ebuild 3227 BLAKE2B 4da40fbf06cb1d9c9dac0efe98d131475906eda860d4ec69bba231a55d6d93c3a89fc31f5d165de086f4cf30f84f51a24db63d8ab5466a33f556f7b9d86bbc51 SHA512 66da766d7d68071304b4eeda1a42c9490274c41035ea9f49d78a92d7d0aca12560e4ddeae2df6a4324cb00c2636cd74cce066087d236b81f6598c8a09e720d33
-EBUILD hyprland-0.42.0.ebuild 2273 BLAKE2B 2797f8371c0cb710e908fcee9ee3042a17c8e1628dcb30717db3d8f00a8f0cada0ad1629b54ca461a91c591926849b5eb99f91cbdb7302b423cfb4f18e3c57d9 SHA512 93478943c68b6dc06874b7a661332b3d02afab6260a165522933222265f8b0698145fd102daea482788a5a02550b957a7926dca4496393305a652139c87939d6
-EBUILD hyprland-9999.ebuild 2273 BLAKE2B 2797f8371c0cb710e908fcee9ee3042a17c8e1628dcb30717db3d8f00a8f0cada0ad1629b54ca461a91c591926849b5eb99f91cbdb7302b423cfb4f18e3c57d9 SHA512 93478943c68b6dc06874b7a661332b3d02afab6260a165522933222265f8b0698145fd102daea482788a5a02550b957a7926dca4496393305a652139c87939d6
+EBUILD hyprland-0.42.0-r1.ebuild 2357 BLAKE2B ef3afe64de415058d6c7c7777afc87357c2e1c2e44291ba27ab4241f6eedf3935d1ab6ea300148431a4bc7bc3760b43aa5f9d580bba7cbf75a93c390605eadb5 SHA512 62b4502b0319cbcab715949119c5ab088bb1a6bd10c057794c0940ba543b6c2f12585567f486212bb4adf1c80a99faa3131cadab90dc7334df4f18a1fef427ae
+EBUILD hyprland-9999.ebuild 2243 BLAKE2B a9255e0b44eb9aab3a9b1b2433ae801d451267ddd2924dc20d8f3f8cf58f8d800114197894f59bfe0321658751b3f316296a4cfc02aede812f4058db6f8c3332 SHA512 0d6e0c1e4d5974d80e8145eb037f2c993d765dbd6a0a07350ca2221087f43e14f77aa91b17d1f7bc9de2987c546cd04447c81de1bd54f9bd8a264b4a107ab670
 MISC metadata.xml 842 BLAKE2B a18d149e43389e07733358e7295c2a9c1aca796292764a7598e9fb2902c3f7ec69b8c7226e245f2bb19df18ff55522c0e1025b43a48f9f44bfa54df6b5aad938 SHA512 1d236b3417f157c2d2604465fcfd1a36a118b96a5cc938b584cb65b1b930ed658497508912680ede27a54e2ea51d87a833f34fe925d0e619e75ce120d6273bde
diff --git a/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch b/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch
deleted file mode 100644
index fe48ce45dd3a..000000000000
--- a/gui-wm/hyprland/files/bash-completion-fix-0.39.1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/hyprwm/Hyprland/pull/5653
-
---- a/hyprctl/meson.build
-+++ b/hyprctl/meson.build
-@@ -2,6 +2,6 @@ executable('hyprctl', 'main.cpp',
-   install: true
- )
-
--install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion'), install_tag: 'runtime', rename: 'hyprctl')
-+install_data('hyprctl.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), install_tag: 'runtime', rename: 'hyprctl')
- install_data('hyprctl.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime')
- install_data('hyprctl.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprctl')
---- a/hyprpm/src/meson.build
-+++ b/hyprpm/src/meson.build
-@@ -9,6 +9,6 @@ executable('hyprpm', src,
-   install : true
- )
-
--install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion'), install_tag: 'runtime', rename: 'hyprpm')
-+install_data('../hyprpm.bash', install_dir: join_paths(get_option('datadir'), 'bash-completion/completions'), install_tag: 'runtime', rename: 'hyprpm')
- install_data('../hyprpm.fish', install_dir: join_paths(get_option('datadir'), 'fish/vendor_completions.d'), install_tag: 'runtime')
- install_data('../hyprpm.zsh', install_dir: join_paths(get_option('datadir'), 'zsh/site-functions'), install_tag: 'runtime', rename: '_hyprpm')
diff --git a/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch b/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch
deleted file mode 100644
index 65148b64137f..000000000000
--- a/gui-wm/hyprland/files/wlroots-hyprland-apply-0.40.0.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/patches/apply.sh b/patches/apply.sh
-index d5492b1b..87d84848 100755
---- a/subprojects/wlroots-hyprland/patches/apply.sh
-+++ b/subprojects/wlroots-hyprland/patches/apply.sh
-@@ -4,15 +4,15 @@
- PATCHES=$(find patches/ -type f -name '*.patch')
- 
- apply () {
--	git apply $PATCH
-+	patch -p1 -r /dev/null -N -s < $PATCH >/dev/null 2>&1 && echo NEW: \'$PATCH\'
- }
- 
- check_applied () {
--	git apply --check --reverse -q $PATCH
-+	patch -p1 -r /dev/null --dry-run -R -s < $PATCH >/dev/null 2>&1 && echo OK: \'$PATCH\'
- }
- 
- fail () {
--	echo =======\> \'$PATCH\' was not applied && exit 1
-+	echo FAILED: \'$PATCH\' NOT APPLICABLE && exit 1
- }
- 
- if [ -n "$PATCHES" ];
diff --git a/gui-wm/hyprland/hyprland-0.42.0.ebuild b/gui-wm/hyprland/hyprland-0.42.0-r1.ebuild
index 0201229de28e..0c9148aefe21 100644
--- a/gui-wm/hyprland/hyprland-0.42.0.ebuild
+++ b/gui-wm/hyprland/hyprland-0.42.0-r1.ebuild
@@ -46,20 +46,22 @@ RDEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
+	x11-libs/libXcursor
 	X? (
 		x11-libs/libxcb:0=
+		x11-base/xwayland
+		x11-libs/xcb-util-errors
+		x11-libs/xcb-util-wm
 	)
 "
 DEPEND="
 	${RDEPEND}
-	${WLROOTS_DEPEND}
 	>=dev-libs/hyprland-protocols-0.3
 	>=dev-libs/hyprlang-0.3.2
 	>=dev-libs/wayland-protocols-1.36
 	>=gui-libs/hyprutils-0.2.1
 "
 BDEPEND="
-	${WLROOTS_BDEPEND}
 	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
 	app-misc/jq
 	dev-build/cmake
@@ -81,13 +83,17 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	# skip version.h
+	sed -i -e "s|scripts/generateVersion.sh|echo|g" meson.build || die
+	default
+}
+
 src_configure() {
 	local emesonargs=(
 		$(meson_feature legacy-renderer legacy_renderer)
 		$(meson_feature systemd)
 		$(meson_feature X xwayland)
-		-Dwlroots:backends=drm,libinput$(usev X ',x11')
-		-Dwlroots:xcb-errors=disabled
 	)
 
 	meson_src_configure
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index 0201229de28e..087e0987105b 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -46,21 +46,23 @@ RDEPEND="
 	x11-libs/libxkbcommon
 	x11-libs/pango
 	x11-libs/pixman
+	x11-libs/libXcursor
 	X? (
 		x11-libs/libxcb:0=
+		x11-base/xwayland
+		x11-libs/xcb-util-errors
+		x11-libs/xcb-util-wm
 	)
 "
 DEPEND="
 	${RDEPEND}
-	${WLROOTS_DEPEND}
 	>=dev-libs/hyprland-protocols-0.3
 	>=dev-libs/hyprlang-0.3.2
 	>=dev-libs/wayland-protocols-1.36
 	>=gui-libs/hyprutils-0.2.1
 "
 BDEPEND="
-	${WLROOTS_BDEPEND}
-	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
+	|| ( >=sys-devel/gcc-14:* >=sys-devel/clang-18:* )
 	app-misc/jq
 	dev-build/cmake
 	>=dev-util/hyprwayland-scanner-0.3.8
@@ -70,12 +72,12 @@ BDEPEND="
 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"
+	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 16 ; then
-		eerror "Hyprland requires >=sys-devel/clang-16 to build"
+	elif tc-is-clang && ver_test $(clang-version) -lt 18 ; then
+		eerror "Hyprland requires >=sys-devel/clang-18 to build"
 		eerror "Please upgrade Clang: emerge -v1 sys-devel/clang"
 		die "Clang version is too old to compile Hyprland!"
 	fi
@@ -86,8 +88,6 @@ src_configure() {
 		$(meson_feature legacy-renderer legacy_renderer)
 		$(meson_feature systemd)
 		$(meson_feature X xwayland)
-		-Dwlroots:backends=drm,libinput$(usev X ',x11')
-		-Dwlroots:xcb-errors=disabled
 	)
 
 	meson_src_configure