I have upgrade Gentoo today (I'm doing a new installation). When Gentoo tries to update x11-proto/glproto from 1.4.17 (yesterday) to 1.4.17-r1 (today) it fails due to file collision: * package x11-proto/glproto-1.4.17-r1 NOT merged * Detected file collision(s): * /usr/include/GL/glxproto.h * /usr/include/GL/glxtokens.h * /usr/include/GL/glxmd.h Those files were installed by previous version in another path: # portageq owners / glxmd.h glxproto.h glxtokens.h x11-proto/glproto-1.4.17 /usr/lib64/opengl/xorg-x11/include/GL/glxmd.h /usr/lib64/opengl/xorg-x11/include/GL/glxproto.h /usr/lib64/opengl/xorg-x11/include/GL/glxtokens.h Why doesn't it delete that files? Reproducible: Always
I have solved it changing "FEATURES=-collision-protect" in make.conf before update this package.
In any case, FEATURE="collision-protect" shouldn't have failed in this case because they are files of the same package.
Same problem upgrading media-libs/mesa from 10.3.7-r1 to 11.0.6.
These are files which were previously managed by eselect-opengl. FEATURE="collision-protect" is not enabled by default for good reason, and if you set it (because you are concerned that portage might overwrite your files) you have to handle the fallout. See this forum post for more details: https://forums.gentoo.org/viewtopic-p-7850500.html#7850500