gentoo auto-resync : 12:12:2023 - 11:25:13

3 files changed, 126 insertions, 13 deletions

diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 8b271904974f..b07119ce94e9 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,7 +1,9 @@
 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
 EBUILD hyprland-0.32.3.ebuild 3475 BLAKE2B cb7d13867a55e0284d9fb6f34acd2517a22faef6de9268e3aca1cd65db712118dbc5a391943f6c5a0eb6f61396e6f6d866b5566cad842eaf58e415a46f3b39f2 SHA512 17466e51bb4eb0388739f324dc7e052fc0d0258525d294bf499d8df703960cfbefb31a5df78583ee84703d222fd1346eb6cf3b0448e941efbd536d8ec93d310c
-EBUILD hyprland-9999.ebuild 3588 BLAKE2B e22617a33b074f882f2519facbb9da0e34f685eb361ab750a4d508dcb321ec7b664ee67f6bb02da1b42b00c8deb428645d97298ce7a0f5169d7be321b0a837cd SHA512 06ffa34bd7aee0d6dec878cebecfcb5c999940800bce92f00d4f3518df6236c4f38991fcc312c10d705abed335a855827388ca30a03ae57b67ec1fcab5e5153d
+EBUILD hyprland-0.33.1.ebuild 3283 BLAKE2B ef17f8c29a11beae531455fd6d2cd391cecdb4ec60c8e0f90953293bd50d284392498fb57ab0f392c5684ee62303c54c9b860b0479110dca7df462987c3383ea SHA512 18b1287754f340726cf6e1575703c7bd37f3fdfe05ff0712f35696760f7f64c61f5c5bbeb39815396910c6b40a4c85165577151cd86d1ddd068d8ed5972df3dd
+EBUILD hyprland-9999.ebuild 3396 BLAKE2B da22b460dcffd1fac55ff897d581526fbd3b4516f912635073cb8b4de5bba933648abba5b2e6e8f5cbb382bc3ab5be40e42212610f7cde793e626845aeeaa531 SHA512 3b6589f9b350bd810808f926a2bd7d2047ed584b67dcbd9f473ea1f21ba2fbd94246c91bc6c7d461495285ab22ba7cbb6b2031bace851888f1c0a57a9f5ea19f
 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98
diff --git a/gui-wm/hyprland/hyprland-0.33.1.ebuild b/gui-wm/hyprland/hyprland-0.33.1.ebuild
new file mode 100644
index 000000000000..049bd8915031
--- /dev/null
+++ b/gui-wm/hyprland/hyprland-0.33.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 2023 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"
+
+# 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.118
+	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-util/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 795779f199ad..cdbdbfd7b4ed 100644
--- a/gui-wm/hyprland/hyprland-9999.ebuild
+++ b/gui-wm/hyprland/hyprland-9999.ebuild
@@ -20,7 +20,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="X legacy-renderer systemd video_cards_nvidia"
+IUSE="X legacy-renderer systemd"
 
 # bundled wlroots has the following dependency string according to included headers.
 # wlroots[drm,gles2-renderer,libinput,x11-backend?,X?]
@@ -34,7 +34,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:=
@@ -97,16 +97,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)