virtual/wine: Stabilize for amd64, x86

Package-Manager: Portage-2.3.10, Repoman-2.3.3

diff --git a/virtual/wine/wine-0-r5.ebuild b/virtual/wine/wine-0-r5.ebuild
index 9371f2d57ed3576450a4b3b66290a4b210928ec3..ac3dcae4f7fd419f75f2d45e0cab59c1eab39759 100644 (file)
--- 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-r6.ebuild b/virtual/wine/wine-0-r6.ebuild
new file mode 100644 (file)
index 0000000..5371654
--- /dev/null
+++ b/virtual/wine/wine-0-r6.ebuild
@@ -0,0 +1,33 @@
+# 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 ~x86-fbsd"
+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"