net-misc/gerbera: migrate from libav

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

diff --git a/net-misc/gerbera/gerbera-1.4.0.ebuild b/net-misc/gerbera/gerbera-1.4.0.ebuild
index 122b20de3f690315b96b68718b6c2dcefeabe71d..4e1290f8ff8ec93fd38b2b91bc90ce5183b2d941 100644 (file)
--- a/net-misc/gerbera/gerbera-1.4.0.ebuild
+++ b/net-misc/gerbera/gerbera-1.4.0.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://gerbera.io"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
 
 DEPEND="
        acct-user/gerbera
@@ -34,10 +34,7 @@ DEPEND="
        lastfm? ( >=media-libs/lastfmlib-0.4 )
        exif? ( media-libs/libexif )
        exiv2? ( media-gfx/exiv2 )
-       ffmpeg? (
-               libav? ( >=media-video/libav-10:0= )
-               !libav? ( >=media-video/ffmpeg-2.2:0= )
-       )
+       ffmpeg? ( >=media-video/ffmpeg-2.2:0= )
        ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
        curl? ( net-misc/curl net-misc/youtube-dl )
        magic? ( sys-apps/file )

diff --git a/net-misc/gerbera/gerbera-9999.ebuild b/net-misc/gerbera/gerbera-9999.ebuild
index 122b20de3f690315b96b68718b6c2dcefeabe71d..11919c4298cf897df64d7ac5429813a773288203 100644 (file)
--- a/net-misc/gerbera/gerbera-9999.ebuild
+++ b/net-misc/gerbera/gerbera-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://gerbera.io"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm libav +magic +matroska mysql systemd +taglib"
+IUSE="curl debug +exif exiv2 +ffmpeg ffmpegthumbnailer +javascript lastfm +magic +matroska mysql systemd +taglib"
 
 DEPEND="
        acct-user/gerbera
@@ -34,10 +34,7 @@ DEPEND="
        lastfm? ( >=media-libs/lastfmlib-0.4 )
        exif? ( media-libs/libexif )
        exiv2? ( media-gfx/exiv2 )
-       ffmpeg? (
-               libav? ( >=media-video/libav-10:0= )
-               !libav? ( >=media-video/ffmpeg-2.2:0= )
-       )
+       ffmpeg? (  >=media-video/ffmpeg-2.2:0= )
        ffmpegthumbnailer? ( media-video/ffmpegthumbnailer )
        curl? ( net-misc/curl net-misc/youtube-dl )
        magic? ( sys-apps/file )