app-emulation/vice: migrate from libav

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

diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild b/app-emulation/vice/vice-3.4_p37498.ebuild
index 9e9f6f6462e5861dae2dbcf12dc682b638dc83f9..f14dee2dee4722b4a478a74c3c4a5c9ff67f17fb 100644 (file)
--- a/app-emulation/vice/vice-3.4_p37498.ebuild
+++ b/app-emulation/vice/vice-3.4_p37498.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
+IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
 
 RDEPEND="
@@ -26,10 +26,7 @@ RDEPEND="
                >=net-libs/libpcap-0.9.8
                >=net-libs/libnet-1.1.2.1:1.1
        )
-       ffmpeg? (
-               libav? ( media-video/libav:= )
-               !libav? ( media-video/ffmpeg:= )
-       )
+       ffmpeg? ( media-video/ffmpeg:= )
        flac? ( media-libs/flac )
        gif? ( media-libs/giflib:= )
        gtk? (

diff --git a/app-emulation/vice/vice-3.4_p37605.ebuild b/app-emulation/vice/vice-3.4_p37605.ebuild
index 46da78904065316324518c222f79d2b77fa36198..c77734211e9c130fe5bb3cf8449c7a200e3aa67f 100644 (file)
--- a/app-emulation/vice/vice-3.4_p37605.ebuild
+++ b/app-emulation/vice/vice-3.4_p37605.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame libav mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
+IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
 
 RDEPEND="
@@ -26,10 +26,7 @@ RDEPEND="
                >=net-libs/libpcap-0.9.8
                >=net-libs/libnet-1.1.2.1:1.1
        )
-       ffmpeg? (
-               libav? ( media-video/libav:= )
-               !libav? ( media-video/ffmpeg:= )
-       )
+       ffmpeg? ( media-video/ffmpeg:= )
        flac? ( media-libs/flac )
        gif? ( media-libs/giflib:= )
        gtk? (