From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 253B8158094 for ; Sat, 30 Jul 2022 03:21:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4E162E0FEE; Sat, 30 Jul 2022 03:21:13 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA6ECE0FEE for ; Sat, 30 Jul 2022 03:21:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0CEFF33E695 for ; Sat, 30 Jul 2022 03:21:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6CD7F54D for ; Sat, 30 Jul 2022 03:21:10 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1659151260.500bff78581acb71b695e8e29eff42c666420a64.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/man-pages-l10n/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-i18n/man-pages-l10n/man-pages-l10n-4.14.0-r1.ebuild app-i18n/man-pages-l10n/man-pages-l10n-4.14.0.ebuild X-VCS-Directories: app-i18n/man-pages-l10n/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 500bff78581acb71b695e8e29eff42c666420a64 X-VCS-Branch: master Date: Sat, 30 Jul 2022 03:21:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 07c73e6f-2cb3-411c-8fa1-2b5ce0a1a648 X-Archives-Hash: bacbaa206eda919aec12fb47d5e3d37b commit: 500bff78581acb71b695e8e29eff42c666420a64 Author: Ulrich Müller gentoo org> AuthorDate: Sat Jul 30 03:13:13 2022 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Jul 30 03:21:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=500bff78 app-i18n/man-pages-l10n: Fix file collision with sys-apps/shadow If there is a file collision in any language, then remove all language versions of that file. Bug: https://bugs.gentoo.org/861743#c2 Signed-off-by: Ulrich Müller gentoo.org> ...14.0.ebuild => man-pages-l10n-4.14.0-r1.ebuild} | 77 +++++++++++----------- 1 file changed, 39 insertions(+), 38 deletions(-) diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0-r1.ebuild similarity index 64% rename from app-i18n/man-pages-l10n/man-pages-l10n-4.14.0.ebuild rename to app-i18n/man-pages-l10n/man-pages-l10n-4.14.0-r1.ebuild index 3254d8837780..f3ee6041875e 100644 --- a/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0.ebuild +++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.14.0-r1.ebuild @@ -32,50 +32,51 @@ src_prepare() { sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die # some packages have their own translations - local noinst_manpages=( + local f noinst_manpages=( # app-arch/xz-utils - de/xz.1 - de/xzdec.1 - de/xzdiff.1 - de/xzgrep.1 - de/xzless.1 - de/xzmore.1 + xz.1 + xzdec.1 + xzdiff.1 + xzgrep.1 + xzless.1 + xzmore.1 # sys-apps/shadow - {cs,de,es,hu,nl,pl}/groups.1 - de/su.1 + groups.1 + su.1 # sys-apps/sysvinit - de/last.1 - de/mesg.1 - de/mountpoint.1 - de/utmpdump.1 - de/wall.1 - fr/bootlogd.8 - de/halt.8 - {fr,pl}/killall5.8 - de/runlevel.8 - de/sulogin.8 + last.1 + mesg.1 + mountpoint.1 + utmpdump.1 + wall.1 + bootlogd.8 + halt.8 + killall5.8 + runlevel.8 + sulogin.8 # sys-process/procps - {de,fr,pl}/free.1 - {de,fr}/pgrep.1 - {de,fr}/pmap.1 - {de,fr,pl}/ps.1 - {de,fr}/pwdx.1 - {de,fr}/tload.1 - {de,fr,pl}/uptime.1 - {de,fr}/sysctl.conf.5 - {de,fr}/sysctl.8 - {de,fr}/vmstat.8 + free.1 + pgrep.1 + pmap.1 + ps.1 + pwdx.1 + tload.1 + uptime.1 + sysctl.conf.5 + sysctl.8 + vmstat.8 # sys-process/psmisc - {de,nl,pl}/fuser.1 - {de,pl}/killall.1 - de/peekfd.1 - de/prtstat.1 - de/pslog.1 - {de,pl}/pstree.1 + fuser.1 + killall.1 + peekfd.1 + prtstat.1 + pslog.1 + pstree.1 ) - printf '%s\n' "${noinst_manpages[@]}" \ - | sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm - assert + + for f in "${noinst_manpages[@]}"; do + rm po/*/"man${f##*.}/${f}.po" || die + done } src_configure() {