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

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

[Ulrich Müller]

commit:     a293e636dead912e23744c594c4f805bbb6f7f31
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 13:48:38 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 13:49:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a293e636

app-emacs/teco: Fix old-style backquotes.

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

 app-emacs/teco/files/teco-7-backquotes.patch | 34 ++++++++++++++++++++++++++++
 app-emacs/teco/teco-7-r2.ebuild              |  3 ++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app-emacs/teco/files/teco-7-backquotes.patch b/app-emacs/teco/files/teco-7-backquotes.patch
new file mode 100644
index 00000000000..b586812cf03
--- /dev/null
+++ b/app-emacs/teco/files/teco-7-backquotes.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/684180
+
+--- a/teco.el
++++ b/teco.el
+@@ -451,10 +451,10 @@
+ and does
+ 	(aset teco:exec-1 ?x 'teco:type-1-x)"
+   (let ((s (intern (concat "teco:type-1-" (char-to-string char)))))
+-    (` (progn
+-	 (defun (, s) ()
+-	   (,@ body))
+-	 (aset teco:exec-1 (, char) '(, s))))))
++    `(progn
++       (defun ,s ()
++	 ,@body)
++       (aset teco:exec-1 ,char ',s))))
+ 
+ (defmacro teco:define-type-2 (char &rest body)
+   "Define the code to process a type 2 character.
+@@ -467,10 +467,10 @@
+ and does
+ 	(aset teco:exec-2 ?x 'teco:type-2-x)"
+   (let ((s (intern (concat "teco:type-2-" (char-to-string char)))))
+-    (` (progn
+-	 (defun (, s) ()
+-	   (,@ body))
+-	 (aset teco:exec-2 (, char) '(, s))))))
++    `(progn
++       (defun ,s ()
++	 ,@body)
++       (aset teco:exec-2 ,char ',s))))
+ 
+ (defconst teco:char-types (make-vector 256 0)
+   "Define the characteristics of characters, as tested by \":

diff --git a/app-emacs/teco/teco-7-r2.ebuild b/app-emacs/teco/teco-7-r2.ebuild
index 921d8d072be..3fedca3d015 100644
--- a/app-emacs/teco/teco-7-r2.ebuild
+++ b/app-emacs/teco/teco-7-r2.ebuild
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 PATCHES=("${FILESDIR}"/${P}-minibuffer-prompt.patch
-	"${FILESDIR}"/${P}-emacs-24.patch)
+	"${FILESDIR}"/${P}-emacs-24.patch
+	"${FILESDIR}"/${P}-backquotes.patch)
 SITEFILE="50${PN}-gentoo.el"
 DOC_CONTENTS="To be able to invoke Teco directly, define a keybinding
 	for teco:command in your ~/.emacs file, e.g.:

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

[Ulrich Müller]

commit:     5558f887801e48aae47444b308b19f503169bbe7
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct  1 13:46:45 2019 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct  1 13:49:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5558f887

app-emacs/teco: Bump EAPI to 7.

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

 app-emacs/teco/files/teco-7-emacs-24.patch            |  4 ++--
 app-emacs/teco/files/teco-7-minibuffer-prompt.patch   |  4 ++--
 app-emacs/teco/{teco-7-r1.ebuild => teco-7-r2.ebuild} | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app-emacs/teco/files/teco-7-emacs-24.patch b/app-emacs/teco/files/teco-7-emacs-24.patch
index 0b3251919dd..d0cda4d90fd 100644
--- a/app-emacs/teco/files/teco-7-emacs-24.patch
+++ b/app-emacs/teco/files/teco-7-emacs-24.patch
@@ -1,5 +1,5 @@
---- teco.el
-+++ teco.el
+--- a/teco.el
++++ b/teco.el
 @@ -312,7 +312,7 @@
    "Return string describing the version of Teco.  When called interactively,
  displays the version."

diff --git a/app-emacs/teco/files/teco-7-minibuffer-prompt.patch b/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
index f46fadc98a3..4d8328198fb 100644
--- a/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
+++ b/app-emacs/teco/files/teco-7-minibuffer-prompt.patch
@@ -1,5 +1,5 @@
---- teco.el
-+++ teco.el
+--- a/teco.el
++++ b/teco.el
 @@ -2213,9 +2213,11 @@
  (define-key teco:command-keymap "/" 'teco:command-slash)
  (define-key teco:command-keymap "*" 'teco:command-star)

diff --git a/app-emacs/teco/teco-7-r1.ebuild b/app-emacs/teco/teco-7-r2.ebuild
similarity index 70%
rename from app-emacs/teco/teco-7-r1.ebuild
rename to app-emacs/teco/teco-7-r2.ebuild
index ef2a0ac6508..921d8d072be 100644
--- a/app-emacs/teco/teco-7-r1.ebuild
+++ b/app-emacs/teco/teco-7-r2.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit readme.gentoo elisp
+inherit elisp readme.gentoo-r1
 
 DESCRIPTION="TECO interpreter for GNU Emacs"
 HOMEPAGE="https://www.emacswiki.org/emacs/TECO"
-# taken from: http://www.emacswiki.org/emacs/teco.el
+# taken from: https://www.emacswiki.org/emacs/teco.el
 SRC_URI="mirror://gentoo/${P}.el.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-ELISP_PATCHES="${P}-minibuffer-prompt.patch
-	${P}-emacs-24.patch"
+PATCHES=("${FILESDIR}"/${P}-minibuffer-prompt.patch
+	"${FILESDIR}"/${P}-emacs-24.patch)
 SITEFILE="50${PN}-gentoo.el"
 DOC_CONTENTS="To be able to invoke Teco directly, define a keybinding
 	for teco:command in your ~/.emacs file, e.g.: