gentoo auto-resync : 16:04:2024 - 12:04:26

4 files changed, 159 insertions, 18 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index e4184fe33780..290653c5122d 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 31cd3ea9d70f..273891843912 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -3,9 +3,11 @@ DIST hyprland-0.34.0.gh.tar.gz 14128415 BLAKE2B 059fc8b849daeb71b08d7114fd8aea12
 DIST hyprland-0.37.1.gh.tar.gz 54651435 BLAKE2B 92bd78168909510ffb21b46f7d66e139e7b86f7655c7a8126eaf90b6ef6d7d5affaf0bc55ca1647a2f80b6d767afc00e1efe5f2241b2bc88d20357acee611b92 SHA512 f09316e210805b833a27524894222edc7a048b77f9f5d9cc8faa5b4e37040485ad3b9638f60a346da8d4d4aff24bbd6382b7fde64d07528990e9a521b2f46454
 DIST hyprland-0.38.0.gh.tar.gz 54658884 BLAKE2B a0a26f59b0c4967cf58258adc719912855853fc54c5ebf55d42d34ca51905021ce4755eaaaf9c07ca1cabd0502d2a9c2e6bf6455bda10f36c2960b2525738416 SHA512 8452a0dab1c71c336201977318bb24442fe3ca08ae349e31b015f011bbb6d98aaf19dcfdcd31349c85ab837d6cda24dab40409469d0721d930e59aa7e2282153
 DIST hyprland-0.38.1.gh.tar.gz 54701702 BLAKE2B 56f16d938099856be9aea0a089154e58a1d2226f42fc2a81a560e3f3883caed6eb76faa674340a3a4a1632df5a8c1a28d084c64c6749c3452c23ca192bef967b SHA512 addd4cea3f83e17907180288021718a66973c247b261e306accb7b32bbbbd2f0b3f4fcf4c22189614f561c361bfb99ea0645f4698e7af9491379d424d1d1142b
+DIST hyprland-0.39.0.gh.tar.gz 54724451 BLAKE2B 77913ad8afb97d063607c5afaeb977cb4bf0dd9e16a597b3af7613ca28729e9a3ff6ebbf954811d60d6fc74e222a85f77afdd1afc6c2c20438b8d56e4b97b859 SHA512 875ed6dab9015862974e57e7c360541e98ad7e7633669083dbaf3aa13b284ce9071cf70620fa8b46be02825487585b9dbfd792416a960db5b8bccad9062b3110
 EBUILD hyprland-0.34.0.ebuild 3732 BLAKE2B 931c743c8bf05fe46179ec7fd4968439899b1dcd6e9afc23b01ab86372a666342b9fe7b27b49dca10d08e1c6eb667dae823e0acdfccdbdb05ceed7856a80a8e0 SHA512 dada8e515fb9eaae7bca023b5e5442f78c19ff9483a0a7f30b148fad7fc1cf6222d739bf35ad41a494f10dba59faa0f0c416c06064b139b166b9ff8a6e1c2533
 EBUILD hyprland-0.37.1.ebuild 3715 BLAKE2B 9ad1db0bcb9e2c63fa3a23abe14c26c4a3fae60a46985731fbea497a9fa86165f1f7c942ad744cd84a5f8a7d2b711f93493ad04faf23317c89bee3adb631c499 SHA512 3de2a9ed87567edf2707e2997ebc2cef0ac3f914aed184ae4121515298f1c566075fcb3e4b1ca2dc19b333676dcc259dfea110b5deb177629ed6d46396938e35
 EBUILD hyprland-0.38.0.ebuild 3735 BLAKE2B 867a6609496a33ebb6863c7d0405136e83eea51b5967527a71027b61259a3887395f8c623bf81372db92845d0497e40ac987eec06c47ee57156f4145d5f09939 SHA512 8bd315cb5cecec8c3aab4c2d9c768cb4c18e07b286b1828072f5897ab567861b28a128f6adfd94606653610e551fc845c710c58bd5525a5ddb9cacd48985fd85
 EBUILD hyprland-0.38.1.ebuild 3735 BLAKE2B 867a6609496a33ebb6863c7d0405136e83eea51b5967527a71027b61259a3887395f8c623bf81372db92845d0497e40ac987eec06c47ee57156f4145d5f09939 SHA512 8bd315cb5cecec8c3aab4c2d9c768cb4c18e07b286b1828072f5897ab567861b28a128f6adfd94606653610e551fc845c710c58bd5525a5ddb9cacd48985fd85
-EBUILD hyprland-9999.ebuild 3709 BLAKE2B 71bccc3a7ea591f2d91c192d3cec48f8c1218507851bf5fdd9b93f0ff69191c27b1e52beec781ba02aea624fe09a520aa23e87059056970cb37396be3383df40 SHA512 ebc011e832f723c6dfb2087e159f45eda07ab96ce27baf7a24a4a842801a940351045a5081e1f5ae2ed07fdd4b1a4917e63bae395443364f23207427b127c7ba
+EBUILD hyprland-0.39.0.ebuild 3740 BLAKE2B 6a5bd57339aea420e2e3a40fc4f5fda5423b291327a841c95339d23a255b48620459c33215554c765807cfa6f4174cd2a70cf660044a3c35e27b6577e0b680cb SHA512 9917eab667b7f690166b8d5abf289e5b59c6510888af4445cb504d69c66bdba2f939af14942bdc621f0fa53196e576396ef473f5f45de30497dd7a6721f8a2c5
+EBUILD hyprland-9999.ebuild 3735 BLAKE2B 867a6609496a33ebb6863c7d0405136e83eea51b5967527a71027b61259a3887395f8c623bf81372db92845d0497e40ac987eec06c47ee57156f4145d5f09939 SHA512 8bd315cb5cecec8c3aab4c2d9c768cb4c18e07b286b1828072f5897ab567861b28a128f6adfd94606653610e551fc845c710c58bd5525a5ddb9cacd48985fd85
 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98
diff --git a/gui-wm/hyprland/hyprland-0.39.0.ebuild b/gui-wm/hyprland/hyprland-0.39.0.ebuild
new file mode 100644
index 000000000000..94a191ed8244
--- /dev/null
+++ b/gui-wm/hyprland/hyprland-0.39.0.ebuild
@@ -0,0 +1,139 @@
+# 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}-rev1.tar.gz -> ${P}.gh.tar.gz"
+	S="${WORKDIR}/${PN}-source"
+
+	KEYWORDS="~amd64 ~riscv"
+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-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[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-renderutil
+		x11-libs/xcb-util-wm
+		x11-base/xwayland
+	)
+"
+WLROOTS_RDEPEND="
+	${WLROOTS_DEPEND}
+"
+WLROOTS_BDEPEND="
+	>=dev-libs/wayland-protocols-1.32
+	dev-util/wayland-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
+	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.2
+	>=dev-libs/hyprlang-0.3.2
+	>=dev-libs/wayland-protocols-1.32
+"
+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_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-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index d319336d3193..a2006ea15983 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -15,7 +15,7 @@ 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"
+	KEYWORDS="~amd64 ~riscv"
 fi
 
 LICENSE="BSD"
@@ -34,32 +34,32 @@ HYPRPM_RDEPEND="
 # 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
+WLROOTS_DEPEND="
 	>=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.118
+	>=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-base/xwayland
-		x11-libs/libxcb:0=
+		x11-libs/libxcb:=
 		x11-libs/xcb-util-renderutil
 		x11-libs/xcb-util-wm
+		x11-base/xwayland
 	)
 "
-WLROOTS_DEPEND="
-	>=dev-libs/wayland-protocols-1.33
+WLROOTS_RDEPEND="
+	${WLROOTS_DEPEND}
 "
 WLROOTS_BDEPEND="
-	dev-util/glslang
+	>=dev-libs/wayland-protocols-1.32
 	dev-util/wayland-scanner
+	virtual/pkgconfig
 "
 RDEPEND="
 	${HYPRPM_RDEPEND}
@@ -67,7 +67,7 @@ RDEPEND="
 	dev-cpp/tomlplusplus
 	dev-libs/glib:2
 	dev-libs/libinput
-	dev-libs/wayland
+	>=dev-libs/wayland-1.20.0
 	gui-libs/hyprcursor
 	media-libs/libglvnd
 	x11-libs/cairo
@@ -82,9 +82,9 @@ RDEPEND="
 DEPEND="
 	${RDEPEND}
 	${WLROOTS_DEPEND}
-	dev-libs/hyprland-protocols
-	dev-libs/hyprlang
-	>=dev-libs/wayland-protocols-1.25
+	>=dev-libs/hyprland-protocols-0.2
+	>=dev-libs/hyprlang-0.3.2
+	>=dev-libs/wayland-protocols-1.32
 "
 BDEPEND="
 	${WLROOTS_BDEPEND}