From: Mikle Kolyada <zlogene@gentoo.org>
Date: Sun, 26 Apr 2020 18:26:44 +0000 (+0300)
Subject: media-video/handbrake: migrate from libav
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=556814880b332350c2af62639333757cdfeb8822;p=gentoo.git

media-video/handbrake: migrate from libav

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

diff --git a/media-video/handbrake/handbrake-1.2.2-r3.ebuild b/media-video/handbrake/handbrake-1.2.2-r3.ebuild
index a2e9041ccde2..723f649b7e26 100644
--- a/media-video/handbrake/handbrake-1.2.2-r3.ebuild
+++ b/media-video/handbrake/handbrake-1.2.2-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=6
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac nvenc x265"
+IUSE="+fdk gstreamer gtk libav-aac nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -45,8 +45,7 @@ RDEPEND="
 	media-libs/x264:=
 	media-sound/lame
 	sys-libs/zlib
-	libav? ( >=media-video/libav-12.2:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-4.1:0=[fdk?] )
+	>=media-video/ffmpeg-4.1:0=[fdk?]
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
diff --git a/media-video/handbrake/handbrake-1.3.0-r2.ebuild b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
index 2f99c1e31eb0..e7362b5877d8 100644
--- a/media-video/handbrake/handbrake-1.3.0-r2.ebuild
+++ b/media-video/handbrake/handbrake-1.3.0-r2.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac numa nvenc x265"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -47,8 +47,7 @@ RDEPEND="
 	media-libs/x264:=
 	media-sound/lame
 	sys-libs/zlib
-	libav? ( >=media-video/libav-12.2:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-4.2.1:0=[fdk?] )
+	>=media-video/ffmpeg-4.2.1:0=[fdk?]
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index c1345ae1ac6c..ed8a647b082c 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -23,7 +23,7 @@ HOMEPAGE="http://handbrake.fr/"
 LICENSE="GPL-2"
 
 SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac numa nvenc x265"
+IUSE="+fdk gstreamer gtk libav-aac numa nvenc x265"
 
 REQUIRED_USE="^^ ( fdk libav-aac )"
 
@@ -47,8 +47,7 @@ RDEPEND="
 	media-libs/x264:=
 	media-sound/lame
 	sys-libs/zlib
-	libav? ( >=media-video/libav-12.2:0=[fdk?] )
-	!libav? ( >=media-video/ffmpeg-4.2.1:0=[fdk?] )
+	>=media-video/ffmpeg-4.2.1:0=[fdk?]
 	gstreamer? (
 		media-libs/gstreamer:1.0
 		media-libs/gst-plugins-base:1.0