From: Mikle Kolyada <zlogene@gentoo.org>
Date: Sat, 25 Apr 2020 17:21:15 +0000 (+0300)
Subject: kde-apps/k3b: migrate from libav
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=344ef7b1a3da57ce5c97e58ea464b56ef403fba0;p=gentoo.git

kde-apps/k3b: migrate from libav

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

diff --git a/kde-apps/k3b/k3b-19.12.3.ebuild b/kde-apps/k3b/k3b-19.12.3.ebuild
index 154711497a70..0b6e9c0f13a3 100644
--- a/kde-apps/k3b/k3b-19.12.3.ebuild
+++ b/kde-apps/k3b/k3b-19.12.3.ebuild
@@ -17,7 +17,7 @@ https://userbase.kde.org/K3b"
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
 KEYWORDS="amd64 arm64 x86"
-IUSE="dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
+IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
 
 REQUIRED_USE="
 	flac? ( taglib )
@@ -53,10 +53,7 @@ DEPEND="
 	>=dev-qt/qtxml-${QTMIN}:5
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread:= )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	flac? ( >=media-libs/flac-1.2[cxx] )
 	mp3? ( media-sound/lame )
 	mad? ( media-libs/libmad )
diff --git a/kde-apps/k3b/k3b-20.04.0.ebuild b/kde-apps/k3b/k3b-20.04.0.ebuild
index 76f61aeb976e..68fe0dac27bb 100644
--- a/kde-apps/k3b/k3b-20.04.0.ebuild
+++ b/kde-apps/k3b/k3b-20.04.0.ebuild
@@ -17,7 +17,7 @@ https://userbase.kde.org/K3b"
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
 KEYWORDS="~amd64"
-IUSE="dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
+IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
 
 REQUIRED_USE="
 	flac? ( taglib )
@@ -53,10 +53,7 @@ DEPEND="
 	>=dev-qt/qtxml-${QTMIN}:5
 	media-libs/libsamplerate
 	dvd? ( media-libs/libdvdread:= )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
+	ffmpeg? ( media-video/ffmpeg:0= )
 	flac? ( >=media-libs/flac-1.2[cxx] )
 	mp3? ( media-sound/lame )
 	mad? ( media-libs/libmad )