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 45B4E138334 for ; Sat, 4 Jan 2020 09:56:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 84370E0828; Sat, 4 Jan 2020 09:56:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 687A4E0828 for ; Sat, 4 Jan 2020 09:56: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 764E834DEAA for ; Sat, 4 Jan 2020 09:56:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 330633C for ; Sat, 4 Jan 2020 09:56:23 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1578131768.35f729e094640deb8bc7d0cb5662bbb3b1d2a851.asturm@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.8.1.ebuild X-VCS-Directories: media-gfx/gmic/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 35f729e094640deb8bc7d0cb5662bbb3b1d2a851 X-VCS-Branch: master Date: Sat, 4 Jan 2020 09:56:23 +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: 95af4d40-01b8-4bd1-9e83-e0ca6699a878 X-Archives-Hash: ccf0e403eee4fe68bbc8f86c0dcad68f commit: 35f729e094640deb8bc7d0cb5662bbb3b1d2a851 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Jan 4 09:55:17 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Jan 4 09:56:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f729e0 media-gfx/gmic: Use src_prepare from 2.7.2 again cmake.eclass was fixed instead, until a better solution is found. Closes: https://bugs.gentoo.org/704758 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> media-gfx/gmic/gmic-2.8.1.ebuild | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/media-gfx/gmic/gmic-2.8.1.ebuild b/media-gfx/gmic/gmic-2.8.1.ebuild index 1d3205fc5a2..4c6884de786 100644 --- a/media-gfx/gmic/gmic-2.8.1.ebuild +++ b/media-gfx/gmic/gmic-2.8.1.ebuild @@ -85,12 +85,10 @@ src_prepare() { if use gimp || use krita || use qt5; then # respect user flags sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die - + local S="${S}/gmic-qt" # fix linking with fftw when thread support is enabled - pushd "${S}"/gmic-qt > /dev/null || die PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch ) cmake_src_prepare - popd > /dev/null || die fi }