From d657fce1df748c533013697b30600483299ee1d4 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 26 Apr 2020 13:23:38 +0300 Subject: [PATCH] media-sound/aqualung: mugrate from libav Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada --- media-sound/aqualung/aqualung-1.0-r2.ebuild | 9 +++------ media-sound/aqualung/aqualung-1.0-r3.ebuild | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/media-sound/aqualung/aqualung-1.0-r2.ebuild b/media-sound/aqualung/aqualung-1.0-r2.ebuild index efd8ec6f8015..ce1efdd48678 100644 --- a/media-sound/aqualung/aqualung-1.0-r2.ebuild +++ b/media-sound/aqualung/aqualung-1.0-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate +IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack" @@ -26,10 +26,7 @@ RDEPEND=" alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( media-sound/jack-audio-connection-kit ) diff --git a/media-sound/aqualung/aqualung-1.0-r3.ebuild b/media-sound/aqualung/aqualung-1.0-r3.ebuild index 975f08e2a444..707083c856a2 100644 --- a/media-sound/aqualung/aqualung-1.0-r3.ebuild +++ b/media-sound/aqualung/aqualung-1.0-r3.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 @@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/aqualung/${PN}-${MY_PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libav libsamplerate +IUSE="alsa cdda cddb debug flac ffmpeg ifp jack ladspa lame libsamplerate lua mac modplug mp3 musepack oss podcast pulseaudio sndfile speex systray vorbis wavpack" @@ -30,10 +30,7 @@ RDEPEND=" alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio-paranoia ) cddb? ( media-libs/libcddb ) - ffmpeg? ( - libav? ( media-video/libav:0= ) - !libav? ( media-video/ffmpeg:0= ) - ) + ffmpeg? ( media-video/ffmpeg:0= ) flac? ( media-libs/flac ) ifp? ( media-libs/libifp ) jack? ( media-sound/jack-audio-connection-kit ) -- 2.26.2