gentoo auto-resync : 23:03:2024 - 13:01:09

7 files changed, 141 insertions, 221 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 94013891e859..72e57233717b 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 0d2e843d0132..bfce6db23973 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -9,8 +9,6 @@ AUX audacity-3.2.3-allow-overriding-alsa-jack.patch 1683 BLAKE2B bd8081283dfc87e
 AUX audacity-3.2.3-disable-ccache.patch 850 BLAKE2B 0f8fab52e0f8205c90b0ed798d1793cbde1395715445ac66e6d9b612fd825650f38dc95759b56d0d7455f45202e901de4d2cea3c54ede17356f3ff4f1c8c61ff SHA512 468676dfeff2aa40a3ccbab3c4eb5cf04a8dae0db2772c580d6455b93b4feb9665b3badab7ea8085a6bce1ab243e7c8b0fc2974ab7b2c703db7c49f757bdd48e
 AUX audacity-3.2.3-fix-rpaths.patch 5961 BLAKE2B d48471ba4cea8103fd1caef6e3e13356e9c8103b7edb239a55e89975e455eb82efa6c0bf348aa2be6eedb10ae95753d3f104d7646cbe21a7dcc45e1274928e2a SHA512 b1f7449d13961f3e5d073f2f8cc0443f5e050733d76cbd94dc2dd764b7b1438339cc9155765637767f692c6781760a8b3776bbdaf36c57f4af7cbc7ca51d81fd
 AUX audacity-3.2.3-remove-conan-threadpool.patch 1681 BLAKE2B d5b32185ae961c1ab49fd28410de857b7e3eddaeebf2435dd77c526912ff06a604500c8af2357dc8c601fc032823c74beec4c207cca58fa074d950de6cace6fb SHA512 4a4ee937be644587114e9e097178859ae369e3519475224ea22095ecf51971215b7873b3d9f05ff4f6dcb12c31741448381621c250e159824c818fa61238f0c1
-AUX audacity-3.2.5-gcc13-deux.patch 2531 BLAKE2B 5fbd985902facc87db733c7db3981f67d5232c1a40259eec5831ad7142c065831ec64f5167a587a7a83736225965d2e4159615845c952cb4a6b5f7a46e9218e7 SHA512 45722981858006be507cb2f9212d34626a40554eb75a6397b1073019433ae16689345ce8b4062b18ee61907f5dd9b51e4f250211b16183a0e82ab6ca32f44366
-AUX audacity-3.2.5-gettext-0.22.patch 1193 BLAKE2B 9410d92db9b6a4b06e91cbae5ba25ec5dc16ee3421c511468a55e0038ed2db70c9d195f7eca894503c1bec023e0efc1006ac36eada4f1e87567828f4288b23c9 SHA512 f8a3187343f11875840d605da11a021d7e1f25fa5cb361432863d3933a3880a5e8df63d6feb6706e88bdb5e0f0e4e5c77ec8d21806003abf66166fe8a28e02b2
 AUX audacity-3.3.3-Findlibmad.patch 1758 BLAKE2B c1e0ef6734f925127b0be9abc84fb1b6411d15b8b973683f84f54d9c0e557c7b4dcc786baa9962ff039529f9306144008f1f12b1edb8f519df5a0f0c4d06d9de SHA512 0724cabecd37e2c740227fdc6f0144d97d68bd9846609aea25dfaa41289e8eea790487af320e784e1e6e8c3c2e27689af9643bcc2114c9e5f9d09d679f4ed754
 AUX audacity-3.3.3-fix-includes.patch 1764 BLAKE2B ea7f73f60b8b5ffc42218b65d8148273689d2460b97e4728adf878cb3980762375615cf6b29e205945b69dd36f17b760e949d8805f4bd2d867d0b37133290c6e SHA512 d3dd1c39bfda4146b315f923fb6ecda07ad30d77dae7d930e315a4aae8e2a45de04c217b982aa719d8579c3933bd3843ca42095c1ddc161860a204f8d94dcb12
 AUX audacity-3.3.3-fix-rpaths.patch 3819 BLAKE2B 29079fb4fd63b383546b1f82c08fb98b16eba0588da99b936f7de104bcb826fd6a0dc7f63fd379e44ace9d80ea612d86deda9f68980e3cd5c0874f1925b35b91 SHA512 d05868e7adf91c613534aa965059da5e393582bbaee0b49605c2e270d528dfd8fa882ce356e5fed38752afbbb09539165ea566b13c13df4bc949ed8c5f2617e1
@@ -18,14 +16,14 @@ AUX audacity-3.3.3-gettext-0.22.patch 872 BLAKE2B 5de981a0b86606f688ca9fa8f036d5
 AUX audacity-3.3.3-local-threadpool-libraries.patch 1377 BLAKE2B 6031d9e3f9b4e11a2d16fe96dc261254dbba62dcb461d9c395f9e8d61cb46176680f3eb3f63a0bb5b581bcf35e9c6c7ab954177476c08d0118c0f0d41a34b496 SHA512 1d61c9fbeaae67fff1c02bc84c6791abab5fcdd886c729caf4cd87ecd8d1ede58bd634cebce133d3209212939603aba5a05c5b8cee762a8b2c2bda10a2c11888
 AUX audacity-3.3.3-remove-conan-test-dependency.patch 1140 BLAKE2B 8c74631de260406f47f1d1b5bd869e726ec086eaca143f747f7c0dfd8e0c193c86de44a5ace3e69d85a6dfb7a0ee755ba5defd79bbc114f46974cf6ba7f74f5a SHA512 bfc0b07f03a530486a496447a235384c018dc7a284aa6660e22c6540648be15264e92cb1151f40fe198b46576f0a63b86e6042bb9ccfce32036c596510fbc2c1
 AUX audacity-3.3.3-upstream-fix-rapidjson.patch 2461 BLAKE2B d59077e4729aa5702db6181eb3dac9a9c98f6f64c3b4e61c87c6856c76b8ddb2d9f9036db07efe8263619fa5a9b14fd1ae4be380df34a5483f102b2bde809a18 SHA512 67c6760c472c4161335f9c65129a28495ad9e8605a1f17cd1570037fc4767c9d326221598c93e0e1595bd10d6044a1d7b8dcac9b6c29babecee60a526ef6dd92
+AUX audacity-3.4.2-audiocom-std-string.patch 898 BLAKE2B 697c0ce279a2d0618a7be3dc64d5b54b864516e9ddc1493244d4f555eca270057f0d4e2472ad77c897a810f262a5e8af8c86d738e59063ed5eb5b977406c708d SHA512 438c72c1139180218012c1bdebcb33a5bfd1851beef4ceeb8d60bbc64348f760710b0f64644f9aeed841bd929d3cc07f0dd302567d65fa8d37cdbb48557d56bc
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
-DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B b8e48cab1c89cadb343a17fcb1d811a7363231152867f842ffff6dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24 SHA512 850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
 DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c SHA512 c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
 DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa33337b5d0b6a00e14bd420d6f064515455055233a45f5ebf47 SHA512 9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
+DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5 SHA512 5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
 EBUILD audacity-2.4.2-r3.ebuild 3926 BLAKE2B b62459d874285eabace837ac9b2f324574ea1418a6d6396c27de531177c3f9e20511488b7d8fd22e4d8febb75ff3c706eccfd26053ec64e43f82f6906a5bc06b SHA512 0036524556974517dc0ea9427664db5564e8f9312c627a8ddf70850ba457beef51b46666fb3693cbc67b75c3775c86b90a500d7d50a515fafb6536c592d1e49b
-EBUILD audacity-3.2.5-r1.ebuild 7014 BLAKE2B 3d63b714a6bf4e3c3acf81d85eeecc0e9bf4f0ecd3b426502e87532fb32355b0de5274b6a511b6a978724dd4963defc87496db0268c1deddfb4401b64025bf41 SHA512 3338a4437856e1446ed5efe971d2824543b9fa4a96ae8c26c7e5ab7092ace0ce4d2c035a4e56f0e968142c606171b87b93d8e93841431c6b370cd92c7b0cc070
 EBUILD audacity-3.3.3.ebuild 7247 BLAKE2B d13edb80efb3cc7da04706b30972265594527b09003be5c690e1a4f3c8fa3b918fea751eec1fc6bd29d3810547204fcc4421681ed657be63847b341e38d58708 SHA512 6120da23d94e41ceb840a3cc6e9a6295e4da03674fffce158625ab671eca780ba77985916396af40c0a19eb99facd9a4e31fda7b6ef6aff79b2f4a9d1ffa4888
-EBUILD audacity-9999.ebuild 6918 BLAKE2B a7251b4b663d994c768b13a19534826533b59878601de805cda126f971c4be38ad35c9c3d9b6d388caea40c8f97affaecaa5234e78e12c55727c83c2c6cf763e SHA512 a0d1bf849f5480c27b06a36eb65b7877e33f99e8a84a0683e688ea0aa3a072a10a14b4902768dd2ec9294fcca672d386ab7e32a5660e45d9364809019a1847bd
+EBUILD audacity-3.4.2.ebuild 6631 BLAKE2B 109402f706bf0cf6f6211466809cc6765124add5f4dfdc16b4908fad038ce84a8803df4918f5b660c9149f10c19e8db916043372a62a6b57665916c9f94d4562 SHA512 e63a58b74b9a1d32d86de75180c5262375a46ef1fe514e759f662ef41b4093fb35d02ee68ac2bbe63fede4ca293c6794480d8da96fd585dde43bb13af777d8ff
+EBUILD audacity-9999.ebuild 6866 BLAKE2B 951ac9b256237f8498f37d8e2acd3058885de8a07ce7f8e1e3d11588def2e358b6a0979b5f9b4945657eb881e2971763cfd44020afffd4a645ca6e859af2b1ed SHA512 b1d1a8aae8a442ecb938f6d45b38e956ef51f7a53b54e2ede7dab703b24cf5ac139937bfe186d5a762531a5265a7416cb0789ef41283e4bd1ed466e31894d156
 MISC metadata.xml 1646 BLAKE2B af82a110327cebf9311bec6c360e3765101c09c917925d505ddfbd27f060feb923e621f37e47da27aead1b7951dcc4140e07e54213b6dc3e0abc6178506ce94b SHA512 ebc43bf8a79c77f4b7b999ddf619d99f85a58688ddacdc1a3bfdab431f28f97818effaf6ff1972fe3b81dcd42223e72d02a96ba3b29f2aa7bc6b8ea354265b2d
diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild b/media-sound/audacity/audacity-3.4.2.ebuild
index 2eb91ea6190a..27f06abecfde 100644
--- a/media-sound/audacity/audacity-3.2.5-r1.ebuild
+++ b/media-sound/audacity/audacity-3.4.2.ebuild
@@ -5,10 +5,8 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit cmake wxwidgets xdg
+inherit cmake wxwidgets xdg virtualx
 
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
 DESCRIPTION="Free crossplatform audio editor"
 HOMEPAGE="https://www.audacityteam.org/"
 
@@ -17,26 +15,30 @@ HOMEPAGE="https://www.audacityteam.org/"
 # cmake-proxies/CMakeLists.txt and search for "ThreadPool".
 MY_THREADPOOL_DATE=20140926
 MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h -> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-	doc? ( https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz )
-	audiocom? ( ${MY_THREADPOOL} )"
-S="${WORKDIR}/${PN}-${MY_P}"
+
+if [[ ${PV} = 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/audacity/audacity.git"
+else
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	MY_P="Audacity-${PV}"
+	S="${WORKDIR}/${PN}-sources-${PV}"
+	SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz"
+fi
+
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
 
 # GPL-2+, GPL-3 - Audacity itself
 # ZLIB - The ThreadPool single-header library
 # CC-BY-3.0 - Documentation
 LICENSE="GPL-2+
 	GPL-3
-	doc? ( CC-BY-3.0 )
 	audiocom? ( ZLIB )
 "
 SLOT="0"
-KEYWORDS="amd64 ~riscv"
-IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
-	opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
+	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+RESTRICT="!test? ( test )"
 
 # dev-db/sqlite:3 hard dependency.
 # dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
@@ -63,6 +65,9 @@ RESTRICT="test"
 RDEPEND="dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/glib:2
+	dev-libs/rapidjson:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
 	media-libs/libsndfile
 	media-libs/libsoundtouch:=
 	media-libs/portaudio[alsa?]
@@ -70,13 +75,13 @@ RDEPEND="dev-db/sqlite:3
 	media-libs/portsmf:=
 	media-libs/soxr
 	media-sound/lame
+	sys-apps/util-linux
+	sys-libs/zlib:=
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	sys-apps/util-linux
 	alsa? ( media-libs/alsa-lib )
 	audiocom? (
-		dev-libs/rapidjson
 		net-misc/curl
 	)
 	ffmpeg? ( media-video/ffmpeg )
@@ -90,7 +95,6 @@ RDEPEND="dev-db/sqlite:3
 		media-libs/sratom
 		media-libs/suil
 	)
-	mad? ( media-libs/libmad )
 	mpg123? ( media-sound/mpg123 )
 	ogg? ( media-libs/libogg )
 	opus? ( media-libs/opus )
@@ -100,80 +104,75 @@ RDEPEND="dev-db/sqlite:3
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )
 "
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
+DEPEND="${RDEPEND}
+	test? ( <dev-cpp/catch-3:0 )"
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
-REQUIRED_USE="
-	mad? ( !mpg123 )
-"
-
 PATCHES=(
 	# Equivalent to previous versions
-	"${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+	"${FILESDIR}/audacity-3.2.3-disable-ccache.patch"
 	# From Debian
-	"${FILESDIR}/${PN}-3.2.3-fix-rpaths.patch"
+	"${FILESDIR}/audacity-3.3.3-fix-rpaths.patch"
 
 	# Disables some header-based detection
-	"${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+	"${FILESDIR}/audacity-3.2.3-allow-overriding-alsa-jack.patch"
 
 	# For has_networking
-	"${FILESDIR}/${PN}-3.2.3-remove-conan-threadpool.patch"
-	"${FILESDIR}/${PN}-3.2.3-allow-finding-rapidjson-pkgconfig.patch"
+	"${FILESDIR}/audacity-3.3.3-local-threadpool-libraries.patch"
 
-	# GCC 13
-	"${FILESDIR}/${PN}-3.2.5-gcc13-deux.patch"
+	# Allows running tests without conan
+	"${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch"
 
-	# gettext 0.22
-	"${FILESDIR}/${PN}-3.2.5-gettext-0.22.patch"
+	# #920363
+	"${FILESDIR}/audacity-3.4.2-audiocom-std-string.patch"
 )
 
 src_prepare() {
 	cmake_src_prepare
 
-	local header_subs="${S}/lib-src/header-substitutes"
-	cat <<-EOF >"${header_subs}/allegro.h" || die
-	/* Hack the allegro.h header substitute to use system headers.  */
-	#include <portsmf/allegro.h>
-	EOF
-
 	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
 	if use audiocom; then
-		mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
-		cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
-		   "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
+		mkdir -p "${S}/lib-src/threadpool/ThreadPool/" || die
+		cp "${DISTDIR}/progschj-ThreadPool-${MY_THREADPOOL_DATE}.h" \
+		   "${S}/lib-src/threadpool/ThreadPool/ThreadPool.h" || die
 	fi
+
+	# Remove documentation incorrect installations
+	sed -i -e \
+		'/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \
+		src/CMakeLists.txt || die
 }
 
 src_configure() {
 	setup-wxwidgets
 
 	# * always use system libraries if possible
-	# * options listed roughly in the order specified in
-	#   cmake-proxies/CMakeLists.txt
 	# * USE_VST was omitted, it appears to no longer have dependencies
 	#   (this is different from VST3)
 	local mycmakeargs=(
 		# Tell the CMake-based build system it's building a release.
 		-DAUDACITY_BUILD_LEVEL=2
-		-Daudacity_use_nyquist=local
-		-Daudacity_use_pch=OFF
-		-Daudacity_use_portmixer=$(usex portmixer system off)
-		-Daudacity_use_soxr=system
 
-		-Daudacity_conan_enabled=OFF
+		-Daudacity_conan_enabled=off
 
 		-Daudacity_has_networking=$(usex audiocom on off)
 		# Not useful on Gentoo.
 		-Daudacity_has_updates_check=OFF
 		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
-		-Daudacity_has_threadpool=local
+
+		# Disable telemetry features.
+		-Daudacity_has_sentry_reporting=off
+		-Daudacity_has_crashreports=off
+
+		-Daudacity_has_tests=$(usex test on off)
 
 		# The VST3 SDK is unpackaged, and it appears to be under a breed
 		# of a proprietary license and the GPL.
-		-Daudacity_has_vst3=OFF
+		-Daudacity_has_vst3=off
+
 		-Daudacity_lib_preference=system
 		-Daudacity_obey_system_dependencies=ON
 		-Daudacity_use_expat=system
@@ -182,27 +181,27 @@ src_configure() {
 		-Daudacity_use_ladspa=$(usex ladspa)
 		-Daudacity_use_lame=system
 		-Daudacity_use_wxwidgets=system
+		-Daudacity_use_libflac=$(usex flac system off)
 		-Daudacity_use_libmp3lame=system
 		-Daudacity_use_libmpg123=$(usex mpg123 system off)
-		-Daudacity_use_libmad=$(usex mad system off)
-		-Daudacity_use_wavpack=$(usex wavpack system off)
 		-Daudacity_use_libogg=$(usex ogg system off)
-		-Daudacity_use_libflac=$(usex flac system off)
 		-Daudacity_use_libopus=$(usex flac system off)
-		-Daudacity_use_libvorbis=$(usex vorbis system off)
 		-Daudacity_use_libsndfile=system
-		-Daudacity_use_portaudio=system
-		-Daudacity_use_midi=system
-		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_libvorbis=$(usex vorbis system off)
 		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_midi=system
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_pch=off
+		-Daudacity_use_portaudio=system
+		-Daudacity_use_portmixer=$(usex portmixer system off)
 		-Daudacity_use_portsmf=system
+		-Daudacity_use_rapidjson=system
 		-Daudacity_use_sbsms=$(usex sbsms system off)
 		-Daudacity_use_soundtouch=system
+		-Daudacity_use_soxr=system
 		-Daudacity_use_twolame=$(usex twolame system off)
-
-		# Disable telemetry features.
-		-Daudacity_has_sentry_reporting=off
-		-Daudacity_has_crashreports=off
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_wavpack=$(usex wavpack system off)
 
 		# See the allow-overriding-alsa-jack.patch patch
 		-DPA_HAS_ALSA=$(usex alsa on off)
@@ -214,16 +213,6 @@ src_configure() {
 	cmake_src_configure
 }
 
-src_install() {
-	cmake_src_install
-
-	# Remove bad doc install
-	rm -r "${ED}"/usr/share/doc || die
-
-	if use doc ; then
-		docinto html
-		dodoc -r "${WORKDIR}"/help/manual/{m,man}
-		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
-		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
-	fi
+src_test() {
+	virtx cmake_src_test
 }
diff --git a/media-sound/audacity/audacity-9999.ebuild b/media-sound/audacity/audacity-9999.ebuild
index be537c7c96c0..9246a3ee4e7c 100644
--- a/media-sound/audacity/audacity-9999.ebuild
+++ b/media-sound/audacity/audacity-9999.ebuild
@@ -20,10 +20,10 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/audacity/audacity.git"
 else
-	KEYWORDS="~amd64 ~riscv"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	MY_P="Audacity-${PV}"
-	S="${WORKDIR}/${PN}-${MY_P}"
-	SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz"
+	S="${WORKDIR}/${PN}-sources-${PV}"
+	SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz"
 fi
 
 SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
@@ -39,7 +39,6 @@ SLOT="0"
 IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
 	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( mpg123 )"
 
 # dev-db/sqlite:3 hard dependency.
 # dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
@@ -66,7 +65,9 @@ REQUIRED_USE="test? ( mpg123 )"
 RDEPEND="dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/glib:2
-	dev-libs/rapidjson
+	dev-libs/rapidjson:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
 	media-libs/libsndfile
 	media-libs/libsoundtouch:=
 	media-libs/portaudio[alsa?]
@@ -74,13 +75,13 @@ RDEPEND="dev-db/sqlite:3
 	media-libs/portsmf:=
 	media-libs/soxr
 	media-sound/lame
+	sys-apps/util-linux
+	sys-libs/zlib:=
 	x11-libs/gdk-pixbuf:2
 	x11-libs/gtk+:3
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	sys-apps/util-linux
 	alsa? ( media-libs/alsa-lib )
 	audiocom? (
-		dev-libs/rapidjson
 		net-misc/curl
 	)
 	ffmpeg? ( media-video/ffmpeg )
@@ -105,42 +106,44 @@ RDEPEND="dev-db/sqlite:3
 "
 DEPEND="${RDEPEND}
 	test? ( <dev-cpp/catch-3:0 )"
-BDEPEND="app-arch/unzip
+BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 "
 
 PATCHES=(
 	# Equivalent to previous versions
-	"${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+	"${FILESDIR}/audacity-3.2.3-disable-ccache.patch"
 	# From Debian
-	"${FILESDIR}/${PN}-3.3.3-fix-rpaths.patch"
+	"${FILESDIR}/audacity-3.3.3-fix-rpaths.patch"
 
 	# Disables some header-based detection
-	"${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+	"${FILESDIR}/audacity-3.2.3-allow-overriding-alsa-jack.patch"
 
 	# For has_networking
-	"${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch"
+	"${FILESDIR}/audacity-3.3.3-local-threadpool-libraries.patch"
 
 	# Allows running tests without conan
-	"${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
+	"${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch"
+
+	# #920363
+	"${FILESDIR}/audacity-3.4.2-audiocom-std-string.patch"
 )
 
 src_prepare() {
 	cmake_src_prepare
 
-	local header_subs="${S}/libraries/lib-note-track"
-	cat <<-EOF >"${header_subs}/WrapAllegro.h" || die
-	/* Hack the allegro.h header substitute to use system headers.  */
-	#include <portsmf/allegro.h>
-	EOF
-
 	# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
 	if use audiocom; then
-		mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
-		cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
-		   "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
+		mkdir -p "${S}/lib-src/threadpool/ThreadPool/" || die
+		cp "${DISTDIR}/progschj-ThreadPool-${MY_THREADPOOL_DATE}.h" \
+		   "${S}/lib-src/threadpool/ThreadPool/ThreadPool.h" || die
 	fi
+
+	# Remove documentation incorrect installations
+	sed -i -e \
+		'/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \
+		src/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -154,28 +157,29 @@ src_configure() {
 	setup-wxwidgets
 
 	# * always use system libraries if possible
-	# * options listed roughly in the order specified in
-	#   cmake-proxies/CMakeLists.txt
 	# * USE_VST was omitted, it appears to no longer have dependencies
 	#   (this is different from VST3)
 	local mycmakeargs=(
 		# Tell the CMake-based build system it's building a release.
 		-DAUDACITY_BUILD_LEVEL=2
-		-Daudacity_use_nyquist=local
-		-Daudacity_use_pch=OFF
-		-Daudacity_use_portmixer=$(usex portmixer system off)
-		-Daudacity_use_soxr=system
 
-		-Daudacity_conan_enabled=OFF
+		-Daudacity_conan_enabled=off
 
 		-Daudacity_has_networking=$(usex audiocom on off)
 		# Not useful on Gentoo.
 		-Daudacity_has_updates_check=OFF
 		-Daudacity_has_audiocom_upload=$(usex audiocom on off)
 
+		# Disable telemetry features.
+		-Daudacity_has_sentry_reporting=off
+		-Daudacity_has_crashreports=off
+
+		-Daudacity_has_tests=$(usex test on off)
+
 		# The VST3 SDK is unpackaged, and it appears to be under a breed
 		# of a proprietary license and the GPL.
-		-Daudacity_has_vst3=OFF
+		-Daudacity_has_vst3=off
+
 		-Daudacity_lib_preference=system
 		-Daudacity_obey_system_dependencies=ON
 		-Daudacity_use_expat=system
@@ -184,34 +188,33 @@ src_configure() {
 		-Daudacity_use_ladspa=$(usex ladspa)
 		-Daudacity_use_lame=system
 		-Daudacity_use_wxwidgets=system
+		-Daudacity_use_libflac=$(usex flac system off)
 		-Daudacity_use_libmp3lame=system
 		-Daudacity_use_libmpg123=$(usex mpg123 system off)
-		-Daudacity_use_wavpack=$(usex wavpack system off)
 		-Daudacity_use_libogg=$(usex ogg system off)
-		-Daudacity_use_libflac=$(usex flac system off)
 		-Daudacity_use_libopus=$(usex flac system off)
-		-Daudacity_use_libvorbis=$(usex vorbis system off)
 		-Daudacity_use_libsndfile=system
-		-Daudacity_use_portaudio=system
-		-Daudacity_use_midi=system
-		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_libvorbis=$(usex vorbis system off)
 		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_midi=system
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_pch=off
+		-Daudacity_use_portaudio=system
+		-Daudacity_use_portmixer=$(usex portmixer system off)
 		-Daudacity_use_portsmf=system
+		-Daudacity_use_rapidjson=system
 		-Daudacity_use_sbsms=$(usex sbsms system off)
 		-Daudacity_use_soundtouch=system
+		-Daudacity_use_soxr=system
 		-Daudacity_use_twolame=$(usex twolame system off)
-
-		# Disable telemetry features.
-		-Daudacity_has_sentry_reporting=off
-		-Daudacity_has_crashreports=off
+		-Daudacity_use_vamp=$(usex vamp system off)
+		-Daudacity_use_wavpack=$(usex wavpack system off)
 
 		# See the allow-overriding-alsa-jack.patch patch
 		-DPA_HAS_ALSA=$(usex alsa on off)
 		## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
 		## AFAICT it introduces no deps as-is, but that could change.
 		## Similar goes for PA_HAS_JACK.
-
-		-Daudacity_has_tests=$(usex test ON OFF)
 	)
 
 	cmake_src_configure
@@ -220,10 +223,3 @@ src_configure() {
 src_test() {
 	virtx cmake_src_test
 }
-
-src_install() {
-	cmake_src_install
-
-	# Remove bad doc install
-	rm -r "${ED}"/usr/share/doc || die
-}
diff --git a/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch b/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch
deleted file mode 100644
index c9fdad5fbafd..000000000000
--- a/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://github.com/audacity/audacity/issues/4489
-https://github.com/audacity/audacity/commit/a49d145ef5e3046273c879be0a21d48ecd4dcab7
-https://bugs.gentoo.org/899764
-
---- a/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
-+++ b/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
-@@ -46,7 +46,8 @@ typedef uint64_t uintmax_t;
- */
- #endif
- 
--#include <stddef.h>
-+#include <cstddef>
-+#include <cstdint>
- #include <string>
- #include <iostream>
- #include <sstream>
-@@ -355,10 +356,6 @@
- typedef signed int SINT32;
- typedef float FLOAT32;
- typedef double FLOAT64;
--// added by RBD
--#ifdef __linux__
--#define intptr_t long
--#endif
- 
- // The default sampling rate.
- const StkFloat SRATE = 44100.0;
---- a/src/effects/LoadEffects.cpp
-+++ b/src/effects/LoadEffects.cpp
-@@ -154,9 +154,9 @@ void BuiltinEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
-       if (rediscoverAll ||
-          !pm.IsPluginRegistered(path, &pair.second->name.Msgid())
-       ){
--         DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident)
-+         DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID&
-          {
--            const auto pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident);
-+            const auto& pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident);
-             if(pair.second->excluded)
-                PluginManager::Get().EnablePlugin(pluginId, false);
-             return pluginId;
---- a/libraries/lib-module-manager/PluginHost.cpp
-+++ b/libraries/lib-module-manager/PluginHost.cpp
-@@ -37,11 +37,11 @@ namespace
-             TranslatableString errorMessage{};
-             auto validator = provider->MakeValidator();
-             auto numPlugins = provider->DiscoverPluginsAtPath(
--               pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident)
-+               pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID&
-             {
-                //Workaround: use DefaultRegistrationCallback to create all descriptors for us
-                //and then put a copy into result
--               auto id = PluginManager::DefaultRegistrationCallback(provider, ident);
-+               auto& id = PluginManager::DefaultRegistrationCallback(provider, ident);
-                if(const auto ptr = PluginManager::Get().GetPlugin(id))
-                {
-                   auto desc = *ptr;
diff --git a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch b/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch
deleted file mode 100644
index f84508a2c903..000000000000
--- a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-https://bugs.gentoo.org/909201
-upstream fix: https://github.com/audacity/audacity/pull/4866
-
---- a/locale/be.po
-+++ b/locale/be.po
-@@ -3097,7 +3097,7 @@
- #: src/FileFormats.cpp
- #, c-format
- msgid "Error (file may not have been written): %s"
--msgstr "Памылка (магчыма, файл не запісаны): %hs"
-+msgstr "Памылка (магчыма, файл не запісаны): %s"
- 
- #: src/FileFormats.cpp
- #, fuzzy
---- a/locale/fa.po
-+++ b/locale/fa.po
-@@ -3053,7 +3053,7 @@
- #: src/FileFormats.cpp
- #, c-format
- msgid "Error (file may not have been written): %s"
--msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs"
-+msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s"
- 
- #: src/FileFormats.cpp
- msgid "&Copy uncompressed files into the project (safer)"
---- a/locale/fr.po
-+++ b/locale/fr.po
-@@ -3142,7 +3142,7 @@
- #: src/FileFormats.cpp
- #, c-format
- msgid "Error (file may not have been written): %s"
--msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %hs"
-+msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %s"
- 
- # trebmuh to check (accélérateur)
- #: src/FileFormats.cpp
diff --git a/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch
new file mode 100644
index 000000000000..f06799030b4b
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch
@@ -0,0 +1,30 @@
+From 23f1df0b13c46cef746674434640588864f8c453 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 18 Feb 2024 23:16:28 +0300
+Subject: [PATCH] Fix compilation with audiocom
+
+Fix error `OAuthService.h: error: field mAccessToken has incomplete type
+std::string {aka std::_cxx11::basic_string<char>}`
+
+See: https://bugs.gentoo.org/920363
+
+Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+---
+ libraries/lib-cloud-audiocom/OAuthService.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libraries/lib-cloud-audiocom/OAuthService.h b/libraries/lib-cloud-audiocom/OAuthService.h
+index bd01f1656..18761df6d 100644
+--- a/libraries/lib-cloud-audiocom/OAuthService.h
++++ b/libraries/lib-cloud-audiocom/OAuthService.h
+@@ -12,6 +12,7 @@
+ 
+ #include <chrono>
+ #include <functional>
++#include <string>
+ #include <string_view>
+ #include <mutex>
+ 
+-- 
+2.43.0
+