* /usr/include/pugiconfig.hpp * /usr/include/pugixml.hpp * /usr/lib64/cmake/pugixml/pugixml-config-gentoo.cmake * /usr/lib64/cmake/pugixml/pugixml-config.cmake * * Searching all installed packages for file collisions... * * Press Ctrl-C to Stop * * dev-libs/pugixml-1.9:0::gentoo * /usr/include/pugiconfig.hpp * /usr/include/pugixml.hpp * /usr/lib64/cmake/pugixml/pugixml-config-gentoo.cmake * /usr/lib64/cmake/pugixml/pugixml-config.cmake * * Package 'dev-libs/libsavitar-3.3.0' NOT merged due to file collisions. ------------------------------------------------------------------- This is an unstable amd64 chroot image at a tinderbox (==build bot) name: 17.0-no-multilib_libressl_20180608-234334 ------------------------------------------------------------------- gcc-config -l: [1] x86_64-pc-linux-gnu-7.3.0 * Available Python interpreters, in order of preference: [1] python3.5 [2] python2.7 (fallback) Available Ruby profiles: [1] ruby23 (with Rubygems) * emerge -qpv dev-libs/libsavitar [ebuild N ] dev-libs/libsavitar-3.3.0 USE="-python -static-libs" PYTHON_SINGLE_TARGET="python3_5 -python3_6" PYTHON_TARGETS="python3_5 -python3_6"
Created attachment 535908 [details] emerge-info.txt
Created attachment 535910 [details] dev-libs:libsavitar-3.3.0:20180614-150936.log
Created attachment 535912 [details] emerge-history.txt
Created attachment 535914 [details] etc.portage.tbz2
Created attachment 535916 [details] logs.tbz2
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7855f572f7b201eebe1476a9dc01ec2726f8ce88 commit 7855f572f7b201eebe1476a9dc01ec2726f8ce88 Author: Mathy Vanvoorden <mathy@vanvoorden.be> AuthorDate: 2018-06-14 21:15:04 +0000 Commit: Alexey Shvetsov <alexxy@gentoo.org> CommitDate: 2018-06-15 11:09:08 +0000 dev-libs/libsavitar: use pugixml from system resolving file collision Upstream put pugixml inside the distribution and it is built and installed alongside with the library. This results in file collisions when pugixml is already installed on the system. Existing upstream pull request: https://github.com/Ultimaker/libSavitar/pull/8 This commit applies that pull request as a patch. I modified the patch slightly to not include the actual deletion of the library and only apply the needed changes to the rest of the library. I did this because otherwise the filesize was bigger than the portage limit. Closes: https://bugs.gentoo.org/658112 Closes: https://github.com/gentoo/gentoo/pull/8846 Package-Manager: Portage[mgorny]-2.3.36.1 .../libsavitar-3.3.0-remove-packaged-pugixml.patch | 119 +++++++++++++++++++++ ...tar-3.3.0.ebuild => libsavitar-3.3.0-r1.ebuild} | 2 + 2 files changed, 121 insertions(+)
