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

(-)a/eclass/eutils.eclass (-4 / +10 lines)
Lines 350-355 EPATCH_FORCE="no" Link Here
350
# List of patches not to apply.	 Note this is only file names,
350
# List of patches not to apply.	 Note this is only file names,
351
# and not the full path.  Globs accepted.
351
# and not the full path.  Globs accepted.
352
352
353
# @VARIABLE: EPATCH_USER_SOURCE
354
# @DESCRIPTION:
355
# Location for user patches, see the epatch_user function.
356
# Should be set by the user. Don't set this in ebuilds.
357
: ${EPATCH_USER_SOURCE:=${PORTAGE_CONFIGROOT%/}/etc/portage/patches}
358
353
# @FUNCTION: epatch
359
# @FUNCTION: epatch
354
# @USAGE: [options] [patches] [dirs of patches]
360
# @USAGE: [options] [patches] [dirs of patches]
355
# @DESCRIPTION:
361
# @DESCRIPTION:
Lines 697-707 epatch_user() { Link Here
697
	[[ -e ${applied} ]] && return 2
703
	[[ -e ${applied} ]] && return 2
698
704
699
	# don't clobber any EPATCH vars that the parent might want
705
	# don't clobber any EPATCH vars that the parent might want
700
	local EPATCH_SOURCE check base=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
706
	local EPATCH_SOURCE check
701
	for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT}}; do
707
	for check in ${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT}}; do
702
		EPATCH_SOURCE=${base}/${CTARGET}/${check}
708
		EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CTARGET}/${check}
703
		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${CHOST}/${check}
709
		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${CHOST}/${check}
704
		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${base}/${check}
710
		[[ -r ${EPATCH_SOURCE} ]] || EPATCH_SOURCE=${EPATCH_USER_SOURCE}/${check}
705
		if [[ -d ${EPATCH_SOURCE} ]] ; then
711
		if [[ -d ${EPATCH_SOURCE} ]] ; then
706
			EPATCH_SOURCE=${EPATCH_SOURCE} \
712
			EPATCH_SOURCE=${EPATCH_SOURCE} \
707
			EPATCH_SUFFIX="patch" \
713
			EPATCH_SUFFIX="patch" \

Return to bug 559698