From 00d91a986fb8a5762dcd7f5cd01e7e353a1a8b48 Mon Sep 17 00:00:00 2001 From: belliash Date: Fri, 13 Jan 2012 15:23:07 +0100 Subject: [PATCH] merge data into portage tree --- ezsync | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/ezsync b/ezsync index 444a8f0..44481fb 100755 --- a/ezsync +++ b/ezsync @@ -139,3 +139,18 @@ if isSet MERGED_OVERLAY && isSet OVERLAY_BUILD; then [ ${?} -ne 0 ] && die "Ezbuild was unable to record changes to the remote overlay repository!" 8 fi fi + +# Merge data into build portage +printInfo "Merging ebuilds into building Portage..." +pullRsync ${PORTAGESDIR}/${PORTAGE_BUILD[0]} ${PORTAGESDIR}/${PORTAGE_MAINLINE[0]} +[ ${?} -ne 0 ] && die "EzBuild was unable to merge ebuilds into Portage tree!" 16 +for OVERLAY in ${MERGED_PORTAGE[*]}; do + TEMP="\${$OVERLAY[*]}" + CURRENT_OVERLAY=(`eval echo ${TEMP}`) + mergeOverlay ${OVERLAYSDIR}/${CURRENT_OVERLAY[0]} ${PORTAGESDIR}/${PORTAGE_BUILD[0]} ${CURRENT_OVERLAY[4]} ${CURRENT_OVERLAY[5]} ${CURRENT_OVERLAY[6]} + [ ${?} -ne 0 ] && die "EzBuild was unable to merge ebuilds into Portage tree!" 16 + if [ -f ${OVERLAYSDIR}/${CURRENT_OVERLAY[0]}/profiles/package.mask ]; then + run "cp -apf ${OVERLAYSDIR}/${CURRENT_OVERLAY[0]}/profiles/package.mask ${PORTAGESDIR}/${PORTAGE_BUILD[0]}/profiles/package.mask/${OVERLAY_BUILD[0]%-*}" + [ ${?} -ne 0 ] && die "EzBuild was unable to merge package.mask file into Portage tree!" 16 + fi +done