[gentoo-commits] repo/gentoo:master commit in: app-emacs/vm/files/, app-emacs/vm/

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

commit:     b451acb7defe46c596ca96ae3245b2779d47aa92
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 13 11:27:23 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 13 11:27:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b451acb7

app-emacs/vm: Declare encoding of texinfo file.

Closes: https://bugs.gentoo.org/697556
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>

 app-emacs/vm/files/vm-8.2.0_beta-texinfo-encoding.patch |  8 ++++++++
 app-emacs/vm/vm-8.2.0_beta-r1.ebuild                    | 12 +++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app-emacs/vm/files/vm-8.2.0_beta-texinfo-encoding.patch b/app-emacs/vm/files/vm-8.2.0_beta-texinfo-encoding.patch
new file mode 100644
index 00000000000..2e202ee9c77
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.2.0_beta-texinfo-encoding.patch
@@ -0,0 +1,8 @@
+--- vm-8.2.0b-orig/info/vm.texinfo
++++ vm-8.2.0b/info/vm.texinfo
+@@ -1,4 +1,5 @@
+ \input texinfo
++@documentencoding ISO-8859-1
+ @setfilename vm.info
+ @settitle VM User's Manual
+ @dircategory Emacs

diff --git a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
index 271adb1e64f..df64a109d95 100644
--- a/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
+++ b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
@@ -23,13 +23,15 @@ BDEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
+PATCHES=(
+	"${FILESDIR}"/${P}-datadir.patch
+	"${FILESDIR}"/${P}-texinfo-5.patch
+	"${FILESDIR}"/${P}-optional-args.patch
+	"${FILESDIR}"/${P}-texinfo-encoding.patch
+)
 
 src_prepare() {
-	eapply "${FILESDIR}/${P}-datadir.patch"
-	eapply "${FILESDIR}/${P}-texinfo-5.patch"
-	eapply "${FILESDIR}/${P}-optional-args.patch"
-	eapply_user
-
+	elisp_src_prepare
 	if ! use bbdb; then
 		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
 		eapply "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"