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

(-)a/bin/phase-helpers.sh (-2 / +7 lines)
Lines 1089-1094 if ___eapi_has_eapply_user; then Link Here
1089
		local basedir=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
1089
		local basedir=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
1090
1090
1091
		local d applied
1091
		local d applied
1092
		local LC_ALL=POSIX
1093
		local prev_shopt=$(shopt -p nullglob)
1094
		shopt -s nullglob
1095
1092
		# possibilities:
1096
		# possibilities:
1093
		# 1. ${CATEGORY}/${P}-${PR} (note: -r0 desired to avoid applying
1097
		# 1. ${CATEGORY}/${P}-${PR} (note: -r0 desired to avoid applying
1094
		#    ${P} twice)
1098
		#    ${P} twice)
Lines 1096-1107 if ___eapi_has_eapply_user; then Link Here
1096
		# 3. ${CATEGORY}/${PN}
1100
		# 3. ${CATEGORY}/${PN}
1097
		# all of the above may be optionally followed by a slot
1101
		# all of the above may be optionally followed by a slot
1098
		for d in "${basedir}"/${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT%/*}}; do
1102
		for d in "${basedir}"/${CATEGORY}/{${P}-${PR},${P},${PN}}{,:${SLOT%/*}}; do
1099
			if [[ -d ${d} ]]; then
1103
			if [[ -n $(echo ${d}/*.diff) || -n $(echo ${d}/*.patch) ]]; then
1100
				eapply "${d}"
1104
				eapply "${d}"
1101
				applied=1
1105
				applied=1
1102
			fi
1106
			fi
1103
		done
1107
		done
1104
1108
1109
		${prev_shopt}
1110
1105
		[[ -n ${applied} ]] && ewarn "User patches applied."
1111
		[[ -n ${applied} ]] && ewarn "User patches applied."
1106
	}
1112
	}
1107
fi
1113
fi
1108
- 

Return to bug 573920