--- a/eclass/x-mgcf-golang-common.eclass	Thu Jan 02 12:15:01 2025 +0000
+++ b/eclass/x-mgcf-golang-common.eclass	Thu Mar 13 21:30:01 2025 +0000
@@ -440,7 +440,7 @@
 		debug-print "${FUNCNAME}: GOBIN = ${GOBIN}"
 		debug-print "${FUNCNAME}: EGO_SRC = ${EGO_SRC}"
 		debug-print "${FUNCNAME}: CGO_ENABLED = ${CGO_ENABLED}"
-	eend
+	eend 0
 }
 
 
@@ -522,7 +522,7 @@
 					github*)
 						ebegin "${message}"
 							mv ${DEPENDENCY[project_name]}-${DEPENDENCY[revision]}* "${GOPATH}"/src/${destdir} || die
-						eend
+						eend $?
 
 						# FIX: sometimes the source code inside an importpath alias
 						#      (such as gopkg.in/mylib.v1) invokes imports from
@@ -539,12 +539,12 @@
 						#einfo "path: ${DEPENDENCY[author_name]}-${DEPENDENCY[project_name]}-${DEPENDENCY[revision]}"
 						ebegin "${message}"
 							mv ${DEPENDENCY[author_name]}-${DEPENDENCY[project_name]}-${DEPENDENCY[revision]}* "${GOPATH}"/src/${destdir} || die
-						eend
+						eend $?
 						;;
 					code.google*)
 						ebegin "${message}"
 							mv ${DEPENDENCY[project_name]}-${DEPENDENCY[revision]}* "${GOPATH}"/src/${destdir} || die
-						eend
+						eend $?
 						;;
 					*) die "Function 'x-mgcf-golang-common_src_prepare' doesn't support '${DEPENDENCY[importpath]}'" ;;
 				esac
@@ -678,12 +678,12 @@
 	if [[ -d "${S}"/Godeps/_workspace/pkg ]]; then
 		ebegin "Cleaning up pre-built object files in Godep workspace"
 			rm -r "${S}"/Godeps/_workspace/pkg || die
-		eend
+		eend $?
 	fi
 	if [[ -d "${S}"/Godeps/_workspace/bin ]]; then
 		ebegin "Cleaning up executables in Godep workspace"
 			rm -r "${S}"/Godeps/_workspace/bin || die
-		eend
+		eend $?
 	fi
 
 
@@ -704,7 +704,7 @@
 	if [[ -n ${GOLANG_PKG_STATIK} ]]; then
 		ebegin "${ESTATIK} $GOLANG_PKG_STATIK"
 			${ESTATIK} $GOLANG_PKG_STATIK || die
-		eend
+		eend $?
 	fi
 }
 
@@ -732,7 +732,7 @@
 			debug-print "$FUNCNAME: GOPATH: Adding vendor path ${path}"
 			ebegin "- ${path//${S}\//}"
 				GOPATH="${GOPATH}:$( echo ${path} )"
-			eend
+			eend $?
 		done
 
 		export GOPATH
@@ -1007,7 +1007,7 @@
 	#if [[ ! -d "${1}"/src ]]; then
 	#	ebegin "Fixing $1"
 	#		ln -s "${1}" "${1}"/src || die
-	#	eend
+	#	eend $?
 	#fi
 
 	GOLANG_PKG_VENDOR+=(${1})
@@ -1055,7 +1055,7 @@
 		ln -s "${GOPATH}/src/${TARGET}" \
 			"${GOPATH}/src/${ALIAS}" \
 			|| die
-	eend
+	eend $?
 }
 
 

--- a/eclass/x-mgcf-golang-live.eclass	Thu Jan 02 12:15:01 2025 +0000
+++ b/eclass/x-mgcf-golang-live.eclass	Thu Mar 13 21:30:01 2025 +0000
@@ -138,7 +138,7 @@
 	# Imports all go dependencies
 	ebegin "Importing all the sources in ${GOPATH}"
 		cp -r "${EGO_LIVESTORE_DIR}/src" "${GOPATH}" || die "Unable to copy sources to ${GOPATH}"
-	eend
+	eend $?
 
 	x-mgcf-golang-common_src_prepare
 }