Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 40819 | Differences between
and this patch

Collapse All | Expand All

(-)ebuild.sh (-5 / +22 lines)
Lines 312-318 Link Here
312
	for x in "$@"; do
312
	for x in "$@"; do
313
		myfail="failure unpacking ${x}"
313
		myfail="failure unpacking ${x}"
314
		echo ">>> Unpacking ${x} to $(pwd)"
314
		echo ">>> Unpacking ${x} to $(pwd)"
315
		y="$(echo $x | sed 's:.*\.\(tar\)\.[a-zA-Z0-9]*:\1:')"
315
		y="${x%.*}"
316
		y="${y##*.}"
316
317
317
		case "${x##*.}" in
318
		case "${x##*.}" in
318
			tar) 
319
			tar) 
Lines 880-887 Link Here
880
						# can easly be bypassed using the addwrite() function
881
						# can easly be bypassed using the addwrite() function
881
						addwrite "${sfconf}"
882
						addwrite "${sfconf}"
882
						echo ">>> Appending commented out entry to ${sfconf} for ${PF}"
883
						echo ">>> Appending commented out entry to ${sfconf} for ${PF}"
883
						ls -ldh "${i}" | awk '{print "## "$0}' | sed s:"${IMAGE}"::g >> ${sfconf}
884
						ls_ret=ls -ldh "${i}"
884
						echo "#${i/${IMAGE}/}" >> ${sfconf}
885
						echo "## ${ls_ret%${IMAGE}*}${ls_ret#*${IMAGE}}" >> ${sfconf}
885
						# no delwrite() eh?
886
						# no delwrite() eh?
886
						# delwrite ${sconf}
887
						# delwrite ${sconf}
887
					}
888
					}
Lines 1221-1226 Link Here
1221
# === === === === === functions end, main part begins === === === === ===
1222
# === === === === === functions end, main part begins === === === === ===
1222
# === === === === === === === === === === === === === === === === === ===
1223
# === === === === === === === === === === === === === === === === === ===
1223
1224
1225
1226
# this is a function for removing any directory matching a passed in pattern from 
1227
# PATH
1228
function remove_path_entry() {
1229
	local anchor=$1; shift
1230
	IFS=":"
1231
	stripped_path=""
1232
	for p in ${PATH}; do
1233
		if [ ${p/${anchor}} == ${p} ]; then
1234
			stripped_path="${stripped_path}:${p}"
1235
		fi
1236
	done
1237
	IFS="\n"
1238
	PATH=${stripped_path}
1239
}
1240
1224
if [ "$*" != "depend" ] && [ "$*" != "clean" ]; then
1241
if [ "$*" != "depend" ] && [ "$*" != "clean" ]; then
1225
	cd ${PORTAGE_TMPDIR} &> /dev/null
1242
	cd ${PORTAGE_TMPDIR} &> /dev/null
1226
	cd ${BUILD_PREFIX} &> /dev/null
1243
	cd ${BUILD_PREFIX} &> /dev/null
Lines 1234-1240 Link Here
1234
			#We can enable distributed compile support
1251
			#We can enable distributed compile support
1235
			if [ -z "${PATH/*distcc*/}" ]; then
1252
			if [ -z "${PATH/*distcc*/}" ]; then
1236
				# Remove the other reference.
1253
				# Remove the other reference.
1237
				PATH="$(echo ${PATH} | sed 's/:[^:]*distcc[^:]*:/:/;s/^[^:]*distcc[^:]*://;s/:[^:]*distcc[^:]*$//')"
1254
				remove_path_entry "distcc"
1238
			fi
1255
			fi
1239
			export PATH="/usr/lib/distcc/bin:${PATH}"
1256
			export PATH="/usr/lib/distcc/bin:${PATH}"
1240
			[ ! -z "${DISTCC_LOG}" ] && addwrite "$(dirname ${DISTCC_LOG})"
1257
			[ ! -z "${DISTCC_LOG}" ] && addwrite "$(dirname ${DISTCC_LOG})"
Lines 1248-1254 Link Here
1248
		#We can enable compiler cache support
1265
		#We can enable compiler cache support
1249
		if [ -z "${PATH/*ccache*/}" ]; then
1266
		if [ -z "${PATH/*ccache*/}" ]; then
1250
			# Remove the other reference.
1267
			# Remove the other reference.
1251
			PATH="$(echo ${PATH} | sed 's/:[^:]*ccache[^:]*:/:/;s/^[^:]*ccache[^:]*://;s/:[^:]*ccache[^:]*$//')"
1268
			remove_path_entry "ccache"
1252
		fi
1269
		fi
1253
1270
1254
		if [ -d /usr/lib/ccache/bin ]; then
1271
		if [ -d /usr/lib/ccache/bin ]; then

Return to bug 40819