From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7734A138334 for ; Tue, 8 Jan 2019 19:20:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 456ABE09D6; Tue, 8 Jan 2019 19:20:01 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1B899E09D6 for ; Tue, 8 Jan 2019 19:20:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 71334335D06 for ; Tue, 8 Jan 2019 19:19:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CECED455 for ; Tue, 8 Jan 2019 19:19:57 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1546975190.92e12d5306f0f510f994cfa50830c7c4c1ae1ad0.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/groff/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/groff/groff-1.22.4.ebuild X-VCS-Directories: sys-apps/groff/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 92e12d5306f0f510f994cfa50830c7c4c1ae1ad0 X-VCS-Branch: master Date: Tue, 8 Jan 2019 19:19:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 89ee1026-91c2-48a3-88ed-0358a0184532 X-Archives-Hash: 94eddf787ec03110b058b17e7540d85a commit: 92e12d5306f0f510f994cfa50830c7c4c1ae1ad0 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Jan 8 18:34:07 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Jan 8 19:19:50 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e12d53 sys-apps/groff: really use /usr/share/doc/${PF} as docdir Previous attempt to force groff to honor docdir didn't work and would require `eautoreconf`. We are now patching Makefile.in only and avoid `eautoreconf`. Link: https://github.com/gentoo/gentoo/pull/10697#issuecomment-451577399 Fixes: ba6771a19744 ("sys-apps/groff: bump to v1.22.4 RC4") Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Thomas Deutschmann gentoo.org> sys-apps/groff/groff-1.22.4.ebuild | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild index 67b0f18455e..749ccb4d7c9 100644 --- a/sys-apps/groff/groff-1.22.4.ebuild +++ b/sys-apps/groff/groff-1.22.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -42,9 +42,9 @@ src_prepare() { default # honor Gentoo's docdir - sed -i -e '/^docdir=/s/^/#/' \ - Makefile.am \ - || die "failed to modify Makefile.am" + sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX%/}/usr/share/doc/${PF}\"|g" \ + Makefile.in \ + || die "failed to modify Makefile.in" # Make sure we can cross-compile this puppy if tc-is-cross-compiler ; then @@ -73,7 +73,6 @@ src_prepare() { src_configure() { local myeconfargs=( --with-appresdir="${EPREFIX%/}"/usr/share/X11/app-defaults - --docdir="${EPREFIX%/}"/usr/share/doc/${PF} $(use_with X x) ) econf "${myeconfargs[@]}"