gentoo auto-resync : 18:04:2024 - 12:04:39

5 files changed, 244 insertions, 229 deletions

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 48308d1c437e..1003fe60e9b9 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -6,11 +6,8 @@ AUX audacity-2.4.2-fix-gettimeofday.patch 338 BLAKE2B f9deed24aca404693a0094b83e
 AUX audacity-2.4.2-fix-libflac-undefined-references.patch 2255 BLAKE2B a1c90b3b712ef558d74edc0f8e2a4db71a8b8292b633e24a9808587923a012d0935e35e574b76ad94ade95779d917419459b83d5cf5eeb90a696ca7cc3102814 SHA512 d3cc5fd18b3869047112b930aadcf912911ed6bda0299dc3a9a284db28a56aa4545629df567844735c8c5a4c641e21e6c39f42838c41d406ac18758a74760621
 AUX audacity-2.4.2-fix-metainfo.patch 468 BLAKE2B 87133634ca1be0ce0392b044d60a1632c6a963ee11a1893064c41c9d8093adf081bc3fd6a2e2dcc909573bd22d1d21e8cb58c8bbf9e464058780cfce839d6c06 SHA512 a2cdabecf53c03b77434ddbdbfb7606eb52f8e52b67d62bd206799eb0e9399345967106d7644784de338ef68d3e87c26952c491e775b1a323e1e2a91e41fe200
 AUX audacity-2.4.2-fix-vertical-track-resizing.patch 462 BLAKE2B 3f6fe748506f39ca64b72449853bc396389c2760767d916301298951aaa7b82cc1379c2b7d9860b4579a964dedc6806c85120cd3f4f1aa2b726ae5846bae1df2 SHA512 dc7c2cb3ae1e47e00f473b0943994e352275dc41d41255b2b1ba2e042d9bd6ab046f2088cda81dbc22f2ffeb13a97d28073ce078e35bb29e868f6fa2e8b9e0df
-AUX audacity-3.2.3-allow-finding-rapidjson-pkgconfig.patch 677 BLAKE2B 3d29197b3e73784ce6bb844188fe207c4c19ac48670589a98a7a3b198c1220be0da47535402cfc234ffc82bb3b97c44660caaa8a794d249b83250b182bb2913f SHA512 2755d34cf38ce79609a6f64b0e35e5c4f05c262d588efdf4f8e47049017d21e8712e425ab9a63faba2af5369b1f9cd36a98c2bae51e6e01afe7a3b0751d4cad3
 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.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.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
@@ -28,6 +25,7 @@ DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133
 EBUILD audacity-2.4.2-r3.ebuild 3926 BLAKE2B b62459d874285eabace837ac9b2f324574ea1418a6d6396c27de531177c3f9e20511488b7d8fd22e4d8febb75ff3c706eccfd26053ec64e43f82f6906a5bc06b SHA512 0036524556974517dc0ea9427664db5564e8f9312c627a8ddf70850ba457beef51b46666fb3693cbc67b75c3775c86b90a500d7d50a515fafb6536c592d1e49b
 EBUILD audacity-2.4.2-r4.ebuild 4101 BLAKE2B 165c11e5773b0bfb80b93c3860331ca78cacbda755edff4ba8ba0e7d953e3bd39f34988aa27e586b2be885b915218a181895ab2906de9c321de49fb8b6efa10c SHA512 30952598e25cdef0ad003d1857174244b28b6cc81bc7d194386290666ab6f34da75cfd4cbbddd994d2915e113faaccfbd65b66fc92ff4302f51601f5980a7513
 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 6906 BLAKE2B 460e973e2b6870b7c3afe8eb56bbf0b5e5c596cfd5c421ef078e1358076a285324d3d19b5faf882870e89370162c0f33bac12aa87f9abb3d8222b2d5a6c3021d SHA512 500dffe96ac7ad1b0a0f911cbb81cd2dcae0723834020c54257be5d493a9fb85313893320c27839a587b7fd37b27431cfd743a540b87988503ecd010d8efe891
 EBUILD audacity-9999.ebuild 7048 BLAKE2B 6c661ade492cc7d7287d7c69be4b4475b3f5fcfae01b29922842c8364260c3f05293679fd225d6a578d2a509e4b932bf0cac3b8910505bc91d5a5741b673b134 SHA512 9418de04b75ce522bc0b3d08278cae3802491a67e2a74ad120e3bf4b1dcc1d2b7c965e97773d5b4e44ef3fd029f135bfa4ccbcc53d79bd2f425199456cdc5ece
 MISC metadata.xml 1642 BLAKE2B fc334dbb1c31f732eb26bc00279966ca1ddd5c60bcac5ba4cfe49101ea4b34962befc66bb151f68289a8e5f2e06a9afe9ab88d8a159ad9b47ad6c304927b2521 SHA512 d68acc20cc56c6fe5ef879d881d92843761561a8e276eb56ea0a543336c197606d8c808e11c8dee33f12bcaf8847a51c623e5dbad75e709a9d87b8a9486f253b
diff --git a/media-sound/audacity/audacity-3.3.3.ebuild b/media-sound/audacity/audacity-3.3.3.ebuild
new file mode 100644
index 000000000000..2cba5da71a87
--- /dev/null
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -0,0 +1,243 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake flag-o-matic wxwidgets xdg virtualx
+
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/"
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code.  Probably not worth packaging individually.  Check
+# 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"
+
+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}-${MY_P}"
+	SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.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
+	audiocom? ( ZLIB )
+"
+SLOT="0"
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad 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
+#   cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
+#   for libuuid
+# portmidi became non-optional: building without it results in build
+#   failures, even with some of the Debian patches.  It's probably not
+#   in our best interest to fix that as a patch series.
+# glib, gtk and gdk are all directly relied on in the source, not just
+
+# Libraries used at runtime via dlopen:
+# - dev-libs/{serd,sord} - for LV2 support
+# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
+# - media-sound/lame :: For MP3 export
+# - media-video/ffmpeg :: For generic FFMPEG export
+#   This one has the interesting property of many versions being
+#   supported at runtime.  See: libraries/lib-ffmpeg-support/impl
+#   Current support grid:
+#   - Lavf - 5[789]
+#   - Lavc - 5[789]
+#   - Lavu - 5[2567]
+
+RDEPEND="dev-db/sqlite:3
+	dev-libs/expat
+	dev-libs/glib:2
+	media-libs/libsndfile
+	media-libs/libsoundtouch:=
+	media-libs/portaudio[alsa?]
+	media-libs/portmidi
+	media-libs/portsmf:=
+	media-libs/soxr
+	media-sound/lame
+	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 )
+	flac? ( media-libs/flac:=[cxx] )
+	id3tag? ( media-libs/libid3tag:= )
+	lv2? (
+		dev-libs/serd
+		dev-libs/sord
+		media-libs/lilv
+		media-libs/lv2
+		media-libs/sratom
+		media-libs/suil
+	)
+	mad? ( media-libs/libmad )
+	mpg123? ( media-sound/mpg123 )
+	ogg? ( media-libs/libogg )
+	opus? ( media-libs/opus )
+	sbsms? ( media-libs/libsbsms )
+	twolame? ( media-sound/twolame )
+	vamp? ( media-libs/vamp-plugin-sdk )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+	test? ( <dev-cpp/catch-3:0 )"
+BDEPEND="app-arch/unzip
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+REQUIRED_USE="
+	mad? ( !mpg123 )
+"
+
+PATCHES=(
+	# Equivalent to previous versions
+	"${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+	# From Debian
+	"${FILESDIR}/${PN}-3.3.3-fix-rpaths.patch"
+
+	# Disables some header-based detection
+	"${FILESDIR}/${PN}-3.2.3-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"
+
+	# 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
+	/* 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
+	fi
+}
+
+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_has_networking=$(usex audiocom on off)
+		# Not useful on Gentoo.
+		-Daudacity_has_updates_check=OFF
+		-Daudacity_has_audiocom_upload=$(usex audiocom 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_lib_preference=system
+		-Daudacity_obey_system_dependencies=ON
+		-Daudacity_use_expat=system
+		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+		-Daudacity_use_libid3tag=$(usex id3tag system off)
+		-Daudacity_use_ladspa=$(usex ladspa)
+		-Daudacity_use_lame=system
+		-Daudacity_use_wxwidgets=system
+		-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_lv2=$(usex lv2 system off)
+		-Daudacity_use_portsmf=system
+		-Daudacity_use_sbsms=$(usex sbsms system off)
+		-Daudacity_use_soundtouch=system
+		-Daudacity_use_twolame=$(usex twolame system off)
+
+		# Disable telemetry features.
+		-Daudacity_has_sentry_reporting=off
+		-Daudacity_has_crashreports=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
+}
+
+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-finding-rapidjson-pkgconfig.patch b/media-sound/audacity/files/audacity-3.2.3-allow-finding-rapidjson-pkgconfig.patch
deleted file mode 100644
index d36f51bc2098..000000000000
--- a/media-sound/audacity/files/audacity-3.2.3-allow-finding-rapidjson-pkgconfig.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 0a786020046c9d608f1e2f463575d4ca8febf909 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
-Date: Sun, 18 Dec 2022 13:41:06 +0100
-Subject: [PATCH 3/3] Add pkg-config fallback for RapidJSON
-
----
- cmake-proxies/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt
-index 7568bb32f..db40dcf63 100644
---- a/cmake-proxies/CMakeLists.txt
-+++ b/cmake-proxies/CMakeLists.txt
-@@ -289,6 +289,7 @@ if( ${_OPT}has_sentry_reporting OR ${_OPT}has_audiocom_upload )
-       RapidJSON
-       rapidjson/1.1.0
-       REQUIRED
-+      PKG_CONFIG "RapidJSON"
-    )
- endif()
- 
--- 
-2.39.0
-
diff --git a/media-sound/audacity/files/audacity-3.2.3-fix-rpaths.patch b/media-sound/audacity/files/audacity-3.2.3-fix-rpaths.patch
deleted file mode 100644
index 2f1578211c9c..000000000000
--- a/media-sound/audacity/files/audacity-3.2.3-fix-rpaths.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-From: Benjamin Drung <benjamin.drung@canonical.com>
-Date: Thu, 22 Sep 2022 19:52:43 +0200
-Subject: Fix rpath for private libraries on Linux
-
-Installing audacity on Linux will produce private libraries that have
-`RUNPATH` set to the build directory instead of the installation
-directory.
-
-The root cause is that the library directory is copied to the
-installation directory without touching the libraries. The cmake wiki
-says in RPATH handling caveats [1]: "Since install-side RPATH tweaking
-is an operation that is done by target-specific installation handling,
-any target that should have its install RPATH changed (e.g. to
-`CMAKE_INSTALL_RPATH`) needs to end up in the installation via an
-`install(TARGETS ...)` signature and not via directory-based copying."
-
-So replace `install(DIRECTORY ...)` by individual `install(TARGETS ...)`
-for the libraries and modules. Then cmake will replace the `RUNPATH` to
-`$ORIGIN/../lib/audacity`, which is still incorrect. Therefore set
-`INSTALL_RPATH` explicitly.
-
-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
-Signed-off-by: Benjamin Drung <benjamin.drung@canonical.com>
----
- CMakeLists.txt                                      |  1 +
- cmake-proxies/cmake-modules/AudacityFunctions.cmake | 19 +++++++++++++++++++
- modules/CMakeLists.txt                              |  7 -------
- modules/mod-script-pipe/CMakeLists.txt              |  1 +
- src/CMakeLists.txt                                  | 10 ----------
- 5 files changed, 21 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8428c8c..b9ff631 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -389,6 +389,7 @@ set( INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" )
- set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" )
- set( _DATADIR "${CMAKE_INSTALL_DATADIR}" )
- set( _PKGLIB "${_LIBDIR}/audacity" )
-+set( _PKGMODULE "${_PKGLIB}/modules" )
- set( _PKGDATA "${_DATADIR}/audacity/" )
- set( _MANDIR "${CMAKE_INSTALL_MANDIR}" )
- set( _MODDIR "${_DEST}/modules" )
-diff --git a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
-index 47682eb..a8f144f 100644
---- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake
-+++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
-@@ -338,6 +338,17 @@ function( canonicalize_node_name var node )
-    set( "${var}" "${node}" PARENT_SCOPE )
- endfunction()
- 
-+# Call install(TARGETS...) only on Linux systems (i.e. exclude MacOS and Windows)
-+macro( install_target_linux target destination )
-+   if( NOT "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
-+      install( TARGETS "${target}" DESTINATION "${destination}" )
-+   endif()
-+endmacro()
-+
-+macro( install_audacity_module target )
-+   install_target_linux( "${target}" "${_PKGMODULE}" )
-+endmacro()
-+
- function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
-    ADDITIONAL_DEFINES ADDITIONAL_LIBRARIES LIBTYPE )
- 
-@@ -382,6 +393,7 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
-          PROPERTIES
-             PREFIX ""
-             FOLDER "modules" # for IDE organization
-+            INSTALL_RPATH "$ORIGIN/.."
-       )
-       if( CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin" )
-          add_custom_command(
-@@ -423,6 +435,7 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
-             PREFIX ""
-             FOLDER "libraries" # for IDE organization
-             INSTALL_NAME_DIR ""
-+            INSTALL_RPATH "$ORIGIN"
-             BUILD_WITH_INSTALL_NAME_DIR YES
-       )
-    endif()
-@@ -525,6 +538,12 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
-    endforeach()
-    set( GRAPH_EDGES "${GRAPH_EDGES}" PARENT_SCOPE )
- 
-+   # Note: Some modules set EXCLUDE_FROM_ALL afterwards to not be installed.
-+   # Therefore only install libraries, but not modules here.
-+   if( NOT REAL_LIBTYPE STREQUAL "MODULE" )
-+      install_target_linux( "${TARGET}" "${_PKGLIB}" )
-+   endif()
-+
-    # collect unit test targets if they are present
-    if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests")
-       add_subdirectory(tests)
-diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
-index d464383..15dead4 100644
---- a/modules/CMakeLists.txt
-+++ b/modules/CMakeLists.txt
-@@ -16,12 +16,5 @@ foreach( MODULE ${MODULES} )
-    add_subdirectory("${MODULE}")
- endforeach()
- 
--if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
--   if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
--      install( DIRECTORY "${_DEST}/modules"
--               DESTINATION "${_PKGLIB}" )
--   endif()
--endif()
--
- #propagate collected edges up to root CMakeLists.txt
- set( GRAPH_EDGES "${GRAPH_EDGES}" PARENT_SCOPE )
-diff --git a/modules/mod-script-pipe/CMakeLists.txt b/modules/mod-script-pipe/CMakeLists.txt
-index 5ee1862..ccfd50f 100644
---- a/modules/mod-script-pipe/CMakeLists.txt
-+++ b/modules/mod-script-pipe/CMakeLists.txt
-@@ -15,3 +15,4 @@ set( DEFINES
- )
- audacity_module( mod-script-pipe "${SOURCES}" "Audacity"
-    "${DEFINES}" "" )
-+install_audacity_module( mod-script-pipe )
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 7b90c1b..c5f30ad 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1621,17 +1621,7 @@ else()
-                DESTINATION "."
-                RESOURCE DESTINATION "${_APPDIR}/Resources" )
-    else()
--
-       install( TARGETS ${TARGET} RUNTIME )
--
--      install( DIRECTORY "${_DEST}/${_LIBDIR}/"
--               DESTINATION "${_LIBDIR}"
--               USE_SOURCE_PERMISSIONS
--               FILES_MATCHING PATTERN "*.so*" )
--
--      install( CODE "set( _LIBDIR \"${_LIBDIR}\")" )
--      install( SCRIPT "${CMAKE_SOURCE_DIR}/scripts/build/linux/fix_rpath.cmake" )
--
-       install( FILES "${_INTDIR}/audacity.desktop"
-                DESTINATION "${_DATADIR}/applications" )
-       install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.txt"
diff --git a/media-sound/audacity/files/audacity-3.2.3-remove-conan-threadpool.patch b/media-sound/audacity/files/audacity-3.2.3-remove-conan-threadpool.patch
deleted file mode 100644
index 1940ec8a6d9f..000000000000
--- a/media-sound/audacity/files/audacity-3.2.3-remove-conan-threadpool.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-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
-
-We pull it in manually.
----
- cmake-proxies/CMakeLists.txt | 27 +++++++++++++++++++--------
- 1 file changed, 19 insertions(+), 8 deletions(-)
-
-diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt
-index 81bbf2efd..474814f07 100644
---- a/cmake-proxies/CMakeLists.txt
-+++ b/cmake-proxies/CMakeLists.txt
-@@ -258,12 +258,22 @@ if( ${_OPT}has_networking )
-       set ( curl_ssl "openssl" )
-    endif ()
- 
--   add_conan_lib(
--      ThreadPool
--      threadpool/20140926
--      REQUIRED
--      ALWAYS_ALLOW_CONAN_FALLBACK
--   )
-+   if ( ${_OPT}has_threadpool STREQUAL "local" )
-+     # Gentoo: Hack in Portage-downloaded ThreadPool.h.
-+     # This follows somewhat-like-upstream conventions, except it doesn't use
-+     # the proxy library mechanism because there's no library.
-+     add_library ( ThreadPool::ThreadPool INTERFACE IMPORTED GLOBAL )
-+     target_include_directories ( ThreadPool::ThreadPool INTERFACE
-+       ${CMAKE_SOURCE_DIR}/lib-src/threadpool
-+     )
-+   else()
-+     add_conan_lib(
-+       ThreadPool
-+       threadpool/20140926
-+       REQUIRED
-+       ALWAYS_ALLOW_CONAN_FALLBACK
-+     )
-+   endif()
- 
-    add_conan_lib(
-       CURL
-@@ -276,8 +286,9 @@ if( ${_OPT}has_networking )
-       CONAN_OPTIONS
-          libcurl:with_ssl=${curl_ssl}
-          libcurl:shared=True
--   )
--
-+       )
-+else()
-+   set(unused "${${_OPT}has_threadpool}")
- endif()
- 
- if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
--- 
-2.39.0
-