gentoo resync : 06.04.2022

4 files changed, 17 insertions, 28 deletions

diff --git a/app-emacs/evil/Manifest b/app-emacs/evil/Manifest
index 3f6fb0b1f4ca..0de223ee956d 100644
--- a/app-emacs/evil/Manifest
+++ b/app-emacs/evil/Manifest
@@ -1,6 +1,5 @@
 AUX 50evil-gentoo.el 99 BLAKE2B 9ebd3d4d3a09091e822cbb6bc8d50890c6b46d627ef83d9d6ad8b518f0dd11a766ede08898746b0cd7e2657aa584c58535927716dfacf656802e840e13b4b861 SHA512 fb934f37d51412b59b8d5a7d27a7791d2db547bf1d71fd0a5b85bd31d24e2a663e92272095b6b2fe0cf44cac6ae69ed1a422b6b4ef0c6533e004018cfa6011b3
+AUX evil-1.14.0-emacs-28.patch 340 BLAKE2B 04d82c7e54a07ca2bcd503b89c178237d5a9293e1339cd622b0bf49ef8ae95a9a794c7a9564a5011a5e3667c7dbf7ee36064c874c71f0c98b37293ac9ad09e4f SHA512 02e88ec81760b4dc7e6512f0bf3ec78f91d06ac025fc4028c213e0bfddf5238de41a2838c5228091ae7d25914e44537a87494f2dd7ba316876d0202818a8af1a
 DIST evil-1.14.0.tar.gz 410031 BLAKE2B 85613c3e69812ce9f34b23c57e9d3c86084332ef08b3a87a508db27db6cae3c255087b07bb94d2fa4614ec82f46856b75250d22dbae15cf5194740598975eced SHA512 9d45534ec3242f86cf39884647b495b0c7a4e06875ba7f4581f43b0f22216bd9deb9a09b39b3e5a25c004e5707ed24a275b8a59572bbcaea4ef37787320492f0
-DIST evil-1.2.14.tar.gz 544497 BLAKE2B 1230632dbcfc065a65aca673e87662c8c77c5ce93e2aeaefcd416e9c41971c08fa692c976a1635f504080de20d08357b7beb4efb65db8198dbdbb766459f7987 SHA512 300de4b4bc6924bef7ec4f58cb9c24b38e694e7c1c215bfc5e816523fc5887dee6ce333b322d7fe5c47497491d194ee7c7269fe36c692f8c4413a8e286b796b3
-EBUILD evil-1.14.0.ebuild 632 BLAKE2B 1c5311f1b7e90fab27b4f4d364d72f8216d3cd32366b5a85eefb05522dfaa694c7406bc7d212b78932d08d9fd851d7c1f71cadda48d8334cf6aaefc89c59a489 SHA512 7ba9b9fb7fdde239837761f3617d8119f85950766e3d53b471da6cf3019e5d127af0801e0cb1abd3c212c907f5321098ef13a5ce1f37f47646d35fa5018430c2
-EBUILD evil-1.2.14.ebuild 618 BLAKE2B 66ca6958b28c0b97bfeecbc52fa68d82c404125e589872bd51589d57b55664f602b7927903ef0e5f547952ba896c6f5537eb0674e22d609b0ec7862909dd88aa SHA512 4c968fa83af442aeadaab822f66b9122f3e6cec75bad339d1b4d3f508d49db14155b1c6e9e21734637372c2c6ab850037eba157804595aadbd85636f147db362
+EBUILD evil-1.14.0.ebuild 678 BLAKE2B 632866bf2a52b50f474cc24be4d05c04134394f5e8f7c5e737d617ca7e8b58d445139362378cab142332fab0e20c64f879c657dcbd27dcf950d82d8d4f5ba526 SHA512 8a4b72d67e90152e1694bbc39add91c4a8ccd4090d0da891d8753d47742684e0524fb5b2329dd471e945918b42a1dd46c2006751e86fb4abdfce5798e3bcfa94
 MISC metadata.xml 283 BLAKE2B 81c49021199f71096079a27f9121390fb8c1285c54b9478583ff2d647277fa106ef12456d7097c4be092fc48b514a1adcf855ca0fac911598232ef9eb7f102c0 SHA512 f32b303760addf5d4db8d18bd10fb677353cdfa4c5e545d47804ef756cf5e5a21f8b8efb631b08f802185913ceb98da820e404e06eb03d01fe9ea85c10d1ac13
diff --git a/app-emacs/evil/evil-1.14.0.ebuild b/app-emacs/evil/evil-1.14.0.ebuild
index 7bbcef190ae2..d0449cbc8999 100644
--- a/app-emacs/evil/evil-1.14.0.ebuild
+++ b/app-emacs/evil/evil-1.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,7 @@ RDEPEND=">=app-emacs/undo-tree-0.6.3"
 BDEPEND="${RDEPEND}
 	sys-apps/texinfo"
 
+PATCHES=( "${FILESDIR}"/${P}-emacs-28.patch )
 ELISP_REMOVE="evil-pkg.el evil-tests.el evil-test-helpers.el"
 ELISP_TEXINFO="doc/build/texinfo/evil.texi"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/evil/evil-1.2.14.ebuild b/app-emacs/evil/evil-1.2.14.ebuild
deleted file mode 100644
index 01082bccd41f..000000000000
--- a/app-emacs/evil/evil-1.2.14.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit elisp
-
-DESCRIPTION="Extensible vi layer for Emacs"
-HOMEPAGE="https://github.com/emacs-evil/evil"
-SRC_URI="https://github.com/emacs-evil/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-RESTRICT="test"
-
-RDEPEND=">=app-emacs/undo-tree-0.6.3"
-BDEPEND="${RDEPEND}
-	sys-apps/texinfo"
-
-ELISP_REMOVE="evil-pkg.el evil-tests.el evil-test-helpers.el"
-ELISP_TEXINFO="doc/evil.texi"
-SITEFILE="50${PN}-gentoo.el"
-DOCS="CHANGES.org CONTRIBUTING.md README.md"
diff --git a/app-emacs/evil/files/evil-1.14.0-emacs-28.patch b/app-emacs/evil/files/evil-1.14.0-emacs-28.patch
new file mode 100644
index 000000000000..eb54a125232c
--- /dev/null
+++ b/app-emacs/evil/files/evil-1.14.0-emacs-28.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/836906
+
+--- evil-1.2.14/evil-ex.el
++++ evil-1.2.14/evil-ex.el
+@@ -592,7 +592,7 @@
+ 
+ (define-obsolete-function-alias
+   'evil-ex-shell-command-completion-at-point
+-  'comint-completion-at-point)
++  'comint-completion-at-point "")
+ 
+ (evil-ex-define-argument-type shell
+   "Shell argument type, supports completion."