gentoo auto-resync : 01:11:2024 - 03:04:33

17 files changed, 209 insertions, 166 deletions

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 6f63c4039cce..c551d5a5e051 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,19 +1,25 @@
-AUX audacity-3.2.3-allow-overriding-alsa-jack.patch 1683 BLAKE2B bd8081283dfc87e5e8a3c4826b1a57daed5f28a70a45ff86834d2f3ccf9fa699301cee953c2b3b51095b7bd163247efd9e07bc8548f1195a43e3e5c069a59bfc SHA512 a83ce313094533f7308bfc7c847e5fe908f3e4182c5a86f13b53f3f4df7a63ae6778a85f85c84e348b7db702f07066f4e8d552319a84e4edc459ea6751b73878
-AUX audacity-3.2.3-disable-ccache.patch 850 BLAKE2B 0f8fab52e0f8205c90b0ed798d1793cbde1395715445ac66e6d9b612fd825650f38dc95759b56d0d7455f45202e901de4d2cea3c54ede17356f3ff4f1c8c61ff SHA512 468676dfeff2aa40a3ccbab3c4eb5cf04a8dae0db2772c580d6455b93b4feb9665b3badab7ea8085a6bce1ab243e7c8b0fc2974ab7b2c703db7c49f757bdd48e
-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
+AUX audacity-3.2.3-allow-overriding-alsa-jack.patch 1344 BLAKE2B e21bd17fee679472a2035b6aafc7c183b1a251c7a8b9b27350fe8ebab46efa00f10917d1eed2782b170907dd98c129e7449d8c95e6a27b5c961cc6ac320422f4 SHA512 b3ca905ed9237b2046c08374801ac72a3f26009e3713fdd91d604760bd442216f506bcf772d2a41147e7e365ed8a55e54b1881ec9c16bb6140bfe84e53d27e34
+AUX audacity-3.2.3-disable-ccache.patch 653 BLAKE2B 5c5a9d07df52746077c963d9d174433aca75eaee4ed06de82547e7b760f3f1bc14d718591d322c50a2cbf8b8a089fbc7d2d8fb00268b478e617eff50ee522115 SHA512 5b4924fdb62ce792adeb30d4c0d760b34b0177e4faf27dbcffb829a273fef6010dfeb2f7f12896d6b6f6953384322b69738b88dc7d083884e39e04d50979ca64
+AUX audacity-3.3.3-Findlibmad.patch 1423 BLAKE2B cd007fba05b459b48663bfd1ca9e3e7ec42454de1eafa460d3f6eb673d379ebcc4a4bdece680b99ec141a3a1fcaaa7dd616d6fc03ca050a2b3ed26c0c1944c32 SHA512 897325655811bba295d65e4a52d9dbc727dea9db4ea102934065b717cb6ef6e08e91709fbd37cf8973af28eb087c01f52f7e44e217d1d7cdc6e98c7ccdd5cd95
+AUX audacity-3.3.3-fix-includes.patch 1409 BLAKE2B b173b21c1d33ecf3ffbc9b295e5112cf481b4dacafcd4d820e1c04ab5086e4f57dda7a5d39c0fece1edc9c632386fcf953c23fb92ce0e21b1e4dc4855e266bbb SHA512 9d8da4469a4a65402d3998ba93247de0a389e892ed8d41129f80139705534ee64c615f01d9f05638d8f9d2ae61796ba9cae0457658dba9cbf8bbd188e7d7e896
+AUX audacity-3.3.3-fix-rpaths.patch 3221 BLAKE2B 9573de885e113556c8816a57509532222eca4d66c4aeb935682a5eafb0db235dccaf82068af69dd9ee6c6df405e90db96d69f4ba0f65c3ad6f0d5c381eee3a51 SHA512 596c529155c7162f59e7ec10cee09ab063f89ec2c9f72ca3784c67e36aecf174271f0ade063105f6f24fa5d4df21fbc585cb2c336aecbe19f044adb8706e1f8a
 AUX audacity-3.3.3-gettext-0.22.patch 872 BLAKE2B 5de981a0b86606f688ca9fa8f036d58d160d0c98f2f5c980089af076ad37951f4675e4e6d6f40e9b719ffd2793cf747a259fc847a60d72e84d56c89f7349499f SHA512 459092cd0bd192468e55ba7174b1b23a0334fb3186fddbf0d14348c870efad23a7e4baa69a288ca6f2bbe5363e5a4251006b8fb580bdf6035184f3c5205c338d
-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
-AUX audacity-3.4.2-fix-build-with-use-lv2-off.patch 1006 BLAKE2B cc38f68aa3febbdc604f28cb787bd66f5d67149a77dca8ab4db060147b94bb104a5480754d70200a962f297b5c0fd2dc11cdf8a34bfd71a8b7ef43489e461688 SHA512 d1a667fed915669b66cf037d25fb932e724a93e7620f837d3780a68dbf6c3afe522da7668858e7ea24523c6c0842806ed3ae8de7eb691d3272d94e669787afd0
+AUX audacity-3.3.3-local-threadpool-libraries.patch 1011 BLAKE2B f31560308b008c44081de361f5d353a0520dc2d82d4ba6cf149b0736cccd2507ffe9561f9b80fbb456adaff41fb376d9cae264b0b19d591313b9b960516f0839 SHA512 47d0455709eb1f9dea1cfcccf2b2e8e0840e05fae54d0dc77bee33a2c3f9420a912752dedbbf2de52da99f58f80b3340d019174d2e6f8f3634afc4c174cec9e2
+AUX audacity-3.3.3-remove-conan-test-dependency.patch 967 BLAKE2B 8e5815ecd1dbaa222a128cfb27f4b8c9138d180ec52d15c85639377a05ea8d7953eba054fece5fb44563e9714cae0e5a71d08c06e895066cd719b88b59255f77 SHA512 e8bf2b76b0879600ea9f6d186d2a7bf397a17879facb3ee9279712360358195242ff13fbc2c1f7d24c71348ed0ed83d9bfefccc7f934b667bf688b39c0d89cd1
+AUX audacity-3.3.3-upstream-fix-rapidjson.patch 1786 BLAKE2B 5d269ae42c2c900ba3ac62b4ca721c9d0ff267419c45261e52b90670d45aaf02a4f902678b46a0409e46c090191f0891437041c48973682cd954b10e08c40b12 SHA512 231e6f7a0f5e1068e709e4d3742ffdd1f34f3ed1a60292d1cfc9f3fb673e5b95116f4d7eda9a134c4c585540d848a8587db4caf0525379a509faa34d2c028251
+AUX audacity-3.4.2-audiocom-std-string.patch 673 BLAKE2B b533c2d3e3a55d2c8aca7d81fbad4af349607b6b7c4f8ea4f930d38d04b17448f327f89ce811826df06532692a4c98cb3ddcae68da154cc1f90c20c6195794c2 SHA512 a645e4352b76d806c194e57b89ed506fc8b9b8f837c0b036fbf6a827d76c969fc9f6e5264f7f65f0e979d4e0225d9439319fef3b4c6c22ef50002c2f294c211f
+AUX audacity-3.4.2-fix-build-with-use-lv2-off.patch 812 BLAKE2B 561e83d0f027ee7f5328bac3f50d19a7ce8233c02d1c15fc01a6488940ddb3a1811077912c1ee3d35e1daff8ccdf66c0e21a7487d40c32c728860fb86fd30a3b SHA512 f00a7d30efb4e07ba7c38e2e1c3496764d44f7769f0315a0e5b3437a01919271c7ee635168cc5163f46b17267668df9c96318d31a38ce0be3d52b8283485b674
+AUX audacity-3.7.0-allow-overriding-alsa-jack.patch 1342 BLAKE2B a5ced9a9d0c4b094d07e5e23a55f23531ae662cd88c6306576238946212519787f1aaea7d297e90c736d765ee4037fdd335e484b7368691e536af1ab68010119 SHA512 6961e5997eb892b51693b6f9d49909bc219e579a8408ef69b7b174682a58ffeaf38a43f0c11e7803d79bbbd4e132564bd75bd340c6f4d3740a4ed20382ad2778
+AUX audacity-3.7.0-audiocom-std-string.patch 688 BLAKE2B 66b760eeca4d1a6d5cc7dcc34f03bf120fab9372dd283268a1169d70d025ef470ee39719dc8924003c6db9639924238326c131fce5f94091e42e02f76197ed3c SHA512 9d7bfa580d08ac3ad8aed7d500afe9a2e76f52e53623d4428d832084bc793c89779a8f14d222b2b8cc2a7a25eee14fcfad7c5cce53a3630aa4b5148992735dfe
+AUX audacity-3.7.0-disable-ccache.patch 641 BLAKE2B 794dc3ccaff8c420631829a98322164d7441a3f08946f98372a2d9bdad308040ab9c958e3dc64af3dc6c7f1e56cc453e8c1fd8f7b8157781cab6949dfce357d2 SHA512 77dd2d18bf537a8e93710e1a32976e92873b154b89b919645c65de607284897127193bd947076e93278241f76136b2c1d8b765bd8ac7a0b15551200fedd05714
+AUX audacity-3.7.0-local-threadpool-libraries.patch 1066 BLAKE2B 8ceadbbb9e2b841be73ab6f970eeb6fbe30285b83968bba5b722086aeae699d86d1e6529dac4c77f16296dacb42f09652fc8b133f08ce8382e17ec5633403f35 SHA512 e946f6558faa32046ad098c52352c9b6150aa52c49732081b54985dbc079bfab39fd2bd27b329f6f06028b0d62ebbed0bcb865e2f41171ec917920631b26b808
+AUX audacity-3.7.0-portsmf.patch 302 BLAKE2B 2dee89e346934ff5cadd1cbc5304fbec9b3391fd4be1cf9c3b27d8b1dbda8acfba2a6fff4f76a1237d277d540109c48efc03b7c8af88f58b40f0662992050d87 SHA512 b9b0bacf9f75120c40ca4796015ef11a80bc5d868b15009bfeb3f0bc15c2b2fe070326b70f6c09a1dde8dbb30de7372577ef4f07bc7c3cb95380e0065aeb45df
 DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c SHA512 c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
 DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5 SHA512 5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c
+DIST audacity-sources-3.7.0.tar.gz 61801488 BLAKE2B 97ff912d60c07a4e7509ad60814b944f3a0feb6b892328aee9375d64673eb2460bc54ef0dc2385173d92f8121ce330d0529a48940b0e08a434cbf05a8912f05c SHA512 0306cae5c42eb3b86781e37866fe1f95c0564c5a14525c69bbe9cfd614ee31d5296fa845bfd4be5f7a4c3e9ac67224e75dd114a16df9b5c6d1a1c79ce1d874bb
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
-EBUILD audacity-3.3.3-r1.ebuild 7417 BLAKE2B d2765f71208c5c1df301fd33d04e880e34133e364e1789e723082c144cc4ca1138b5edb6541dc8d30f74041a5c365fccdea965e6d3b6cefb778c700e3bbc216a SHA512 57a8168d6dcc83c8412881eda35df1e17b0bd2592ca9a95dbd7366c4902b6e0ac59cf4f9709e86be5993ef8d50abe790d7a360fe37b60ba31c4024401c521d4d
 EBUILD audacity-3.3.3.ebuild 7247 BLAKE2B d13edb80efb3cc7da04706b30972265594527b09003be5c690e1a4f3c8fa3b918fea751eec1fc6bd29d3810547204fcc4421681ed657be63847b341e38d58708 SHA512 6120da23d94e41ceb840a3cc6e9a6295e4da03674fffce158625ab671eca780ba77985916396af40c0a19eb99facd9a4e31fda7b6ef6aff79b2f4a9d1ffa4888
 EBUILD audacity-3.4.2-r1.ebuild 6904 BLAKE2B 1884b799dbbcf59ea235d4351b1fe9da68f0d3c5964e671e8ddca49eb88e63512a19d774676b182711fd9742d9f18a1bdde1f6008a449200d73df19bd6130485 SHA512 b19140ac540f2c874eec6086475a1967c5fea707a80ff490e286c305dc0538666df48d5cf88f0fec9d912e9890e7e702c128efd3c3f421321a4fbcc9ce1feb66
+EBUILD audacity-3.7.0.ebuild 6802 BLAKE2B 4d867dd13f855223aa584da30b405024bd951072b672b242b2a0e156ffe1f339b95d55b151c350c13baf4af8554c58a2223cea0f32d967f24965b8a3b62e6cca SHA512 b9946fc171a9af922f9c94248ea92da87ba6a46a80ad5d433a538969da044935e14d02c59c68e72740eec42270592952e703ee52100a58fd5d2d4005c26dab33
 EBUILD audacity-9999.ebuild 7048 BLAKE2B 6c661ade492cc7d7287d7c69be4b4475b3f5fcfae01b29922842c8364260c3f05293679fd225d6a578d2a509e4b932bf0cac3b8910505bc91d5a5741b673b134 SHA512 9418de04b75ce522bc0b3d08278cae3802491a67e2a74ad120e3bf4b1dcc1d2b7c965e97773d5b4e44ef3fd029f135bfa4ccbcc53d79bd2f425199456cdc5ece
 MISC metadata.xml 1409 BLAKE2B a3ca34262c6bc000ba252729024afdf354aa2f61cfb31a382e8d2571cb5321451ed88b6baa2c976b5adadb0b76a07aa64b2e75b61441f46d431c09b1aebb9804 SHA512 d9e0158632dfa398fd07602e65a3e5a4a8a12a3786a5b3672f7983be976cdfe023fc38b9a3c2c1742d0a0fc0411eea5989c3cf48c2ecfe33b2533c27e9098b05
diff --git a/media-sound/audacity/audacity-3.3.3-r1.ebuild b/media-sound/audacity/audacity-3.7.0.ebuild
index 82c770a5849d..3b9ac4e8b0de 100644
--- a/media-sound/audacity/audacity-3.3.3-r1.ebuild
+++ b/media-sound/audacity/audacity-3.7.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit cmake flag-o-matic wxwidgets xdg virtualx
+inherit cmake wxwidgets xdg virtualx
 
 DESCRIPTION="Free crossplatform audio editor"
 HOMEPAGE="https://www.audacityteam.org/"
@@ -22,8 +22,8 @@ if [[ ${PV} = 9999* ]]; then
 else
 	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} )"
@@ -36,10 +36,9 @@ LICENSE="GPL-2+
 	audiocom? ( ZLIB )
 "
 SLOT="0"
-IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 +ogg
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 +ogg
 	opus +portmixer sbsms test twolame vamp +vorbis wavpack"
 REQUIRED_USE="
-	mad? ( !mpg123 )
 	opus? ( ogg )
 	vorbis? ( ogg )
 "
@@ -70,6 +69,8 @@ RESTRICT="!test? ( test )"
 RDEPEND="dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/glib:2
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
 	media-libs/libsndfile
 	media-libs/libsoundtouch:=
 	media-libs/portaudio[alsa?]
@@ -77,12 +78,15 @@ 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? ( net-misc/curl )
+	audiocom? (
+		net-misc/curl
+	)
 	ffmpeg? ( media-video/ffmpeg )
 	flac? ( media-libs/flac:=[cxx] )
 	id3tag? ( media-libs/libid3tag:= )
@@ -94,10 +98,12 @@ RDEPEND="dev-db/sqlite:3
 		media-libs/sratom
 		media-libs/suil
 	)
-	mad? ( media-libs/libmad )
 	mpg123? ( media-sound/mpg123-base )
 	ogg? ( media-libs/libogg )
-	opus? ( media-libs/opus )
+	opus? (
+		media-libs/opus
+		media-libs/opusfile
+	)
 	sbsms? ( media-libs/libsbsms )
 	twolame? ( media-sound/twolame )
 	vamp? ( media-libs/vamp-plugin-sdk )
@@ -105,93 +111,76 @@ RDEPEND="dev-db/sqlite:3
 	wavpack? ( media-sound/wavpack )
 "
 DEPEND="${RDEPEND}
-	audiocom? ( dev-libs/rapidjson )
+	dev-libs/rapidjson
 	x11-base/xorg-proto
 	test? ( <dev-cpp/catch-3:0 )"
-BDEPEND="app-arch/unzip
-	|| ( dev-lang/nasm dev-lang/yasm )
+BDEPEND="|| ( dev-lang/nasm dev-lang/yasm )
 	sys-devel/gettext
 	virtual/pkgconfig"
 
 PATCHES=(
-	# Equivalent to previous versions
-	"${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
-	# From Debian
-	"${FILESDIR}/${PN}-3.3.3-fix-rpaths.patch"
+	# fixes include path
+	"${FILESDIR}/audacity-3.7.0-portsmf.patch"
+
+	# disables ccache
+	"${FILESDIR}/audacity-3.7.0-disable-ccache.patch"
 
 	# Disables some header-based detection
-	"${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+	"${FILESDIR}/audacity-3.7.0-allow-overriding-alsa-jack.patch"
 
 	# For has_networking
-	"${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch"
-	"${FILESDIR}/${PN}-3.3.3-upstream-fix-rapidjson.patch"
-
-	# Add Findlibmad.cmake
-	"${FILESDIR}/${PN}-3.3.3-Findlibmad.patch"
-
-	# Fix includes
-	"${FILESDIR}/${PN}-3.3.3-fix-includes.patch"
-
-	# gettext 0.22
-	"${FILESDIR}/${PN}-3.3.3-gettext-0.22.patch"
+	"${FILESDIR}/audacity-3.7.0-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}/${PN}-3.4.2-audiocom-std-string.patch"
+	"${FILESDIR}/audacity-3.7.0-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() {
-	# -Werror=strict-aliasing
-	# Reportedly also -Werror=odr but I could not get that far.
-	# https://bugs.gentoo.org/915226
-	# https://github.com/audacity/audacity/issues/6096
-	append-flags -fno-strict-aliasing
-	filter-lto
-
 	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
@@ -200,35 +189,34 @@ 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 opus system off)
 		-Daudacity_use_libsndfile=system
 		-Daudacity_use_libvorbis=$(usex vorbis system off)
-		-Daudacity_use_portaudio=system
-		-Daudacity_use_midi=system
-		-Daudacity_use_vamp=$(usex vamp system off)
 		-Daudacity_use_lv2=$(usex lv2 system off)
+		-Daudacity_use_midi=system
+		-Daudacity_use_nyquist=local
+		-Daudacity_use_opusfile=$(usex opus system off)
+		-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
@@ -237,10 +225,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.3-allow-overriding-alsa-jack.patch b/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch
index 53ac8edc33fb..00852c3889a9 100644
--- a/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch
+++ b/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch
@@ -4,13 +4,6 @@ Date: Sat, 17 Dec 2022 21:13:56 +0100
 Subject: [PATCH] portmixer: Allow overriding PA_HAS_{ALSA,JACK}
 
 Not included for OSS as OSS is always included AFAICT.
----
- CMakeLists.txt                   | 3 +++
- lib-src/portmixer/CMakeLists.txt | 9 ++++++---
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 42e765691..c18a939e6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -624,6 +624,9 @@ cmd_option( ${_OPT}use_portmixer "Build PortMixer support into Audacity" On)
@@ -23,8 +16,6 @@ index 42e765691..c18a939e6 100644
  endif()
  
  cmd_option( ${_OPT}use_nyquist "Build Nyquist support into Audacity" On)
-diff --git a/lib-src/portmixer/CMakeLists.txt b/lib-src/portmixer/CMakeLists.txt
-index 65a384fa0..1ddc8ed50 100644
 --- a/lib-src/portmixer/CMakeLists.txt
 +++ b/lib-src/portmixer/CMakeLists.txt
 @@ -8,9 +8,12 @@ if (UNIX AND NOT APPLE)
diff --git a/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch b/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch
index a40847bb941c..c18e9e521d62 100644
--- a/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch
+++ b/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch
@@ -3,14 +3,6 @@ From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
 Date: Fri, 16 Dec 2022 23:37:36 +0100
 Subject: [PATCH] Don't force enable ccache
 
----
-Analogous to the similar patches in prior versions.
-
-CMakeLists.txt | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c1c7baf2..42e765691 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -142,14 +142,6 @@ set( CMAKE_PREFIX_PATH
diff --git a/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
index 7237614782b3..908d7efeb316 100644
--- a/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
@@ -7,14 +7,6 @@ Date: Fri, 14 Jul 2023 21:17:45 +0000
 Subject: [PATCH] Add missing Findlibmad.cmake file
 
 This fixes compiling against the system installed libmad.
----
- cmake-proxies/cmake-modules/Findlibmad.cmake | 35 ++++++++++++++++++++
- 1 file changed, 35 insertions(+)
- create mode 100644 cmake-proxies/cmake-modules/Findlibmad.cmake
-
-diff --git a/cmake-proxies/cmake-modules/Findlibmad.cmake b/cmake-proxies/cmake-modules/Findlibmad.cmake
-new file mode 100644
-index 000000000000..0858c2d93e24
 --- /dev/null
 +++ b/cmake-proxies/cmake-modules/Findlibmad.cmake
 @@ -0,0 +1,35 @@
diff --git a/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch b/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch
index 2e8685a09a3f..4e9d2d0788d3 100644
--- a/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch
@@ -4,13 +4,6 @@ Date: Fri, 14 Jul 2023 21:08:52 +0000
 Subject: [PATCH] Fix ImportMP3_MAD and ImportQT include directives
 
 This fixes 'file not found' errors.
----
- src/import/ImportMP3_MAD.cpp | 6 +++---
- src/import/ImportQT.cpp      | 8 ++++----
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/import/ImportMP3_MAD.cpp b/src/import/ImportMP3_MAD.cpp
-index fa26eaca49dd..9e6dfdf3a534 100644
 --- a/src/import/ImportMP3_MAD.cpp
 +++ b/src/import/ImportMP3_MAD.cpp
 @@ -62,10 +62,10 @@ static Importer::RegisteredUnusableImportPlugin registered
@@ -27,8 +20,6 @@ index fa26eaca49dd..9e6dfdf3a534 100644
  
  // PRL:  include these last,
  // and correct some preprocessor namespace pollution from wxWidgets that
-diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp
-index f931b5a63fc1..5b49c1630b7f 100644
 --- a/src/import/ImportQT.cpp
 +++ b/src/import/ImportQT.cpp
 @@ -17,8 +17,8 @@
diff --git a/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch b/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch
index b3fcdb85b022..5588f2e2b968 100644
--- a/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch
@@ -8,9 +8,8 @@ Fixes: https://github.com/audacity/audacity/issues/3289
 Forwarded: https://github.com/audacity/audacity/pull/3671
 [1] https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#caveats
 
-diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2023-06-08 15:17:02.000000000 +0200
-+++ b/CMakeLists.txt	2023-07-14 01:18:46.452163033 +0200
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
 @@ -412,6 +412,7 @@
  set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" )
  set( _DATADIR "${CMAKE_INSTALL_DATADIR}" )
@@ -19,9 +18,8 @@ diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
  set( _PKGDATA "${_DATADIR}/audacity/" )
  set( _MANDIR "${CMAKE_INSTALL_MANDIR}" )
  set( _MODDIR "${_PKGLIB}/modules" )
-diff -Nuar a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
---- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake	2023-06-08 15:17:02.000000000 +0200
-+++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake	2023-07-14 01:23:42.025628702 +0200
+--- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake
++++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
 @@ -338,6 +338,17 @@
     set( "${var}" "${node}" PARENT_SCOPE )
  endfunction()
@@ -70,17 +68,15 @@ diff -Nuar a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies
        )
  
        if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
-diff -Nuar a/modules/mod-script-pipe/CMakeLists.txt b/modules/mod-script-pipe/CMakeLists.txt
---- a/modules/mod-script-pipe/CMakeLists.txt	2023-06-08 15:17:02.000000000 +0200
-+++ b/modules/mod-script-pipe/CMakeLists.txt	2023-07-14 01:25:10.730068564 +0200
+--- a/modules/mod-script-pipe/CMakeLists.txt
++++ b/modules/mod-script-pipe/CMakeLists.txt
 @@ -15,3 +15,4 @@
  )
  audacity_module( mod-script-pipe "${SOURCES}" "Audacity"
     "${DEFINES}" "" )
 +install_audacity_module( mod-script-pipe )
-diff -Nuar a/src/CMakeLists.txt b/src/CMakeLists.txt
---- a/src/CMakeLists.txt	2023-06-08 15:17:02.000000000 +0200
-+++ b/src/CMakeLists.txt	2023-07-14 01:26:23.098427419 +0200
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
 @@ -1557,11 +1557,6 @@
                 RUNTIME
                 RESOURCE DESTINATION "${_PKGDATA}" )
diff --git a/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch b/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
index a3ef6cf3859d..8ca232d5896a 100644
--- a/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
@@ -5,9 +5,8 @@ From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
 Date: Sun, 18 Dec 2022 13:37:35 +0100
 Subject: [PATCH] Allow using local dependency for threadpool
 
-diff -Nuar a/cmake-proxies/cmake-modules/DependenciesList.cmake b/cmake-proxies/cmake-modules/DependenciesList.cmake
---- a/cmake-proxies/cmake-modules/DependenciesList.cmake	2023-07-14 03:40:22.518292749 +0200
-+++ b/cmake-proxies/cmake-modules/DependenciesList.cmake	2023-07-14 03:40:43.790398232 +0200
+--- a/cmake-proxies/cmake-modules/DependenciesList.cmake
++++ b/cmake-proxies/cmake-modules/DependenciesList.cmake
 @@ -56,7 +56,6 @@
  audacity_find_package(PortAudio REQUIRED)
  
@@ -16,9 +15,8 @@ diff -Nuar a/cmake-proxies/cmake-modules/DependenciesList.cmake b/cmake-proxies/
     audacity_find_package(CURL REQUIRED CONAN_PACKAGE_NAME libcurl)
  endif()
  
-diff -Nuar a/libraries/lib-network-manager/CMakeLists.txt b/libraries/lib-network-manager/CMakeLists.txt
---- a/libraries/lib-network-manager/CMakeLists.txt	2023-07-14 03:38:42.061794613 +0200
-+++ b/libraries/lib-network-manager/CMakeLists.txt	2023-07-14 03:38:27.913724456 +0200
+--- a/libraries/lib-network-manager/CMakeLists.txt
++++ b/libraries/lib-network-manager/CMakeLists.txt
 @@ -43,4 +43,8 @@
  
  set ( DEFINES INTERFACE "HAS_NETWORKING" )
diff --git a/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch b/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch
index 63dd3b58f0f0..2898cd1a53cf 100644
--- a/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch
@@ -9,12 +9,6 @@ Subject: [PATCH] Remove dependency on conan for unit tests
 
 These run fine with catch2 installed from system package manager; there
 is no reason to enforce conan dependency.
----
- CMakeLists.txt | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cbe79a43b933..7b682c4e729d 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -228,15 +228,11 @@ cmd_option( ${_OPT}has_url_schemes_support
diff --git a/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch b/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
index c95676a18cfe..e3c110e72d07 100644
--- a/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
@@ -6,14 +6,6 @@ From: Dmitry Vedenko <dmitry@crsib.me>
 Date: Mon, 7 Aug 2023 17:12:49 +0300
 Subject: [PATCH] Fixes RapidJSON missing from Linux builds
 
----
- .../cmake-modules/dependencies/rapidjson.cmake    | 15 +++++++++++++--
- linux/packages/arch/dependencies.sh               |  1 +
- linux/packages/fedora34/dependencies.sh           |  1 +
- 3 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
-index c44aad81b8e4..ba95962a6eb6 100644
 --- a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
 +++ b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
 @@ -1,7 +1,18 @@
@@ -37,8 +29,6 @@ index c44aad81b8e4..ba95962a6eb6 100644
 +      endif()
     endif()
  endif()
-diff --git a/linux/packages/arch/dependencies.sh b/linux/packages/arch/dependencies.sh
-index d34012442efd..8aa8792057d4 100755
 --- a/linux/packages/arch/dependencies.sh
 +++ b/linux/packages/arch/dependencies.sh
 @@ -44,6 +44,7 @@ deps=(
@@ -49,8 +39,6 @@ index d34012442efd..8aa8792057d4 100755
  )
  
  pacman -Syu --noconfirm \
-diff --git a/linux/packages/fedora34/dependencies.sh b/linux/packages/fedora34/dependencies.sh
-index 8f6ce8ff2eb8..1e039612b095 100755
 --- a/linux/packages/fedora34/dependencies.sh
 +++ b/linux/packages/fedora34/dependencies.sh
 @@ -54,6 +54,7 @@ deps=(
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
index f06799030b4b..3a0289c69a0f 100644
--- 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
@@ -9,12 +9,6 @@ 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 @@
diff --git a/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch b/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch
index 8c47ff8642d7..4a21f19dd0e5 100644
--- a/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch
+++ b/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch
@@ -7,12 +7,6 @@ libraries/lib-lv2/LV2Utils.h:18:10: fatal error: lilv/lilv.h: No such file or di
    18 | #include "lilv/lilv.h" // for lilv_free
       |          ^~~~~~~~~~~~~
 compilation terminated.
----
- libraries/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
-index b1ebefa1b023..879cd948791d 100644
 --- a/libraries/CMakeLists.txt
 +++ b/libraries/CMakeLists.txt
 @@ -50,7 +50,6 @@ set( LIBRARIES
diff --git a/media-sound/audacity/files/audacity-3.7.0-allow-overriding-alsa-jack.patch b/media-sound/audacity/files/audacity-3.7.0-allow-overriding-alsa-jack.patch
new file mode 100644
index 000000000000..c0689d4724ac
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.7.0-allow-overriding-alsa-jack.patch
@@ -0,0 +1,39 @@
+From e46dbcb9763f4367705c66009703f15ff0ff5558 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Sat, 17 Dec 2022 21:13:56 +0100
+Subject: [PATCH] portmixer: Allow overriding PA_HAS_{ALSA,JACK}
+
+Not included for OSS as OSS is always included AFAICT.
+
+REBASED
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -615,6 +607,9 @@ cmd_option( ${_OPT}use_portmixer "Build PortMixer support into Audacity" On)
+ if( ${_OPT}use_portmixer )
+    set(USE_PORTMIXER Yes)
+    add_subdirectory( "lib-src/portmixer" )
++else()
++  # Suppress bogus warnings about unused variables
++  set (unusedIgnore "${PA_HAS_ALSA}${PA_HAS_JACK}${PA_HAS_OSS}")
+ endif()
+ 
+ cmd_option( ${_OPT}use_nyquist "Build Nyquist support into Audacity" On)
+--- a/lib-src/portmixer/CMakeLists.txt
++++ b/lib-src/portmixer/CMakeLists.txt
+@@ -8,9 +8,12 @@ if (UNIX AND NOT APPLE)
+    include(CheckIncludeFile)
+    set(CMAKE_REQUIRED_LIBRARIES portaudio::portaudio)
+ 
+-   check_include_file( "pa_jack.h" PA_HAS_JACK )
+-
+-   check_include_file( "pa_linux_alsa.h" PA_HAS_ALSA )
++   if ( NOT DEFINED PA_HAS_JACK )
++     check_include_file( "pa_jack.h" PA_HAS_JACK )
++   endif()
++   if ( NOT DEFINED PA_HAS_ALSA )
++     check_include_file( "pa_linux_alsa.h" PA_HAS_ALSA )
++   endif()
+    if( PA_HAS_ALSA )
+       find_package( ALSA REQUIRED QUIET )
+    endif()
diff --git a/media-sound/audacity/files/audacity-3.7.0-audiocom-std-string.patch b/media-sound/audacity/files/audacity-3.7.0-audiocom-std-string.patch
new file mode 100644
index 000000000000..b844429c8776
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.7.0-audiocom-std-string.patch
@@ -0,0 +1,24 @@
+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>
+
+REBASED
+
+--- 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 <string>
+ #include <mutex>
diff --git a/media-sound/audacity/files/audacity-3.7.0-disable-ccache.patch b/media-sound/audacity/files/audacity-3.7.0-disable-ccache.patch
new file mode 100644
index 000000000000..9c2b9ebebde6
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.7.0-disable-ccache.patch
@@ -0,0 +1,22 @@
+From afd777fbcbaa9e9c14b80374c60ecd631eb537ea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Fri, 16 Dec 2022 23:37:36 +0100
+Subject: [PATCH] Don't force enable ccache
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -140,14 +140,6 @@ set( CMAKE_PREFIX_PATH
+ set( CMAKE_CXX_STANDARD 17 )
+ set( CMAKE_CXX_STANDARD_REQUIRED ON )
+ 
+-# Use ccache if available
+-find_program( CCACHE_PROGRAM ccache )
+-mark_as_advanced( FORCE CCACHE_PROGRAM )
+-
+-if( CCACHE_PROGRAM )
+-   set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
+-endif()
+-
+ # Define option() prefix
+ set( _OPT "audacity_" )
+ 
diff --git a/media-sound/audacity/files/audacity-3.7.0-local-threadpool-libraries.patch b/media-sound/audacity/files/audacity-3.7.0-local-threadpool-libraries.patch
new file mode 100644
index 000000000000..c47ae9bd508a
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.7.0-local-threadpool-libraries.patch
@@ -0,0 +1,30 @@
+This is an adapted version of:
+
+From 7b5f56ec441fb472b61bae14e1efa353db4d7aca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Sun, 18 Dec 2022 13:37:35 +0100
+Subject: [PATCH] Allow using local dependency for threadpool
+
+REBASED
+
+--- a/cmake-proxies/cmake-modules/DependenciesList.cmake
++++ b/cmake-proxies/cmake-modules/DependenciesList.cmake
+@@ -63,7 +63,6 @@ endif()
+ audacity_find_package(PortAudio REQUIRED)
+ 
+ if( ${_OPT}has_networking )
+-   audacity_find_package(ThreadPool REQUIRED)
+    audacity_find_package(CURL REQUIRED CONAN_PACKAGE_NAME libcurl)
+ endif()
+ 
+--- a/libraries/lib-network-manager/CMakeLists.txt
++++ b/libraries/lib-network-manager/CMakeLists.txt
+@@ -53,4 +53,8 @@ PRIVATE
+ set ( DEFINES INTERFACE "HAS_NETWORKING" PRIVATE "WIN32_LEAN_AND_MEAN" )
+ 
+ 
++add_library ( threadpool::threadpool INTERFACE IMPORTED GLOBAL )
++target_include_directories ( threadpool::threadpool INTERFACE
++  ${CMAKE_SOURCE_DIR}/lib-src/threadpool
++)
+ audacity_library( ${TARGET} "${SOURCES}" "${LIBRARIES}" "${DEFINES}" "" )
diff --git a/media-sound/audacity/files/audacity-3.7.0-portsmf.patch b/media-sound/audacity/files/audacity-3.7.0-portsmf.patch
new file mode 100644
index 000000000000..612f8b7b5161
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.7.0-portsmf.patch
@@ -0,0 +1,11 @@
+--- a/libraries/lib-note-track/WrapAllegro.h
++++ b/libraries/lib-note-track/WrapAllegro.h
+@@ -13,7 +13,7 @@
+ #elif defined(__linux__)
+ 
+ #include <cstring> // Allegro include fails if this header isn't included due to no memcpy
+-#include "allegro.h"
++#include <portsmf/allegro.h>
+ 
+ #else //_MSC_VER
+