| 1 |
commit: bb545ce18b5e2a620b09e9d3afeb4947eddcc7f4 |
| 2 |
Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 6 21:48:58 2021 +0000 |
| 4 |
Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 6 21:49:37 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb545ce1 |
| 7 |
|
| 8 |
app-emulation/wine-staging: 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-staging/wine-staging-6.21.ebuild | 39 ++++------------------ |
| 14 |
.../wine-staging/wine-staging-9999.ebuild | 39 ++++------------------ |
| 15 |
2 files changed, 12 insertions(+), 66 deletions(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/wine-staging/wine-staging-6.21.ebuild b/app-emulation/wine-staging/wine-staging-6.21.ebuild |
| 18 |
index a6c1ddd5392..123600cc984 100644 |
| 19 |
--- a/app-emulation/wine-staging/wine-staging-6.21.ebuild |
| 20 |
+++ b/app-emulation/wine-staging/wine-staging-6.21.ebuild |
| 21 |
@@ -48,15 +48,13 @@ fi |
| 22 |
|
| 23 |
LICENSE="LGPL-2.1" |
| 24 |
SLOT="${MY_PV}" |
| 25 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 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 +unwind usb v4l vaapi 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 pipelight prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging 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 |
osmesa? ( opengl ) |
| 31 |
pipelight? ( staging ) |
| 32 |
test? ( abi_x86_32 ) |
| 33 |
- themes? ( staging ) |
| 34 |
- vaapi? ( staging ) |
| 35 |
vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 |
| 36 |
|
| 37 |
# FIXME: the test suite is unsuitable for us; many tests require net access |
| 38 |
@@ -75,21 +73,18 @@ COMMON_DEPEND=" |
| 39 |
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
| 40 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
| 41 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
| 42 |
- faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) |
| 43 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 44 |
- gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] ) |
| 45 |
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 46 |
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 47 |
+ gphoto2? ( |
| 48 |
+ media-libs/libgphoto2:=[${MULTILIB_USEDEP}] |
| 49 |
+ virtual/jpeg:0=[${MULTILIB_USEDEP}] |
| 50 |
+ ) |
| 51 |
gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 52 |
gstreamer? ( |
| 53 |
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
| 54 |
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] |
| 55 |
) |
| 56 |
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
| 57 |
kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) |
| 58 |
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) |
| 59 |
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) |
| 60 |
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) |
| 61 |
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) |
| 62 |
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) |
| 63 |
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) |
| 64 |
@@ -100,32 +95,21 @@ COMMON_DEPEND=" |
| 65 |
) |
| 66 |
osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) |
| 67 |
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) |
| 68 |
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
| 69 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
| 70 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
| 71 |
sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
| 72 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
| 73 |
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
| 74 |
- themes? ( |
| 75 |
- dev-libs/glib:2[${MULTILIB_USEDEP}] |
| 76 |
- x11-libs/cairo[${MULTILIB_USEDEP}] |
| 77 |
- x11-libs/gtk+:3[${MULTILIB_USEDEP}] |
| 78 |
- ) |
| 79 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
| 80 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
| 81 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
| 82 |
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) |
| 83 |
usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) |
| 84 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
| 85 |
- vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) |
| 86 |
vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) |
| 87 |
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
| 88 |
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) |
| 89 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
| 90 |
- xml? ( |
| 91 |
- dev-libs/libxml2[${MULTILIB_USEDEP}] |
| 92 |
- dev-libs/libxslt[${MULTILIB_USEDEP}] |
| 93 |
- )" |
| 94 |
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" |
| 95 |
|
| 96 |
RDEPEND="${COMMON_DEPEND} |
| 97 |
app-emulation/wine-desktop-common |
| 98 |
@@ -472,26 +456,20 @@ multilib_src_configure() { |
| 99 |
--sysconfdir="${EPREFIX}/etc/wine" |
| 100 |
$(use_with alsa) |
| 101 |
$(use_with capi) |
| 102 |
- $(use_with lcms cms) |
| 103 |
$(use_with cups) |
| 104 |
$(use_with udisks dbus) |
| 105 |
- $(use_with faudio) |
| 106 |
$(use_with fontconfig) |
| 107 |
$(use_with ssl gnutls) |
| 108 |
$(use_enable gecko mshtml) |
| 109 |
- $(use_with gcrypt) |
| 110 |
$(use_with gphoto2 gphoto) |
| 111 |
- $(use_with gsm) |
| 112 |
$(use_with gssapi) |
| 113 |
$(use_with gstreamer) |
| 114 |
--without-hal |
| 115 |
- $(use_with jpeg) |
| 116 |
$(use_with kerberos krb5) |
| 117 |
$(use_with ldap) |
| 118 |
# TODO: Will bug 685172 still need special handling? |
| 119 |
$(use_with mingw) |
| 120 |
$(use_enable mono mscoree) |
| 121 |
- $(use_with mp3 mpg123) |
| 122 |
$(use_with netapi) |
| 123 |
$(use_with nls gettext) |
| 124 |
$(use_with openal) |
| 125 |
@@ -500,7 +478,6 @@ multilib_src_configure() { |
| 126 |
$(use_with osmesa) |
| 127 |
$(use_with oss) |
| 128 |
$(use_with pcap) |
| 129 |
- $(use_with png) |
| 130 |
$(use_with pulseaudio pulse) |
| 131 |
$(use_with threads pthread) |
| 132 |
$(use_with scanner sane) |
| 133 |
@@ -517,14 +494,10 @@ multilib_src_configure() { |
| 134 |
$(use_with X xfixes) |
| 135 |
$(use_with xcomposite) |
| 136 |
$(use_with xinerama) |
| 137 |
- $(use_with xml) |
| 138 |
- $(use_with xml xslt) |
| 139 |
) |
| 140 |
|
| 141 |
use staging && myconf+=( |
| 142 |
--with-xattr |
| 143 |
- $(use_with themes gtk3) |
| 144 |
- $(use_with vaapi va) |
| 145 |
) |
| 146 |
|
| 147 |
local PKG_CONFIG |
| 148 |
|
| 149 |
diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 150 |
index a6c1ddd5392..123600cc984 100644 |
| 151 |
--- a/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 152 |
+++ b/app-emulation/wine-staging/wine-staging-9999.ebuild |
| 153 |
@@ -48,15 +48,13 @@ fi |
| 154 |
|
| 155 |
LICENSE="LGPL-2.1" |
| 156 |
SLOT="${MY_PV}" |
| 157 |
-IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 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 +unwind usb v4l vaapi vkd3d vulkan +X +xcomposite xinerama +xml" |
| 158 |
+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 pipelight prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama" |
| 159 |
REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) |
| 160 |
X? ( truetype ) |
| 161 |
elibc_glibc? ( threads ) |
| 162 |
osmesa? ( opengl ) |
| 163 |
pipelight? ( staging ) |
| 164 |
test? ( abi_x86_32 ) |
| 165 |
- themes? ( staging ) |
| 166 |
- vaapi? ( staging ) |
| 167 |
vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 |
| 168 |
|
| 169 |
# FIXME: the test suite is unsuitable for us; many tests require net access |
| 170 |
@@ -75,21 +73,18 @@ COMMON_DEPEND=" |
| 171 |
alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) |
| 172 |
capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) |
| 173 |
cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) |
| 174 |
- faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) |
| 175 |
fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) |
| 176 |
- gcrypt? ( dev-libs/libgcrypt:=[${MULTILIB_USEDEP}] ) |
| 177 |
- gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) |
| 178 |
- gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) |
| 179 |
+ gphoto2? ( |
| 180 |
+ media-libs/libgphoto2:=[${MULTILIB_USEDEP}] |
| 181 |
+ virtual/jpeg:0=[${MULTILIB_USEDEP}] |
| 182 |
+ ) |
| 183 |
gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) |
| 184 |
gstreamer? ( |
| 185 |
media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] |
| 186 |
media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] |
| 187 |
) |
| 188 |
- jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) |
| 189 |
kerberos? ( virtual/krb5:0=[${MULTILIB_USEDEP}] ) |
| 190 |
- lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) |
| 191 |
ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) |
| 192 |
- mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) |
| 193 |
netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) |
| 194 |
nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) |
| 195 |
odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) |
| 196 |
@@ -100,32 +95,21 @@ COMMON_DEPEND=" |
| 197 |
) |
| 198 |
osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) |
| 199 |
pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) |
| 200 |
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) |
| 201 |
pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) |
| 202 |
scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) |
| 203 |
sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) |
| 204 |
ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) |
| 205 |
staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) |
| 206 |
- themes? ( |
| 207 |
- dev-libs/glib:2[${MULTILIB_USEDEP}] |
| 208 |
- x11-libs/cairo[${MULTILIB_USEDEP}] |
| 209 |
- x11-libs/gtk+:3[${MULTILIB_USEDEP}] |
| 210 |
- ) |
| 211 |
truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) |
| 212 |
udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) |
| 213 |
udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) |
| 214 |
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) |
| 215 |
usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) |
| 216 |
v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) |
| 217 |
- vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) |
| 218 |
vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) |
| 219 |
vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) |
| 220 |
xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) |
| 221 |
- xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) |
| 222 |
- xml? ( |
| 223 |
- dev-libs/libxml2[${MULTILIB_USEDEP}] |
| 224 |
- dev-libs/libxslt[${MULTILIB_USEDEP}] |
| 225 |
- )" |
| 226 |
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" |
| 227 |
|
| 228 |
RDEPEND="${COMMON_DEPEND} |
| 229 |
app-emulation/wine-desktop-common |
| 230 |
@@ -472,26 +456,20 @@ multilib_src_configure() { |
| 231 |
--sysconfdir="${EPREFIX}/etc/wine" |
| 232 |
$(use_with alsa) |
| 233 |
$(use_with capi) |
| 234 |
- $(use_with lcms cms) |
| 235 |
$(use_with cups) |
| 236 |
$(use_with udisks dbus) |
| 237 |
- $(use_with faudio) |
| 238 |
$(use_with fontconfig) |
| 239 |
$(use_with ssl gnutls) |
| 240 |
$(use_enable gecko mshtml) |
| 241 |
- $(use_with gcrypt) |
| 242 |
$(use_with gphoto2 gphoto) |
| 243 |
- $(use_with gsm) |
| 244 |
$(use_with gssapi) |
| 245 |
$(use_with gstreamer) |
| 246 |
--without-hal |
| 247 |
- $(use_with jpeg) |
| 248 |
$(use_with kerberos krb5) |
| 249 |
$(use_with ldap) |
| 250 |
# TODO: Will bug 685172 still need special handling? |
| 251 |
$(use_with mingw) |
| 252 |
$(use_enable mono mscoree) |
| 253 |
- $(use_with mp3 mpg123) |
| 254 |
$(use_with netapi) |
| 255 |
$(use_with nls gettext) |
| 256 |
$(use_with openal) |
| 257 |
@@ -500,7 +478,6 @@ multilib_src_configure() { |
| 258 |
$(use_with osmesa) |
| 259 |
$(use_with oss) |
| 260 |
$(use_with pcap) |
| 261 |
- $(use_with png) |
| 262 |
$(use_with pulseaudio pulse) |
| 263 |
$(use_with threads pthread) |
| 264 |
$(use_with scanner sane) |
| 265 |
@@ -517,14 +494,10 @@ multilib_src_configure() { |
| 266 |
$(use_with X xfixes) |
| 267 |
$(use_with xcomposite) |
| 268 |
$(use_with xinerama) |
| 269 |
- $(use_with xml) |
| 270 |
- $(use_with xml xslt) |
| 271 |
) |
| 272 |
|
| 273 |
use staging && myconf+=( |
| 274 |
--with-xattr |
| 275 |
- $(use_with themes gtk3) |
| 276 |
- $(use_with vaapi va) |
| 277 |
) |
| 278 |
|
| 279 |
local PKG_CONFIG |
Archives