diff --git a/README.rst b/README.rst
index 2d5fc5932..f425c031a 100644
--- a/README.rst
+++ b/README.rst
@@ -48,55 +48,77 @@ QUICK INSTALLATION GUIDE
           might want to try skipping to step 5 first, and if it doesn't work,
           coming back and doing steps 3 and 4.
 
-3. *UNMASK EBUILDS*:
-   Before being able to install you may need to unmask the required ebuilds. If
-   you are using Gentoo/unstable or Funtoo (i.e. you have a line like
-   ``ACCEPT_KEYWORDS=~arch`` in your /etc/portage/make.conf) you can at least
-   skip the ``keywords`` entries, but the ``unmask`` entries may still be
-   relevant. You can make use of the following files, which already contain all
-   required entries::
-
-     sage-on-gentoo/package.unmask/sage
-     sage-on-gentoo/package.keywords/sage
-     sage-on-gentoo/package.keywords/sage.prefix (for prefix users only)
-
-   To use these files permanently, place symbolic links to those files into your
-   ``/etc/portage/package.unmask`` and ``/etc/portage/package.keywords/``
-   directories, respectively::
-
-     ln -s <path-to-layman>/sage-on-gentoo/package.unmask/sage \
-           /etc/portage/package.unmask/sage
-     ln -s <path-to-layman>/sage-on-gentoo/package.keywords/sage \
-           /etc/portage/package.keywords/sage
-
-   Otherwise, simply copy them into the respective directories for a one-time
-   fix.
-
-   The sage.prefix files contains keywords for ebuilds lacking any prefix 
-   keywords.
-
-4. *ADD USE-FLAGS FOR EBUILDS*:
-   Since Sage's ebuild requires its dependencies to be built with several USE-
-   flags we provide a standard package.use file as well::
-
-     ln -s <path-to-layman>/sage-on-gentoo/package.use/sage \
-           /etc/portage/package.use/sage
-
-   If you are using unstable or Funtoo you may also need the following file::
-
-     ln -s <path-to-layman>/sage-on-gentoo/package.use/sage-unstable \
-           /etc/portage/package.use/sage-unstable
-
-   <path-to-layman> is usually /var/lib/layman (this path used to be
-   /usr/local/portage/layman for older version of layman).
-
-   You should also consider linking in the same way the file ``99sage-doc-bin``.
-   This file sets sane default options for installing html documentation from a binary
-   tarball. Building the sage documentation from scratch is memory hungry and you
-   shouldn't consider doing it with less than 6GB of free memory on your system.
-   This is only available for stable realease of sage (sage-X.Y). User of the development
-   version of sage (sage-9999 ebuild) need to build their own documentation from scratch
-   if they need it.
+3. *USE THE PROFILE*:
+   This overlay provides three types of profiles::
+
+     stable
+     stable/bindoc
+     devel
+
+   you can see them with the command::
+
+     eselect profile list
+
+   the fastest method for using the profile chosen is via::
+
+     eselect profile set <number>
+
+   where <number> is the number of the profile you want to use.
+
+   Alternatively, if you don't want to lose your profile, you can combine your
+   existing profile with one of the sage-on-gentoo overlay; you may want to
+   get a look to this link
+
+   https://wiki.gentoo.org/wiki/Profile_(Portage)#Combining_profiles
+
+   or follow our quickguide.
+   To get started you need a local overlay, for example in::
+
+     /usr/local/portage
+
+   next you have to put this line::
+
+     profile-formats = portage-2
+
+   in the file::
+
+     /usr/local/portage/metadata/layout.conf
+
+   then you have to create the path for your local profile, for example combining
+   hardened-amd64 with stable-bindoc-amd64::
+
+     mkdir -p /usr/local/portage/profiles/hardened/linux/amd64/sage-stable-bindoc/
+
+   once created, you put the lines corresponding to the path of the profiles (found
+   with eselect profile list)
+
+     sage-on-gentoo:default/linux/amd64/13.0/stable/bindoc
+     gentoo:hardened/linux/amd64
+
+   in::
+
+     /usr/local/portage/profiles/hardened/linux/amd64/sage-stable-bindoc/parent
+
+   remember that the order matters.
+   Lastly you have to add a line corresponding to the path you have created
+   following this format::
+
+     amd64 hardened/linux/amd64/sage-stable-bindoc stable
+
+   to the file::
+
+     /usr/local/portage/profiles/profiles.desc
+
+   remember to change "stable" into "dev" if you use the "devel" profile or into
+   "exp" if you use any of the prefix profiles and "amd64" to your architecture.
+
+   The new profile will show if you run::
+
+     eselect profile list
+
+   and now you can choose it with::
+
+     eselect profile set <number>
 
 5. *INSTALL SAGE*:
    Type::
diff --git a/metadata/layout.conf b/metadata/layout.conf
index f1f9325df..0ccdb0c37 100644
--- a/metadata/layout.conf
+++ b/metadata/layout.conf
@@ -20,3 +20,5 @@ thin-manifests = true
 update-changelog = false
 
 use-manifests = strict
+
+profile-formats = portage-2
diff --git a/package.keywords/sage b/package.keywords/sage
deleted file mode 120000
index 58987171d..000000000
--- a/package.keywords/sage
+++ /dev/null
@@ -1 +0,0 @@
-sage-7.6
\ No newline at end of file
diff --git a/package.keywords/sage-7.5.1 b/package.keywords/sage-7.5.1
deleted file mode 100644
index 45581a65e..000000000
--- a/package.keywords/sage-7.5.1
+++ /dev/null
@@ -1,188 +0,0 @@
-# app-emacs/imaxima-1.0-r3 is needed for >=maxima-5.29
-app-emacs/imaxima
-dev-java/asm:2
-~dev-lang/R-3.2.0
-~dev-lang/python-2.7.10
->=dev-libs/mathjax-2.5.0
-~dev-libs/mpc-1.0.2
->=dev-libs/ntl-9.8.1
-~dev-libs/ppl-1.1
-dev-libs/c-blosc
->=dev-lisp/ecls-16.0.0::sage-on-gentoo
-dev-python/characteristic
-dev-python/cvxopt
-~dev-python/cysignals-1.4.0
-~dev-python/cython-0.25.2::sage-on-gentoo
-~dev-python/bottleneck-0.8.0
->=dev-python/matplotlib-1.5.1
-~dev-python/networkx-1.10
-~dev-python/pyopenssl-0.14
-~dev-python/cryptography-0.6.1
-~dev-python/future-0.15.2
-dev-python/imagesize
-dev-python/ptyprocess
-~dev-python/python-dateutil-2.3
-~dev-python/python-openid-2.2.5
-~dev-python/flask-autoindex-0.5
-~dev-python/flask-babel-0.8
-~dev-python/flask-openid-1.2.4
-dev-python/flask-oldsessions
-=dev-python/psutil-4.4*
-~dev-python/flask-silk-0.2
-=dev-python/setuptools-20*
-dev-python/terminado
-dev-python/mistune
-=dev-python/numpy-1.10*::sage-on-gentoo
-dev-python/cycler
-dev-python/versioneer
-=dev-python/jedi-0.10*
-dev-python/typing
-=dev-python/ipython-5.3*
->=dev-python/notebook-4.1.0
->=dev-python/ipywidgets-4.0.0
-dev-python/widgetsnbextension
->=dev-python/ipykernel-4.0.0
-=dev-python/nbformat-4.0*
-=dev-python/path-py-7*
->=dev-python/ipyparallel-4.0.0
->=dev-python/traitlets-4.1.0
-dev-python/entrypoints
->=dev-python/nbconvert-4.0.0
-dev-python/prompt_toolkit
-dev-python/wcwidth
-dev-python/backports-shutil_get_terminal_size
-=dev-python/ipython_genutils-0.1*
->=dev-python/jupyter_core-4.0.0
->=dev-python/jupyter_client-4.0.0
->=dev-python/qtconsole-4.0.0
-dev-python/mpmath
->=dev-python/pexpect-4.0.1
-dev-python/pandas
-dev-python/pyasn1-modules
-~dev-python/pkgconfig-1.2.2
-~dev-python/pycurl-7.19.3.1
-~dev-python/pytz-2014.2
-~dev-python/pytables-3.1.1
-dev-python/rpy
-dev-python/simplegeneric
-~dev-python/speaklater-1.3
->=dev-python/sympy-1.0
-=dev-python/twisted-names-15*
-=dev-python/twisted-core-15*
-=dev-python/twisted-mail-15*
-=dev-python/twisted-web-15*
-dev-python/webassets
-~dev-python/werkzeug-0.9.6
-~dev-python/sphinx-1.4.1
-~dev-python/sphinx-1.4.4
-~dev-tex/sage-latex-3.0
-dev-tex/tkz-berge
-dev-tex/tkz-graph
-~media-gfx/tachyon-0.98.9
-sci-libs/cddlib
-sci-libs/dsdp
-~sci-libs/fflas-ffpack-2.2.2
-=sci-libs/fplll-5.0*
-~dev-python/fpylll-0.2.3
-~sci-libs/givaro-4.0.2
->=sci-libs/gsl-1.16
->=sci-libs/iml-1.0.4
-~sci-mathematics/cliquer-1.21
-~sci-libs/libgap-4.8.3
-~sci-libs/linbox-1.4.2
-~sci-libs/m4ri-20140914
-~sci-libs/m4rie-20150908
-~sci-libs/mpfi-1.5.1
-~sci-libs/pynac-0.7.3
-~sci-libs/scipy-0.17.0
-sci-libs/symmetrica
-sci-libs/vecmath-objectclub
-sci-libs/zn_poly
-~sci-mathematics/arb-2.8.1
-sci-mathematics/cu2
-sci-mathematics/cubex
-sci-mathematics/dikcube
->=sci-mathematics/eclib-20150510
-~sci-mathematics/gmp-ecm-6.4.4
-sci-mathematics/flintqs
-~sci-mathematics/flint-2.4.5
-~sci-mathematics/flint-2.5.2
-~sci-mathematics/gap-4.8.3
-=sci-mathematics/giac-1.2.2*
-dev-gap/GAPDoc
->=sci-mathematics/glpk-4.54
->=sci-mathematics/lcalc-1.23-r6
-sci-mathematics/lrcalc
-~sci-mathematics/maxima-5.35.1::sage-on-gentoo
-#~sci-mathematics/maxima-5.38.1::sage-on-gentoo
-sci-mathematics/mcube
-sci-mathematics/optimal
-sci-mathematics/palp
-~sci-mathematics/pari-2.8.0_alpha
-sci-mathematics/pari-data
-~sci-mathematics/planarity-2.2.0
-=sci-mathematics/brial-0.8*
-~sci-mathematics/nauty-2.6.1
-sci-mathematics/ratpoints
-sci-mathematics/rubiks
-sci-mathematics/rw
-~sci-mathematics/sage-7.5.1
-~sci-mathematics/sage-data-conway_polynomials-0.4
-~sci-mathematics/sage-data-combinatorial_designs-20140630
-~sci-mathematics/sage-data-elliptic_curves-0.8
-~sci-mathematics/sage-data-graphs-20161026
-~sci-mathematics/sage-data-polytopes_db-20120220
->=sci-mathematics/sage-notebook-0.13
-~sci-mathematics/singular-4.1.0_p1
-sci-mathematics/sympow
-~www-servers/tornado-3.1.1
-##########################
-# optional dependencies
-##########################
-sci-mathematics/ExportSageNB
-~sci-chemistry/sage-jmol-bin-14.2.11
-virtual/jre:1.7
-virtual/jdk:1.7
-dev-python/giacpy_sage
-#########################
-# sage optional binding
-#########################
-sci-libs/libbraiding
-sci-libs/libhomfly
-sci-libs/modular_decomposition
-~sci-libs/bliss-0.73
-=sci-libs/cxsparse-3.1*
-dev-libs/igraph
-~dev-python/python-igraph-0.7.0
-# coinor-cbc
-#sci-libs/coinor-clp
-#sci-libs/coinor-dylp
-#sci-libs/coinor-vol
-#sci-libs/coinor-cgl
-#sci-libs/coinor-utils
-#sci-libs/coinor-osi
-#sci-libs/coinor-cbc
-#####################
-# gap packages that can be used in sage
-#####################
-~dev-gap/aclib-1.2
-~dev-gap/Alnuth-3.0.0
-~dev-gap/autpgrp-1.5
-~dev-gap/crime-1.4
-~dev-gap/crystcat-1.1.6
-~dev-gap/ctbllib-1.2_p2
-~dev-gap/design-1.6
-~dev-gap/factint-1.5.3
-~dev-gap/grape-4.7
-~dev-gap/GUAVA-3.13
-~dev-gap/hap-1.11
-~dev-gap/HAPcryst-0.1.11
-~dev-gap/happrime-0.6
-~dev-gap/laguna-3.7.0
-~dev-gap/polycyclic-2.11
-~dev-gap/polymaking-0.8.1
-~dev-gap/sonata-2.8
-~dev-gap/cryst-4.1.12
-~dev-gap/toric-1.8
-~dev-gap/sage-meta-1.0
-
diff --git a/package.keywords/sage-devel b/package.keywords/sage-devel
deleted file mode 120000
index 5e5523272..000000000
--- a/package.keywords/sage-devel
+++ /dev/null
@@ -1 +0,0 @@
-sage-9999
\ No newline at end of file
diff --git a/profiles/arch.list b/profiles/arch.list
new file mode 100644
index 000000000..fb5b33a08
--- /dev/null
+++ b/profiles/arch.list
@@ -0,0 +1,4 @@
+amd64
+x86
+amd64-linux
+x86-linux
diff --git a/profiles/default/linux/amd64/13.0/devel/parent b/profiles/default/linux/amd64/13.0/devel/parent
new file mode 100644
index 000000000..e121b94a1
--- /dev/null
+++ b/profiles/default/linux/amd64/13.0/devel/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/devel
diff --git a/profiles/default/linux/amd64/13.0/parent b/profiles/default/linux/amd64/13.0/parent
new file mode 100644
index 000000000..f1f056c2f
--- /dev/null
+++ b/profiles/default/linux/amd64/13.0/parent
@@ -0,0 +1,2 @@
+gentoo:default/linux/amd64/13.0
+..
diff --git a/profiles/default/linux/amd64/13.0/stable/bindoc/parent b/profiles/default/linux/amd64/13.0/stable/bindoc/parent
new file mode 100644
index 000000000..bc5747dda
--- /dev/null
+++ b/profiles/default/linux/amd64/13.0/stable/bindoc/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:features/bindoc
diff --git a/profiles/default/linux/amd64/13.0/stable/parent b/profiles/default/linux/amd64/13.0/stable/parent
new file mode 100644
index 000000000..99840371f
--- /dev/null
+++ b/profiles/default/linux/amd64/13.0/stable/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/stable
diff --git a/profiles/default/linux/amd64/parent b/profiles/default/linux/amd64/parent
new file mode 100644
index 000000000..e49445b6b
--- /dev/null
+++ b/profiles/default/linux/amd64/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:arch/amd64
diff --git a/profiles/default/linux/parent b/profiles/default/linux/parent
new file mode 100644
index 000000000..f3229c5b9
--- /dev/null
+++ b/profiles/default/linux/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/x86/13.0/devel/parent b/profiles/default/linux/x86/13.0/devel/parent
new file mode 100644
index 000000000..e121b94a1
--- /dev/null
+++ b/profiles/default/linux/x86/13.0/devel/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/devel
diff --git a/profiles/default/linux/x86/13.0/parent b/profiles/default/linux/x86/13.0/parent
new file mode 100644
index 000000000..fd0a0a46c
--- /dev/null
+++ b/profiles/default/linux/x86/13.0/parent
@@ -0,0 +1,2 @@
+gentoo:default/linux/x86/13.0
+..
diff --git a/profiles/default/linux/x86/13.0/stable/bindoc/parent b/profiles/default/linux/x86/13.0/stable/bindoc/parent
new file mode 100644
index 000000000..bc5747dda
--- /dev/null
+++ b/profiles/default/linux/x86/13.0/stable/bindoc/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:features/bindoc
diff --git a/profiles/default/linux/x86/13.0/stable/parent b/profiles/default/linux/x86/13.0/stable/parent
new file mode 100644
index 000000000..99840371f
--- /dev/null
+++ b/profiles/default/linux/x86/13.0/stable/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/stable
diff --git a/profiles/default/linux/x86/parent b/profiles/default/linux/x86/parent
new file mode 100644
index 000000000..2600c5b96
--- /dev/null
+++ b/profiles/default/linux/x86/parent
@@ -0,0 +1 @@
+sage-on-gentoo:arch/x86
diff --git a/profiles/default/parent b/profiles/default/parent
new file mode 100644
index 000000000..f3229c5b9
--- /dev/null
+++ b/profiles/default/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/eapi b/profiles/eapi
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/profiles/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/features/bindoc/eapi b/profiles/features/bindoc/eapi
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/profiles/features/bindoc/eapi
@@ -0,0 +1 @@
+5
diff --git a/package.use/99sage-bin-doc b/profiles/features/bindoc/package.use
similarity index 100%
rename from package.use/99sage-bin-doc
rename to profiles/features/bindoc/package.use
diff --git a/package.unmask/sage b/profiles/package.unmask
similarity index 100%
rename from package.unmask/sage
rename to profiles/package.unmask
diff --git a/profiles/prefix/eapi b/profiles/prefix/eapi
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/profiles/prefix/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/prefix/linux-standalone/amd64/devel/parent b/profiles/prefix/linux-standalone/amd64/devel/parent
new file mode 100644
index 000000000..e121b94a1
--- /dev/null
+++ b/profiles/prefix/linux-standalone/amd64/devel/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/devel
diff --git a/profiles/prefix/linux-standalone/amd64/parent b/profiles/prefix/linux-standalone/amd64/parent
new file mode 100644
index 000000000..e54fd690e
--- /dev/null
+++ b/profiles/prefix/linux-standalone/amd64/parent
@@ -0,0 +1,3 @@
+gentoo:prefix/linux-standalone/amd64
+..
+sage-on-gentoo:arch/amd64
diff --git a/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent b/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent
new file mode 100644
index 000000000..bc5747dda
--- /dev/null
+++ b/profiles/prefix/linux-standalone/amd64/stable/bindoc/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:features/bindoc
diff --git a/profiles/prefix/linux-standalone/amd64/stable/parent b/profiles/prefix/linux-standalone/amd64/stable/parent
new file mode 100644
index 000000000..99840371f
--- /dev/null
+++ b/profiles/prefix/linux-standalone/amd64/stable/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/stable
diff --git a/profiles/prefix/linux-standalone/parent b/profiles/prefix/linux-standalone/parent
new file mode 100644
index 000000000..f3229c5b9
--- /dev/null
+++ b/profiles/prefix/linux-standalone/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/prefix/linux-standalone/x86/devel/parent b/profiles/prefix/linux-standalone/x86/devel/parent
new file mode 100644
index 000000000..e121b94a1
--- /dev/null
+++ b/profiles/prefix/linux-standalone/x86/devel/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/devel
diff --git a/profiles/prefix/linux-standalone/x86/parent b/profiles/prefix/linux-standalone/x86/parent
new file mode 100644
index 000000000..de5fbd6f9
--- /dev/null
+++ b/profiles/prefix/linux-standalone/x86/parent
@@ -0,0 +1,3 @@
+gentoo:prefix/linux-standalone/x86
+..
+sage-on-gentoo:arch/x86
diff --git a/profiles/prefix/linux-standalone/x86/stable/bindoc/parent b/profiles/prefix/linux-standalone/x86/stable/bindoc/parent
new file mode 100644
index 000000000..bc5747dda
--- /dev/null
+++ b/profiles/prefix/linux-standalone/x86/stable/bindoc/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:features/bindoc
diff --git a/profiles/prefix/linux-standalone/x86/stable/parent b/profiles/prefix/linux-standalone/x86/stable/parent
new file mode 100644
index 000000000..99840371f
--- /dev/null
+++ b/profiles/prefix/linux-standalone/x86/stable/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/stable
diff --git a/profiles/prefix/linux/amd64/devel/parent b/profiles/prefix/linux/amd64/devel/parent
new file mode 100644
index 000000000..e121b94a1
--- /dev/null
+++ b/profiles/prefix/linux/amd64/devel/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/devel
diff --git a/profiles/prefix/linux/amd64/parent b/profiles/prefix/linux/amd64/parent
new file mode 100644
index 000000000..d2b05d5f0
--- /dev/null
+++ b/profiles/prefix/linux/amd64/parent
@@ -0,0 +1,3 @@
+gentoo:prefix/linux/amd64
+..
+sage-on-gentoo:arch/amd64
diff --git a/profiles/prefix/linux/amd64/stable/bindoc/parent b/profiles/prefix/linux/amd64/stable/bindoc/parent
new file mode 100644
index 000000000..bc5747dda
--- /dev/null
+++ b/profiles/prefix/linux/amd64/stable/bindoc/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:features/bindoc
diff --git a/profiles/prefix/linux/amd64/stable/parent b/profiles/prefix/linux/amd64/stable/parent
new file mode 100644
index 000000000..99840371f
--- /dev/null
+++ b/profiles/prefix/linux/amd64/stable/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/stable
diff --git a/profiles/prefix/linux/parent b/profiles/prefix/linux/parent
new file mode 100644
index 000000000..f3229c5b9
--- /dev/null
+++ b/profiles/prefix/linux/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/prefix/linux/x86/devel/parent b/profiles/prefix/linux/x86/devel/parent
new file mode 100644
index 000000000..e121b94a1
--- /dev/null
+++ b/profiles/prefix/linux/x86/devel/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/devel
diff --git a/profiles/prefix/linux/x86/parent b/profiles/prefix/linux/x86/parent
new file mode 100644
index 000000000..1cd2f484a
--- /dev/null
+++ b/profiles/prefix/linux/x86/parent
@@ -0,0 +1,3 @@
+gentoo:prefix/linux/x86
+..
+sage-on-gentoo:arch/x86
diff --git a/profiles/prefix/linux/x86/stable/bindoc/parent b/profiles/prefix/linux/x86/stable/bindoc/parent
new file mode 100644
index 000000000..bc5747dda
--- /dev/null
+++ b/profiles/prefix/linux/x86/stable/bindoc/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:features/bindoc
diff --git a/profiles/prefix/linux/x86/stable/parent b/profiles/prefix/linux/x86/stable/parent
new file mode 100644
index 000000000..99840371f
--- /dev/null
+++ b/profiles/prefix/linux/x86/stable/parent
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/stable
diff --git a/package.keywords/sage.prefix b/profiles/prefix/package.keywords
similarity index 100%
rename from package.keywords/sage.prefix
rename to profiles/prefix/package.keywords
diff --git a/profiles/prefix/parent b/profiles/prefix/parent
new file mode 100644
index 000000000..f3229c5b9
--- /dev/null
+++ b/profiles/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
new file mode 100644
index 000000000..34c5399b0
--- /dev/null
+++ b/profiles/profiles.desc
@@ -0,0 +1,18 @@
+amd64		default/linux/amd64/13.0/stable			stable
+amd64		default/linux/amd64/13.0/stable/bindoc		stable
+amd64		default/linux/amd64/13.0/devel			dev
+x86		default/linux/x86/13.0/stable			stable
+x86		default/linux/x86/13.0/stable/bindoc		stable
+x86		default/linux/x86/13.0/devel			dev
+amd64-linux	prefix/linux/amd64/stable			exp
+amd64-linux	prefix/linux/amd64/stable/bindoc		exp
+amd64-linux	prefix/linux/amd64/devel			exp
+x86-linux	prefix/linux/x86/stable				exp
+x86-linux	prefix/linux/x86/stable/bindoc			exp
+x86-linux	prefix/linux/x86/devel				exp
+amd64-linux	prefix/linux-standalone/amd64/stable		exp
+amd64-linux	prefix/linux-standalone/amd64/stable/bindoc	exp
+amd64-linux	prefix/linux-standalone/amd64/devel		exp
+x86-linux	prefix/linux-standalone/x86/stable		exp
+x86-linux	prefix/linux-standalone/x86/stable/bindoc	exp
+x86-linux	prefix/linux-standalone/x86/devel		exp
diff --git a/profiles/releases/devel/eapi b/profiles/releases/devel/eapi
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/profiles/releases/devel/eapi
@@ -0,0 +1 @@
+5
diff --git a/package.keywords/sage-9999 b/profiles/releases/devel/package.keywords
similarity index 96%
rename from package.keywords/sage-9999
rename to profiles/releases/devel/package.keywords
index 272b4f38e..ef6f5b1fe 100644
--- a/package.keywords/sage-9999
+++ b/profiles/releases/devel/package.keywords
@@ -8,11 +8,11 @@ dev-java/asm:2
 >=dev-libs/ntl-9.8.1
 ~dev-libs/ppl-1.1
 dev-libs/c-blosc
->=dev-lisp/ecls-16.0.0::sage-on-gentoo
+>=dev-lisp/ecls-16.0.0
 dev-python/characteristic
 dev-python/cvxopt
 =dev-python/cysignals-1.6*
-~dev-python/cython-0.25.2::sage-on-gentoo
+~dev-python/cython-0.25.2
 ~dev-python/bottleneck-0.8.0
 >=dev-python/matplotlib-1.5.1
 ~dev-python/networkx-1.11
@@ -113,15 +113,15 @@ dev-gap/GAPDoc
 >=sci-mathematics/glpk-4.54
 >=sci-mathematics/lcalc-1.23-r6
 sci-mathematics/lrcalc
-~sci-mathematics/maxima-5.39.0::sage-on-gentoo
+~sci-mathematics/maxima-5.39.0
 sci-mathematics/mcube
 sci-mathematics/optimal
 sci-mathematics/palp
 ~sci-mathematics/pari-2.9.2
 sci-mathematics/pari-data
 ~sci-mathematics/planarity-3.0.0.5
-=sci-libs/libbrial-1.0*
-=dev-python/pybrial-1.0*
+=sci-libs/brial-1.0*
+=dev-python/sage-brial-1.0*
 ~sci-mathematics/nauty-2.6.1
 sci-mathematics/ratpoints
 sci-mathematics/rubiks
@@ -186,4 +186,3 @@ dev-libs/igraph
 ~dev-gap/cryst-4.1.12
 ~dev-gap/toric-1.8
 ~dev-gap/sage-meta-1.0
-
diff --git a/package.use/sage-unstable b/profiles/releases/devel/package.use
similarity index 100%
rename from package.use/sage-unstable
rename to profiles/releases/devel/package.use
diff --git a/profiles/releases/devel/parent b/profiles/releases/devel/parent
new file mode 100644
index 000000000..b39562b4b
--- /dev/null
+++ b/profiles/releases/devel/parent
@@ -0,0 +1 @@
+../stable
diff --git a/profiles/releases/stable/eapi b/profiles/releases/stable/eapi
new file mode 100644
index 000000000..7ed6ff82d
--- /dev/null
+++ b/profiles/releases/stable/eapi
@@ -0,0 +1 @@
+5
diff --git a/package.keywords/sage-7.6 b/profiles/releases/stable/package.keywords
similarity index 96%
rename from package.keywords/sage-7.6
rename to profiles/releases/stable/package.keywords
index 6afc64f95..69f2be96b 100644
--- a/package.keywords/sage-7.6
+++ b/profiles/releases/stable/package.keywords
@@ -8,11 +8,11 @@ dev-java/asm:2
 >=dev-libs/ntl-9.8.1
 ~dev-libs/ppl-1.1
 dev-libs/c-blosc
->=dev-lisp/ecls-16.0.0::sage-on-gentoo
+>=dev-lisp/ecls-16.0.0
 dev-python/characteristic
 dev-python/cvxopt
 ~dev-python/cysignals-1.4.0
-~dev-python/cython-0.25.2::sage-on-gentoo
+~dev-python/cython-0.25.2
 ~dev-python/bottleneck-0.8.0
 >=dev-python/matplotlib-1.5.1
 ~dev-python/networkx-1.10
@@ -32,7 +32,7 @@ dev-python/flask-oldsessions
 =dev-python/setuptools-20*
 dev-python/terminado
 dev-python/mistune
-=dev-python/numpy-1.10*::sage-on-gentoo
+=dev-python/numpy-1.10*
 dev-python/cycler
 dev-python/versioneer
 =dev-python/jedi-0.10*
@@ -113,7 +113,7 @@ dev-gap/GAPDoc
 >=sci-mathematics/glpk-4.54
 >=sci-mathematics/lcalc-1.23-r6
 sci-mathematics/lrcalc
-~sci-mathematics/maxima-5.39.0::sage-on-gentoo
+~sci-mathematics/maxima-5.39.0
 sci-mathematics/mcube
 sci-mathematics/optimal
 sci-mathematics/palp
@@ -185,4 +185,3 @@ dev-libs/igraph
 ~dev-gap/cryst-4.1.12
 ~dev-gap/toric-1.8
 ~dev-gap/sage-meta-1.0
-
diff --git a/package.use/sage b/profiles/releases/stable/package.use
similarity index 100%
rename from package.use/sage
rename to profiles/releases/stable/package.use