1 |
commit: ac75c62c86ace04f15b23a0d43faf9784fccbf10 |
2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Nov 6 21:48:33 2021 +0000 |
4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Nov 6 21:49:34 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac75c62c |
7 |
|
8 |
app-emulation/wine-vanilla: Sync with ::wine |
9 |
|
10 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
11 |
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> |
12 |
|
13 |
.../wine-vanilla/wine-vanilla-6.21.ebuild | 27 +++++----------------- |
14 |
.../wine-vanilla/wine-vanilla-9999.ebuild | 27 +++++----------------- |
15 |
2 files changed, 12 insertions(+), 42 deletions(-) |
16 |
|
17 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild |
18 |
index 5209a25f537..37f3515cb34 100644 |
19 |
--- a/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild |
20 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild |
21 |
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} |
22 |
|
23 |
LICENSE="LGPL-2.1" |
24 |
SLOT="${PV}" |
25 |
-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 mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml" |
26 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos kernel_FreeBSD ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama" |
27 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
28 |
X? ( truetype ) |
29 |
elibc_glibc? ( threads ) |
30 |
@@ -59,20 +59,18 @@ COMMON_DEPEND=" |
31 |
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
32 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
33 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
34 |
- faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) |
35 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
36 |
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
37 |
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
38 |
+ gphoto2? ( |
39 |
+ media-libs/libgphoto2:=[${MULTILIB_USEDEP}] |
40 |
+ virtual/jpeg:0=[${MULTILIB_USEDEP}] |
41 |
+ ) |
42 |
gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
43 |
gstreamer? ( |
44 |
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
45 |
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] |
46 |
) |
47 |
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
48 |
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
49 |
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) |
50 |
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) |
51 |
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) |
52 |
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) |
53 |
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) |
54 |
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) |
55 |
@@ -83,7 +81,6 @@ COMMON_DEPEND=" |
56 |
) |
57 |
osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) |
58 |
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) |
59 |
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
60 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
61 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
62 |
sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
63 |
@@ -97,11 +94,7 @@ COMMON_DEPEND=" |
64 |
vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) |
65 |
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
66 |
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) |
67 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
68 |
- xml? ( |
69 |
- dev-libs/libxml2[${MULTILIB_USEDEP}] |
70 |
- dev-libs/libxslt[${MULTILIB_USEDEP}] |
71 |
- )" |
72 |
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" |
73 |
|
74 |
RDEPEND="${COMMON_DEPEND} |
75 |
app-emulation/wine-desktop-common |
76 |
@@ -400,25 +393,20 @@ multilib_src_configure() { |
77 |
--sysconfdir="${EPREFIX}/etc/wine" |
78 |
$(use_with alsa) |
79 |
$(use_with capi) |
80 |
- $(use_with lcms cms) |
81 |
$(use_with cups) |
82 |
$(use_with udisks dbus) |
83 |
- $(use_with faudio) |
84 |
$(use_with fontconfig) |
85 |
$(use_with ssl gnutls) |
86 |
$(use_enable gecko mshtml) |
87 |
$(use_with gphoto2 gphoto) |
88 |
- $(use_with gsm) |
89 |
$(use_with gssapi) |
90 |
$(use_with gstreamer) |
91 |
--without-hal |
92 |
- $(use_with jpeg) |
93 |
$(use_with kerberos krb5) |
94 |
$(use_with ldap) |
95 |
# TODO: Will bug 685172 still need special handling? |
96 |
$(use_with mingw) |
97 |
$(use_enable mono mscoree) |
98 |
- $(use_with mp3 mpg123) |
99 |
$(use_with netapi) |
100 |
$(use_with nls gettext) |
101 |
$(use_with openal) |
102 |
@@ -427,7 +415,6 @@ multilib_src_configure() { |
103 |
$(use_with osmesa) |
104 |
$(use_with oss) |
105 |
$(use_with pcap) |
106 |
- $(use_with png) |
107 |
$(use_with pulseaudio pulse) |
108 |
$(use_with threads pthread) |
109 |
$(use_with scanner sane) |
110 |
@@ -444,8 +431,6 @@ multilib_src_configure() { |
111 |
$(use_with X xfixes) |
112 |
$(use_with xcomposite) |
113 |
$(use_with xinerama) |
114 |
- $(use_with xml) |
115 |
- $(use_with xml xslt) |
116 |
) |
117 |
|
118 |
local PKG_CONFIG |
119 |
|
120 |
diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
121 |
index 5209a25f537..37f3515cb34 100644 |
122 |
--- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
123 |
+++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild |
124 |
@@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} |
125 |
|
126 |
LICENSE="LGPL-2.1" |
127 |
SLOT="${PV}" |
128 |
-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 mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama +xml" |
129 |
+IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +fontconfig +gecko gphoto2 gssapi gstreamer kerberos kernel_FreeBSD ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama" |
130 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
131 |
X? ( truetype ) |
132 |
elibc_glibc? ( threads ) |
133 |
@@ -59,20 +59,18 @@ COMMON_DEPEND=" |
134 |
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
135 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
136 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
137 |
- faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) |
138 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
139 |
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
140 |
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
141 |
+ gphoto2? ( |
142 |
+ media-libs/libgphoto2:=[${MULTILIB_USEDEP}] |
143 |
+ virtual/jpeg:0=[${MULTILIB_USEDEP}] |
144 |
+ ) |
145 |
gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
146 |
gstreamer? ( |
147 |
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
148 |
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] |
149 |
) |
150 |
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
151 |
kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
152 |
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) |
153 |
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) |
154 |
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) |
155 |
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) |
156 |
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) |
157 |
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) |
158 |
@@ -83,7 +81,6 @@ COMMON_DEPEND=" |
159 |
) |
160 |
osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) |
161 |
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) |
162 |
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
163 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
164 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
165 |
sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
166 |
@@ -97,11 +94,7 @@ COMMON_DEPEND=" |
167 |
vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) |
168 |
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
169 |
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) |
170 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
171 |
- xml? ( |
172 |
- dev-libs/libxml2[${MULTILIB_USEDEP}] |
173 |
- dev-libs/libxslt[${MULTILIB_USEDEP}] |
174 |
- )" |
175 |
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" |
176 |
|
177 |
RDEPEND="${COMMON_DEPEND} |
178 |
app-emulation/wine-desktop-common |
179 |
@@ -400,25 +393,20 @@ multilib_src_configure() { |
180 |
--sysconfdir="${EPREFIX}/etc/wine" |
181 |
$(use_with alsa) |
182 |
$(use_with capi) |
183 |
- $(use_with lcms cms) |
184 |
$(use_with cups) |
185 |
$(use_with udisks dbus) |
186 |
- $(use_with faudio) |
187 |
$(use_with fontconfig) |
188 |
$(use_with ssl gnutls) |
189 |
$(use_enable gecko mshtml) |
190 |
$(use_with gphoto2 gphoto) |
191 |
- $(use_with gsm) |
192 |
$(use_with gssapi) |
193 |
$(use_with gstreamer) |
194 |
--without-hal |
195 |
- $(use_with jpeg) |
196 |
$(use_with kerberos krb5) |
197 |
$(use_with ldap) |
198 |
# TODO: Will bug 685172 still need special handling? |
199 |
$(use_with mingw) |
200 |
$(use_enable mono mscoree) |
201 |
- $(use_with mp3 mpg123) |
202 |
$(use_with netapi) |
203 |
$(use_with nls gettext) |
204 |
$(use_with openal) |
205 |
@@ -427,7 +415,6 @@ multilib_src_configure() { |
206 |
$(use_with osmesa) |
207 |
$(use_with oss) |
208 |
$(use_with pcap) |
209 |
- $(use_with png) |
210 |
$(use_with pulseaudio pulse) |
211 |
$(use_with threads pthread) |
212 |
$(use_with scanner sane) |
213 |
@@ -444,8 +431,6 @@ multilib_src_configure() { |
214 |
$(use_with X xfixes) |
215 |
$(use_with xcomposite) |
216 |
$(use_with xinerama) |
217 |
- $(use_with xml) |
218 |
- $(use_with xml xslt) |
219 |
) |
220 |
|
221 |
local PKG_CONFIG |