From 38f4c58168b7d971226fbb0974ff66c70ffd8af3 Mon Sep 17 00:00:00 2001
From: Wolfgang Müller
Date: Fri, 22 Feb 2019 15:02:27 +0100
Subject: host-demeter: Move portage tree to /var/portage/tree

Additionally, use rsync instead of webrsync
---
 host-demeter/make.conf              | 6 ++----
 host-demeter/repos.conf/gentoo.conf | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/host-demeter/make.conf b/host-demeter/make.conf
index b2a4fc9..a83b501 100644
--- a/host-demeter/make.conf
+++ b/host-demeter/make.conf
@@ -4,9 +4,8 @@ CHOST="x86_64-pc-linux-gnu"
 
 CPU_FLAGS_X86="mmx mmxext popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3"
 
-PORTDIR="/var/portage"
-DISTDIR="${PORTDIR}/distfiles"
-PKGDIR="${PORTDIR}/packages"
+DISTDIR="/var/portage/distfiles"
+PKGDIR="/var/portage/packages"
 
 MAKEOPTS="-j3"
 
@@ -20,6 +19,5 @@ EMERGE_DEFAULT_OPTS="--ask --alert --autounmask=n --jobs 2 --load-average 2"
 GENTOO_MIRRORS="http://de-mirror.org/gentoo/ rsync://de-mirror.org/gentoo/ http://gentoo.mneisen.org/ http://mirror.netcologne.de/gentoo/ rsync://mirror.netcologne.de/gentoo/ http://ftp.halifax.rwth-aachen.de/gentoo/ rsync://ftp.halifax.rwth-aachen.de/gentoo/ http://ftp-stud.hs-esslingen.de/pub/Mirrors/gentoo/ rsync://ftp-stud.hs-esslingen.de/gentoo/"
 
 FEATURES="cgroup webrsync-gpg userfetch clean-logs split-log split-elog compress-build-logs downgrade-backup parallel-install"
-PORTAGE_GPG_DIR="/var/lib/gentoo/gkeys/keyrings/gentoo/release"
 
 INSTALL_MASK="/usr/share/bash-completion"
diff --git a/host-demeter/repos.conf/gentoo.conf b/host-demeter/repos.conf/gentoo.conf
index dd5c0a8..9de7cbd 100644
--- a/host-demeter/repos.conf/gentoo.conf
+++ b/host-demeter/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://rsync.de.gentoo.org/gentoo-portage/
-- 
cgit v1.2.3-2-gb3c3