From: Michael Palimaka <kensington@gentoo.org>
Date: Fri, 15 Apr 2016 19:15:21 +0000 (+1000)
Subject: kde5.eclass: merge type is already checked in _check_gcc_version
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad4c6aee2096d8717dc311f19debba3c4a2dc17b;p=gentoo.git

kde5.eclass: merge type is already checked in _check_gcc_version
---

diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 313e0609d175..fce7d129102a 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