From 12cbc8821476dcbac38464a41f7cb336da7ac0c9 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 13 Aug 2010 07:05:12 -0700
Subject: Use EbuildIpcDaemon to replace the functionality of
 EBUILD_EXIT_STATUS_FILE.

---
 bin/ebuild.sh             | 14 ++++----------
 bin/isolated-functions.sh |  7 ++++---
 bin/misc-functions.sh     |  4 +---
 3 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'bin')

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index f9bfb3400..8b458705d 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -289,10 +289,6 @@ register_success_hook() {
 if ! hasq "$EBUILD_PHASE" clean cleanrm depend help ; then
 	cd "$PORTAGE_BUILDDIR" || \
 		die "PORTAGE_BUILDDIR does not exist: '$PORTAGE_BUILDDIR'"
-else
-	# Don't try to create this when it's parent
-	# directory doesn't necessarily exist.
-	unset EBUILD_EXIT_STATUS_FILE
 fi
 
 #if no perms are specified, dirs/files will have decent defaults
@@ -749,9 +745,10 @@ dyn_clean() {
 	fi
 
 	if [[ $EMERGE_FROM = binary ]] || ! hasq keepwork $FEATURES; then
-		rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,exit_status,logid,unpacked,prepared} \
+		rm -f "$PORTAGE_BUILDDIR"/.{ebuild_changed,logid,unpacked,prepared} \
 			"$PORTAGE_BUILDDIR"/.{configured,compiled,tested,packaged} \
-			"$PORTAGE_BUILDDIR"/.die_hooks
+			"$PORTAGE_BUILDDIR"/.die_hooks \
+			"$PORTAGE_BUILDDIR"/.ipc_{in,out,lock}
 
 		rm -rf "${PORTAGE_BUILDDIR}/build-info"
 		rm -rf "${WORKDIR}"
@@ -2206,10 +2203,6 @@ ebuild_main() {
 		exit 1
 		;;
 	esac
-	if [ -n "$EBUILD_EXIT_STATUS_FILE" ] ; then
-		> "$EBUILD_EXIT_STATUS_FILE" || \
-			die "failed to create '$EBUILD_EXIT_STATUS_FILE'"
-	fi
 }
 
 if [[ $EBUILD_PHASE = depend ]] ; then
@@ -2230,6 +2223,7 @@ elif [[ -n $EBUILD_SH_ARGS ]] ; then
 			chown portage:portage "$T/environment" &>/dev/null
 			chmod g+w "$T/environment" &>/dev/null
 		fi
+		[[ -n $PORTAGE_IPC_DAEMON ]] && "$PORTAGE_BIN_PATH"/ebuild-ipc exit 0
 		exit 0
 	)
 	exit $?
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index ddcf8f0d7..14ba58cc8 100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -189,7 +189,7 @@ die() {
 	fi
 	eerror "S: '${S}'"
 
-	[ -n "$EBUILD_EXIT_STATUS_FILE" ] && > "$EBUILD_EXIT_STATUS_FILE"
+	[[ -n $PORTAGE_IPC_DAEMON ]] && "$PORTAGE_BIN_PATH"/ebuild-ipc exit 1
 
 	# subshell die support
 	[[ $BASHPID = $EBUILD_MASTER_PID ]] || kill -s SIGTERM $EBUILD_MASTER_PID
@@ -558,7 +558,7 @@ save_ebuild_env() {
 		# portage config variables and variables set directly by portage
 		unset ACCEPT_LICENSE BAD BRACKET BUILD_PREFIX COLS \
 			DISTCC_DIR DISTDIR DOC_SYMLINKS_DIR \
-			EBUILD_EXIT_STATUS_FILE EBUILD_FORCE_TEST EBUILD_MASTER_PID \
+			EBUILD_FORCE_TEST EBUILD_MASTER_PID \
 			ECLASSDIR ECLASS_DEPTH ENDCOL FAKEROOTKEY \
 			GOOD HILITE HOME \
 			LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
@@ -569,7 +569,8 @@ save_ebuild_env() {
 			PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
 			PORTAGE_DEPCACHEDIR PORTAGE_GID \
 			PORTAGE_GRPNAME PORTAGE_INST_GID \
-			PORTAGE_INST_UID PORTAGE_LOG_FILE PORTAGE_MASTER_PID \
+			PORTAGE_INST_UID PORTAGE_IPC_DAEMON \
+			PORTAGE_LOG_FILE PORTAGE_MASTER_PID \
 			PORTAGE_NONFATAL PORTAGE_QUIET \
 			PORTAGE_REPO_NAME PORTAGE_RESTRICT PORTAGE_UPDATE_ENV \
 			PORTAGE_USERNAME PORTAGE_VERBOSE PORTAGE_WORKDIR_MODE PORTDIR \
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 10d193124..9777c9954 100755
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -853,9 +853,7 @@ if [ -n "${MISC_FUNCTIONS_ARGS}" ]; then
 		${x}
 	done
 	unset x
+	[[ -n $PORTAGE_IPC_DAEMON ]] && "$PORTAGE_BIN_PATH"/ebuild-ipc exit 0
 fi
 
-[ -n "${EBUILD_EXIT_STATUS_FILE}" ] && \
-	touch "${EBUILD_EXIT_STATUS_FILE}" &>/dev/null
-
 :
-- 
cgit v1.2.3-1-g7c22