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@[email protected]
@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
