[gentoo-commits] repo/gentoo:master commit in: sys-apps/groff/

[Thomas Deutschmann]

commit:     ba6771a19744ebd7a4139c4d54bc7c49ec5b8b4d
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  3 00:04:42 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Dec  3 00:08:02 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba6771a1

sys-apps/groff: bump to v1.22.4 RC4

Package is now honoring docdir.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 sys-apps/groff/Manifest                                          | 2 +-
 .../groff/{groff-1.22.4_rc3.ebuild => groff-1.22.4_rc4.ebuild}   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 47b0d1aaf28..31311757165 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -1,4 +1,4 @@
 DIST groff-1.22.1-japanese.patch.bz2 52968 BLAKE2B 
8064ff973c9507536c4e6edb6146c33c6c3a994598f0bb925bd23307a5ed407af9fe744990735d640ea69def4a6aed69ee87b7abbacca401c0059cf63e6eb147
 SHA512 
883d15dd2f1420a067d35737c45431f33f05bbe3c7e7edab0e119416117b5d096972d71452eae94bfd3df23aa7d6595fc6e65208bd4fba86815162bdf9af8bef
 DIST groff-1.22.2.tar.gz 4019913 BLAKE2B 
904a2a6064cc70cf088224d6f608389eb56842142802636b94fef30f5e20b5c62db03087878d0e04e22c65754e0fd253aa7cfd23c1354057862f70e17db43366
 SHA512 
ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80
 DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 
28c380d33719f4eb0c91a9761e76beb9a2f1f6fb632c731bb6b26f76fee1857e7340d62a2239b360e049351e2e291c420db18a4f6bf8f50221bf249457872693
 SHA512 
c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
-DIST groff-1.22.4.rc3.tar.gz 4119916 BLAKE2B 
b7748213fdd85136624c46a6d0f442ba3f5937e8612edd036b8bd0dd2d501030e2be86907bb607a1267f5216c26a9004527904dae48a52a0226232f1146a001e
 SHA512 
a67fdcffddc660bac22a77063c6efde36b01ddb3b905c4cef9a959dd1b4194899e23d2c536b3f4b15f24d3d1d043245921043e442d775139f62a49f7a6bb3e3f
+DIST groff-1.22.4.rc4.tar.gz 4134495 BLAKE2B 
7cf15e0eb13b00cd16ba127d2b0196ffca0ef2f0ec3b32290af466afee5211f32eea14fcb6fd875378d4f8c57dd851be3e3ad9dac2d6a583f8c3dc3c647905f0
 SHA512 
ff5822c36f7701783e132e3fddd06dcfe68200d7e2e8c131016793282e459ced4529710c1f25d4155b84fc2cb09aa51ffa25664f5390f4b6064a9f41ffd5c30d

diff --git a/sys-apps/groff/groff-1.22.4_rc3.ebuild 
b/sys-apps/groff/groff-1.22.4_rc4.ebuild
similarity index 91%
rename from sys-apps/groff/groff-1.22.4_rc3.ebuild
rename to sys-apps/groff/groff-1.22.4_rc4.ebuild
index ad57e91b4b4..67b0f18455e 100644
--- a/sys-apps/groff/groff-1.22.4_rc3.ebuild
+++ b/sys-apps/groff/groff-1.22.4_rc4.ebuild
@@ -41,6 +41,11 @@ PATCHES=(
 src_prepare() {
        default
 
+       # honor Gentoo's docdir
+       sed -i -e '/^docdir=/s/^/#/' \
+               Makefile.am \
+               || die "failed to modify Makefile.am"
+
        # Make sure we can cross-compile this puppy
        if tc-is-cross-compiler ; then
                sed -i \
@@ -67,8 +72,8 @@ src_prepare() {
 
 src_configure() {
        local myeconfargs=(
-               --with-appresdir="${EPREFIX}"/usr/share/X11/app-defaults
-               --docdir="${EPREFIX}"/usr/share/doc/${PF}
+               --with-appresdir="${EPREFIX%/}"/usr/share/X11/app-defaults
+               --docdir="${EPREFIX%/}"/usr/share/doc/${PF}
                $(use_with X x)
        )
        econf "${myeconfargs[@]}"