commit: 4b683463aa84bc6820f786a465b4059b1372fa1c Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Apr 22 11:53:26 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Apr 22 12:11:56 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b683463
virtual/wine: update for arm64+wow64, drop IUSE="proton staging" Detailed changes: - proton,staging: never quite liked these IUSE, this virtual is not intended for users to pick wine through USE (they can just e.g. add wine-staging to world file), and seems no packages depend on specific wine variants through this and it would be annoying for users to set these USE if they did - wow64: allowing as an option should remove the need for users to unset abi_x86_32 when they use it - keyword for ~arm64, it's an option now and no need for keywordreq for a virtual - drop REQUIRED_USE, arm64 is also an option over abi_x86_* and there's no real reason to enforce at least one being set here - while here, swap `abi_x86_64=` by `abi_x86_64?`, the former tend to give confusing portage messages and is not needed here Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> profiles/arch/amd64/package.use.stable.mask | 4 ---- profiles/arch/x86/package.use.stable.mask | 4 ---- virtual/wine/metadata.xml | 8 -------- virtual/wine/wine-0-r10.ebuild | 24 ------------------------ virtual/wine/wine-0-r11.ebuild | 22 ++++++++++++++++++++++ 5 files changed, 22 insertions(+), 40 deletions(-) diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index ad58d841b53f..b820d0622471 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -126,10 +126,6 @@ media-radio/wsjtx doc # Pulls too much unstable ruby deps (some are not even keyworded) net-misc/chrony html -# Adam Feldman <[email protected]> (2017-09-27) -# patchset variants are not stable -virtual/wine staging - # Tim Harder <[email protected]> (2017-09-11) # Pulls in dev-ruby/asciidoctor which has too large of a ruby testing # dep tree to be stabilized at this time. diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask index 17de34b8fd7b..7b1bf505d5ea 100644 --- a/profiles/arch/x86/package.use.stable.mask +++ b/profiles/arch/x86/package.use.stable.mask @@ -137,10 +137,6 @@ net-analyzer/wireshark -doc # Stable mask dev-ruby/haml test till rails is stabilized. dev-ruby/haml test -# Adam Feldman <[email protected]> (2017-09-27) -# patchset variants are not stable -virtual/wine proton staging - # Christoph Junghans <[email protected]> (2017-02-26) # Stable mask some fabrics (bug #525534) sys-cluster/openmpi openmpi_fabrics_knem openmpi_fabrics_ofed openmpi_rm_pbs openmpi_ofed_features_rdmacm openmpi_ofed_features_control-hdr-padding openmpi_ofed_features_udcm openmpi_ofed_features_dynamic-sl diff --git a/virtual/wine/metadata.xml b/virtual/wine/metadata.xml index a5e53660da5c..bfcc785d4120 100644 --- a/virtual/wine/metadata.xml +++ b/virtual/wine/metadata.xml @@ -5,13 +5,5 @@ <email>[email protected]</email> <name>Wine</name> </maintainer> - <use> - <flag name="proton">Enable Valve Software's fork of Wine</flag> - <flag name="staging">Enable Wine-Staging's Patchset</flag> - </use> <stabilize-allarches/> - <longdescription lang="en"> - Allows for any variant of Wine, regardless of slotting to fulfill the dependencies - traditionally fulfilled by the non-slotted, pre-variant, app-emulation/wine. - </longdescription> </pkgmetadata> diff --git a/virtual/wine/wine-0-r10.ebuild b/virtual/wine/wine-0-r10.ebuild deleted file mode 100644 index ec2d32f55736..000000000000 --- a/virtual/wine/wine-0-r10.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Virtual for Wine that supports multiple variants and slotting" - -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="+abi_x86_32 +abi_x86_64 proton staging" -REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )" - -# Note, the ordering here is intentional, to take advantage of the short-circuit -# logic of portage, to enforce wine-vanilla as default for new users. The idea -# behind this is that some USE flags may pull in 3rd-party patchsets, so default -# of vanilla prevents that. -RDEPEND=" - proton? ( app-emulation/wine-proton ) - staging? ( app-emulation/wine-staging[staging(+)] ) - || ( - app-emulation/wine-vanilla[abi_x86_32=,abi_x86_64=] - app-emulation/wine-proton[abi_x86_32=,abi_x86_64=] - app-emulation/wine-staging[abi_x86_32=,abi_x86_64=] - )" diff --git a/virtual/wine/wine-0-r11.ebuild b/virtual/wine/wine-0-r11.ebuild new file mode 100644 index 000000000000..d03f4ff525a6 --- /dev/null +++ b/virtual/wine/wine-0-r11.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Virtual to depend on any app-emulation/wine-* variant" + +SLOT="0" +KEYWORDS="amd64 ~arm64 x86" +IUSE="+abi_x86_32 +abi_x86_64" + +# wow64 provides 32+64bit support +RDEPEND=" + || ( + app-emulation/wine-vanilla[abi_x86_32?,abi_x86_64?] + app-emulation/wine-staging[abi_x86_32?,abi_x86_64?] + app-emulation/wine-proton[abi_x86_32?,abi_x86_64?] + app-emulation/wine-vanilla[wow64(-)] + app-emulation/wine-staging[wow64(-)] + app-emulation/wine-proton[wow64(-)] + ) +"
