gentoo resync : 28.04.2021

3 files changed, 2 insertions, 70 deletions

diff --git a/app-i18n/man-pages-l10n/Manifest b/app-i18n/man-pages-l10n/Manifest
index eb514fd47ed4..b86170fac21a 100644
--- a/app-i18n/man-pages-l10n/Manifest
+++ b/app-i18n/man-pages-l10n/Manifest
@@ -1,5 +1,3 @@
-DIST manpages-l10n-v4.0.0.tar.bz2 34796889 BLAKE2B 6413278ab2c9482ffdd2cf6ef1f4c6e05f2f1d7be8c8d556cb137ca4c5c2d6297f9547725f3afcf8023478c05e41d99d595a0b5a44da0d0188ed0287c630e5b6 SHA512 9c83363ffaa9ff9015934869623958594e64f1cbb52367dd8274425a5cb45dac06109d231fd7f165eb35248b4229f3bbf252a6a4630e7d5a47edbf41d4a646a9
 DIST manpages-l10n-v4.2.0.tar.bz2 51747352 BLAKE2B 97c3e3fdb11b47753c9c179751fb001af0a9f79324d594d297981735f82b3917bd31fc5c100462d6093e621a98773f23543548efb957113ade39e9c315cd4d72 SHA512 b2de542fdb97868b5fa96f24947c7a37216dc6a6a5ee66142023dd1036017f7128ca26ac8367b0edbd76cfa049174892749efafef9dbf4221e90dd9166b82652
-EBUILD man-pages-l10n-4.0.0.ebuild 1699 BLAKE2B b1b3d8eb90703a0e00939d7d967590794754a9fdf6fd2cbdc4555ea817f977723eac373aab3071c7360f7a319620b7e8ea1368d3a8a9d95345bbd4d3cf9da7b8 SHA512 8237b93e639111a3dd2767230240bebd3535c8c89cdbf5aab8b49efe2f253dcc4ec952c6aac7cb4f8b038a3da7570146e0d72011e1c7ce7d2cc223cb40c77b79
-EBUILD man-pages-l10n-4.2.0-r1.ebuild 1807 BLAKE2B 17a3ad712a4793a83ea42b33c9c6d5cdee519f4440d222ca9ad389a8ae754321dbaa1130f482b1a79436f0778b5388a663047bd85d69c2f36294ce4ad751207a SHA512 1c3d24bed8169290d533ef3c8e249d3f71fb342fbf24159521668b9ffe2de2c8944b54fe8779fb127042f451655438e21bc5b66cbf8aa1c1ceb45d57fc6d4654
+EBUILD man-pages-l10n-4.2.0-r1.ebuild 1799 BLAKE2B 16720e493e97ef1144b96919c70f965a3ee52a2d45cfcfff02677a44ae842ad464119ea89f0b820676481a6248f327c06570e3015a4300caf74400664fb4b814 SHA512 654b3e9ab65b6a3dd8c500066833e4ed33dc6ccc908b8ae4895e5922d35e758ed8a3b3ac8951c0cf3af6baf8d43a2516dc5a614a21f57b6dde09a9b9672cab28
 MISC metadata.xml 235 BLAKE2B a6e10699959bdc64d99b8c0b00f46388bdf0c1e125a9351c63e61aae65c6bd9f70ab55a9497f6a6dcf10b161022abdd23c50443193563ba83744c09d1d4cd9c6 SHA512 fdebae10dcd9eddfe7d9546337826902e38d3d0e7b7e6e140038bcb293c98ca81b096d203b5709f42948bfa8868fe2d68d1385fae6664505e14d9ac1541898f9
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
deleted file mode 100644
index 3cd9f132e0b1..000000000000
--- a/app-i18n/man-pages-l10n/man-pages-l10n-4.0.0.ebuild
+++ /dev/null
@@ -1,66 +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"
-# omit pt-BR and ro for now, because they each install only two man pages
-MY_L10N=(de fr nl pl)
-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 )
-	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/xzdiff.1
-		de/xzgrep.1
-		de/xzless.1
-		de/xzmore.1
-		# sys-apps/shadow
-		{de,pl}/groups.1
-		de/su.1
-		# sys-process/procps
-		{de,pl}/free.1
-		{de,fr}/pgrep.1
-		{de,fr}/pmap.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
-}
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
index bf105e588ccb..5d58f5e413a2 100644
--- 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
@@ -11,7 +11,7 @@ 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"
+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_}"