As a follow up to this discussion, I came with the attached patch. It appears to work ok for regular merges and binpkg merges with FEATURES="collision-protect". Per my reading of PMS it does not appear to violate anything so I guess it is ok. -- Gilles Dartiguelongue Gentoo