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