Gentoo Archives: gentoo-commits

From: Mart Raudsepp <leio@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-libs/webkit-gtk/
Date: Mon, 30 Dec 2019 14:03:53
Message-Id: 1577714480.9b30217d8f3fab212eb6635b85c2ae7e29e93c47.leio@gentoo
1 commit: 9b30217d8f3fab212eb6635b85c2ae7e29e93c47
2 Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 30 14:01:12 2019 +0000
4 Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 30 14:01:20 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b30217d
7
8 net-libs/webkit-gtk: adjust compiler deps and checks
9
10 The gcc < 7.3 check will work wrong once gcc10 comes along.
11 Adjust the clang dep to match when initial C++17 support came along.
12
13 Package-Manager: Portage-2.3.79, Repoman-2.3.12
14 Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
15
16 net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild | 6 +-----
17 1 file changed, 1 insertion(+), 5 deletions(-)
18
19 diff --git a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
20 index 5c3c199bdba..5716514c3df 100644
21 --- a/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
22 +++ b/net-libs/webkit-gtk/webkit-gtk-2.26.2.ebuild
23 @@ -114,7 +114,7 @@ DEPEND="${RDEPEND}
24 >=dev-util/gtk-doc-am-1.10
25 >=dev-util/gperf-3.0.1
26 >=sys-devel/bison-2.4.3
27 - || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-3.3 )
28 + || ( >=sys-devel/gcc-7.3 >=sys-devel/clang-5 )
29 sys-devel/gettext
30 virtual/pkgconfig
31
32 @@ -148,10 +148,6 @@ pkg_pretend() {
33 if ! test-flag-CXX -std=c++17 ; then
34 die "You need at least GCC 7.3.x or Clang >= 5 for C++17-specific compiler flags"
35 fi
36 -
37 - if tc-is-gcc && [[ $(gcc-version) < 7.3 ]] ; then
38 - die 'The active compiler needs to be gcc 7.3 (or newer)'
39 - fi
40 fi
41
42 if ! use opengl && ! use gles2-only; then