From de0da7ccac3b7530666b86fcf9719920ff9cbd40 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sun, 30 Nov 2014 15:54:41 +0000
Subject: [PATCH] [scripts] remove mangling of repositories.conf.d

---
 scripts/inner_chroot_script.sh                   | 10 ++--------
 scripts/inner_source_chroot_update.sh            |  9 ++++++---
 scripts/remaster_generic_inner_chroot_script.sh  | 16 ++++++----------
 ...remaster_generic_inner_chroot_script_after.sh |  7 -------
 4 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh
index 93f9de6..50b258e 100755
--- a/scripts/inner_chroot_script.sh
+++ b/scripts/inner_chroot_script.sh
@@ -69,6 +69,8 @@ if [ -n "${UPGRADE_REPO}" ]; then
 	echo "Upgrading system by enabling ${UPGRADE_REPO}"
 	equo repo enable "${UPGRADE_REPO}" || exit 1
 	FORCE_EAPI=2 safe_run equo update || exit 1
+
+	equo repo mirrorsort "${UPGRADE_REPO}"  # ignore errors
 	ETP_NONINTERACTIVE=1 safe_run equo upgrade --fetch || exit 1
 	ETP_NONINTERACTIVE=1 equo upgrade --purge || exit 1
 	echo "-5" | equo conf update
@@ -163,14 +165,6 @@ umount /proc
 equo deptest --pretend
 emaint --fix world
 
-# copy entropy repositories config
-# the one in chroots is optimized to use Garr mirror
-cp /etc/entropy/repositories.conf.example /etc/entropy/repositories.conf -p
-for repo_conf in /etc/entropy/repositories.conf.d/entropy_*.example; do
-	new_repo_conf="${repo_conf%.example}"
-	cp "${repo_conf}" "${new_repo_conf}"
-done
-
 # copy Portage config from sabayonlinux.org entropy repo to system
 for conf in package.mask package.unmask package.keywords make.conf package.use; do
 	repo_path=/var/lib/entropy/client/database/*/sabayonlinux.org/standard
diff --git a/scripts/inner_source_chroot_update.sh b/scripts/inner_source_chroot_update.sh
index 01c07b2..11841a0 100755
--- a/scripts/inner_source_chroot_update.sh
+++ b/scripts/inner_source_chroot_update.sh
@@ -42,10 +42,13 @@ safe_run() {
 	return 0
 }
 
-export FORCE_EAPI=2
-safe_run equo update || exit 1
+FORCE_EAPI=2 safe_run equo update || exit 1
+
+for repo in $(equo repo list -q); do
+	echo "Optimizing mirrors for ${repo}"
+	equo repo mirrorsort "${repo}"  # ignore errors
+done
 
-export ETP_NONINTERACTIVE=1
 safe_run equo upgrade --fetch || exit 1
 equo upgrade --purge || exit 1
 equo remove "${PACKAGES_TO_REMOVE[@]}" # ignore
diff --git a/scripts/remaster_generic_inner_chroot_script.sh b/scripts/remaster_generic_inner_chroot_script.sh
index ca7eade..e8e1343 100755
--- a/scripts/remaster_generic_inner_chroot_script.sh
+++ b/scripts/remaster_generic_inner_chroot_script.sh
@@ -25,15 +25,11 @@ safe_run() {
 # make sure there is no stale pid file around that prevents entropy from running
 rm -f /var/run/entropy/entropy.lock
 
-# disable all mirrors but GARR
-for repo_conf in /etc/entropy/repositories.conf.d/entropy_*; do
-	# skip .example files
-	if [[ "${repo_conf}" =~ .*\.example$ ]]; then
-		echo "skipping ${repo_conf}"
-		continue
-	fi
-	sed -n -e "/^pkg = .*pkg.sabayon.org/p" -e "/^repo = .*pkg.sabayon.org/p" \
-		-e "/garr.it/p" -e "/^\[.*\]$/p" -i "${repo_conf}"
+FORCE_EAPI=2 safe_run equo update || exit 1
+
+for repo in $(equo repo list -q); do
+	echo "Optimizing mirrors for ${repo}"
+	equo repo mirrorsort "${repo}"  # ignore errors
 done
 
-FORCE_EAPI=2 safe_run equo update || exit 1
+exit 0
diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh
index 25fffb0..304bb6c 100755
--- a/scripts/remaster_generic_inner_chroot_script_after.sh
+++ b/scripts/remaster_generic_inner_chroot_script_after.sh
@@ -285,13 +285,6 @@ setup_installed_packages() {
 	rm /var/lib/entropy/client/database/*/sabayon-weekly -rf
 	equo rescue vacuum
 
-	# restore original repositories.conf (all mirrors were filtered for speed)
-	cp /etc/entropy/repositories.conf.example /etc/entropy/repositories.conf || exit 1
-	for repo_conf in /etc/entropy/repositories.conf.d/entropy_*.example; do
-		new_repo_conf="${repo_conf%.example}"
-		cp "${repo_conf}" "${new_repo_conf}"
-	done
-
 	# cleanup log dir
 	rm /var/lib/entropy/logs -rf
 	rm -rf /var/lib/entropy/*cache*