commit:     7674806882902c2987a75dfe82815d9c65a2c03d
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 20:07:17 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 20:08:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76748068

media-sound/audacity: migrate from libav

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 media-sound/audacity/audacity-2.2.2.ebuild | 9 +++------
 media-sound/audacity/audacity-2.3.2.ebuild | 9 +++------
 media-sound/audacity/audacity-2.3.3.ebuild | 7 ++-----
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/media-sound/audacity/audacity-2.2.2.ebuild 
b/media-sound/audacity/audacity-2.2.2.ebuild
index d9ca1cb5302..414cf0f7772 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 1f561978a5f..a3ac1df60e7 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 d6f6c12ec16..d72fafa615e 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 )

Reply via email to