[gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/

["Mikle Kolyada" <zlogene@gentoo.org>]

commit:     b485d2b35dab59326257fbd451414d7e14de7276
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 17:30:14 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 17:30:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b485d2b3

app-emulation/vice: migrate from libav

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

 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 9e9f6f6462e..f14dee2dee4 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 46da7890406..c77734211e9 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? (