Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/gmic/
Date: Sat, 04 Jan 2020 09:56:26
Message-Id: 1578131768.35f729e094640deb8bc7d0cb5662bbb3b1d2a851.asturm@gentoo
1 commit: 35f729e094640deb8bc7d0cb5662bbb3b1d2a851
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 4 09:55:17 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 4 09:56:08 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35f729e0
7
8 media-gfx/gmic: Use src_prepare from 2.7.2 again
9
10 cmake.eclass was fixed instead, until a better solution is found.
11
12 Closes: https://bugs.gentoo.org/704758
13 Package-Manager: Portage-2.3.84, Repoman-2.3.20
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 media-gfx/gmic/gmic-2.8.1.ebuild | 4 +---
17 1 file changed, 1 insertion(+), 3 deletions(-)
18
19 diff --git a/media-gfx/gmic/gmic-2.8.1.ebuild b/media-gfx/gmic/gmic-2.8.1.ebuild
20 index 1d3205fc5a2..4c6884de786 100644
21 --- a/media-gfx/gmic/gmic-2.8.1.ebuild
22 +++ b/media-gfx/gmic/gmic-2.8.1.ebuild
23 @@ -85,12 +85,10 @@ src_prepare() {
24 if use gimp || use krita || use qt5; then
25 # respect user flags
26 sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die
27 -
28 + local S="${S}/gmic-qt"
29 # fix linking with fftw when thread support is enabled
30 - pushd "${S}"/gmic-qt > /dev/null || die
31 PATCHES=( "${FILESDIR}"/${PN}-2.7.1-qt-cmake.patch )
32 cmake_src_prepare
33 - popd > /dev/null || die
34 fi
35 }