Attachment #699660 for bug #782655

Lines 1094-1099 if ___eapi_has_eapply_user; then Link Here

(-)a/bin/phase-helpers.sh (+1 lines)
1094	local tagfile=${T}/.portage_user_patches_applied	1094	local tagfile=${T}/.portage_user_patches_applied
1095	[[ -f ${tagfile} ]] && return	1095	[[ -f ${tagfile} ]] && return
1096	>> "${tagfile}"	1096	>> "${tagfile}"
		1097	[[ " ${FEATURES} " == " userpatches " ]] \|\| return 0
1097		1098
1098	local basedir=${PORTAGE_CONFIGROOT%/}/etc/portage/patches	1099	local basedir=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
1099		1100

Lines 61-67 FEATURES="assume-digests binpkg-docompress binpkg-dostrip binpkg-logs Link Here

(-)a/cnf/make.globals (-1 / +1 lines)
61	preserve-libs protect-owned qa-unresolved-soname-deps	61	preserve-libs protect-owned qa-unresolved-soname-deps
62	sandbox sfperms strict	62	sandbox sfperms strict
63	unknown-features-warn unmerge-logs unmerge-orphans userfetch	63	unknown-features-warn unmerge-logs unmerge-orphans userfetch
64	userpriv usersandbox usersync"	64	userpatches userpriv usersandbox usersync"
65		65
66	# Ignore file collisions in /lib/modules since files inside this directory	66	# Ignore file collisions in /lib/modules since files inside this directory
67	# are never unmerged, and therefore collisions must be ignored in order for	67	# are never unmerged, and therefore collisions must be ignored in order for

Lines 203-208 SUPPORTED_FEATURES = frozenset([ Link Here

(-)a/lib/portage/const.py (+1 lines)
203	"unmerge-orphans",	203	"unmerge-orphans",
204	"unprivileged",	204	"unprivileged",
205	"userfetch",	205	"userfetch",
		206	"userpatches",
206	"userpriv",	207	"userpriv",
207	"usersandbox",	208	"usersandbox",
208	"usersync",	209	"usersync",

Return to bug 782655