| 1 |
commit: 92e12d5306f0f510f994cfa50830c7c4c1ae1ad0 |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 8 18:34:07 2019 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 8 19:19:50 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92e12d53 |
| 7 |
|
| 8 |
sys-apps/groff: really use /usr/share/doc/${PF} as docdir |
| 9 |
|
| 10 |
Previous attempt to force groff to honor docdir didn't work and would |
| 11 |
require `eautoreconf`. |
| 12 |
|
| 13 |
We are now patching Makefile.in only and avoid `eautoreconf`. |
| 14 |
|
| 15 |
Link: https://github.com/gentoo/gentoo/pull/10697#issuecomment-451577399 |
| 16 |
Fixes: ba6771a19744 ("sys-apps/groff: bump to v1.22.4 RC4") |
| 17 |
Package-Manager: Portage-2.3.54, Repoman-2.3.12 |
| 18 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 19 |
|
| 20 |
sys-apps/groff/groff-1.22.4.ebuild | 9 ++++----- |
| 21 |
1 file changed, 4 insertions(+), 5 deletions(-) |
| 22 |
|
| 23 |
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild |
| 24 |
index 67b0f18455e..749ccb4d7c9 100644 |
| 25 |
--- a/sys-apps/groff/groff-1.22.4.ebuild |
| 26 |
+++ b/sys-apps/groff/groff-1.22.4.ebuild |
| 27 |
@@ -1,4 +1,4 @@ |
| 28 |
-# Copyright 1999-2018 Gentoo Authors |
| 29 |
+# Copyright 1999-2019 Gentoo Authors |
| 30 |
# Distributed under the terms of the GNU General Public License v2 |
| 31 |
|
| 32 |
EAPI=6 |
| 33 |
@@ -42,9 +42,9 @@ src_prepare() { |
| 34 |
default |
| 35 |
|
| 36 |
# honor Gentoo's docdir |
| 37 |
- sed -i -e '/^docdir=/s/^/#/' \ |
| 38 |
- Makefile.am \ |
| 39 |
- || die "failed to modify Makefile.am" |
| 40 |
+ sed -i -e "s|^docdir =.*|docdir = \"${EPREFIX%/}/usr/share/doc/${PF}\"|g" \ |
| 41 |
+ Makefile.in \ |
| 42 |
+ || die "failed to modify Makefile.in" |
| 43 |
|
| 44 |
# Make sure we can cross-compile this puppy |
| 45 |
if tc-is-cross-compiler ; then |
| 46 |
@@ -73,7 +73,6 @@ src_prepare() { |
| 47 |
src_configure() { |
| 48 |
local myeconfargs=( |
| 49 |
--with-appresdir="${EPREFIX%/}"/usr/share/X11/app-defaults |
| 50 |
- --docdir="${EPREFIX%/}"/usr/share/doc/${PF} |
| 51 |
$(use_with X x) |
| 52 |
) |
| 53 |
econf "${myeconfargs[@]}" |
Archives