From c84c348111ca187e7a2e41aa011f7431003e9d6e Mon Sep 17 00:00:00 2001
From: Wolfgang Müller
Date: Fri, 22 Feb 2019 02:17:50 +0000
Subject: host-coleridge: Migrate to rsync with verification

---
 host-coleridge/make.conf              | 6 ++----
 host-coleridge/repos.conf/gentoo.conf | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/host-coleridge/make.conf b/host-coleridge/make.conf
index 97bf3b0..68c6970 100644
--- a/host-coleridge/make.conf
+++ b/host-coleridge/make.conf
@@ -6,9 +6,8 @@ CPU_FLAGS_X86="aes avx fma3 fma4 mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 s
 
 PAX_MARKINGS="XT"
 
-PORTDIR="/var/portage"
-DISTDIR="${PORTDIR}/distfiles"
-PKGDIR="${PORTDIR}/packages"
+DISTDIR="/var/portage/distfiles"
+PKGDIR="/var/portage/packages"
 MAKEOPTS="-j6"
 
 PORT_LOGDIR="/var/log/portage"
@@ -23,7 +22,6 @@ PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"
 
 FEATURES="webrsync-gpg userfetch clean-logs split-log split-elog cgroup compress-build-logs downgrade-backup parallel-install"
 
-PORTAGE_GPG_DIR="/var/lib/gentoo/gkeys/keyrings/gentoo/release"
 EMERGE_DEFAULT_OPTS="--color=n --ask --alert --autounmask-write=n --jobs 3 --load-average 4"
 
 INSTALL_MASK="/usr/share/bash-completion /usr/lib/charset.alias"
diff --git a/host-coleridge/repos.conf/gentoo.conf b/host-coleridge/repos.conf/gentoo.conf
index dd5c0a8..acc083b 100644
--- a/host-coleridge/repos.conf/gentoo.conf
+++ b/host-coleridge/repos.conf/gentoo.conf
@@ -2,6 +2,6 @@
 main-repo = gentoo
 
 [gentoo]
-auto-sync = yes
-location = /var/portage
-sync-type = webrsync
+location = /var/portage/tree
+sync-type = rsync
+sync-uri = rsync://mirror.manitu.net/gentoo-portage
-- 
cgit v1.2.3-2-gb3c3