aboutsummaryrefslogtreecommitdiff
path: root/cnf
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2018-08-05 14:30:57 -0700
committerZac Medico <zmedico@gentoo.org>2019-04-18 10:52:54 -0700
commitef8469befbd7b61f1bae8f21ffd95e0c0306a4f8 (patch)
tree5b92b77c02c53fe3280c5f37d20151ef82fc37b6 /cnf
parentUpdates for portage-2.3.63 release (diff)
downloadportage-ef8469befbd7b61f1bae8f21ffd95e0c0306a4f8.tar.gz
portage-ef8469befbd7b61f1bae8f21ffd95e0c0306a4f8.tar.bz2
portage-ef8469befbd7b61f1bae8f21ffd95e0c0306a4f8.zip
Change /usr/portage council approved locations (bug 378603)
This includes a _compat_upgrade.default_locations script that the ebuild can call in pkg_preinst in order to maintain backward-compatible defaults when appropriate. The new defaults are specified in the summary of the 20180729 council meeting: Vote: Default locations for the Gentoo repository, distfiles, and binary packages will be, respectively: /var/db/repos/gentoo /var/cache/distfiles /var/cache/binpkgs Accepted with 6 yes votes and 1 no vote. See: https://projects.gentoo.org/council/meeting-logs/20180729-summary.txt Bug: https://bugs.gentoo.org/378603 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'cnf')
-rw-r--r--cnf/make.globals4
-rw-r--r--cnf/repos.conf2
2 files changed, 3 insertions, 3 deletions
diff --git a/cnf/make.globals b/cnf/make.globals
index b4ed8c466..b01cca599 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -27,8 +27,8 @@ ACCEPT_PROPERTIES="*"
ACCEPT_RESTRICT="*"
# Miscellaneous paths
-DISTDIR="/usr/portage/distfiles"
-PKGDIR="/usr/portage/packages"
+DISTDIR="/var/cache/distfiles"
+PKGDIR="/var/cache/binpkgs"
RPMDIR="/usr/portage/rpm"
# Temporary build directory
diff --git a/cnf/repos.conf b/cnf/repos.conf
index 352073cfd..e84840bf2 100644
--- a/cnf/repos.conf
+++ b/cnf/repos.conf
@@ -2,7 +2,7 @@
main-repo = gentoo
[gentoo]
-location = /usr/portage
+location = /var/db/repos/gentoo
sync-type = rsync
sync-uri = rsync://rsync.gentoo.org/gentoo-portage
auto-sync = yes