gentoo resync : 06.04.2022

4 files changed, 50 insertions, 6 deletions

diff --git a/app-emacs/volume/Manifest b/app-emacs/volume/Manifest
index c52f0e856080..2e89a01feb8b 100644
--- a/app-emacs/volume/Manifest
+++ b/app-emacs/volume/Manifest
@@ -1,5 +1,6 @@
 AUX 50volume-gentoo.el 100 BLAKE2B 03917eb50fa454861498a47516054b0a58bbfff701cbc7665597380ec2f76a7f8600b4916e15d9cc5a841168da4db9b26b9e122cc65771437e444d1d14bdcfdd SHA512 82727310458923bdb06d840b3471c49f6498faaab53033333d1ba02ab2c03f709e17ea5373d264441401e0bb82770c9c451e61cd468fa04a04229471f620ca63
+AUX volume-1.0-emacs-28.patch 1250 BLAKE2B 9214b55a29cfea4ff246d939bd459058d5b41a8cbaef32217ac0a3ba0223d1c31470f76a0038566a84c7e0a9bf2994e9b2b99457d4b4e4915cf2265e0fe5b0ef SHA512 c3cf14a6b6b0538dad672dd734391197ab502f1b12b7e0903825cabf4348392525549c392e68ba7c24155290f7f691630c05ab0cced868f80b9acb50188c340b
 AUX volume-1.0-mode-line.patch 552 BLAKE2B 48a7159d7389bd7d4a87280af1eceb4e32b1f3ea467176ecb0e1f787364930d91eb7cf56da124b6483f6db0a53ffb016c5987b4f73437701f815ddb448f103db SHA512 aec6fa297e242ce601704ca5709d9595ea0fb14fab2d0eeb3380d20d545a7131e5260dc1c2cc7e1d85c88789aa7f4d2f4701c121dec1401a3e4b7902b40c589d
 DIST volume-1.0.el.bz2 8044 BLAKE2B cdd914a25c137f28f9f26e88430ed6ce3be7b4788c9fcaa3e0246b7057233c78af80f33ce9b6fd778fac47c9de624707f169f6e2836b93aa2c30f8c25e88deef SHA512 32672ef525571bc022d6c0f5f5f5f9d16bb5f57176e63a3dbaa67f41cef5a8bfef06468093c439601b2b3439f6e77e8e7e6d6c9245b18a77ebb409c64eece510
-EBUILD volume-1.0-r1.ebuild 604 BLAKE2B 34142668ab126e86852073dab2f6ed27f56a82bd64976885429870ffba455dfd3d25f1c3072aaeed83535af842569413fdd54917fd4fca3597f072f02ac21a99 SHA512 6d345abf87568533e3add9d5baf1535f0e64a12b1a91925689bf778846204c5bce6554277f71f0c0e4d8a07eca76c660d60ee735f033a980eaee894d3a79e42c
-MISC metadata.xml 362 BLAKE2B 80613aac2b7f405ece82b2d344c47d1643b820b28ac3326923654e7e90ef802ef31b61e7c930f2d4264c2ce01ed709bf3732e07cfd487f83683060210b01ff09 SHA512 35306e5192c253ef3e51bcc0dada1b23d353b206558188cde887b9922cefd952bf837c8920facc73e5acd69975c80f8032286f607071aedac61b152027f50e9b
+EBUILD volume-1.0-r1.ebuild 650 BLAKE2B f71d0edc01159da7be8bef1f5705dd323c315d3376907c7ca7bde033c965813f033380e28ea992f28d73c06e266d86d5bc6fcc7f042cb4cb370c79fef3629727 SHA512 dd79256c44e0d963a423bee00adad2ec55b16ed0ad9217f447942b2346e24e5c76e767b40add7822b2200bb479bbbda94263d4f41544a7e8ef9f55ea1e64d871
+MISC metadata.xml 362 BLAKE2B 8653447478357d3d3d891be8ba855d33d1ec12728daf5902e45af1d784e6874eb8d849f6fca9165a7138674243e7b1be1222d07d32487cb0f1be7e9aef0a516c SHA512 64211dbbf4c7b3bbab4ae796fca10c81780ff82d65a3506267f339283cbe51f063b1d55fffe56be488a7eb19d606f2c798c44d462d0df292b62f05e4d6cadf79
diff --git a/app-emacs/volume/files/volume-1.0-emacs-28.patch b/app-emacs/volume/files/volume-1.0-emacs-28.patch
new file mode 100644
index 000000000000..8a26b0441ebf
--- /dev/null
+++ b/app-emacs/volume/files/volume-1.0-emacs-28.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/836904
+
+--- a/volume.el
++++ b/volume.el
+@@ -448,7 +448,7 @@
+ 
+ (when (fboundp 'define-obsolete-variable-alias)
+   (define-obsolete-variable-alias 'volume-amixer-control
+-    'volume-amixer-default-channel))
++    'volume-amixer-default-channel ""))
+ 
+ (defvar volume-amixer-current-channel volume-amixer-default-channel
+   "The name of the ALSA mixer channel to manipulate.")
+@@ -562,7 +562,7 @@
+ 
+ (when (fboundp 'define-obsolete-function-alias)
+   (define-obsolete-function-alias 'volume-channel-name
+-    'volume-channel-label))
++    'volume-channel-label ""))
+ 
+ (defun volume-channels ()
+   "Return the list of available channels."
+@@ -775,7 +775,7 @@
+   (volume-lower (* n 10)))
+ 
+ (defalias 'volume-lower-more 'volume-lower-10)
+-(make-obsolete 'volume-lower-more 'volume-lower-10)
++(make-obsolete 'volume-lower-more 'volume-lower-10 "")
+ 
+ (defun volume-raise-10 (&optional n)
+   "Raise the volume by 10 N percentage units."
+@@ -783,7 +783,7 @@
+   (volume-raise (* n 10)))
+ 
+ (defalias 'volume-raise-more 'volume-raise-10)
+-(make-obsolete 'volume-raise-more 'volume-raise-10)
++(make-obsolete 'volume-raise-more 'volume-raise-10 "")
+ 
+ (defun volume-lower-50 (&optional n)
+   "Lower the volume by 50 N percentage units."
diff --git a/app-emacs/volume/metadata.xml b/app-emacs/volume/metadata.xml
index 978a4ffa187c..9241744bc512 100644
--- a/app-emacs/volume/metadata.xml
+++ b/app-emacs/volume/metadata.xml
@@ -7,6 +7,6 @@
 </maintainer>
 <stabilize-allarches/>
 <upstream>
-  <remote-id type="github">dbrock/volume-el</remote-id>
+  <remote-id type="github">dbrock/volume.el</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/app-emacs/volume/volume-1.0-r1.ebuild b/app-emacs/volume/volume-1.0-r1.ebuild
index 130913594d03..3bb752070488 100644
--- a/app-emacs/volume/volume-1.0-r1.ebuild
+++ b/app-emacs/volume/volume-1.0-r1.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
@@ -6,7 +6,7 @@ EAPI=7
 inherit elisp
 
 DESCRIPTION="Tweak your sound card volume from Emacs"
-HOMEPAGE="https://github.com/dbrock/volume-el"
+HOMEPAGE="https://github.com/dbrock/volume.el"
 SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.el.bz2"
 
 LICENSE="GPL-2+"
@@ -18,5 +18,8 @@ KEYWORDS="amd64 ppc sparc x86"
 
 # RDEPEND="|| ( media-sound/aumixer media-sound/alsa-utils )"
 
-ELISP_PATCHES="${P}-mode-line.patch"
+PATCHES=(
+	"${FILESDIR}"/${P}-mode-line.patch
+	"${FILESDIR}"/${P}-emacs-28.patch
+)
 SITEFILE="50${PN}-gentoo.el"