From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1557014-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 1C804158089
	for <garchives@archives.gentoo.org>; Sun, 24 Sep 2023 18:20:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5BE692BC025;
	Sun, 24 Sep 2023 18:20:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(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 437352BC025
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Sep 2023 18:20:36 +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 7290C340831
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Sep 2023 18:20:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id C8EC5F25
	for <gentoo-commits@lists.gentoo.org>; Sun, 24 Sep 2023 18:20:33 +0000 (UTC)
From: "Ulrich Müller" <ulm@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, "Ulrich Müller" <ulm@gentoo.org>
Message-ID: <1695579615.4a4ff16db2f869316ad52abdb07cdab0c311b7bf.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-editors/emacs/emacs-29.1-r4.ebuild app-editors/emacs/emacs-29.1.9999.ebuild app-editors/emacs/emacs-30.0.9999.ebuild
X-VCS-Directories: app-editors/emacs/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 4a4ff16db2f869316ad52abdb07cdab0c311b7bf
X-VCS-Branch: master
Date: Sun, 24 Sep 2023 18:20:33 +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: 032cf176-e7f7-4dc4-a77a-fe18a5e0847e
X-Archives-Hash: d1c90cf1932e81a9fca4ce7130659306

commit:     4a4ff16db2f869316ad52abdb07cdab0c311b7bf
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 18:18:41 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 18:20:15 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a4ff16d

app-editors/emacs: Fix build failure with USE=jit

Closes: https://bugs.gentoo.org/914609
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/emacs/emacs-29.1-r4.ebuild   | 4 ++--
 app-editors/emacs/emacs-29.1.9999.ebuild | 4 ++--
 app-editors/emacs/emacs-30.0.9999.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app-editors/emacs/emacs-29.1-r4.ebuild b/app-editors/emacs/emacs-29.1-r4.ebuild
index 2b6082dff731..040aa8836093 100644
--- a/app-editors/emacs/emacs-29.1-r4.ebuild
+++ b/app-editors/emacs/emacs-29.1-r4.ebuild
@@ -183,6 +183,8 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi
 
+	default
+
 	if use jit; then
 		find lisp -type f -name "*.elc" -delete || die
 
@@ -197,8 +199,6 @@ src_prepare() {
 				| sed -n '/^libraries:/{s:^[^/]*::;p}')
 	fi
 
-	default
-
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 

diff --git a/app-editors/emacs/emacs-29.1.9999.ebuild b/app-editors/emacs/emacs-29.1.9999.ebuild
index f5b24beb6980..25d19bc31d28 100644
--- a/app-editors/emacs/emacs-29.1.9999.ebuild
+++ b/app-editors/emacs/emacs-29.1.9999.ebuild
@@ -180,6 +180,8 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi
 
+	default
+
 	if use jit; then
 		find lisp -type f -name "*.elc" -delete || die
 
@@ -194,8 +196,6 @@ src_prepare() {
 				| sed -n '/^libraries:/{s:^[^/]*::;p}')
 	fi
 
-	default
-
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die
 

diff --git a/app-editors/emacs/emacs-30.0.9999.ebuild b/app-editors/emacs/emacs-30.0.9999.ebuild
index dec82f14d0ea..256307d1056b 100644
--- a/app-editors/emacs/emacs-30.0.9999.ebuild
+++ b/app-editors/emacs/emacs-30.0.9999.ebuild
@@ -181,6 +181,8 @@ src_prepare() {
 			|| die "Upstream version number changed to ${FULL_VERSION}"
 	fi
 
+	default
+
 	if use jit; then
 		find lisp -type f -name "*.elc" -delete || die
 
@@ -195,8 +197,6 @@ src_prepare() {
 				| sed -n '/^libraries:/{s:^[^/]*::;p}')
 	fi
 
-	default
-
 	# Fix filename reference in redirected man page
 	sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 || die