profiles: Move amd64-specific masks to amd64 where they belong

Move the amd64-specific masks from features/64bit-native to
arch/amd64/no-multilib. There is no reason to apply them to non-x86
architectures really. NFC, confirmed with profile-dumper.

5 files changed, 25 insertions, 191 deletions

diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 3e615cc50977..2aa8bca4ae67 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -2,6 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# James Le Cuirot <chewi@gentoo.org> (13 Aug 2016)
+# Steam requires amd64 multilib. These are steam-overlay packages.
+dev-util/adobe-air-runtime
+games-util/steam-client-meta
+games-util/steam-games-meta
+games-util/steam-launcher
+games-util/steam-meta
+
+# Andreas K. Huettel <dilfridge@gentoo.org>
+# Novell Groupwise Client sadly needs a 32bit java vm (bundled)
+mail-client/novell-groupwise-client
+
 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
 =app-editors/emacs-18*
@@ -26,6 +38,7 @@ dev-lang/idb
 dev-lang/ifc
 dev-perl/Archive-Rar
 dev-python/skype4py
+dev-util/android-ndk
 dev-util/android-sdk-update-manager
 dev-util/android-studio
 dev-util/biew
@@ -38,6 +51,7 @@ games-action/heretic2
 games-action/heretic2-demo
 games-action/hotline-miami
 games-action/intrusion2
+games-action/lugaru
 games-action/mutantstorm-demo
 games-action/phobiaii
 games-action/rune
@@ -116,6 +130,7 @@ games-rpg/nwn-data
 games-rpg/nwn-penultima
 games-rpg/nwn-penultimarerolled
 games-rpg/nwn-shadowlordsdreamcatcherdemon
+games-rpg/penumbra-collection
 games-rpg/wasteland2
 games-server/etqw-ded
 games-server/nwn-ded
diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index 705dbb67b71c..c97f8e70927f 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/package.use.mask
@@ -1,7 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# Mike Frysinger <vapier@gentoo.org> (12 Aug 2016)
+# Requires sys-boot/grub:0 which is masked here.
+sys-apps/memtest86+ floppy
+
 # Alexandre Rostovtsev <tetromino@gentoo.org> (24 Jun 2012)
 # Disable 32-bit parts of wine, bug #351436
 app-emulation/wine mono
@@ -20,3 +24,7 @@ net-im/skype apulse
 # Tim Harder <radhermit@gentoo.org> (17 Jan 2016)
 # Skype requires multilib support
 net-im/bitlbee skype
+
+# Alexis Ballier <aballier@gentoo.org> (13 Aug 2009)
+# Requires wine
+media-sound/lmms vst
diff --git a/profiles/features/64bit-native/package.mask b/profiles/features/64bit-native/package.mask
deleted file mode 100644
index 05215b179a2d..000000000000
--- a/profiles/features/64bit-native/package.mask
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# James Le Cuirot <chewi@gentoo.org> (13 Aug 2016)
-# Steam requires amd64 multilib. These are steam-overlay packages.
-dev-util/adobe-air-runtime
-games-util/steam-client-meta
-games-util/steam-games-meta
-games-util/steam-launcher
-games-util/steam-meta
-
-# Andreas K. Huettel <dilfridge@gentoo.org>
-# Novell Groupwise Client sadly needs a 32bit java vm (bundled)
-mail-client/novell-groupwise-client
-
-# AMD64 Team <amd64@gentoo.org>
-# Mask packages that rely on amd64 multilib
-app-accessibility/mbrola
-app-accessibility/perlbox-voice
-app-arch/stuffit
-app-benchmarks/cpuburn
-=app-editors/emacs-18*
-app-emulation/crossover-bin
-app-emulation/crossover-office-bin
-app-emulation/crossover-office-pro-bin
-app-emulation/playonlinux
-app-emulation/q4wine
->=app-i18n/atokx3-3.0.0
-app-office/ooextras
-app-emulation/winetricks
-app-text/acroread
-dev-embedded/libftd2xx
-dev-embedded/openocd
-dev-lang/icc
-dev-lang/idb
-dev-lang/ifc
-dev-perl/Archive-Rar
-dev-python/skype4py
-dev-util/android-sdk-update-manager
-dev-util/android-ndk
-dev-util/biew
-games-action/cs2d
-games-action/descent3
-games-action/descent3-demo
-games-action/heretic2
-games-action/heretic2-demo
-games-action/lugaru
-games-action/mutantstorm-demo
-games-action/phobiaii
-games-action/rune
-games-action/spacetripper-demo
-games-arcade/aquaria
-games-arcade/barbarian-bin
-games-arcade/jardinains
-games-arcade/gish-demo
-games-emulation/caps
-games-emulation/nestra
-games-emulation/zinc
-games-emulation/zsnes
-games-fps/avp
-games-fps/doom3-cdoom
-games-fps/doom3-chextrek
-games-fps/doom3-data
-games-fps/doom3-demo
-games-fps/doom3-ducttape
-games-fps/doom3-eventhorizon
-games-fps/doom3-hellcampaign
-games-fps/doom3-inhell
-games-fps/doom3-lms
-games-fps/doom3-mitm
-games-fps/doom3-roe
-games-fps/doom3
-games-fps/enemy-territory-etpro
-games-fps/enemy-territory-omnibot
-games-fps/enemy-territory-truecombat
-games-fps/enemy-territory
-games-fps/etqw-bin
-games-fps/etqw-data
-games-fps/etqw-demo
-games-fps/glxquake-bin
-games-fps/legends
-games-fps/postal2
-games-fps/postal2mp-demo
-games-fps/quake3-bin
-games-fps/quake3-demo
-games-fps/quake3-ra3
-games-fps/quake4-bin
-games-fps/quake4-data
-games-fps/quake4-demo
-games-fps/rtcw
-games-fps/rtcwmp-demo
-games-fps/rtcwsp-demo
-games-fps/sauerbraten
-games-fps/serious-sam-tfe
-games-fps/serious-sam-tse
-games-fps/soldieroffortune
-games-fps/soldieroffortune-demo
-games-fps/unreal-tournament
-games-fps/ut2003
-games-fps/ut2003-demo
-games-fps/ut2004-demo
-games-puzzle/hoh-bin
-games-roguelike/adom
-games-rpg/eschalon-book-1-demo
-games-rpg/nwmouse
-games-rpg/nwmovies
-games-rpg/nwn
-games-rpg/nwn-cep
-games-rpg/nwn-data
-games-rpg/nwn-penultima
-games-rpg/nwn-penultimarerolled
-games-rpg/nwn-shadowlordsdreamcatcherdemon
-games-rpg/penumbra-collection
-games-server/etqw-ded
-games-server/nwn-ded
-games-server/ut2003-ded
-games-simulation/bcs-demo
-games-strategy/darwinia
-games-strategy/darwinia-demo
-games-strategy/defcon-demo
-games-strategy/dominions2
-games-strategy/heroes3
-games-strategy/heroes3-demo
-games-strategy/majesty-demo
-games-strategy/smac
-games-strategy/spaz
-media-fonts/acroread-asianfonts
-media-sound/ventrilo-server-bin
-media-video/binkplayer
-media-video/tsmuxer
-net-im/skype
-net-im/skypetab-ng
-net-print/cndrvcups-common-lb
-net-print/cndrvcups-lb
-net-misc/icaclient
-net-misc/ps3mediaserver
-sci-biology/foldingathome
-sci-electronics/eagle
-sci-chemistry/cara-bin
-sci-chemistry/cyana
-sci-chemistry/icm
-sci-chemistry/mars
-sci-libs/ipp
-sys-libs/lib-compat-loki
-www-plugins/nspluginwrapper
-
-# AMD64 Team; <amd64@gentoo.org>
-# grub-1 is not available on no-multilib-profiles;
-<sys-boot/grub-1.99
diff --git a/profiles/features/64bit-native/package.use.mask b/profiles/features/64bit-native/package.use.mask
deleted file mode 100644
index c778ad68ddd7..000000000000
--- a/profiles/features/64bit-native/package.use.mask
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Mike Frysinger <vapier@gentoo.org> (12 Aug 2016)
-# Requires sys-boot/grub:0 which is masked here.
-sys-apps/memtest86+ floppy
-
-# Alexandre Rostovtsev <tetromino@gentoo.org> (04 Jul 2012)
-# Disable 32-bit parts of wine, bug #351436
-app-emulation/wine mono
-
-# Apr 28, 2008 Sébastien Fabbro <bicatali@gentoo.org>
-# ifc masked
-sci-libs/acml ifc
-
-# Alexis Ballier <aballier@gentoo.org> (13 Aug 2009)
-# Requires wine
-media-sound/lmms vst
-
-# Tomas Chvatal <scarabeus@gentoo.org> (13 Nov 2014)
-# The apulse is 32b used there only
-net-im/skype apulse
diff --git a/profiles/features/64bit-native/use.mask b/profiles/features/64bit-native/use.mask
index 6ad7395d2678..25c245751fb4 100644
--- a/profiles/features/64bit-native/use.mask
+++ b/profiles/features/64bit-native/use.mask
@@ -1,25 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # USE flags masked because providing packages require a 32-bit ABI
 
-# 2007/08/29 Christoph Mende <angelos@gentoo.org>
-# app-accessibility/mbrola is x86 only
-mbrola
-
-# 2007/08/24 Michael Marineau <marineam@gentoo.org>
-# Xen HVM support requires building 32-bit binaries.
-hvm
-
 # 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org>
 # Mask multilib, since we cannot use it.
 multilib
-
-# 2009/05/11 Doug Goldstein <cardoe@gentoo.org>
-# Mask 32bit since this will always require emulation packages
-32bit
-
-# Michał Górny <mgorny@gentoo.org> (26 Jan 2013)
-# Mask the multilib flags back for non-multilib profile.
-abi_x86_32