[gentoo-commits] repo/gentoo:master commit in: media-sound/cmus/

["Arthur Zamarin" <arthurzam@gentoo.org>]

commit:     38e755d166c63eab9c4e7f68739d660123db0341
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 09:44:20 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 17:48:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38e755d1

media-sound/cmus: fix VariableShadowed

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-sound/cmus/cmus-2.10.0-r1.ebuild | 11 +++++------
 media-sound/cmus/cmus-9999.ebuild      | 10 +++++-----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/media-sound/cmus/cmus-2.10.0-r1.ebuild b/media-sound/cmus/cmus-2.10.0-r1.ebuild
index db9395714548..3679ab233896 100644
--- a/media-sound/cmus/cmus-2.10.0-r1.ebuild
+++ b/media-sound/cmus/cmus-2.10.0-r1.ebuild
@@ -21,8 +21,11 @@ SLOT="0"
 IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libsamplerate
 	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio sndio systemd tremor +unicode
 	+vorbis wavpack"
-
-REQUIRED_USE="?? ( elogind systemd )"
+# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
+REQUIRED_USE="
+	?? ( elogind systemd )
+	tremor? ( vorbis )
+	mp4? ( aac )" # enabling mp4 adds -lfaad
 
 BDEPEND="
 	virtual/pkgconfig
@@ -60,10 +63,6 @@ RDEPEND="${DEPEND}
 	)
 "
 
-# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
-REQUIRED_USE="tremor? ( vorbis )
-	mp4? ( aac )" # enabling mp4 adds -lfaad
-
 DOCS=( AUTHORS README.md )
 
 S="${WORKDIR}/${P/_/-}"

diff --git a/media-sound/cmus/cmus-9999.ebuild b/media-sound/cmus/cmus-9999.ebuild
index fc4d20a5eac3..0bd63fdecd83 100644
--- a/media-sound/cmus/cmus-9999.ebuild
+++ b/media-sound/cmus/cmus-9999.ebuild
@@ -22,7 +22,11 @@ IUSE="aac alsa ao cddb cdio debug discid elogind examples ffmpeg +flac jack libs
 	+mad mikmod modplug mp4 musepack opus oss pidgin pulseaudio sndio systemd tremor +unicode
 	+vorbis wavpack"
 
-REQUIRED_USE="?? ( elogind systemd )"
+# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
+REQUIRED_USE="
+	?? ( elogind systemd )
+	tremor? ( vorbis )
+	mp4? ( aac )" # enabling mp4 adds -lfaad
 
 BDEPEND="
 	virtual/pkgconfig
@@ -60,10 +64,6 @@ RDEPEND="${DEPEND}
 	)
 "
 
-# Both CONFIG_TREMOR=y and CONFIG_VORBIS=y are required to link to tremor libs instead of vorbis libs
-REQUIRED_USE="tremor? ( vorbis )
-	mp4? ( aac )" # enabling mp4 adds -lfaad
-
 DOCS=( AUTHORS README.md )
 
 S="${WORKDIR}/${P/_/-}"