cschwan · Alessandro-Barbieri · May 28, 2017 · May 28, 2017 · May 28, 2017 · May 28, 2017
diff --git 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
@@ -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
diff --git a/package.keywords/sage-7.5.1 b/package.keywords/sage-7.5.1
diff --git a/package.keywords/sage-devel b/package.keywords/sage-devel
diff --git a/profiles/arch.list 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/stable
diff --git a/profiles/default/linux/amd64/parent 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
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/x86/13.0/devel/parent 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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/stable
diff --git a/profiles/default/linux/x86/parent b/profiles/default/linux/x86/parent
@@ -0,0 +1 @@
+sage-on-gentoo:arch/x86
diff --git a/profiles/default/parent b/profiles/default/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/eapi b/profiles/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/features/bindoc/eapi b/profiles/features/bindoc/eapi
@@ -0,0 +1 @@
+5
diff --git a/package.use/99sage-bin-doc → profiles/features/bindoc/package.use b/package.use/99sage-bin-doc → profiles/features/bindoc/package.use
diff --git a/package.unmask/sage → profiles/package.unmask b/package.unmask/sage → profiles/package.unmask
diff --git a/profiles/prefix/eapi 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/stable
diff --git a/profiles/prefix/linux-standalone/parent 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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+..
+sage-on-gentoo:releases/stable
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,5 @@ thin-manifests = true
		update-changelog = false

		use-manifests = strict

		profile-formats = portage-2