media-video/x264-encoder: 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/x264-encoder/x264-encoder-0.0.20190214.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
index a597d419a8137036892a021653571a61f3128090..893ddce8fed181c04380ad32185493fc32ab21c3 100644 (file)
--- a/media-video/x264-encoder/x264-encoder-0.0.20190214.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190214.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
@@ -20,16 +20,13 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
 
 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
 
 RDEPEND="
        ~media-libs/x264-${PV}[interlaced=,threads=]
-       ffmpeg? (
-               !libav? ( media-video/ffmpeg:= )
-               libav? ( media-video/libav:= )
-       )
+       ffmpeg? ( media-video/ffmpeg:= )
        ffmpegsource? ( media-libs/ffmpegsource )
        mp4? ( >=media-video/gpac-0.5.2:= )"
 

diff --git a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
index 6ad1f8d7a6c71f0f80e094038d9296b68b10a9aa..18dccd367cb042a3ff71840bd4e5bdd580fe5df5 100644 (file)
--- a/media-video/x264-encoder/x264-encoder-0.0.20190903.ebuild
+++ b/media-video/x264-encoder/x264-encoder-0.0.20190903.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
@@ -20,16 +20,13 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
 
 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
 
 RDEPEND="
        ~media-libs/x264-${PV}[interlaced=,threads=]
-       ffmpeg? (
-               !libav? ( media-video/ffmpeg:= )
-               libav? ( media-video/libav:= )
-       )
+       ffmpeg? ( media-video/ffmpeg:= )
        ffmpegsource? ( media-libs/ffmpegsource )
        mp4? ( >=media-video/gpac-0.5.2:= )"
 

diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild
index 6ad1f8d7a6c71f0f80e094038d9296b68b10a9aa..18dccd367cb042a3ff71840bd4e5bdd580fe5df5 100644 (file)
--- a/media-video/x264-encoder/x264-encoder-9999.ebuild
+++ b/media-video/x264-encoder/x264-encoder-9999.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
@@ -20,16 +20,13 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced libav mp4 +threads"
+IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads"
 
 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
 
 RDEPEND="
        ~media-libs/x264-${PV}[interlaced=,threads=]
-       ffmpeg? (
-               !libav? ( media-video/ffmpeg:= )
-               libav? ( media-video/libav:= )
-       )
+       ffmpeg? ( media-video/ffmpeg:= )
        ffmpegsource? ( media-libs/ffmpegsource )
        mp4? ( >=media-video/gpac-0.5.2:= )"