From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A4DB7158094 for ; Thu, 28 Jul 2022 19:08:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE333E0EF7; Thu, 28 Jul 2022 19:08:52 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A763CE0EF7 for ; Thu, 28 Jul 2022 19:08:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC43F33BEF4 for ; Thu, 28 Jul 2022 19:08:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46C4B54D for ; Thu, 28 Jul 2022 19:08:49 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1659035292.001c4e29e3651e0699213f4f7fdc537ae83204dc.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/wine-vanilla/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild app-emulation/wine-vanilla/wine-vanilla-9999.ebuild X-VCS-Directories: app-emulation/wine-vanilla/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 001c4e29e3651e0699213f4f7fdc537ae83204dc X-VCS-Branch: master Date: Thu, 28 Jul 2022 19:08:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fda84d80-ae44-4242-bd18-a37eeca25d00 X-Archives-Hash: 21e9955d0e277713c0197b19e36319b8 commit: 001c4e29e3651e0699213f4f7fdc537ae83204dc Author: Nick Sarnie gentoo org> AuthorDate: Thu Jul 28 19:04:30 2022 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Thu Jul 28 19:08:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=001c4e29 app-emulation/wine-vanilla: Merge USE flags Closes: https://bugs.gentoo.org/649594 Signed-off-by: Nick Sarnie gentoo.org> .../{wine-vanilla-9999.ebuild => wine-vanilla-7.13-r1.ebuild} | 5 ++--- app-emulation/wine-vanilla/wine-vanilla-9999.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild similarity index 97% copy from app-emulation/wine-vanilla/wine-vanilla-9999.ebuild copy to app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild index ddd54410ad78..d776771e041b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.13-r1.ebuild @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${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 pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl 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 pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl 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 ) @@ -69,7 +69,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}] @@ -326,9 +325,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-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index ddd54410ad78..d776771e041b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${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 pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl 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 pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl 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 ) @@ -69,7 +69,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}] @@ -326,9 +325,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?