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

Collapse All | Expand All

(-)epatch.eclass.orig (-15 / +29 lines)
Lines 423-445 Link Here
423
	# don't clobber any EPATCH vars that the parent might want
423
	# don't clobber any EPATCH vars that the parent might want
424
	local EPATCH_SOURCE check
424
	local EPATCH_SOURCE check
425
	for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT%/*}}; do
425
	for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT%/*}}; do
426
		EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CTARGET}/${check}
426
		set -- \
427
		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CHOST}/${check}
427
			"${EPATCH_USER_SOURCE}/${CTARGET}/${check}" \
428
		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${check}
428
			"${EPATCH_USER_SOURCE}/${CHOST}/${check}" \
429
		if [[ -d ${EPATCH_SOURCE} ]] ; then
429
			"${EPATCH_USER_SOURCE}/${check}"
430
			local old_n_applied_patches=${EPATCH_N_APPLIED_PATCHES:-0}
430
		while true; do
431
			EPATCH_SOURCE=${EPATCH_SOURCE} \
431
			EPATCH_SOURCE=$1
432
			EPATCH_SUFFIX="patch" \
432
			if [[ -d ${EPATCH_SOURCE} || -L ${EPATCH_SOURCE} ]] \
433
			EPATCH_FORCE="yes" \
433
					&& [[ ! -r ${EPATCH_SOURCE} ]]; then
434
			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
434
				die "Unable to open user patch directory '${EPATCH_SOURCE}'; permission denied"
435
			epatch
436
			echo "${EPATCH_SOURCE}" > "${applied}"
437
			if [[ ${old_n_applied_patches} -lt ${EPATCH_N_APPLIED_PATCHES} ]]; then
438
				has epatch_user_death_notice ${EBUILD_DEATH_HOOKS} || \
439
					EBUILD_DEATH_HOOKS+=" epatch_user_death_notice"
440
			fi
435
			fi
441
			return 0
436
			if [[ -d ${EPATCH_SOURCE} ]]; then
437
				# viable patch directory found
438
				break
439
			fi
440
			if ! shift || [[ $# -eq 0 ]]; then
441
				# no viable patch directories found; proceed to next 'check'
442
				continue 2
443
			fi
444
		done
445
		local old_n_applied_patches=${EPATCH_N_APPLIED_PATCHES:-0}
446
		EPATCH_SOURCE=${EPATCH_SOURCE} \
447
		EPATCH_SUFFIX="patch" \
448
		EPATCH_FORCE="yes" \
449
		EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
450
		epatch
451
		echo "${EPATCH_SOURCE}" > "${applied}"
452
		if [[ ${old_n_applied_patches} -lt ${EPATCH_N_APPLIED_PATCHES} ]]; then
453
			has epatch_user_death_notice ${EBUILD_DEATH_HOOKS} || \
454
				EBUILD_DEATH_HOOKS+=" epatch_user_death_notice"
442
		fi
455
		fi
456
		return 0
443
	done
457
	done
444
	echo "none" > "${applied}"
458
	echo "none" > "${applied}"
445
	return 1
459
	return 1

Return to bug 634396