From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1688164-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 (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 42D4D158042
for <garchives@archives.gentoo.org>; Sat, 9 Nov 2024 11:29:50 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9208DE088A;
Sat, 9 Nov 2024 11:29:49 +0000 (UTC)
Received: from smtp.gentoo.org (mail.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 75CA5E088A
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Nov 2024 11:29:49 +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))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A348C33BE3B
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Nov 2024 11:29:48 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 443191953
for <gentoo-commits@lists.gentoo.org>; Sat, 9 Nov 2024 11:29:47 +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: <1731151767.79dfdd171713f4937a76f8679fe8256a60342feb.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-doc/elisp-manual/, app-doc/elisp-manual/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-doc/elisp-manual/elisp-manual-25.3.ebuild app-doc/elisp-manual/elisp-manual-26.3.ebuild app-doc/elisp-manual/elisp-manual-27.2.ebuild app-doc/elisp-manual/elisp-manual-28.2.ebuild app-doc/elisp-manual/files/elisp-manual-25.3-direntry.patch app-doc/elisp-manual/files/elisp-manual-25.3-direntry.patch.in app-doc/elisp-manual/files/elisp-manual-26.3-direntry.patch app-doc/elisp-manual/files/elisp-manual-27.2-direntry.patch app-doc/elisp-manual/files/elisp-manual-28.2-direntry.patch
X-VCS-Directories: app-doc/elisp-manual/ app-doc/elisp-manual/files/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: 79dfdd171713f4937a76f8679fe8256a60342feb
X-VCS-Branch: master
Date: Sat, 9 Nov 2024 11:29:47 +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: 0adbf7be-1030-4d5a-82f8-3e4b5da0ab3b
X-Archives-Hash: 2106e775d53bef2ea5d5610e45b1992b
commit: 79dfdd171713f4937a76f8679fe8256a60342feb
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 9 11:17:20 2024 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 9 11:29:27 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79dfdd17
app-doc/elisp-manual: Consolidate patches into one common input file
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
app-doc/elisp-manual/elisp-manual-25.3.ebuild | 9 +++++++--
app-doc/elisp-manual/elisp-manual-26.3.ebuild | 9 +++++++--
app-doc/elisp-manual/elisp-manual-27.2.ebuild | 9 +++++++--
app-doc/elisp-manual/elisp-manual-28.2.ebuild | 9 +++++++--
.../files/elisp-manual-25.3-direntry.patch | 22 ----------------------
...y.patch => elisp-manual-25.3-direntry.patch.in} | 6 +++---
.../files/elisp-manual-26.3-direntry.patch | 22 ----------------------
.../files/elisp-manual-28.2-direntry.patch | 22 ----------------------
8 files changed, 31 insertions(+), 77 deletions(-)
diff --git a/app-doc/elisp-manual/elisp-manual-25.3.ebuild b/app-doc/elisp-manual/elisp-manual-25.3.ebuild
index 5a4e275b704f..a6927a42869e 100644
--- a/app-doc/elisp-manual/elisp-manual-25.3.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-25.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,12 @@ KEYWORDS="amd64 ppc x86"
BDEPEND="sys-apps/texinfo"
-PATCHES=("${FILESDIR}/${P}-direntry.patch")
+src_prepare() {
+ sed -e "s/@version@/${SLOT}/g" "${FILESDIR}"/${PN}-25.3-direntry.patch.in \
+ > "${T}"/direntry.patch || die
+ eapply "${T}"/direntry.patch
+ eapply_user
+}
src_compile() {
makeinfo -I "${WORKDIR}"/emacs elisp.texi || die
diff --git a/app-doc/elisp-manual/elisp-manual-26.3.ebuild b/app-doc/elisp-manual/elisp-manual-26.3.ebuild
index 0a9d38d01f70..bafa7a4a1ec4 100644
--- a/app-doc/elisp-manual/elisp-manual-26.3.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-26.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,12 @@ KEYWORDS="amd64 ppc ~riscv x86"
BDEPEND="sys-apps/texinfo"
-PATCHES=("${FILESDIR}/${P}-direntry.patch")
+src_prepare() {
+ sed -e "s/@version@/${SLOT}/g" "${FILESDIR}"/${PN}-25.3-direntry.patch.in \
+ > "${T}"/direntry.patch || die
+ eapply "${T}"/direntry.patch
+ eapply_user
+}
src_compile() {
makeinfo -I "${WORKDIR}"/emacs elisp.texi || die
diff --git a/app-doc/elisp-manual/elisp-manual-27.2.ebuild b/app-doc/elisp-manual/elisp-manual-27.2.ebuild
index 384d3d540172..d1f9f8376081 100644
--- a/app-doc/elisp-manual/elisp-manual-27.2.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-27.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,12 @@ KEYWORDS="amd64 ppc ~riscv x86"
BDEPEND="sys-apps/texinfo"
-PATCHES=("${FILESDIR}/${P}-direntry.patch")
+src_prepare() {
+ sed -e "s/@version@/${SLOT}/g" "${FILESDIR}"/${PN}-25.3-direntry.patch.in \
+ > "${T}"/direntry.patch || die
+ eapply "${T}"/direntry.patch
+ eapply_user
+}
src_compile() {
makeinfo -I "${WORKDIR}"/emacs elisp.texi || die
diff --git a/app-doc/elisp-manual/elisp-manual-28.2.ebuild b/app-doc/elisp-manual/elisp-manual-28.2.ebuild
index 384d3d540172..d1f9f8376081 100644
--- a/app-doc/elisp-manual/elisp-manual-28.2.ebuild
+++ b/app-doc/elisp-manual/elisp-manual-28.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -15,7 +15,12 @@ KEYWORDS="amd64 ppc ~riscv x86"
BDEPEND="sys-apps/texinfo"
-PATCHES=("${FILESDIR}/${P}-direntry.patch")
+src_prepare() {
+ sed -e "s/@version@/${SLOT}/g" "${FILESDIR}"/${PN}-25.3-direntry.patch.in \
+ > "${T}"/direntry.patch || die
+ eapply "${T}"/direntry.patch
+ eapply_user
+}
src_compile() {
makeinfo -I "${WORKDIR}"/emacs elisp.texi || die
diff --git a/app-doc/elisp-manual/files/elisp-manual-25.3-direntry.patch b/app-doc/elisp-manual/files/elisp-manual-25.3-direntry.patch
deleted file mode 100644
index 7303baa827c5..000000000000
--- a/app-doc/elisp-manual/files/elisp-manual-25.3-direntry.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lispref-orig/elisp.texi
-+++ lispref/elisp.texi
-@@ -1,6 +1,6 @@
- \input texinfo @c -*-texinfo-*-
- @c %**start of header
--@setfilename ../../info/elisp.info
-+@setfilename elisp25.info
-
- @ifset VOL1
- @set volflag
-@@ -116,9 +116,9 @@
- @end quotation
- @end copying
-
--@dircategory Emacs lisp
-+@dircategory Emacs
- @direntry
--* Elisp: (elisp). The Emacs Lisp Reference Manual.
-+* Elisp 25: (elisp25). The Emacs Lisp Reference Manual for Emacs 25.
- @end direntry
-
- @titlepage
diff --git a/app-doc/elisp-manual/files/elisp-manual-27.2-direntry.patch b/app-doc/elisp-manual/files/elisp-manual-25.3-direntry.patch.in
similarity index 71%
rename from app-doc/elisp-manual/files/elisp-manual-27.2-direntry.patch
rename to app-doc/elisp-manual/files/elisp-manual-25.3-direntry.patch.in
index 55ca06f6da73..97d025d4004e 100644
--- a/app-doc/elisp-manual/files/elisp-manual-27.2-direntry.patch
+++ b/app-doc/elisp-manual/files/elisp-manual-25.3-direntry.patch.in
@@ -4,11 +4,11 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
-@setfilename ../../info/elisp.info
-+@setfilename elisp27.info
++@setfilename elisp@version@.info
@ifset VOL1
@set volflag
-@@ -117,9 +117,9 @@
+@@ -116,9 +116,9 @@
@end quotation
@end copying
@@ -16,7 +16,7 @@
+@dircategory Emacs
@direntry
-* Elisp: (elisp). The Emacs Lisp Reference Manual.
-+* Elisp 27: (elisp27). The Emacs Lisp Reference Manual for Emacs 27.
++* Elisp @version@: (elisp@version@). The Emacs Lisp Reference Manual for Emacs @version@.
@end direntry
@titlepage
diff --git a/app-doc/elisp-manual/files/elisp-manual-26.3-direntry.patch b/app-doc/elisp-manual/files/elisp-manual-26.3-direntry.patch
deleted file mode 100644
index 4ce926fc5c4d..000000000000
--- a/app-doc/elisp-manual/files/elisp-manual-26.3-direntry.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lispref-orig/elisp.texi
-+++ lispref/elisp.texi
-@@ -1,6 +1,6 @@
- \input texinfo @c -*-texinfo-*-
- @c %**start of header
--@setfilename ../../info/elisp.info
-+@setfilename elisp26.info
-
- @ifset VOL1
- @set volflag
-@@ -116,9 +116,9 @@
- @end quotation
- @end copying
-
--@dircategory Emacs lisp
-+@dircategory Emacs
- @direntry
--* Elisp: (elisp). The Emacs Lisp Reference Manual.
-+* Elisp 26: (elisp26). The Emacs Lisp Reference Manual for Emacs 26.
- @end direntry
-
- @titlepage
diff --git a/app-doc/elisp-manual/files/elisp-manual-28.2-direntry.patch b/app-doc/elisp-manual/files/elisp-manual-28.2-direntry.patch
deleted file mode 100644
index 69aa78c7c7ad..000000000000
--- a/app-doc/elisp-manual/files/elisp-manual-28.2-direntry.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lispref/elisp.texi
-+++ lispref/elisp.texi
-@@ -1,6 +1,6 @@
- \input texinfo @c -*-texinfo-*-
- @c %**start of header
--@setfilename ../../info/elisp.info
-+@setfilename elisp28.info
-
- @ifset VOL1
- @set volflag
-@@ -117,9 +117,9 @@
- @end quotation
- @end copying
-
--@dircategory Emacs lisp
-+@dircategory Emacs
- @direntry
--* Elisp: (elisp). The Emacs Lisp Reference Manual.
-+* Elisp 28: (elisp28). The Emacs Lisp Reference Manual for Emacs 28.
- @end direntry
-
- @titlepage