[gentoo-commits] repo/proj/guru:master commit in: gui-libs/xdg-desktop-portal-hyprland/

["Haelwenn Monnier" <contact@hacktivis.me>]

commit:     192c2f7dc8a109423241141ede9be3860a4f3866
Author:     Remigiusz Micielski <rmicielski <AT> purelymail <DOT> com>
AuthorDate: Fri Sep 29 13:19:55 2023 +0000
Commit:     Haelwenn Monnier <contact <AT> hacktivis <DOT> me>
CommitDate: Fri Sep 29 13:19:55 2023 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=192c2f7d

gui-libs/xdg-desktop-portal-hyprland: improve compiler check

Signed-off-by: Remigiusz Micielski <rmicielski <AT> purelymail.com>

 .../xdg-desktop-portal-hyprland-1.1.0.ebuild         | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.1.0.ebuild b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.1.0.ebuild
index 62aa1bd3e5..214ef6c28c 100644
--- a/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.1.0.ebuild
+++ b/gui-libs/xdg-desktop-portal-hyprland/xdg-desktop-portal-hyprland-1.1.0.ebuild
@@ -47,6 +47,7 @@ RDEPEND="
 "
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.24
+	>=sys-devel/gcc-13:*
 	dev-libs/hyprland-protocols
 	virtual/pkgconfig
 "
@@ -54,16 +55,15 @@ BDEPEND="
 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} -lt 13 ]]; then
-			die "XDPH requires >=sys-devel/gcc-13.0.0 to build"
-		fi
-	else
-		die "XDPH 1.1.0 won't build with clang.\
-		See: https://github.com/hyprwm/xdg-desktop-portal-hyprland/issues/81";
+	if tc-is-gcc && ver_test $(gcc-version) -lt 11 ; then
+		eerror "XDPH needs >=gcc-13 to compile."
+		eerror "Please upgrade GCC: emerge -v1 sys-devel/gcc"
+		die "GCC version is too old to compile XDPH!"
+	elif ! tc-is-gcc ; then
+		eerror "XDPH v1.1.0 needs >=gcc-13 to compile."
+		eerror "Due to an upstream issue, XDPH won't compile with clang."
+		eerror "Please either use GCC, or merge an older version than 1.0.0."
+		die "XDPH won't compile with clang!"
 	fi
 }