gentoo auto-resync : 02:07:2024 - 08:01:06

4 files changed, 143 insertions, 21 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index fbf86686b746..7eae478172cf 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 75a512468d1b..65caf41b14fa 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -4,9 +4,11 @@ DIST hyprland-0.37.1.gh.tar.gz 54651435 BLAKE2B 92bd78168909510ffb21b46f7d66e139
 DIST hyprland-0.39.1.gh.tar.gz 54681029 BLAKE2B 5a78c5e7cef3369fd72abc05941f88f0391fb87e79afaa13c128acd9f8d2aa79d6af4d0dc82a90c09689993fe914ac48bc5ba4a32173eed31ecc20204f5a4edc SHA512 da8ee577aa823c9fb7b45bfd07503656561c1cd4cac42a9bf8f582f653c93b20824b3bce7bbcbd47b7f7f8e83fb1b630d6d5c983fe345c971322369f193c2c8f
 DIST hyprland-0.40.0.gh.tar.gz 54734246 BLAKE2B 54d5b1bb062003e38156c67bfc0b796d0e4d855f35b0122fa191037caa47e5be2a25acfe588835c49ac747fc7430124480e4a7716782fd23d028289bee236e7f SHA512 948e7237fa811f104ee11764d7947d2fd8291e79cf6db00d3f3905204f5bb2df1e51e26b2600f086f5b22d910ef50c2941343dd05e7a5d2f4b6053b150800f21
 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
 EBUILD hyprland-0.37.1-r1.ebuild 3776 BLAKE2B 695ad287b51c217d6b6cf340e9737de64d43a21bb03265d5dc8ac738c91aac37af020950b81d928d6b182b49388855b68a752e614a6b96db11045d9b37afec4d SHA512 663d4f5a8e8ed20c6a80ca7fc9d3b86605a48651c0900f173d98110b494200b1832a7ca195c79e72a08b38c1e64eb6de54aa16e38ce606c81aa4007c354c95f1
 EBUILD hyprland-0.39.1-r3.ebuild 3967 BLAKE2B 2d469c0a319227b1ce83fd1ab8be9cc04cfeb43737ee717ec0f163afb0c3f162332760c5c5cedea089303e6d913a20ac91719cb37ff1f36aa3c290085527af9c SHA512 038d6297db31571f67cf3b4181012ab29625d13d2a3952bb4214539dede9dfdafc7ea4429523fb47e2fb407cb6c7bc5f8c4ecd6d3328e01aa5e5f75184464830
 EBUILD hyprland-0.40.0-r1.ebuild 4009 BLAKE2B 129b4d55aa26fbc9f282a1b2de230a1431770aaec9c088a28874dfb08de81871774df26f3571494dfa62c3ed9631aa0af739e169e95269ba416edae2344ee01a SHA512 2be06355e9fb98a187e9aa3754cae800eab0fa91ffaac7ce69f0f8cf955a67bf3affc6a73b7c3d78af5ed8da1b2ba0150f323dbea5940c855c7398eb20799224
 EBUILD hyprland-0.41.1.ebuild 3451 BLAKE2B 21286db4b04d32cbb340069a44f022c3fb8ae65fa83fe5d7bd8891980bedc7cf7984bf6c8a9be91b57853818d96a7e151b0b40afec1bc65d8f8c5bef7d37ea91 SHA512 b9c860711a669f7c80472485effb254d841735043911255b72ac5d8b6af14b7f1df4dfcb708e6b137c73131b86ab498e6822fa9de5686b799e8f6217bacfa381
-EBUILD hyprland-9999.ebuild 3855 BLAKE2B ff90716f20b3d7519fc9a76663ab6f9b0dfdd51b31a4e4c706350aedbb1a05d169c17fe513c97ea51894a357b73d139b1ec47b60309ff353fd03996ee831d292 SHA512 52a0d5078f5ea5398822828acfab73af26184f8895a362638d5a8c3849ae09700b1c5532250d5f94c469f94f189cbbbdb11621f0fd4d66247cdd9c7539bde2b9
+EBUILD hyprland-0.41.2.ebuild 3227 BLAKE2B 4da40fbf06cb1d9c9dac0efe98d131475906eda860d4ec69bba231a55d6d93c3a89fc31f5d165de086f4cf30f84f51a24db63d8ab5466a33f556f7b9d86bbc51 SHA512 66da766d7d68071304b4eeda1a42c9490274c41035ea9f49d78a92d7d0aca12560e4ddeae2df6a4324cb00c2636cd74cce066087d236b81f6598c8a09e720d33
+EBUILD hyprland-9999.ebuild 3113 BLAKE2B 0b4fc852279010e7e4a74f69cbade4bf94b806eb6ae881783a3ab6e79da5c1767c3d6f5f6ff6c1407745d58dd662cca17276729c40b5dc4817311c5ee907d465 SHA512 643ee5c75ea794f607e648fc64a493de89f30f0879bb915f770297aa5bb55201acedca66d3b940408372100963fa16c86e46d3a346017055fb688d9b90ea95f7
 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98
diff --git a/gui-wm/hyprland/hyprland-0.41.2.ebuild b/gui-wm/hyprland/hyprland-0.41.2.ebuild
new file mode 100644
index 000000000000..9c3bfc3cf5cb
--- /dev/null
+++ b/gui-wm/hyprland/hyprland-0.41.2.ebuild
@@ -0,0 +1,135 @@
+# 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"
+
+if [[ "${PV}" = *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hyprwm/${PN^}.git"
+else
+	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"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="X legacy-renderer systemd"
+
+# hyprpm (hyprland plugin manager) requires the dependencies at runtime
+# so that it can clone, compile and install plugins.
+HYPRPM_RDEPEND="
+	app-alternatives/ninja
+	dev-build/cmake
+	dev-build/meson
+	dev-libs/libliftoff
+	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.9
+	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-0.3
+	>=dev-libs/hyprlang-0.3.2
+	>=dev-libs/wayland-protocols-1.36
+	>=gui-libs/hyprutils-0.1.5
+"
+BDEPEND="
+	${WLROOTS_BDEPEND}
+	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
+	app-misc/jq
+	dev-build/cmake
+	>=dev-util/hyprwayland-scanner-0.3.8
+	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() {
+	# 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)
+		$(meson_feature X wlroots: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 1b9ccde49fd6..f7df6d445341 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -73,7 +73,7 @@ RDEPEND="
 	dev-libs/glib:2
 	dev-libs/libinput
 	>=dev-libs/wayland-1.20.0
-	>=gui-libs/hyprcursor-0.1.7
+	>=gui-libs/hyprcursor-0.1.9
 	media-libs/libglvnd
 	x11-libs/cairo
 	x11-libs/libdrm
@@ -87,16 +87,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.1.5
 "
 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
 "
 
@@ -126,19 +127,3 @@ src_configure() {
 
 	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
-}