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

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

[NP Hardass]

commit:     7b5333121b0b41b08f94c88d8da3e9eba41cfd2e
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 17:20:27 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 17:22:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b533312

virtual/wine: Virtual for multislot/split wine.

Thanks to eroen for his help with laying the groundwork.

Thanks to bobwya, chiitoo, eroen, sarnex, slackner, and wizardedit
for their feedback and testing.

Imported from wine-a-holics overlay

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 virtual/wine/metadata.xml     | 16 ++++++++++++++++
 virtual/wine/wine-0-r4.ebuild | 31 +++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/virtual/wine/metadata.xml b/virtual/wine/metadata.xml
new file mode 100644
index 00000000000..640696b8ae1
--- /dev/null
+++ b/virtual/wine/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>wine@gentoo.org</email>
+		<name>Wine</name>
+	</maintainer>
+	<use>
+		<flag name="d3d9">Enable Ixit's Gallium Nine Patchset</flag>
+		<flag name="staging">Enable Wine-Staging's Patchset</flag>
+	</use>
+	<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-r4.ebuild b/virtual/wine/wine-0-r4.ebuild
new file mode 100644
index 00000000000..37b7a7f5477
--- /dev/null
+++ b/virtual/wine/wine-0-r4.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Virtual for WINE that supports multiple variants and slotting"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="staging d3d9"
+
+# 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="
+	staging? ( || (
+		app-emulation/wine-staging[staging]
+		app-emulation/wine-any[staging]
+	) )
+	d3d9? ( || (
+		app-emulation/wine-d3d9[d3d9]
+		app-emulation/wine-any[d3d9]
+	) )
+	|| (
+		app-emulation/wine-vanilla
+		app-emulation/wine-staging
+		app-emulation/wine-d3d9
+		app-emulation/wine-any
+	)
+	!app-emulation/wine:0"

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

[NP Hardass]

commit:     330ea10a3bd83ee826a6e0151fbfb849b5b0e0cc
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Sat May 13 00:59:34 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Sat May 13 01:03:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=330ea10a

virtual/wine: Update letter case

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 virtual/wine/metadata.xml     | 2 +-
 virtual/wine/wine-0-r4.ebuild | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/virtual/wine/metadata.xml b/virtual/wine/metadata.xml
index 640696b8ae1..de062ba7a89 100644
--- a/virtual/wine/metadata.xml
+++ b/virtual/wine/metadata.xml
@@ -10,7 +10,7 @@
 		<flag name="staging">Enable Wine-Staging's Patchset</flag>
 	</use>
 	<longdescription lang="en">
-		Allows for any variant of WINE, regardless of slotting to fulfill the dependencies
+		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-r4.ebuild b/virtual/wine/wine-0-r4.ebuild
index 37b7a7f5477..cf17eab1c25 100644
--- a/virtual/wine/wine-0-r4.ebuild
+++ b/virtual/wine/wine-0-r4.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=6
 
-DESCRIPTION="Virtual for WINE that supports multiple variants and slotting"
+DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="staging d3d9"
+IUSE="d3d9 staging"
 
 # 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

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

[NP Hardass]

commit:     97cb8a1c4fe6ec36ea2088137f091786916be4de
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 15 20:48:32 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Sep 20 22:20:38 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97cb8a1c

virtual/wine: Revbump: Support abi_x86 USE flags

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 virtual/wine/{wine-0-r4.ebuild => wine-0-r5.ebuild} | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/virtual/wine/wine-0-r4.ebuild b/virtual/wine/wine-0-r5.ebuild
similarity index 70%
rename from virtual/wine/wine-0-r4.ebuild
rename to virtual/wine/wine-0-r5.ebuild
index cf17eab1c25..9371f2d57ed 100644
--- a/virtual/wine/wine-0-r4.ebuild
+++ b/virtual/wine/wine-0-r5.ebuild
@@ -7,7 +7,9 @@ DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="d3d9 staging"
+IUSE="+abi_x86_32 +abi_x86_64 d3d9 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
@@ -23,9 +25,9 @@ RDEPEND="
 		app-emulation/wine-any[d3d9]
 	) )
 	|| (
-		app-emulation/wine-vanilla
-		app-emulation/wine-staging
-		app-emulation/wine-d3d9
-		app-emulation/wine-any
+		app-emulation/wine-vanilla[abi_x86_32=,abi_x86_64=]
+		app-emulation/wine-staging[abi_x86_32=,abi_x86_64=]
+		app-emulation/wine-d3d9[abi_x86_32=,abi_x86_64=]
+		app-emulation/wine-any[abi_x86_32=,abi_x86_64=]
 	)
 	!app-emulation/wine:0"

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

[NP Hardass]

commit:     b1c49613948ec9cf4af186bdf16630945ce7c5af
Author:     NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 27 20:00:26 2017 +0000
Commit:     NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 22:32:30 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c49613

virtual/wine: Stabilize for amd64, x86

Package-Manager: Portage-2.3.10, Repoman-2.3.3

 virtual/wine/wine-0-r5.ebuild                       | 2 +-
 virtual/wine/{wine-0-r5.ebuild => wine-0-r6.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/virtual/wine/wine-0-r5.ebuild b/virtual/wine/wine-0-r5.ebuild
index 9371f2d57ed..ac3dcae4f7f 100644
--- a/virtual/wine/wine-0-r5.ebuild
+++ b/virtual/wine/wine-0-r5.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86 ~x86-fbsd"
 IUSE="+abi_x86_32 +abi_x86_64 d3d9 staging"
 
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"

diff --git a/virtual/wine/wine-0-r5.ebuild b/virtual/wine/wine-0-r6.ebuild
similarity index 96%
copy from virtual/wine/wine-0-r5.ebuild
copy to virtual/wine/wine-0-r6.ebuild
index 9371f2d57ed..5371654fca7 100644
--- a/virtual/wine/wine-0-r5.ebuild
+++ b/virtual/wine/wine-0-r6.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 IUSE="+abi_x86_32 +abi_x86_64 d3d9 staging"
 
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"

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

[Nick Sarnie]

commit:     fef2454484ce1f8d6f22889d8dae5224ec84b6ee
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 00:23:01 2019 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 00:24:22 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fef24544

virtual/wine: Remove d3d9 USE

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 virtual/wine/wine-0-r6.ebuild | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/virtual/wine/wine-0-r6.ebuild b/virtual/wine/wine-0-r6.ebuild
index 9371f2d57ed..ce5b0f83df0 100644
--- a/virtual/wine/wine-0-r6.ebuild
+++ b/virtual/wine/wine-0-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
 
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+abi_x86_32 +abi_x86_64 d3d9 staging"
+IUSE="+abi_x86_32 +abi_x86_64 staging"
 
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
 
@@ -20,10 +20,6 @@ RDEPEND="
 		app-emulation/wine-staging[staging]
 		app-emulation/wine-any[staging]
 	) )
-	d3d9? ( || (
-		app-emulation/wine-d3d9[d3d9]
-		app-emulation/wine-any[d3d9]
-	) )
 	|| (
 		app-emulation/wine-vanilla[abi_x86_32=,abi_x86_64=]
 		app-emulation/wine-staging[abi_x86_32=,abi_x86_64=]

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

[Nick Sarnie]

commit:     aecda2f12d7476116b5223b755f5e52a1856363d
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 01:43:04 2019 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 01:46:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aecda2f1

virtual/wine: Remove reference to last rited package

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 virtual/wine/wine-0-r7.ebuild | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/virtual/wine/wine-0-r7.ebuild b/virtual/wine/wine-0-r7.ebuild
new file mode 100644
index 00000000000..c169693fcdb
--- /dev/null
+++ b/virtual/wine/wine-0-r7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+abi_x86_32 +abi_x86_64 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="
+	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"

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

[Nick Sarnie]

commit:     20fde2d04ece0d70d28cb6af3c2e0a21ffd291ad
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 22 19:59:16 2019 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 19:59:56 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20fde2d0

virtual/wine: amd64 and x86 stable

Closes: https://bugs.gentoo.org/703554
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 virtual/wine/wine-0-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virtual/wine/wine-0-r7.ebuild b/virtual/wine/wine-0-r7.ebuild
index c169693fcdb..18cacfaec22 100644
--- a/virtual/wine/wine-0-r7.ebuild
+++ b/virtual/wine/wine-0-r7.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+abi_x86_32 +abi_x86_64 staging"
 
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"

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

[Nick Sarnie]

commit:     96291729a6a54f681f4d72e3190e7d5c5c105527
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 22 20:22:33 2019 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 20:22:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96291729

virtual/wine: Drop old

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 virtual/wine/metadata.xml     |  1 -
 virtual/wine/wine-0-r5.ebuild | 33 ---------------------------------
 virtual/wine/wine-0-r6.ebuild | 29 -----------------------------
 3 files changed, 63 deletions(-)

diff --git a/virtual/wine/metadata.xml b/virtual/wine/metadata.xml
index de062ba7a89..7c40dfd6a6b 100644
--- a/virtual/wine/metadata.xml
+++ b/virtual/wine/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Wine</name>
 	</maintainer>
 	<use>
-		<flag name="d3d9">Enable Ixit's Gallium Nine Patchset</flag>
 		<flag name="staging">Enable Wine-Staging's Patchset</flag>
 	</use>
 	<longdescription lang="en">

diff --git a/virtual/wine/wine-0-r5.ebuild b/virtual/wine/wine-0-r5.ebuild
deleted file mode 100644
index 5ffa6e83891..00000000000
--- a/virtual/wine/wine-0-r5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+abi_x86_32 +abi_x86_64 d3d9 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="
-	staging? ( || (
-		app-emulation/wine-staging[staging]
-		app-emulation/wine-any[staging]
-	) )
-	d3d9? ( || (
-		app-emulation/wine-d3d9[d3d9]
-		app-emulation/wine-any[d3d9]
-	) )
-	|| (
-		app-emulation/wine-vanilla[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-staging[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-d3d9[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-any[abi_x86_32=,abi_x86_64=]
-	)
-	!app-emulation/wine:0"

diff --git a/virtual/wine/wine-0-r6.ebuild b/virtual/wine/wine-0-r6.ebuild
deleted file mode 100644
index ce5b0f83df0..00000000000
--- a/virtual/wine/wine-0-r6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+abi_x86_32 +abi_x86_64 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="
-	staging? ( || (
-		app-emulation/wine-staging[staging]
-		app-emulation/wine-any[staging]
-	) )
-	|| (
-		app-emulation/wine-vanilla[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-staging[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-d3d9[abi_x86_32=,abi_x86_64=]
-		app-emulation/wine-any[abi_x86_32=,abi_x86_64=]
-	)
-	!app-emulation/wine:0"

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

[David Seifert]

commit:     c48e7cfb0ab2b5bcb6cfd982c7b00844f8901519
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu May 13 15:19:02 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May 13 15:19:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c48e7cfb

virtual/wine: Mark ALLARCHES

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 virtual/wine/metadata.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/virtual/wine/metadata.xml b/virtual/wine/metadata.xml
index 7c40dfd6a6b..1a756ef373c 100644
--- a/virtual/wine/metadata.xml
+++ b/virtual/wine/metadata.xml
@@ -8,6 +8,7 @@
 	<use>
 		<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.

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

[Ionen Wolkens]

commit:     51c8f37560dc84a1cd059dc6d7540678c87cce9b
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 28 16:50:52 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep  3 19:46:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c8f375

virtual/wine: EAPI7->8, add app-emulation/wine-proton

Also cleanup extra || ( ), no-op and I don't believe these will have
uses now that wine-any is gone. Related to this, not convinced USE on
this virtual are still meaningful but don't want to change things
around at the moment, so setting wine-proton same way as staging.

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

 virtual/wine/metadata.xml     |  1 +
 virtual/wine/wine-0-r8.ebuild | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/virtual/wine/metadata.xml b/virtual/wine/metadata.xml
index a7c476ea196a..a5e53660da5c 100644
--- a/virtual/wine/metadata.xml
+++ b/virtual/wine/metadata.xml
@@ -6,6 +6,7 @@
 		<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/>

diff --git a/virtual/wine/wine-0-r8.ebuild b/virtual/wine/wine-0-r8.ebuild
new file mode 100644
index 000000000000..af40db7eedf9
--- /dev/null
+++ b/virtual/wine/wine-0-r8.ebuild
@@ -0,0 +1,25 @@
+# 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=]
+	)
+	!app-emulation/wine:0"

[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"
+	)"

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

[Ionen Wolkens]

commit:     9d6d72cad3e6b30d11aa135e652f90d6240cc41a
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 04:24:14 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 13:42:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d6d72ca

virtual/wine: stabilize 0-r10 for ALLARCHES

Not useful in stable given wine-proton isn't, but no reason to
keep multiple versions of this -- so stabling to cleanup.

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

 virtual/wine/wine-0-r10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/virtual/wine/wine-0-r10.ebuild b/virtual/wine/wine-0-r10.ebuild
index 8b239c870d42..ec2d32f55736 100644
--- a/virtual/wine/wine-0-r10.ebuild
+++ b/virtual/wine/wine-0-r10.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+abi_x86_32 +abi_x86_64 proton staging"
 REQUIRED_USE="|| ( abi_x86_32 abi_x86_64 )"
 

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

[Ionen Wolkens]

commit:     b34a4c65b901957944a3550be798e80430b52612
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 04:24:38 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 13:43:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b34a4c65

virtual/wine: drop 0-r9

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

 virtual/wine/wine-0-r9.ebuild | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/virtual/wine/wine-0-r9.ebuild b/virtual/wine/wine-0-r9.ebuild
deleted file mode 100644
index b46e61f831a1..000000000000
--- a/virtual/wine/wine-0-r9.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual for Wine that supports multiple variants and slotting"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+abi_x86_32 +abi_x86_64 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="
-	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=]
-	)"