New default PORTDIR, PKGDIR, and DISTDIR settings approved by council

The locations approved by the council:

DISTDIR="/var/cache/distfiles"
PKGDIR="/var/cache/binpkgs"
PORTDIR="/var/db/repos/gentoo"

Bug: https://bugs.gentoo.org/684908
Signed-off-by: Zac Medico <zmedico@gentoo.org>

1 files changed, 12 insertions, 13 deletions

diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 957ab0e6..76ac4a29 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -31,14 +31,14 @@ envscript="/etc/catalyst/catalystrc"
 options="autoresume bindist kerncache pkgcache seedcache snapcache"
 
 # source repo settings
-distdir="/usr/portage/distfiles"
-portdir="/usr/portage"
+distdir="/var/cache/distfiles"
+portdir="/var/db/repos/gentoo"
 
 # target repo info
-repo_basedir="/usr"
-repo_name="portage"
-target_distdir="/usr/portage/distfiles"
-target_pkgdir="/usr/portage/packages"
+repo_basedir="/var/db/repos"
+repo_name="gentoo"
+target_distdir="/var/cache/distfiles"
+target_pkgdir="/var/cache/binpkgs"
 
 # other catalyst settings
 sharedir="/usr/share/catalyst"
@@ -156,17 +156,16 @@ Repository settings
 
 *distdir*::
 Source distfiles location used in generation of the stages.  This is usually the
-hosts distfiles location.  `/usr/portage/distfiles` should work for most
+hosts distfiles location.  `/var/cache/distfiles` should work for most
 default installations, but it should be set to match your hosts configuration.
 
 *portdir*::
-Source Gentoo tree location (primary repo). `/usr/portage/` should work for most
+Source Gentoo tree location (primary repo). `/var/db/repos/gentoo/` should work for most
 default installations.
 
 *repo_basedir*::
-The target repository directory to contain the rimary repo (gentoo repo) and
-any overlays.  `/usr` is the historical location. But that is in the process of
-changing.  `/var/gentoo/repos` is an option.
+The target repository directory to contain the primary repo (gentoo repo) and
+any overlays.  The default location is `/var/db/repos`.
 
 *repo_name*::
 The name of the main repository (ie: gentoo).  This has had a directory name
@@ -180,12 +179,12 @@ internal repo_name value should be the same.
 This is the target distfiles directory location for the stage being created.
 This is important because this value will be stored in the stage's make.conf
 and will become the default location used if it is not edited by users.
-The default location is `/usr/portage/distfiles`.
+The default location is `/var/cache/distfiles`.
 
 *target_pkgdir*::
 This is the target packages directory for storing binpkgs in the stage being
 built.  This location is stored in the make.conf of the stage being built.
-The default location for this has typically been `/usr/portage/packages`
+The default location for this has typically been `/var/cache/binpkgs`
 
 Other settings
 ~~~~~~~~~~~~~~