From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 32BE31382C5 for ; Tue, 23 Mar 2021 21:16:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5CD7DE0824; Tue, 23 Mar 2021 21:16:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3E8B6E0824 for ; Tue, 23 Mar 2021 21:16:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 808A734096C for ; Tue, 23 Mar 2021 21:16:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D276D4F1 for ; Tue, 23 Mar 2021 21:16:21 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1616533906.8a557e5cac0df1a98fc9c906f5320958d71b99d1.sarnex@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild X-VCS-Directories: app-emulation/wine-vanilla/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 8a557e5cac0df1a98fc9c906f5320958d71b99d1 X-VCS-Branch: master Date: Tue, 23 Mar 2021 21:16:21 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 69551446-98f2-49fa-bfff-b15ca7383358 X-Archives-Hash: 89ef999faadc0610d515c12ef1554c7e commit: 8a557e5cac0df1a98fc9c906f5320958d71b99d1 Author: Florian Schmaus geekplace eu> AuthorDate: Mon Mar 22 16:55:01 2021 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Tue Mar 23 21:11:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=8a557e5c app-emulation/wine-vanilla: remove redundant MERGE_TYPE check Since wine_compiler_check() is only ever called in src_configured, which is not invoked on binary merges, the MERGE_TYPE check in wine_compiler_check() is redundant. Signed-off-by: Florian Schmaus geekplace.eu> Reported-by: Göktürk Yüksek gentoo.org> Signed-off-by: Nick Sarnie gentoo.org> app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild index 045e3bf..21840c2 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.4.ebuild @@ -153,8 +153,6 @@ if [[ ${#PATCHES_BIN[@]} -ge 1 ]] || [[ ${PV} == 9999 ]]; then fi wine_compiler_check() { - [[ ${MERGE_TYPE} = "binary" ]] && return 0 - # GCC-specific bugs if tc-is-gcc; then # bug #549768