gentoo resync : 25.08.2020

10 files changed, 186 insertions, 271 deletions

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 9ed0e456eee4..815143f6da6f 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,17 +1,19 @@
 AUX audacity-2.2.1-portmixer.patch 776 BLAKE2B 18e5e3a3394c2a56afd9314993bde41376a59bc7c480b159ca9d14ff812f507de32018d5b28ee9a2cdd4f3b5f1a6e420e85f3d8660c0fa0e28941f6fdce9fb6a SHA512 f00fdd46150181873bc4aa24f95b3491471198429f47fae2d4f79f0f360a642adf94936dcf63bb02e84f9581d87c05dc8d93ed37eddaf43e31d900d505b50805
 AUX audacity-2.2.2-automake.patch 916 BLAKE2B 8de3bb400bebcfcd1b2e51ce8ada2d24e9524b56219f31bd9181e6c6c6c7382aee3d32bfb2024b7d3155f9f2464c541c5e12c7e395ce3fd9197234db8347b4d1 SHA512 2e89f45595674c3388648a6aeac4f43b82fdda2f5ba8efda2d2d98a11be2a76cab5cd0d8a87d8e581810a6ed3984d88b01e7462b51544dea550952ab563defca
 AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492e0f8d929e8e47bf12f574741fdf052ad7c9b780fb8c578790c505990d42712239470bacc5ba132dbdcb8fa3bc78 SHA512 5c0f9ca7d25ac2c15cc12a643408066eb7b320fb7c1476d9169be25128b3a4b682ed77e9d101923c7c6df187571874b9e67635d98472e875b7520053909b271a
-AUX audacity-2.3.2-Fix-building-without-midi.patch 1845 BLAKE2B 482cf34d9a43d7fcd9b9104ad5e5a0a5ebe5b744cbc9cd9f2e267e591c822781acf601c355665a0bdb95ee94a758eac72fe4d74b6f9f72cb48b40c7f0cd0a2ac SHA512 d2fcf0c57a7c9a13a15daf6c901430e114193c0cdf395fbacaaf10be6717a6c74dcb1284ede3d12eca1c418f2948483f84fc75c78e80176531c3adbfbbeeae31
-AUX audacity-2.3.2-fix_building_against_system_portaudio.patch 1991 BLAKE2B 2e9609542728d3d5c80471d95a49f3051c061a3a06290820db90a0cad346c759c666ae66a36c26b7005f727f73049c40423fbb2c86c6492f0b89023c80972bf1 SHA512 7b7612249ec7f1eb765fd40b15b89e90fe7e251cd6a49d54643c43e8e2ab6e319b5a49c8432abe6d2440a610a306c6553538835a018ecb0c832aab88cc3f033a
 AUX audacity-2.3.3-Fix-building-against-system-portaudio.patch 1952 BLAKE2B 9a5ef294d55dfe226175d2fdd8b23a9a4e6b3e963c26b9d4d8b430054dba5c39c6ae97f911b720dc53af5173c6a639275dd119c5292f53164e749782fa8f1e46 SHA512 ff85a33922bed3a626dd82c71406d81ac59c36dc45e5d2164662aabcd14a859479304cf684b9f64d0b110a9a1a82042b130c21e820ebd4c917fd9094c0737ed2
 AUX audacity-2.3.3-fno-common.patch 2232 BLAKE2B eeaa5452a3da08bb4ba22965ad9a3ce77b838e9177d4cc53c630865bd91dfd1d348dcd4128b20f875e9a50d9ec19fb6e371cf28bf059072437480f71c7225f1a SHA512 3f534101b6194b4f557b88cdf96ae91cc3e2c86ef387ba5ccc33aa192212074eb018de9dd2d459518133baf9f46c1c8d499d74ae00b593a26b904ac3d288a700
-DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B 968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802 SHA512 a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
+AUX audacity-2.4.2-add-missing-include-portaudio.patch 346 BLAKE2B 51b3a09a2ed616364f7ded02663bd0a527a12d088e514fa494f7324756263cd73713a50391f3895366c3d92d491ef56d21ee380bf9c640228d5ab680328f37a8 SHA512 ccc7ebfc6453ef02b2ef4e546d8c96d45fb5ccd46a088225dc241371745bd8f39dd63b0044bfba24f1eeec70affcac29a4499f0d15a16fb4dd99eb87980fc4fa
+AUX audacity-2.4.2-fix-gettimeofday.patch 338 BLAKE2B f9deed24aca404693a0094b83ec310d7609b6989749f42b3b6304feb9d62c02436b0c4d62116b145d44d1a0ddeaf38c86794ef449393c998f5b5a062e408ed3f SHA512 d19082009dc915b28f02e3451f06e5041b68159af138ecad10641f3c59526b4ab2873e6e676b87dff0e54320b48a6254a0da434566855605ca81b747a732e952
+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
 DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846 SHA512 0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
+DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
 DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53 SHA512 a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
-DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B 6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44 SHA512 5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
 DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84 SHA512 2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
+DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
 DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
 EBUILD audacity-2.2.2.ebuild 3289 BLAKE2B ff93b28d787c0b5d25b0f87f0fae06960cf74e8e4a730e396cd7005be47267c7056a7df4c674effdfdd10a07ab71e6ff9b212069b169fa03e4f18bdbd1731456 SHA512 cdec097cb4416242580921bb3bf128b7532a79b096cee81c1b8fc5375a6020fb922e8f63bc7cf96f21fcab9f92df22d543ff0630a87d064df8952cae2895394b
-EBUILD audacity-2.3.2.ebuild 3254 BLAKE2B 7ee66453862ceb01265f240daad2eb197f0cc9ec1d6f138e79ab377c318c958c67eb9cb5c2cc46d0d92797d833f13c9b15e53599018d0171021288bab5976e0f SHA512 856e6846a7339ac05e9437953456702bc4505aa6826be9a231e4b3ad9ab045ce5a3ef5c16473195d02988dd20fd3d348a9be3c9f643fc41dc3f20a1c923e1bd6
 EBUILD audacity-2.3.3.ebuild 3232 BLAKE2B 4b0a5cb513a911a615ec96c6816c910b171da04390ed89ab76c7d7498e53342044dd206c446873c47a2f1a5b0233a92cb0d57c26f28a2684a3a9fa3020572211 SHA512 671e750ca235b472ccb95c8d0d6ae2417d10311bf6b7321e323e547ecf21e7d578e04840e032e3afaacdf8cf20976961143a8100795cae1c2b36aa1b5ce3a02b
-MISC metadata.xml 1175 BLAKE2B 4579a87e1bc8a5b420f05774e640471e859e76d0526e581d6dbfbf1f39b36462d3d87677cd98d67b458486f32c34c215c69c9318069732c722cf4ef351a7803b SHA512 5d522d5b6d837f7632f8e1bb25d13d4f134880c7ddd12c637dd1235054c234f0679d02c7b6a0e3caa0c9d20782d5621bfa312239c177e4db4298e3f38d6d80ae
+EBUILD audacity-2.4.2-r1.ebuild 3699 BLAKE2B b71220e00f54cc2c1b9c020d58d0e5949e528f35cbd489b948890a49dcac75c6ea10b23111898ebb1e7601580c42a119f90fab1b0f269aab3a13db4b87061521 SHA512 07205d550c94a73ad406af1f6cd3751f9cb4b9c2f90f6c1b5a0615572ac7dbecbc11d439ca23fbb6f6ad66e595b55710536bff86b39da2f625becac2c10b5082
+MISC metadata.xml 1343 BLAKE2B 5bd530b1826b79a7b2ed54ebe055f752b8cdeb0d4e837d184deefb4ce8a2395e243d690bb0775d4e022d990533b55c9c6d7fed1c60c213e09fe351e161530b36 SHA512 ff75ba648bbbcff37e9529b8b52a1c6b86aadc8b650d6e121e1e5296514f1adeee0b52e37856c466c1c88baf7fcfcc3db6bcb935100e8a623dfd8926e697c6e5
diff --git a/media-sound/audacity/audacity-2.3.2.ebuild b/media-sound/audacity/audacity-2.3.2.ebuild
deleted file mode 100644
index a3ac1df60e7e..000000000000
--- a/media-sound/audacity/audacity-2.3.2.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.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/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
-	+lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
-
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
-	dev-libs/expat
-	>=media-libs/libsndfile-1.0.0
-	>=media-libs/portaudio-19.06.00-r2[alsa?]
-	<media-libs/portaudio-20
-	media-libs/soxr
-	x11-libs/wxGTK:3.0[X]
-	alsa? ( media-libs/alsa-lib )
-	ffmpeg? ( >=media-video/ffmpeg-1.2:= )
-	flac? ( >=media-libs/flac-1.3.1[cxx] )
-	id3tag? ( media-libs/libid3tag )
-	jack? ( virtual/jack )
-	lame? ( >=media-sound/lame-3.70 )
-	lv2? (
-		media-libs/lilv
-		media-libs/lv2
-		media-libs/suil
-	)
-	mad? ( >=media-libs/libmad-0.14.2b )
-	sbsms? ( media-libs/libsbsms )
-	soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
-	twolame? ( media-sound/twolame )
-	vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.2-fix_building_against_system_portaudio.patch
-	"${FILESDIR}"/${PN}-2.3.2-Fix-building-without-midi.patch
-)
-
-src_prepare() {
-	default
-
-	use midi || sed -i \
-		-e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
-		src/Experimental.h || die
-}
-
-src_configure() {
-	local WX_GTK_VER="3.0"
-	setup-wxwidgets
-	append-cxxflags -std=gnu++14
-
-	# * always use system libraries if possible
-	# * options listed in the order that configure --help lists them
-	local myeconfargs=(
-		--disable-dynamic-loading
-		--enable-nyquist=local
-		--enable-unicode
-		--with-expat
-		--with-lib-preference=system
-		--with-libsndfile
-		--with-libsoxr
-		--with-mod-script-pipe
-		--with-mod-nyq-bench
-		--with-portaudio
-		--with-widgetextra=local
-		--with-wx-version=${WX_GTK_VER}
-		$(use_enable cpu_flags_x86_sse sse)
-		$(use_enable ladspa)
-		$(use_enable nls)
-		$(use_enable vst)
-		$(use_with ffmpeg)
-		$(use_with flac libflac)
-		$(use_with id3tag libid3tag)
-		$(use_with lame)
-		$(use_with lv2)
-		$(use_with mad libmad)
-		$(use_with midi portmidi local)
-		$(use_with midi "" local)
-		$(use_with portmixer)
-		$(use_with sbsms)
-		$(use_with soundtouch)
-		$(use_with twolame libtwolame)
-		$(use_with vamp libvamp)
-		$(use_with vorbis libvorbis)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	# Remove bad doc install
-	rm -r "${ED}"/usr/share/doc || die
-
-	# Install our docs
-	einstalldocs
-
-	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
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild b/media-sound/audacity/audacity-2.4.2-r1.ebuild
new file mode 100644
index 000000000000..e6c8898ad225
--- /dev/null
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 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://web.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 ~mips ~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"
+)
+
+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 leaving it to the default behavior
+		-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
+}
+
+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.2-Fix-building-without-midi.patch b/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch
deleted file mode 100644
index d4ec1a7320f6..000000000000
--- a/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -urpN a/src/Track.h b/src/Track.h
---- a/src/Track.h	2019-05-04 13:38:57.000000000 +0300
-+++ b/src/Track.h	2019-08-27 19:32:36.937551831 +0300
-@@ -53,10 +53,6 @@ using WaveTrackConstArray = std::vector
- 
- using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > >;
- 
--#if defined(USE_MIDI)
--class NoteTrack;
--#endif
--
- class TrackList;
- 
- using ListOfTracks = std::list< std::shared_ptr< Track > >;
-@@ -74,9 +70,7 @@ enum class TrackKind
- {
-    None,
-    Wave,
--#if defined(USE_MIDI)
-    Note,
--#endif
-    Label,
-    Time,
-    Audio,
-diff -urpN a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp
---- a/src/menus/FileMenus.cpp	2019-05-04 13:38:57.000000000 +0300
-+++ b/src/menus/FileMenus.cpp	2019-08-27 19:32:36.939551720 +0300
-@@ -141,8 +141,6 @@ AudacityProject *DoImportMIDI(
- }
- #endif
- 
--#ifdef USE_MIDI
--
- // Menu handler functions
- 
- struct Handler : CommandHandlerObject {
-@@ -480,6 +478,7 @@ void OnImportLabels(const CommandContext
-    }
- }
- 
-+#ifdef USE_MIDI
- void OnImportMIDI(const CommandContext &context)
- {
-    auto &project = context.project;
-@@ -496,7 +495,7 @@ void OnImportMIDI(const CommandContext &
-    if (!fileName.empty())
-       DoImportMIDI(&project, fileName);
- }
--#endif
-+#endif // USE_MIDI
- 
- void OnImportRaw(const CommandContext &context)
- {
-diff -urpN a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp
---- a/src/tracks/ui/TimeShiftHandle.cpp	2019-05-04 13:38:57.000000000 +0300
-+++ b/src/tracks/ui/TimeShiftHandle.cpp	2019-08-27 19:32:36.940551665 +0300
-@@ -393,12 +393,12 @@ UIHandle::Result TimeShiftHandle::Click
-                ok = false;
-             else
-                captureClips = true;
--         },
- #ifdef USE_MIDI
-+         },
-          [&](NoteTrack *) {
-             captureClips = true;
--         }
- #endif
-+         }
-       );
- 
-    if ( ! ok )
diff --git a/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch b/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch
deleted file mode 100644
index fa785fdd6c5e..000000000000
--- a/media-sound/audacity/files/audacity-2.3.2-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
-@@ -465,8 +465,23 @@ TimeTrack and AudioIOListener and whethe
-    #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-portaudio.patch b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch
new file mode 100644
index 000000000000..7b845bc31817
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch
@@ -0,0 +1,11 @@
+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-fix-gettimeofday.patch b/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch
new file mode 100644
index 000000000000..0e6e3e5d8cb1
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch
@@ -0,0 +1,12 @@
+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-metainfo.patch b/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch
new file mode 100644
index 000000000000..09b9fd0e868b
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch
@@ -0,0 +1,12 @@
+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
new file mode 100644
index 000000000000..71160b4365eb
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch
@@ -0,0 +1,14 @@
+--- 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 b7c2db3a2bd7..7f3a6ec835ae 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -14,7 +14,9 @@
     <flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
     <flag name="lv2">Add support for Ladspa V2</flag>
     <flag name="midi">Enables MIDI support</flag>
+    <flag name="portmidi">Enable support for MIDI via media-libs/portmidi</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="soundtouch">Enables soundtouch library support for pitch and