sys-process/procps-3.3.16 fails to merge due to a collision with app-i18n/man-pages-pl-0.7. This is a regression, since sys-process/procps-3.3.15-r1 causes no such problem. Relevant log: * package sys-process/procps-3.3.16 NOT merged * * Detected file collision(s): * * /usr/share/man/pl/man1/uptime.1.bz2 * /usr/share/man/pl/man1/free.1.bz2 * * Searching all installed packages for file collisions... * * Press Ctrl-C to Stop * * app-i18n/man-pages-pl-0.7:0::gentoo * /usr/share/man/pl/man1/free.1.bz2 * /usr/share/man/pl/man1/uptime.1.bz2 Reproducible: Always Steps to Reproduce: 1. Install app-i18n/man-pages-pl-0.7 2. Try to install sys-process/procps-3.3.16 Actual Results: Package fails to merge due to file collisions Expected Results: Package merges as intended
The same collisions happen with app-i18n/man-pages-de-2.12:0 * Detected file collision(s): * * /usr/share/man/de/man1/free.1.bz2 * /usr/share/man/de/man1/uptime.1.bz2 * * Searching all installed packages for file collisions... * * Press Ctrl-C to Stop * * app-i18n/man-pages-de-2.12:0::gentoo * /usr/share/man/de/man1/free.1.bz2 * /usr/share/man/de/man1/uptime.1.bz2 * * Package 'sys-process/procps-3.3.16' NOT merged due to file collisions.
(In reply to Michał Ziąbkowski from comment #0) > This is a regression, since sys-process/procps-3.3.15-r1 causes no such > problem. I wouldn't call this a regression, because procps has the better rights to install its own localised man pages. So presumably, the app-i18n packages are the ones that should be fixed. I see that for example man-pages-de has a blacklist already in place (noinst_manpages), so adding the two files would be trivial. CCing maintainer of app-i18n/man-pages-de, too.
(In reply to Ulrich Müller from comment #2) > I wouldn't call this a regression, because procps has the better rights to > install its own localised man pages. > > So presumably, the app-i18n packages are the ones that should be fixed. I > see that for example man-pages-de has a blacklist already in place > (noinst_manpages), so adding the two files would be trivial. Fair enough. I suspect the localized man pages are less up-to-date anyway, so not much of a loss there.
I'll add them to the blacklist of man-pages-de. Complication is that if <procps-3.3.16 is installed it would be better to not blacklist them (i.e. doing it conditionally). I'll have to think about that. Tangential thought: this solution does not scale well, maybe I should convince procps upstream to include their translation into man-pages-de.
i'll fix the pl variant today.
Created attachment 599254 [details] fixed ebuild
(In reply to Marcin Kowalski from comment #6) > Created attachment 599254 [details] > fixed ebuild -MY_PKG=manpages-pl-${PV} +inherit versionator + +MY_VER=$(get_version_component_range 1-2) [...] -SRC_URI="mirror://sourceforge/manpages-pl/${MY_PKG}.tar.bz2" +SRC_URI="mirror://sourceforge/manpages-pl/manpages-pl-${MY_VER}.tar.bz2" What is the purpose of this change? It doesn't seem to do anything (note that PV doesn't include the revision, so it's still "0.7"). Also, can you please attach it as "git format-patch", including a signoff? (See https://www.gentoo.org/glep/glep-0076.html#certificate-of-origin.)
(In reply to Markus Oehme from comment #4) > I'll add them to the blacklist of man-pages-de. Complication is that if > <procps-3.3.16 is installed it would be better to not blacklist them (i.e. > doing it conditionally). I'll have to think about that. > > Tangential thought: this solution does not scale well, maybe I should > convince procps upstream to include their translation into man-pages-de. Actually my collision was with app-i18n/man-pages-de - before it takes years to fix all bug reports, I added "/bin/rm -rf man-po/translated/*" to src_configure() (cf. patch to procps ebuild). Note that I found a commented-out "clean-local" target in man-po/Makefile.in which seems to serve a similar purpose (removing locally-provided translated manpages, probably in favour of a global package).
Created attachment 599476 [details, diff] Patch to procps ebuild Patch removing the local manpage translations provided by this package.
(In reply to Bernd Feige from comment #9) > Created attachment 599476 [details, diff] [details, diff] > Patch to procps ebuild > > Patch removing the local manpage translations provided by this package. Nope, it's the app-i18n/man-pages-* packages that should be fixed. I am going to take care of it.
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47d0d73ec00762f6585526dc3c5c9c129a3a07a6 commit 47d0d73ec00762f6585526dc3c5c9c129a3a07a6 Author: Ulrich Müller <ulm@gentoo.org> AuthorDate: 2019-12-14 09:55:56 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2019-12-14 09:57:15 +0000 app-i18n/man-pages-pl: Fix file collision with sys-process/procps. Bug: https://bugs.gentoo.org/702276 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Ulrich Müller <ulm@gentoo.org> app-i18n/man-pages-pl/man-pages-pl-0.7-r1.ebuild | 31 ++++++++++++++++++++++++ 1 file changed, 31 insertions(+) https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=936a620678f6dcdeec3293870a20f4bc19b6f311 commit 936a620678f6dcdeec3293870a20f4bc19b6f311 Author: Ulrich Müller <ulm@gentoo.org> AuthorDate: 2019-12-14 09:55:22 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2019-12-14 09:57:15 +0000 app-i18n/man-pages-de: Fix file collision with sys-process/procps. Bug: https://bugs.gentoo.org/702276 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Ulrich Müller <ulm@gentoo.org> app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild | 82 +++++++++++++++++++++++ 1 file changed, 82 insertions(+)
(In reply to Ulrich Müller from comment #10) > Nope, it's the app-i18n/man-pages-* packages that should be fixed. I am > going to take care of it. Thanks. I just think that that's a maintenance nightmare, just as Markus said. Or do away with global manpage dumps and add a "pull docs from xx" logic to the ebuilds of packages lacking own docs.
(In reply to Bernd Feige from comment #12) > I just think that that's a maintenance nightmare, just as Markus said. Searching our Bugzilla for "ALL app-i18n/man-pages collision", it appears that the previous file collision happened in 2013 (bug 480970). Not much of a maintenance burden, IMHO.
The bug has been referenced in the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251e2aa8f139d515b6c0c7d305cc6f751c5614a2 commit 251e2aa8f139d515b6c0c7d305cc6f751c5614a2 Author: Ulrich Müller <ulm@gentoo.org> AuthorDate: 2019-12-18 05:29:38 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2019-12-18 05:29:38 +0000 sys-process/procps: Block against old app-i18n/man-pages-{de,pl}. Because of file collisions for the free.1 and uptime.1 man pages. Bug: https://bugs.gentoo.org/702276 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Ulrich Müller <ulm@gentoo.org> sys-process/procps/procps-3.3.16.ebuild | 2 ++ 1 file changed, 2 insertions(+)
*** Bug 703364 has been marked as a duplicate of this bug. ***
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebe0085b83dc7c9fc5da5ef0dee6a5843bf3525 commit 0ebe0085b83dc7c9fc5da5ef0dee6a5843bf3525 Author: Markus Oehme <bureau@jonglieren-jena.de> AuthorDate: 2020-03-18 19:23:32 +0000 Commit: Ulrich Müller <ulm@gentoo.org> CommitDate: 2020-03-18 20:16:23 +0000 app-i18n/man-pages-de: Bump to version 2.16 This is the last release of man-pages-de. Upstream has renamed to manpages-l10n and now includes multiple languages. They just released manpages-l10n-4.0.0 under the new name. This also fixes collisions with sys-process/procps and app-arch/xz-utils. Closes: https://bugs.gentoo.org/696552 Closes: https://bugs.gentoo.org/702276 Closes: https://bugs.gentoo.org/713190 Signed-off-by: Markus Oehme <bureau@jonglieren-jena.de> [Added dev-lang/perl to BDEPEND.] Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Ulrich Müller <ulm@gentoo.org> app-i18n/man-pages-de/Manifest | 1 + app-i18n/man-pages-de/man-pages-de-2.16.ebuild | 68 ++++++++++++++++++++++++++ 2 files changed, 69 insertions(+)
