Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/
Date: Sun, 01 Dec 2019 13:14:56
Message-Id: 1575206068.6e6733204201bbd5b483ff445133f371379bb051.sarnex@gentoo
1 commit: 6e6733204201bbd5b483ff445133f371379bb051
2 Author: Ilya Trukhanov <lahvuun <AT> gmail <DOT> com>
3 AuthorDate: Sun Dec 1 11:30:32 2019 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 1 13:14:28 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=6e673320
7
8 app-emulation/wine-staging: remove ffmpeg USE-flag from v4.13+
9
10 Closes: https://github.com/gentoo-mirror/wine/pull/7
11
12 Package-Manager: Portage-2.3.80, Repoman-2.3.19
13 Manifest-Sign-Key: EE6A5B5CF673AC7CFDEACE807650CA33236F1992
14 Signed-off-by: Ilya Trukhanov <lahvuun <AT> gmail.com>
15 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
16
17 app-emulation/wine-staging/wine-staging-4.13.ebuild | 5 +----
18 app-emulation/wine-staging/wine-staging-4.14.ebuild | 5 +----
19 app-emulation/wine-staging/wine-staging-4.15.ebuild | 5 +----
20 app-emulation/wine-staging/wine-staging-4.16.ebuild | 5 +----
21 app-emulation/wine-staging/wine-staging-4.17.ebuild | 5 +----
22 app-emulation/wine-staging/wine-staging-4.18.ebuild | 5 +----
23 app-emulation/wine-staging/wine-staging-4.19.ebuild | 5 +----
24 app-emulation/wine-staging/wine-staging-4.20.ebuild | 5 +----
25 app-emulation/wine-staging/wine-staging-4.21.ebuild | 5 +----
26 app-emulation/wine-staging/wine-staging-9999.ebuild | 5 +----
27 10 files changed, 10 insertions(+), 40 deletions(-)
28
29 diff --git a/app-emulation/wine-staging/wine-staging-4.13.ebuild b/app-emulation/wine-staging/wine-staging-4.13.ebuild
30 index d891684..39d7be6 100644
31 --- a/app-emulation/wine-staging/wine-staging-4.13.ebuild
32 +++ b/app-emulation/wine-staging/wine-staging-4.13.ebuild
33 @@ -44,11 +44,10 @@ fi
34
35 LICENSE="LGPL-2.1"
36 SLOT="${PV}"
37 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
38 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
39 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
40 X? ( truetype )
41 elibc_glibc? ( threads )
42 - ffmpeg? ( staging )
43 osmesa? ( opengl )
44 pipelight? ( staging )
45 test? ( abi_x86_32 )
46 @@ -73,7 +72,6 @@ COMMON_DEPEND="
47 capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
48 cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
49 faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
50 - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
51 fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
52 gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
53 gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
54 @@ -443,7 +441,6 @@ multilib_src_configure() {
55 $(use_with ncurses curses)
56 $(use_with udisks dbus)
57 $(use_with faudio)
58 - $(use_with ffmpeg)
59 $(use_with fontconfig)
60 $(use_with ssl gnutls)
61 $(use_enable gecko mshtml)
62
63 diff --git a/app-emulation/wine-staging/wine-staging-4.14.ebuild b/app-emulation/wine-staging/wine-staging-4.14.ebuild
64 index 1c459ad..5d26b6d 100644
65 --- a/app-emulation/wine-staging/wine-staging-4.14.ebuild
66 +++ b/app-emulation/wine-staging/wine-staging-4.14.ebuild
67 @@ -44,11 +44,10 @@ fi
68
69 LICENSE="LGPL-2.1"
70 SLOT="${PV}"
71 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
72 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
73 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
74 X? ( truetype )
75 elibc_glibc? ( threads )
76 - ffmpeg? ( staging )
77 osmesa? ( opengl )
78 pipelight? ( staging )
79 test? ( abi_x86_32 )
80 @@ -73,7 +72,6 @@ COMMON_DEPEND="
81 capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
82 cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
83 faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
84 - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
85 fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
86 gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
87 gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
88 @@ -443,7 +441,6 @@ multilib_src_configure() {
89 $(use_with ncurses curses)
90 $(use_with udisks dbus)
91 $(use_with faudio)
92 - $(use_with ffmpeg)
93 $(use_with fontconfig)
94 $(use_with ssl gnutls)
95 $(use_enable gecko mshtml)
96
97 diff --git a/app-emulation/wine-staging/wine-staging-4.15.ebuild b/app-emulation/wine-staging/wine-staging-4.15.ebuild
98 index 1c459ad..5d26b6d 100644
99 --- a/app-emulation/wine-staging/wine-staging-4.15.ebuild
100 +++ b/app-emulation/wine-staging/wine-staging-4.15.ebuild
101 @@ -44,11 +44,10 @@ fi
102
103 LICENSE="LGPL-2.1"
104 SLOT="${PV}"
105 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
106 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
107 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
108 X? ( truetype )
109 elibc_glibc? ( threads )
110 - ffmpeg? ( staging )
111 osmesa? ( opengl )
112 pipelight? ( staging )
113 test? ( abi_x86_32 )
114 @@ -73,7 +72,6 @@ COMMON_DEPEND="
115 capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
116 cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
117 faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
118 - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
119 fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
120 gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
121 gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
122 @@ -443,7 +441,6 @@ multilib_src_configure() {
123 $(use_with ncurses curses)
124 $(use_with udisks dbus)
125 $(use_with faudio)
126 - $(use_with ffmpeg)
127 $(use_with fontconfig)
128 $(use_with ssl gnutls)
129 $(use_enable gecko mshtml)
130
131 diff --git a/app-emulation/wine-staging/wine-staging-4.16.ebuild b/app-emulation/wine-staging/wine-staging-4.16.ebuild
132 index 1c459ad..5d26b6d 100644
133 --- a/app-emulation/wine-staging/wine-staging-4.16.ebuild
134 +++ b/app-emulation/wine-staging/wine-staging-4.16.ebuild
135 @@ -44,11 +44,10 @@ fi
136
137 LICENSE="LGPL-2.1"
138 SLOT="${PV}"
139 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
140 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
141 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
142 X? ( truetype )
143 elibc_glibc? ( threads )
144 - ffmpeg? ( staging )
145 osmesa? ( opengl )
146 pipelight? ( staging )
147 test? ( abi_x86_32 )
148 @@ -73,7 +72,6 @@ COMMON_DEPEND="
149 capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
150 cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
151 faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
152 - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
153 fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
154 gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
155 gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
156 @@ -443,7 +441,6 @@ multilib_src_configure() {
157 $(use_with ncurses curses)
158 $(use_with udisks dbus)
159 $(use_with faudio)
160 - $(use_with ffmpeg)
161 $(use_with fontconfig)
162 $(use_with ssl gnutls)
163 $(use_enable gecko mshtml)
164
165 diff --git a/app-emulation/wine-staging/wine-staging-4.17.ebuild b/app-emulation/wine-staging/wine-staging-4.17.ebuild
166 index 2d1bd8b..4376738 100644
167 --- a/app-emulation/wine-staging/wine-staging-4.17.ebuild
168 +++ b/app-emulation/wine-staging/wine-staging-4.17.ebuild
169 @@ -44,11 +44,10 @@ fi
170
171 LICENSE="LGPL-2.1"
172 SLOT="${PV}"
173 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
174 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
175 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
176 X? ( truetype )
177 elibc_glibc? ( threads )
178 - ffmpeg? ( staging )
179 osmesa? ( opengl )
180 pipelight? ( staging )
181 test? ( abi_x86_32 )
182 @@ -73,7 +72,6 @@ COMMON_DEPEND="
183 capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
184 cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
185 faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
186 - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
187 fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
188 gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
189 gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
190 @@ -443,7 +441,6 @@ multilib_src_configure() {
191 $(use_with ncurses curses)
192 $(use_with udisks dbus)
193 $(use_with faudio)
194 - $(use_with ffmpeg)
195 $(use_with fontconfig)
196 $(use_with ssl gnutls)
197 $(use_enable gecko mshtml)
198
199 diff --git a/app-emulation/wine-staging/wine-staging-4.18.ebuild b/app-emulation/wine-staging/wine-staging-4.18.ebuild
200 index 2d1bd8b..4376738 100644
201 --- a/app-emulation/wine-staging/wine-staging-4.18.ebuild
202 +++ b/app-emulation/wine-staging/wine-staging-4.18.ebuild
203 @@ -44,11 +44,10 @@ fi
204
205 LICENSE="LGPL-2.1"
206 SLOT="${PV}"
207 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
208 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
209 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
210 X? ( truetype )
211 elibc_glibc? ( threads )
212 - ffmpeg? ( staging )
213 osmesa? ( opengl )
214 pipelight? ( staging )
215 test? ( abi_x86_32 )
216 @@ -73,7 +72,6 @@ COMMON_DEPEND="
217 capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
218 cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
219 faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
220 - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
221 fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
222 gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
223 gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
224 @@ -443,7 +441,6 @@ multilib_src_configure() {
225 $(use_with ncurses curses)
226 $(use_with udisks dbus)
227 $(use_with faudio)
228 - $(use_with ffmpeg)
229 $(use_with fontconfig)
230 $(use_with ssl gnutls)
231 $(use_enable gecko mshtml)
232
233 diff --git a/app-emulation/wine-staging/wine-staging-4.19.ebuild b/app-emulation/wine-staging/wine-staging-4.19.ebuild
234 index 2d1bd8b..4376738 100644
235 --- a/app-emulation/wine-staging/wine-staging-4.19.ebuild
236 +++ b/app-emulation/wine-staging/wine-staging-4.19.ebuild
237 @@ -44,11 +44,10 @@ fi
238
239 LICENSE="LGPL-2.1"
240 SLOT="${PV}"
241 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
242 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
243 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
244 X? ( truetype )
245 elibc_glibc? ( threads )
246 - ffmpeg? ( staging )
247 osmesa? ( opengl )
248 pipelight? ( staging )
249 test? ( abi_x86_32 )
250 @@ -73,7 +72,6 @@ COMMON_DEPEND="
251 capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
252 cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
253 faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
254 - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
255 fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
256 gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
257 gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
258 @@ -443,7 +441,6 @@ multilib_src_configure() {
259 $(use_with ncurses curses)
260 $(use_with udisks dbus)
261 $(use_with faudio)
262 - $(use_with ffmpeg)
263 $(use_with fontconfig)
264 $(use_with ssl gnutls)
265 $(use_enable gecko mshtml)
266
267 diff --git a/app-emulation/wine-staging/wine-staging-4.20.ebuild b/app-emulation/wine-staging/wine-staging-4.20.ebuild
268 index a2a1c58..018e0d7 100644
269 --- a/app-emulation/wine-staging/wine-staging-4.20.ebuild
270 +++ b/app-emulation/wine-staging/wine-staging-4.20.ebuild
271 @@ -44,11 +44,10 @@ fi
272
273 LICENSE="LGPL-2.1"
274 SLOT="${PV}"
275 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
276 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
277 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
278 X? ( truetype )
279 elibc_glibc? ( threads )
280 - ffmpeg? ( staging )
281 osmesa? ( opengl )
282 pipelight? ( staging )
283 test? ( abi_x86_32 )
284 @@ -73,7 +72,6 @@ COMMON_DEPEND="
285 capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
286 cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
287 faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
288 - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
289 fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
290 gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
291 gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
292 @@ -443,7 +441,6 @@ multilib_src_configure() {
293 $(use_with ncurses curses)
294 $(use_with udisks dbus)
295 $(use_with faudio)
296 - $(use_with ffmpeg)
297 $(use_with fontconfig)
298 $(use_with ssl gnutls)
299 $(use_enable gecko mshtml)
300
301 diff --git a/app-emulation/wine-staging/wine-staging-4.21.ebuild b/app-emulation/wine-staging/wine-staging-4.21.ebuild
302 index a2a1c58..018e0d7 100644
303 --- a/app-emulation/wine-staging/wine-staging-4.21.ebuild
304 +++ b/app-emulation/wine-staging/wine-staging-4.21.ebuild
305 @@ -44,11 +44,10 @@ fi
306
307 LICENSE="LGPL-2.1"
308 SLOT="${PV}"
309 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
310 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
311 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
312 X? ( truetype )
313 elibc_glibc? ( threads )
314 - ffmpeg? ( staging )
315 osmesa? ( opengl )
316 pipelight? ( staging )
317 test? ( abi_x86_32 )
318 @@ -73,7 +72,6 @@ COMMON_DEPEND="
319 capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
320 cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
321 faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
322 - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
323 fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
324 gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
325 gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
326 @@ -443,7 +441,6 @@ multilib_src_configure() {
327 $(use_with ncurses curses)
328 $(use_with udisks dbus)
329 $(use_with faudio)
330 - $(use_with ffmpeg)
331 $(use_with fontconfig)
332 $(use_with ssl gnutls)
333 $(use_enable gecko mshtml)
334
335 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
336 index a2a1c58..018e0d7 100644
337 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
338 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
339 @@ -44,11 +44,10 @@ fi
340
341 LICENSE="LGPL-2.1"
342 SLOT="${PV}"
343 -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio ffmpeg +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
344 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap +mono mp3 ncurses netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml"
345 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )
346 X? ( truetype )
347 elibc_glibc? ( threads )
348 - ffmpeg? ( staging )
349 osmesa? ( opengl )
350 pipelight? ( staging )
351 test? ( abi_x86_32 )
352 @@ -73,7 +72,6 @@ COMMON_DEPEND="
353 capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] )
354 cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
355 faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] )
356 - ffmpeg? ( >=media-video/ffmpeg-4:=[${MULTILIB_USEDEP}] )
357 fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] )
358 gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] )
359 gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] )
360 @@ -443,7 +441,6 @@ multilib_src_configure() {
361 $(use_with ncurses curses)
362 $(use_with udisks dbus)
363 $(use_with faudio)
364 - $(use_with ffmpeg)
365 $(use_with fontconfig)
366 $(use_with ssl gnutls)
367 $(use_enable gecko mshtml)