summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2021-02-09 18:14:51 +0100
committerUlrich Müller <ulm@gentoo.org>2021-02-09 18:24:10 +0100
commit1c12b72095cd0a3897e3e4b4f4acbf49d549ecf2 (patch)
tree78c1df2314b3988af470e257f5ee2d4d73b819f8 /app-i18n
parentprofiles/package.mask: fix media-gfx/gqview mask date (diff)
downloadgentoo-1c12b72095cd0a3897e3e4b4f4acbf49d549ecf2.tar.gz
gentoo-1c12b72095cd0a3897e3e4b4f4acbf49d549ecf2.tar.bz2
gentoo-1c12b72095cd0a3897e3e4b4f4acbf49d549ecf2.zip
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@gentoo.org>
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild1
-rw-r--r--app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild (renamed from app-i18n/man-pages-l10n/man-pages-l10n-4.2.0.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 14b3afed15ab..3cd9f132e0b1 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
index 4e729d0cd021..bf105e588ccb 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