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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BE5591382C5 for ; Tue, 9 Feb 2021 17:24:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F1FE6E092C; Tue, 9 Feb 2021 17:24:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD2F3E092C for ; Tue, 9 Feb 2021 17:24:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C062B3408CF for ; Tue, 9 Feb 2021 17:24:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7702E2A9 for ; Tue, 9 Feb 2021 17:24:14 +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: <1612891450.1c12b72095cd0a3897e3e4b4f4acbf49d549ecf2.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.0.0.ebuild app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild app-i18n/man-pages-l10n/man-pages-l10n-4.2.0.ebuild X-VCS-Directories: app-i18n/man-pages-l10n/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 1c12b72095cd0a3897e3e4b4f4acbf49d549ecf2 X-VCS-Branch: master Date: Tue, 9 Feb 2021 17:24:14 +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: 9fcc1dca-de6d-4994-9795-f9f126b342da X-Archives-Hash: 8bb3122a42a77b21324fdac5c04b3b1b commit: 1c12b72095cd0a3897e3e4b4f4acbf49d549ecf2 Author: Ulrich Müller gentoo org> AuthorDate: Tue Feb 9 17:14:51 2021 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Tue Feb 9 17:24:10 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c12b720 app-i18n/man-pages-l10n: Don't install ps(1) manpage File collision with sys-process/procps-3.3.17. Closes: https://bugs.gentoo.org/769773 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Ulrich Müller gentoo.org> app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild | 1 + ...es-l10n-4.2.0.ebuild => man-pages-l10n-4.2.0-r1.ebuild} | 14 ++++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild index 14b3afed15a..3cd9f132e0b 100644 --- a/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild +++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild @@ -18,6 +18,7 @@ IUSE="${MY_L10N[@]/#/l10n_}" REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )" RDEPEND="virtual/man + !>=sys-process/procps-3.3.17 !>=sys-process/psmisc-23.4 l10n_de? ( !app-i18n/man-pages-de ) l10n_fr? ( !app-i18n/man-pages-fr ) diff --git a/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild similarity index 97% rename from app-i18n/man-pages-l10n/man-pages-l10n-4.2.0.ebuild rename to app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild index 4e729d0cd02..bf105e588cc 100644 --- a/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0.ebuild +++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild @@ -46,20 +46,22 @@ src_prepare() { de/su.1 # sys-process/procps {de,fr,pl}/free.1 - {de,nl,pl}/fuser.1 - {de,pl}/killall.1 {de,fr}/pgrep.1 {de,fr}/pmap.1 - de/peekfd.1 - de/prtstat.1 - de/pslog.1 - {de,pl}/pstree.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 + # 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 ) printf '%s\n' "${noinst_manpages[@]}" \ | sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm