diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index ad58d841b53fa..b820d0622471e 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 (2017-09-27) -# patchset variants are not stable -virtual/wine staging - # Tim Harder (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 17de34b8fd7b6..7b1bf505d5eaf 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 (2017-09-27) -# patchset variants are not stable -virtual/wine proton staging - # Christoph Junghans (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 a5e53660da5c4..bfcc785d41208 100644 --- a/virtual/wine/metadata.xml +++ b/virtual/wine/metadata.xml @@ -5,13 +5,5 @@ wine@gentoo.org Wine - - Enable Valve Software's fork of Wine - Enable Wine-Staging's Patchset - - - Allows for any variant of Wine, regardless of slotting to fulfill the dependencies - traditionally fulfilled by the non-slotted, pre-variant, app-emulation/wine. - diff --git a/virtual/wine/wine-0-r10.ebuild b/virtual/wine/wine-0-r10.ebuild deleted file mode 100644 index ec2d32f557362..0000000000000 --- 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 0000000000000..d03f4ff525a63 --- /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(-)] + ) +"