From 1c12b72095cd0a3897e3e4b4f4acbf49d549ecf2 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Tue, 9 Feb 2021 18:14:51 +0100 Subject: app-i18n/man-pages-l10n: Don't install ps(1) manpage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../man-pages-l10n/man-pages-l10n-4.0.0.ebuild | 1 + .../man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild | 73 ++++++++++++++++++++++ .../man-pages-l10n/man-pages-l10n-4.2.0.ebuild | 71 --------------------- 3 files changed, 74 insertions(+), 71 deletions(-) create mode 100644 app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild delete mode 100644 app-i18n/man-pages-l10n/man-pages-l10n-4.2.0.ebuild (limited to 'app-i18n') 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-r1.ebuild b/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild new file mode 100644 index 000000000000..bf105e588ccb --- /dev/null +++ b/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0-r1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +MY_P="${PN/-}-v${PV}" +DESCRIPTION="A somewhat comprehensive collection of man page translations" +HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/" +SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +# build failure for es and it, so omit them for now #769314 +MY_L10N=(de fr nl pl pt-BR ro) +IUSE="${MY_L10N[@]/#/l10n_}" +REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )" + +RDEPEND="virtual/man + l10n_de? ( !app-i18n/man-pages-de ) + l10n_fr? ( !app-i18n/man-pages-fr ) + l10n_nl? ( !app-i18n/man-pages-nl ) + l10n_pl? ( !app-i18n/man-pages-pl )" + +BDEPEND="app-text/po4a + dev-lang/perl" + +DOCS=(AUTHORS.md CHANGES.md README.md) + +src_prepare() { + default + sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die + + # some packages have their own translations + local noinst_manpages=( + # app-arch/xz-utils + de/xz.1 + de/xzdec.1 + de/xzdiff.1 + de/xzgrep.1 + de/xzless.1 + de/xzmore.1 + # sys-apps/shadow + {de,nl,pl}/groups.1 + de/su.1 + # 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 + # 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 + assert +} + +src_configure() { + econf --enable-compression=none +} 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.ebuild deleted file mode 100644 index 4e729d0cd021..000000000000 --- a/app-i18n/man-pages-l10n/man-pages-l10n-4.2.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -MY_P="${PN/-}-v${PV}" -DESCRIPTION="A somewhat comprehensive collection of man page translations" -HOMEPAGE="https://manpages-l10n-team.pages.debian.net/manpages-l10n/" -SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2" -S="${WORKDIR}/${MY_P}" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -# build failure for es and it, so omit them for now #769314 -MY_L10N=(de fr nl pl pt-BR ro) -IUSE="${MY_L10N[@]/#/l10n_}" -REQUIRED_USE="|| ( ${MY_L10N[@]/#/l10n_} )" - -RDEPEND="virtual/man - l10n_de? ( !app-i18n/man-pages-de ) - l10n_fr? ( !app-i18n/man-pages-fr ) - l10n_nl? ( !app-i18n/man-pages-nl ) - l10n_pl? ( !app-i18n/man-pages-pl )" - -BDEPEND="app-text/po4a - dev-lang/perl" - -DOCS=(AUTHORS.md CHANGES.md README.md) - -src_prepare() { - default - sed -i -e "/^SUBDIRS/s/=.*/= ${L10N//-/_}/" po/Makefile.{am,in} || die - - # some packages have their own translations - local noinst_manpages=( - # app-arch/xz-utils - de/xz.1 - de/xzdec.1 - de/xzdiff.1 - de/xzgrep.1 - de/xzless.1 - de/xzmore.1 - # sys-apps/shadow - {de,nl,pl}/groups.1 - 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}/pwdx.1 - {de,fr}/tload.1 - {de,fr,pl}/uptime.1 - {de,fr}/sysctl.conf.5 - {de,fr}/sysctl.8 - {de,fr}/vmstat.8 - ) - printf '%s\n' "${noinst_manpages[@]}" \ - | sed 's%^\(.*\)/\(.*\)\.\(.*\)$%po/\1/man\3/\2.\3.po%' | xargs rm - assert -} - -src_configure() { - econf --enable-compression=none -} -- cgit v1.2.3-65-gdbad