Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/vice/
Date: Sat, 25 Apr 2020 17:30:59
Message-Id: 1587835851.b485d2b35dab59326257fbd451414d7e14de7276.zlogene@gentoo
1 commit: b485d2b35dab59326257fbd451414d7e14de7276
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 25 17:30:14 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 25 17:30:51 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b485d2b3
7
8 app-emulation/vice: migrate from libav
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 app-emulation/vice/vice-3.4_p37498.ebuild | 7 ++-----
14 app-emulation/vice/vice-3.4_p37605.ebuild | 7 ++-----
15 2 files changed, 4 insertions(+), 10 deletions(-)
16
17 diff --git a/app-emulation/vice/vice-3.4_p37498.ebuild b/app-emulation/vice/vice-3.4_p37498.ebuild
18 index 9e9f6f6462e..f14dee2dee4 100644
19 --- a/app-emulation/vice/vice-3.4_p37498.ebuild
20 +++ b/app-emulation/vice/vice-3.4_p37498.ebuild
21 @@ -15,7 +15,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
22 LICENSE="GPL-2+"
23 SLOT="0"
24 KEYWORDS="amd64 x86"
25 -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"
26 +IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
27 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
28
29 RDEPEND="
30 @@ -26,10 +26,7 @@ RDEPEND="
31 >=net-libs/libpcap-0.9.8
32 >=net-libs/libnet-1.1.2.1:1.1
33 )
34 - ffmpeg? (
35 - libav? ( media-video/libav:= )
36 - !libav? ( media-video/ffmpeg:= )
37 - )
38 + ffmpeg? ( media-video/ffmpeg:= )
39 flac? ( media-libs/flac )
40 gif? ( media-libs/giflib:= )
41 gtk? (
42
43 diff --git a/app-emulation/vice/vice-3.4_p37605.ebuild b/app-emulation/vice/vice-3.4_p37605.ebuild
44 index 46da7890406..c77734211e9 100644
45 --- a/app-emulation/vice/vice-3.4_p37605.ebuild
46 +++ b/app-emulation/vice/vice-3.4_p37605.ebuild
47 @@ -15,7 +15,7 @@ SRC_URI="https://sourceforge.net/code-snapshots/svn/v/vi/vice-emu/code/${MY_P}.z
48 LICENSE="GPL-2+"
49 SLOT="0"
50 KEYWORDS="~amd64 ~x86"
51 -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"
52 +IUSE="alsa debug doc ethernet ffmpeg flac gif +gtk headless ipv6 jpeg lame mpg123 ogg oss +opengl parport pci png portaudio pulseaudio sdl zlib"
53 REQUIRED_USE="|| ( gtk headless sdl ) gtk? ( zlib )"
54
55 RDEPEND="
56 @@ -26,10 +26,7 @@ RDEPEND="
57 >=net-libs/libpcap-0.9.8
58 >=net-libs/libnet-1.1.2.1:1.1
59 )
60 - ffmpeg? (
61 - libav? ( media-video/libav:= )
62 - !libav? ( media-video/ffmpeg:= )
63 - )
64 + ffmpeg? ( media-video/ffmpeg:= )
65 flac? ( media-libs/flac )
66 gif? ( media-libs/giflib:= )
67 gtk? (