gentoo Easter resync : 12.04.2020

4 files changed, 69 insertions, 84 deletions

diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
index 9d1e5670ad26..7b770ec3e12b 100644
--- a/app-i18n/man-pages-de/Manifest
+++ b/app-i18n/man-pages-de/Manifest
@@ -1,4 +1,5 @@
 DIST manpages-de-v2.12.tar.bz2 10242050 BLAKE2B fa497a6fce2c2387dad2ab9443584174d8d5fab530b94e0123e71286c588cb3a2e52aa96760dbfd6545bed013c460e1bf61eb4a5af0673bb84c1c0f0c960a357 SHA512 548d3dd500ce1eadc71365119e35072b71e3fbe36eba664d992e94897f442fb93f9397053f72363f83dff2e931d93e2af995976736d8513d11d7c42bdb471862
-EBUILD man-pages-de-2.12-r1.ebuild 1939 BLAKE2B 72a35122ddd8142df74d0d672085822586f3150fb099d86d632efc6023a946400b6b785d3303fa5bb392e6b5b47a3e07f6053c8a4790a0a7f6a84375ee1190b1 SHA512 0f02c403ac476ad1a62ead48b63c651e5bcaa38f9e5fa69cfd8b081a3e1015a66e7a0524171be5f1601758ee8e43587ab399ad50c5accb7743962fa26f08da51
-EBUILD man-pages-de-2.12.ebuild 1885 BLAKE2B 37b9fa1c64f6247eff9b1f17d4a3d236cf1479ccd0d8eafa0d92b1d553dc90dec733edca50056ae30fee8a91208faea0aef5c8cebb438d46f3135d3b4da3d51f SHA512 6e07902a7259200bdeacbc13d9269e7852ab4d1fff2dd4a84268f785469171c3c1763ec25a47356da9607fa50394522bc31e7b40b9491ec5c885a1bedd7397de
+DIST manpages-l10n-v2.16.tar.bz2 26569385 BLAKE2B ff5877a2a58e48fb7411559bbc22dae5918bda2d1fa38b5239bb6fc0561d85c44a276a491a368fee75ee26508f0128b5f4a5d0afe344321b4d4c653dd6a24898 SHA512 e534276b693c124a70a409ba9318a4a3e168c3d10c8e2837811f27d471ebb25eb4235eff9910cfc57624560fbc6273379a2d813b4a8cec2dd7ca1a0cd09ed78d
+EBUILD man-pages-de-2.12-r1.ebuild 1925 BLAKE2B 813a1e51c6cfac0aac9264583c62ba17e7cb9473a2c361ecf637c53812a6abdae0604cde202e0476de1238049160d1e999890ff34452f344ed30c93c63c43620 SHA512 65229c44e14ba1f4df186eab529691150ac66fd4a9e1457024c0810b2c4b875915c7cc52bb05b48b0d94d33dfe7b11a3504f3c28f523849aa4224d96e7a9ce5a
+EBUILD man-pages-de-2.16.ebuild 1439 BLAKE2B e7b8b5c572c04a6308faa4841b8e2125d5d3cec25c493148f5a7e117bb3d480cfd16e0cab46a88333e6ff948498e0d70e9de213afb7224adc431b2b67ef61033 SHA512 4518beb6324e3a658b4c610a763b3755e98f4c0ff9b2fef32ac37aa16b86291ee2f4b0f7eaad8eaa3fe3806fcbdc6b58541cd85d6e094311d8888a924b54eadc
 MISC metadata.xml 369 BLAKE2B 41170815bcde0a65831b0453eee7b99359594bc67d345e31d1228d6b5def740d73087b96473511a8249528ac16a80b0eeee91791f9d4f113cb5caed918b40552 SHA512 e36208b3689927021e51ad2348ba3f5a5598b9657ffd7156d928dc817b90ed91a57d43605eb8a3e2fde1caf04349ba76b68ebc7ead1061ecca66280095179658
diff --git a/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild b/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
index 5901e1eda028..b38f24d861d5 100644
--- a/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
+++ b/app-i18n/man-pages-de/man-pages-de-2.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://salsa.debian.org/manpages-de-team/manpages-de/-/archive/v${PV}/
 
 LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 RDEPEND="virtual/man"
diff --git a/app-i18n/man-pages-de/man-pages-de-2.12.ebuild b/app-i18n/man-pages-de/man-pages-de-2.12.ebuild
deleted file mode 100644
index d2837b0ad588..000000000000
--- a/app-i18n/man-pages-de/man-pages-de-2.12.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-MY_P="${PN/-/}-v${PV}"
-
-DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
-HOMEPAGE="https://salsa.debian.org/manpages-de-team/manpages-de"
-SRC_URI="https://salsa.debian.org/manpages-de-team/manpages-de/-/archive/v${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-BDEPEND="app-text/po4a"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	sed '/gzip --best/d' -i po/Makefile.am || die
-
-	# sys-apps/shadow has it's own translated man-page for this
-	local manpage
-	local noinst_manpages=(
-		upstream/debian-unstable/man1/groups.1
-		po/man1/groups.1.po
-		po/man1/su.1.po
-	)
-	for manpage in ${noinst_manpages[@]} ; do
-		rm "${manpage}" || die
-	done
-
-	# Use the same compression as every other manpage
-	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
-	local PORTAGE_COMPRESS_FLAGS_LOCAL=${PORTAGE_COMPRESS_FLAGS}
-	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
-		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)
-				PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
-			;;
-		esac
-	fi
-
-	# Fix source files for symlinks
-	local LINKSOURCE
-	case ${PORTAGE_COMPRESS_LOCAL} in
-		bzip2)
-			for LINKSOURCE in upstream/*/links.txt ; do
-				sed -i -e 's/\.gz/\.bz2/g' "${LINKSOURCE}" || die
-			done
-		;;
-		gzip)
-			# pass
-		;;
-		xz)
-			for LINKSOURCE in upstream/*/links.txt ; do
-				sed -i -e 's/\.gz/\.xz/g' "${LINKSOURCE}" || die
-			done
-		;;
-		*)
-			ewarn "Unexpected compression command ${PORTAGE_COMPRESS} found, symlinks will not work."
-		;;
-	esac
-
-	eautoreconf
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake mandir="${ED}"/usr/share/man install
-	dodoc CHANGES.md README.md
-}
diff --git a/app-i18n/man-pages-de/man-pages-de-2.16.ebuild b/app-i18n/man-pages-de/man-pages-de-2.16.ebuild
new file mode 100644
index 000000000000..f802bbdaabd6
--- /dev/null
+++ b/app-i18n/man-pages-de/man-pages-de-2.16.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="manpages-l10n-v${PV}"
+
+DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
+HOMEPAGE="https://salsa.debian.org/manpages-l10n-team/manpages-l10n"
+SRC_URI="https://salsa.debian.org/manpages-l10n-team/manpages-l10n/-/archive/v${PV}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="virtual/man"
+BDEPEND="app-text/po4a
+	dev-lang/perl"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	# some packages have their own translations
+	local noinst_manpages=(
+		# sys-apps/shadow
+		po/de/man1/groups.1.po
+		po/de/man1/su.1.po
+		# sys-process/procps
+		po/de/man1/tload.1.po
+		po/de/man1/pwdx.1.po
+		po/de/man1/uptime.1.po
+		po/de/man1/pmap.1.po
+		po/de/man1/pgrep.1.po
+		po/de/man1/free.1.po
+		po/de/man5/sysctl.conf.5.po
+		po/de/man8/sysctl.8.po
+		po/de/man8/vmstat.8.po
+		# app-arch/xz-utils
+		po/de/man1/xz.1.po
+		po/de/man1/xzdiff.1.po
+		po/de/man1/xzgrep.1.po
+		po/de/man1/xzless.1.po
+		po/de/man1/xzmore.1.po
+	)
+	rm "${noinst_manpages[@]}" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --enable-compression="none"
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake mandir="${ED}"/usr/share/man install
+	dodoc CHANGES.md README.md
+}