media-sound/audacity: drop 2.4.2-r3, 2.4.2-r4

Bug: https://bugs.gentoo.org/860441
Bug: https://bugs.gentoo.org/915226
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

12 files changed, 0 insertions, 467 deletions

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 28fe9c10d805..291b854872b1 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,5 +1,3 @@
-DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 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-sources-3.4.2.tar.gz 57499669 BLAKE2B deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5 SHA512 5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c
 DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
diff --git a/media-sound/audacity/audacity-2.4.2-r3.ebuild b/media-sound/audacity/audacity-2.4.2-r3.ebuild
deleted file mode 100644
index 1abe82ab11b8..000000000000
--- a/media-sound/audacity/audacity-2.4.2-r3.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-
-inherit cmake flag-o-matic wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://www.audacityteam.org/"
-# wget doesn't seem to work on FossHub links, so we mirror
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-	doc? ( https://dev.gentoo.org/~fordfrog/distfiles/${PN}-manual-${DOC_PV}.zip )"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
-IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
-	portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
-
-RESTRICT="test"
-
-RDEPEND="dev-libs/expat
-	media-libs/libsndfile
-	media-libs/libsoundtouch:=
-	media-libs/portaudio[alsa?]
-	media-libs/soxr
-	>=media-sound/lame-3.100-r3
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? ( media-libs/flac:=[cxx] )
-	id3tag? ( media-libs/libid3tag:= )
-	jack? ( virtual/jack )
-	lv2? (
-		dev-libs/serd
-		dev-libs/sord
-		>=media-libs/lilv-0.24.6-r2
-		media-libs/lv2
-		media-libs/sratom
-		media-libs/suil
-	)
-	mad? ( >=media-libs/libmad-0.15.1b )
-	ogg? ( media-libs/libogg )
-	portmidi? ( media-libs/portmidi )
-	sbsms? ( media-libs/libsbsms )
-	twolame? ( media-sound/twolame )
-	vamp? ( media-libs/vamp-plugin-sdk )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="portmidi? ( portsmf )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
-	"${FILESDIR}/${P}-fix-vertical-track-resizing.patch"
-	"${FILESDIR}/${P}-fix-gettimeofday.patch"
-	"${FILESDIR}/${P}-fix-metainfo.patch"
-	"${FILESDIR}/${P}-add-missing-include-portaudio.patch"
-	"${FILESDIR}/${P}-disable-ccache.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	setup-wxwidgets
-	append-cxxflags -std=gnu++14
-
-	# * always use system libraries if possible
-	# * options listed in the order that cmake-gui lists them
-	local mycmakeargs=(
-#		--disable-dynamic-loading
-		-Daudacity_lib_preference=system
-		-Daudacity_use_expat=system
-		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
-		-Daudacity_use_flac=$(usex flac system off)
-		-Daudacity_use_id3tag=$(usex id3tag system off)
-		-Daudacity_use_ladspa=$(usex ladspa)
-		-Daudacity_use_lame=system
-		-Daudacity_use_lv2=$(usex lv2 system off)
-		-Daudacity_use_mad=$(usex mad system off)
-		-Daudacity_use_midi=$(usex portmidi system off)
-		-Daudacity_use_nyquist=local
-		-Daudacity_use_ogg=$(usex ogg system off)
-		-Daudacity_use_pa_alsa=$(usex alsa)
-		-Daudacity_use_pa_jack=$(usex jack linked off)
-		-Daudacity_use_pa_oss=$(usex oss)
-		-Daudacity_use_pch=OFF
-		-Daudacity_use_portaudio=local # only 'local' option is present
-		-Daudacity_use_portmixer=$(usex portmixer local off)
-		-Daudacity_use_portsmf=$(usex portsmf local off)
-		-Daudacity_use_sbsms=$(usex sbsms local off) # no 'system' option in configuration?
-		-Daudacity_use_sndfile=system
-		-Daudacity_use_soundtouch=system
-		-Daudacity_use_soxr=system
-		-Daudacity_use_twolame=$(usex twolame system off)
-		-Daudacity_use_vamp=$(usex vamp system off)
-		-Daudacity_use_vorbis=$(usex vorbis system off)
-		-Daudacity_use_vst=$(usex vst)
-		-Daudacity_use_wxwidgets=system
-	)
-
-	cmake_src_configure
-
-	# if git is not installed, this (empty) file is not being created and the compilation fails
-	# so we create it manually
-	touch "${BUILD_DIR}/src/private/RevisionIdent.h" || die "failed to create file"
-}
-
-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,manual}
-		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
-		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
-	fi
-}
diff --git a/media-sound/audacity/audacity-2.4.2-r4.ebuild b/media-sound/audacity/audacity-2.4.2-r4.ebuild
deleted file mode 100644
index b29bbbcdba5e..000000000000
--- a/media-sound/audacity/audacity-2.4.2-r4.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-WX_GTK_VER="3.0-gtk3"
-
-inherit cmake flag-o-matic wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://www.audacityteam.org/"
-# wget doesn't seem to work on FossHub links, so we mirror
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
-	doc? ( https://dev.gentoo.org/~fordfrog/distfiles/${PN}-manual-${DOC_PV}.zip )"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
-	portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
-
-RESTRICT="test"
-
-RDEPEND="dev-libs/expat
-	media-libs/libsndfile
-	media-libs/libsoundtouch:=
-	media-libs/portaudio[alsa?]
-	media-libs/soxr
-	>=media-sound/lame-3.100-r3
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( <media-video/ffmpeg-5:= )
-	flac? ( media-libs/flac:=[cxx] )
-	id3tag? ( media-libs/libid3tag:= )
-	jack? ( virtual/jack )
-	lv2? (
-		dev-libs/serd
-		dev-libs/sord
-		>=media-libs/lilv-0.24.6-r2
-		media-libs/lv2
-		media-libs/sratom
-		media-libs/suil
-	)
-	mad? ( >=media-libs/libmad-0.15.1b )
-	ogg? ( media-libs/libogg )
-	portmidi? ( media-libs/portmidi )
-	sbsms? ( media-libs/libsbsms )
-	twolame? ( media-sound/twolame )
-	vamp? ( media-libs/vamp-plugin-sdk )
-	vorbis? ( media-libs/libvorbis )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="app-arch/unzip
-	|| ( dev-lang/nasm dev-lang/yasm )
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-REQUIRED_USE="portmidi? ( portsmf )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
-	"${FILESDIR}/${P}-fix-vertical-track-resizing.patch"
-	"${FILESDIR}/${P}-fix-gettimeofday.patch"
-	"${FILESDIR}/${P}-fix-metainfo.patch"
-	"${FILESDIR}/${P}-add-missing-include-limits.patch"
-	"${FILESDIR}/${P}-add-missing-include-portaudio.patch"
-	"${FILESDIR}/${P}-disable-ccache.patch"
-	"${FILESDIR}/${P}-fix-libflac-undefined-references.patch"
-)
-
-src_prepare() {
-	cmake_src_prepare
-}
-
-src_configure() {
-	setup-wxwidgets
-	append-cxxflags -std=gnu++14
-
-	# * always use system libraries if possible
-	# * options listed in the order that cmake-gui lists them
-	local mycmakeargs=(
-#		--disable-dynamic-loading
-		-Daudacity_lib_preference=system
-		-Daudacity_use_expat=system
-		-Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
-		-Daudacity_use_flac=$(usex flac system off)
-		-Daudacity_use_id3tag=$(usex id3tag system off)
-		-Daudacity_use_ladspa=$(usex ladspa)
-		-Daudacity_use_lame=system
-		-Daudacity_use_lv2=$(usex lv2 system off)
-		-Daudacity_use_mad=$(usex mad system off)
-		-Daudacity_use_midi=$(usex portmidi system off)
-		-Daudacity_use_nyquist=local
-		-Daudacity_use_ogg=$(usex ogg system off)
-		-Daudacity_use_pa_alsa=$(usex alsa)
-		-Daudacity_use_pa_jack=$(usex jack linked off)
-		-Daudacity_use_pa_oss=$(usex oss)
-		-Daudacity_use_pch=OFF
-		-Daudacity_use_portaudio=local # only 'local' option is present
-		-Daudacity_use_portmixer=$(usex portmixer local off)
-		-Daudacity_use_portsmf=$(usex portsmf local off)
-		-Daudacity_use_sbsms=$(usex sbsms local off) # no 'system' option in configuration?
-		-Daudacity_use_sndfile=system
-		-Daudacity_use_soundtouch=system
-		-Daudacity_use_soxr=system
-		-Daudacity_use_twolame=$(usex twolame system off)
-		-Daudacity_use_vamp=$(usex vamp system off)
-		-Daudacity_use_vorbis=$(usex vorbis system off)
-		-Daudacity_use_vst=$(usex vst)
-		-Daudacity_use_wxwidgets=system
-	)
-
-	cmake_src_configure
-
-	# if git is not installed, this (empty) file is not being created and the compilation fails
-	# so we create it manually
-	touch "${BUILD_DIR}/src/private/RevisionIdent.h" || die "failed to create file"
-}
-
-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,manual}
-		dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
-		dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
-	fi
-}
diff --git a/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch b/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch
deleted file mode 100644
index b44517fca80e..000000000000
--- a/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001
-From: Antonio Ospite <ao2@ao2.it>
-Date: Tue, 7 Nov 2017 13:06:33 +0100
-Subject: [PATCH] Fix building against the system portaudio library
-
-Building against the system portaudio results in this error:
-
-./src/AudioIO.cpp:983: undefined reference to `PaUtil_GetTime'
-audacity-AudioIO.o: In function `audacityAudioCallback(void const*, void*,
-unsigned long, PaStreamCallbackTimeInfo const*, unsigned long, void*)':
-./src/AudioIO.cpp:4630: undefined reference to `PaUtil_GetTime'
-collect2: error: ld returned 1 exit status
-Makefile:2349: recipe for target 'audacity' failed
-make[3]: *** [audacity] Error 1
-
-This is because PaUtil_GetTime is declared as a C symbol in pa_util.h
-but is resolved as a C++ symbol at link time.
-
-Audacity fixes this in the local tree with this change:
-https://github.com/audacity/audacity/commit/38fd97b8e26060332ab3e9e000a8882326a70ba7
-
-However this is not general enough for the portaudio debian package.
-
-Since PaUtil_GetTime() is the only function causing problems, just copy
-over the code where it's used.
----
- src/AudioIO.cpp | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
---- a/src/AudioIO.cpp
-+++ b/src/AudioIO.cpp
-@@ -480,8 +480,23 @@
-    #define ROUND(x) (int) ((x)+0.5)
-    //#include <string.h>
- //   #include "../lib-src/portmidi/pm_common/portmidi.h"
--   #include "../lib-src/portaudio-v19/src/common/pa_util.h"
-    #include "NoteTrack.h"
-+
-+PaTime PaUtil_GetTime( void )
-+{
-+#ifdef HAVE_MACH_ABSOLUTE_TIME
-+    return mach_absolute_time() * machSecondsConversionScaler_;
-+#elif defined(HAVE_CLOCK_GETTIME)
-+    struct timespec tp;
-+    clock_gettime(CLOCK_REALTIME, &tp);
-+    return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9);
-+#else
-+    struct timeval tv;
-+    gettimeofday( &tv, NULL );
-+    return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec;
-+#endif
-+}
-+
- #endif
- 
- #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
diff --git a/media-sound/audacity/files/audacity-2.4.2-add-missing-include-limits.patch b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-limits.patch
deleted file mode 100644
index 09fb42ad2026..000000000000
--- a/media-sound/audacity/files/audacity-2.4.2-add-missing-include-limits.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/include/audacity/Types.h
-+++ b/include/audacity/Types.h
-@@ -44,6 +44,7 @@
- 
- #include <algorithm>
- #include <functional>
-+#include <limits>
- #include <type_traits>
- #include <vector>
- #include <wx/debug.h> // for wxASSERT
diff --git a/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch
deleted file mode 100644
index 7b845bc31817..000000000000
--- a/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur a/src/AudioIOBase.cpp b/src/AudioIOBase.cpp
---- a/src/AudioIOBase.cpp	2020-06-19 15:16:47.000000000 +0000
-+++ b/src/AudioIOBase.cpp	2020-08-04 19:43:27.985734707 +0000
-@@ -21,6 +21,7 @@
- #include "prefs/RecordingPrefs.h"
- #include "widgets/MeterPanelBase.h"
- 
-+#include "portaudio.h"
- #if USE_PORTMIXER
- #include "portmixer.h"
- #endif
diff --git a/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch b/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch
deleted file mode 100644
index 03acf6a20586..000000000000
--- a/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4ff5430..9c9dbf6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -69,14 +69,6 @@ set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-proxies/cmake-modules)
- set( CMAKE_CXX_STANDARD 14 )
- 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()
--
- # Our very own project
- project( Audacity )
- 
diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch b/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch
deleted file mode 100644
index 0e6e3e5d8cb1..000000000000
--- a/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
-index 0187e39..28a5348 100644
---- a/src/AudioIO.cpp
-+++ b/src/AudioIO.cpp
-@@ -427,6 +427,7 @@ time warp info and AudioIOListener and whether the playback is looped.
- #include <math.h>
- #include <stdlib.h>
- #include <algorithm>
-+#include <sys/time.h>
- 
- #ifdef __WXMSW__
- #include <malloc.h>
diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-libflac-undefined-references.patch b/media-sound/audacity/files/audacity-2.4.2-fix-libflac-undefined-references.patch
deleted file mode 100644
index 0500f7621e45..000000000000
--- a/media-sound/audacity/files/audacity-2.4.2-fix-libflac-undefined-references.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From be29286502be6c41b76e652b02862fe987c1f49b Mon Sep 17 00:00:00 2001
-From: Matthew White <mehw.is.me@inventati.org>
-Date: Sun, 14 Apr 2024 04:03:34 +0000
-Subject: [PATCH] libflac: fix undefined references when libflac is disabled
-
-In the upstream master branch:
- - future commit 2fbfd3e0a5ab803e2072cbac1b2be685c3adcf05 disabled
-   ondemand (aka OD) in CMakeLists.txt.
- - future commit cbf1bb558e094e24cbb54c3bbd2bd45a1abbfb2a expunged
-   ondemand fully.
-
-Closes: https://bugs.gentoo.org/741969
-Closes: https://bugs.gentoo.org/884747
----
- src/CMakeLists.txt         | 6 ++++--
- src/ProjectFileManager.cpp | 4 +++-
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 93dc50c82..b2c4496ab 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -702,8 +702,10 @@ list( APPEND SOURCES
-       ondemand/ODComputeSummaryTask.h
-       ondemand/ODDecodeFFmpegTask.cpp
-       ondemand/ODDecodeFFmpegTask.h
--      ondemand/ODDecodeFlacTask.cpp
--      ondemand/ODDecodeFlacTask.h
-+      $<$<BOOL:${USE_LIBFLAC}>:
-+         ondemand/ODDecodeFlacTask.cpp
-+         ondemand/ODDecodeFlacTask.h
-+      >
-       ondemand/ODDecodeTask.cpp
-       ondemand/ODDecodeTask.h
-       ondemand/ODManager.cpp
-diff --git a/src/ProjectFileManager.cpp b/src/ProjectFileManager.cpp
-index de5eeee98..106c52c31 100644
---- a/src/ProjectFileManager.cpp
-+++ b/src/ProjectFileManager.cpp
-@@ -51,7 +51,9 @@ Paul Licameli split from AudacityProject.cpp
- #include "import/ImportMIDI.h"
- #include "commands/CommandContext.h"
- #include "ondemand/ODComputeSummaryTask.h"
-+#ifdef USE_LIBFLAC
- #include "ondemand/ODDecodeFlacTask.h"
-+#endif
- #include "ondemand/ODManager.h"
- #include "ondemand/ODTask.h"
- #include "toolbars/SelectionBar.h"
-@@ -276,7 +278,7 @@ void ProjectFileManager::EnqueueODTasks()
-          while((odFlags|createdODTasks) != createdODTasks)
-          {
-             std::unique_ptr<ODTask> newTask;
--#ifdef EXPERIMENTAL_OD_FLAC
-+#if defined(EXPERIMENTAL_OD_FLAC) && defined(USE_LIBFLAC)
-             if(!(createdODTasks&ODTask::eODFLAC) && (odFlags & ODTask::eODFLAC)) {
-                newTask = std::make_unique<ODDecodeFlacTask>();
-                createdODTasks = createdODTasks | ODTask::eODFLAC;
--- 
-2.44.0
-
diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch b/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch
deleted file mode 100644
index 09b9fd0e868b..000000000000
--- a/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt
-index 43a7714..0e8a3d8 100755
---- a/help/CMakeLists.txt
-+++ b/help/CMakeLists.txt
-@@ -40,6 +40,6 @@ if( NOT "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" )
-    install( FILES "${_SRCDIR}/audacity.1"
-             DESTINATION "${_MANDIR}/man1" )
-    install( FILES "${_SRCDIR}/audacity.appdata.xml"
--            DESTINATION "${_DATADIR}/appdata" )
-+            DESTINATION "${_DATADIR}/metainfo" )
- endif()
- 
diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch b/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch
deleted file mode 100644
index 71160b4365eb..000000000000
--- a/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/menus/ViewMenus.cpp	2020-05-27 17:49:20.645538517 +0500
-+++ b/src/menus/ViewMenus.cpp	2020-05-27 17:49:26.844538493 +0500
-@@ -4,10 +4,10 @@
- #include "../CommonCommandFlags.h"
- #include "../Menus.h"
- #include "../Prefs.h"
-+#include "../ProjectWindow.h"
- #include "../Project.h"
- #include "../ProjectHistory.h"
- #include "../ProjectSettings.h"
--#include "../ProjectWindow.h"
- #include "../Track.h"
- #include "../TrackInfo.h"
- #include "../TrackPanel.h"
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index e17276dd00ed..74f5a6715d2d 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -23,13 +23,10 @@
     <flag name="lv2">Add support for Ladspa V2</flag>
     <flag name="mpg123">Use <pkg>media-sound/mpg123-base</pkg> instead of
       <pkg>media-libs/libmad</pkg> for MPEG decoding</flag>
-    <flag name="portmidi">Enable support for MIDI via <pkg>media-libs/portmidi</pkg></flag>
     <flag name="portmixer">Enable the internal portmixer feature</flag>
-    <flag name="portsmf">Enable support for Portable Standard Midi File Library</flag>
     <flag name="sbsms">Enables sbsms library support for slower, more
       accurate pitch and tempo changing</flag>
     <flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
     <flag name="vamp">Enables vamp plugins support (Audio analysing plugins)</flag>
-    <flag name="vst">Enable VST plugin support</flag>
   </use>
 </pkgmetadata>