gentoo auto-resync : 16:01:2024 - 05:29:50

4 files changed, 74 insertions, 16 deletions

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 0453447312bd..4de7ff8df49a 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -16,6 +16,7 @@ AUX audacity-3.3.3-fix-includes.patch 1764 BLAKE2B ea7f73f60b8b5ffc42218b65d8148
 AUX audacity-3.3.3-fix-rpaths.patch 3819 BLAKE2B 29079fb4fd63b383546b1f82c08fb98b16eba0588da99b936f7de104bcb826fd6a0dc7f63fd379e44ace9d80ea612d86deda9f68980e3cd5c0874f1925b35b91 SHA512 d05868e7adf91c613534aa965059da5e393582bbaee0b49605c2e270d528dfd8fa882ce356e5fed38752afbbb09539165ea566b13c13df4bc949ed8c5f2617e1
 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
 DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B b8e48cab1c89cadb343a17fcb1d811a7363231152867f842ffff6dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24 SHA512 850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
@@ -25,6 +26,6 @@ DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B e3c96282b5eeffe5854781cfe316f
 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 6833 BLAKE2B 274a7aa715286e3eefbeb10f94b5ba6d66893d8de4aabe9ff59f31d0edc4af20fbe4e8d768aaf61c404a25067dc524911ea59fa33c8e7cd9a1dde3d3042e714d SHA512 0e81bc0f879d85ce76050d68787a0552a842e88872ac5ec5214cc83172644c15719edd29e8a20904f23bfbf3b5ef5a7b943fa9aa97f8dbcd07f7e0d64364370c
-EBUILD audacity-9999.ebuild 6450 BLAKE2B 357b0353b8d91498a2da8378cd92104abaca0d40518261fc7a767ccf04ecdcf9ffbedbe0e9fef7ebfe80f345e6311924a63d4706c41e8c6e3693c5257237dac2 SHA512 f33879b580a6b33646ae45eed6f07fa92cbdbd37cbf7b7bf2b28f818f52a1208b45ba129014dc083137a7b7a250460ab3dd86f1f6902921ce7ceb0220bcbf2e8
+EBUILD audacity-3.3.3.ebuild 7009 BLAKE2B 1d2eebb9213ebc1339aef10cc924c4a7a80b4939aa7d8c911aa0f2407aec1aee98e03d6297e85b68a5225713475f9e3ca2c7b2a5a9533c2ccee14803f688d8e7 SHA512 22de742f511e33e3c7e0e1bd1de94881496530386ed2432e9021d6204534c9b2fc31b485021e996cb93f90d9d16e9258e4b2e890ca04d7fe5cb736126c14b7e2
+EBUILD audacity-9999.ebuild 6680 BLAKE2B 7690fccaef1c7cc582fab90e089ece7afbd13e5110d206d1c2d8755a8297c416b5d7d9705cbbad670877c533b42d7cad307ab25128b7282b6c8ccce444881231 SHA512 ba6a71db32fb3efaa43e0d946495713b4bf7d3bed39df43fd0bce95a44570d6647f87e76fcd097c40e56789bf1cad0749a5e929c8347d24138144f2f17674f86
 MISC metadata.xml 1512 BLAKE2B 277533c5356fb9fee5f353c14f43886e2823cf11f50deff855e31b039e197dd9daeab65dd133461e468f6bf2862b72e910ea36f67bceedec00a5e2234a386db5 SHA512 f66ee862c1fa473e825afc68186b1e2ecc3e7f4bb49272fde63b7b52afb2075795632c0690dd37ded5390a180720297d12b33360f34a4050640080b906ea0a28
diff --git a/media-sound/audacity/audacity-3.3.3.ebuild b/media-sound/audacity/audacity-3.3.3.ebuild
index 4e68dd30ca14..f77da513d7d2 100644
--- a/media-sound/audacity/audacity-3.3.3.ebuild
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit cmake wxwidgets xdg
+inherit cmake wxwidgets xdg virtualx
 
 DESCRIPTION="Free crossplatform audio editor"
 HOMEPAGE="https://www.audacityteam.org/"
@@ -37,10 +37,8 @@ LICENSE="GPL-2+
 "
 SLOT="0"
 IUSE="alsa audiocom 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"
+	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
@@ -104,7 +102,8 @@ RDEPEND="dev-db/sqlite:3
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/catch:0 )"
 BDEPEND="app-arch/unzip
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -135,6 +134,9 @@ PATCHES=(
 
 	# gettext 0.22
 	"${FILESDIR}/${PN}-3.3.3-gettext-0.22.patch"
+
+	# Allows running tests without conan
+	"${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
 )
 
 src_prepare() {
@@ -215,11 +217,17 @@ src_configure() {
 		## 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
 }
 
+src_test() {
+	virtx cmake_src_test
+}
+
 src_install() {
 	cmake_src_install
 
diff --git a/media-sound/audacity/audacity-9999.ebuild b/media-sound/audacity/audacity-9999.ebuild
index ad59e3249ef7..b8d173af117a 100644
--- a/media-sound/audacity/audacity-9999.ebuild
+++ b/media-sound/audacity/audacity-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
 
-inherit cmake wxwidgets xdg
+inherit cmake wxwidgets xdg virtualx
 
 DESCRIPTION="Free crossplatform audio editor"
 HOMEPAGE="https://www.audacityteam.org/"
@@ -37,10 +37,9 @@ LICENSE="GPL-2+
 "
 SLOT="0"
 IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
-	opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
+	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
@@ -67,6 +66,7 @@ RESTRICT="test"
 RDEPEND="dev-db/sqlite:3
 	dev-libs/expat
 	dev-libs/glib:2
+	dev-libs/rapidjson
 	media-libs/libsndfile
 	media-libs/libsoundtouch:=
 	media-libs/portaudio[alsa?]
@@ -103,7 +103,8 @@ RDEPEND="dev-db/sqlite:3
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/catch:0 )"
 BDEPEND="app-arch/unzip
 	sys-devel/gettext
 	virtual/pkgconfig
@@ -120,13 +121,16 @@ PATCHES=(
 
 	# For has_networking
 	"${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch"
+
+	# Allows running tests without conan
+	"${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
 )
 
 src_prepare() {
 	cmake_src_prepare
 
-	local header_subs="${S}/lib-src/header-substitutes"
-	cat <<-EOF >"${header_subs}/allegro.h" || die
+	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
@@ -199,11 +203,17 @@ src_configure() {
 		## 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
 }
 
+src_test() {
+	virtx cmake_src_test
+}
+
 src_install() {
 	cmake_src_install
 
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
new file mode 100644
index 000000000000..63dd3b58f0f0
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/916258
+https://github.com/audacity/audacity/discussions/5841
+https://github.com/matoro/audacity/commit/270be88a9390eb25c2f4b16030f6897f08a6a685
+
+From 270be88a9390eb25c2f4b16030f6897f08a6a685 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Mon, 15 Jan 2024 20:21:08 -0500
+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
+    "Build custom URL schemes support into Audacity"
+    Off)
+ 
+-include( CMakeDependentOption )
+-
+-cmake_dependent_option(
+-   ${_OPT}has_tests
++cmd_option( ${_OPT}has_tests
+    "Enables automated testing support"
+-   On
+-   "${_OPT}conan_enabled"
+-   Off
+-)
++   On)
++
++include( CMakeDependentOption )
+ 
+ cmake_dependent_option(
+    ${_OPT}has_audiocom_upload