media-gfx/gmic: Use src_prepare from 2.7.2 again
authorAndreas Sturmlechner <asturm@gentoo.org>
Sat, 4 Jan 2020 09:55:17 +0000 (10:55 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Sat, 4 Jan 2020 09:56:08 +0000 (10:56 +0100)
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 <asturm@gentoo.org>
media-gfx/gmic/gmic-2.8.1.ebuild

index 1d3205fc5a201ae7a7a4fc190f8c634b72b23890..4c6884de7863db30695eb6a44a8885bd5a45b54c 100644 (file)
@@ -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
 }