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 DDFE7138359 for ; Fri, 6 Nov 2020 20:25:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A89EE0849; Fri, 6 Nov 2020 20:25:40 +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 23348E0849 for ; Fri, 6 Nov 2020 20:25:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 AB98C340DF9 for ; Fri, 6 Nov 2020 20:25:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 280D63BE for ; Fri, 6 Nov 2020 20:25:37 +0000 (UTC) From: "Marek Szuba" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Marek Szuba" Message-ID: <1604694327.7c5da76e715616d593aaa8c593660e7b75be77cd.marecki@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/gmic/gmic-2.9.2.ebuild X-VCS-Directories: media-gfx/gmic/ X-VCS-Committer: marecki X-VCS-Committer-Name: Marek Szuba X-VCS-Revision: 7c5da76e715616d593aaa8c593660e7b75be77cd X-VCS-Branch: master Date: Fri, 6 Nov 2020 20:25:37 +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: aab982d8-fdca-446f-a87d-c011bbcf4007 X-Archives-Hash: c54742dd9e7a068280d5ae34db750410 commit: 7c5da76e715616d593aaa8c593660e7b75be77cd Author: Marek Szuba gentoo org> AuthorDate: Fri Nov 6 20:16:13 2020 +0000 Commit: Marek Szuba gentoo org> CommitDate: Fri Nov 6 20:25:27 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5da76e media-gfx/gmic: make sure patches only get applied once For certain USE flags, the ebuild calls cmake_src_prepare for the second time in another source directory. This causes emerge to attempt to apply all the patches listed in PATCHES again, in the wrong place. Make sure PATCHES is empty when cmake_src_prepare is called for the second time. Closes: https://bugs.gentoo.org/753377 Signed-off-by: Marek Szuba gentoo.org> media-gfx/gmic/gmic-2.9.2.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media-gfx/gmic/gmic-2.9.2.ebuild b/media-gfx/gmic/gmic-2.9.2.ebuild index 260962b2dc1..51708f537aa 100644 --- a/media-gfx/gmic/gmic-2.9.2.ebuild +++ b/media-gfx/gmic/gmic-2.9.2.ebuild @@ -96,6 +96,8 @@ src_prepare() { -e '/${CMAKE_EXE_LINKER_FLAGS} -s/d' \ -i gmic-qt/CMakeLists.txt || die local S="${S}/gmic-qt" + # Bug #753377 + local PATCHES=() cmake_src_prepare fi }