profiles/arch: Remove redundant package.use.mask entries for cuda

The cuda flag is controlled via use.mask, so there is no need for
duplicate entries in package.use.mask. Furthermore, they cause issues
with use.stable.mask.

2 files changed, 5 insertions, 39 deletions

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index cb0fafd197a6..53e4ea6721d5 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -153,7 +153,7 @@ app-editors/gvim -luajit -racket
 
 # Kacper Kowalik <xarthisius@gentoo.org> (09 Aug 2013)
 # Works on amd64
-sys-apps/hwloc -cuda -gl
+sys-apps/hwloc -gl
 
 # Michał Górny <mgorny@gentoo.org> (22 Jul 2013)
 # Meaningless on amd64 (it controls the 32-bit x86 JIT).
@@ -162,18 +162,13 @@ dev-python/pypy-bin cpu_flags_x86_sse2
 dev-python/pypy3 cpu_flags_x86_sse2
 dev-python/pypy3-bin cpu_flags_x86_sse2
 
-# Justin Lecher <jlec@gentoo.org> (21 Feb 2013)
-# cuda only works on x86 and amd64
-sci-libs/cholmod -cuda
-sci-libs/flann -cuda
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (30 Dec 2012)
 # chromium, mono work on this arch (masked in base)
 gnome-extra/zeitgeist-datasources -chromium
 
 # Christoph Junghans <junghans@gentoo.org> (26 Dec 2012)
 # cuda works on x86/amd64 (masked in base)
-sci-chemistry/gromacs -cuda -mkl
+sci-chemistry/gromacs -mkl
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (3 Nov 2012)
 # Unmask here, as it's masked in base.
@@ -191,10 +186,6 @@ media-libs/freetype -infinality
 # Masked in base like the above.
 dev-java/icedtea -infinality
 
-# Rick Farina <zerochaos@gentoo.org> (05 July 2012)
-# masked in base, unmask x86/amd64 only
-app-crypt/johntheripper -cuda
-
 # Mike Gilbert <floppym@gentoo.org> (29 Jun 2012)
 # sys-fs/zfs is not available everywhere.
 sys-boot/grub -libzfs
@@ -265,10 +256,6 @@ media-libs/mesa -llvm
 # x86 platforms works
 sys-power/pm-utils -video_cards_intel -video_cards_radeon
 
-# Mounir Lamouri <volkmar@gentoo.org> (07 Nov 2009)
-# Masked in base, unmak for amd64/x86. Bug 267264
-media-gfx/k3d -cuda
-
 # Jean-Noël Rivasseau <elvanor@gentoo.org> (23 Sep 2009)
 # X use flag only for amd64/x86, bug 285951.
 media-gfx/iscan -X
@@ -291,10 +278,6 @@ media-libs/imlib2 cpu_flags_x86_mmx
 # bad comment heading. see bug #246144
 media-video/mplayer -cpudetection
 
-# Tomas Chvatal <scarabeus@gentoo.org> (31 Jan 2009)
-# masked in base, unmask for x86/amd64
-sci-misc/boinc -cuda
-
 # Serkan Kaba <serkan@gentoo.org> (20 Jul 2008)
 app-text/enchant -zemberek
 
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask
index a9d8a52cdad7..ad0394c7a847 100644
--- a/profiles/arch/base/package.use.mask
+++ b/profiles/arch/base/package.use.mask
@@ -135,20 +135,15 @@ app-editors/gvim luajit racket
 # Kacper Kowalik <xarthisius@gentoo.org> (09 Aug 2013)
 # Doesn't work on most profiles. Easier to mask here and
 # unmask in particular profiles
-sys-apps/hwloc cuda gl opencl
-
-# Justin Lecher <jlec@gentoo.org> (21 Feb 2013)
-# cuda only works on x86 and amd64
-sci-libs/cholmod cuda
-sci-libs/flann cuda
+sys-apps/hwloc gl opencl
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (30 Dec 2012)
 # chromium is keyworded only on a few arches
 gnome-extra/zeitgeist-datasources chromium
 
 # Christoph Junghans <junghans@gentoo.org> (26 Dec 2012)
-# cuda/mkl only works on x86/amd64
-sci-chemistry/gromacs cuda mkl
+# mkl only works on x86/amd64
+sci-chemistry/gromacs mkl
 
 # Diego Elio Pettenò <flameeyes@gentoo.org> (3 Nov 2012)
 # Requires net-dns/unbound which is not keyworded by most arches
@@ -162,10 +157,6 @@ media-libs/freetype infinality
 # Mask this in conjunction with the above.
 dev-java/icedtea infinality
 
-# Rick Farina <zerochaos@gentoo.org> (05 July 2012)
-# cuda is available on x86/amd64 only
-app-crypt/johntheripper cuda
-
 # Mike Gilbert <floppym@gentoo.org> (29 Jun 2012)
 # sys-fs/zfs is not available everywhere.
 sys-boot/grub libzfs
@@ -229,18 +220,10 @@ dev-libs/glib systemtap
 # Masked because tools pulled in are not supported on most archs.
 sys-power/pm-utils video_cards_intel video_cards_radeon
 
-# Mounir Lamouri <volkmar@gentoo.org> (07 Nov 2009)
-# Mask cuda for k3d. Works only on amd64/x86. Bug 267264
-media-gfx/k3d cuda
-
 # Jean-Noël Rivasseau <elvanor@gentoo.org> (23 Sep 2009)
 # X use flag only for amd64/x86, bug 285951.
 media-gfx/iscan X
 
-# Tomas Chvatal <scarabeus@gentoo.org> (31 Jan 2009)
-# mask cuda for boinc. Works only on amd64 and x86
-sci-misc/boinc cuda
-
 # Robert Buchholz <rbu@gentoo.org> (16 Aug 2008)
 # TLS needs dev-libs/cryptlib, which is x86 only
 dev-python/kaa-base tls