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 87579158451 for ; Sat, 13 Jan 2024 13:12:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2216E2A72; Sat, 13 Jan 2024 13:12:01 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8F62FE2A67 for ; Sat, 13 Jan 2024 13:12:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 BA6F434319B for ; Sat, 13 Jan 2024 13:12:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2942B14B1 for ; Sat, 13 Jan 2024 13:11:59 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1705151422.9c1d344f958aa76fc55537ce46834f5aa7434c65.ionen@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.0.2.ebuild app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild app-emulation/wine-vanilla/wine-vanilla-9999.ebuild X-VCS-Directories: app-emulation/wine-vanilla/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 9c1d344f958aa76fc55537ce46834f5aa7434c65 X-VCS-Branch: master Date: Sat, 13 Jan 2024 13:11:59 +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: 7024875e-10d8-4531-8531-b8b24498346a X-Archives-Hash: 3cc1d6baaad2fba0076cf36d64b0d134 commit: 9c1d344f958aa76fc55537ce46834f5aa7434c65 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Jan 13 12:06:13 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Jan 13 13:10:22 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c1d344f app-emulation/wine-vanilla: adjust style Not touching 8.x (except 8.0.2) given 9.0 is soon, and these will be dropped once new 9.1 development cycle starts. Signed-off-by: Ionen Wolkens gentoo.org> .../wine-vanilla/wine-vanilla-7.0.2.ebuild | 27 ++++++++++++++-------- .../wine-vanilla/wine-vanilla-8.0.2.ebuild | 24 ++++++++++++------- .../wine-vanilla/wine-vanilla-9999.ebuild | 23 +++++++++++------- 3 files changed, 49 insertions(+), 25 deletions(-) diff --git a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild index a4d883c1152c..c0595c8ef846 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-7.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -23,7 +23,8 @@ fi DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" HOMEPAGE=" https://www.winehq.org/ - https://gitlab.winehq.org/wine/wine/" + https://gitlab.winehq.org/wine/wine/ +" LICENSE="LGPL-2.1+ BSD-2 IJG MIT ZLIB gsm libpng2 libtiff" SLOT="${PV}" @@ -33,10 +34,13 @@ IUSE=" +gstreamer kerberos ldap +mingw +mono netapi nls odbc openal opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +truetype udev udisks +unwind usb v4l +vkd3d +vulkan - +xcomposite xinerama" + +xcomposite xinerama +" +# bug #551124 for truetype REQUIRED_USE=" X? ( truetype ) - crossdev-mingw? ( mingw )" # bug #551124 for truetype + crossdev-mingw? ( mingw ) +" # tests are non-trivial to run, can hang easily, don't play well with # sandbox, and several need real opengl/vulkan or network access @@ -68,7 +72,8 @@ WINE_DLOPEN_DEPEND=" truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )" + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) +" WINE_COMMON_DEPEND=" ${WINE_DLOPEN_DEPEND} X? ( @@ -95,7 +100,8 @@ WINE_COMMON_DEPEND=" !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) ) usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] ) - vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] )" + vkd3d? ( >=app-emulation/vkd3d-1.2[${MULTILIB_USEDEP}] ) +" RDEPEND=" ${WINE_COMMON_DEPEND} app-emulation/wine-desktop-common @@ -114,11 +120,13 @@ RDEPEND=" ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 )" + udisks? ( sys-fs/udisks:2 ) +" DEPEND=" ${WINE_COMMON_DEPEND} sys-kernel/linux-headers - X? ( x11-base/xorg-proto )" + X? ( x11-base/xorg-proto ) +" BDEPEND=" dev-lang/perl sys-devel/binutils @@ -126,7 +134,8 @@ BDEPEND=" sys-devel/flex virtual/pkgconfig mingw? ( !crossdev-mingw? ( dev-util/mingw64-toolchain[${MULTILIB_USEDEP}] ) ) - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" IDEPEND=">=app-eselect/eselect-wine-2" QA_CONFIG_IMPL_DECL_SKIP=( diff --git a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild index d669f1bf277a..73082cc5aa7b 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-8.0.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 2022-2023 Gentoo Authors +# Copyright 2022-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -32,10 +32,13 @@ IUSE=" llvm-libunwind custom-cflags +fontconfig +gecko gphoto2 +gstreamer kerberos +mingw +mono netapi nls odbc opencl +opengl osmesa pcap perl pulseaudio samba scanner +sdl selinux +ssl +strip +truetype - udev udisks +unwind usb v4l +vulkan +xcomposite xinerama" + udev udisks +unwind usb v4l +vulkan +xcomposite xinerama +" +# bug #551124 for truetype REQUIRED_USE=" X? ( truetype ) - crossdev-mingw? ( mingw )" # bug #551124 for truetype + crossdev-mingw? ( mingw ) +" # tests are non-trivial to run, can hang easily, don't play well with # sandbox, and several need real opengl/vulkan or network access @@ -67,7 +70,8 @@ WINE_DLOPEN_DEPEND=" truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )" + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) +" WINE_COMMON_DEPEND=" ${WINE_DLOPEN_DEPEND} X? ( @@ -91,7 +95,8 @@ WINE_COMMON_DEPEND=" llvm-libunwind? ( sys-libs/llvm-libunwind[${MULTILIB_USEDEP}] ) !llvm-libunwind? ( sys-libs/libunwind:=[${MULTILIB_USEDEP}] ) ) - usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] )" + usb? ( dev-libs/libusb:1[${MULTILIB_USEDEP}] ) +" RDEPEND=" ${WINE_COMMON_DEPEND} app-emulation/wine-desktop-common @@ -110,11 +115,13 @@ RDEPEND=" ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 )" + udisks? ( sys-fs/udisks:2 ) +" DEPEND=" ${WINE_COMMON_DEPEND} sys-kernel/linux-headers - X? ( x11-base/xorg-proto )" + X? ( x11-base/xorg-proto ) +" BDEPEND=" dev-lang/perl sys-devel/binutils @@ -124,7 +131,8 @@ BDEPEND=" mingw? ( !crossdev-mingw? ( >=dev-util/mingw64-toolchain-10.0.0_p1-r2[${MULTILIB_USEDEP}] ) ) - nls? ( sys-devel/gettext )" + nls? ( sys-devel/gettext ) +" IDEPEND=">=app-eselect/eselect-wine-2" QA_CONFIG_IMPL_DECL_SKIP=( diff --git a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild index 82e4101c491a..7109f7104bbe 100644 --- a/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild +++ b/app-emulation/wine-vanilla/wine-vanilla-9999.ebuild @@ -23,7 +23,8 @@ fi DESCRIPTION="Free implementation of Windows(tm) on Unix, without external patchsets" HOMEPAGE=" https://www.winehq.org/ - https://gitlab.winehq.org/wine/wine/" + https://gitlab.winehq.org/wine/wine/ +" LICENSE="LGPL-2.1+ BSD-2 IJG MIT OPENLDAP ZLIB gsm libpng2 libtiff" SLOT="${PV}" @@ -35,11 +36,12 @@ IUSE=" +truetype udev udisks +unwind usb v4l +vulkan wayland wow64 +xcomposite xinerama" # bug #551124 for truetype -# TODO: wow64 can be done without mingw if using clang (needs bug #912237) +# TODO?: wow64 can be done without mingw if using clang (needs bug #912237) REQUIRED_USE=" X? ( truetype ) crossdev-mingw? ( mingw ) - wow64? ( abi_x86_64 !abi_x86_32 mingw )" + wow64? ( abi_x86_64 !abi_x86_32 mingw ) +" # tests are non-trivial to run, can hang easily, don't play well with # sandbox, and several need real opengl/vulkan or network access @@ -71,7 +73,8 @@ WINE_DLOPEN_DEPEND=" truetype? ( media-libs/freetype[${MULTILIB_USEDEP}] ) udisks? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) v4l? ( media-libs/libv4l[${MULTILIB_USEDEP}] ) - vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] )" + vulkan? ( media-libs/vulkan-loader[${MULTILIB_USEDEP}] ) +" WINE_COMMON_DEPEND=" ${WINE_DLOPEN_DEPEND} X? ( @@ -100,7 +103,8 @@ WINE_COMMON_DEPEND=" wayland? ( dev-libs/wayland[${MULTILIB_USEDEP}] x11-libs/libxkbcommon[${MULTILIB_USEDEP}] - )" + ) +" RDEPEND=" ${WINE_COMMON_DEPEND} app-emulation/wine-desktop-common @@ -122,11 +126,13 @@ RDEPEND=" ) samba? ( net-fs/samba[winbind] ) selinux? ( sec-policy/selinux-wine ) - udisks? ( sys-fs/udisks:2 )" + udisks? ( sys-fs/udisks:2 ) +" DEPEND=" ${WINE_COMMON_DEPEND} sys-kernel/linux-headers - X? ( x11-base/xorg-proto )" + X? ( x11-base/xorg-proto ) +" BDEPEND=" || ( sys-devel/binutils @@ -141,7 +147,8 @@ BDEPEND=" wow64? ( dev-util/mingw64-toolchain[abi_x86_32] ) ) ) nls? ( sys-devel/gettext ) - wayland? ( dev-util/wayland-scanner )" + wayland? ( dev-util/wayland-scanner ) +" IDEPEND=">=app-eselect/eselect-wine-2" QA_CONFIG_IMPL_DECL_SKIP=(