From f95f96be356d8fd3a12f5a647003aaa30bff4cd9 Mon Sep 17 00:00:00 2001
From: belliash <belliash@asiotec.org>
Date: Thu, 12 Jan 2012 16:24:20 +0100
Subject: [PATCH] update local copy of mainline portage & fix die

---
 ezsync | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/ezsync b/ezsync
index a478843..518d2b1 100755
--- a/ezsync
+++ b/ezsync
@@ -93,4 +93,19 @@ eval `keychain --noask --eval id_dsa id_rsa &> /dev/null`
 # Update local copy of Portage that is being built
 printInfo "Refreshing local build Portage tree..."
 synchronizeRepository ${PORTAGESDIR}/${PORTAGE_BUILD[0]} ${PORTAGE_BUILD[1]} ${PORTAGE_BUILD[2]} ${PORTAGE_BUILD[3]}
-[ ${?} -ne 0 ] && die "EzBuild was unable to refresh local copy of build Portage tree!"
+[ ${?} -ne 0 ] && die "EzBuild was unable to refresh local copy of build Portage tree!" 2
+
+# Update local copy of mainline Portage
+if ! hasElement "mainline" ${EZNOSYNC} && ! hasElement "portage" ${EZNOSYNC}; then
+	printInfo "Synchronizing mainline Portage tree..."
+	synchronizeRepository ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]} ${PORTAGE_MAINLINE[1]} ${PORTAGE_MAINLINE[2]} ${PORTAGE_MAINLINE[3]}
+	[ ${?} -ne 0 ] && die "EzBuild was unable to synchronize mainline Portage tree!" 2
+	[ -e ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]}/metadata/cache ] && rm -rf ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]}/metadata/cache
+	echo "distfiles/*" > ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]}/.gitignore
+	echo "packages/*" >> ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]}/.gitignore
+	if [ ! -d ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]}/profiles/package.mask ]; then
+		mv ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]}/profiles/package.mask ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]}/profiles/package.mask.bak &> /dev/null
+		makeDirectory ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]}/profiles/package.mask
+		mv ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]}/profiles/package.mask.bak ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]}/profiles/package.mask/${PORTAGE_MAINLINE[0]%-*} &> /dev/null
+	fi
+fi