From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1063E59CB2 for ; Fri, 15 Apr 2016 19:15:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B440E0854; Fri, 15 Apr 2016 19:15:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 37788E0854 for ; Fri, 15 Apr 2016 19:15:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0023D340766 for ; Fri, 15 Apr 2016 19:15:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AE2CA80 for ; Fri, 15 Apr 2016 19:15:34 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1460747721.06222905d1a08a809f3ba050cdc0d2ce30dccd5c.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde5.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 06222905d1a08a809f3ba050cdc0d2ce30dccd5c X-VCS-Branch: master Date: Fri, 15 Apr 2016 19:15:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1b67b18c-d241-409d-92ce-f49eb0a13bc0 X-Archives-Hash: 6bc8bda52a8be03619952c84f7f2f96a commit: 06222905d1a08a809f3ba050cdc0d2ce30dccd5c Author: Michael Palimaka gentoo org> AuthorDate: Fri Apr 15 19:15:21 2016 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Fri Apr 15 19:15:21 2016 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=06222905 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 ae95079..5d2dc14 100644 --- a/eclass/kde5.eclass +++ b/eclass/kde5.eclass @@ -381,9 +381,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 @@ -391,9 +389,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_pkg_nofetch