From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1337254-garchives=archives.gentoo.org@lists.gentoo.org> 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 4A831158087 for <garchives@archives.gentoo.org>; Sat, 6 Nov 2021 21:47:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFCEAE0953; Sat, 6 Nov 2021 21:47:54 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 17AD4E094F for <gentoo-commits@lists.gentoo.org>; Sat, 6 Nov 2021 21:47: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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04A88342E54 for <gentoo-commits@lists.gentoo.org>; Sat, 6 Nov 2021 21:47:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 58D70D0 for <gentoo-commits@lists.gentoo.org>; Sat, 6 Nov 2021 21:47:51 +0000 (UTC) From: "Nick Sarnie" <sarnex@gentoo.org> 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" <sarnex@gentoo.org> Message-ID: <1636235050.dce377840c72294a19a9ce41fa4b083325c61951.sarnex@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-vanilla/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-vanilla/wine-vanilla-6.20.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: dce377840c72294a19a9ce41fa4b083325c61951 X-VCS-Branch: master Date: Sat, 6 Nov 2021 21:47:51 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: efc92aba-cad5-4a5d-847b-8a13bb5f41cc X-Archives-Hash: 87858c06c7aa48dcf8943f6e7dcd838c commit: dce377840c72294a19a9ce41fa4b083325c61951 Author: Alex Xu (Hello71) <alex_y_xu <AT> yahoo <DOT> ca> AuthorDate: Mon Oct 25 19:38:20 2021 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Sat Nov 6 21:44:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=dce37784 app-emulation/wine-vanilla: update USE, deps for 6.20, 9999 vendored versions maybe should be split out, but for now the depends should be kept accurate. Signed-off-by: Alex Xu (Hello71) <alex_y_xu <AT> yahoo.ca> Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> .../wine-vanilla/wine-vanilla-6.20.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.20.ebuild b/app-emulation/wine-vanilla/wine-vanilla-6.20.ebuild index 5209a25..37f3515 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-6.20.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-6.20.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 5209a25..37f3515 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