From b485d2b35dab59326257fbd451414d7e14de7276 Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sat, 25 Apr 2020 20:30:14 +0300 Subject: app-emulation/vice: migrate from libav Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mikle Kolyada --- app-emulation/vice/vice-3.4_p37498.ebuild | 7 ++----- app-emulation/vice/vice-3.4_p37605.ebuild | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild b/app-emulation/vice/vice-3.4_p37498.ebuild index 9e9f6f6462e5..f14dee2dee47 100644 --- 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 46da78904065..c77734211e9c 100644 --- 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? ( -- cgit v1.2.3-65-gdbad