gentoo resync : 06.04.2022

3 files changed, 28 insertions, 2 deletions

diff --git a/app-emacs/emacs-jabber/Manifest b/app-emacs/emacs-jabber/Manifest
index 323dd45fea6d..6130236c5a31 100644
--- a/app-emacs/emacs-jabber/Manifest
+++ b/app-emacs/emacs-jabber/Manifest
@@ -1,4 +1,5 @@
 AUX 50emacs-jabber-gentoo.el 206 BLAKE2B c94ea17b7cab171249f24a873af06ef38b586a25870a27557255902a072b5d0995e14141f7d6a9648d9ba5bbe3e7887a319de67ba2429c9b840b6d2d5b29c8e4 SHA512 44c94b318b547689788c60d41ceb8b93ffbb479099fe94933636a9a91505abaf62bfcbddb145d34cb509d35dec3c0f62b2dafc91477a723ce6585a69f45a9cb5
+AUX emacs-jabber-0.8.92-emacs-28.patch 942 BLAKE2B 5c3327422ac06cac61f99a032e0795bb6d506938bb280e5b41ec9ac937286b1ae23a508271e6716913ff484d985d6459b821f7029c770c7a75066dd7d977f7ec SHA512 b66a91e872b78e4cb4b3f27d6eedb8a234c5a95fc4a270d76ff54831d8fa6dc5a9122f06084ca1a1f1fb5d1e5b7aa131031f94d8260771b32288a8b69fddaf6b
 DIST emacs-jabber-0.8.92.tar.xz 293948 BLAKE2B 0de6eacb0ae1487a080a241e9ef4c38a98d96647773b7d35857e958e06f35906963947f7de836d2ea80a1935f96ccbc79de83ab88ce307085017ba229679f0f0 SHA512 30cfb5e420914e411bfbbc0c4f1b7fb78190bee6aea61fad0f9b426e0138608f327626da6ff792fc443c58b7d3b70dc3f6291ca4e1a16965fa1283f91afe8882
-EBUILD emacs-jabber-0.8.92.ebuild 516 BLAKE2B 9e64081a7fed8fb6d53178014529f521a94f9ca7e1dfdf6f840494eb55c8a1c6a555d01a82eb020a560456ef10012f8ccfdb1f505fc9f9f5d4947c2f3ab868ff SHA512 fa49293f0ab87390ebcb43766800b9e966221a368b65aabe42ea33a2582bbd5938ca40984554d2c48d613c82c41906480022ea728d6f68599289a27914362abc
+EBUILD emacs-jabber-0.8.92.ebuild 562 BLAKE2B 3c4016d912ccbbfaa1c5ff6cfba07895659a7b1642c186a3784913afaf7cb4dfb8fc1edbcadfb3cddcd573d247a947529b83e50360f8f6e81bc2ea60b4544d75 SHA512 14c0c76220b4c1c6f1727e1f9d7bc98374f4229c0de7b8e8d36b23688eba1f1ba80c75451e3b9306a12982e9fa60d95914df776c72661389b261548c36599daa
 MISC metadata.xml 363 BLAKE2B d7b0a56bf9d4ae4eeed84fd0d464644c1d3cb04abea3f4b39273f3d22793a60b7e3d8e21a2e02b7bc454b6a3cf939300a598ebee1cc28d040141a64cf94cb521 SHA512 a6f4b7d9ec08ba628640cea1c990730a0332a9ee6197466b3db16bb761f9866d814c0b264c997ec0423b71e16ef68ee3a50ff00f4b565dcb0324436b27791a41
diff --git a/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild b/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
index 02f3fb71c349..91ccdffb5d2b 100644
--- a/app-emacs/emacs-jabber/emacs-jabber-0.8.92.ebuild
+++ b/app-emacs/emacs-jabber/emacs-jabber-0.8.92.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/hexrgb"
 DEPEND="${RDEPEND}
 	sys-apps/texinfo"
 
+PATCHES=( "${FILESDIR}"/${P}-emacs-28.patch )
 SITEFILE="50${PN}-gentoo.el"
 ELISP_TEXINFO="jabber.texi"
 DOCS="AUTHORS NEWS README"
diff --git a/app-emacs/emacs-jabber/files/emacs-jabber-0.8.92-emacs-28.patch b/app-emacs/emacs-jabber/files/emacs-jabber-0.8.92-emacs-28.patch
new file mode 100644
index 000000000000..28a108bafa32
--- /dev/null
+++ b/app-emacs/emacs-jabber/files/emacs-jabber-0.8.92-emacs-28.patch
@@ -0,0 +1,24 @@
+https://bugs.gentoo.org/836817
+
+--- emacs-jabber-0.8.92/jabber-menu.el
++++ emacs-jabber-0.8.92/jabber-menu.el
+@@ -100,7 +100,7 @@
+   (interactive "P")
+   (setq jabber-display-menu (if remove nil t))
+   (force-mode-line-update))
+-(make-obsolete 'jabber-menu "set the variable `jabber-display-menu' instead.")
++(make-obsolete 'jabber-menu 'jabber-display-menu "")
+ 
+ ;; This used to be:
+ ;; (define-key-after global-map [menu-bar jabber-menu] ...)
+--- emacs-jabber-0.8.92/jabber-roster.el
++++ emacs-jabber-0.8.92/jabber-roster.el
+@@ -816,7 +816,7 @@
+ (defalias 'jabber-presence-update-roster 'ignore)
+ ;;jabber-presence-update-roster is not needed anymore.
+ ;;Its work is done in `jabber-process-presence'."
+-(make-obsolete 'jabber-presence-update-roster 'ignore)
++(make-obsolete 'jabber-presence-update-roster 'ignore "")
+ 
+ (defun jabber-next-property (&optional prev)
+   "Return position of next property appearence or nil if there is none.