[gentoo-commits] repo/gentoo:master commit in: virtual/wine/

[Ionen Wolkens]

commit:     caaf13ee896adccdcd711bb067ead20416e7b0b7
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  9 19:14:37 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep 10 09:47:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caaf13ee

virtual/wine: add (+) to staging USE, and drop ancient blockers

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 virtual/wine/{wine-0-r8.ebuild => wine-0-r10.ebuild} | 5 ++---
 virtual/wine/{wine-0-r7.ebuild => wine-0-r9.ebuild}  | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/virtual/wine/wine-0-r8.ebuild b/virtual/wine/wine-0-r10.ebuild
similarity index 91%
rename from virtual/wine/wine-0-r8.ebuild
rename to virtual/wine/wine-0-r10.ebuild
index af40db7eedf9..8b239c870d42 100644
--- a/virtual/wine/wine-0-r8.ebuild
+++ b/virtual/wine/wine-0-r10.ebuild
@@ -16,10 +16,9 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
 # of vanilla prevents that.
 RDEPEND="
        proton? ( app-emulation/wine-proton )
-       staging? ( app-emulation/wine-staging[staging] )
+       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=]
-       )
-       !app-emulation/wine:0"
+       )"

diff --git a/virtual/wine/wine-0-r7.ebuild b/virtual/wine/wine-0-r9.ebuild
similarity index 87%
rename from virtual/wine/wine-0-r7.ebuild
rename to virtual/wine/wine-0-r9.ebuild
index 18cacfaec222..b46e61f831a1 100644
--- a/virtual/wine/wine-0-r7.ebuild
+++ b/virtual/wine/wine-0-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,10 +17,9 @@ REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
 # of vanilla prevents that.
 RDEPEND="
        staging? ( || (
-               app-emulation/wine-staging[staging]
+               app-emulation/wine-staging[staging(+)]
        ) )
        || (
                app-emulation/wine-vanilla[abi_x86_32=,abi_x86_64=]
                app-emulation/wine-staging[abi_x86_32=,abi_x86_64=]
-       )
-       !app-emulation/wine:0"
+       )"