* Messages for package sys-devel/gettext-0.22: * This package will overwrite one or more files that may belong to other * packages (see list below). You can use a command such as `portageq * owners / <filename>` to identify the installed package that owns a * file. If portageq reports that only one package owns a file then do * NOT file a bug report. A bug report is only useful if it identifies at * least two or more packages that are known to install the same file(s). * If a collision occurs and you can not explain where the file came from * then you should simply ignore the collision since there is not enough * information to determine if a real problem exists. Please do NOT file * a bug report at https://bugs.gentoo.org/ unless you report exactly * which two packages install the same file(s). See * https://wiki.gentoo.org/wiki/Knowledge_Base:Blockers for tips on how * to solve the problem. And once again, please do NOT file a bug report * unless you have completely understood the above message. * * Detected file collision(s): * * /gentoo/prefix64/usr/lib/libintl.so.8.3.0 * /gentoo/prefix64/usr/include/libintl.h * /gentoo/prefix64/usr/lib/libintl.so * /gentoo/prefix64/usr/lib/libintl.so.8 * * Searching all installed packages for file collisions... * * Press Ctrl-C to Stop * * dev-libs/libintl-0.22:0::gentoo_prefix * /usr/include/libintl.h * /usr/lib/libintl.so * /usr/lib/libintl.so.8 * /usr/lib/libintl.so.8.3.0 * * Package 'sys-devel/gettext-0.22' NOT merged due to file collisions. If * necessary, refer to your elog messages for the whole content of the * above message. not sure this was intentional, if so a blocker is missing, but likely "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168 needs to be put back into PATCHES.
(In reply to Fabian Groffen from comment #0) > not sure this was intentional, if so a blocker is missing, but likely > > "${FILESDIR}"/${PN}-0.19.7-disable-libintl.patch #564168 > > needs to be put back into PATCHES. Upstream made some changes. The patch would need to be rebased.
This is the updated patch: % cat files/gettext-0.22-disable-libintl.patch https://bugs.gentoo.org/564168 https://bugs.gentoo.org/909041 Never build libintl since it's in dev-libs/libintl now. We can drop this if/when upstream fixes the configure flag handling: https://savannah.gnu.org/bugs/?48233 --- a/gettext-runtime/configure +++ b/gettext-runtime/configure @@ -22765,9 +22765,7 @@ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ - && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools \ - && test "$PACKAGE" != libintl; }; then + }; then gt_use_preinstalled_gnugettext=yes else LIBINTL= --- a/gettext-tools/configure +++ b/gettext-tools/configure @@ -26129,9 +26129,7 @@ if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \ || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \ - && test "$PACKAGE" != gettext-runtime \ - && test "$PACKAGE" != gettext-tools \ - && test "$PACKAGE" != libintl; }; then + }; then gt_use_preinstalled_gnugettext=yes else LIBINTL= Ok to apply in 0.22-r1?
I can't claim to understand what the patch is doing, but it seems pretty similar to the old one. If it works for you, feel free to commit.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b76f3a0c56fd50eaf4272ea78bb9283a533710c0 commit b76f3a0c56fd50eaf4272ea78bb9283a533710c0 Author: Fabian Groffen <grobian@gentoo.org> AuthorDate: 2023-06-24 18:33:08 +0000 Commit: Fabian Groffen <grobian@gentoo.org> CommitDate: 2023-06-24 18:33:53 +0000 sys-devel/gettext-0.22-r1: fix non-Linux targets Closes: https://bugs.gentoo.org/909041 Signed-off-by: Fabian Groffen <grobian@gentoo.org> .../files/gettext-0.22-disable-libintl.patch | 34 ++++++++++++++++++++++ ...{gettext-0.22.ebuild => gettext-0.22-r1.ebuild} | 1 + 2 files changed, 35 insertions(+)
Fabian, the patch has not propagated to ::gentoo_prefix yet. I would reproduce the bug on macOS Majove.
Sorry, it is in ::gentoo_prefix, but affecting the bootstrap.
I think we need a new snapshot, right?
(In reply to Fabian Groffen from comment #7) > I think we need a new snapshot, right? Yes, indeed.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=02c424a9b45035b690daf58088bc6db30220d9ba commit 02c424a9b45035b690daf58088bc6db30220d9ba Author: Fabian Groffen <grobian@gentoo.org> AuthorDate: 2023-07-08 05:57:10 +0000 Commit: Fabian Groffen <grobian@gentoo.org> CommitDate: 2023-07-08 05:57:10 +0000 scripts/bootstrap-prefix: bump bootstrap snapshot for gettext/libintl Closes: https://bugs.gentoo.org/909041 Signed-off-by: Fabian Groffen <grobian@gentoo.org> scripts/bootstrap-prefix.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
