Gentoo Archives: gentoo-commits

From: Nick Sarnie <sarnex@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-staging/
Date: Sun, 27 Mar 2022 14:55:09
Message-Id: 1648392865.6fef210b4e023ea4fb9862b80af2f9689e30d2a6.sarnex@gentoo
1 commit: 6fef210b4e023ea4fb9862b80af2f9689e30d2a6
2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 27 14:54:25 2022 +0000
4 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 27 14:54:25 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fef210b
7
8 app-emulation/wine-staging: Sync with ::wine
9
10 Package-Manager: Portage-3.0.30, Repoman-3.0.3
11 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>
12
13 app-emulation/wine-staging/wine-staging-7.5.ebuild | 7 ++++---
14 app-emulation/wine-staging/wine-staging-9999.ebuild | 1 +
15 2 files changed, 5 insertions(+), 3 deletions(-)
16
17 diff --git a/app-emulation/wine-staging/wine-staging-7.5.ebuild b/app-emulation/wine-staging/wine-staging-7.5.ebuild
18 index cf584a42b185..1ad582f1f5d0 100644
19 --- a/app-emulation/wine-staging/wine-staging-7.5.ebuild
20 +++ b/app-emulation/wine-staging/wine-staging-7.5.ebuild
21 @@ -48,7 +48,7 @@ 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 +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test +threads +truetype udev +udisks +unwind usb v4l vkd3d vulkan +X +xcomposite xinerama"
26 +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos +fontconfig +gecko gphoto2 gssapi gstreamer kerberos ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight 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 @@ -117,6 +117,7 @@ RDEPEND="${COMMON_DEPEND}
31 !app-emulation/wine:0
32 dos? ( >=games-emulation/dosbox-0.74_p20160629 )
33 gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
34 + mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
35 mono? ( app-emulation/wine-mono:7.1.1 )
36 perl? (
37 dev-lang/perl
38 @@ -275,8 +276,8 @@ pkg_pretend() {
39 # Verify OSS support
40 if use oss; then
41 if ! has_version ">=media-sound/oss-4"; then
42 - eerror "You cannot build wine with USE=oss without having support from a"
43 - eerror "FreeBSD kernel or >=media-sound/oss-4 (only available through external repos)"
44 + eerror "You cannot build wine with USE=oss without having support from"
45 + eerror ">=media-sound/oss-4 (only available through external repos)"
46 eerror
47 die
48 fi
49
50 diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild
51 index 4ca357d70437..1ad582f1f5d0 100644
52 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild
53 +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild
54 @@ -117,6 +117,7 @@ RDEPEND="${COMMON_DEPEND}
55 !app-emulation/wine:0
56 dos? ( >=games-emulation/dosbox-0.74_p20160629 )
57 gecko? ( app-emulation/wine-gecko:2.47.2[abi_x86_32?,abi_x86_64?] )
58 + mingw? ( !!>=cross-i686-w64-mingw32/binutils-2.38 !!>=cross-x86_64-w64-mingw32/binutils-2.38 )
59 mono? ( app-emulation/wine-mono:7.1.1 )
60 perl? (
61 dev-lang/perl