[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michael Palimaka]

commit:     ad4c6aee2096d8717dc311f19debba3c4a2dc17b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 15 19:15:21 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 17:15:33 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad4c6aee

kde5.eclass: merge type is already checked in _check_gcc_version

 eclass/kde5.eclass | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 313e060..fce7d12 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -337,9 +337,7 @@ debug-print "${LINENO} ${ECLASS} ${FUNCNAME}: SRC_URI is 
${SRC_URI}"
 # Do some basic settings
 kde5_pkg_pretend() {
        debug-print-function ${FUNCNAME} "$@"
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               _check_gcc_version
-       fi
+       _check_gcc_version
 }
 
 # @FUNCTION: kde5_pkg_setup
@@ -347,9 +345,7 @@ kde5_pkg_pretend() {
 # Do some basic settings
 kde5_pkg_setup() {
        debug-print-function ${FUNCNAME} "$@"
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               _check_gcc_version
-       fi
+       _check_gcc_version
 }
 
 # @FUNCTION: kde5_src_unpack