Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Thu, 24 Sep 2015 19:38:39
Message-Id: 1443123504.b8ed8550b1168204c1ef0148d68b50eb33b3d55e.kensington@gentoo
1 commit: b8ed8550b1168204c1ef0148d68b50eb33b3d55e
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 23 13:02:37 2015 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 24 19:38:24 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ed8550
7
8 kde5.eclass: don't check gcc version for binary merges
9
10 eclass/kde5.eclass | 8 ++++++--
11 1 file changed, 6 insertions(+), 2 deletions(-)
12
13 diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
14 index 23e3127..feafd8f 100644
15 --- a/eclass/kde5.eclass
16 +++ b/eclass/kde5.eclass
17 @@ -340,7 +340,9 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is ${SRC_URI}"
18 # Do some basic settings
19 kde5_pkg_pretend() {
20 debug-print-function ${FUNCNAME} "$@"
21 - _check_gcc_version
22 + if [[ ${MERGE_TYPE} != binary ]]; then
23 + _check_gcc_version
24 + fi
25 }
26
27 # @FUNCTION: kde5_pkg_setup
28 @@ -348,7 +350,9 @@ kde5_pkg_pretend() {
29 # Do some basic settings
30 kde5_pkg_setup() {
31 debug-print-function ${FUNCNAME} "$@"
32 - _check_gcc_version
33 + if [[ ${MERGE_TYPE} != binary ]]; then
34 + _check_gcc_version
35 + fi
36 }
37
38 # @FUNCTION: kde5_src_unpack