commit: 1c12b72095cd0a3897e3e4b4f4acbf49d549ecf2 Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Tue Feb 9 17:14:51 2021 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> 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 <ulm <AT> 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
