[gentoo-commits] repo/gentoo:master commit in: profiles/arch/base/, profiles/base/, profiles/arch/amd64/, ...

[Nick Sarnie]

commit:     68a50914bb9999a1dd2397293936945eb9ef44dd
Author:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 22 20:19:29 2019 +0000
Commit:     Nick Sarnie <sarnex <AT> gentoo <DOT> org>
CommitDate: Sun Dec 22 20:21:42 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68a50914

profiles: Remove references to last rited packages

Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org>

 profiles/arch/amd64/no-multilib/package.use.mask |  2 --
 profiles/arch/amd64/package.use.force            |  2 --
 profiles/arch/amd64/package.use.mask             |  2 --
 profiles/arch/amd64/package.use.stable.mask      |  7 +------
 profiles/arch/base/package.use.mask              | 10 ----------
 profiles/arch/x86/package.use.stable.mask        |  7 +------
 profiles/base/package.use.force                  |  4 +---
 7 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index f83b6bb9564..37241d814ba 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/package.use.mask
@@ -14,8 +14,6 @@ app-emulation/xen-tools ovmf
 # abi_x86_32 at this time.
 app-emulation/wine-vanilla test
 app-emulation/wine-staging test
-app-emulation/wine-d3d9 test
-app-emulation/wine-any test
 
 # Mike Frysinger <vapier@g.o> (2016-08-12)
 # Requires sys-boot/grub:0 which is masked here.

diff --git a/profiles/arch/amd64/package.use.force b/profiles/arch/amd64/package.use.force
index 0f4c85a656e..9af2e497819 100644
--- a/profiles/arch/amd64/package.use.force
+++ b/profiles/arch/amd64/package.use.force
@@ -13,8 +13,6 @@ dev-lang/rust llvm_targets_X86
 # Packages with optional 64-bit variant
 app-emulation/wine-vanilla -abi_x86_64
 app-emulation/wine-staging -abi_x86_64
-app-emulation/wine-d3d9 -abi_x86_64
-app-emulation/wine-any -abi_x86_64
 virtual/wine -abi_x86_64
 
 # Michał Górny <mgorny@g.o> (2017-04-08)

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 4b1be845a52..09a9e9d1764 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -106,8 +106,6 @@ media-video/mpv -vulkan
 
 # Nick Sarnie <sarnex@g.o> (2018-04-29)
 # media-libs/vulkan-loader and app-emulation/vkd3d are keyworded on amd64
-app-emulation/wine-any -vkd3d -vulkan
-app-emulation/wine-d3d9 -vkd3d -vulkan
 app-emulation/wine-staging -vkd3d -vulkan
 app-emulation/wine-vanilla -vkd3d -vulkan
 

diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index 0cc07951442..c3814e0fc7e 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -22,11 +22,6 @@
 # not yet ready for everyone.
 net-misc/curl quiche
 
-# Nick Sarnie <sarnex@g.o> (2019-10-14)
-# Allow on stable for now
-app-emulation/wine-d3d9 -d3d9
-virtual/wine -d3d9
-
 # Andreas Sturmlechner <asturm@g.o> (2019-08-18)
 # media-video/pipewire is not stable yet
 dev-libs/weston pipewire
@@ -77,7 +72,7 @@ sci-libs/gdal oracle
 
 # NP-Hardass <NP-Hardass@g.o> (2017-09-27)
 # patchset variants are not stable
-virtual/wine d3d9 staging
+virtual/wine staging
 
 # Tim Harder <radhermit@g.o> (2017-09-11)
 # Pulls in dev-ruby/asciidoctor which has too large of a ruby testing

diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index 78ea5c5b805..83885078994 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -14,14 +14,6 @@ net-misc/curl quiche
 # net-libs/nghttp3 net-libs/ngtcp2[ssl] are not available on all arches
 net-misc/curl nghttp3
 
-# Nick Sarnie <sarnex@g.o> (2019-10-14)
-# No longer updated or supported by the Wine project
-# wine-d3d9 superceeded by nine-standalone
-# wine-any has no value without wine-d3d9
-# Removal in 30 days
-app-emulation/wine-d3d9 d3d9
-virtual/wine d3d9
-
 # Luke Dashjr <luke-jr+gentoobugs@×××××××.org> (2019-09-21)
 # Moved from arch/powerpc/ppc64 as it applies to most architectures.
 sys-firmware/seabios debug
@@ -85,8 +77,6 @@ media-video/mpv vulkan
 
 # Nick Sarnie <sarnex@g.o> (2018-04-29)
 # media-libs/vulkan-loader and app-emulation/vkd3d are not available everywhere
-app-emulation/wine-any vkd3d vulkan
-app-emulation/wine-d3d9 vkd3d vulkan
 app-emulation/wine-staging vkd3d vulkan
 app-emulation/wine-vanilla vkd3d vulkan
 

diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index c1b987d076a..72e4dea554a 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -17,11 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Nick Sarnie <sarnex@g.o> (2019-10-14)
-# Allow on stable for now
-app-emulation/wine-d3d9 -d3d9
-virtual/wine -d3d9
-
 # Andreas Sturmlechner <asturm@g.o> (2019-09-13)
 # media-video/pipewire is not stable yet
 dev-libs/weston pipewire
@@ -72,7 +67,7 @@ sci-libs/gdal oracle
 
 # NP-Hardass <NP-Hardass@g.o> (2017-09-27)
 # patchset variants are not stable
-virtual/wine d3d9 staging
+virtual/wine staging
 
 # Andreas Sturmlechner <asturm@g.o> (2017-03-01)
 # Requires not yet stabilised dev-db/oracle-instantclient.

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index e8205d6ded6..f4a4718c4ec 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -58,10 +58,8 @@ sci-astronomy/esomidas libtirpc
 sys-cluster/glusterfs libtirpc
 
 # NP-Hardass <NP-Hardass@g.o> (2017-04-10)
-# Always force patch on appropriate variant to ensure
-# similar experience when using app-emulation/wine-any
+# Always force patch on appropriate variant
 app-emulation/wine-staging staging
-app-emulation/wine-d3d9 d3d9
 
 # David Seifert <soap@g.o> (2017-03-07)
 # Only ever use system ffmpeg, allow kodi bundled ffmpeg