Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/
Date: Sat, 25 Apr 2020 20:09:17
Message-Id: 1587845313.7674806882902c2987a75dfe82815d9c65a2c03d.zlogene@gentoo
1 commit: 7674806882902c2987a75dfe82815d9c65a2c03d
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 25 20:07:17 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 25 20:08:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76748068
7
8 media-sound/audacity: migrate from libav
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 media-sound/audacity/audacity-2.2.2.ebuild | 9 +++------
14 media-sound/audacity/audacity-2.3.2.ebuild | 9 +++------
15 media-sound/audacity/audacity-2.3.3.ebuild | 7 ++-----
16 3 files changed, 8 insertions(+), 17 deletions(-)
17
18 diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild
19 index d9ca1cb5302..414cf0f7772 100644
20 --- a/media-sound/audacity/audacity-2.2.2.ebuild
21 +++ b/media-sound/audacity/audacity-2.2.2.ebuild
22 @@ -1,4 +1,4 @@
23 -# Copyright 1999-2019 Gentoo Authors
24 +# Copyright 1999-2020 Gentoo Authors
25 # Distributed under the terms of the GNU General Public License v2
26
27 EAPI=6
28 @@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
29 LICENSE="GPL-2"
30 SLOT="0"
31 KEYWORDS="amd64 ~mips ppc ppc64 x86"
32 -IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
33 +IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
34 +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
35
36 RESTRICT="test"
37 @@ -29,10 +29,7 @@ RDEPEND=">=app-arch/zip-2.3
38 media-libs/soxr
39 x11-libs/wxGTK:3.0[X]
40 alsa? ( media-libs/alsa-lib )
41 - ffmpeg? (
42 - libav? ( media-video/libav:= )
43 - !libav? ( >=media-video/ffmpeg-1.2:= )
44 - )
45 + ffmpeg? ( >=media-video/ffmpeg-1.2:= )
46 flac? ( >=media-libs/flac-1.3.1[cxx] )
47 id3tag? ( media-libs/libid3tag )
48 jack? ( virtual/jack )
49
50 diff --git a/media-sound/audacity/audacity-2.3.2.ebuild b/media-sound/audacity/audacity-2.3.2.ebuild
51 index 1f561978a5f..a3ac1df60e7 100644
52 --- a/media-sound/audacity/audacity-2.3.2.ebuild
53 +++ b/media-sound/audacity/audacity-2.3.2.ebuild
54 @@ -1,4 +1,4 @@
55 -# Copyright 1999-2019 Gentoo Authors
56 +# Copyright 1999-2020 Gentoo Authors
57 # Distributed under the terms of the GNU General Public License v2
58
59 EAPI=7
60 @@ -16,7 +16,7 @@ SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
61 LICENSE="GPL-2"
62 SLOT="0"
63 KEYWORDS="~amd64 ~mips ~x86"
64 -IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
65 +IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
66 +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
67
68 RESTRICT="test"
69 @@ -29,10 +29,7 @@ RDEPEND=">=app-arch/zip-2.3
70 media-libs/soxr
71 x11-libs/wxGTK:3.0[X]
72 alsa? ( media-libs/alsa-lib )
73 - ffmpeg? (
74 - libav? ( media-video/libav:= )
75 - !libav? ( >=media-video/ffmpeg-1.2:= )
76 - )
77 + ffmpeg? ( >=media-video/ffmpeg-1.2:= )
78 flac? ( >=media-libs/flac-1.3.1[cxx] )
79 id3tag? ( media-libs/libid3tag )
80 jack? ( virtual/jack )
81
82 diff --git a/media-sound/audacity/audacity-2.3.3.ebuild b/media-sound/audacity/audacity-2.3.3.ebuild
83 index d6f6c12ec16..d72fafa615e 100644
84 --- a/media-sound/audacity/audacity-2.3.3.ebuild
85 +++ b/media-sound/audacity/audacity-2.3.3.ebuild
86 @@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
87 LICENSE="GPL-2"
88 SLOT="0"
89 KEYWORDS="~amd64 ~mips ~x86"
90 -IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
91 +IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
92 +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis +vst"
93
94 RESTRICT="test"
95 @@ -30,10 +30,7 @@ RDEPEND="dev-libs/expat
96 media-libs/soxr
97 x11-libs/wxGTK:${WX_GTK_VER}[X]
98 alsa? ( media-libs/alsa-lib )
99 - ffmpeg? (
100 - libav? ( media-video/libav:= )
101 - !libav? ( >=media-video/ffmpeg-1.2:= )
102 - )
103 + ffmpeg? ( >=media-video/ffmpeg-1.2:= )
104 flac? ( >=media-libs/flac-1.3.1[cxx] )
105 id3tag? ( media-libs/libid3tag )
106 jack? ( virtual/jack )