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/aqualung/
Date: Sun, 26 Apr 2020 10:24:29
Message-Id: 1587896630.d657fce1df748c533013697b30600483299ee1d4.zlogene@gentoo
1 commit: d657fce1df748c533013697b30600483299ee1d4
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 26 10:23:38 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 26 10:23:50 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d657fce1
7
8 media-sound/aqualung: mugrate 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/aqualung/aqualung-1.0-r2.ebuild | 9 +++------
14 media-sound/aqualung/aqualung-1.0-r3.ebuild | 9 +++------
15 2 files changed, 6 insertions(+), 12 deletions(-)
16
17 diff --git a/media-sound/aqualung/aqualung-1.0-r2.ebuild b/media-sound/aqualung/aqualung-1.0-r2.ebuild
18 index efd8ec6f801..ce1efdd4867 100644
19 --- a/media-sound/aqualung/aqualung-1.0-r2.ebuild
20 +++ b/media-sound/aqualung/aqualung-1.0-r2.ebuild
21 @@ -1,4 +1,4 @@
22 -# Copyright 1999-2017 Gentoo Foundation
23 +# Copyright 1999-2020 Gentoo Authors
24 # Distributed under the terms of the GNU General Public License v2
25
26 EAPI=6
27 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
28 LICENSE="GPL-2"
29 SLOT="0"
30 KEYWORDS="amd64 x86"
31 -IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
32 +IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
33 lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
34 vorbis wavpack"
35
36 @@ -26,10 +26,7 @@ RDEPEND="
37 alsa? ( media-libs/alsa-lib )
38 cdda? ( dev-libs/libcdio-paranoia )
39 cddb? ( media-libs/libcddb )
40 - ffmpeg? (
41 - libav? ( media-video/libav:0= )
42 - !libav? ( media-video/ffmpeg:0= )
43 - )
44 + ffmpeg? ( media-video/ffmpeg:0= )
45 flac? ( media-libs/flac )
46 ifp? ( media-libs/libifp )
47 jack? ( media-sound/jack-audio-connection-kit )
48
49 diff --git a/media-sound/aqualung/aqualung-1.0-r3.ebuild b/media-sound/aqualung/aqualung-1.0-r3.ebuild
50 index 975f08e2a44..707083c856a 100644
51 --- a/media-sound/aqualung/aqualung-1.0-r3.ebuild
52 +++ b/media-sound/aqualung/aqualung-1.0-r3.ebuild
53 @@ -1,4 +1,4 @@
54 -# Copyright 1999-2019 Gentoo Authors
55 +# Copyright 1999-2020 Gentoo Authors
56 # Distributed under the terms of the GNU General Public License v2
57
58 EAPI=7
59 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz"
60 LICENSE="GPL-2"
61 SLOT="0"
62 KEYWORDS="~amd64 ~x86"
63 -IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate
64 +IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate
65 lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray
66 vorbis wavpack"
67
68 @@ -30,10 +30,7 @@ RDEPEND="
69 alsa? ( media-libs/alsa-lib )
70 cdda? ( dev-libs/libcdio-paranoia )
71 cddb? ( media-libs/libcddb )
72 - ffmpeg? (
73 - libav? ( media-video/libav:0= )
74 - !libav? ( media-video/ffmpeg:0= )
75 - )
76 + ffmpeg? ( media-video/ffmpeg:0= )
77 flac? ( media-libs/flac )
78 ifp? ( media-libs/libifp )
79 jack? ( media-sound/jack-audio-connection-kit )