[gentoo-commits] repo/gentoo:master commit in: app-editors/emacs/

["Ulrich Müller" <ulm@gentoo.org>]

commit:     d7509efb4ad2e271f6c981b28fc45f100e35044a
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 24 15:03:31 2023 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 15:06:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7509efb

app-editors/emacs: Fix small-ja-dict properly

Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-editors/emacs/Manifest                                       | 1 +
 app-editors/emacs/{emacs-29.1-r3.ebuild => emacs-29.1-r4.ebuild} | 7 +------
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 8e3d6b5f2811..3056ca240c9d 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -9,4 +9,5 @@ DIST emacs-27.2.tar.xz 44624480 BLAKE2B 245ea96004b90f81ac74de74521cbbe086caf117
 DIST emacs-28.2-patches-4.tar.xz 6168 BLAKE2B d2968c5f96dcf285f987d32aa8e2ad38c8c2cc7757f9dd83a1faa75efc20c1ac44d6944cf9bcbafbfaa34caae2e7ec24a28fa250d8f5206e4d27649cc2719cec SHA512 94be2c6f715b073ab76a1b3f36194ba6f9c299599b4ba4292a14970f1a2974634ed961d20f62b3939a18347d02fb8025628a7622910f64df0b9879f98dcf5c14
 DIST emacs-28.2.tar.xz 47722600 BLAKE2B a7e4990658b5e7306510f8dded93aaf0b82cdd9306df8b786526d038c3249ef9579287075f2235eb01a71ae1699db555254f137b86ab2d2305b45895053df552 SHA512 a7cec7e3e82367815a1442f69af54102dbfc434069810a9dec5938a6660cb8b076e6f1fb0bfff9695b15603dbbe05eb9c7dfd92e90cf40fc4d1e5746bce83bd8
 DIST emacs-29.1-patches-3.tar.xz 2264 BLAKE2B 7003dc29c991170f4bf893aac3d0d82362c625fc9e872f79339e20cea64a8a36145201c66c9a3a9004a638f2854fc9288a954858985f91b6ca204cb3e455bdb4 SHA512 e5ab678512c8d1cb15428e47c2cd7d97daa6140a71866eed35708fde123bcc31da437cd881d18d1535c744250f36989e46d11f6a749a26b3f8977f3aa55edc45
+DIST emacs-29.1-patches-4.tar.xz 3436 BLAKE2B 4db49d6cf1a03c022deea5f17cf11c3020c09fa912fc7d88e38d4960b966d6d6d805e4d0ed8788d168de83b7acfe6a2537706dfab1b2c372285864f199fcfa15 SHA512 c52f8c587306b9f6c5f599b96177ffb527bfb9d8cfd8d2a14206bc9b718ca746ca4f482dedac0c48d8f053c7d3eaf7ebc0734c74fb507515380a4500d0a2bba2
 DIST emacs-29.1.tar.xz 52081008 BLAKE2B 5bec8fd7c63c04b93b2ad87c12c48373930c1b3c6984d139938ad1eb692af76417dc5494057225a04f77ce4797958056aa3522f50e3b0565ef5f060bb15f5402 SHA512 de10f2af462682019af680e6a82fd33feb05ce6d995bedf5756264fa06e29d90cab02c5884b0aeade1c5ab39cf064e0fb6ff9f78d9eedbd162f0a985945b9ec2

diff --git a/app-editors/emacs/emacs-29.1-r3.ebuild b/app-editors/emacs/emacs-29.1-r4.ebuild
similarity index 98%
rename from app-editors/emacs/emacs-29.1-r3.ebuild
rename to app-editors/emacs/emacs-29.1-r4.ebuild
index f329456c4789..2b6082dff731 100644
--- a/app-editors/emacs/emacs-29.1-r3.ebuild
+++ b/app-editors/emacs/emacs-29.1-r4.ebuild
@@ -32,7 +32,7 @@ else
 		SRC_URI="https://alpha.gnu.org/gnu/emacs/pretest/${PN}-${PV/_/-}.tar.xz"
 	fi
 	# Patchset from proj/emacs-patches.git
-	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-3.tar.xz"
+	SRC_URI+=" https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.tar.xz"
 	PATCHES=("${WORKDIR}/patch")
 	SLOT="${PV%%.*}"
 	[[ ${PV} == *.*.* ]] && SLOT+="-vcs"
@@ -197,11 +197,6 @@ src_prepare() {
 				| sed -n '/^libraries:/{s:^[^/]*::;p}')
 	fi
 
-	if use small-ja-dic; then
-		# Remove pre-built dictionary https://debbugs.gnu.org/66125
-		rm -rf lisp/leim/ja-dic || die
-	fi
-
 	default
 
 	# Fix filename reference in redirected man page