summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-04-16 05:15:21 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-04-21 03:15:33 +1000
commitad4c6aee2096d8717dc311f19debba3c4a2dc17b (patch)
tree8df914be00a5d8e9d030b41fd8a4138732f04a23
parentkde5.eclass: drop minimal gcc requirement for kde-frameworks (diff)
downloadgentoo-ad4c6aee2096d8717dc311f19debba3c4a2dc17b.tar.gz
gentoo-ad4c6aee2096d8717dc311f19debba3c4a2dc17b.tar.bz2
gentoo-ad4c6aee2096d8717dc311f19debba3c4a2dc17b.zip
kde5.eclass: merge type is already checked in _check_gcc_version
-rw-r--r--eclass/kde5.eclass8
1 files changed, 2 insertions, 6 deletions
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