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

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

[Ulrich Müller]

commit:     5e3ee0a508a71cbc4090d86e09e3a5c124566034
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 10 06:22:02 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Aug 10 06:22:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e3ee0a5

app-emacs/vm: Fix function definition in vm-pcrisis.el.

Bug: https://bugs.gentoo.org/652952
Package-Manager: Portage-2.3.45, Repoman-2.3.10

 app-emacs/vm/files/vm-8.2.0_beta-optional-args.patch   | 13 +++++++++++++
 .../{vm-8.2.0_beta.ebuild => vm-8.2.0_beta-r1.ebuild}  | 18 +++++++++---------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/app-emacs/vm/files/vm-8.2.0_beta-optional-args.patch b/app-emacs/vm/files/vm-8.2.0_beta-optional-args.patch
new file mode 100644
index 00000000000..2cec28e046f
--- /dev/null
+++ b/app-emacs/vm/files/vm-8.2.0_beta-optional-args.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/652952
+
+--- vm-8.2.0b-orig/lisp/vm-pcrisis.el
++++ vm-8.2.0b/lisp/vm-pcrisis.el
+@@ -1214,7 +1214,7 @@
+ ;; Functions for vmpc-conditions:
+ ;; -------------------------------------------------------------------
+ 
+-(defun vmpc-none-true-yet (&optional &rest exceptions)
++(defun vmpc-none-true-yet (&rest exceptions)
+   "True if none of the previous evaluated conditions was true.
+ This is a condition that can appear in `vmpc-conditions'.  If EXCEPTIONS are
+ specified, it means none were true except those.  For example, if you wanted

diff --git a/app-emacs/vm/vm-8.2.0_beta.ebuild b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
similarity index 83%
rename from app-emacs/vm/vm-8.2.0_beta.ebuild
rename to app-emacs/vm/vm-8.2.0_beta-r1.ebuild
index 2ed8bc2e6aa..0cdf2674f88 100644
--- a/app-emacs/vm/vm-8.2.0_beta.ebuild
+++ b/app-emacs/vm/vm-8.2.0_beta-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit elisp eutils
+inherit elisp
 
 MY_PV="${PV/_beta/b}"
 MY_P="${PN}-${MY_PV}"
@@ -17,22 +17,22 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="bbdb ssl"
 
 DEPEND="bbdb? ( <app-emacs/bbdb-3 )"
-RDEPEND="!app-emacs/u-vm-color
-	${DEPEND}
+RDEPEND="${DEPEND}
 	ssl? ( net-misc/stunnel )"
-DEPEND="${DEPEND}
-	sys-apps/texinfo"
+BDEPEND="sys-apps/texinfo"
 
 S="${WORKDIR}/${MY_P}"
 SITEFILE="50${PN}-gentoo.el"
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-datadir.patch"
-	epatch "${FILESDIR}/${P}-texinfo-5.patch"
+	eapply "${FILESDIR}/${P}-datadir.patch"
+	eapply "${FILESDIR}/${P}-texinfo-5.patch"
+	eapply "${FILESDIR}/${P}-optional-args.patch"
+	eapply_user
 
 	if ! use bbdb; then
 		elog "Excluding vm-pcrisis.el since the \"bbdb\" USE flag is not set."
-		epatch "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
+		eapply "${FILESDIR}/${PN}-8.0-no-pcrisis.patch"
 	fi
 }
 

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

[Ulrich Müller]

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"