commit: 01a0702e33a51407ef70d102fbc79111b32bd3fb Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Thu Jul 28 19:06:26 2022 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Thu Jul 28 19:08:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01a0702e
app-emulation/wine-staging: Merge USE flags Bug: https://bugs.gentoo.org/649594 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> .../{wine-staging-9999.ebuild => wine-staging-7.13-r1.ebuild} | 5 ++--- app-emulation/wine-staging/wine-staging-9999.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-7.13-r1.ebuild similarity index 97% copy from app-emulation/wine-staging/wine-staging-9999.ebuild copy to app-emulation/wine-staging/wine-staging-7.13-r1.ebuild index 7c7e3938e005..86f05a0bdc36 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-7.13-r1.ebuild @@ -48,7 +48,7 @@ fi LICENSE="LGPL-2.1" SLOT="${MY_PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw 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 vulkan +X +xcomposite xinerama" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 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 vulkan +X +xcomposite xinerama" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) crossdev-mingw? ( mingw ) @@ -83,7 +83,6 @@ COMMON_DEPEND=" media-libs/libgphoto2:=[${MULTILIB_USEDEP}] media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] ) - gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] @@ -389,9 +388,9 @@ multilib_src_configure() { $(use_with ssl gnutls) $(use_enable gecko mshtml) $(use_with gphoto2 gphoto) - $(use_with gssapi) $(use_with gstreamer) --enable-hal + $(use_with kerberos gssapi) $(use_with kerberos krb5) $(use_with ldap) # TODO: Will bug 685172 still need special handling? diff --git a/app-emulation/wine-staging/wine-staging-9999.ebuild b/app-emulation/wine-staging/wine-staging-9999.ebuild index 7c7e3938e005..86f05a0bdc36 100644 --- a/app-emulation/wine-staging/wine-staging-9999.ebuild +++ b/app-emulation/wine-staging/wine-staging-9999.ebuild @@ -48,7 +48,7 @@ fi LICENSE="LGPL-2.1" SLOT="${MY_PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw 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 vulkan +X +xcomposite xinerama" +IUSE="+abi_x86_32 +abi_x86_64 +alsa capi crossdev-mingw cups custom-cflags dos +fontconfig +gecko gphoto2 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 vulkan +X +xcomposite xinerama" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) crossdev-mingw? ( mingw ) @@ -83,7 +83,6 @@ COMMON_DEPEND=" media-libs/libgphoto2:=[${MULTILIB_USEDEP}] media-libs/libjpeg-turbo:0=[${MULTILIB_USEDEP}] ) - gssapi? ( virtual/krb5[${MULTILIB_USEDEP}] ) gstreamer? ( media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] media-plugins/gst-plugins-meta:1.0[${MULTILIB_USEDEP}] @@ -389,9 +388,9 @@ multilib_src_configure() { $(use_with ssl gnutls) $(use_enable gecko mshtml) $(use_with gphoto2 gphoto) - $(use_with gssapi) $(use_with gstreamer) --enable-hal + $(use_with kerberos gssapi) $(use_with kerberos krb5) $(use_with ldap) # TODO: Will bug 685172 still need special handling?
