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 832B0158086 for ; Sat, 6 Nov 2021 21:49:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 61ED52BC08E; Sat, 6 Nov 2021 21:49:55 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 396A92BC08E for ; Sat, 6 Nov 2021 21:49:54 +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 456D4342E8E for ; Sat, 6 Nov 2021 21:49:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F11C5D0 for ; Sat, 6 Nov 2021 21:49:51 +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: <1636235374.ac75c62c86ace04f15b23a0d43faf9784fccbf10.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-6.21.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: ac75c62c86ace04f15b23a0d43faf9784fccbf10 X-VCS-Branch: master Date: Sat, 6 Nov 2021 21:49:51 +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: 724b04ea-4a0e-41df-995e-74bbcefd6019 X-Archives-Hash: 15e3fab61e8cf3eaaa9c95fd13e2a3d3 commit: ac75c62c86ace04f15b23a0d43faf9784fccbf10 Author: Nick Sarnie gentoo org> AuthorDate: Sat Nov 6 21:48:33 2021 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sat Nov 6 21:49:34 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac75c62c app-emulation/wine-vanilla: Sync with ::wine Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Nick Sarnie gentoo.org> .../wine-vanilla/wine-vanilla-6.21.ebuild | 27 +++++----------------- .../wine-vanilla/wine-vanilla-9999.ebuild | 27 +++++----------------- 2 files changed, 12 insertions(+), 42 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild index 5209a25f537..37f3515cb34 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.21.ebuild @@ -35,7 +35,7 @@ SRC_URI="${SRC_URI} LICENSE="LGPL-2.1" SLOT="${PV}" -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" +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" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -59,20 +59,18 @@ COMMON_DEPEND=" alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) - faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gphoto2? ( + media-libs/libgphoto2:=[${MULTILIB_USEDEP}] + virtual/jpeg: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}] ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) @@ -83,7 +81,6 @@ COMMON_DEPEND=" ) osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) @@ -97,11 +94,7 @@ COMMON_DEPEND=" vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - xml? ( - dev-libs/libxml2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - )" + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" RDEPEND="${COMMON_DEPEND} app-emulation/wine-desktop-common @@ -400,25 +393,20 @@ multilib_src_configure() { --sysconfdir="${EPREFIX}/etc/wine" $(use_with alsa) $(use_with capi) - $(use_with lcms cms) $(use_with cups) $(use_with udisks dbus) - $(use_with faudio) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) $(use_with gphoto2 gphoto) - $(use_with gsm) $(use_with gssapi) $(use_with gstreamer) --without-hal - $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) # TODO: Will bug 685172 still need special handling? $(use_with mingw) $(use_enable mono mscoree) - $(use_with mp3 mpg123) $(use_with netapi) $(use_with nls gettext) $(use_with openal) @@ -427,7 +415,6 @@ multilib_src_configure() { $(use_with osmesa) $(use_with oss) $(use_with pcap) - $(use_with png) $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) @@ -444,8 +431,6 @@ multilib_src_configure() { $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) - $(use_with xml) - $(use_with xml xslt) ) local PKG_CONFIG diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 5209a25f537..37f3515cb34 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 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" +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" REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 ) X? ( truetype ) elibc_glibc? ( threads ) @@ -59,20 +59,18 @@ COMMON_DEPEND=" alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] ) capi? ( net-libs/libcapi[${MULTILIB_USEDEP}] ) cups? ( net-print/cups:=[${MULTILIB_USEDEP}] ) - faudio? ( app-emulation/faudio:=[${MULTILIB_USEDEP}] ) fontconfig? ( media-libs/fontconfig:=[${MULTILIB_USEDEP}] ) - gphoto2? ( media-libs/libgphoto2:=[${MULTILIB_USEDEP}] ) - gsm? ( media-sound/gsm:=[${MULTILIB_USEDEP}] ) + gphoto2? ( + media-libs/libgphoto2:=[${MULTILIB_USEDEP}] + virtual/jpeg: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}] ) - jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] ) kerberos? ( virtual/krb5[${MULTILIB_USEDEP}] ) - lcms? ( media-libs/lcms:2=[${MULTILIB_USEDEP}] ) ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] ) - mp3? ( >=media-sound/mpg123-1.5.0[${MULTILIB_USEDEP}] ) netapi? ( net-fs/samba[netapi(+),${MULTILIB_USEDEP}] ) nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] ) odbc? ( dev-db/unixODBC:=[${MULTILIB_USEDEP}] ) @@ -83,7 +81,6 @@ COMMON_DEPEND=" ) osmesa? ( >=media-libs/mesa-13[osmesa,${MULTILIB_USEDEP}] ) pcap? ( net-libs/libpcap[${MULTILIB_USEDEP}] ) - png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] ) scanner? ( media-gfx/sane-backends:=[${MULTILIB_USEDEP}] ) sdl? ( media-libs/libsdl2:=[haptic,joystick,${MULTILIB_USEDEP}] ) @@ -97,11 +94,7 @@ COMMON_DEPEND=" vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) xcomposite? ( x11-libs/libXcomposite[${MULTILIB_USEDEP}] ) - xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] ) - xml? ( - dev-libs/libxml2[${MULTILIB_USEDEP}] - dev-libs/libxslt[${MULTILIB_USEDEP}] - )" + xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )" RDEPEND="${COMMON_DEPEND} app-emulation/wine-desktop-common @@ -400,25 +393,20 @@ multilib_src_configure() { --sysconfdir="${EPREFIX}/etc/wine" $(use_with alsa) $(use_with capi) - $(use_with lcms cms) $(use_with cups) $(use_with udisks dbus) - $(use_with faudio) $(use_with fontconfig) $(use_with ssl gnutls) $(use_enable gecko mshtml) $(use_with gphoto2 gphoto) - $(use_with gsm) $(use_with gssapi) $(use_with gstreamer) --without-hal - $(use_with jpeg) $(use_with kerberos krb5) $(use_with ldap) # TODO: Will bug 685172 still need special handling? $(use_with mingw) $(use_enable mono mscoree) - $(use_with mp3 mpg123) $(use_with netapi) $(use_with nls gettext) $(use_with openal) @@ -427,7 +415,6 @@ multilib_src_configure() { $(use_with osmesa) $(use_with oss) $(use_with pcap) - $(use_with png) $(use_with pulseaudio pulse) $(use_with threads pthread) $(use_with scanner sane) @@ -444,8 +431,6 @@ multilib_src_configure() { $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) - $(use_with xml) - $(use_with xml xslt) ) local PKG_CONFIG