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@gentoo.org>
This commit is contained in:
Ionen Wolkens
2025-04-22 07:53:26 -04:00
parent 3182b302c0
commit 4b683463aa
5 changed files with 22 additions and 40 deletions

View File

@@ -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 <NP-Hardass@gentoo.org> (2017-09-27)
# patchset variants are not stable
virtual/wine staging
# Tim Harder <radhermit@gentoo.org> (2017-09-11)
# Pulls in dev-ruby/asciidoctor which has too large of a ruby testing
# dep tree to be stabilized at this time.

View File

@@ -137,10 +137,6 @@ net-analyzer/wireshark -doc
# Stable mask dev-ruby/haml test till rails is stabilized.
dev-ruby/haml test
# Adam Feldman <NP-Hardass@gentoo.org> (2017-09-27)
# patchset variants are not stable
virtual/wine proton staging
# Christoph Junghans <junghans@gentoo.org> (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

View File

@@ -5,13 +5,5 @@
<email>wine@gentoo.org</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>

View File

@@ -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=]
)"

View File

@@ -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(-)]
)
"