gentoo auto-resync : 03:01:2024 - 19:55:55

3 files changed, 41 insertions, 24 deletions

diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 978e372c861b..d1537378a9a0 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,10 +1,10 @@
 AUX gcc14.patch 1300 BLAKE2B c737318ca98ca4a3782353c74656b4f13abd675fcd61c4ccd8b80f72161b11b601f4fc07774c6c174ee141e215f99d8949cf2eb4f617a445f4502f890767c7ac SHA512 aa7e4bfadf12c8bf6e26b4e0751d7906a8fcf9171587d4f5561e2af22ee28b62100bc9e7759b760a92414d6004fecdda00fe2d140264738d0cb1eec86ff00172
 AUX hyprland-0.31.0-fix-log-headers.patch 865 BLAKE2B c8173cdac049a5914c3f00261300ef5d9dbfd89b0e8ff643b97b86bc590fb23b5824005cd42a9f790bf1766843bf92765cbd0b65b0a2ef8390505e47dcc6771b SHA512 f6546c729596a18d91471e1853c5a377c05637e572814006635d039f027a4943fea13206794ed537862e83b708e1a49b81db874362073ec267b5f0f378b98696
-DIST hyprland-0.31.0.gh.tar.gz 14068621 BLAKE2B 272ba0c92ee6f8db623bb7b79a64ec1a3f2d2e0e1a8825ab7cc43e30dc64d77396ae014469a308c10deea0f9607680ff3a9328b747c82acccd5156e9d9c07cde SHA512 27798eba3bc430fe3689ecfb6ae38a59f48c39183c8cbd4fea8dca0a92a25941e6ee8b51d70f18498a3b0ef6c2575658299ee36ed6a6a93c7b54548ab64f07ca
 DIST hyprland-0.32.3.gh.tar.gz 14119304 BLAKE2B 304878a3bb167da9ceae8afbde21bf2c64b81ffd61c13ccfd772f240d234bb9cbd448f7ae2d0fcc6d8e7c7e29e1eca66ad68d98cfef9b22caccae9ee9f3ae39d SHA512 521cfa6b3621142cb4cc1e6c11978e49f28b29836a1a8e00cc2c697f44dcf620da63e9d39deeabb41130a56c65464b6117416c8a3c1bd690bb056955b7ccea40
 DIST hyprland-0.33.1.gh.tar.gz 14120494 BLAKE2B bd007d332b39b614aefe09b240a340ee9d9eed346bc80dc66e976cf2fbf85ca342fe8bd66b863f1626be7366b9623c4543957f0618c858cec133ee9dd6ac027e SHA512 7e45266310452a12ada4761a9b76a7a385e55f6fae6a446c78595e89fcb8b1cef8275e09bf3b9b636a096498c5c2328b1d00b0c33447ab4d018a9a6956855352
-EBUILD hyprland-0.31.0-r1.ebuild 3533 BLAKE2B 8cc6a7e39acf06cb559a186897e5b0c17b6d3a4c5f1925c98b50d3ab0e9a688e70054a8ddfe633913c5224c067c0ab71b03687ebee53368ff54223b29ee57755 SHA512 23b1a7c2348ebfffbf248f7d04e85095bc4abbc072a9b3b713006f3cd71b09e7299667f7234cf28b4c3a4d723a83c8b94a1d4ebfe4ee5ed53a4a6eaa1b6ea4bd
+DIST hyprland-0.34.0.gh.tar.gz 14128415 BLAKE2B 059fc8b849daeb71b08d7114fd8aea1264c0e9967f471df66b27aca46b95fd499d2929730ba66981bb7d6c423479533b280839db7839ca1df007825f72fb9bf8 SHA512 35cce0668a13d7e7fd220d62efd965a069ff0213996bfa47ca0852c6258881bc070020d4831364b325b71d8ce7373d1793a89006a4341088dcbaf01914920f1a
 EBUILD hyprland-0.32.3.ebuild 3474 BLAKE2B 83438aa4b11a775af2434c17efe96f730c767dadf93e884af284a6a922a82759732305651287d40a475e71bd9b683119ef5ed98523d4e7478e1fbe9f3bb68cf3 SHA512 5a486356f8566de903f9319f27640454c219f6418709078e42d5bf4a78316b4d8c662d0064c8fc3f4664ecfa7c42e9a26eb827ad78a6d1c8d11e7b745106173a
 EBUILD hyprland-0.33.1.ebuild 3323 BLAKE2B 00be1dbbfc8b82ff0178c7a737ad99c8acdbb1a85dba509fbb393436ab6e340face1ceb048066141a1f16cd4362d9d10f3eb0de57d382f19ce86af3f12166bf1 SHA512 325d4f083fa7c7443aa0eb0c1699e22e895af65405b3ec7246f51ceac632c8cb0daf4b343c76c72f55400b416692ff0567711136fa7639194a8f3120db4d99e5
-EBUILD hyprland-9999.ebuild 3418 BLAKE2B 86fb259e9f4ed87fd93b1704300913b4ec3b80dcf9c097d9b48ea8d65336a97e35de12bd9abf869a5872fa90c9086fcda4c1faffd18c9e5a266c6846f3122a4b SHA512 56df8184e3194489293f2d3c3e1d55dc5d26d449d81f470e89ddc0e973227bb3354f3e66dd60f4a7cff636c1e0b48b8486da3ae6ab947512989dc26dea77e996
+EBUILD hyprland-0.34.0.ebuild 3715 BLAKE2B 2224b6ab1a4981d064490f4bf936904235f2fb23577cafe4d58e82be823e0610bc1683b3c91189558ad57d372cc8684482c4f68a720ce1e72d1d7da033442e33 SHA512 acbe29b92c239425f90574807e8e692fbbb4db2d749b3dc8c001310f5a9ade199a29ded67365b7bef3c8b8f06913bdc46e7618ba3ee542e614c772fe2afc8713
+EBUILD hyprland-9999.ebuild 3675 BLAKE2B e18220ce4db125089882b353f4ec698b2390840bc2d7e9086ca6119a54ef34355aba26fbbcdcfbe2fdc263e3ed8b862f3afe9e36f09d61b3ffc16ae306f2c416 SHA512 8197e09000f8a4ea758156750e9a85a8a7addcbb058b31adb50592ca6e8f320f29e9457f64402034ab33dadde621e4892cd55309a245ddbed6e1ddc7469b2652
 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98
diff --git a/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild b/gui-wm/hyprland/hyprland-0.34.0.ebuild
index cdf924368947..bd3ac7a0d56e 100644
--- a/gui-wm/hyprland/hyprland-0.31.0-r1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -8,14 +8,30 @@ 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"
+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
 
-KEYWORDS="amd64"
 LICENSE="BSD"
 SLOT="0"
-IUSE="X legacy-renderer systemd video_cards_nvidia"
+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="
+	dev-util/cmake
+	dev-util/meson
+	dev-util/ninja
+	dev-vcs/git
+	sys-auth/polkit
+	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
@@ -28,7 +44,7 @@ WLROOTS_RDEPEND="
 	media-libs/mesa[egl(+),gles2]
 	sys-apps/hwdata:=
 	sys-auth/seatd:=
-	>=x11-libs/libdrm-2.4.114
+	>=x11-libs/libdrm-2.4.118
 	x11-libs/libxkbcommon
 	>=x11-libs/pixman-0.42.0
 	virtual/libudev:=
@@ -46,9 +62,10 @@ WLROOTS_BDEPEND="
 	dev-util/glslang
 	dev-util/wayland-scanner
 "
-
 RDEPEND="
+	${HYPRPM_RDEPEND}
 	${WLROOTS_RDEPEND}
+	dev-cpp/tomlplusplus
 	dev-libs/glib:2
 	dev-libs/libinput
 	dev-libs/wayland
@@ -78,7 +95,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/hyprland-0.31.0-fix-log-headers.patch"
+	"${FILESDIR}/gcc14.patch"
 )
 
 pkg_setup() {
@@ -95,16 +112,6 @@ pkg_setup() {
 	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)
diff --git a/gui-wm/hyprland/hyprland-9999.ebuild b/gui-wm/hyprland/hyprland-9999.ebuild
index a1f4a61b4bb8..56d4297657e4 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,13 +15,23 @@ 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 ~riscv"
+	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="
+	dev-util/cmake
+	dev-util/meson
+	dev-util/ninja
+	dev-vcs/git
+	sys-auth/polkit
+	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
@@ -52,8 +62,8 @@ WLROOTS_BDEPEND="
 	dev-util/glslang
 	dev-util/wayland-scanner
 "
-
 RDEPEND="
+	${HYPRPM_RDEPEND}
 	${WLROOTS_RDEPEND}
 	dev-cpp/tomlplusplus
 	dev-libs/glib:2