profiles: Revert opencl masks

There are some depgraph issues to solve before we're ready for this.

This reverts commit a4b7a64c78029cba9db33d52e6e3efc83822ced8.
This reverts commit e2609adda1f455cd3e691374d4e00c06bfed7b07.
This reverts commit c8357609da2e98fa08215193bf7054a8ae45ee45.

Signed-off-by: Matt Turner <mattst88@gentoo.org>

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index ea33fa0ade12831a4179e83ff6b9ac27e699e079..9f7bbe33ffd6b47ad79c15d52ac173d88f98253b 100644 (file)
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,11 +17,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Marek Szuba <marecki@gentoo.org> (2020-04-01)
-# Phase one of removing ABI_X86_32 support from virtual/opencl,
-# as announced on 2020-03-09
-virtual/opencl abi_x86_32
-
 # Guilherme Amadio <amadio@gentoo.org> (2020-03-16)
 # media-libs/cudnn is keyworded on amd64
 sci-physics/root -cudnn

diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
index 3770dbf14cd6ff74dfbaa9c0ea603d7430780a83..3e1b51eff52a47b7b8e8315d4edcd0f68f924de2 100644 (file)
--- a/profiles/arch/x86/package.mask
+++ b/profiles/arch/x86/package.mask
@@ -1,11 +1,6 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# Marek Szuba <marecki@gentoo.org> (2020-04-01)
-# Phase one of removing ABI_X86_32 support from virtual/opencl,
-# as announced on 2020-03-09
-virtual/opencl
-
 # Bernardo Meurer <bernardo@standard.ai> (2019-09-28)
 # Requires app-crypt/tpm2-tss which is pending ~x86 vide
 # https://bugs.gentoo.org/695758

diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 055fa75bbd73dd85bd5cc6f5078d0ef986279a12..82f29aa00acbe89a29f550aec7f5875112b8b900 100644 (file)
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -4,11 +4,6 @@
 # Unmask the flag which corresponds to ARCH.
 -x86
 
-# Marek Szuba <marecki@gentoo.org> (2020-04-01)
-# Phase one of removing ABI_X86_32 support from virtual/opencl,
-# as announced on 2020-03-09
-opencl
-
 # Matt Turner <mattst88@gentoo.org> (2018-11-11)
 # d3d9 works on x86
 -d3d9