From c86fde0e5d27539d36afcf2e08a0f38afbd32521 Mon Sep 17 00:00:00 2001
From: Max Magorsch <arzano@gentoo.org>
Date: Sun, 19 Sep 2021 23:12:59 +0000
Subject: Use repo/sync/gentoo.git instead of repo/gentoo.git and egencache

Using repo/sync/gentoo.git will leverade the repository mirror &
CI instead of generating the metadata manually using egencache.
This will:
  - reduce the dependencies of soko
  - reduce the chance of bugs due to wrong metadata
  - simplify the whole setup

Also this should resolve any issues that arised around ebuilds that
used EAPI 8.

Signed-off-by: Max Magorsch <arzano@gentoo.org>
---
 bin/fullupdate.sh | 17 +----------------
 bin/update.sh     | 17 +----------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/bin/fullupdate.sh b/bin/fullupdate.sh
index a4627a3..b9423e2 100755
--- a/bin/fullupdate.sh
+++ b/bin/fullupdate.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-: "${GIT_URI:=https://anongit.gentoo.org/git/repo/gentoo.git}"
+: "${GIT_URI:=https://anongit.gentoo.org/git/repo/sync/gentoo.git}"
 : "${GIT_BRANCH:=master}"
 : "${GIT_REMOTE:=origin}"
-: "${JOBS:=6}"
 
 update_repository(){
   # This is the copy of the tree used to run gpackages against.
@@ -25,19 +24,6 @@ update_repository(){
   fi
 }
 
-update_md5cache(){
-  mkdir -p /var/cache/pgo-egencache
-  cd /mnt/packages-tree/gentoo/ || exit 1
-
-  #echo 'FEATURES="-userpriv -usersandbox -sandbox"' >> /etc/portage/make.conf
-
-  egencache -j "${JOBS}" --cache-dir /var/cache/pgo-egencache --repo gentoo --repositories-configuration '[gentoo]
-  location = /mnt/packages-tree/gentoo' --update
-
-  egencache -j "${JOBS}" --cache-dir /var/cache/pgo-egencache --repo gentoo --repositories-configuration '[gentoo]
-  location = /mnt/packages-tree/gentoo' --update-use-local-desc
-}
-
 fullupdate_database(){
   cd /mnt/packages-tree/gentoo/ || exit 1
   /go/src/soko/bin/soko --fullupdate
@@ -45,5 +31,4 @@ fullupdate_database(){
 
 
 update_repository
-update_md5cache
 fullupdate_database
diff --git a/bin/update.sh b/bin/update.sh
index 1774e34..11666b0 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-: "${GIT_URI:=https://anongit.gentoo.org/git/repo/gentoo.git}"
+: "${GIT_URI:=https://anongit.gentoo.org/git/repo/sync/gentoo.git}"
 : "${GIT_BRANCH:=master}"
 : "${GIT_REMOTE:=origin}"
-: "${JOBS:=6}"
 
 update_repository(){
   # This is the copy of the tree used to run gpackages against.
@@ -25,19 +24,6 @@ update_repository(){
   fi
 }
 
-update_md5cache(){
-  mkdir -p /var/cache/pgo-egencache
-  cd /mnt/packages-tree/gentoo/ || exit 1
-
-  #echo 'FEATURES="-userpriv -usersandbox -sandbox"' >> /etc/portage/make.conf
-
-  egencache -j "${JOBS}" --cache-dir /var/cache/pgo-egencache --repo gentoo --repositories-configuration '[gentoo]
-  location = /mnt/packages-tree/gentoo' --update
-
-  egencache -j "${JOBS}" --cache-dir /var/cache/pgo-egencache --repo gentoo --repositories-configuration '[gentoo]
-  location = /mnt/packages-tree/gentoo' --update-use-local-desc
-}
-
 update_database(){
   cd /mnt/packages-tree/gentoo/ || exit 1
   /go/src/soko/bin/soko --update
@@ -45,5 +31,4 @@ update_database(){
 
 
 update_repository
-update_md5cache
 update_database
-- 
cgit v1.2.3-65-gdbad