gentoo auto-resync : 30:09:2023 - 17:40:25

27 files changed, 529 insertions, 208 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index e1c5a5573d11..443addbbdd28 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcde/Manifest b/media-sound/abcde/Manifest
index ef0900d05dcd..487932f48857 100644
--- a/media-sound/abcde/Manifest
+++ b/media-sound/abcde/Manifest
@@ -1,4 +1,4 @@
 AUX abcde-2.9.3-Makefile.patch 528 BLAKE2B 7568595d6f67b47bbe6dd84cb829ac2b5f37c32a1a4c275cb073f0e6c03d78868b18821bd5ebc87aa8428708b94477c53e674ea9bfd051852a34ff866bad5815 SHA512 1438f8654f41e8681f0f2887d403ba6c2f85a70dc813f19c93c51aeea2e481dc80cde4d73807aad2e5f01f479224f4f9f4eec85bf6ed81ce442d873386b63d12
 DIST abcde-2.9.3.tar.gz 160876 BLAKE2B cb3ebc372b4bfcf002beda567c2aa91dba11e77fdaeee8ec0d351fe907d6209ccb9013135db2a3ea0f85148eeaaa91f06243c607ac732a1b13f7a0a54d721fb0 SHA512 51a1dfa1f1d2dab6b8dad7d9f70d0139938151bc2dae0e9fc80da5385b4bba4d71c89a4d1b2dec5bd24787a542cb0caeacbef423cf32b8014cf6320c391b4236
-EBUILD abcde-2.9.3-r3.ebuild 1810 BLAKE2B c0f046f348e1fb9664085f17df35e74b4bf50a709d4d2430989dc156295c32b2d1528d5f25677e2b02a1eae03ea9b98e356bad449f28a56a94f51b65caf85186 SHA512 744d697fcee0c7d2152fb459c4a62fcd18014b8de9e6d29a08c27d5785b6337a73e004a0bb987edf4779719795195bec22254f6f53b89827a17f9824c131e7c4
+EBUILD abcde-2.9.3-r4.ebuild 1817 BLAKE2B 1be35fcd89d98c2bbca06923ae7029ef7ae15a40be45a5d57bb0382e0a3224733b30d198cd413b5779db6e94f2341951d5f5fa557125bcb30a231b3e22c9ce31 SHA512 760f92dcd01e182f67262f7a271e437fb33640441ac61f9fa40a8a256d3bafff92eb03e56df8fda58c4eb7942e9c6cc99aa9d39927152151e737cd9511d5f864
 MISC metadata.xml 688 BLAKE2B 1b7fa0f469d0875c859efba67704f3f879a4aacdf1265e4e420ac9061d90233f60720fe9ff7c8af1d192c7c164225388db4ceaefec047c309cbe319f54d33ca4 SHA512 494ec16cb838014916286f73e1fe215afbf35ee420bd5b5451f4e53e6a0b71a168cfee109c489752ae2a39668fca07ceb2b8127f5fdfe17a141472d7f2187ada
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/Manifest b/media-sound/aqualung/Manifest
index b74c2d0ff47a..aaef8be6aaf3 100644
--- a/media-sound/aqualung/Manifest
+++ b/media-sound/aqualung/Manifest
@@ -1,4 +1,9 @@
 AUX aqualung-1.1-configure-lua-version.patch 1230 BLAKE2B ea7a3f9a5bfaef41e97639e9a417da233cd0b0577abf674ebee2e07141493f6f6207142f9b910e14e765d7fe2c1cdf43ab0b1a68234944f4134b3d8e35a255f1 SHA512 dfdfa42025e7c27cb735129fa0af0c2cd0b29803231bf225daa16c9b46357172eb9a5b6429cffc634dd4c3003de17339df3a4f27fbd0de682291302c63b89b10
+AUX aqualung-1.2-mac-configure.patch 2195 BLAKE2B 2079fa9cdbeaf182cce47622cc721c3ac8c1fda722aea33eacd0933257edcd2e0289e190950dce2680f58b94fe96ae5120a86f013cac3c66b0424b67ff690736 SHA512 8e59956681510d4d78c127a49b5df6a4bfcb076bd0478af91d38183ecb11708399c84662e79eab4d94b79c65ed242cd610f4e24d71cb7c5b197ee469e1b35938
+AUX aqualung-1.2-mac-dec.patch 5038 BLAKE2B 0b27d435d530e3c71bf85350b85073b04cfe9000ac5ac1a099107cedd45e3add0d08152a5c0eff87201aee54b60a25562d244b80f1e93abcc3358c81bc53e761 SHA512 c7074ff3879d2106b7f772882debfa8482f7afb2b1d22ef3d543ee8ed3cc474d1fc3d21faa2680b564415f2974034a0aa3d2927b5ad37d034c2b1f7efd036954
+AUX aqualung-1.2-mac-endianness.patch 2441 BLAKE2B bf2009142e01824e24c819c49a2b32f3dbd96a52268834dabf6ba61ddf97b56f547f3508081cbea96f098fecb41e19f7bb0c543fdadd2208f11a216a00dfe626 SHA512 a664e112e058adbe817aee5f5d376f6720ecc6592d543b4a49634150207e8c3a248b3c9e18cfbc1c313818b6d6c435859aca515f7932379dd178d1fea012181a
+AUX aqualung-1.2-mac-glib.patch 605 BLAKE2B 8b61a45446488a19cef5a721e855935624ece57e8378ff8ea0236f970523a5178123885d4dde35d5a32802395969a4c8d574f9caaacbb5353f9f9f4d1c380207 SHA512 8ce3dfaa6ebbe5254fdb69dfbf81e27d6d91e15c9da22a77e9fcfb00c13cf3d817f6bcf49f976c7a71dbab2ede90772c173334ca5ab8a6ec4d66e6b606dfbe23
 DIST aqualung-1.2.tar.gz 1974910 BLAKE2B 4956865a5897cf92d3ebb65cb30f27164e7717fadbbff8e275b25d5fa9c60382846877f644d3a8393935df82f9b92d282fe41befe27cd86accc3f6885650063f SHA512 0e11f307344c8ada7f3869d953e6fb8b088a8af345d51f3e93af18b4b57ea6f35bbc47eefea40956114d56882e4a0d66c1496a7b9a14dfd82e6a95cfc0ef52c5
-EBUILD aqualung-1.2-r1.ebuild 2659 BLAKE2B db05f990cfcdde60aadc7ff9ab06fc978baeac3c427bfd0a0bdef566d1d3612c75d5679aec288b40b0f418b2ca4b19b4a711f8c082d1b1eaf228c5ac430e65c5 SHA512 a27e3a1deb99bf1f28b33453e84ec8d6f6e8c764d364be6c59558c49a652c0fbb76de4d1706086b72bd59703cc83c58708abea018559c86273375ad3a980f6ff
+EBUILD aqualung-1.2-r2.ebuild 2594 BLAKE2B 5fcf720249ef9ea30f41f872e27e1b75d23edb5d3b128c069bcdd9bc996a7404b1e520296b785af4f538787dbe5b86ccf633ae16485600f65b31144d7b3a2b03 SHA512 13e78c07056ec893b7ae80d266d6325675a0b037d0029db5a78c1e77fab0f510a3f41c7cfd36702a7e3bfc01704406c5fefec7cb12e522e2908d78caa02b06e2
+EBUILD aqualung-1.2-r3.ebuild 2798 BLAKE2B 5e5bd87a1d738d7035a0126295376f8d4589f1c2a4019e7527036ca96afc4123e6f2a8ea9280ba668c3cf39ce635260ac80f379ca3ff70b9395d7514ab97afa5 SHA512 08df39f78e4e0eea88c67ff4b9b447b3bfa78a65fef8735e1295a32c1d951c0bdf39d6d44d76ecb52781a14f1183f123b31127ecbf8377d1476f2e2399ce1cd0
 MISC metadata.xml 919 BLAKE2B 66ad98450937b883d555b01bb05777de0bd00fba596231586d064bed7502f391b13235cb4a55366fc9146278047b177f895feddf94c59597bca5c5e92001ccd3 SHA512 1ccc8d585cf46e8d7c09f6bd8182e6941442b7045ab5243598b2c18b946c93ee8aa2fd257ba54af6db6af2689e33676967e266149fce2dc79e650afa480f828c
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/aqualung/aqualung-1.2-r3.ebuild b/media-sound/aqualung/aqualung-1.2-r3.ebuild
new file mode 100644
index 000000000000..dc7c665c8929
--- /dev/null
+++ b/media-sound/aqualung/aqualung-1.2-r3.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..4} luajit )
+
+inherit autotools desktop lua-single xdg
+
+DESCRIPTION="Music player for a wide range of formats designed for gapless playback"
+HOMEPAGE="https://aqualung.jeremyevans.net/ https://github.com/jeremyevans/aqualung"
+SRC_URI="https://github.com/jeremyevans/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
+	lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
+	vorbis wavpack"
+
+REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )"
+
+BDEPEND="
+	virtual/pkgconfig
+	sys-devel/gettext
+"
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/libxml2
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	alsa? ( media-libs/alsa-lib )
+	cdda? ( dev-libs/libcdio-paranoia )
+	cddb? ( media-libs/libcddb )
+	ffmpeg? ( media-video/ffmpeg:= )
+	flac? ( media-libs/flac:= )
+	ifp? ( media-libs/libifp )
+	jack? ( virtual/jack )
+	ladspa? ( media-libs/liblrdf )
+	lame? ( media-sound/lame )
+	libsamplerate? ( media-libs/libsamplerate )
+	lua? ( ${LUA_DEPS} )
+	mac? ( >=media-sound/mac-10.24:= )
+	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
+	)
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1-configure-lua-version.patch"
+	"${FILESDIR}/${PN}-1.2-mac-configure.patch"
+	"${FILESDIR}/${PN}-1.2-mac-dec.patch"
+	"${FILESDIR}/${PN}-1.2-mac-endianness.patch"
+	"${FILESDIR}/${PN}-1.2-mac-glib.patch"
+)
+
+pkg_setup() {
+	use lua && lua-single_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	xdg_environment_reset
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-rpath \
+		--enable-loop \
+		--enable-nls \
+		--enable-transcoding \
+		$(use_enable debug) \
+		$(use_enable podcast) \
+		$(use_enable systray) \
+		$(use_enable jack jack-mgmt) \
+		$(use_with alsa) \
+		$(use_with cdda) \
+		$(use_with cddb) \
+		$(use_with ffmpeg lavc) \
+		$(use_with flac) \
+		$(use_with ifp) \
+		$(use_with jack) \
+		$(use_with ladspa) \
+		$(use_with lame) \
+		$(use_with libsamplerate src) \
+		$(use_with lua) \
+		$(use_with mac MAC) \
+		$(use_with modplug mod) \
+		$(use_with mp3 mpeg) \
+		$(use_with musepack mpc) \
+		$(use_with oss) \
+		$(use_with pulseaudio pulse) \
+		$(use_with sndfile) \
+		$(use_with speex) \
+		$(use_with vorbis vorbis) \
+		$(use_with vorbis vorbisenc) \
+		$(use_with wavpack)
+}
+
+src_install() {
+	default
+
+	newicon src/img/icon_64.png aqualung.png
+	make_desktop_entry aqualung Aqualung
+}
diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch b/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch
new file mode 100644
index 000000000000..6418228158bf
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-configure.patch
@@ -0,0 +1,48 @@
+diff -Naur aqualung-1.2_orig/configure.ac aqualung-1.2/configure.ac
+--- aqualung-1.2_orig/configure.ac	2023-08-13 18:12:52.281251038 +0200
++++ aqualung-1.2/configure.ac	2023-08-13 18:13:55.693247259 +0200
+@@ -275,11 +275,11 @@
+         [AQUALUNG_FOUND([lavc])],
+         [AQUALUNG_MISSING([lavc], [$lavc_PKG_ERRORS])])])
+ 
+-AQUALUNG_DETECT([mac], [Monkey's Audio Codec],
+-    [AC_CHECK_LIB([mac], [CreateIAPEDecompress],
+-        [AQUALUNG_FOUND([mac], [-lmac -lstdc++])],
+-        [AQUALUNG_MISSING([mac],
+-            [Monkey's Audio Codec support requires libmac])],
++AQUALUNG_DETECT([MAC], [Monkey's Audio Codec],
++    [AC_CHECK_LIB([MAC], [CreateIAPEDecompress],
++        [AQUALUNG_FOUND([MAC], [-lMAC -lstdc++])],
++        [AQUALUNG_MISSING([MAC],
++            [Monkey's Audio Codec support requires libMAC])],
+         [-lstdc++])])
+ 
+ AQUALUNG_DETECT([mod], [MOD Audio],
+diff -Naur aqualung-1.2_orig/src/decoder/dec_mac.cpp aqualung-1.2/src/decoder/dec_mac.cpp
+--- aqualung-1.2_orig/src/decoder/dec_mac.cpp	2023-08-13 18:20:40.318223141 +0200
++++ aqualung-1.2/src/decoder/dec_mac.cpp	2023-08-13 18:21:33.661219962 +0200
+@@ -31,9 +31,9 @@
+ #define DLLEXPORT
+ 
+ #include "../undef_ac_pkg.h"
+-#include <mac/All.h>
+-#include <mac/MACLib.h>
+-#include <mac/CharacterHelper.h>
++#include <MAC/All.h>
++#include <MAC/MACLib.h>
++#include <MAC/CharacterHelper.h>
+ #include "../undef_ac_pkg.h"
+ #include <config.h>	/* re-establish undefined autoconf macros */
+ 
+diff -Naur aqualung-1.2_orig/src/Makefile.am aqualung-1.2/src/Makefile.am
+--- aqualung-1.2_orig/src/Makefile.am	2023-08-14 00:51:00.972827161 +0200
++++ aqualung-1.2/src/Makefile.am	2023-08-14 00:51:10.563826590 +0200
+@@ -25,7 +25,7 @@
+ aqualung_LDADD = $(LDADD) $(xml_LIBS) $(gtk_LIBS) $(glib_LIBS) \
+                  $(alsa_LIBS) $(jack_LIBS) $(oss_LIBS) $(pulse_LIBS) \
+                  $(sndio_LIBS) $(winmm_LIBS) \
+-                 $(flac_LIBS) $(lame_LIBS) $(lavc_LIBS) $(mac_LIBS) \
++                 $(flac_LIBS) $(lame_LIBS) $(lavc_LIBS) $(MAC_LIBS) \
+                  $(mad_LIBS) $(mod_LIBS) $(mpc_LIBS) $(sndfile_LIBS) \
+                  $(speex_LIBS) $(vorbis_LIBS) $(vorbisenc_LIBS) \
+                  $(wavpack_LIBS) \
diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch b/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch
new file mode 100644
index 000000000000..a7fb369cb1c2
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-dec.patch
@@ -0,0 +1,136 @@
+--- aqualung-1.2_orig/src/decoder/dec_mac.cpp	2023-08-13 19:40:59.245935911 +0200
++++ aqualung-1.2/src/decoder/dec_mac.cpp	2023-08-13 19:41:33.660933860 +0200
+@@ -24,6 +24,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <glib.h>
+ 
+ 
+ /* expand this to nothing so there's no error when including MACLib.h */
+@@ -60,16 +61,16 @@
+ 
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+ 	file_decoder_t * fdec = dec->fdec;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++        APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 
+-	int act_read = 0;
++	APE::int64 act_read = 0;
+ 	unsigned long scale = 1 << (pd->bits_per_sample - 1);
+ 	float fbuf[2 * BLOCKS_PER_READ];
+ 	int n = 0;
+ 
+ 	switch (pd->bits_per_sample) {
+ 	case 8:
+-		char data8[2 * BLOCKS_PER_READ];
++		unsigned char data8[2 * BLOCKS_PER_READ];
+ 		pdecompress->GetData(data8, BLOCKS_PER_READ, &act_read);
+ 		if (!act_read) {
+ 			return 1;
+@@ -84,7 +85,7 @@
+ 
+ 	case 16:
+ 		short data16[2 * BLOCKS_PER_READ];
+-		pdecompress->GetData((char *)data16, BLOCKS_PER_READ, &act_read);
++		pdecompress->GetData((unsigned char *)data16, BLOCKS_PER_READ, &act_read);
+ 		if (!act_read) {
+ 			return 1;
+ 		}
+@@ -100,7 +101,7 @@
+ 
+ 	case 32:
+ 		int data32[2 * BLOCKS_PER_READ];
+-		pdecompress->GetData((char *)data32, BLOCKS_PER_READ, &act_read);
++		pdecompress->GetData((unsigned char *)data32, BLOCKS_PER_READ, &act_read);
+ 		if (!act_read) {
+ 			return 1;
+ 		}
+@@ -170,31 +171,33 @@
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+ 	file_decoder_t * fdec = dec->fdec;
+ 	metadata_t * meta;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++	APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 	const char * comp_level = NULL;
+ 
+ 
+ 	int ret = 0;
+ #ifdef __OpenBSD__
+         wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+-#else
+-        wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
+-#endif
+         pdecompress = CreateIAPEDecompress(pUTF16, &ret);
+         free(pUTF16);
++#else
++        gunichar2 * pUTF16 = g_utf8_to_utf16(filename, -1, NULL, NULL, NULL);
++        pdecompress = CreateIAPEDecompress((wchar_t *)pUTF16, &ret, FALSE, FALSE, FALSE);
++        g_free(pUTF16);
++#endif
+ 
+         if (!pdecompress || ret != ERROR_SUCCESS) {
+                 return DECODER_OPEN_BADLIB;
+         }
+ 
+ 	pd->decompress = (void *)pdecompress;
+-        pd->sample_rate = pdecompress->GetInfo(APE_INFO_SAMPLE_RATE);
+-        pd->bits_per_sample = pdecompress->GetInfo(APE_INFO_BITS_PER_SAMPLE);
+-        pd->bitrate = pdecompress->GetInfo(APE_DECOMPRESS_AVERAGE_BITRATE);
+-        pd->channels = pdecompress->GetInfo(APE_INFO_CHANNELS);
+-        pd->length_in_ms = pdecompress->GetInfo(APE_DECOMPRESS_LENGTH_MS);
+-        pd->block_align = pdecompress->GetInfo(APE_INFO_BLOCK_ALIGN);
+-	pd->compression_level = pdecompress->GetInfo(APE_INFO_COMPRESSION_LEVEL);
++        pd->sample_rate = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_SAMPLE_RATE);
++        pd->bits_per_sample = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_BITS_PER_SAMPLE);
++        pd->bitrate = pdecompress->GetInfo(APE::IAPEDecompress::APE_DECOMPRESS_AVERAGE_BITRATE);
++        pd->channels = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_CHANNELS);
++        pd->length_in_ms = pdecompress->GetInfo(APE::IAPEDecompress::APE_DECOMPRESS_LENGTH_MS);
++        pd->block_align = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_BLOCK_ALIGN);
++	pd->compression_level = pdecompress->GetInfo(APE::IAPEDecompress::APE_INFO_COMPRESSION_LEVEL);
+ 
+ 	if ((pd->channels != 1) && (pd->channels != 2)) {
+ 		printf("Sorry, MAC file with %d channels is not supported.\n", pd->channels);
+@@ -218,19 +221,19 @@
+ 	fdec->file_lib = MAC_LIB;
+ 
+ 	switch (pd->compression_level) {
+-	case COMPRESSION_LEVEL_FAST:
++	case APE_COMPRESSION_LEVEL_FAST:
+ 		comp_level = _("Compression: Fast");
+ 		break;
+-	case COMPRESSION_LEVEL_NORMAL:
++	case APE_COMPRESSION_LEVEL_NORMAL:
+ 		comp_level = _("Compression: Normal");
+ 		break;
+-	case COMPRESSION_LEVEL_HIGH:
++	case APE_COMPRESSION_LEVEL_HIGH:
+ 		comp_level = _("Compression: High");
+ 		break;
+-	case COMPRESSION_LEVEL_EXTRA_HIGH:
++	case APE_COMPRESSION_LEVEL_EXTRA_HIGH:
+ 		comp_level = _("Compression: Extra High");
+ 		break;
+-	case COMPRESSION_LEVEL_INSANE:
++	case APE_COMPRESSION_LEVEL_INSANE:
+ 		comp_level = _("Compression: Insane");
+ 		break;
+ 	default:
+@@ -255,7 +258,7 @@
+ mac_decoder_close(decoder_t * dec) {
+ 
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++	APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 
+ 	delete(pdecompress);
+ 	rb_free(pd->rb);
+@@ -294,7 +297,7 @@
+ 	
+ 	mac_pdata_t * pd = (mac_pdata_t *)dec->pdata;
+ 	file_decoder_t * fdec = dec->fdec;
+-	IAPEDecompress * pdecompress = (IAPEDecompress *)pd->decompress;
++	APE::IAPEDecompress * pdecompress = (APE::IAPEDecompress *)pd->decompress;
+ 	char flush_dest;
+ 
+ 	pdecompress->Seek(seek_to_pos);
diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-endianness.patch b/media-sound/aqualung/files/aqualung-1.2-mac-endianness.patch
new file mode 100644
index 000000000000..3296bd67ad7e
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-endianness.patch
@@ -0,0 +1,73 @@
+From d2c88317b6042a05c236faf3c09f600337c6379e Mon Sep 17 00:00:00 2001
+From: Jeremy Evans <code@jeremyevans.net>
+Date: Tue, 5 Sep 2023 17:48:00 +0100
+Subject: [PATCH] Fix the Monkey's Audio decoder to work with current Monkey's
+ Audio (Fixes #33)
+
+Using g_utf8_to_utf16 doesn't work because current Monkey's Audio
+expects a different endianness of the multibyte character string.
+Using GetUTF16FromANSI works for compiling only if namedspaced
+correctly, and if namespaced correctly, it cannot link. Use a
+similar approach for building the correct multibyte string.
+
+Remove the DLLEXPORT define, to avoid a warning when including
+the MAC headers.
+
+Tested using the Monkey's Audio 10.20 SDK.
+---
+ src/decoder/dec_mac.cpp | 25 ++++++++++---------------
+ 1 file changed, 10 insertions(+), 15 deletions(-)
+
+diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
+index b007f74..6d4b658 100644
+--- a/src/decoder/dec_mac.cpp
++++ b/src/decoder/dec_mac.cpp
+@@ -27,14 +27,9 @@
+ #include <glib.h>
+ 
+ 
+-/* expand this to nothing so there's no error when including MACLib.h */
+-/* -- talkin' about cross-platform libraries? */
+-#define DLLEXPORT
+-
+ #include "../undef_ac_pkg.h"
+ #include <MAC/All.h>
+ #include <MAC/MACLib.h>
+-#include <MAC/CharacterHelper.h>
+ #include "../undef_ac_pkg.h"
+ #include <config.h>	/* re-establish undefined autoconf macros */
+ 
+@@ -48,7 +43,6 @@
+ 
+ extern size_t sample_size;
+ 
+-
+ #define BLOCKS_PER_READ 2048
+ 
+ 
+@@ -176,15 +170,16 @@ mac_decoder_open(decoder_t * dec, char * filename) {
+ 
+ 
+ 	int ret = 0;
+-#ifdef __OpenBSD__
+-        wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+-        pdecompress = CreateIAPEDecompress(pUTF16, &ret);
+-        free(pUTF16);
+-#else
+-        gunichar2 * pUTF16 = g_utf8_to_utf16(filename, -1, NULL, NULL, NULL);
+-        pdecompress = CreateIAPEDecompress((wchar_t *)pUTF16, &ret, FALSE, FALSE, FALSE);
+-        g_free(pUTF16);
+-#endif
++        int filename_len = strlen(filename);
++        int i;
++        APE::str_utfn * filename_utf16 = new APE::str_utfn [static_cast<size_t>(filename_len) + 1];
++
++        for (i = 0; i < filename_len; i++)
++            filename_utf16[i] = (APE::str_utfn)(APE::str_utf8)filename[i];
++        filename_utf16[i] = 0;
++
++        pdecompress = CreateIAPEDecompress(filename_utf16, &ret, FALSE, FALSE, FALSE);
++        delete [] filename_utf16;
+ 
+         if (!pdecompress || ret != ERROR_SUCCESS) {
+                 return DECODER_OPEN_BADLIB;
diff --git a/media-sound/aqualung/files/aqualung-1.2-mac-glib.patch b/media-sound/aqualung/files/aqualung-1.2-mac-glib.patch
new file mode 100644
index 000000000000..59aee6432581
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.2-mac-glib.patch
@@ -0,0 +1,22 @@
+From 1c2a295a72e1e3abc6df40714d9753e311541550 Mon Sep 17 00:00:00 2001
+From: Jeremy Evans <code@jeremyevans.net>
+Date: Wed, 6 Sep 2023 09:02:31 +0100
+Subject: [PATCH] Remove now unnecessary glib include in mac decoder
+
+Pointed out by Daniel Pielmeier.
+---
+ src/decoder/dec_mac.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
+index 6d4b658..f89450d 100644
+--- a/src/decoder/dec_mac.cpp
++++ b/src/decoder/dec_mac.cpp
+@@ -24,7 +24,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <glib.h>
+ 
+ 
+ #include "../undef_ac_pkg.h"
diff --git a/media-sound/asunder/Manifest b/media-sound/asunder/Manifest
index 35782048a773..e3c040d38581 100644
--- a/media-sound/asunder/Manifest
+++ b/media-sound/asunder/Manifest
@@ -1,5 +1,5 @@
 DIST asunder-2.9.7.tar.bz2 283805 BLAKE2B 6c92d02586e7d0781ac0d698047d588ef7aa5e0c1544cdd8ffb4fd7c00d0066f61c01aa82502b4a4417ba6b70fb3da2c537e5d1e715ea992831f7d618724b949 SHA512 ef5e998b3e3e552ac23696619742caff9c30e52cb2b11f75395cc6e4b2134c58df1c4a97e930db0e8c61dfc31e77b3d9a99a4c9ab6c07ae59b9e91f723401e23
 DIST asunder-3.0.1.tar.bz2 301493 BLAKE2B 3333a76512d8ce61d81b7b24d2b9d5682651f1feea43411bc86a45b486aab0283339f81db13579108bd815cd615d446abe8ca88ca84637b1b9f0aa941056d849 SHA512 07b4caa80c35b39f407952276237787561100e1f546637b64119741f75385afe8db43a991cce364fb152ed5d20b9a9ac99a972b6cbb9616073dada2e2d048b74
-EBUILD asunder-2.9.7.ebuild 922 BLAKE2B 093f83b5b3eb92419235a2c89d5b33c9fd8315ca07c1c403d1fcd5c330b1cae015cd11cf51eb56668b40d4eb07efae5a572fdbc5093f0b2bc38585c1a6748482 SHA512 523985473eb35667c708d9b973fdfb8f79ac82fa733c2b1daab8f3d2d232733fa840c872227c5f0b0d31d22387543fd10e7299f9d47a5f35c11f016e3aed39b0
-EBUILD asunder-3.0.1.ebuild 924 BLAKE2B b9036f8012595367ca8829cdb98e5a816eeb3d769fb1ed569636506a0caa667bf278119ac6ef6f1c11151e1b668bcce2ef493bf5c28427e5c9fcbed1e946621c SHA512 78ffc7055ccbd0d00300f395aac7e6ce699037575b9e5d53209886ddbbb3d3eb8fe3b9e108e42a4330a8212a6cf43bb7e1d5afb5e84cb1b265febd3587c7a669
+EBUILD asunder-2.9.7-r1.ebuild 929 BLAKE2B ad6e68f98cd67cad62368e957e643459b4234c84d24e854159aa47d0888dd3cfa3d5a985202beb50df7c120708ae046ac0e0bd240690f28a2830a4834bbc9d26 SHA512 7af87e95f04ca7efe53318d879569ab92a2f9a2c5f3422137b1dd41d6f2e4aecc8ba6b6fdbe17aad4823176ea57d5ef7e0c9b663140f4a0ff3b31116ff153571
+EBUILD asunder-3.0.1-r1.ebuild 931 BLAKE2B efd1c6e9a5f9132c13c1336ed9cc6575c7de9883f322a0ce0a5eb251a7aa7dd71069f5e23d50dedc693a676be0f410764ea86bef97210129a3c4853600ae1227 SHA512 db9afbaed8c5ef319b5c5cf056b4333942ab7be38c632a86a866b48a14b8aea9374ddd37dc8afa659e00ffca29db61fc24281b62c8ede795da6bf455324b229f
 MISC metadata.xml 346 BLAKE2B 834e443617483d5a0aaee70af73664a7df8750f6e7f45bd50b32ee38e794f258d995e35f9f1acaae380913100a46462d93d3756c15277b3e7c35807153bad5b3 SHA512 6d1d57ad927b868d230f98c4bc6a0d75b67ed0e66f3fbca682f304367f00c229d2ec5d526d9d9ee5bd0080bba8304e92eb8ca458079926d7b44632382c81ff84
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/Manifest b/media-sound/dir2ogg/Manifest
index cc15e0b71086..a09fa68c1d72 100644
--- a/media-sound/dir2ogg/Manifest
+++ b/media-sound/dir2ogg/Manifest
@@ -1,3 +1,3 @@
 DIST dir2ogg-0.13.tar.gz 20338 BLAKE2B 4f00c7e587eb7bba349d7024977d0d67ac9424a09649650e923df7100c60a67db78f363ac9d41931e969a5d8131f9461485f120cc4f308b0abcca4d5b570aba2 SHA512 292c35dd20a8e0499b3bd22d89c6ed0ae0abcf2b58f669316a2f39d45092a1c9a14fb168ad9ac893dfdd5138600c8be5e66502141c9dc7376b18e1e8d1ca5054
-EBUILD dir2ogg-0.13-r1.ebuild 1204 BLAKE2B 9d1023bcf1f0002990d513c766e91b56317a203cbb1aab2f56802e9487fac06ef4d2cac12fcd14ba327a38982059705aced9874ebb991f7c8ed1299290ff68e4 SHA512 70274c2a61095c2b9a9cea77f47c61ae211dc910bf8f3d9c2f1df300cea28688fef311ce7651d527ab9dd6b516d0c28c05b6ce4c7e79adade2510f8210ac2ebb
+EBUILD dir2ogg-0.13-r2.ebuild 1211 BLAKE2B be14527d2eb39143f7e1ff826e58bbec34ad72d99f9d0cf7699b6ed8c07a5050239231d1a6a1a968a1949289a53331d30eb6ea08d7a0d9b16417d507ba9b7a2d SHA512 b715fbebf53bd71c5f74e4b7b85426a9d7544b1bc830d462d3edc8d3b684a281f5743a74aacd0a2878b1e2ee10bbe973e765109e2e9eec377752fe9dcfbfcf6e
 MISC metadata.xml 446 BLAKE2B c41324185b347080d23121f9d47f2db7bed1e786c96daf39e3a41505270c864853c1c1626f52c45832aa6c8b8cb567a9745b530dd09b5dbf99ad8cafe4775314 SHA512 f997508acff421632f070b56c4e5abbdccd070ca8e91795139219484edb0c8331d6934446c654279ca099bfd487183c92632f8502ca77699b8bdea8add7c26cb
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/Manifest b/media-sound/flacon/Manifest
index cd67f126412a..e6858e880264 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,8 +1,4 @@
 AUX flacon-9.0.0-no-man-compress.patch 1425 BLAKE2B 9f21a5b8a8b2ec0986b0d5902b15ecfa5214ce1471f4a851e88feb07ef80e8d89617173c587128b6340d349afa087c46e6b787f6cc297a7c594d787b19a060f0 SHA512 7b80c99514bdd540737a773182e9213ef4027c529a6fdd3808c4d35baeec9c5ebb67d15f550cb8a38e37764f19e2a4b7d1cfba0cc0c3872dc4658b7158c9239a
 DIST flacon-10.0.0.tar.gz 3802889 BLAKE2B e99be9ad2da98e84455426df853bb38cecb91a6c66cb3f532459637adee97078fb034d3c5b5cc905b74756adbf6c11276f589d450c1506fba2dace264efe8b9c SHA512 55744b3ef46f298e8082ab172b8e0b5ad428ec3c965ae69befe7f9abb4e87417cf2373385240000471c92391d243ef3b33f25ae565c8e9497021d3b619a5ac1a
-DIST flacon-9.1.0.tar.gz 3769110 BLAKE2B 9e0c4aaef3f6019a8c8196a204e8281ca4250df441ea14127d9347f26557091e87019388bd2942afc39e45a7864d653e2ae887f665ce190f18e646448c3f8e3e SHA512 be35c61e082be7d05bebee5f99192201f91e90f3a80827ac5808e6798f7ed0ada28ab7c2456702c443be51356ec192cd059408c2c3feb5b48b5bab048d0efb00
-DIST flacon-9.4.0.tar.gz 3772714 BLAKE2B b45d6f934e80ae1d3546c1c54fdab22dac38d7ccf01b903a8c820145465c5732d34d6118bafcbbb4bde8c5bb528a707ebbee8b6a53ab5a1c29f1562a52c61382 SHA512 9dfd4ce558c4e3ce902c3b2e43b3c3fb94606f68dd550f774e3704d19ce6a28e887a7410054d6becfe3d20166aa687b7689821d6ee095e4efdc30e35a85e70ad
-EBUILD flacon-10.0.0.ebuild 1968 BLAKE2B 617e901bcfa75ed73913f1f1f3b7b282a0a5573bf9ad6234fee6f659608192a460756b84fe201f5fddc8e0d5dcf09ac17b41532c8113cf1b29c0769ec7dd8671 SHA512 4ed0c69d3fb814822b603ce80d136c3618e85875b70743d3c321a6b15b4121109d915670a623a551a3f49b6fa5ecf0456bb846264a464f609ba9de6a57447950
-EBUILD flacon-9.1.0.ebuild 1976 BLAKE2B 0f6ec4c849a6e153628d3df0dcb151f348b053f9eb51107e356739ececa758d3b1045cd6dddc8c82a5888bb4896571c5aef632fdc6b5dc2acb22f090dd8dc957 SHA512 541ad3c226597af60122fd717dd310003df537217d13d9c70f4ee96bc604dbf21993cec2b4f81cfdb6ca687d6e565fb6823c3b018adfa6985fdee073a6fe25e4
-EBUILD flacon-9.4.0.ebuild 2090 BLAKE2B 6ac21eca944e1bea177ca4d001d8afeda2eb854c47f26b68aeddde1b29f443bcaa2219e6898dc457a781bfcc404dad9155609c3e5813b562b961081c679b6426 SHA512 6d59a351e5095152f21516e22c8eeda5b80c634fe3b4849506836c5837819c646ab8716b72a1772ad6cb20bd5c1d59e53063ecdcd9b230bea066aed69e5fe914
+EBUILD flacon-10.0.0-r1.ebuild 1975 BLAKE2B afc43cd1707b5de23f7e767db5471e82ab0a2ef09ce000a3573a80f0e479053e5de528a86abea6f4832a628e66c6f2f11507cc944bf9b33fb7c9745073800396 SHA512 0738a2bcb6067b26a54d7ff47a85a37107ce438176a022b14db1607d1bbf53ff10c15c417a643c7fde29cfe6dd62f904075afc060264390b04a4444a95b61d9a
 MISC metadata.xml 483 BLAKE2B 795d557d1298374afb1a7b7e944258091e5a1a33cbba44ffb89d2b41545a13bc079ea406012351256e9aa3be08aa0277adb6757e68ac5d55e3fd636bce5efca9 SHA512 3d744c253befad102285251d40d891aef8ddab615f095a717951706fd64ac12f4fc7191d1b5ce0c4e9c3870eec5b427fcf5158771349a4a8c5219f7b797386ac
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/flacon/flacon-9.1.0.ebuild b/media-sound/flacon/flacon-9.1.0.ebuild
deleted file mode 100644
index 5f2a960ee2d2..000000000000
--- a/media-sound/flacon/flacon-9.1.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Tests require lots of disk space
-CHECKREQS_DISK_BUILD=10G
-inherit check-reqs cmake optfeature virtualx xdg-utils
-
-DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
-HOMEPAGE="https://flacon.github.io/"
-SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-i18n/uchardet
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/taglib
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	test? (
-		dev-qt/qttest:5
-		media-libs/flac
-		media-sound/mac
-		media-sound/shntool
-		media-sound/ttaenc
-		media-sound/wavpack
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.0.0-no-man-compress.patch
-)
-
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	virtx "${BUILD_DIR}/tests/${PN}_test" || die
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} optionally supports formats listed below."
-	optfeature 'FLAC input and output support' media-libs/flac
-	optfeature 'WavPack input and output support' media-sound/wavpack
-	optfeature 'APE input support' media-sound/mac
-	optfeature 'ALAC output support' media-sound/alac_decoder
-	optfeature 'TTA input support' media-sound/ttaenc
-	optfeature 'AAC output support' media-libs/faac
-	optfeature 'MP3 output support' media-sound/lame
-	optfeature 'Vorbis output support' media-sound/vorbis-tools
-	optfeature 'MP3 Replay Gain support' media-sound/mp3gain
-	optfeature 'Vorbis Replay Gain support' media-sound/vorbisgain
-
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/flacon/flacon-9.4.0.ebuild b/media-sound/flacon/flacon-9.4.0.ebuild
deleted file mode 100644
index a304dc15d58e..000000000000
--- a/media-sound/flacon/flacon-9.4.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Tests require lots of disk space
-CHECKREQS_DISK_BUILD=10G
-inherit check-reqs cmake optfeature virtualx xdg-utils
-
-DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
-HOMEPAGE="https://flacon.github.io/"
-SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-i18n/uchardet
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/taglib
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	test? (
-		dev-qt/qttest:5
-		media-libs/flac
-		media-sound/mac
-		media-sound/shntool
-		media-sound/ttaenc
-		media-sound/wavpack
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.0.0-no-man-compress.patch
-)
-
-RESTRICT="!test? ( test )"
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTS="$(usex test)"
-	)
-	cmake_src_configure
-}
-
-src_test() {
-	# All tests fail with enabled sandbox
-	# TODO: Get all tests to pass
-	# See bug: #831592
-	local -x SANDBOX_ON=0
-
-	virtx "${BUILD_DIR}/tests/${PN}_test" || die
-}
-
-pkg_postinst() {
-	optfeature_header "${PN} optionally supports formats listed below."
-	optfeature 'FLAC input and output support' media-libs/flac
-	optfeature 'WavPack input and output support' media-sound/wavpack
-	optfeature 'APE input support' media-sound/mac
-	optfeature 'ALAC output support' media-sound/alac_decoder
-	optfeature 'TTA input support' media-sound/ttaenc
-	optfeature 'AAC output support' media-libs/faac
-	optfeature 'MP3 output support' media-sound/lame
-	optfeature 'Vorbis output support' media-sound/vorbis-tools
-	optfeature 'MP3 Replay Gain support' media-sound/mp3gain
-	optfeature 'Vorbis Replay Gain support' media-sound/vorbisgain
-
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/mac/Manifest b/media-sound/mac/Manifest
index 7146f47b15e6..936059d9d6a9 100644
--- a/media-sound/mac/Manifest
+++ b/media-sound/mac/Manifest
@@ -1,6 +1,10 @@
+AUX mac-10.18-linux.patch 1178 BLAKE2B 3566e9bcc5221cd04b75b9e43d3b944edb3f5e38b307e74bc49ec01f6000890c9077a7889fb1938c6e45de9aea9603cf008ac77cbb67e4344cb7fa3751be0cc3 SHA512 c46e3ba670b28306a51a5c9fff5d95653108ad0cebeeb8a2f5307c99ef0bfa64f5f8930ecfac427c07120be162cdfd65f5d5b384b8a4c4f53e258408c8b0ca62
+AUX mac-10.18-output.patch 2812 BLAKE2B 1b4324f2f13a1e87e5ee4f2f063f3e2f242c1a476ae6df9e3cc9d1170ce9ad7f3707f35e038c34db5ef941f7bbdfb823cc6163a117284f17ff6e5104b0fd855f SHA512 9e202deece5ffd5c3c2167de147767a0ce8d7badef0f5a0cc5575a89c9cce548daf19cc0d0f650b726bc63a13eb7565693b98e92dac579baca9eb161f96f15b5
 AUX mac-4.11.4.5.7-gcc6.patch 10119 BLAKE2B d6a363f26c7a08c6bdb0e14fea6bb29553427372fa74375c1cf5721f28bd6bbcc6e091cb3703705d773bda93e3cede89725cbe28b8b678307fa3d5eeca1c3a5d SHA512 0439cb133779dd540c5cee6760dd6a8acd23434b60baaba804430883cb6d67ca37151370356e9adec3f031cb02c34d529a8f91618f0f9fca6e58e14a295c3a63
 AUX mac-4.11.4.5.7-null.patch 406 BLAKE2B 8e8c38cebd040bc9728de64c994ee422ee6ab6f403773ff69ea26b85c38ceb4b15ced1b3b6343b36ebc7e380bde54eddf2c13e6c00e8f33cfac99955f6b44920 SHA512 d8fc2ed994b627176f78796980a9d8f4ce386c97aa05ce68085f642f3feb62a0994f88c8586f60a4a1f1116bc42e57d3881deb967e81a887eed800589d61c867
 AUX mac-4.11.4.5.7-output.patch 1498 BLAKE2B 7016b28d4c9a71d02471de1f4a5e5f1ade7db75d53f096916d3f87b154d82fcb4c3e6fd3891f909e0eebef512795ad2072d332241d69315b9e1ab959f7f895ad SHA512 c96874817ea5389ea2af46c634cd548733e614274b43c9395e146c9151dd9e7a03bbb8c82f36807cc2178070f8a87b886c6db94c27cb4369dbfcb874074db490
+DIST mac-10.24.zip 1653617 BLAKE2B 4b22b29cbdaa8d715d985231feafdc4c5a3e85e623b2954bcdfaa3cc868502be8c6aa809264bc3b9d3b096bfa2b34fe22724ec5a072c3c93242834790d08aea7 SHA512 e6e88d14b2bc2b33425fc653e1771709f3cddfbed5441090eab32009365e8770aef52e0a4229ca189180d59b928f4f899302fde9f9b8ac7bfbc5fb15533b26c4
 DIST monkeys-audio_4.11-u4-b5-s7.orig.tar.gz 511190 BLAKE2B 28b5a3aadd9dae410c93cfc43c40c07fe207036f27cf60d59d8fa137a0327f90a78746c14930b7d3becb7f5fa69a454a6855aae1553dc74cd5168a9a523bb8f0 SHA512 7e73b35c86d6007ab2a94a2d8b7449bb4ac505bbba53e40373a279dc83a9cad5f62a51419a6375335576cf325c88ed7d317b0ef3039b8a497100cb74a63c25d0
+EBUILD mac-10.24.ebuild 600 BLAKE2B 1d7e67320c7eaa0f8a9ff9ed8c2d4e182365e11769deeddf4fffe80a4d1f8946d47381e6bd4db9522b99e937f4426c7a9e635ac5333118b73783f44b2c4c4456 SHA512 937eec890d880ec9eef6ab82dbc739b2edc3e4231eef6b91b90a6c8de926bfee2684b14057e37c5ce043d129bd4746523f8f466bff46c27c5ee7f01173244fda
 EBUILD mac-4.11.4.5.7-r1.ebuild 1419 BLAKE2B f0f98dbf50f62289d4f6767b96c3a31d70561253c014c2f0dd4e0941941c3389ea5c59e404ded08c0e2e3d0d0c658dbb378993b18aca171e71ee17cd8c6a318f SHA512 96d6deb9c106b8efe2c7ec151aabafdf1922475274efaf37763a22e538bbb73b021b607c1fd95ad591dcce4ec5506b6ee6ce4bd9488d4e124a3ff6353a2a78ec
 MISC metadata.xml 374 BLAKE2B ac05d2add0cd7ac5956aad2f5a7bc031880ac86b1ba62266c3d5afcfa769e687d974cf00e1e1d4c3b50964b5a05c193f4a033eabe0ec0a6d626018aedf32be00 SHA512 586664bdcd30ef7b414740d264e143511f39411a33b845ce0f39503dd2215e501fba07c408ea777472ede967e91001617ac91dd9acb303ad8757bcabbba17b0e
diff --git a/media-sound/mac/files/mac-10.18-linux.patch b/media-sound/mac/files/mac-10.18-linux.patch
new file mode 100644
index 000000000000..0346101f3eb0
--- /dev/null
+++ b/media-sound/mac/files/mac-10.18-linux.patch
@@ -0,0 +1,24 @@
+diff -Naur mac-10.18_orig/Shared/All.h mac-10.18/Shared/All.h
+--- mac-10.18_orig/Shared/All.h	2023-08-13 18:59:03.447085864 +0200
++++ mac-10.18/Shared/All.h	2023-08-13 19:00:20.053081298 +0200
+@@ -11,7 +11,7 @@
+ **************************************************************************************************/

+ #if !defined(PLATFORM_WINDOWS) && !defined(PLATFORM_APPLE) && !defined(PLATFORM_LINUX)

+     #pragma message("No platform set for MACLib, defaulting to Windows")

+-    #define PLATFORM_WINDOWS

++    #define PLATFORM_LINUX

+ #endif

+ 

+ #ifdef PLATFORM_ANDROID

+diff -Naur mac-10.18_orig/Source/Shared/All.h mac-10.18/Source/Shared/All.h
+--- mac-10.18_orig/Source/Shared/All.h	2023-08-13 18:59:03.453085864 +0200
++++ mac-10.18/Source/Shared/All.h	2023-08-13 19:00:12.732081734 +0200
+@@ -11,7 +11,7 @@
+ **************************************************************************************************/

+ #if !defined(PLATFORM_WINDOWS) && !defined(PLATFORM_APPLE) && !defined(PLATFORM_LINUX)

+     #pragma message("No platform set for MACLib, defaulting to Windows")

+-    #define PLATFORM_WINDOWS

++    #define PLATFORM_LINUX

+ #endif

+ 

+ #ifdef PLATFORM_ANDROID

diff --git a/media-sound/mac/files/mac-10.18-output.patch b/media-sound/mac/files/mac-10.18-output.patch
new file mode 100644
index 000000000000..f790842a93f8
--- /dev/null
+++ b/media-sound/mac/files/mac-10.18-output.patch
@@ -0,0 +1,37 @@
+diff -Naur mac-10.18_orig/Source/Console/Console.cpp mac-10.18/Source/Console/Console.cpp
+--- mac-10.18_orig/Source/Console/Console.cpp	2023-08-14 19:06:29.480902250 +0200
++++ mac-10.18/Source/Console/Console.cpp	2023-08-14 19:07:11.613901402 +0200
+@@ -67,7 +67,7 @@
+ **************************************************************************************************/

+ static void DisplayProperUsage(FILE * pFile)

+ {

+-    fwprintf(pFile, L"Proper Usage: [EXE] [Input File] [Output File] [Mode]\n\n");

++    fwprintf(pFile, L"Proper Usage: [mac] [Input File] [Output File] [Mode]\n\n");

+ 

+     fwprintf(pFile, L"Modes: \n");

+     fwprintf(pFile, L"    Compress (fast): '-c1000'\n");

+@@ -83,15 +83,15 @@
+     fwprintf(pFile, L"    Remove Tag: '-r'\n\n");

+ 

+     fwprintf(pFile, L"Examples:\n");

+-    fwprintf(pFile, L"    Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n");

+-    fwprintf(pFile, L"    Compress: mac.exe \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -t \"Artist=Metallica|Album=Black|Name=One\"\n");

+-    fwprintf(pFile, L"    Transcode from pipe: ffmpeg.exe -i \"Metallica - One.flac\" -f wav - | mac.exe - \"Metallica - One.ape\" -c2000\n");

+-    fwprintf(pFile, L"    Decompress: mac.exe \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n");

+-    fwprintf(pFile, L"    Decompress: mac.exe \"Metallica - One.ape\" auto -d\n");

+-    fwprintf(pFile, L"    Verify: mac.exe \"Metallica - One.ape\" -v\n");

+-    fwprintf(pFile, L"    Full Verify: mac.exe \"Metallica - One.ape\" -V\n");

+-    fwprintf(pFile, L"    Tag: mac.exe \"Metallica - One.ape\" -t \"Artist=Metallica|Album=Black|Name=One|Comment=\\\"This is in quotes\\\"\"\n");

+-    fwprintf(pFile, L"    Remove tag: mac.exe \"Metallica - One.ape\" -r\n");

++    fwprintf(pFile, L"    Compress: mac \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000\n");

++    fwprintf(pFile, L"    Compress: mac \"Metallica - One.wav\" \"Metallica - One.ape\" -c2000 -t \"Artist=Metallica|Album=Black|Name=One\"\n");

++    fwprintf(pFile, L"    Transcode from pipe: ffmpeg -i \"Metallica - One.flac\" -f wav - | mac - \"Metallica - One.ape\" -c2000\n");

++    fwprintf(pFile, L"    Decompress: mac \"Metallica - One.ape\" \"Metallica - One.wav\" -d\n");

++    fwprintf(pFile, L"    Decompress: mac \"Metallica - One.ape\" auto -d\n");

++    fwprintf(pFile, L"    Verify: mac \"Metallica - One.ape\" -v\n");

++    fwprintf(pFile, L"    Full Verify: mac \"Metallica - One.ape\" -V\n");

++    fwprintf(pFile, L"    Tag: mac \"Metallica - One.ape\" -t \"Artist=Metallica|Album=Black|Name=One|Comment=\\\"This is in quotes\\\"\"\n");

++    fwprintf(pFile, L"    Remove tag: mac \"Metallica - One.ape\" -r\n");

+     fwprintf(pFile, L"    (note: int filenames must be put inside of quotations)\n");

+ }

+ 

diff --git a/media-sound/mac/mac-10.24.ebuild b/media-sound/mac/mac-10.24.ebuild
new file mode 100644
index 000000000000..4b25756f5a06
--- /dev/null
+++ b/media-sound/mac/mac-10.24.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Monkey's Audio Codecs"
+HOMEPAGE="https://www.monkeysaudio.com"
+SRC_URI="http://monkeysaudio.com/files/MAC_${PV/.}_SDK.zip -> ${P}.zip"
+
+LICENSE="mac"
+SLOT="0/10"
+KEYWORDS="~alpha ~amd64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND=""
+DEPEND=""
+BDEPEND="app-arch/unzip"
+
+src_unpack() {
+	mkdir -p "${S}" || die
+	cd "${S}" || die
+	default
+}
+
+CMAKE_BUILD_TYPE=Release
+
+PATCHES=(
+	"${FILESDIR}/${PN}-10.18-linux.patch"
+	"${FILESDIR}/${PN}-10.18-output.patch"
+)
diff --git a/media-sound/shntool/Manifest b/media-sound/shntool/Manifest
index afc091f4e15f..4083f246aa5f 100644
--- a/media-sound/shntool/Manifest
+++ b/media-sound/shntool/Manifest
@@ -1,3 +1,3 @@
 DIST shntool-3.0.10.tar.gz 216061 BLAKE2B b662c64992409c1a12dd3fffab5f39c69b2c1f8fb958cba590009f599e4363403aa1d353efdec8ab7529fc22cfac0b908368a132b60f7e5acd55dcae932909e2 SHA512 2150d7123860abb54a56a1615bda991ed3713d73c338723f28b7d01a63c49a47809be16dc57b5b4edeee1567b003f9a4b54945c1cd08440f9503d22b91eaa06d
-EBUILD shntool-3.0.10-r2.ebuild 766 BLAKE2B 76f1c399c104d6a96b0ad5bb0df2e568536962ec1fe4c26c72b400b65673b238ae9b47566db8933ea0a8cbfb05cefcf53e5ce98ed35cf8bdad86da252144ae71 SHA512 2c28d26b2d7e1f12103508663e3ca94caba32b6adfd1782fe892a6485e64d7a55588b5642cf121502876ed0b73495a678639cca3da4cf36af2d28db5d2d30408
+EBUILD shntool-3.0.10-r3.ebuild 773 BLAKE2B cf1a9ab4e15e321a86685812ade1de1d5310fe977ee2339c5ca4da9a94e65eaef69c018ab957099a19b2bd8c68be74c3ae7e6e5ec19e2f548c44e3a57414925a SHA512 ad7ed7f0597ae38f09d5365d60cb05dfacd99c839c4784b1e092c5b7212abb438409338f36146dc661e8be08eba610cb3bb3f954849acf7f258213a9b60af790
 MISC metadata.xml 497 BLAKE2B 67a1bba74b1ae73b180893f4fff0a70c5a973dfcee3ef286736350e34d5de804b2e0b77afa8b1432e8608880c9bbff931e84adf0e3b48ffaec8ec4498b0ca84b SHA512 147aef7550ae0e787e347bdcdaa9986d03a848a61abc3bc4fe2e56d638b04f96a39763589eef8bbf7bc50f4c9583d5e57f33cb07b0cce3b42e6971fb2e98fb73
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/Manifest b/media-sound/xmms2/Manifest
index aa7d2768fd47..4d7b4c0e3fa4 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,5 +1,5 @@
 AUX xmms2-0.9.1-cpp-client.patch 503 BLAKE2B b8127c72ab8830cb0c4ca45c5c7887f194f5cbe0999167f8eadd803df75ecaaaf3b4246d691be1b6106dbede0b3293747fa6d1cfc5f151968dd26065aa9e3b15 SHA512 3b5703614a3afe49cadaf74b2d5e9d436232af62dc60248f929961806ab058ed8b06df0fd9ec0f958e2b454e3be75028117fc9c7a071bef1f9d2aa5496c448c5
 AUX xmms2-0.9.1-faad.patch 437 BLAKE2B 832db481404d470d347ee73ae04064d5ce423aca2a4a7681a80301e33522245429306e26eb200f9e111de60e2fa5341478f51282ee8c2264cf3b60a79b83a797 SHA512 7b5380762e311e1479073ca922343ce5d0dbfe2b3ab0f9218e2d85d52d8a37e301a6bb7bdfc0603b3f72578421df0ff335edb8bd9ea20e485cc1037a2197c62c
 DIST xmms2-0.9.3.tar.xz 1741548 BLAKE2B 19a99d66d3b6991811c1124b76becaa05d04602a84725ca166141947272a3a033545a2e315a70751e8fab83a9b3b16235f1e408dd13caac0a8e7cbf9e8101e34 SHA512 03f2f6b66a35a8e80fdba3afb2a550c19ce2b7b6d53c63c7a735eb787f79b27a325b0715a31544e87c86e386f54a5a9a89aa3a9e81ae5ed29e362bd7b5bfa1ad
-EBUILD xmms2-0.9.3.ebuild 5407 BLAKE2B b55b5f31a2b10ec144b13e13860bec0bb4fee387b46822a5da75ff52f329809492af836f1edbb2ccedc00aae35934d9adfa49c66caf0ab49be3950337ba8da7a SHA512 8cc69387022d199fc2474ba0ba02a08bed5f57a96d215b9b96debed89b52a8d4838b8fa2bc8607c402c1bee7df31ebb64b04804e7c54125ca2467646e4e7a825
+EBUILD xmms2-0.9.3-r1.ebuild 5414 BLAKE2B db6b67b6b70ec96eccf43347001804fb2e99bab676a5ea12e67c183ef29c24df8cd9e79c181f3c8ed74cf526fc4f37fb6ade449721bada728d60a86aecdb37bb SHA512 a84b0af676cb7cb966f0a3f7d7be97753bbb9b46a23d5e8437287522a17133f09b9fb5f73ee44f4377179e4146c2544a5f6a4682a75a2aa803b55d35787e5858
 MISC metadata.xml 1472 BLAKE2B 1ad415f39603eb6959f85bad95c95e49c6d36fbed3ea2fbe4e3c58772ed335cc5ec4375f19bfc60493a1c30911109f52e870df45acc36d972b0fc56e44c60803 SHA512 aaa7996662236229f4c78cfac1de6e702991c3191f8c20b25a290b6a0bde29a3a00355ad746a767206ea089e1be88ae79abd3a563ce3a8305480406af62f83e7
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