gentoo auto-resync : 27:10:2023 - 08:42:41

3 files changed, 50 insertions, 13 deletions

diff --git a/gui-wm/hyprland/Manifest b/gui-wm/hyprland/Manifest
index 4be187989797..2dbeed430869 100644
--- a/gui-wm/hyprland/Manifest
+++ b/gui-wm/hyprland/Manifest
@@ -1,8 +1,9 @@
 AUX hyprland-0.28.0-no-wlroots-automagic-r1.patch 880 BLAKE2B eecb42897483a41040442e2dc8a14a3ca22276a8625a15f2b43a180db5f2cdd509e186dc30271d2c2c679844082ccbb6af4d73b7a2b08eb890f1e87dcfc0f323 SHA512 5f629a3e755bf513e17f6b814001677e9c6ea0ec249030ca652dd3661180fa7ed3b85340b62c5ee7f08df29c0d0678d185c3949d1df1bbc950128028163e7a88
 AUX hyprland-0.30.0-3400-fix-build.patch 1923 BLAKE2B 57bd8c8ad0dbb308c4cc49ecebb584fb6516997d7af8e064dd5a153d5dd321d2739d9bb39cd104ef551faad307d4bd29b4446f186170fc9c6bab8039f9553f2a SHA512 8d1dd21104103ef95c6585b246eb9abd239eea20be7bea64bb9fc5b81547d910b7490df0083de9e92735b02b7995e880f1c9be0aeaf18972f515e04e6966dd97
 AUX hyprland-0.30.0-no-wlroots-automagic-r1.patch 760 BLAKE2B 386b70de5c525fb1f1258565cb6dccc7edb1561190c261885ee6603640e81f866887adbd22caf765c3c9dd5a94d03b104136f48c93be3cbcad8da0206e73dc35 SHA512 e6915957153fba06b00dcd3401e3febacca0b9976ff9ac73611732b632d55348b153132554026ebecefea63834d006c9bd57e4ecb55ecddde8add5f376364900
-DIST hyprland-0.29.1.gh.tar.gz 14056843 BLAKE2B 9e9f1b15d354cf5e391b1add5dc5ce8cf2e4b206853465028a6170e613c7c5435e9a6e3318cd1006d3c2874d885128b95495bba08444fade0185b2a69d9ab950 SHA512 abbfd244b7473ec521a639b0d424e2873193ab9ef0d24e6272e15b79da9ade8ee56ea4cffdc328713f99600c1d320384839d32eb223034945659b015125e98b1
+AUX hyprland-0.31.0-fix-log-headers.patch 865 BLAKE2B c8173cdac049a5914c3f00261300ef5d9dbfd89b0e8ff643b97b86bc590fb23b5824005cd42a9f790bf1766843bf92765cbd0b65b0a2ef8390505e47dcc6771b SHA512 f6546c729596a18d91471e1853c5a377c05637e572814006635d039f027a4943fea13206794ed537862e83b708e1a49b81db874362073ec267b5f0f378b98696
 DIST hyprland-0.30.0.gh.tar.gz 14064946 BLAKE2B 188328ed08ca8a9db97ae94b77159f9ebe5361a050a177ec586f376b168dab4c9dcd6b6d71d3314e9470f46b57f0610a92cdfe73ff1704b9f55f21399895e69f SHA512 f8053c19460e7768aa00944d1fc624d85ff9e042d0750a74d28e08147fe50e45262bdb1c259642bb7241746a8fb967344841e58fa598213f8c333f15246f9c94
-EBUILD hyprland-0.29.1.ebuild 2576 BLAKE2B eabbf6255c19a2a200efc8c2ef77d55e1c995448af3c859a0c734f03704a1a1ff2ebacdba124e6187bc39ec283d6c86e282ccea75d3d3a600734a418d7efd30c SHA512 fa64b70fb0914beaffdc16bd50ab40c7c96f4e2f8c30b8b2cf3ed258343df8e053c844a7e4df7d6ab1801d39ad2b5e836cf421b2d8e40d90cecfced5b6592b59
+DIST hyprland-0.31.0.gh.tar.gz 14068621 BLAKE2B 272ba0c92ee6f8db623bb7b79a64ec1a3f2d2e0e1a8825ab7cc43e30dc64d77396ae014469a308c10deea0f9607680ff3a9328b747c82acccd5156e9d9c07cde SHA512 27798eba3bc430fe3689ecfb6ae38a59f48c39183c8cbd4fea8dca0a92a25941e6ee8b51d70f18498a3b0ef6c2575658299ee36ed6a6a93c7b54548ab64f07ca
 EBUILD hyprland-0.30.0.ebuild 2774 BLAKE2B b74b342882ca178e338b03d76f92296f3aa2dc2df4ea48da9aa71cfb4cea90b495301d2bc4ee963a80cc765f631f5a493202d280f37763661d43cb7d37c625ed SHA512 8e582ef86485186a8675db8fdb6e8192cbcc04b994d1334504ccb61bbe9ca0fcbb2e297f23768caf88469006b8896b9c82798874d923ba072ac2a9e4abec2111
+EBUILD hyprland-0.31.0.ebuild 2775 BLAKE2B 4ab232a342300d1c1fa9555f719f5b552509e225eb6dc478b934fe61542073a0ea3e057c4e4a82111d9616185635cd40f4bc0fa97313fe7eebd5990bb3d7bda4 SHA512 76058fa817e71b62680f5be7c458b4cd31b28be8c00c30e87a3a91edf6072a878f7df52546c2c22501ea0e3fc6040f5b8297100602f30ee8466a382025533ccc
 MISC metadata.xml 716 BLAKE2B fc5248c809b9b5bf1002e3d82ff80f595b8e613d09e5541f1a0151c3ea2c117376d25fa5a40c85d254533708d9eff5339bd329b42118e87ca49e22e55c0c5d7b SHA512 31252ced2546f3686f17259aabfe9273af14f7efaf3fa0bfb446c65c6d9478be3a23c531e0ac463f27fe1d50842f6f126f32e47a8a03a345306297e182952e98
diff --git a/gui-wm/hyprland/files/hyprland-0.31.0-fix-log-headers.patch b/gui-wm/hyprland/files/hyprland-0.31.0-fix-log-headers.patch
new file mode 100644
index 000000000000..7abd8164c9b4
--- /dev/null
+++ b/gui-wm/hyprland/files/hyprland-0.31.0-fix-log-headers.patch
@@ -0,0 +1,33 @@
+From 5dd0637e90efa17e391b67934998936194701d08 Mon Sep 17 00:00:00 2001
+From: memchr <memchr@proton.me>
+Date: Mon, 16 Oct 2023 16:22:01 +0000
+Subject: [PATCH] fix(build): do not include wlr headers directly, use
+ includes.hpp instead.
+
+---
+ src/debug/Log.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/debug/Log.hpp b/src/debug/Log.hpp
+index 125ed7f45d..085465c911 100644
+--- a/src/debug/Log.hpp
++++ b/src/debug/Log.hpp
+@@ -1,10 +1,10 @@
+ #pragma once
+ #include <string>
+-#include <wlr/util/log.h>
+ #include <format>
+ #include <iostream>
+ #include <fstream>
+ #include <chrono>
++#include "../includes.hpp"
+ #include "../helpers/MiscFunctions.hpp"
+ 
+ #define LOGMESSAGESIZE 1024
+@@ -79,4 +79,4 @@ namespace Debug {
+     }
+ 
+     void wlrLog(wlr_log_importance level, const char* fmt, va_list args);
+-};
+\ No newline at end of file
++};
diff --git a/gui-wm/hyprland/hyprland-0.29.1.ebuild b/gui-wm/hyprland/hyprland-0.31.0.ebuild
index 116dc4c643f0..55520c4c2de9 100644
--- a/gui-wm/hyprland/hyprland-0.29.1.ebuild
+++ b/gui-wm/hyprland/hyprland-0.31.0.ebuild
@@ -70,6 +70,7 @@ DEPEND="
 "
 BDEPEND="
 	${WLROOTS_BDEPEND}
+	|| ( >=sys-devel/gcc-13:* >=sys-devel/clang-16:* )
 	app-misc/jq
 	dev-util/cmake
 	dev-util/wayland-scanner
@@ -77,18 +78,22 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/hyprland-0.30.0-no-wlroots-automagic-r1.patch"
+	"${FILESDIR}/hyprland-0.31.0-fix-log-headers.patch"
+)
+
 pkg_setup() {
 	[[ ${MERGE_TYPE} == binary ]] && return
 
-	if tc-is-gcc; then
-		STDLIBVER=$(echo '#include <string>' | $(tc-getCXX) -x c++ -dM -E - | \
-					grep GLIBCXX_RELEASE | sed 's/.*\([1-9][0-9]\)/\1/')
-
-		if ! [[ ${STDLIBVER} -ge 12 ]]; then
-			die "Hyprland requires >=sys-devel/gcc-12.1.0 to build"
-		fi
-	elif [[ $(clang-major-version) -lt 16 ]]; then
-		die "Hyprland requires >=sys-devel/clang-16.0.3 to build";
+	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
 }
 
@@ -99,8 +104,6 @@ src_prepare() {
 		cd "${S}" || die
 	fi
 
-	eapply "${FILESDIR}/hyprland-0.28.0-no-wlroots-automagic-r1.patch"
-
 	default
 }