public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/man-pages-l10n/
Date: Sat, 30 Jul 2022 03:21:10 +0000 (UTC)	[thread overview]
Message-ID: <1659151260.500bff78581acb71b695e8e29eff42c666420a64.ulm@gentoo> (raw)

commit:     500bff78581acb71b695e8e29eff42c666420a64
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 30 03:13:13 2022 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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() {


             reply	other threads:[~2022-07-30  3:21 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-30  3:21 Ulrich Müller [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-04-05 17:27 [gentoo-commits] repo/gentoo:master commit in: app-i18n/man-pages-l10n/ Ulrich Müller
2025-04-05 17:27 Ulrich Müller
2025-03-10 11:09 Arthur Zamarin
2025-02-01 13:39 Ulrich Müller
2025-02-01 13:39 Ulrich Müller
2023-12-10  1:38 Ionen Wolkens
2023-07-09 20:42 Ulrich Müller
2023-07-09 20:42 Ulrich Müller
2023-06-10  6:52 Sam James
2023-05-01  8:08 Ulrich Müller
2023-04-29  8:41 Ulrich Müller
2023-04-29  8:41 Ulrich Müller
2023-04-29  7:47 Arthur Zamarin
2023-01-28  8:46 Ulrich Müller
2023-01-28  8:46 Ulrich Müller
2022-07-28 23:06 Sam James
2022-06-12  8:53 Ulrich Müller
2022-06-11 11:30 Ulrich Müller
2022-03-29 11:21 Ulrich Müller
2022-03-29 11:21 Ulrich Müller
2022-03-25 19:44 Sam James
2022-02-14 13:57 Ulrich Müller
2022-02-14  7:27 Ulrich Müller
2022-02-13 23:20 Ulrich Müller
2022-02-13 22:55 Ulrich Müller
2021-08-08 13:13 Ulrich Müller
2021-08-06  0:25 Sam James
2021-07-22 13:18 Ulrich Müller
2021-07-19 10:20 Ulrich Müller
2021-03-29 17:25 Ulrich Müller
2021-03-29 15:30 Sam James
2021-02-09 17:24 Ulrich Müller
2021-02-07 17:01 Ulrich Müller
2021-02-07 17:01 Ulrich Müller
2021-02-06 18:33 Ulrich Müller
2020-04-15 22:54 Ulrich Müller
2020-04-15  9:39 Mart Raudsepp
2020-03-24 20:08 Ulrich Müller
2020-03-20 12:35 Ulrich Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1659151260.500bff78581acb71b695e8e29eff42c666420a64.ulm@gentoo \
    --to=ulm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox