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 a2e9041ccde2a178cafda790a10d42065f43657f..723f649b7e265ebab81755f7e54543e791fc030d 100644 (file)
--- 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 2f99c1e31eb05d56a2c201cc8e7e69cb5137a736..e7362b5877d8c5149a0d37b1b399e79599bdd596 100644 (file)
--- 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 c1345ae1ac6c810684de55dd4c538584708c4b9e..ed8a647b082c28498781944f063dc2a5f5b7a28d 100644 (file)
--- 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