commit: 10cd11b24a9de8831b556d1d9c0553c43149fb3b Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sun Feb 17 15:36:59 2019 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Sun Feb 17 15:43:23 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10cd11b2
app-i18n/man-pages-de: Bump to version 2.10. Removed version 2.9 - Bumped to EAPI-7 - removed man1/su.1.po file as it collides with sys-apps/shadow package - put all to be removed files into a local array - Remove "gzip --best" call from Makefile.am instead of Makefile.in because eautoreconf call comes at a later point effectively reverting the change again - Improved readability of case calls - Moved src_unpack() stuff into src_prepare() - Fix man-page links when xz compression is being used Bug: https://bugs.gentoo.org/670092 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-i18n/man-pages-de/Manifest | 2 +- ...ages-de-2.9.ebuild => man-pages-de-2.10.ebuild} | 52 ++++++++++++++-------- 2 files changed, 34 insertions(+), 20 deletions(-) diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest index aa0551bdab8..d2fe7572e1a 100644 --- a/app-i18n/man-pages-de/Manifest +++ b/app-i18n/man-pages-de/Manifest @@ -1,5 +1,5 @@ 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.9.tar.bz2 9148970 BLAKE2B 39d5c781f7a81733a3b264c92fa9d7615bbb28841fe67000f8188424619bc83323439c6f5c752b567937f2d50b8dba4a8f3959c2524dbe027ba9fc283be97f9a SHA512 32a6979bf394cb490d33e9c2ce2e94b80a442043551747dc88fd05096785766c01887de6b6fb6858beaa31491a3d4cc8194fdd4284aec32002536f3bc92ebe40 diff --git a/app-i18n/man-pages-de/man-pages-de-2.9.ebuild b/app-i18n/man-pages-de/man-pages-de-2.10.ebuild similarity index 61% rename from app-i18n/man-pages-de/man-pages-de-2.9.ebuild rename to app-i18n/man-pages-de/man-pages-de-2.10.ebuild index f12feaf49d1..2828f80836c 100644 --- a/app-i18n/man-pages-de/man-pages-de-2.9.ebuild +++ b/app-i18n/man-pages-de/man-pages-de-2.10.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -17,44 +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/primary/man1/groups.1 + po/primary/man1/groups.1.po + po/primary/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" + 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 "${S}/upstream/"*"/links.txt" - do - sed -i -e "s/\.gz/\.bz2/g" "$LINKSOURCE" || die - done + bzip2) + for LINKSOURCE in upstream/*/links.txt ; do + sed -i -e 's/\.gz/\.bz2/g' "${LINKSOURCE}" || die + done ;; - gzip) # pass + gzip) + # pass ;; - *) ewarn "Unexpected compression command ${PORTAGE_COMPRESS} found, symlinks will not work." + 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 }
