Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 564976
Collapse All | Expand All

(-)old/eclass/eutils.eclass (-1 / +10 lines)
Lines 326-331 EPATCH_OPTS="" Link Here
326
#	-E - automatically remove empty files
326
#	-E - automatically remove empty files
327
# @CODE
327
# @CODE
328
EPATCH_COMMON_OPTS="-g0 -E --no-backup-if-mismatch"
328
EPATCH_COMMON_OPTS="-g0 -E --no-backup-if-mismatch"
329
# @VARIABLE: EPATCH_N_APPLIED_PATCHES
330
# @DESCRIPTION:
331
# Counter variable which indicates how many patches were applied.
332
EPATCH_N_APPLIED_PATCHES=0
329
# @VARIABLE: EPATCH_EXCLUDE
333
# @VARIABLE: EPATCH_EXCLUDE
330
# @DESCRIPTION:
334
# @DESCRIPTION:
331
# List of patches not to apply.	 Note this is only file names,
335
# List of patches not to apply.	 Note this is only file names,
Lines 634-639 epatch() { Link Here
634
			: $(( count++ ))
638
			: $(( count++ ))
635
		done
639
		done
636
640
641
		: $(( EPATCH_N_APPLIED_PATCHES++ ))
642
637
		# if we had to decompress the patch, delete the temp one
643
		# if we had to decompress the patch, delete the temp one
638
		if [[ -n ${PIPE_CMD} ]] ; then
644
		if [[ -n ${PIPE_CMD} ]] ; then
639
			rm -f "${PATCH_TARGET}"
645
			rm -f "${PATCH_TARGET}"
Lines 709-721 epatch_user() { Link Here
709
		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CHOST}/${check}
715
		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CHOST}/${check}
710
		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${check}
716
		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${check}
711
		if [[ -d ${EPATCH_SOURCE} ]] ; then
717
		if [[ -d ${EPATCH_SOURCE} ]] ; then
718
			local old_n_applied_patches=${EPATCH_N_APPLIED_PATCHES}
712
			EPATCH_SOURCE=${EPATCH_SOURCE} \
719
			EPATCH_SOURCE=${EPATCH_SOURCE} \
713
			EPATCH_SUFFIX="patch" \
720
			EPATCH_SUFFIX="patch" \
714
			EPATCH_FORCE="yes" \
721
			EPATCH_FORCE="yes" \
715
			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
722
			EPATCH_MULTI_MSG="Applying user patches from ${EPATCH_SOURCE} ..." \
716
			epatch
723
			epatch
717
			echo "${EPATCH_SOURCE}" > "${applied}"
724
			echo "${EPATCH_SOURCE}" > "${applied}"
718
			has epatch_user_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" epatch_user_death_notice"
725
			if [[ ${old_n_applied_patches} -lt ${EPATCH_N_APPLIED_PATCHES} ]]; then
726
				has epatch_user_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" epatch_user_death_notice"
727
			fi
719
			return 0
728
			return 0
720
		fi
729
		fi
721
	done
730
	done

Return to bug 564976