Attachment #747180 for bug #782655

Lines 1136-1141 if ___eapi_has_eapply_user; then Link Here

(-)a/bin/phase-helpers.sh (+1 lines)
1136	local tagfile=${T}/.portage_user_patches_applied	1136	local tagfile=${T}/.portage_user_patches_applied
1137	[[ -f ${tagfile} ]] && return	1137	[[ -f ${tagfile} ]] && return
1138	>> "${tagfile}"	1138	>> "${tagfile}"
		1139	[[ " ${FEATURES} " == " userpatches " ]] \|\| return 0
1139		1140
1140	local basedir=${PORTAGE_CONFIGROOT%/}/etc/portage/patches	1141	local basedir=${PORTAGE_CONFIGROOT%/}/etc/portage/patches
1141		1142

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 207-212 SUPPORTED_FEATURES = frozenset( Link Here

(-)a/lib/portage/const.py (+1 lines)
207	"unprivileged",	207	"unprivileged",
208	"userfetch",	208	"userfetch",
209	"userpriv",	209	"userpriv",
		210	"userpatches",
210	"usersandbox",	211	"usersandbox",
211	"usersync",	212	"usersync",
212	"webrsync-gpg",	213	"webrsync-gpg",

Return to bug 782655