gentoo resync : 13.10.2019

5 files changed, 49 insertions, 13 deletions

diff --git a/app-emacs/teco/Manifest b/app-emacs/teco/Manifest
index 49ba271d8936..d4f3c214ff59 100644
--- a/app-emacs/teco/Manifest
+++ b/app-emacs/teco/Manifest
@@ -1,6 +1,7 @@
 AUX 50teco-gentoo.el 257 BLAKE2B 4abde23767cfa240b27e735158997eee8f91ea71893d398eacebacea28529c10bb6a61f66e602c362858878a54ecdafa3e071d232ac76c3edb61ef3ed9f31e19 SHA512 ab17c9541474290b9ea85d6788b54e5615b4ca93cb8194986950d285f744f614f8e598e6d5bf6441069f8274c7f012f9266178a104789488f88934ce1e2b0759
-AUX teco-7-emacs-24.patch 1350 BLAKE2B b5dd024ce4bfa4db7f7108756772ac3d7faf074260749af2254bff429cd4ac82c18b840f70e41f28e4ba0a2f342831374372695d4ea6c0f0030663e6aa6546f0 SHA512 71afdf37ab38e76181e1a7ce90a73ad31a625039d784b9334f79a8642a45c7922022f74231e8cf70cb6bcad023012412262d6ef840ac611a182e3eb48ee0f4e5
-AUX teco-7-minibuffer-prompt.patch 2574 BLAKE2B 93f031a0d59b7887251b5642d031a83ecf7f94a481e55804530fec5c2f6b8a80c16fecb53a3b1560c38c1f2c8de583c11cac3a721d3d84d04a083f1a1fd859eb SHA512 df67994df08353757cf7be3d8ebf0c0d6c048d8e195360d9f7afaa29ca44cd3ccbe95885d9c790a29c1965c3d291136e195fa076bf9a0a42304c46267ebb1446
+AUX teco-7-backquotes.patch 909 BLAKE2B f68b2548e03263373a42fbc1158483bedece62ad7db2b3c7fdd0deb82c80e21d2ac7c06ef93517c50a047c74110e1e8b5c08af9a082beddb17a0019119a76c61 SHA512 dd58da5639487b7ce1ad8cb3b0fcb71eef3bd0c00646fc7acbcde22563cadfc4cc41cdf37adf82671bcdd8e50cc769bf85a35836ddf3e5d040ede5e10f40d3d0
+AUX teco-7-emacs-24.patch 1354 BLAKE2B fd1d077b9557a62af242e47557be0287ca179a3108c1d89799f28e488f8387440846d5a26b68a3cbcee7187537ed33eb0c7d99f54320f5f65798390473174df3 SHA512 599695cd16a0b244f4b8da5ce8787a57a7d821bbf19fe9374a8e78e16e29f022bb3e9a6979440fdbc3fbc1013769e24cad5a393f5e6b065d3da80a9e7e8fe53c
+AUX teco-7-minibuffer-prompt.patch 2578 BLAKE2B baa39f6434eca9ca3329f472b0bdae5568c4c7d188891e7d29daca0e1555417f48b251d88af8186ae630c0a9972df6a39f97eb8641765cc0308821bb886918f8 SHA512 e8f36df69268e63373f3f740cbefe3add0afb10c147d546ac06d5d6176822c0e281e6bd7cf91368d7a850c6f7bc06f836d5a79ac690711e0fdc4ebb16c322819
 DIST teco-7.el.bz2 16372 BLAKE2B c5608c1546262b9dcb52e0c5f1e41c87e94f142a96e8ce1262201b00672d810c925c20090c36edc596e0fb362265e72861f4bc214cb13ed94fa71b586bc4f45d SHA512 7fb050d2d12aadeccc18d852b4191493be301c90ac5426ee4f985a89eba62f9b57d263a2156d5252e88d06bbe68508aca2bebeca65402ff9e8f00937f5189feb
-EBUILD teco-7-r1.ebuild 701 BLAKE2B 4a5416ad5446deb45609d0a530cee937b3ad480dd4e06b7f9b2085b68c7acfdedcf0aab5ef8806947a43298a904da3830deb02df70d6e19856be6442f0af4804 SHA512 c19c94c05c2e10d145e7a43ae2a900849950ec6a001fb09f2d1bb46a6b097e9c3212869a63e2ce614747ab6ed9a2f4b12058cf8a2c92b0352f3c453b7bd587a2
+EBUILD teco-7-r2.ebuild 761 BLAKE2B 90a3a29380bf49fdf3c76457973266b7b9998fc4ef6334d7e539f8fdd202d549e04d5c30407babd72002a05239aafa9a6ba5583f67a7a8f0afee08cefeed31ba SHA512 7ee3103b54c37a8ad1c58b85624b48dc6e9c0d01506f7b2c89eccbfd822cfd794bbf7e4669001b23fbfc682fc7d1f1dc5c060b0ebfb36acc2883cb388a0de4b0
 MISC metadata.xml 282 BLAKE2B 432e60a3b04def9f566fde3852011e006c0d578c72c42115734d1af5c128440fcee68134c8f891baad437e64a8d61fbbac49e70a35ed4f6f85641e888d3a2547 SHA512 1838e22e1f5b849b816a05d1b25bd81333c8cf67ceb996177e05ba7a555b8e0e307e62cb53e6f1217f4216823e2fecf050e85437678503d60e10c6b2d5303072
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 000000000000..b586812cf038
--- /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/files/teco-7-emacs-24.patch b/app-emacs/teco/files/teco-7-emacs-24.patch
index 0b3251919ddb..d0cda4d90fd4 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 f46fadc98a39..4d8328198fbb 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
index ef2a0ac6508f..3fedca3d015a 100644
--- a/app-emacs/teco/teco-7-r1.ebuild
+++ b/app-emacs/teco/teco-7-r2.ebuild
@@ -1,21 +1,22 @@
-# 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
+	"${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.: