From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1488674-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 06A0C15800F
for <garchives@archives.gentoo.org>; Tue, 21 Feb 2023 05:13:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id E1589E0B11;
Tue, 21 Feb 2023 05:13:54 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id BB997E0B11
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Feb 2023 05:13:54 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 88B69340D6C
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Feb 2023 05:13:53 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DC21F8B9
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Feb 2023 05:13:51 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1676956408.24cbad0193c8e1e50bc5d30828e88b0872f6620e.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/ghc/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-lang/ghc/ghc-9.0.2-r4.ebuild
X-VCS-Directories: dev-lang/ghc/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 24cbad0193c8e1e50bc5d30828e88b0872f6620e
X-VCS-Branch: master
Date: Tue, 21 Feb 2023 05:13:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 64cf5949-1650-4a76-a72c-abde8d9daf22
X-Archives-Hash: 22017d4dba379974ebebc69f472203d5
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"