[gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/

[Sam James]

commit:     24cbad0193c8e1e50bc5d30828e88b0872f6620e
Author:     hololeap <hololeap <AT> users <DOT> noreply <DOT> github <DOT> com>
AuthorDate: Thu Feb  9 20:08:05 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 21 05:13:28 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24cbad01

dev-lang/ghc: conditionally apply sphinx patch

The sphinx patch only applies to the source code and will cause a
failure if it is applied with USE=binary (this flag disables the
unpacking of the source code).

This reverts commit 978a89b79928342990c7da40c43a1cc9b84d3e7e.

Signed-off-by: hololeap <hololeap <AT> users.noreply.github.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-lang/ghc/ghc-9.0.2-r4.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dev-lang/ghc/ghc-9.0.2-r4.ebuild b/dev-lang/ghc/ghc-9.0.2-r4.ebuild
index 9f6a1b7d14d4..73c3cf5af681 100644
--- a/dev-lang/ghc/ghc-9.0.2-r4.ebuild
+++ b/dev-lang/ghc/ghc-9.0.2-r4.ebuild
@@ -503,9 +503,6 @@ src_prepare() {
                [[ -e "${f}" ]] || ln -sf "$($(tc-getPKG_CONFIG) 
--cflags-only-I libffi | sed "s/-I//g" | tr -d " ")/$(basename "${f}")" "${f}" 
|| die
        done
 
-
-       eapply "${FILESDIR}"/${PN}-9.0.2-sphinx-6.patch
-
        if use binary; then
                if use prefix; then
                        relocate_ghc "${EPREFIX}"
@@ -592,6 +589,7 @@ src_prepare() {
                eapply "${FILESDIR}"/latomic-subword
                eapply "${WORKDIR}"/${P}-riscv64-llvm.patch
                eapply "${FILESDIR}"/${PN}-9.0.2-fptools.patch # clang-16 
workaround
+               eapply "${FILESDIR}"/${PN}-9.0.2-sphinx-6.patch
 
                # mingw32 target
                pushd "${S}/libraries/Win32"