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 26563158086 for ; 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 E9583E094F; 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 4D8B72BC08E for ; 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 27DB3342F47 for ; Sat, 6 Nov 2021 21:47:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 91E581AD for ; Sat, 6 Nov 2021 21:47: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: <1636235204.593a7fd4916c3d899a5c3bb6d02abcd5fb2ef0bf.sarnex@gentoo> Subject: [gentoo-commits] repo/proj/wine:master commit in: app-emulation/wine-staging/ X-VCS-Repository: repo/proj/wine X-VCS-Files: app-emulation/wine-staging/wine-staging-6.21.ebuild X-VCS-Directories: app-emulation/wine-staging/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: 593a7fd4916c3d899a5c3bb6d02abcd5fb2ef0bf X-VCS-Branch: master Date: Sat, 6 Nov 2021 21:47: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: 5357794c-7aab-45f5-b1f6-6b7b195ceb8d X-Archives-Hash: a3e154d783064ffd3b5815e0291ebcc8 commit: 593a7fd4916c3d899a5c3bb6d02abcd5fb2ef0bf Author: Nick Sarnie gentoo org> AuthorDate: Sat Nov 6 21:46:44 2021 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Sat Nov 6 21:46:44 2021 +0000 URL: https://gitweb.gentoo.org/repo/proj/wine.git/commit/?id=593a7fd4 app-emulation/wine-staging: Fix 6.21 deps Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Nick Sarnie gentoo.org> .../wine-staging/wine-staging-6.21.ebuild | 39 ++++------------------ 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/app-emulation/wine-staging/wine-staging-6.21.ebuild b/app-emulation/wine-staging/wine-staging-6.21.ebuild index a6c1ddd..123600c 100644 --- a/app-emulation/wine-staging/wine-staging-6.21.ebuild +++ b/app-emulation/wine-staging/wine-staging-6.21.ebuild @@ -48,15 +48,13 @@ fi LICENSE="LGPL-2.1" SLOT="${MY_PV}" -IUSE="+abi_x86_32 +abi_x86_64 +alsa capi cups custom-cflags dos elibc_glibc +faudio +fontconfig +gcrypt +gecko gphoto2 gsm gssapi gstreamer +jpeg kerberos kernel_FreeBSD +lcms ldap mingw +mono mp3 netapi nls odbc openal opencl +opengl osmesa oss +perl pcap pipelight +png prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging test themes +threads +truetype udev +udisks +unwind usb v4l vaapi 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 pipelight prelink pulseaudio +realtime +run-exes samba scanner sdl selinux +ssl staging 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 ) osmesa? ( opengl ) pipelight? ( staging ) test? ( abi_x86_32 ) - themes? ( staging ) - vaapi? ( staging ) vkd3d? ( vulkan )" # osmesa-opengl #286560 # X-truetype #551124 # FIXME: the test suite is unsuitable for us; many tests require net access @@ -75,21 +73,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}] ) - gcrypt? ( dev-libs/libgcrypt:=[${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:0=[${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}] ) @@ -100,32 +95,21 @@ 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}] ) ssl? ( net-libs/gnutls:=[${MULTILIB_USEDEP}] ) staging? ( sys-apps/attr[${MULTILIB_USEDEP}] ) - themes? ( - dev-libs/glib:2[${MULTILIB_USEDEP}] - x11-libs/cairo[${MULTILIB_USEDEP}] - x11-libs/gtk+:3[${MULTILIB_USEDEP}] - ) truetype? ( >=media-libs/freetype-2.0.0[${MULTILIB_USEDEP}] ) udev? ( virtual/libudev:=[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vaapi? ( x11-libs/libva[X,${MULTILIB_USEDEP}] ) 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 @@ -472,26 +456,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 gcrypt) $(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) @@ -500,7 +478,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) @@ -517,14 +494,10 @@ multilib_src_configure() { $(use_with X xfixes) $(use_with xcomposite) $(use_with xinerama) - $(use_with xml) - $(use_with xml xslt) ) use staging && myconf+=( --with-xattr - $(use_with themes gtk3) - $(use_with vaapi va) ) local PKG_CONFIG