media-sound/*: Prepare for media-sound/mac bump

Bug: https://bugs.gentoo.org/838715
Signed-off-by: Daniel Pielmeier <billie@gentoo.org>

8 files changed, 20 insertions, 15 deletions

diff --git a/media-sound/abcde/abcde-2.9.3-r3.ebuild b/media-sound/abcde/abcde-2.9.3-r4.ebuild
index ff1093b5c2fb..3e81ffb65f15 100644
--- a/media-sound/abcde/abcde-2.9.3-r3.ebuild
+++ b/media-sound/abcde/abcde-2.9.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -37,7 +37,7 @@ RDEPEND="
 	lame? ( media-sound/lame )
 	mac? (
 		media-sound/apetag
-		media-sound/mac
+		<=media-sound/mac-4.12
 	)
 	musepack? ( media-sound/musepack-tools )
 	musicbrainz? (
diff --git a/media-sound/aqualung/aqualung-1.2-r1.ebuild b/media-sound/aqualung/aqualung-1.2-r2.ebuild
index 7979234c9fef..a8a06cac3610 100644
--- a/media-sound/aqualung/aqualung-1.2-r1.ebuild
+++ b/media-sound/aqualung/aqualung-1.2-r2.ebuild
@@ -24,8 +24,6 @@ BDEPEND="
 	virtual/pkgconfig
 	sys-devel/gettext
 "
-# <ffmpeg-5 dep for bug #834391
-# https://github.com/jeremyevans/aqualung/issues/29
 RDEPEND="
 	app-arch/bzip2
 	dev-libs/libxml2
@@ -42,14 +40,21 @@ RDEPEND="
 	lame? ( media-sound/lame )
 	libsamplerate? ( media-libs/libsamplerate )
 	lua? ( ${LUA_DEPS} )
-	mac? ( media-sound/mac )
+	mac? ( <=media-sound/mac-4.12 )
 	modplug? ( media-libs/libmodplug )
 	mp3? ( media-libs/libmad )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	pulseaudio? ( media-libs/libpulse )
 	sndfile? ( media-libs/libsndfile )
-	speex? ( media-libs/speex media-libs/liboggz media-libs/libogg )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
+	speex? (
+		media-libs/speex
+		media-libs/liboggz
+		media-libs/libogg
+	)
+	vorbis? (
+		media-libs/libvorbis
+		media-libs/libogg
+	)
 	wavpack? ( media-sound/wavpack )
 "
 DEPEND="${RDEPEND}"
diff --git a/media-sound/asunder/asunder-2.9.7.ebuild b/media-sound/asunder/asunder-2.9.7-r1.ebuild
index cde24a12aab4..f55896226042 100644
--- a/media-sound/asunder/asunder-2.9.7.ebuild
+++ b/media-sound/asunder/asunder-2.9.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -24,7 +24,7 @@ DEPEND="media-libs/libcddb
 # dlopen() deps
 RDEPEND="${DEPEND}
 	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
+	mac? ( <=media-sound/mac-4.12 )
 	mp3? ( media-sound/lame )
 	musepack? ( media-sound/musepack-tools )
 	opus? ( media-sound/opus-tools )
diff --git a/media-sound/asunder/asunder-3.0.1.ebuild b/media-sound/asunder/asunder-3.0.1-r1.ebuild
index 030d989f735d..22ad05fbe08e 100644
--- a/media-sound/asunder/asunder-3.0.1.ebuild
+++ b/media-sound/asunder/asunder-3.0.1-r1.ebuild
@@ -24,7 +24,7 @@ DEPEND="media-libs/libcddb
 # dlopen() deps
 RDEPEND="${DEPEND}
 	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
+	mac? ( <=media-sound/mac-4.12 )
 	mp3? ( media-sound/lame )
 	musepack? ( media-sound/musepack-tools )
 	opus? ( media-sound/opus-tools )
diff --git a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild b/media-sound/dir2ogg/dir2ogg-0.13-r2.ebuild
index c5e67d47a6ce..0445569da3d7 100644
--- a/media-sound/dir2ogg/dir2ogg-0.13-r1.ebuild
+++ b/media-sound/dir2ogg/dir2ogg-0.13-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="${DEPEND}
 		media-libs/flac
 		media-video/mplayer ) )
 	mac? ( || (
-		media-sound/mac
+		<=media-sound/mac-4.12
 		media-video/mplayer ) )
 	mp3? ( || (
 		media-sound/mpg123
diff --git a/media-sound/flacon/flacon-10.0.0.ebuild b/media-sound/flacon/flacon-10.0.0-r1.ebuild
index c9709c275785..654d494065c9 100644
--- a/media-sound/flacon/flacon-10.0.0.ebuild
+++ b/media-sound/flacon/flacon-10.0.0-r1.ebuild
@@ -33,7 +33,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-qt/qttest:5
 		media-libs/flac
-		media-sound/mac
+		<=media-sound/mac-4.12
 		media-sound/shntool
 		media-sound/ttaenc
 		media-sound/wavpack
diff --git a/media-sound/shntool/shntool-3.0.10-r2.ebuild b/media-sound/shntool/shntool-3.0.10-r3.ebuild
index fb803b412363..36d805f84bc6 100644
--- a/media-sound/shntool/shntool-3.0.10-r2.ebuild
+++ b/media-sound/shntool/shntool-3.0.10-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ IUSE="alac flac mac shorten sox wavpack"
 RDEPEND="
 	alac? ( media-sound/alac_decoder )
 	flac? ( media-libs/flac )
-	mac? ( media-sound/mac )
+	mac? ( <=media-sound/mac-4.12 )
 	shorten? ( media-sound/shorten )
 	sox? ( media-sound/sox )
 	wavpack? ( media-sound/wavpack )"
diff --git a/media-sound/xmms2/xmms2-0.9.3.ebuild b/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
index b47252b3f7a1..c4c3d80df577 100644
--- a/media-sound/xmms2/xmms2-0.9.3.ebuild
+++ b/media-sound/xmms2/xmms2-0.9.3-r1.ebuild
@@ -70,7 +70,7 @@ COMMON_DEPEND="
 			media-libs/libvorbis
 		)
 		jack? ( virtual/jack )
-		mac? ( media-sound/mac )
+		mac? ( <=media-sound/mac-4.12 )
 		mad? ( media-libs/libmad )
 		mms? (
 			media-libs/libmms