From 254db834fddf8e9fe1ab6b36f99f60c1ef85aea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20L=C3=BCke?= <kai@kinvolk.io>
Date: Tue, 28 Jul 2020 15:17:08 +0200
Subject: [PATCH] update_ebuilds: Do not generate metadata/md5-cache files

The metadata/md5-cache is not required and we stop using it because
this machine-generated content is a common cause for merge conflicts
and has no benefits.
---
 update_ebuilds | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/update_ebuilds b/update_ebuilds
index 28f197cc4d..96aafba647 100755
--- a/update_ebuilds
+++ b/update_ebuilds
@@ -20,8 +20,6 @@ DEFINE_string rsync "rsync://rsync.gentoo.org/gentoo-portage" \
     "Rsync location for gentoo-portage to use with --portage=rsync"
 DEFINE_boolean commit ${FLAGS_FALSE} \
     "Commit all changes after updating portage-stable."
-DEFINE_boolean regencache ${FLAGS_TRUE} \
-    "Regenerate cache for updated ebuilds."
 
 
 # Parse flags
@@ -38,11 +36,6 @@ if [[ -z "$*" ]]; then
     die "No packages provided"
 fi
 
-# eclass updates impact coreos-overlay too, use update_metadata.
-if [[ "$*" == *eclass* ]]; then
-    FLAGS_regencache=${FLAGS_FALSE}
-fi
-
 cd "$FLAGS_portage_stable"
 
 for pkg in "$@"; do
@@ -75,11 +68,6 @@ for pkg in "$@"; do
 
     git add -A "$pkg"
 
-    # Sync up the ebuild metadata cache
-    if [[ $FLAGS_regencache -eq $FLAGS_TRUE && "$pkg" == */* && "$pkg" != metadata/glsa ]]; then
-        egencache --repo=portage-stable --update "$pkg"
-        git add -A "metadata/md5-cache/${pkg}-*"
-    fi
 done
 
 if [[ $FLAGS_commit -eq $FLAGS_TRUE ]]; then
@@ -98,6 +86,3 @@ else
     git status
 fi
 
-if [[ "$*" == *eclass* ]]; then
-    info "Please run update_metadata to update cache in all overlays."
-fi