gentoo resync : 15.01.2020

5 files changed, 3 insertions, 68 deletions

diff --git a/virtual/wine/Manifest b/virtual/wine/Manifest
index d5c8cc36c05b..564e1b852b98 100644
--- a/virtual/wine/Manifest
+++ b/virtual/wine/Manifest
@@ -1,4 +1,2 @@
-EBUILD wine-0-r5.ebuild 1011 BLAKE2B f3a67828edf578b1bb9c2f5b6f5ed387123419fd390b6da4f99323dce8c7512d008be77d7270b420c9b3264db097868403f36d58e38876eab851fc977497f622 SHA512 8c86b3059e6d33b971aaef192b4adf9516a1edb3faf60f311b57180720874fbb188133b1a585355507a6c2e5e5e5552a8996a0281acc2d796bcbb85e588b4d5e
-EBUILD wine-0-r6.ebuild 923 BLAKE2B 5bfca554416fc7b46b34a4a8ac789af7183177efc03ce52292a97f25b80d83b14d1a70df28facbb36ac87ff1d2b7264e309347d5af010b50890e50a15be32c09 SHA512 579bf05c33864078a04584bbfe4f8ce23ed47297434c7e6f503cd7515a907889704f41751f369a399ee41312cf669a86e545dc170c775856e73910b0d2aeec42
-EBUILD wine-0-r7.ebuild 788 BLAKE2B ea1bdf23acb8d1af4e4caa1cbe096f243e2fbd7336a4ccc2b97d25b08ab48ebfcf9ca0b3af63d0a9ef88c56519ca1873d21944da6b5e514a1f43d6ea7c817fa9 SHA512 6e8dabe31a7f323c20abd028933d54fbaf2e07a5abe87938cdbd8f1df5517d4143006ef36291456a65c46344de3efa04e7200e6959b14bdeddd717d7293316be
-MISC metadata.xml 588 BLAKE2B 2aa8c20868c11eda5c3365bd0f5f320d9d13bb9cf2681949bc6853534abf2178bda5d325ba55242ea1b8bfbed4daf9f0e360d29510e4f5d76d62be4aefcb48b3 SHA512 fb7933567b68997f1ca8e78a36a63fb2f956d452c6fbd5376f8a335653fef3bafe722960d5c954fee3d8a061774c8bdf93c39f8c786c3bb9ab7152d8031588a7
+EBUILD wine-0-r7.ebuild 786 BLAKE2B f001da539be2b56d39d06b825c691f5de07c0d7468e059b3fc1fb54f4580a50f749b82306fe5b696e2e0b7009fbd278a9a4756d19c1d6f9a38e10020e9586500 SHA512 433b8fb67d592384a933b2c5f35f2185a2c3e69e1d77a320d7879071e02f73ca430c3b5f24ea769a43a30f5539b99b61a7b225f0b9abccafd026a66dde26d1d8
+MISC metadata.xml 525 BLAKE2B 7ef7d5b7c92c557305d4f0edb1661ca4557dfda6c348b478620417812c0129c3589eabf150f4ff6839ce17f7d18525835524e3663b58de4244c55a35c411b8d6 SHA512 3288a91e913c956646b5787af3b9dbfa293709cddd77009d3ae8a82da56b371098c8904e72d3b0ddea7f4b110375cb3f033c409368f12fe1d4fddfb2f3149e63
diff --git a/virtual/wine/metadata.xml b/virtual/wine/metadata.xml
index de062ba7a89a..7c40dfd6a6bd 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 5ffa6e838918..000000000000
--- 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 ce5b0f83df02..000000000000
--- 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"
diff --git a/virtual/wine/wine-0-r7.ebuild b/virtual/wine/wine-0-r7.ebuild
index c169693fcdbb..18cacfaec222 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 )"