| 1 |
commit: c9fde0661308f1686a8d88065293e20f36745939 |
| 2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Nov 25 08:39:19 2015 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Nov 25 08:43:19 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9fde066 |
| 7 |
|
| 8 |
Merge remote-tracking branch 'github/pr/392'. |
| 9 |
|
| 10 |
app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild | 2 +- |
| 11 |
app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild | 5 ++--- |
| 12 |
2 files changed, 3 insertions(+), 4 deletions(-) |
| 13 |
|
| 14 |
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild |
| 15 |
index 11654a7..ad31eca 100644 |
| 16 |
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild |
| 17 |
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.69.ebuild |
| 18 |
@@ -51,7 +51,7 @@ src_prepare() { |
| 19 |
# Fix doc install path. |
| 20 |
sed -e \ |
| 21 |
"s%/share/doc/linuxdoc-tools%/share/doc/${PF}%" \ |
| 22 |
- -i Makefile.in |
| 23 |
+ -i Makefile.in || die |
| 24 |
|
| 25 |
# Upstream developers unconditionally build docs during the install phase. |
| 26 |
# The only sane solution in this case is to patch things out from Makefile. |
| 27 |
|
| 28 |
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild |
| 29 |
index b45639c..b9883e7 100644 |
| 30 |
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild |
| 31 |
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.71-r1.ebuild |
| 32 |
@@ -39,14 +39,13 @@ DOCS=( ChangeLog README ) |
| 33 |
|
| 34 |
S="${WORKDIR}/${PN}-upstream/${PV}-${GIT_SHA1}" |
| 35 |
|
| 36 |
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" \ |
| 37 |
- "/usr/share/linuxdoc-tools/linuxdoc-tools.catalog" |
| 38 |
+sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog" |
| 39 |
|
| 40 |
src_prepare() { |
| 41 |
# Use Gentoo doc install path. |
| 42 |
sed -i \ |
| 43 |
-e "s%/share/doc/linuxdoc-tools%/share/doc/${PF}%" \ |
| 44 |
- Makefile.in |
| 45 |
+ Makefile.in || die |
| 46 |
|
| 47 |
autotools-utils_src_prepare |
| 48 |
} |
Archives