From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1116365-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 75513138334
for <garchives@archives.gentoo.org>; Sun, 13 Oct 2019 11:28:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C2F35E0844;
Sun, 13 Oct 2019 11:28:18 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id CE707E0844
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Oct 2019 11:28:17 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D733234BCCA
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Oct 2019 11:28:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 602F6802
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Oct 2019 11:28:15 +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: <1570966069.b451acb7defe46c596ca96ae3245b2779d47aa92.ulm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emacs/vm/files/, app-emacs/vm/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emacs/vm/files/vm-8.2.0_beta-texinfo-encoding.patch app-emacs/vm/vm-8.2.0_beta-r1.ebuild
X-VCS-Directories: app-emacs/vm/ app-emacs/vm/files/
X-VCS-Committer: ulm
X-VCS-Committer-Name: Ulrich Müller
X-VCS-Revision: b451acb7defe46c596ca96ae3245b2779d47aa92
X-VCS-Branch: master
Date: Sun, 13 Oct 2019 11:28:15 +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: 39e1e2f1-1e53-481f-b8c9-f5a08bc0c168
X-Archives-Hash: 95dd5d0e3c4bc98985bab42a397bee2b
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"