Merge branch 'edge' into next

5 files changed, 75 insertions, 20 deletions

diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 8b169465397e..9ed0e456eee4 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -4,13 +4,14 @@ AUX audacity-2.2.2-midi.patch 4999 BLAKE2B 74e99c16abbd64f4f74ccc1dc4e76a156d492
 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
 DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846 SHA512 0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
 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-minsrc-2.2.2.tar.xz 8210700 BLAKE2B b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26 SHA512 8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
-EBUILD audacity-2.2.2.ebuild 3343 BLAKE2B 11ad65e95ea0a16b6434017246b0b5063c13df6821a856bcc4116de082f5a673394480a1a15e63065ccded4d8bdea786eb7988dc747440b11d5fbb6fb4504601 SHA512 80136688f1ef9a75424f24bdb98ccfbb8ad7c1dfdabd7a8ede9c4ba837de7039c2109e92fe7b1e13e5e0fa05e6f39af109bc779b20dc04af0ee96b93ba3af660
-EBUILD audacity-2.3.2.ebuild 3308 BLAKE2B 26a4dbfbfa65f793da903e9856925df8f5cfa3dab66f2af941862152769a591c1a1943f2375e4120548b7bbc31c09db1d0fa02209e8e989c4444551e7ac61170 SHA512 1635af065e989252de42db1cd9089d4584b7e4691b4bcb6541657e57abaefef13decc48f4aabee759b02b8471f5c93842336ce7abb77db66edc224b202c77f1f
-EBUILD audacity-2.3.3.ebuild 3242 BLAKE2B ac795176b5622e555db732d45e7d77c0ec5190485707c8b80c773ed0eecb9a879b67de566eb3670126780e26b3a17c99bdd972ddc25727965d970c6ee4dedfc5 SHA512 e2bced43a4be7f9464598065acc70b6c9017987999240063fcc12206b8783719b3c609965bdf3c23f0e7b42d0f5fabcfe612c1169183deead060ac75f5bba393
+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
diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild
index d9ca1cb53029..414cf0f7772c 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+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"
@@ -29,10 +29,7 @@ RDEPEND=">=app-arch/zip-2.3
 	media-libs/soxr
 	x11-libs/wxGTK:3.0[X]
 	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( >=media-video/ffmpeg-1.2:= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-1.2:= )
 	flac? ( >=media-libs/flac-1.3.1[cxx] )
 	id3tag? ( media-libs/libid3tag )
 	jack? ( virtual/jack )
diff --git a/media-sound/audacity/audacity-2.3.2.ebuild b/media-sound/audacity/audacity-2.3.2.ebuild
index 1f561978a5fe..a3ac1df60e7e 100644
--- a/media-sound/audacity/audacity-2.3.2.ebuild
+++ b/media-sound/audacity/audacity-2.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+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"
@@ -29,10 +29,7 @@ RDEPEND=">=app-arch/zip-2.3
 	media-libs/soxr
 	x11-libs/wxGTK:3.0[X]
 	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( >=media-video/ffmpeg-1.2:= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-1.2:= )
 	flac? ( >=media-libs/flac-1.3.1[cxx] )
 	id3tag? ( media-libs/libid3tag )
 	jack? ( virtual/jack )
diff --git a/media-sound/audacity/audacity-2.3.3.ebuild b/media-sound/audacity/audacity-2.3.3.ebuild
index d6f6c12ec16c..0418e4cc8654 100644
--- a/media-sound/audacity/audacity-2.3.3.ebuild
+++ b/media-sound/audacity/audacity-2.3.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~mips ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+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"
@@ -30,10 +30,7 @@ RDEPEND="dev-libs/expat
 	media-libs/soxr
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
 	alsa? ( media-libs/alsa-lib )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( >=media-video/ffmpeg-1.2:= )
-	)
+	ffmpeg? ( >=media-video/ffmpeg-1.2:= )
 	flac? ( >=media-libs/flac-1.3.1[cxx] )
 	id3tag? ( media-libs/libid3tag )
 	jack? ( virtual/jack )
@@ -58,6 +55,7 @@ BDEPEND="app-arch/unzip
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+	"${FILESDIR}"/${PN}-2.3.3-fno-common.patch
 )
 
 src_prepare() {
diff --git a/media-sound/audacity/files/audacity-2.3.3-fno-common.patch b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
new file mode 100644
index 000000000000..5b922638aa5c
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
@@ -0,0 +1,62 @@
+From bcb460e5a9af2088d8081577b324ec20d0069ed8 Mon Sep 17 00:00:00 2001
+From: Leland Lucius <github@homerow.net>
+Date: Mon, 16 Dec 2019 00:59:33 -0600
+Subject: [PATCH] Misc changes to get new Nyquist to build
+
+[backport of bd6ec9c0ed9fe94ae2f6e171969ae8a9fe45c11d]
+---
+ lib-src/libnyquist/nyquist/cmt/cmtio.h   | 4 ++--
+ lib-src/libnyquist/nyquist/cmt/userio.c  | 4 ++++
+ lib-src/libnyquist/nyquist/sys/unix/io.c | 6 +++---
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/lib-src/libnyquist/nyquist/cmt/cmtio.h b/lib-src/libnyquist/nyquist/cmt/cmtio.h
+index 3e50ad957..232862b50 100644
+--- a/lib-src/libnyquist/nyquist/cmt/cmtio.h
++++ b/lib-src/libnyquist/nyquist/cmt/cmtio.h
+@@ -1,7 +1,7 @@
+ #define NOCHAR -2
+ 
+-int IOinputfd;
+-int IOnochar;
++extern int IOinputfd;
++extern int IOnochar;
+ 
+ int IOsetup(int inputfd);
+ int IOcleanup(void);
+diff --git a/lib-src/libnyquist/nyquist/cmt/userio.c b/lib-src/libnyquist/nyquist/cmt/userio.c
+index f442376c5..a33ac98c9 100644
+--- a/lib-src/libnyquist/nyquist/cmt/userio.c
++++ b/lib-src/libnyquist/nyquist/cmt/userio.c
+@@ -153,6 +153,10 @@ extern int debug;
+ #include "xlisp.h"
+ #endif
+ 
++int     IOinputfd;      /* input file descriptor (usually 0) */
++
++int     IOnochar;       /* Value to be returned by IOgetchar()
++                           where there is no input to be had */
+ 
+ /****************************************************************************
+ *
+diff --git a/lib-src/libnyquist/nyquist/sys/unix/io.c b/lib-src/libnyquist/nyquist/sys/unix/io.c
+index 21b2abed8..f3e499c0d 100644
+--- a/lib-src/libnyquist/nyquist/sys/unix/io.c
++++ b/lib-src/libnyquist/nyquist/sys/unix/io.c
+@@ -16,10 +16,10 @@
+ #include <sgtty.h>
+ #include "cext.h"
+ 
+-int     IOinputfd;      /* input file descriptor (usually 0) */
++extern int     IOinputfd;      /* input file descriptor (usually 0) */
+ 
+-int     IOnochar;       /* Value to be returned by IOgetchar()
+-                   where there is no input to be had */
++extern int     IOnochar;       /* Value to be returned by IOgetchar()
++                                  where there is no input to be had */
+ 
+ static  struct sgttyb IOoldmodes, IOcurrentmodes;
+                 /* Initial and current tty modes */
+-- 
+2.24.1
+