[gentoo-commits] proj/hardened-dev:master commit in: profiles/features/desktop/gnome/, profiles/arch/x86/CVS/, ...

[Magnus Granberg]

commit:     03e6c106631b6c07f46441a1d05c2ebe506bff06
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 31 15:40:47 2015 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sat Jan 31 15:40:47 2015 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=03e6c106

Add rules

---
 main                                               |   5 +
 profiles/README.profiles                           |   7 -
 profiles/arch/amd64/parent                         |   1 -
 profiles/arch/amd64/rules                          |   2 +
 profiles/arch/x86/CVS/Entries                      |  14 -
 profiles/arch/x86/CVS/Repository                   |   1 -
 profiles/arch/x86/CVS/Root                         |   1 -
 profiles/arch/x86/ChangeLog                        | 597 ---------------------
 profiles/arch/x86/eapi                             |   1 -
 profiles/arch/x86/make.defaults                    |  45 --
 profiles/arch/x86/package.mask                     |   4 -
 profiles/arch/x86/package.use                      |   7 -
 profiles/arch/x86/package.use.force                |   8 -
 profiles/arch/x86/package.use.mask                 | 234 --------
 profiles/arch/x86/package.use.stable.mask          |  44 --
 profiles/arch/x86/parent                           |   1 -
 profiles/arch/x86/profile.bashrc                   |  12 -
 profiles/arch/x86/use.force                        |   7 -
 profiles/arch/x86/use.mask                         | 224 --------
 profiles/arch/x86/use.stable.mask                  |  22 -
 profiles/arch/x86/xbox/CVS/Entries                 |   5 -
 profiles/arch/x86/xbox/CVS/Repository              |   1 -
 profiles/arch/x86/xbox/CVS/Root                    |   1 -
 profiles/arch/x86/xbox/eapi                        |   1 -
 profiles/arch/x86/xbox/make.defaults               |  12 -
 profiles/arch/x86/xbox/package.mask                |   3 -
 profiles/arch/x86/xbox/parent                      |   1 -
 profiles/features/desktop/gnome/parent             |   1 -
 profiles/features/desktop/kde/parent               |   1 -
 profiles/features/{no-multilib => gnome}/eapi      |   0
 .../features/{desktop => }/gnome/make.defaults     |   0
 profiles/features/{desktop => }/gnome/package.use  |   0
 profiles/{releases/13.0 => features/gnome}/parent  |   0
 profiles/features/hardened/linux/amd64/rules       |   2 +
 profiles/features/{desktop => }/kde/eapi           |   0
 profiles/features/{desktop => }/kde/make.defaults  |   0
 profiles/features/{desktop => }/kde/package.use    |   0
 .../features/{hardened/linux/amd64 => kde}/parent  |   0
 profiles/features/{desktop => }/kde/use.force      |   0
 profiles/releases/13.0/rules                       |   2 +
 profiles/rules                                     |   2 +
 .../desktop/gnome => targets/no-multilib}/eapi     |   0
 .../no-multilib/make.defaults                      |   0
 .../{features => targets}/no-multilib/package.mask |   0
 .../no-multilib/package.use.force                  |   0
 .../no-multilib/package.use.mask                   |   0
 .../{features => targets}/no-multilib/use.mask     |   0
 47 files changed, 13 insertions(+), 1256 deletions(-)

diff --git a/main b/main
new file mode 100644
index 0000000..1cdd7d7
--- /dev/null
+++ b/main
@@ -0,0 +1,5 @@
+DEPEND="
+	base
+	arch? (amd64)
+	target? (linux)
+	lib? (glibc)"

diff --git a/profiles/README.profiles b/profiles/README.profiles
deleted file mode 100644
index 3fc4a26..0000000
--- a/profiles/README.profiles
+++ /dev/null
@@ -1,7 +0,0 @@
-arch		Archetect
-Base		Base
-lib		Glibc
-type		Linux
-target	64bit, 32bit, mixed
-releases	13.0
-features	desktop, kde, gnome, hardened, selinux

diff --git a/profiles/arch/amd64/parent b/profiles/arch/amd64/parent
deleted file mode 100644
index eb001c6..0000000
--- a/profiles/arch/amd64/parent
+++ /dev/null
@@ -1 +0,0 @@
-../base

diff --git a/profiles/arch/amd64/rules b/profiles/arch/amd64/rules
new file mode 100644
index 0000000..309e644
--- /dev/null
+++ b/profiles/arch/amd64/rules
@@ -0,0 +1,2 @@
+DEPEND="
+	target? (multilib/lib32)"

diff --git a/profiles/arch/x86/CVS/Entries b/profiles/arch/x86/CVS/Entries
deleted file mode 100644
index d67c8b2..0000000
--- a/profiles/arch/x86/CVS/Entries
+++ /dev/null
@@ -1,14 +0,0 @@
-/parent/1.1/Sun Sep 21 00:12:01 2008//
-/profile.bashrc/1.3/Fri Jul  8 15:36:30 2011//
-D/xbox////
-/package.use/1.2/Sun Nov 11 13:43:00 2012//
-/use.force/1.2/Wed Feb 13 00:15:15 2013//
-/package.mask/1.24/Sun Aug 25 00:23:23 2013//
-/eapi/1.1/Wed Mar 19 00:20:01 2014//
-/package.use.force/1.3/Thu Jun 12 06:29:47 2014//
-/package.use.stable.mask/1.9/Tue Nov 25 18:15:04 2014//
-/use.stable.mask/1.8/Tue Nov 25 18:15:04 2014//
-/ChangeLog/1.189/Fri Jan 30 22:46:43 2015//
-/make.defaults/1.17/Fri Jan 30 22:46:43 2015//
-/package.use.mask/1.146/Fri Jan 30 22:46:43 2015//
-/use.mask/1.69/Fri Jan 30 22:46:43 2015//

diff --git a/profiles/arch/x86/CVS/Repository b/profiles/arch/x86/CVS/Repository
deleted file mode 100644
index 3fa9c82..0000000
--- a/profiles/arch/x86/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-gentoo-x86/profiles/arch/x86

diff --git a/profiles/arch/x86/CVS/Root b/profiles/arch/x86/CVS/Root
deleted file mode 100644
index ef93b44..0000000
--- a/profiles/arch/x86/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-zorry@××××××××××.org:/var/cvsroot

diff --git a/profiles/arch/x86/ChangeLog b/profiles/arch/x86/ChangeLog
deleted file mode 100644
index 16c6eaa..0000000
--- a/profiles/arch/x86/ChangeLog
+++ /dev/null
@@ -1,597 +0,0 @@
-# ChangeLog for Gentoo/x86 profile directory
-# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/ChangeLog,v 1.189 2015/01/30 21:48:00 mgorny Exp $
-
-  30 Jan 2015; Michał Górny <mgorny@g.o> make.defaults:
-  Hide CPU_FLAGS_X86 everywhere but on amd64 & x86.
-
-  28 Jan 2015; Michał Górny <mgorny@g.o> package.use.mask:
-  Update package.use.* entries for CPU_FLAGS_X86. Keep duplicate with old flags
-  until conversion is complete.
-
-  28 Jan 2015; Mike Gilbert <floppym@g.o> xbox/make.defaults:
-  Set CPU_FLAGS_X86 to a reasonable default.
-
-  28 Jan 2015; Michał Górny <mgorny@g.o> use.mask:
-  Mask CPU_FLAGS_X86 for non-x86 arches.
-
-  23 Dec 2014; Gilles Dartiguelongue <eva@g.o> package.use.mask:
-  Add mask for USE=kms for x11-wm/mutter-3.14, bug #533420.
-
-  23 Dec 2014; Gilles Dartiguelongue <eva@g.o> package.use.mask:
-  Add package.use.mask entry for clutter, bug #533420.
-
-  16 Nov 2014; Mike Gilbert <floppym@g.o> use.stable.mask:
-  Drop unneeded python3_4 (un)mask.
-
-  15 Nov 2014; Mike Gilbert <floppym@g.o> package.use.stable.mask:
-  Move pyudev[python3_4] mask to base profile.
-
-  09 Nov 2014; Michał Górny <mgorny@g.o> package.use.stable.mask,
-  use.mask, use.stable.mask:
-  Unmask PyPy3.
-
-  09 Nov 2014; Michał Górny <mgorny@g.o> package.use.stable.mask:
-  Remove stale masks on dev-python/python-exec.
-
-  04 Nov 2014; Mike Gilbert <floppym@g.o> package.use.stable.mask,
-  use.stable.mask:
-  Negate python3_4 stable mask.
-
-  19 Oct 2014; Mike Gilbert <floppym@g.o> use.mask, use.stable.mask:
-  Unmask/stable-mask apparmor.
-
-  18 Oct 2014; Mike Frysinger <vapier@g.o> package.use.mask:
-  Drop systemd-specific seccomp mask since the USE flag itself is handled
-  properly #524148 by Christian Ruppert.
-
-  11 Oct 2014; Tim Harder <radhermit@g.o> package.use.mask,
-  package.use.stable.mask:
-  Unmask skype use flag for net-im/bitlbee on unstable systems.
-
-  13 Sep 2014; Markos Chandras <hwoarang@g.o> package.use.mask:
-  midori[jit] works on x86
-
-  02 Sep 2014; Hans de Graaff <graaff@g.o> use.mask:
-  ruby_targets_jruby is now masked everywhere.
-
-  04 Aug 2014; Mike Frysinger <vapier@g.o> package.use.mask:
-  Unmask x86-specific flashrom USE flags.
-
-  27 Jul 2014; Alexis Ballier <aballier@g.o> use.mask:
-  unmask xop useflag on x86
-
-  01 Jul 2014; Michał Górny <mgorny@g.o> make.defaults:
-  Set default ABI_X86. Just in case.
-
-  29 Jun 2014; Andreas K. Huettel <dilfridge@g.o> use.mask:
-  Mask use-flag firebird and package dev-db/firebird for bug 460780
-
-  29 Jun 2014; Andreas K. Huettel <dilfridge@g.o>
-  package.use.stable.mask:
-  Stablemask firebird useflag on libreoffice until dependencies are stabilized
-
-  25 Jun 2014; Michał Górny <mgorny@g.o> make.defaults:
-  Fix typo.
-
-  25 Jun 2014; Michał Górny <mgorny@g.o> make.defaults:
-  Experimentally mark native ABI USE flag implicit for better
-  user-friendliness.
-
-  20 Jun 2014; Michał Górny <mgorny@g.o> make.defaults:
-  Set amd64-compatible values for ABI and related variables.
-
-  23 Apr 2014; Lars Wendler <polynomial-c@g.o> package.use.mask:
-  media-sound/lmms[vst] works on 32bit x86
-
-  08 Apr 2014; Mike Gilbert <floppym@g.o> package.use.stable.mask,
-  use.mask, use.stable.mask:
-  Drop pypy2_0.
-
-  30 Mar 2014; Michał Górny <mgorny@g.o> +package.use.stable.mask,
-  use.mask, use.stable.mask:
-  Move pypy flag masks to arch profile since it is EAPI=5 now.
-
-  30 Mar 2014; Michał Górny <mgorny@g.o> use.mask:
-  Fix order of use.mask. Sorry for messing it up.
-
-  30 Mar 2014; Mike Gilbert <floppym@g.o> package.use.mask:
-  Add missing '-' to systemd seccomp mask.
-
-  30 Mar 2014; Andrey Grozin <grozin@g.o> +use.stable.mask:
-  Masking gcl
-
-  27 Mar 2014; Mike Gilbert <floppym@g.o> package.use.mask:
-  Negate sys-apps/systemd[seccomp] mask.
-
-  19 Mar 2014; Andreas K. Huettel <dilfridge@g.o> +eapi, +xbox/eapi:
-  Increase EAPI to 5
-
-  09 Mar 2014; Andrey Grozin <grozib@g.o> use.mask:
-  Unmask gcl
-
-  08 Mar 2014; Matt Turner <mattst88@g.o> package.use.mask:
-  Add media-libs/mesa -openmax to package.use.mask.
-
-  26 Feb 2014; Mike Gilbert <floppym@g.o> use.mask:
-  Unmask avx2
-
-  16 Feb 2014; Samuli Suominen <ssuominen@g.o> package.use.mask:
-  Mask experimental USE="sse2" for libmikmod.
-
-  18 Jan 2014; Mike Frysinger <vapier@g.o> make.defaults:
-  Drop python targets hacks now that base/ has it #474128.
-
-  27 Dec 2013; Sergey Popov <pinkbyte@g.o> package.use.mask:
-  Unmask 'context' USE-flag for dev-libs/boost
-
-  19 Nov 2013; Tim Harder <radhermit@g.o> package.use.mask:
-  Unmask racket USE flag for app-editors/(g)vim.
-
-  08 Sep 2013; Christoph Junghans <ottxor@g.o> package.use.mask:
-  masked sci-libs/fftw[quad]
-
-  01 Sep 2013; Jeff Horelick <jdhore@g.o> package.use.mask:
-  unmask sid for >=media-plugins/audacious-plugins-3.4
-
-  24 Aug 2013; Markus Meier <maekke@g.o> package.mask:
-  remove texlive-2013 mask, bug #475124
-
-  22 Aug 2013; Chí-Thanh Christopher Nguyễn <chithanh@g.o> use.mask:
-  Drop obsolete opencl unmask.
-
-  13 Aug 2013; Tim Harder <radhermit@g.o> package.use.mask:
-  Unmask luajit USE flag for app-editors/(g)vim.
-
-  11 Aug 2013; Alexis Ballier <aballier@g.o> package.mask:
-  move texlive mask from global to arch profiles, bug #475124
-
-  09 Jun 2013; Ulrich Müller <ulm@g.o> package.use.mask:
-  Remove mask for media-libs/realcodecs. Package has been removed.
-
-  08 Jun 2013; Sergey Popov <pinkbyte@g.o> package.use.mask:
-  Move mask for app-leechcraft/leechcraft-meta[unstable] to base profile
-
-  19 May 2013; Justin Lecher <jlec@g.o> package.use.mask:
-  Add missing use unmask, #469530
-
-  04 May 2013; Michał Górny <mgorny@g.o> package.use.mask:
-  Remove USE=systemd from package.use.mask since the flag is (un)masked
-  globally now.
-
-  04 May 2013; Michał Górny <mgorny@g.o> use.mask:
-  Mask systemd flag globally, unmask on arches on which systemd is keyworded.
-
-  07 Mar 2013; Tim Harder <radhermit@g.o> use.mask:
-  Unmask jython2_7 for PYTHON_TARGETS.
-
-  03 Mar 2013; Michał Górny <mgorny@g.o> use.mask:
-  Fix abi_x86_32 unmask.
-
-  21 Feb 2013; Justin Lecher <jlec@g.o> package.use.mask:
-  cuda only works on x86 and amd64
-
-  21 Feb 2013; Diego E. Pettenò <flameeyes@g.o> use.mask:
-  Fix error in masking.
-
-  16 Feb 2013; Agostino Sarubbo <ago@g.o> package.use.mask:
-  mask net-misc/leechcraft-full[unstable] because requires packages not ready
-  for the stabilization
-
-  12 Feb 2013; Christoph Junghans <ottxor@g.o> use.mask:
-  sse41 -> sse4_1 (bug #456886)
-
-  07 Feb 2013; Matt Turner <mattst88@g.o> use.mask:
-  Drop sse5 USE flag.
-
-  01 Feb 2013; Michał Górny <mgorny@g.o> use.force, use.mask:
-  Set ABI_X86 flags for amd64 & x86 up.
-
-  25 Jan 2013; Christoph Junghans <ottxor@g.o> use.mask:
-  unmask missing amd64/x86 instruction sets
-
-  20 Jan 2013; Michał Górny <mgorny@g.o> use.mask:
-  Remove the pypy unmask for old profiles. It is unmasked in the new EAPI=5
-  profiles now.
-
-  18 Jan 2013; Samuli Suominen <ssuominen@g.o> use.mask:
-  Don't unmask USE="clvm" here because it's not masked in base profile thus
-  making this entry pointless.
-
-  02 Jan 2013; Mike Gilbert <floppym@g.o> use.mask:
-  Mask pypy-1.8 for removal.
-
-  02 Jan 2013; Mike Gilbert <floppym@g.o> use.mask:
-  Unmask pypy targets.
-
-  30 Dec 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Unmask sys-kernel/dracut[dracut_modules_systemd] (masked in base).
-
-  30 Dec 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Unmask sys-kernel/dracut[dracut_modules_biosdevname] (masked in base).
-
-  30 Dec 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Unmask zeitgeist-datasources[chromium,tomboy] (masked in base).
-
-  27 Dec 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Add epiphany[jit] to webkit-gtk[jit] unmask.
-
-  26 Dec 2012; Christoph Junghans <ottxor@g.o> package.use.mask:
-  unmasked openmm/mkl for sci-chemistry/gromacs
-
-  19 Dec 2012; Sergey Popov <pinkbyte@g.o> package.mask,
-  package.use.mask, xbox/package.mask:
-  Clean up some deprecated atoms, wrt bug #444181
-
-  09 Dec 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask,
-  use.mask:
-  dev-lang/orc is used in many packages, so move orc from package.use.mask to
-  use.mask
-
-  30 Nov 2012; Christoph Junghans <ottxor@g.o> package.use.mask:
-  unmasked cuda for sci-chemistry/gromacs
-
-  26 Nov 2012; Anthony G. Basile <blueness@g.o> package.use.mask:
-  No need to unmask net-misc/tor[nat-pmp,upnp] on x86
-
-  24 Nov 2012; Mike Gilbert <floppym@g.o> use.mask:
-  Unmask python_single_target_jython2_5
-
-  12 Nov 2012; Mike Gilbert <floppym@g.o> make.defaults:
-  Move PYTHON_TARGETS=python3_2 from arch profiles to base.
-
-  05 Nov 2012; Sergei Trofimovich <slyfox@g.o> package.use:
-  Fixed typo qemu_softmmu_target{,s}_.
-
-  04 Nov 2012; Diego E. Pettenò <flameeyes@g.o> package.use.mask:
-  Unmask dane USE flag for net-libs/gnutls.
-
-  29 Oct 2012; Doug Goldstein <cardoe@g.o> +package.use:
-  Add package.use so we can enable the native arch as the default qemu target
-  for bug #437788
-
-  07 Oct 2012; Samuli Suominen <ssuominen@g.o> package.use.mask:
-  Restore USE="systemd" mask to sys-auth/polkit for stabilization.
-
-  15 Sep 2012; Johannes Huber <johu@g.o> package.use.mask:
-  Masked media-libs/phonon[zeitgeist] for stabilization as the use flag pulls a
-  dep tree of hell.
-
-  31 Jul 2012; Ralph Sennhauser <sera@g.o> use.mask:
-  Unmask python_targets_jython2_5 as it's available on x86.
-
-  16 Jul 2012; Anthony G. Basile <blueness@g.o> package.use.mask:
-  Mask net-libs/cyassl[sha512] on x86
-
-  04 Jul 2012; Samuli Suominen <ssuominen@g.o> package.use.mask:
-  Remove references to net-libs/xulrunner and www-client/icecat wrt #424617
-
-  14 Jun 2012; Davide Pesavento <pesa@g.o> package.use.mask:
-  Consolidate USE=jit masking/unmasking for qt-script and qt-webkit.
-
-  25 May 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Remove webkit-gtk's USE mask, the flags are now masked in specific arches.
-
-  24 May 2012; Arun Raghavan <ford_prefect@g.o> package.use.mask:
-  For PulseAudio, mask xen USE flag by default, unmask on x86/amd64 where it is
-  supported.
-
-  15 May 2012; Mike Gilbert <floppym@g.o> make.defaults:
-  Default PYTHON_TARGETS should include python-3 for arches where it is stable.
-  See bug 415575.
-
-  13 Apr 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Mask webkit-gtk[geoloc] in base and unmask on arches where app-misc/geoclue
-  and app-accessibility/at-spi2-core are available.
-
-  13 Apr 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Consolidate USE=systemd mask, and add gnome-system-monitor.
-
-  13 Apr 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Consolidate USE=systemd mask, and add gnome-system-monitor.
-
-  12 Apr 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
-  gobject-introspection[doctool], bug #411761.
-
-  11 Apr 2012; Michał Górny <mgorny@g.o> package.use.mask:
-  Unmask USE=jit on libzpaq for x86/amd64.
-
-  28 Mar 2012; Arun Raghavan <ford_prefect@g.o> package.use.mask:
-  webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
-  added.
-
-  27 Mar 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Allow networkmanager[systemd] on x86.
-
-  05 Mar 2012; Joerg Bornkessel <hd_brummy@g.o> use.mask:
-  dxr3 unmask, works with v4l2, #350211
-
-  28 Feb 2012; Samuli Suominen <ssuominen@g.o> use.mask:
-  Unmask USE="vidix" from base/use.mask.
-
-  27 Feb 2012; Bernard Cafarelli <voyageur@g.o> package.use.mask:
-  Allow gnustep-make[libobjc2] on amd64
-
-  08 Feb 2012; Bernard Cafarelli <voyageur@g.o> package.use.mask:
-  Drop arch-speficic mask on gnustep-base/gnustep-make[libobjc2]
-
-  26 Jan 2012; Thomas Kahle <tomka@g.o> package.use.mask:
-  unmask fprint for gdm-3 per bug 390345
-
-  17 Jan 2012; Doug Goldstein <cardoe@g.o> package.use.mask:
-  Mask the spice USE flag on app-emulation/qemu-kvm since the SPICE server
-  isn't supported on 32 bit platforms.
-
-  09 Jan 2012; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Unmask USE="jit" for webkit-gtk (bug #396313).
-
-  06 Dec 2011; Samuli Suominen <ssuominen@g.o> package.use.mask:
-  Unmask USE="pic" for media-video/transcode.
-
-  06 Dec 2011; Samuli Suominen <ssuominen@g.o> package.use.mask:
-  Unmask USE="nuv" for media-video/transcode as a x86 only feature.
-
-  29 Nov 2011; Davide Pesavento <pesa@g.o> package.use.mask:
-  Unmask USE="jit" for qt-webkit.
-
-  25 Nov 2011; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Mask USE flags on gnome-3.2 packages due to missing keywords on deps; bug
-  #390345
-
-  25 Nov 2011; Samuli Suominen <ssuominen@g.o> package.use.mask:
-  Unmask USE="suid" for www-client/links which is required by USE="svga"
-
-  21 Oct 2011; Kacper Kowalik <xarthisius@g.o> package.use.mask:
-  Drop hearbeat mask wrt #387685 by Marcin Mirosław <bug@×××××.pl>
-
-  21 Oct 2011; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Undo poorly thought out masking of USE="colord packagekit" on gtk+; need to
-  get it keyworded properly (bug #387959)
-
-  19 Oct 2011; Alexandre Rostovtsev <tetromino@g.o> package.use.mask:
-  Unmask USE="colord" and "packagekit" for x11-libs/gtk+.
-
-  16 Oct 2011; Samuli Suominen <ssuominen@g.o> package.use.mask:
-  Unmask USE="bluray" for gnome-base/gvfs.
-
-  03 Oct 2011; Samuli Suominen <ssuominen@g.o> use.mask:
-  Mask USE="dxr3" again wrt #350211.
-
-  27 Sep 2011; Nirbheek Chauhan <nirbheek@g.o> package.use.mask:
-  Mask dev-libs/glib[systemtap] and unmask for amd64/x86, bug 384647
-
-  22 Jul 2011; Anthony G. Basile <blueness@g.o> package.use.mask:
-  Unmask USE="nat-pmp" and "upnp" here.
-
-  11 Jul 2011; Samuli Suominen <ssuominen@g.o> use.mask:
-  Unmask USE="opencl" here.
-
-  11 Jul 2011; Robin H. Johnson <robbat2@g.o> package.use.mask:
-  unmask parse-clocks on x86/amd46 for ntp due to pps-tools.
-
-  08 Jul 2011; Samuli Suominen <ssuominen@g.o> profile.bashrc:
-  Convert "hasq" to "has" and "useq" to "use".
-
-  03 Jul 2011; Alexey Shvetsov <alexxy@g.o> package.use.mask:
-  unmask maui use flag for torque
-
-  01 Jul 2011; Alexey Shvetsov <alexxy@g.o> use.mask:
-  use unmask infiniband on x86
-
-  07 Jun 2011; Bernard Cafarelli <voyageur@g.o> package.use.mask:
-  Allow libobjc2 USE-flag on gnustep-base/gnustep-make
-
-  29 May 2011; Christian Faulhammer <fauli@g.o> package.use.mask:
-  Lift mask for spice USE flag on app-emulation/qemu-kvm, everything is now
-  keyworded
-
-  27 May 2011; Doug Goldstein <cardoe@g.o> package.use.mask:
-  Mask spice USE flag for app-emulation/qemu-kvm as the necessary
-  depends are masked. bug #368961
-
-  09 May 2011; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
-  use.mask:
-  Remove video_cards_nouveau unmask, bug #364027.
-
-  30 Apr 2011; Ulrich Mueller <ulm@g.o> -xbox/virtuals:
-  Remove old-style virtual/linux-sources, bug 118442.
-
-  28 Apr 2011; Andrey Grozin <grozin@g.o> package.use.mask:
-  Unmask cmucl USE flag on sci-mathematics/fricas
-
-  12 Apr 2011; Mart Raudsepp <leio@g.o> package.use.mask:
-  Unmask orc USE flag on gst-plugins-bad
-
-  10 Apr 2011; Ulrich Mueller <ulm@g.o> -virtuals, xbox/virtuals:
-  Remove old-style virtual/bootloader, bug 359971.
-
-  31 Mar 2011; Tomáš Chvátal <scarabeus@g.o> package.use.mask:
-  snort with prelude useflag is stable
-
-  30 Mar 2011; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
-  use.mask:
-  Unmask video_cards_qxl
-
-  24 Mar 2011; Jim Ramsay <lack@g.o> package.use.mask:
-  Bug 360235: Clean up USE mask for www-plugins/adobe-flash
-
-  20 Mar 2011; Mart Raudsepp <leio@g.o> package.use.mask:
-  Unmask orc USE flag on gst-plugins-good
-
-  26 Feb 2011; Thomas Kahle <tomka@g.o> package.use.mask:
-  libprelude can't go stable at this point, snort can.
-
-  22 Feb 2011; Kacper Kowalik <xarthisius@g.o> package.use.mask:
-  Mask pacemaker-gui[heartbeat] since >=heartbeat-3.0 is still masked
-
-  13 Feb 2011; Tim Harder <radhermit@g.o> package.use.mask:
-  Unmask bluray USE flag on mplayer
-
-  30 Jan 2011; Arun Raghavan <ford_prefect@g.o> package.use.mask:
-  Unmask orc USE flag on gst-plugins-ffmpeg
-
-  27 Dec 2010; Mart Raudsepp <leio@g.o> package.use.mask:
-  Add gst-plugins-a52dec to the orc package.use.mask unmask set
-
-  28 Nov 2010; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
-  package.use.mask:
-  Unmask mesa's llvm flag
-
-  18 Nov 2010; Arun Raghavan <ford_prefect@g.o> use.mask:
-  Orc optimisations work fine on x86
-
-  10 Nov 2010; Dane Smith <c1pher@g.o> package.use.mask:
-  Unmask valgrind use flag for net-libs/gnutls on x86.
-
-  17 Sep 2010; Andrey Grozin <grozin@g.o> package.use.mask:
-  Unmasking the USE flag clozurecl for maxima (formerly it was openmcl)
-
-  07 Sep 2010; Mike Frysinger <vapier@g.o> use.mask:
-  Mask USE=win64 on 32bit profiles.
-
-  23 Aug 2010; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
-  make.defaults:
-  Add VIDEO_CARDS="nouveau" to make.defaults
-
-  12 Aug 2010; Jim Ramsay <lack@g.o> package.use.mask:
-  Updating USE masks for www-plugin/adobe-flash: 32bit and 64bit for 10.0
-  and nspluginwrapper for 10.1
-
-  25 Jul 2010; Nirbheek Chauhan <nirbheek@g.o> package.use.mask:
-  Fix atom for pkgmove from www-client/mozilla-firefox -> www-client/firefox
-
-  01 Jul 2010; Kacper Kowalik <xarthisius@g.o> package.use.mask:
-  Correct masking sys-cluster/pacemaker[heartbeat]
-
-  01 Jul 2010; Kacper Kowalik <xarthisius@g.o> package.use.mask:
-  Masking sys-cluster/pacemaker[heartbeat]
-
-  26 Jun 2010; Nirbheek Chauhan <nirbheek@g.o> package.use.mask:
-  Forgot to unmask icecat too
-
-  26 Jun 2010; Nirbheek Chauhan <nirbheek@g.o> package.use.mask:
-  Unmask USE=ipc for firefox/xulrunner on x86 due to bug 325185
-
-  13 Jun 2010; Dror Levin <spatz@g.o> use.mask:
-  Remove vpx USE unmask.
-
-  12 Jun 2010; Dror Levin <spatz@g.o> use.mask:
-  Unmask amd64/x86 only vpx for now.
-
-  12 May 2010; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
-  package.use.mask:
-  unmask dev-libs/udis86 test after adding patch to make yasm optional
-
-  10 May 2010; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
-  package.use.mask:
-  unmask dev-libs/udis86 test
-
-  03 May 2010; Alex Legler <a3li@g.o> use.mask:
-  Unmask ruby_targets_ree18
-
-  13 Apr 2010; Chí-Thanh Christopher Nguyễn <chithanh@g.o>
-  package.use.mask:
-  unmask video_cards_nouveau
-
-  31 Mar 2010; Vlastimil Babka <caster@g.o> package.use.mask:
-  Stop unmasking nsplugin of sun-jdk and sun-jre-bin 1.5 due to security
-  #306579.
-
-  16 Mar 2010; Jim Ramsay <lack@g.o> package.use.mask:
-  Oops, got my binary backwards. Really masking this time
-
-  16 Mar 2010; Jim Ramsay <lack@g.o> package.use.mask:
-  Mask USE='32bit 64bit' for www-plugins/adobe-flash (Bug #283328)
-
-  07 Mar 2010; Samuli Suominen <ssuominen@g.o> use.mask:
-  Unmask x86_* flags sse3, sse4, sse4a, and sse5.
-
-  20 Feb 2010; Samuli Suominen <ssuominen@g.o> use.mask:
-  Unmask sane_backends_qcam here; masked in base.
-
-  14 Feb 2010; Samuli Suominen <ssuominen@g.o> use.mask:
-  Unmask SANE_BACKENDS="canon_pp hpsj5s mustek_pp" here.
-
-  02 Feb 2010; Samuli Suominen <ssuominen@g.o> -package.use.force:
-  Remove unrequired skype mask (and now empty package.use.force file).
-
-  08 Jan 2010; Samuli Suominen <ssuominen@g.o> +package.use.force:
-  Force USE="qt-static" enabled for net-im/skype wrt #295525.
-
-  08 Jan 2010; Diego E. Pettenò <flameeyes@g.o> use.mask:
-  Unmask JRuby target.
-
-  13 Dec 2009; Rémi Cardona <remi@g.o> use.mask:
-  drop "vermilion" from VIDEO_CARDS in all profiles
-
-  13 Dec 2009; Rémi Cardona <remi@g.o> make.defaults:
-  drop "vga" from VIDEO_CARDS in all profiles
-
-  23 Sep 2009; Jean-Noël Rivasseau <elvanor@g.o> package.use.mask:
-  X use flag only for amd64/x86, bug 285951.
-
-  05 Sep 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
-  package.mask:
-  Dropped the KDE-4.3 unmask from package.mask now that the mask has been
-  dropped from base/package.mask.
-
-  16 Aug 2009; Rémi Cardona <remi@g.o> make.defaults:
-  drop last traces of i810
-
-  15 Aug 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o>
-  package.mask:
-  Unmasked KDE-4.3.0 for x86 with the permission of Raúl Porcel (armin76).
-
-  21 Jul 2009; Christian Faulhammer <fauli@g.o> package.use.mask:
-  remove spurious mask, see bug 278246
-
-  24 May 2009; Vlastimil Babka <caster@g.o> package.use.mask:
-  Mask nsplugin of 1.4 JVM's. Bug #263810.
-
-  20 Mar 2009; Raúl Porcel <armin76@g.o> package.use.mask:
-  Package.use.mask sse2 on pixman, bug #260287
-
-  21 Jan 2009; Markus Meier <maekke@g.o> package.mask:
-  mask some unported x11-libs/qt-4.4* packages for a smooth upgrade wrt bug
-  #248038
-
-  18 Jan 2009; Markus Meier <maekke@g.o> package.mask:
-  mask this version for a smooth upgrade wrt bug #248038
-
-  02 Dec 2008; Raúl Porcel <armin76@g.o> package.use.mask:
-  P.use.mask media-libs/realcodecs win32codecs USE-flag because repoman complains
-
-  09 Nov 2008; Raúl Porcel <armin76@g.o> package.use.mask:
-  Fix masking of mplayer
-
-  27 Oct 2008; Mike Frysinger <vapier@g.o> use.mask:
-  Unmask lilo.
-
-  16 Aug 2008; Robert Buchholz <rbu@g.o> package.use.mask:
-  Unmask tls for kaa-base
-
-  20 Jul 2008; Serkan Kaba <serkan@g.o> package.use.mask:
-  Add app-text/enchant:zemberek unmask.
-
-  06 Jun 2008; Rémi Cardona <remi@g.o> package.mask:
-  pkgmove to gnome-base/gnome-control-center
-
-  30 Apr 2008; Sébastien Fabbro <bicatali@g.o> use.mask:
-  Removed masking of icc and ifc flags (now only local flags). Removed
-  inexistent icc-pgo flags
-
-  21 Apr 2008; Santiago M. Mola <coldwind@g.o> package.mask:
-  Add ->=net-im/telepathy-mission-control-4.65 to Gnome 2.22 mask.
-
-  10 Apr 2008; Donnie Berkholz <dberkholz@g.o>; make.defaults:
-  Make VIDEO_CARDS defaults a reasonable set instead of every imaginable
-  card.
-
-  10 Apr 2008; Donnie Berkholz <dberkholz@g.o>; use.mask:
-  changing around video_cards_via masking by unmasking only for available
-  arches instead of masking on unavailable.
-
-  03 Apr 2008; Mart Raudsepp <leio@g.o> package.mask:
-  Unmask GNOME-2.22 on x86
-

diff --git a/profiles/arch/x86/eapi b/profiles/arch/x86/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/arch/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
deleted file mode 100644
index da8597e..0000000
--- a/profiles/arch/x86/make.defaults
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/make.defaults,v 1.17 2015/01/30 21:48:00 mgorny Exp $
-
-# All extra USE/etc should be specified in sub-profiles.
-# DO NOT POLLUTE USE ON THIS PROFILE.
-
-ARCH="x86"
-ACCEPT_KEYWORDS="x86"
-
-CHOST="i686-pc-linux-gnu"
-CFLAGS="-O2 -march=i686 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Michał Górny <mgorny@g.o> (30 Jan 2015)
-# Unhide the CPU_FLAGS_X86 USE_EXPANDs.
-USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
-
-# Michał Górny <mgorny@g.o> (20 Jun 2014)
-# Provide values for ABI-related variables that are compatible with
-# multilib amd64, to make consistent ebuild writing easier.
-MULTILIB_ABIS="x86"
-DEFAULT_ABI="x86"
-ABI="x86"
-CHOST_x86="${CHOST}"
-LIBDIR_x86="lib"
-
-# 2006/08/18 - Donnie Berkholz <dberkholz@g.o>
-# Defaults for video drivers
-VIDEO_CARDS="fbdev glint intel mach64 mga nouveau nv r128 radeon savage sis tdfx trident vesa via vmware voodoo"
-
-# 2006/12/21 - Andrej Kacian <ticho@g.o>
-# Defaults for audio drivers
-ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1 emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
-
-# Michał Górny <mgorny@g.o> (25 Jun 2014)
-# Make the native ABI implicit so that MULTILIB_USEDEP can be satisfied
-# by non-multilib ebuilds when non-native ABIs are disabled.
-IUSE_IMPLICIT="abi_x86_32"
-
-# Michał Górny <mgorny@g.o> (01 Jul 2014)
-# Default to abi_x86_32 for packages that don't have it forced.
-ABI_X86="32"

diff --git a/profiles/arch/x86/package.mask b/profiles/arch/x86/package.mask
deleted file mode 100644
index 656dd7c..0000000
--- a/profiles/arch/x86/package.mask
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.mask,v 1.24 2013/08/24 15:29:37 maekke Exp $
-

diff --git a/profiles/arch/x86/package.use b/profiles/arch/x86/package.use
deleted file mode 100644
index 293b86a..0000000
--- a/profiles/arch/x86/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use,v 1.2 2012/11/05 15:51:49 slyfox Exp $
-
-# Doug Goldstein <cardoe@g.o> (29 Oct 2012)
-# Enable the native arch as the default qemu target
-app-emulation/qemu qemu_softmmu_targets_i386

diff --git a/profiles/arch/x86/package.use.force b/profiles/arch/x86/package.use.force
deleted file mode 100644
index a348b85..0000000
--- a/profiles/arch/x86/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.force,v 1.3 2014/06/12 06:29:47 phajdan.jr Exp $
-
-# Pawel Hajdan jr <phajdan.jr@g.o> (12 Jun 2014)
-# On x86 Chromium can be built in non-PIC mode, and this
-# flag can affect performance, see http://crbug.com/332109 .
-www-client/chromium -pic

diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
deleted file mode 100644
index b2eab0f..0000000
--- a/profiles/arch/x86/package.use.mask
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.mask,v 1.146 2015/01/28 21:33:02 mgorny Exp $
-
-# This file requires >=portage-2.1.1
-
-# Pacho Ramos <pacho@g.o> (18 Jan 2015)
-# Missing keywords
-media-plugins/gst-plugins-meta vaapi
-
-# Gilles Dartiguelongue <eva@g.o> (23 Dec 2014)
-# New dependencies for wayland support in Gnome 3.14
-# See bug #533420.
-media-libs/clutter egl
-x11-wm/mutter kms
-
-# Tim Harder <radhermit@g.o> (11 Oct 2014)
-# Unmask skype support for unstable keywords
-net-im/bitlbee -skype
-
-# Mike Frysinger <vapier@g.o> (04 Aug 2014)
-# Unmask flashrom drivers that only work on x86 due to in/out asm insns #454024
-sys-apps/flashrom -atahpt -nic3com -nicnatsemi -nicrealtek -rayer_spi -satamv
-
-# Yixun Lan <dlan@g.o> (21 May 2014)
-# sys-fs/zfs not keyworded on x86
-sys-cluster/ceph zfs
-
-# Lars Wendler <polynomial-c@g.o (23 Apr 2014)
-# Works on 32bit x86
-media-sound/lmms -vst
-
-# Matt Turner <mattst88@g.o> (07 Mar 2014)
-# media-libs/libomxil-bellagio keyworded on amd64/x86
-media-libs/mesa -openmax
-
-# Samuli Suominen <ssuominen@g.o> (16 Feb 2014)
-# Still considered experimental by upstream:
-# http://sourceforge.net/p/mikmod/bugs/16/#17ea
-media-libs/libmikmod sse2
-media-libs/libmikmod cpu_flags_x86_sse2
-
-# Sergey Popov <pinkbyte@g.o> (27 Dec 2013)
-# Boost.Context can be built on x86
-dev-libs/boost	-context
-
-# Christoph Junghans <ottxor@g.o> (08 Sep 2013)
-# restrict USE=quad for x86 as there are too less registers
-sci-libs/fftw quad
-
-# Jeff Horelick <jdhore@g.o> (1 Sep 2013)
-# Dependency (media-libs/libsidplayfp) only keyworded
-# on x86 and amd64. (masked in base)
->=media-plugins/audacious-plugins-3.4 -sid
-
-# Tim Harder <radhermit@g.o> (13 Aug 2013)
-# dev-lang/luajit keyworded for x86 (masked in base)
-# dev-scheme/racket keyworded for amd64 (masked in base)
-app-editors/vim -luajit -racket
-app-editors/gvim -luajit -racket
-
-# Kacper Kowalik <xarthisius@g.o> (09 Aug 2013)
-# Works on x86
-sys-apps/hwloc -cuda -gl -opencl
-
-# Pacho Ramos <pacho@g.o> (20 Jul 2013)
-# Keywords missing, bug #478104
->=app-editors/gedit-plugins-3.8.3 git
-
-# Justin Lecher <jlec@g.o> (21 Feb 2013)
-# cuda only works on x86 and amd64
-sci-libs/cholmod -cuda
-sci-libs/flann -cuda
-
-# Alexandre Rostovtsev <tetromino@g.o> (30 Dec 2012)
-# sys-apps/biosdevname, systemd work on this arch (masked in base)
-sys-kernel/dracut -dracut_modules_biosdevname -dracut_modules_systemd
-
-# Alexandre Rostovtsev <tetromino@g.o> (30 Dec 2012)
-# chromium, mono work on this arch (masked in base)
-gnome-extra/zeitgeist-datasources -chromium -tomboy
-
-# Christoph Jungans <ottxor@g.o> (26 Dec 2012)
-# cuda/openmm/mkl works on x86/amd64 (masked in base)
-sci-chemistry/gromacs -cuda -mkl -openmm
-
-# Diego Elio Pettenò <flameeyes@g.o> (3 Nov 2012)
-# Unmask here, as it's masked in base.
-net-libs/gnutls -dane
-
-# Johannes Huber <johu@g.o> (15 Sep 2012)
-# Masked for stabilization as the use flag pulls a dep tree of hell.
-media-libs/phonon zeitgeist
-
-# Ben de Groot <yngwin@g.o> (30 Jul 2012)
-# dependency keyworded here, masked in base
-media-libs/freetype -infinality
-
-# Rick Farina <zerochaos@g.o> (05 July 2012)
-# masked in base, unmask x86/amd64 only
-app-crypt/johntheripper -cuda
-
-# Alexandre Rostovtsev <tetromino@g.o> (12 Apr 2012)
-# Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
-# gobject-introspection[doctool], bug #411761
-dev-libs/gobject-introspection -doctool
-
-# Michał Górny <mgorny@g.o> (11 Apr 2012)
-# JIT compilation in libzpaq generates code for x86/amd64.
-app-arch/libzpaq -jit
-
-# Arun Raghavan <ford_prefect@g.o> (29 Mar 2012)
-# webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
-# added.
-# Arun Raghavan <ford_prefect@g.o> (24 May 2012)
-# Mask xen USE flag by default, unmask on x86/amd64 where it is supported.
-media-sound/pulseaudio -webrtc-aec -xen
-
-# Bernard Cafarelli <voyageur@g.o> (27 Feb 2012)
-# Masked in base profile, supported on this arch
-gnustep-base/gnustep-make -libobjc2
-
-# Doug Goldstein <cardoe@g.o> (17 Jan 2012)
-# The SPICE server is only supported on 64-bit platforms and not on 32-bit
-app-emulation/qemu	spice
-
-# Alexandre Rostovtsev <tetromino@g.o> (09 Jan 2012)
-# jsc JIT compilation is supported only on amd64/arm/x86 and their prefixes, so
-# it's masked in base profile and unmasked here (bug #396313).
-net-libs/webkit-gtk -jit
-www-client/epiphany -jit
-www-client/midori -jit
-
-# Samuli Suominen <ssuominen@g.o> (06 Dec 2011)
-# NuppelVideo support is x86 only
-media-video/transcode -nuv -pic
-
-# Davide Pesavento <pesa@g.o> (30 Nov 2011)
-# JavaScriptCore JIT is supported only on amd64/arm/x86,
-# so it's masked in base profile and unmasked here.
-dev-qt/qtscript -jit
-dev-qt/qtwebkit -jit
-
-# Samuli Suominen <ssuominen@g.o> (25 Nov 2011)
-# Expose USE="suid" for USE="svga" only for x86 users,
-# see base/package.use.mask
-www-client/links -suid
-
-# Samuli Suominen <ssuominen@g.o> (16 Oct 2011)
-# Masked in base, unmask per arch
-gnome-base/gvfs -bluray
-
-# Nirbheek Chauhan <nirbheek@g.o> (17 Sep 2011)
-# Systemtap is masked in base/package.use.mask
-# Temporarily unmask in amd64/x86, bug 384647
-dev-libs/glib -systemtap
-
-# Robin H. Johnson <robbat2@g.o> (10 Jul 2011)
-# PPS should work on all arches, but only keyworded on amd64/x86
->=net-misc/ntp-4.2.6_p3-r1 -parse-clocks
-
-# Alexey Shvetsov <alexxy@g.o> (1 Jul 2011)
-# Use mask infiniband for stable corosync and glusterfs
-=sys-cluster/glusterfs-3.1.2 infiniband
-=sys-cluster/corosync-1.3.0 infiniband
-
-# Luca Barbato <lu_zero@g.o> (28 Feb 2011)
-# # Masked in base, unmask for amd64/x86
-media-video/mplayer2 -bluray
-
-# Tim Harder <radhermit@g.o> (13 Feb 2011)
-# Masked in base, unmask for amd64/x86
->=media-video/mplayer-1.0_rc4_p20101219 -bluray
-
-# Thomas Kahle <tomka@g.o> (15 Jan 2011)
-# we dropped stable prelude but don't want to drop stable nufw
-=net-firewall/nufw-2.2.21 prelude
-
-# Chí-Thanh Christopher Nguyễn <chithanh@g.o> (28 Nov 2010)
-# sys-devel/llvm is keyworded on x86
-media-libs/mesa -llvm
-
-# Nirbheek Chauhna <nirbheek@g.o> (26 Jun 2010)
-# Inter-process communication doesn't work on anything except x86/amd64/arm
-# due to lack of atomic ops, bug 325185
-www-client/firefox -ipc
-
-# Tomáš Chvátal <scarabeus@g.o> (4 Apr 2010)
-# x86 platforms works
-sys-power/pm-utils -video_cards_intel -video_cards_radeon
-
-# Vlastimil Babka <caster@g.o> (31 Mar 2010)
->=dev-java/sun-jdk-1.6 -nsplugin
->=dev-java/sun-jre-bin-1.6 -nsplugin
->=dev-java/ibm-jdk-bin-1.5 -nsplugin
->=dev-java/ibm-jre-bin-1.5 -nsplugin
-
-# Jim Ramsay <lack@g.o> (24 March 2011)
-# '64bit' '32bit' 'nspluginwrapper' are for amd64 only
-www-plugins/adobe-flash 32bit 64bit
-
-# Mounir Lamouri <volkmar@g.o> (07 Nov 2009)
-# Masked in base, unmak for amd64/x86. Bug 267264
-media-gfx/k3d -cuda
-
-# Jean-Noël Rivasseau <elvanor@g.o> (23 Sep 2009)
-# X use flag only for amd64/x86, bug 285951.
-media-gfx/iscan -X
-
-# Tomáš Chvátal <scarabeus@g.o> (10 Sep 2009)
-# quakeforge has video_cards_voodoo enabled only for x86
-games-fps/quakeforge -video_cards_tdfx
-
-# Tomas Chvatal <scarabeus@g.o> (24 Nov 2008)
-# masked in base, unmask for x86/amd64
-sci-misc/boinc -cuda
-
-# Robert Buchholz <rbu@g.o> (16 Aug 2008)
-# masked in base, unmask for x86/amd64
-dev-python/kaa-base -tls
-
-# Serkan Kaba <serkan@g.o> (20 Jul 2008)
-app-text/enchant -zemberek
-
-x11-terms/eterm sse2
-x11-terms/eterm cpu_flags_x86_sse2
-
-# Christian Faulhammer <opfer@g.o> (14 Jan 2008)
-# only works on x86
-dev-java/ibm-jdk-bin -alsa
-dev-java/ibm-jre-bin -alsa
-
-# Steve Dibb <beandog@g.o> (29 Sept 2008)
-media-video/mplayer -cpudetection -custom-cpuopts -bindist

diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
deleted file mode 100644
index 8916996..0000000
--- a/profiles/arch/x86/package.use.stable.mask
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/package.use.stable.mask,v 1.9 2014/11/15 21:23:39 floppym Exp $
-
-# When you add an entry to the top of this file, add your name, the date, and
-# an explanation of why something is getting masked. Please be extremely
-# careful not to commit atoms that are not valid, as it can cause large-scale
-# breakage, especially if it ends up in the daily snapshot.
-#
-## Example:
-##
-## # Dev E. Loper <developer@g.o> (28 Jun 2012)
-## # Masking foo USE flag until we can get the
-## # foo stuff to work properly again (bug 12345)
-## =media-video/mplayer-0.90_pre5 foo
-## =media-video/mplayer-0.90_pre5-r1 foo
-#
-
-#--- END OF EXAMPLES ---
-
-# Tim Harder <radhermit@g.o> (11 Oct 2014)
-# Masked since skype isn't stable
-net-im/bitlbee skype
-
-# Andreas K. Huettel <dilfridge@g.o> (29 Jun 2014)
-# Not yet stabilized dependencies blocking sec bug 514886
-# we need to repeat this here likely because of the use.mask entry
-app-office/libreoffice firebird
-
-# Michał Górny <mgorny@g.o> (30 Mar 2014)
-# Don't apply stable masks to python-exec since we're forcing every
-# impl there anyway. Please keep this in sync with use.stable.mask.
-dev-lang/python-exec -python_targets_pypy
-dev-lang/python-exec -python_single_target_pypy
-dev-lang/python-exec -python_targets_pypy3
-dev-lang/python-exec -python_single_target_pypy3
-
-# Tom Wijsman <TomWij@g.o (16 Mar 2014)
-# Mask unstable USE flags on media-video/vlc, see security bug #499806.
-media-video/vlc gnutls opus vdpau
-
-# Tom Wijsman <TomWij@g.o> (06 Feb 2014)
-# [QA] Masked jit USE flag on www-apps/cgit as dev-lang/luajit is not stable.
-www-apps/cgit jit

diff --git a/profiles/arch/x86/parent b/profiles/arch/x86/parent
deleted file mode 100644
index eb001c6..0000000
--- a/profiles/arch/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-../base

diff --git a/profiles/arch/x86/profile.bashrc b/profiles/arch/x86/profile.bashrc
deleted file mode 100644
index cf66d2d..0000000
--- a/profiles/arch/x86/profile.bashrc
+++ /dev/null
@@ -1,12 +0,0 @@
-if [[ ${EBUILD_PHASE} == "setup" ]] ; then
-
-	# on x86, -pg requires the frame pointer, so turning it off makes no sense
-	if has profile ${IUSE} && use profile && \
-	   has -fomit-frame-pointer ${CFLAGS} ${CXXFLAGS}
-	then
-		eerror "\nUSE=profile and -fomit-frame-pointer make no sense"
-		eerror "Fix your build settings to avoid build failures\n"
-		[[ -z ${EPAUSE_IGNORE} ]] && sleep 5
-	fi
-
-fi

diff --git a/profiles/arch/x86/use.force b/profiles/arch/x86/use.force
deleted file mode 100644
index 1f18bb0..0000000
--- a/profiles/arch/x86/use.force
+++ /dev/null
@@ -1,7 +0,0 @@
-# Force the flag which corresponds to ARCH.
-x86
-
-# Michał Górny <mgorny@g.o> (26 Jan 2013)
-# Force the flag corresponding to the only ABI. This allows x86 binary
-# packages to have uniform dependencies for amd64-multilib & x86.
-abi_x86_32

diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
deleted file mode 100644
index 5cca120..0000000
--- a/profiles/arch/x86/use.mask
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.mask,v 1.69 2015/01/28 19:21:45 mgorny Exp $
-
-# Unmask the flag which corresponds to ARCH.
--x86
-
-# Mike Gilbert <floppym@g.o (19 Oct 2014)
-# sys-libs/libapparmor
--apparmor
-
-# Alexey Shvetsov <alexxy@g.o> (08 Apr 2014)
-# Cuda works here
--cuda
-
-# Michał Górny <mgorny@g.o> (30 Mar 2014)
-# PyPy is keyworded on this arch.
--python_targets_pypy
--python_single_target_pypy
--python_targets_pypy3
--python_single_target_pypy3
-
-# Michał Górny <mgorny@g.o> (4 May 2013)
-# Unmask systemd since it is keyworded here.
--systemd
-
-# Andrey Grozin <grozin@g.o> (25 Jun 2014)
-# keyworded on x86
--clisp
--clozurecl
--cmucl
--ecls
--gcl
--sbcl
-
-# Michał Górny <mgorny@g.o> (26 Jan 2013)
-# Unmask the flag corresponding to the only ABI. This allows x86 binary
-# packages to have uniform dependencies for amd64-multilib & x86.
--abi_x86_32
-
-# Alexandre Rostovtsev <tetromino@g.o> (09 Dec 2012)
-# Orc optimisations work fine on amd64 and x86
--orc
-
-# Diego Elio Pettenò <flameeyes@g.o> (21 Aug 2012)
-# IPMI is only implemented for x86, amd64 and ia64
--ipmi
-
-# Ralph Sennhauser <sera@g.o> (31 Jul 2012)
-# Keyworded on x86
--python_targets_jython2_5
--python_single_target_jython2_5
--python_targets_jython2_7
--python_single_target_jython2_7
-
-# Joerg Bornkessel <hd_brummy@g.o> (05. Mar 2012)
-# Unmask, works with v4l2, #350211
--dxr3
-
-# Samuli Suominen <ssuominen@g.o> (28 Feb 2012)
-# Unmasking vidix for x86 which is masked in base/use.mask for others
--vidix
-
-# Justin Lecher <jlec@g.o> (04 Feb 2012)
-# Unmask because deps are keyworded
--zeitgeist
-
-# This file masks out USE flags that are simply NOT allowed in the default
-# x86 profile.  This works, for example, if another architecture's
-# profile have a USE flag associated with (such as altivec, mmx, etc).
-
-# 2011/12/22 - Alexis Ballier <aballier@g.o>
-# Unmask vdpau as its supported here
--vdpau
-
-# 2011/07/01 - Alexey Shvetsov <alexxy@g.o>
-# Infiniband stuff works on x86
--infiniband
-
-# 2010/07/27 - Matti Bickel <mabi@g.o>
-# app-text/fdf is only supported on x86
--fdftk
-
-# 2010/02/14 - Samuli Suominen <ssuominen@g.o>
-# Unmask amd64/x86 only SANE_BACKENDS
--sane_backends_canon_pp
--sane_backends_hpsj5s
--sane_backends_mustek_pp
--sane_backends_qcam
-
-# 2010/05/03 - Alex Legler <a3li@g.o>
-# Add support for Ruby Enterprise Edition targets where rubyee is available
-# -ruby_targets_ree18
-
-# 2010/01/08 - Diego E. Pettenò <flameeyes@g.o>
-# Add support for JRuby targets where jruby is available
-#-ruby_targets_jruby
-
-# pbbuttonsd and macbook for KDE and pbuttonsd it
-#-pbbuttonsd
--macbook
-
-# Unmask x86 instruction sets
--3dnow
--3dnowext
--lilo
--mmx
--mmxext
--sse
--sse2
--sse3
--sse4
--sse4_1
--sse4_2
--sse4a
--ssse3
--avx
--avx128fma
--avx2
--avx256
--fma3
--fma4
--xop
--svga
--kqemu
--nvram
--cpu_flags_x86_3dnow
--cpu_flags_x86_3dnowext
--cpu_flags_x86_aes
--cpu_flags_x86_avx
--cpu_flags_x86_avx2
--cpu_flags_x86_fma3
--cpu_flags_x86_fma4
--cpu_flags_x86_mmx
--cpu_flags_x86_mmxext
--cpu_flags_x86_padlock
--cpu_flags_x86_popcnt
--cpu_flags_x86_sse
--cpu_flags_x86_sse2
--cpu_flags_x86_sse3
--cpu_flags_x86_sse4_1
--cpu_flags_x86_sse4_2
--cpu_flags_x86_sse4a
--cpu_flags_x86_ssse3
--cpu_flags_x86_xop
-
-# Unmask nvidia XvMC support
--nvidia
-
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
--oracle
-
-# Unmask osp, used by asterisk; bug 115798
--osp
-
-# Unmask yellownet, used by aqbanking (bug 149970)
--yellownet
-
-# Modular X: unmask for architectures on which they are available
--input_devices_synaptics
--input_devices_virtualbox
--input_devices_vmmouse
--input_devices_wacom
--video_cards_nvidia
--video_cards_fglrx
--video_cards_vmware
--video_cards_geode
--video_cards_via
--video_cards_virtualbox
--video_cards_xgi
--video_cards_qxl
-
-# Modular X: mask for architectures on which they aren't available
-video_cards_newport
-
-#codec support
--x264
-
-# lvm2 cluster
--gulm
-
-# psyco works on x86
--psyco
-
-# Diego Pettenò <flameeyes@g.o> (4 Jan 2007)
-# Unmask the flags for PHP that are available only on x86
--fdftk
--sybase-ct
--ingres
--birdstep
--adabas
--filepro
--pfpro
--informix
--empress
--empress-bcs
--sybase
--frontbase
--dbmaker
--esoob
--solid
-# Shared with amd64
--oci8
--oracle7
--db2
-
-# Robert Buchholz <rbu@g.o> (03 Jun 2007)
-# Unmask as it works on x86
--lcd_devices_svga
--lcd_devices_luise
-
-# George Shapovalov <george@g.o> (8 Apr 2007)
-# supported on x86
--ada
-
-# tcc is x86 only
--tcc
-
-# 64bit Windows doesn't work on 32bit systems
-win64
-
-# fdk-aac is already keyworded here
--fdk

diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
deleted file mode 100644
index 5341ceb..0000000
--- a/profiles/arch/x86/use.stable.mask
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/use.stable.mask,v 1.8 2014/11/16 02:25:27 floppym Exp $
-
-# This file requires eapi 5 or later. New entries go on top.
-# Please use the same syntax as in use.mask
-
-# Mike Gilbert <floppym@g.o> (19 Oct 2014)
-# sys-libs/libapparmor
-apparmor
-
-# Andrey Grozin <grozin@g.o> (25 Jun 2014)
-# no stable versions on x86
-clozurecl
-gcl
-
-# Michał Górny <mgorny@g.o> (30 Mar 2014)
-# PyPy is unstable on this arch.
-python_targets_pypy
-python_single_target_pypy
-python_targets_pypy3
-python_single_target_pypy3

diff --git a/profiles/arch/x86/xbox/CVS/Entries b/profiles/arch/x86/xbox/CVS/Entries
deleted file mode 100644
index 1f03765..0000000
--- a/profiles/arch/x86/xbox/CVS/Entries
+++ /dev/null
@@ -1,5 +0,0 @@
-/parent/1.1/Tue Apr  1 17:40:05 2008//
-/package.mask/1.2/Sat Jan  5 15:18:19 2013//
-/eapi/1.1/Wed Mar 19 00:20:01 2014//
-/make.defaults/1.3/Fri Jan 30 22:46:43 2015//
-D

diff --git a/profiles/arch/x86/xbox/CVS/Repository b/profiles/arch/x86/xbox/CVS/Repository
deleted file mode 100644
index 3407d30..0000000
--- a/profiles/arch/x86/xbox/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-gentoo-x86/profiles/arch/x86/xbox

diff --git a/profiles/arch/x86/xbox/CVS/Root b/profiles/arch/x86/xbox/CVS/Root
deleted file mode 100644
index ef93b44..0000000
--- a/profiles/arch/x86/xbox/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-zorry@××××××××××.org:/var/cvsroot

diff --git a/profiles/arch/x86/xbox/eapi b/profiles/arch/x86/xbox/eapi
deleted file mode 100644
index 7ed6ff8..0000000
--- a/profiles/arch/x86/xbox/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/arch/x86/xbox/make.defaults b/profiles/arch/x86/xbox/make.defaults
deleted file mode 100644
index dd13a30..0000000
--- a/profiles/arch/x86/xbox/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/xbox/make.defaults,v 1.3 2015/01/28 21:06:18 floppym Exp $
-
-PROFILE_ARCH="xbox"
-USE="mmx sse"
-CPU_FLAGS_X86="mmx sse"
-
-CFLAGS="-O2 -march=pentium3 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"

diff --git a/profiles/arch/x86/xbox/package.mask b/profiles/arch/x86/xbox/package.mask
deleted file mode 100644
index a35c8fd..0000000
--- a/profiles/arch/x86/xbox/package.mask
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/x86/xbox/package.mask,v 1.2 2012/12/19 11:15:01 pinkbyte Exp $

diff --git a/profiles/arch/x86/xbox/parent b/profiles/arch/x86/xbox/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/arch/x86/xbox/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/features/desktop/gnome/parent b/profiles/features/desktop/gnome/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/features/desktop/gnome/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/features/desktop/kde/parent b/profiles/features/desktop/kde/parent
deleted file mode 100644
index f3229c5..0000000
--- a/profiles/features/desktop/kde/parent
+++ /dev/null
@@ -1 +0,0 @@
-..

diff --git a/profiles/features/no-multilib/eapi b/profiles/features/gnome/eapi
similarity index 100%
rename from profiles/features/no-multilib/eapi
rename to profiles/features/gnome/eapi

diff --git a/profiles/features/desktop/gnome/make.defaults b/profiles/features/gnome/make.defaults
similarity index 100%
rename from profiles/features/desktop/gnome/make.defaults
rename to profiles/features/gnome/make.defaults

diff --git a/profiles/features/desktop/gnome/package.use b/profiles/features/gnome/package.use
similarity index 100%
rename from profiles/features/desktop/gnome/package.use
rename to profiles/features/gnome/package.use

diff --git a/profiles/releases/13.0/parent b/profiles/features/gnome/parent
similarity index 100%
rename from profiles/releases/13.0/parent
rename to profiles/features/gnome/parent

diff --git a/profiles/features/hardened/linux/amd64/rules b/profiles/features/hardened/linux/amd64/rules
new file mode 100644
index 0000000..0c3d2ed
--- /dev/null
+++ b/profiles/features/hardened/linux/amd64/rules
@@ -0,0 +1,2 @@
+DEPEND="
+	.."

diff --git a/profiles/features/desktop/kde/eapi b/profiles/features/kde/eapi
similarity index 100%
rename from profiles/features/desktop/kde/eapi
rename to profiles/features/kde/eapi

diff --git a/profiles/features/desktop/kde/make.defaults b/profiles/features/kde/make.defaults
similarity index 100%
rename from profiles/features/desktop/kde/make.defaults
rename to profiles/features/kde/make.defaults

diff --git a/profiles/features/desktop/kde/package.use b/profiles/features/kde/package.use
similarity index 100%
rename from profiles/features/desktop/kde/package.use
rename to profiles/features/kde/package.use

diff --git a/profiles/features/hardened/linux/amd64/parent b/profiles/features/kde/parent
similarity index 100%
rename from profiles/features/hardened/linux/amd64/parent
rename to profiles/features/kde/parent

diff --git a/profiles/features/desktop/kde/use.force b/profiles/features/kde/use.force
similarity index 100%
rename from profiles/features/desktop/kde/use.force
rename to profiles/features/kde/use.force

diff --git a/profiles/releases/13.0/rules b/profiles/releases/13.0/rules
new file mode 100644
index 0000000..9e6a2bc
--- /dev/null
+++ b/profiles/releases/13.0/rules
@@ -0,0 +1,2 @@
+DEPEND="
+	releases"

diff --git a/profiles/rules b/profiles/rules
new file mode 100644
index 0000000..c7002de
--- /dev/null
+++ b/profiles/rules
@@ -0,0 +1,2 @@
+DEPEND="
+	arch/base"

diff --git a/profiles/features/desktop/gnome/eapi b/profiles/targets/no-multilib/eapi
similarity index 100%
rename from profiles/features/desktop/gnome/eapi
rename to profiles/targets/no-multilib/eapi

diff --git a/profiles/features/no-multilib/make.defaults b/profiles/targets/no-multilib/make.defaults
similarity index 100%
rename from profiles/features/no-multilib/make.defaults
rename to profiles/targets/no-multilib/make.defaults

diff --git a/profiles/features/no-multilib/package.mask b/profiles/targets/no-multilib/package.mask
similarity index 100%
rename from profiles/features/no-multilib/package.mask
rename to profiles/targets/no-multilib/package.mask

diff --git a/profiles/features/no-multilib/package.use.force b/profiles/targets/no-multilib/package.use.force
similarity index 100%
rename from profiles/features/no-multilib/package.use.force
rename to profiles/targets/no-multilib/package.use.force

diff --git a/profiles/features/no-multilib/package.use.mask b/profiles/targets/no-multilib/package.use.mask
similarity index 100%
rename from profiles/features/no-multilib/package.use.mask
rename to profiles/targets/no-multilib/package.use.mask

diff --git a/profiles/features/no-multilib/use.mask b/profiles/targets/no-multilib/use.mask
similarity index 100%
rename from profiles/features/no-multilib/use.mask
rename to profiles/targets/no-multilib/use.mask