media-video/gpac: 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/gpac/gpac-0.7.1-r1.ebuild b/media-video/gpac/gpac-0.7.1-r1.ebuild
index 3266238bf224866be0ab7038662a74e9d5ba3df4..bdac8071f899ce0b40b9affb8df813e90c5a265d 100644 (file)
--- a/media-video/gpac/gpac-0.7.1-r1.ebuild
+++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/7"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
        pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
@@ -27,10 +27,7 @@ RDEPEND="
        a52? ( media-libs/a52dec )
        aac? ( media-libs/faad2 )
        alsa? ( media-libs/alsa-lib )
-       ffmpeg? (
-               !libav? ( media-video/ffmpeg:0= )
-               libav? ( media-video/libav:0= )
-       )
+       ffmpeg? ( media-video/ffmpeg:0= )
        jack? ( virtual/jack )
        jpeg? ( virtual/jpeg:0 )
        jpeg2k? ( media-libs/openjpeg:0 )

diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
index c39142d90179662471bb3ad6b8ee58e60f9f593c..5c4fcbaddd1410284aac10899bfa07700d159161 100644 (file)
--- a/media-video/gpac/gpac-9999.ebuild
+++ b/media-video/gpac/gpac-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
 LICENSE="GPL-2"
 # subslot == libgpac major
 SLOT="0/7"
-IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
+IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
        pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
 
 RDEPEND="
@@ -27,10 +27,7 @@ RDEPEND="
        a52? ( media-libs/a52dec )
        aac? ( media-libs/faad2 )
        alsa? ( media-libs/alsa-lib )
-       ffmpeg? (
-               !libav? ( media-video/ffmpeg:0= )
-               libav? ( media-video/libav:0= )
-       )
+       ffmpeg? ( media-video/ffmpeg:0= )
        jack? ( virtual/jack )
        jpeg? ( virtual/jpeg:0 )
        jpeg2k? ( media-libs/openjpeg:0 )