gentoo resync : 03.03.2019

3 files changed, 43 insertions, 72 deletions

diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
index 1ef7557a7c5d..2fa7fdb45a5d 100644
--- a/app-i18n/man-pages-de/Manifest
+++ b/app-i18n/man-pages-de/Manifest
@@ -1,12 +1,10 @@
 AUX man-pages-de-1.3-bzip2.patch 604 BLAKE2B 0569a8303e3e28ecbdeaaab04f9ce7a84fb7309485bf7e82da1cbb3aabe0e1987e3a192a27d793cb32bcb36fd8f4dd06ef5940c90ce32e92f3cc783b0387c5aa SHA512 ab07f650572e97cd4bcc31d438d601be182c98998086be9d875b0193a9c7ebe0add85e2cb14867082f70b009acfdd102fe743af02a947f3f41111594c7082932
 DIST manpages-de-1.15.tar.xz 1529576 BLAKE2B 600d9c186ffa46fd1db110c3889abc44bb6ccb6847ed8385c461c7fa696f5a9e8a65233d1290ae9d1e9eb26694e8769aa35983f07205a0e7e57c9b0c14c7d7bc SHA512 d1f1b9f60c4713d6be650e21b7664ff594dbd542b53148c00d1a2269413d39615dd76be4c4095eeb72e2598b94af134ca5d128b85d9520a1ac404364b8a53948
 DIST manpages-de-1.21.tar.xz 1585600 BLAKE2B f2364e0b5fc1ca8ce8f5eb7fa5987d1bc68b1f8f2c1a26240d5cabd03eb5bb094f0d63274c7208059a766498f5f20ca7ccab72a9d4847057aae3b7d6697018e7 SHA512 24cc36e8e9c2efb8cd2a0c374a3f5da96f6645a306082cc28aae5933081f7de24bac03652f690a2becd32a23a93c17ddd9029190c299dda95eeb25f49b327fac
-DIST manpages-de-2.3.tar.xz 7016372 BLAKE2B 3b89049d11bfd539e9114de38198f610145972068c9cec1da1b6398fb1d3e846b112ca0336891c1782a6fb142f397ac472ad78be0596503377318bfe65ec68d2 SHA512 abc3574c4a315d86b4fcccb25d617851c1ff43844fc7b1b92d7849a098280a96ab73d4986047fe6bb18e8f11d391182370eff9db476e0dd2021d0725b4e945eb
 DIST manpages-de-v2.10.tar.bz2 18037944 BLAKE2B 7f2ec07e4b4b13adfb93c00827ae56cb82c2158de2a59bca729e5fe5bbe1f9a60c39712c52ae8b5856eb55288b1b562fd320473ed94f443e252df80a909df08b SHA512 d74b62903061f5af939c8e5a5f48906fecd2956d9291be54cb00041f3c964c769159989fba888ddfb41e167b5342b7b71d2dcc7b58f1b1453836b24bb9121f26
-DIST manpages-de-v2.5.tar.bz2 8744190 BLAKE2B 06b9f970e652892edda6079bd4b912b2272652b5060a0d7a7c3dcd074f2ac71730800a077b7aa4d5175fb44723a60642e39c1bf81ecc731dcadb0ab703461df9 SHA512 3bf5f794ec9a1036f0fdcbea6afc03fd845f42b83c928116e4f47980060b3dcedfb25cd4330a60cc3da7f573d73a50e61ccb6a681979fcc6bfb63b882de1fd20
+DIST manpages-de-v2.12.tar.bz2 10242050 BLAKE2B fa497a6fce2c2387dad2ab9443584174d8d5fab530b94e0123e71286c588cb3a2e52aa96760dbfd6545bed013c460e1bf61eb4a5af0673bb84c1c0f0c960a357 SHA512 548d3dd500ce1eadc71365119e35072b71e3fbe36eba664d992e94897f442fb93f9397053f72363f83dff2e931d93e2af995976736d8513d11d7c42bdb471862
 EBUILD man-pages-de-1.15.ebuild 1289 BLAKE2B 2aa0d95614a5cb2d22a63c661befd01b789e6c7e322a48c013d5b408058235141bf0db7680f81da0016b8f03d246b8de6cc6ac0528cbbfc3aad4fba11bc475d1 SHA512 7f090cb1bef72e48034e98f5868378f47683575dde6668177871b12e1d06bf46cdfffb7b03877d19e57c925cb5c6cb599f766710743d150a79e36ea4f5258f57
 EBUILD man-pages-de-1.21.ebuild 1252 BLAKE2B 49503d85ab5a60b5dc5475f11d4ddc042abb3883665336450179a2247279ee0171037f7937195467e4d7b25dd8671f7a676171c7ad983f9134c7430689139df1 SHA512 2158482fb6541e0391b3c916da51fbc1bd5e67c8a283cc0a795e6e68462eb3c1ce343b8fc9161199a8bf56632505f0c1fd39e4527dffdbb61e5797286d1ae6b9
 EBUILD man-pages-de-2.10.ebuild 1898 BLAKE2B a44fb94d3d46334e1a2e7a58651cec5dc2091815d204222670d7a8e8a2ae09c78c86643ed7f967d62c18d2c7df00d19ec68c01a2f388f49f325a758f869a4d1a SHA512 4528a8b742541dea23819826909f631b5fb5c2287c21aac80a6e2efafc9fe245effca49b868c554e11394d3759b72f314e9f67adb70a665e8b37f32322026fbc
-EBUILD man-pages-de-2.3.ebuild 1356 BLAKE2B 99e0104647b0f1d80125a744b33a0e846cdf8f3d3acc846908376cebfaa1648aceb4a570116e035765164cbabb360ae7b995c522355aba97ed84530eadb90b12 SHA512 6a6081d2116fd0d756e22b8f1ab6d905ab57b9bbef6f7f084df50afe1afbd1187f16c79d800bcf00f9ab8cf3ea3869dd527fa885c0ebad8b0b3d6074d0d919e9
-EBUILD man-pages-de-2.5.ebuild 1436 BLAKE2B 4e5bc9ae14f8fed5e6a13971e6bb5d688d2d626fafe4390c1946c7fe28d6c6785edc9878efbeaa6aca970911a01cacd50b2c514f4717ae749f0134c72f613b7f SHA512 4a009a516c425f5831e82ea223125cf165ce37b12948313e2c39524cb0ac390ae577e1520c671f65b5370820ad4956cde8905e0ea39913ff47c0c3523023919e
+EBUILD man-pages-de-2.12.ebuild 1890 BLAKE2B 50bfe10ff3519dcd0aee03b0e9e46d8b4f25931ca636290c544d0a9b494a6bd37884fb26613966c3bd458e9036347984561087c84bf1c4c7c8cccfca66da2e2b SHA512 8fc7c4180f0d83dbc34e31c9f27d12816d23c507139bb80f5446e37699c6a928ed4739a0da2b96460bf2debb1338bc17f7551aae1402035505a3138aca8f1cf1
 MISC metadata.xml 369 BLAKE2B 41170815bcde0a65831b0453eee7b99359594bc67d345e31d1228d6b5def740d73087b96473511a8249528ac16a80b0eeee91791f9d4f113cb5caed918b40552 SHA512 e36208b3689927021e51ad2348ba3f5a5598b9657ffd7156d928dc817b90ed91a57d43605eb8a3e2fde1caf04349ba76b68ebc7ead1061ecca66280095179658
diff --git a/app-i18n/man-pages-de/man-pages-de-2.5.ebuild b/app-i18n/man-pages-de/man-pages-de-2.12.ebuild
index d8f50681b5ef..824cbd2c4b4c 100644
--- a/app-i18n/man-pages-de/man-pages-de-2.5.ebuild
+++ b/app-i18n/man-pages-de/man-pages-de-2.12.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -17,34 +17,58 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE=""
 
 RDEPEND="virtual/man"
-DEPEND="app-text/po4a"
+BDEPEND="app-text/po4a"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
+src_prepare() {
 	default
 
-	# sys-apps/shadow has it's own translated man-page for this
-	rm "${S}/upstream/primary/man1/groups.1" || die
-	rm "${S}/po/primary/man1/groups.1.po" || die
-}
+	sed '/gzip --best/d' -i po/Makefile.am || die
 
-src_prepare() {
-	default
+	# 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}
-	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
-		PORTAGE_COMPRESS_LOCAL="#"
-	fi
+	local PORTAGE_COMPRESS_FLAGS_LOCAL=${PORTAGE_COMPRESS_FLAGS}
 	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
 		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
+			bzip2|gzip)
+				PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
 			;;
 		esac
 	fi
-	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
-		po/Makefile.in || die
+
+	# 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
 }
 
diff --git a/app-i18n/man-pages-de/man-pages-de-2.3.ebuild b/app-i18n/man-pages-de/man-pages-de-2.3.ebuild
deleted file mode 100644
index 0b4510bd50ca..000000000000
--- a/app-i18n/man-pages-de/man-pages-de-2.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-MY_P="${PN/-/}-${PV}"
-
-DESCRIPTION="A somewhat comprehensive collection of Linux german man page translations"
-HOMEPAGE="https://alioth.debian.org/projects/manpages-de/"
-SRC_URI="https://manpages-de.alioth.debian.org/downloads/${MY_P}.tar.xz"
-
-LICENSE="GPL-3+ man-pages GPL-2+ GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-RDEPEND="virtual/man"
-DEPEND="app-text/po4a"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	default
-
-	# sys-apps/shadow has it's own translated man-page for this
-	rm upstream/primary/man1/groups.1 po/primary/man1/groups.1.po || die
-
-	# Use the same compression as every other manpage
-	local PORTAGE_COMPRESS_LOCAL=${PORTAGE_COMPRESS-bzip2}
-	if [[ ${PORTAGE_COMPRESS+set} == "set" ]] ; then
-		PORTAGE_COMPRESS_LOCAL="#"
-	fi
-	if [[ ${PORTAGE_COMPRESS_FLAGS+set} != "set" ]] ; then
-		case ${PORTAGE_COMPRESS_LOCAL} in
-			bzip2|gzip)  local PORTAGE_COMPRESS_FLAGS_LOCAL="-9"
-			;;
-		esac
-	fi
-	sed -i -e "s/gzip --best/${PORTAGE_COMPRESS_LOCAL} ${PORTAGE_COMPRESS_FLAGS_LOCAL}/"\
-		po/Makefile.in || die
-	eautoreconf
-}
-
-src_compile() { :; }
-
-src_install() {
-	emake mandir="${ED}"/usr/share/man install
-	dodoc CHANGES.md README.md
-}